X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=e4f067eaf7d4cd1b0aef62fcf800895eee17c41d;hb=f3529e7dbcad8af388764938230b1e864359fa83;hp=8396efdd2d4eb185f2d7ef807edd2750c60ed64b;hpb=3b11436b02cf1e6aa080f69d87438d4b079f96a6;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 8396efdd2d..e4f067eaf7 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.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 allfriends_content(&$a) {
 
@@ -25,23 +26,20 @@ function allfriends_content(&$a) {
 		intval(local_user())
 	);
 
-	$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;
 
+	$a->page['aside'] = "";
+	profile_load($a, "", 0, get_contact_details_by_url($c[0]["url"]));
 
-	$r = all_friends(local_user(),$cid);
+	$total = count_all_friends(local_user(), $cid);
 
-	if(! count($r)) {
+	if(count($total))
+		$a->set_pager_total($total);
+
+	$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;
 	}
@@ -51,7 +49,7 @@ function allfriends_content(&$a) {
 	foreach($r as $rr) {
 
 		//get further details of the contact
-		$contact_details = get_contact_details_by_url($rr['url'], $uid);
+		$contact_details = get_contact_details_by_url($rr['url'], $uid, $rr);
 
 		$photo_menu = '';
 
@@ -62,21 +60,23 @@ function allfriends_content(&$a) {
 			$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);
+			$connlnk = App::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'	=> $rr['url'],
-			'name'		=> htmlentities($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'		=> 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'	=> (($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,
 			'conntxt'	=> t('Connect'),
@@ -86,13 +86,16 @@ function allfriends_content(&$a) {
 		$entries[] = $entry;
 	}
 
+	$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'])),
+		//'$title' => sprintf( t('Friends of %s'), htmlentities($c[0]['name'])),
+		'$tab_str' => $tab_str,
 		'$contacts' => $entries,
+		'$paginate' => paginate($a),
 	));
 
-//	$o .= paginate($a);
 	return $o;
 }