X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=d4ee97c4ff7a1b37998ed2ddacd3f6e91c624b8a;hb=748ddb7ad2394484d395bf2dbec4405916f12f6c;hp=436d8bb559b485305d1b89c6d4820b09d6de37fb;hpb=85dc9bb96b30819fcf544c9aa1013a8f380d6981;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 436d8bb559..d4ee97c4ff 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -20,14 +20,12 @@
  */
 
 use Friendica\App;
-use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
 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)
@@ -40,7 +38,7 @@ function common_content(App $a)
 	$zcid = 0;
 
 	if (!local_user()) {
-		notice(DI::l10n()->t('Permission denied.') . EOL);
+		notice(DI::l10n()->t('Permission denied.'));
 		return;
 	}
 
@@ -57,13 +55,13 @@ function common_content(App $a)
 
 		if (DBA::isResult($contact)) {
 			DI::page()['aside'] = "";
-			Model\Profile::load($a, "", 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
@@ -103,11 +101,11 @@ function common_content(App $a)
 	}
 
 	if ($total < 1) {
-		notice(DI::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());
@@ -119,36 +117,6 @@ 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) {
@@ -157,6 +125,14 @@ function common_content(App $a)
 		$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');
 
 	$o .= Renderer::replaceMacros($tpl, [