X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=5a40663f9eb6445e48f44d5c4e82ac08639e9dc9;hb=8bdc906013461464b475c4f10918adff8730dea6;hp=560865b15402de32449ef30c428ee3781289d030;hpb=3b11436b02cf1e6aa080f69d87438d4b079f96a6;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 560865b154..5a40663f9e 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -3,8 +3,9 @@
 require_once('include/socgraph.php');
 require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
+require_once('mod/contacts.php');
 
-function common_content(&$a) {
+function common_content(App $a) {
 
 	$o = '';
 
@@ -18,36 +19,43 @@ function common_content(&$a) {
 		return;
 	}
 
-	if($cmd !== 'loc' && $cmd != 'rem')
+	if ($cmd !== 'loc' && $cmd != 'rem') {
 		return;
+	}
 
-	if(! $uid)
+	if (! $uid) {
 		return;
+	}
 
-	if($cmd === 'loc' && $cid) {
+	if ($cmd === 'loc' && $cid) {
 		$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 			intval($cid),
 			intval($uid)
 		);
-	}
-	else {
+		/// @TODO Handle $c with dbm::is_result()
+		$a->page['aside'] = "";
+		profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
+	} else {
 		$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
 			intval($uid)
 		);
-	}
+		/// @TODO Handle $c with dbm::is_result()
 
-	$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
-		'$name' => htmlentities($c[0]['name']),
-		'$photo' => $c[0]['photo'],
-		'url' => z_root() . '/contacts/' . $cid
-	));
+		$vcard_widget .= replace_macros(get_markup_template("vcard-widget.tpl"),array(
+			'$name' => htmlentities($c[0]['name']),
+			'$photo' => $c[0]['photo'],
+			'url' => 'contacts/' . $cid
+		));
 
-	if(! x($a->page,'aside'))
-		$a->page['aside'] = '';
-	$a->page['aside'] .= $vcard_widget;
+		if (! x($a->page,'aside')) {
+			$a->page['aside'] = '';
+		}
+		$a->page['aside'] .= $vcard_widget;
+	}
 
-	if(! count($c))
+	if (! dbm::is_result($c)) {
 		return;
+	}
 
 	if(! $cid) {
 		if(get_my_url()) {
@@ -55,85 +63,92 @@ function common_content(&$a) {
 				dbesc(normalise_link(get_my_url())),
 				intval($profile_uid)
 			);
-			if(count($r))
+			if (dbm::is_result($r))
 				$cid = $r[0]['id'];
 			else {
 				$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
 					dbesc(normalise_link(get_my_url()))
 				);
-				if(count($r))
+				if (dbm::is_result($r))
 					$zcid = $r[0]['id'];
 			}
 		}
 	}
 
+	if ($cid == 0 && $zcid == 0) {
+		return;
+	}
 
+	if ($cid) {
+		$t = count_common_friends($uid, $cid);
+	} else {
+		$t = count_common_friends_zcid($uid, $zcid);
+	}
 
-	if($cid == 0 && $zcid == 0)
-		return; 
-
-
-	if($cid)
-		$t = count_common_friends($uid,$cid);
-	else
-		$t = count_common_friends_zcid($uid,$zcid);
-
-
-	$a->set_pager_total($t);
-
-	if(! $t) {
+	if (count($t)) {
+		$a->set_pager_total($t);
+	} else {
 		notice( t('No contacts in common.') . EOL);
 		return $o;
 	}
 
 
-	if($cid)
-		$r = common_friends($uid,$cid);
-	else
-		$r = common_friends_zcid($uid,$zcid);
+	if ($cid) {
+		$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
+	} else {
+		$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
+	}
 
 
-	if(! count($r)) {
+	if (! dbm::is_result($r)) {
 		return $o;
 	}
 
 	$id = 0;
 
-	foreach($r as $rr) {
+	foreach ($r as $rr) {
 
 		//get further details of the contact
 		$contact_details = get_contact_details_by_url($rr['url'], $uid);
 
-		// $rr[id] is needed to use contact_photo_menu()
-		$rr[id] = $rr[cid];
+		// $rr['id'] is needed to use contact_photo_menu()
+		/// @TODO Adding '/" here avoids E_NOTICE on missing constants
+		$rr['id'] = $rr['cid'];
 
 		$photo_menu = '';
-		$photo_menu = contact_photo_menu ($rr);
+		$photo_menu = contact_photo_menu($rr);
 
 		$entry = array(
-			'url'		=> $rr['url'],
-			'itemurl'	=> $rr['url'],
-			'name'		=> $rr['name'],
-			'thumb'		=> proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
-			'img_hover'	=> htmlentities($rr['name']),
-			'details'	=> $contact_details['location'],
-			'tags'		=> $contact_details['keywords'],
-			'about'		=> $contact_details['about'],
-			'account_type'	=> (($contact_details['community']) ? t('Forum') : ''),
-			'network'	=> network_to_name($contact_details['network'], $contact_details['url']),
-			'photo_menu'	=> $photo_menu,
-			'id'		=> ++$id,
+			'url'          => $rr['url'],
+			'itemurl'      => (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'name'         => $contact_details['name'],
+			'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+			'img_hover'    => htmlentities($contact_details['name']),
+			'details'      => $contact_details['location'],
+			'tags'         => $contact_details['keywords'],
+			'about'        => $contact_details['about'],
+			'account_type' => account_type($contact_details),
+			'network'      => network_to_name($contact_details['network'], $contact_details['url']),
+			'photo_menu'   => $photo_menu,
+			'id'           => ++$id,
 		);
 		$entries[] = $entry;
 	}
 
+	if ($cmd === 'loc' && $cid && $uid == local_user()) {
+		$tab_str = contacts_tab($a, $cid, 4);
+	} else {
+		$title = t('Common Friends');
+	}
+
 	$tpl = get_markup_template('viewcontact_template.tpl');
 
 	$o .= replace_macros($tpl,array(
-		'$title' => t('Common Friends'),
+		'$title'    => $title,
+		'$tab_str'  => $tab_str,
 		'$contacts' => $entries,
+		'$paginate' => paginate($a),
 	));
 
-//	$o .= paginate($a);
 	return $o;
 }