X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=9d441f18a7c5aaa81d343ca08a14260df5d06c34;hb=ae3d4f63a31c5a9f35c55e6507263a600867b55a;hp=25a6aef17a5cc602833514148f2be7e20639af88;hpb=f303f9edf2dd9943d07e6507006f61ca2abadaa5;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 25a6aef17a..9d441f18a7 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -5,14 +5,14 @@
 
 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\Model;
 use Friendica\Module;
 use Friendica\Util\Proxy as ProxyUtils;
-
-
-require_once 'include/dba.php';
+use Friendica\Util\Strings;
 
 function common_content(App $a)
 {
@@ -47,13 +47,13 @@ function common_content(App $a)
 		$contact = DBA::selectFirst('contact', ['name', 'url', 'photo', 'uid', 'id'], ['self' => true, 'uid' => $uid]);
 
 		if (DBA::isResult($contact)) {
-			$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
-				'$name' => htmlentities($contact['name']),
+			$vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate("widget/vcard.tpl"), [
+				'$name'  => $contact['name'],
 				'$photo' => $contact['photo'],
-				'url' => 'contacts/' . $cid
+				'url'    => 'contact/' . $cid
 			]);
 
-			if (!x($a->page, 'aside')) {
+			if (empty($a->page['aside'])) {
 				$a->page['aside'] = '';
 			}
 			$a->page['aside'] .= $vcard_widget;
@@ -65,11 +65,11 @@ function common_content(App $a)
 	}
 
 	if (!$cid && Model\Profile::getMyURL()) {
-		$contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL()), 'uid' => $uid]);
+		$contact = DBA::selectFirst('contact', ['id'], ['nurl' => Strings::normaliseLink(Model\Profile::getMyURL()), 'uid' => $uid]);
 		if (DBA::isResult($contact)) {
 			$cid = $contact['id'];
 		} else {
-			$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Model\Profile::getMyURL())]);
+			$gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => Strings::normaliseLink(Model\Profile::getMyURL())]);
 			if (DBA::isResult($gcontact)) {
 				$zcid = $gcontact['id'];
 			}
@@ -81,47 +81,47 @@ function common_content(App $a)
 	}
 
 	if ($cid) {
-		$t = Model\GContact::countCommonFriends($uid, $cid);
+		$total = Model\GContact::countCommonFriends($uid, $cid);
 	} else {
-		$t = Model\GContact::countCommonFriendsZcid($uid, $zcid);
+		$total = Model\GContact::countCommonFriendsZcid($uid, $zcid);
 	}
 
-	if ($t > 0) {
-		$a->setPagerTotal($t);
-	} else {
+	if ($total < 1) {
 		notice(L10n::t('No contacts in common.') . EOL);
 		return $o;
 	}
 
+	$pager = new Pager($a->query_string);
+
 	if ($cid) {
-		$r = Model\GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
+		$common_friends = Model\GContact::commonFriends($uid, $cid, $pager->getStart(), $pager->getItemsPerPage());
 	} else {
-		$r = Model\GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
+		$common_friends = Model\GContact::commonFriendsZcid($uid, $zcid, $pager->getStart(), $pager->getItemsPerPage());
 	}
 
-	if (!DBA::isResult($r)) {
+	if (!DBA::isResult($common_friends)) {
 		return $o;
 	}
 
 	$id = 0;
 
 	$entries = [];
-	foreach ($r as $rr) {
+	foreach ($common_friends as $common_friend) {
 		//get further details of the contact
-		$contact_details = Model\Contact::getDetailsByURL($rr['url'], $uid);
+		$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
-		$rr['id'] = $rr['cid'];
+		$common_friend['id'] = $common_friend['cid'];
 
-		$photo_menu = Model\Contact::photoMenu($rr);
+		$photo_menu = Model\Contact::photoMenu($common_friend);
 
 		$entry = [
-			'url'          => $rr['url'],
-			'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
+			'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'    => htmlentities($contact_details['name']),
+			'img_hover'    => $contact_details['name'],
 			'details'      => $contact_details['location'],
 			'tags'         => $contact_details['keywords'],
 			'about'        => $contact_details['about'],
@@ -141,13 +141,13 @@ function common_content(App $a)
 		$title = L10n::t('Common Friends');
 	}
 
-	$tpl = get_markup_template('viewcontact_template.tpl');
+	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-	$o .= replace_macros($tpl, [
+	$o .= Renderer::replaceMacros($tpl, [
 		'$title'    => $title,
 		'$tab_str'  => $tab_str,
 		'$contacts' => $entries,
-		'$paginate' => paginate($a),
+		'$paginate' => $pager->renderFull($total),
 	]);
 
 	return $o;