X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=063eafe67b90d3a1925f6571abb7325e9351c8e8;hb=13150c09a56de662677ee17a1614a2ee55931890;hp=617b5b670a17eddc1db76b356d3f9d71f6e54f1b;hpb=6342b3e0bdd5774857a8fca809994f05e0208d25;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 617b5b670a..063eafe67b 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,6 +1,9 @@
 <?php
 
 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) {
 
@@ -11,47 +14,53 @@ function common_content(&$a) {
 	$cid = intval($a->argv[3]);
 	$zcid = 0;
 
+	if (! local_user()) {
+		notice( t('Permission denied.') . EOL);
+		return;
+	}
+
 	if($cmd !== 'loc' && $cmd != 'rem')
 		return;
+
 	if(! $uid)
 		return;
 
-	if($cmd === 'loc' && $cid) {	
-		$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
+	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 {
-		$c = q("select name, url, photo from contact where self = 1 and uid = %d limit 1",
+		$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)
 		);
-	}	
 
-	$a->page['aside'] .= '<div class="vcard">' 
-		. '<div class="fn label">' . $c[0]['name'] . '</div>' 
-		. '<div id="profile-photo-wrapper">'
-		. '<img class="photo" width="175" height="175" 
-		src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
-		. '</div>';
-	
+		$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(! count($c))
 		return;
 
-	$o .= '<h2>' . t('Common Friends') . '</h2>';
-
-
 	if(! $cid) {
 		if(get_my_url()) {
-			$r = q("select id from contact where nurl = '%s' and uid = %d limit 1",
+			$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
 				dbesc(normalise_link(get_my_url())),
 				intval($profile_uid)
 			);
 			if(count($r))
 				$cid = $r[0]['id'];
 			else {
-				$r = q("select id from gcontact where nurl = '%s' limit 1",
+				$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
 					dbesc(normalise_link(get_my_url()))
 				);
 				if(count($r))
@@ -63,46 +72,75 @@ 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)) {
 		return $o;
 	}
 
-	$tpl = get_markup_template('common_friends.tpl');
+	$id = 0;
 
 	foreach($r as $rr) {
-			
-		$o .= replace_macros($tpl,array(
-			'$url' => $rr['url'],
-			'$name' => $rr['name'],
-			'$photo' => $rr['photo'],
-			'$tags' => ''
-		));
+
+		//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);
+
+		$entry = array(
+			'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;
 	}
 
-	$o .= cleardiv();
-//	$o .= paginate($a);
+	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' => $title,
+		'$tab_str' => $tab_str,
+		'$contacts' => $entries,
+		'$paginate' => paginate($a),
+	));
+
 	return $o;
 }