X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=240aa524be308ea605076fcb250a9da693a7dd42;hb=378cbd90270516be1701adc5bfe64008ef0c17d9;hp=f675b8e29ca1b4080a8f583e821ba6ac34954be1;hpb=43d5876e8b35d53a0bef5248c5d63e5bc209dbbf;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index f675b8e29c..240aa524be 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.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 allfriends_content(&$a) {
 
@@ -12,48 +15,87 @@ 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>';
-	
-
 	if(! count($c))
 		return;
 
-	$o .= '<h2>' . sprintf( t('Friends of %s'), $c[0]['name']) . '</h2>';
+	$a->page['aside'] = "";
+	profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
 
+	$total = count_all_friends(local_user(), $cid);
 
-	$r = all_friends(local_user(),$cid);
+	if(count($total))
+		$a->set_pager_total($total);
 
-	if(! count($r)) {
+	$r = all_friends(local_user(), $cid, $a->pager['start'], $a->pager['itemspage']);
+
+	if(! dbm::is_result($r)) {
 		$o .= t('No friends to display.');
 		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);
+
+		$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(
+				'profile' => array(t("View Profile"), zrl($rr['url'])),
+				'follow' => array(t("Connect/Follow"), $connlnk)
+			);
+		}
+
+		$entry = array(
+			'url'		=> $rr['url'],
+			'itemurl'	=> (($contact_details['addr'] != "") ? $contact_details['addr'] : $rr['url']),
+			'name'		=> htmlentities($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,
+			'conntxt'	=> t('Connect'),
+			'connlnk'	=> $connlnk,
+			'id'		=> ++$id,
+		);
+		$entries[] = $entry;
 	}
 
-	$o .= cleardiv();
-//	$o .= paginate($a);
+	$tab_str = contacts_tab($a, $cid, 3);
+
+	$tpl = get_markup_template('viewcontact_template.tpl');
+
+	$o .= replace_macros($tpl,array(
+		//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+		'$tab_str' => $tab_str,
+		'$contacts' => $entries,
+		'$paginate' => paginate($a),
+	));
+
 	return $o;
 }