X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=08609222972e68dfcd832647f2709d2fbe619967;hb=a867e3a7524e067bdf5da515d85fa2581a6fe49c;hp=852388c1493125bdcc28fafcd6db6229322d0c14;hpb=00c342e13d833fd215e5dc03a508e1abe660fe21;p=friendica.git

diff --git a/mod/common.php b/mod/common.php
index 852388c149..0860922297 100644
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,61 +1,139 @@
 <?php
 
 require_once('include/socgraph.php');
+require_once('include/Contact.php');
+require_once('include/contact_selectors.php');
 
 function common_content(&$a) {
 
 	$o = '';
-	if(! local_user()) {
+
+	$cmd = $a->argv[1];
+	$uid = intval($a->argv[2]);
+	$cid = intval($a->argv[3]);
+	$zcid = 0;
+
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if($a->argc > 1)
-		$cid = intval($a->argv[1]);
-	if(! $cid)
+	if($cmd !== 'loc' && $cmd != 'rem')
+		return;
+
+	if(! $uid)
 		return;
 
-	$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
-		intval($cid),
-		intval(local_user())
-	);
+	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",
+			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
+	));
 
-	$a->page['aside'] .= '<div class="vcard">' 
-		. '<div class="fn label">' . $c[0]['name'] . '</div>' 
-		. '<div id="profile-photo-wrapper">'
-		. '<a href="/contacts/' . $cid . '"><img class="photo" width="175" height="175" 
-		src="' . $c[0]['photo'] . '" alt="' . $c[0]['name'] . '" /></div>'
-		. '</div>';
-	
+	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",
+				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",
+					dbesc(normalise_link(get_my_url()))
+				);
+				if(count($r))
+					$zcid = $r[0]['id'];
+			}
+		}
+	}
+
+
+
+	if($cid == 0 && $zcid == 0)
+		return;
+
 
-//	$o .= '<h3>' . sprintf( t('You and %s'),$c[0]['name']) . '</h3>';
+	if($cid)
+		$t = count_common_friends($uid,$cid);
+	else
+		$t = count_common_friends_zcid($uid,$zcid);
 
 
-	$r = common_friends(local_user(),$cid);
+	$a->set_pager_total($t);
+
+	if(! $t) {
+		notice( t('No contacts in common.') . EOL);
+		return $o;
+	}
+
+
+	if($cid)
+		$r = common_friends($uid,$cid);
+	else
+		$r = common_friends_zcid($uid,$zcid);
+
 
 	if(! count($r)) {
-		$o .= t('No friends in common.');
 		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'		=> $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,
+		);
+		$entries[] = $entry;
 	}
 
-	$o .= cleardiv();
+	$tpl = get_markup_template('viewcontact_template.tpl');
+
+	$o .= replace_macros($tpl,array(
+		'$title' => t('Common Friends'),
+		'$contacts' => $entries,
+	));
+
 //	$o .= paginate($a);
 	return $o;
 }