X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=b59b36ee7d79267be9cff33bd8ddd0c7404d188b;hb=b79bb0d2cb3e6da43d7e6296f5afa29987be88e4;hp=7e1dcc1859f3da99c3cd99e16e1b97482f8fa35f;hpb=42775d53b2c5177cae2e0e1dacb0a32f92e4a83b;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 7e1dcc1859..b59b36ee7d 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,6 +1,22 @@
 <?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;
@@ -10,8 +26,8 @@ use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
+use Friendica\Model\Contact;
 use Friendica\Module;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function common_content(App $a)
@@ -24,7 +40,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;
 	}
 
@@ -41,13 +57,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
@@ -87,11 +103,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());
@@ -108,7 +124,7 @@ function common_content(App $a)
 	$entries = [];
 	foreach ($common_friends as $common_friend) {
 		//get further details of the contact
-		$contact_details = Model\Contact::getDetailsByURL($common_friend['url'], $uid);
+		$contact_details = Model\Contact::getByURLForUser($common_friend['url'], $uid);
 
 		// $rr['id'] is needed to use contact_photo_menu()
 		/// @TODO Adding '/" here avoids E_NOTICE on missing constants
@@ -120,7 +136,7 @@ function common_content(App $a)
 			'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),
+			'thumb'        => Contact::getThumb($contact_details),
 			'img_hover'    => $contact_details['name'],
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],