X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fallfriends.php;h=03f78e696e2c4946a112dc2aeecd694472e049e8;hb=789e1f4275bb216183f93cc392bd6faebfe87fb9;hp=8843265a99ed9a92a2637252b0911e69eabc2e58;hpb=db949bb802448184bfe5164d8d3dd86ddf51b187;p=friendica.git

diff --git a/mod/allfriends.php b/mod/allfriends.php
index 8843265a99..03f78e696e 100644
--- a/mod/allfriends.php
+++ b/mod/allfriends.php
@@ -5,7 +5,6 @@ require_once('include/Contact.php');
 require_once('include/contact_selectors.php');
 require_once('mod/contacts.php');
 
-if(! function_exists('allfriends_content')) {
 function allfriends_content(&$a) {
 
 	$o = '';
@@ -50,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,20 +61,22 @@ function allfriends_content(&$a) {
 		}
 		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);
+			$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($rr['name']),
-			'thumb'		=> proxy_url($rr['photo'], false, PROXY_SIZE_THUMB),
-			'img_hover'	=> htmlentities($rr['name']),
+			'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'),
@@ -98,4 +99,3 @@ function allfriends_content(&$a) {
 
 	return $o;
 }
-}