X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=063eafe67b90d3a1925f6571abb7325e9351c8e8;hb=724f9c80e79783957d75d011a0393f6d6bb1949e;hp=60a4a450b212f66336956905ac833b83a1a8c62e;hpb=e785759a8bd90c4d0e2bb5866e2ad014f45ddb2a;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 60a4a450b2..063eafe67b 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -3,6 +3,7 @@
 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) {
 
@@ -29,22 +30,23 @@ function common_content(&$a) {
 			intval($cid),
 			intval($uid)
 		);
-	}
-	else {
+		$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)
 		);
-	}
 
-	$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))
 		return;
@@ -70,27 +72,26 @@ function common_content(&$a) {
 
 
 	if($cid == 0 && $zcid == 0)
-		return; 
+		return;
 
 
 	if($cid)
-		$t = count_common_friends($uid,$cid);
+		$t = count_common_friends($uid, $cid);
 	else
-		$t = count_common_friends_zcid($uid,$zcid);
-
-
-	$a->set_pager_total($t);
+		$t = count_common_friends_zcid($uid, $zcid);
 
-	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);
+		$r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']);
 	else
-		$r = common_friends_zcid($uid,$zcid);
+		$r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
 
 
 	if(! count($r)) {
@@ -101,25 +102,25 @@ function common_content(&$a) {
 
 	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];
 
 		$photo_menu = '';
-		$photo_menu = contact_photo_menu ($rr);
-
-		//get further details of the contact
-		$contact_details = get_contact_details_by_url($rr['url'], $uid);
+		$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']),
+			'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'	=> (($contact_details['community']) ? t('Forum') : ''),
+			'account_type'	=> account_type($contact_details),
 			'network'	=> network_to_name($contact_details['network'], $contact_details['url']),
 			'photo_menu'	=> $photo_menu,
 			'id'		=> ++$id,
@@ -127,13 +128,19 @@ function common_content(&$a) {
 		$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;
 }