"Contact\User" class created

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 6ad531d0712727cf52c70aec10ca4581a62ead43..d4ee97c4ff7a1b37998ed2ddacd3f6e91c624b8a 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,18 +1,31 @@
 <?php
 /**
- * @file include/common.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
 use Friendica\Module;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function common_content(App $a)
@@ -25,7 +38,7 @@ function common_content(App $a)
        $zcid = 0;
 
        if (!local_user()) {
-               notice(L10n::t('Permission denied.') . EOL);
+               notice(DI::l10n()->t('Permission denied.'));
                return;
        }
 
@@ -42,13 +55,13 @@ function common_content(App $a)
 
                if (DBA::isResult($contact)) {
                        DI::page()['aside'] = "";
-                       Model\Profile::load($a, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
+                       Model\Profile::load($a, "", Model\Contact::getByURL($contact["url"], false));
                }
        } else {
                $contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
                if (DBA::isResult($contact)) {
-                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("widget/vcard.tpl"), [
+                       $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('widget/vcard.tpl'), [
                                '$name'  => $contact['name'],
                                '$photo' => $contact['photo'],
                                'url'    => 'contact/' . $cid
@@ -88,11 +101,11 @@ function common_content(App $a)
        }
 
        if ($total < 1) {
-               notice(L10n::t('No contacts in common.') . EOL);
+               notice(DI::l10n()->t('No contacts in common.'));
                return $o;
        }
 
-       $pager = new Pager(DI::args()->getQueryString());
+       $pager = new Pager(DI::l10n(), DI::args()->getQueryString());
 
        if ($cid) {
                $common_friends = Model\GContact::commonFriends($uid, $cid, $pager->getStart(), $pager->getItemsPerPage());
@@ -104,42 +117,20 @@ function common_content(App $a)
                return $o;
        }
 
-       $id = 0;
-
-       $entries = [];
-       foreach ($common_friends as $common_friend) {
-               //get further details of the contact
-               $contact_details = Model\Contact::getDetailsByURL($common_friend['url'], $uid);
-
-               // $rr['id'] is needed to use contact_photo_menu()
-               /// @TODO Adding '/" here avoids E_NOTICE on missing constants
-               $common_friend['id'] = $common_friend['cid'];
-
-               $photo_menu = Model\Contact::photoMenu($common_friend);
-
-               $entry = [
-                       'url'          => Model\Contact::magicLink($common_friend['url']),
-                       'itemurl'      => ($contact_details['addr'] ?? '') ?: $common_friend['url'],
-                       'name'         => $contact_details['name'],
-                       'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
-                       'img_hover'    => $contact_details['name'],
-                       'details'      => $contact_details['location'],
-                       'tags'         => $contact_details['keywords'],
-                       'about'        => $contact_details['about'],
-                       'account_type' => Model\Contact::getAccountType($contact_details),
-                       'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
-                       'photo_menu'   => $photo_menu,
-                       'id'           => ++$id,
-               ];
-               $entries[] = $entry;
-       }
-
        $title = '';
        $tab_str = '';
        if ($cmd === 'loc' && $cid && local_user() == $uid) {
                $tab_str = Module\Contact::getTabsHTML($a, $contact, 5);
        } else {
-               $title = L10n::t('Common Friends');
+               $title = DI::l10n()->t('Common Friends');
+       }
+
+       $entries = [];
+       foreach ($common_friends as $common_friend) {
+               $contact = Model\Contact::getByURLForUser($common_friend['url'], local_user());
+               if (!empty($contact)) {
+                       $entries[] = Module\Contact::getContactTemplateVars($contact);
+               }
        }
 
        $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');