Create new page_tabs template

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

diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 73be9ecab53be29cf6d7a160fb20335ef5edd6ef..3085bbd0b86fbaabc52e3d1b151929b6ecd9aa73 100644 (file)
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -196,8 +196,8 @@ class Contact extends BaseModule
         */
        private static function blockContact($contact_id)
        {
-               $blocked = !Model\Contact::isBlockedByUser($contact_id, local_user());
-               Model\Contact::setBlockedForUser($contact_id, local_user(), $blocked);
+               $blocked = !Model\Contact\User::isBlocked($contact_id, local_user());
+               Model\Contact\User::setBlocked($contact_id, local_user(), $blocked);
        }
 
        /**
@@ -208,8 +208,8 @@ class Contact extends BaseModule
         */
        private static function ignoreContact($contact_id)
        {
-               $ignored = !Model\Contact::isIgnoredByUser($contact_id, local_user());
-               Model\Contact::setIgnoredForUser($contact_id, local_user(), $ignored);
+               $ignored = !Model\Contact\User::isIgnored($contact_id, local_user());
+               Model\Contact\User::setIgnored($contact_id, local_user(), $ignored);
        }
 
        /**
@@ -395,7 +395,7 @@ class Contact extends BaseModule
                        if ($cmd === 'block') {
                                self::blockContact($contact_id);
 
-                               $blocked = Model\Contact::isBlockedByUser($contact_id, local_user());
+                               $blocked = Model\Contact\User::isBlocked($contact_id, local_user());
                                info(($blocked ? DI::l10n()->t('Contact has been blocked') : DI::l10n()->t('Contact has been unblocked')));
 
                                DI::baseUrl()->redirect('contact/' . $contact_id);
@@ -405,7 +405,7 @@ class Contact extends BaseModule
                        if ($cmd === 'ignore') {
                                self::ignoreContact($contact_id);
 
-                               $ignored = Model\Contact::isIgnoredByUser($contact_id, local_user());
+                               $ignored = Model\Contact\User::isIgnored($contact_id, local_user());
                                info(($ignored ? DI::l10n()->t('Contact has been ignored') : DI::l10n()->t('Contact has been unignored')));
 
                                DI::baseUrl()->redirect('contact/' . $contact_id);
@@ -479,8 +479,8 @@ class Contact extends BaseModule
                                '$baseurl' => DI::baseUrl()->get(true),
                        ]);
 
-                       $contact['blocked']  = Model\Contact::isBlockedByUser($contact['id'], local_user());
-                       $contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
+                       $contact['blocked']  = Model\Contact\User::isBlocked($contact['id'], local_user());
+                       $contact['readonly'] = Model\Contact\User::isIgnored($contact['id'], local_user());
 
                        $relation_text = '';
                        switch ($contact['rel']) {
@@ -531,7 +531,7 @@ class Contact extends BaseModule
                        $nettype = DI::l10n()->t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']));
 
                        // tabs
-                       $tab_str = self::getTabsHTML($a, $contact, 3);
+                       $tab_str = self::getTabsHTML($contact, 3);
 
                        $lost_contact = (($contact['archive'] && $contact['term-date'] > DBA::NULL_DATETIME && $contact['term-date'] < DateTimeFormat::utcNow()) ? DI::l10n()->t('Communications lost with this contact!') : '');
 
@@ -738,8 +738,8 @@ class Contact extends BaseModule
                        $sql_values
                );
                while ($contact = DBA::fetch($stmt)) {
-                       $contact['blocked'] = Model\Contact::isBlockedByUser($contact['id'], local_user());
-                       $contact['readonly'] = Model\Contact::isIgnoredByUser($contact['id'], local_user());
+                       $contact['blocked'] = Model\Contact\User::isBlocked($contact['id'], local_user());
+                       $contact['readonly'] = Model\Contact\User::isIgnored($contact['id'], local_user());
                        $contacts[] = self::getContactTemplateVars($contact);
                }
                DBA::close($stmt);
@@ -855,14 +855,14 @@ 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
         *
         * @return string HTML string of the contact page tabs buttons.
         * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
-       public static function getTabsHTML($a, $contact, $active_tab)
+       public static function getTabsHTML(array $contact, int $active_tab)
        {
                $cid = $pcid = $contact['id'];
                $data = Model\Contact::getPublicAndUserContacID($contact['id'], local_user());
@@ -876,7 +876,7 @@ class Contact extends BaseModule
                $tabs = [
                        [
                                'label' => DI::l10n()->t('Status'),
-                               'url'   => "contact/" . $cid . "/conversations",
+                               'url'   => "contact/" . $pcid . "/conversations",
                                'sel'   => (($active_tab == 1) ? 'active' : ''),
                                'title' => DI::l10n()->t('Conversations started by this contact'),
                                'id'    => 'status-tab',
@@ -884,7 +884,7 @@ class Contact extends BaseModule
                        ],
                        [
                                'label' => DI::l10n()->t('Posts and Comments'),
-                               'url'   => "contact/" . $cid . "/posts",
+                               'url'   => "contact/" . $pcid . "/posts",
                                'sel'   => (($active_tab == 2) ? 'active' : ''),
                                'title' => DI::l10n()->t('Status Messages and Posts'),
                                'id'    => 'posts-tab',
@@ -901,7 +901,7 @@ class Contact extends BaseModule
                ];
 
                // Show this tab only if there is visible friend list
-               $x = Model\Contact::countContactsOfContact($pcid);
+               $x = Model\Contact\Relation::countFollows($pcid);
                if ($x) {
                        $tabs[] = ['label' => DI::l10n()->t('Contacts'),
                                'url'   => "allfriends/" . $pcid,
@@ -964,7 +964,7 @@ class Contact extends BaseModule
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
                if (!$update) {
-                       $o .= self::getTabsHTML($a, $contact, 1);
+                       $o .= self::getTabsHTML($contact, 1);
                }
 
                if (DBA::isResult($contact)) {
@@ -988,7 +988,7 @@ class Contact extends BaseModule
        {
                $contact = DBA::selectFirst('contact', ['uid', 'url', 'id'], ['id' => $contact_id, 'deleted' => false]);
 
-               $o = self::getTabsHTML($a, $contact, 2);
+               $o = self::getTabsHTML($contact, 2);
 
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = '';
@@ -1030,7 +1030,7 @@ class Contact extends BaseModule
                        }
                }
 
-               if (!empty($contact['uid']) && !empty($contact['rel'])) {
+               if (!empty($contact['uid']) && !empty($contact['rel']) && local_user() == $contact['uid']) {
                        switch ($contact['rel']) {
                                case Model\Contact::FRIEND:
                                        $alt_text = DI::l10n()->t('Mutual Friendship');