X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=1be9550b10be2f16944a1884edf68b19ec71faf9;hb=89c5989cfb679449fb776df7380e972d0f676d8d;hp=f675b8e29ca1b4080a8f583e821ba6ac34954be1;hpb=355c42cb309eb1313097411067ca999b699aa620;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index f675b8e29c..1be9550b10 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -1,6 +1,8 @@
 <?php
 
 require_once('include/socgraph.php');
+require_once('include/Contact.php');
+require_once('include/contact_selectors.php');
 
 function allfriends_content(&$a) {
 
@@ -12,27 +14,30 @@ function allfriends_content(&$a) {
 
 	if($a->argc > 1)
 		$cid = intval($a->argv[1]);
+
 	if(! $cid)
 		return;
 
-	$c = q("select name, url, photo from contact where id = %d and uid = %d limit 1",
+	$uid = $a->user[uid];
+
+	$c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
 		intval($cid),
 		intval(local_user())
 	);
 
-	$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>';
-	
+	$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
+	));
+
+	if(! x($a->page,'aside'))
+		$a->page['aside'] = '';
+	$a->page['aside'] .= $vcard_widget;
 
 	if(! count($c))
 		return;
 
-	$o .= '<h2>' . sprintf( t('Friends of %s'), $c[0]['name']) . '</h2>';
-
 
 	$r = all_friends(local_user(),$cid);
 
@@ -41,19 +46,53 @@ function allfriends_content(&$a) {
 		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);
+
+		$photo_menu = '';
+
+		// $rr[cid] is only available for common contacts. So if the contact is a common one, use contact_photo_menu to generate the photo_menu
+		// If the contact is not common to the user, Connect/Follow' will be added to the photo menu
+		if ($rr[cid]) {
+			$rr[id] = $rr[cid];
+			$photo_menu = contact_photo_menu ($rr);
+		}
+		else {
+			$connlnk = $a->get_baseurl() . '/follow/?url=' . $rr['url'];
+			$photo_menu = array(array(t("View Profile"), zrl($rr['url'])));
+			$photo_menu[] = array(t("Connect/Follow"), $connlnk);
+		}
+
+		$entry = array(
+			'url'		=> $rr['url'],
+			'itemurl'	=> (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'name'		=> htmlentities($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,
+			'conntxt'	=> t('Connect'),
+			'connlnk'	=> $connlnk,
+			'id'		=> ++$id,
+		);
+		$entries[] = $entry;
 	}
 
-	$o .= cleardiv();
+	$tpl = get_markup_template('viewcontact_template.tpl');
+
+	$o .= replace_macros($tpl,array(
+		'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+		'$contacts' => $entries,
+	));
+
 //	$o .= paginate($a);
 	return $o;
 }