Merge pull request #7044 from MrPetovan/task/router

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index a9413e1de51676597270c0e27e03344627f47210..ea3eecd4a278f675255e13b29a008b2c9260557d 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -8,7 +8,6 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Hook;
@@ -47,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'])
                ) {
@@ -65,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 {
@@ -119,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),
                ]);
        }
 
@@ -198,7 +197,7 @@ class Contact extends BaseModule
 
                $profile_id = intval(defaults($_POST, 'profile-assign', 0));
                if ($profile_id) {
-                       if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user(), 'deleted' => false])) {
+                       if (!DBA::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) {
                                notice(L10n::t('Could not locate selected profile.') . EOL);
                                return;
                        }
@@ -310,7 +309,7 @@ class Contact extends BaseModule
                        return;
                }
 
-               $r = DBA::update('contact', $fields, ['id' => $contact_id, 'uid' => local_user()]);
+               DBA::update('contact', $fields, ['id' => $contact_id, 'uid' => local_user()]);
 
                // Update the entry in the contact table
                Model\Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
@@ -470,7 +469,6 @@ class Contact extends BaseModule
                $_SESSION['return_path'] = $a->query_string;
 
                if (!empty($a->data['contact']) && is_array($a->data['contact'])) {
-                       $contact_id = $a->data['contact']['id'];
                        $contact = $a->data['contact'];
 
                        $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [
@@ -632,7 +630,6 @@ class Contact extends BaseModule
                                '$hidden'         => ['hidden', L10n::t('Hide this contact from others'), ($contact['hidden'] == 1), L10n::t('Replies/likes to your public posts <strong>may</strong> still be visible')],
                                '$notify'         => ['notify', L10n::t('Notification for new posts'), ($contact['notify_new_posts'] == 1), L10n::t('Send a notification of every new post of this contact')],
                                '$fetch_further_information' => $fetch_further_information,
-                               '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'],
                                '$ffi_keyword_blacklist' => ['ffi_keyword_blacklist', L10n::t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], L10n::t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
                                '$photo'          => $contact['photo'],
                                '$name'           => $contact['name'],
@@ -810,7 +807,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,