Merge pull request #7107 from nupplaphil/bug/mod_fix_routes

[friendica.git] / src / Module / Contact.php

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 230ad4b57bd008938c0a273846609c734424a4c8..42ae32db892da0f90722a5e6257b950db03b3db5 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -46,6 +46,7 @@ class Contact extends BaseModule
 
                $contact_id = null;
                $contact = null;
+               // @TODO: Replace with parameter from router
                if ($a->argc == 2 && intval($a->argv[1])
                        || $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])
                ) {
@@ -64,6 +65,7 @@ class Contact extends BaseModule
 
                if (DBA::isResult($contact)) {
                        if ($contact['self']) {
+                               // @TODO: Replace with parameter from router
                                if (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])) {
                                        $a->internalRedirect('profile/' . $contact['nick']);
                                } else {
@@ -118,11 +120,9 @@ class Contact extends BaseModule
                        '$networks_widget'   => $networks_widget
                ]);
 
-               $base = $a->getBaseURL();
                $tpl = Renderer::getMarkupTemplate('contacts-head.tpl');
                $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [
-                       '$baseurl' => System::baseUrl(true),
-                       '$base' => $base
+                       '$baseurl' => $a->getBaseURL(true),
                ]);
        }
 
@@ -367,6 +367,7 @@ class Contact extends BaseModule
                                return;
                        }
 
+                       // @TODO: Replace with parameter from router
                        $cmd = $a->argv[2];
 
                        $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
@@ -667,6 +668,7 @@ class Contact extends BaseModule
                $archived = false;
                $all = false;
 
+               // @TODO: Replace with parameter from router
                if (($a->argc == 2) && ($a->argv[1] === 'all')) {
                        $sql_extra = '';
                        $all = true;
@@ -807,7 +809,6 @@ class Contact extends BaseModule
 
                $tpl = Renderer::getMarkupTemplate('contacts-template.tpl');
                $o .= Renderer::replaceMacros($tpl, [
-                       '$baseurl'    => System::baseUrl(),
                        '$header'     => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
                        '$tabs'       => $t,
                        '$total'      => $total,