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 410f5878bb3f9fb20d2f01c5f182f889f8e0c2ec..ea3eecd4a278f675255e13b29a008b2c9260557d 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -10,7 +10,7 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
@@ -18,7 +18,6 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
-use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -47,14 +46,15 @@ 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'])
                ) {
                        $contact_id = intval($a->argv[1]);
-                       $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+                       $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
 
                        if (!DBA::isResult($contact)) {
-                               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0]);
+                               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => 0, 'deleted' => false]);
                        }
 
                        // Don't display contacts that are about to be deleted
@@ -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),
                ]);
        }
 
@@ -135,7 +134,7 @@ class Contact extends BaseModule
 
                $contacts_id = $_POST['contact_batch'];
 
-               $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]);
+               $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false, 'deleted' => false]);
                $orig_records = DBA::toArray($stmt);
 
                $count_actions = 0;
@@ -188,13 +187,13 @@ class Contact extends BaseModule
                        return;
                }
 
-               if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) {
+               if (!DBA::exists('contact', ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false])) {
                        notice(L10n::t('Could not access contact record.') . EOL);
                        $a->internalRedirect('contact');
                        return; // NOTREACHED
                }
 
-               Addon::callHooks('contact_edit_post', $_POST);
+               Hook::callAll('contact_edit_post', $_POST);
 
                $profile_id = intval(defaults($_POST, 'profile-assign', 0));
                if ($profile_id) {
@@ -236,7 +235,7 @@ class Contact extends BaseModule
                        notice(L10n::t('Failed to update contact record.') . EOL);
                }
 
-               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
                if (DBA::isResult($contact)) {
                        $a->data['contact'] = $contact;
                }
@@ -248,7 +247,7 @@ class Contact extends BaseModule
 
        private static function updateContactFromPoll($contact_id)
        {
-               $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
                if (!DBA::isResult($contact)) {
                        return;
                }
@@ -269,7 +268,7 @@ class Contact extends BaseModule
 
        private static function updateContactFromProbe($contact_id)
        {
-               $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]);
+               $contact = DBA::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user(), 'deleted' => false]);
                if (!DBA::isResult($contact)) {
                        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);
@@ -370,7 +369,7 @@ class Contact extends BaseModule
 
                        $cmd = $a->argv[2];
 
-                       $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false]);
+                       $orig_record = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => [0, local_user()], 'self' => false, 'deleted' => false]);
                        if (!DBA::isResult($orig_record)) {
                                notice(L10n::t('Could not access contact record.') . EOL);
                                $a->internalRedirect('contact');
@@ -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'],
@@ -642,7 +639,7 @@ class Contact extends BaseModule
                                '$profileurllabel'=> L10n::t('Profile URL'),
                                '$profileurl'     => $contact['url'],
                                '$account_type'   => Model\Contact::getAccountType($contact),
-                               '$location'       => $contact['location'],
+                               '$location'       => BBCode::convert($contact['location']),
                                '$location_label' => L10n::t('Location:'),
                                '$xmpp'           => BBCode::convert($contact['xmpp']),
                                '$xmpp_label'     => L10n::t('XMPP:'),
@@ -659,7 +656,7 @@ class Contact extends BaseModule
 
                        $arr = ['contact' => $contact, 'output' => $o];
 
-                       Addon::callHooks('contact_edit', $arr);
+                       Hook::callAll('contact_edit', $arr);
 
                        return $arr['output'];
                }
@@ -778,6 +775,8 @@ class Contact extends BaseModule
                        $sql_extra .= sprintf(" AND network = '%s' ", DBA::escape($nets));
                }
 
+               $sql_extra .=  " AND NOT `deleted` ";
+
                $sql_extra2 = ((($sort_type > 0) && ($sort_type <= Model\Contact::FRIEND)) ? sprintf(" AND `rel` = %d ", intval($sort_type)) : '');
 
                $r = q("SELECT COUNT(*) AS `total` FROM `contact`
@@ -808,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,
@@ -839,12 +837,12 @@ class Contact extends BaseModule
         *
         * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends'
         *
-        * @param App $a
-        * @param array $contact The contact array
-        * @param int $active_tab 1 if tab should be marked as active
+        * @param App   $a
+        * @param array $contact    The contact array
+        * @param int   $active_tab 1 if tab should be marked as active
         *
-        * @return string | HTML string of the contact page tabs buttons.
-
+        * @return string HTML string of the contact page tabs buttons.
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getTabsHTML($a, $contact, $active_tab)
        {
@@ -937,7 +935,7 @@ class Contact extends BaseModule
                        }
                }
 
-               $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+               $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
                if (!$update) {
                        $o .= self::getTabsHTML($a, $contact, 1);
@@ -961,7 +959,7 @@ class Contact extends BaseModule
 
        private static function getPostsHTML($a, $contact_id)
        {
-               $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id]);
+               $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
                $o = self::getTabsHTML($a, $contact, 2);