X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=06aeec622fffb5d0af21d163b12edeb8f6c6bae3;hb=71f9e500141f6c8787a4a648b4aa57448da2097f;hp=484858f34d8bb5d5822852e28fc6a3b3218752da;hpb=3c55214f28d84412563e90267e74d80e237d4ac6;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 484858f34d..06aeec622f 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -99,12 +99,11 @@ function directory_content(&$a) {
 
 		foreach($r as $rr) {
 
-			$community = '';
 			$itemurl= '';
 
 			$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
 
-			$profile_link = z_root() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
+			$profile_link = 'profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 
 			$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
@@ -128,13 +127,6 @@ function directory_content(&$a) {
 //			if(strlen($rr['gender']))
 //				$details .= '<br />' . t('Gender: ') . $rr['gender'];
 
-
-			// show if account is a community account
-			// ToDo the other should be also respected, but first we need a good translatiion
-			// and systemwide consistency for displaying the page type
-			if((intval($rr['page-flags']) == PAGE_COMMUNITY) OR (intval($rr['page-flags']) == PAGE_PRVGROUP))
-				$community = true;
-
 			$profile = $rr;
 
 			if((x($profile,'address') == 1)
@@ -158,18 +150,20 @@ function directory_content(&$a) {
 			else {
 				$location_e = $location;
 			}
-			
-			$photo_menu = array(array(t("View Profile"), zrl($profile_link)));
+
+			$photo_menu = array(
+				'profile' => array(t("View Profile"), zrl($profile_link))
+			);
 
 			$entry = array(
 				'id' => $rr['id'],
 				'url' => $profile_link,
 				'itemurl' => $itemurl,
-				'thumb' => proxy_url($a->get_cached_avatar_image($rr[$photo]), false, PROXY_SIZE_THUMB),
+				'thumb' => proxy_url($rr[$photo], false, PROXY_SIZE_THUMB),
 				'img_hover' => $rr['name'],
 				'name' => $rr['name'],
 				'details' => $details,
-				'account_type' => ($community ? t('Forum') : ''),
+				'account_type' => account_type($rr),
 				'profile' => $profile,
 				'location' => $location_e,
 				'tags' => $rr['pub_keywords'],
@@ -204,7 +198,7 @@ function directory_content(&$a) {
 			'$gdirpath' => $gdirpath,
 			'$desc' => t('Find on this site'),
 			'$contacts' => $entries,
-			'$finding' => t('Finding:'),
+			'$finding' => t('Results for:'),
 			'$findterm' => (strlen($search) ? $search : ""),
 			'$title' => t('Site Directory'),
 			'$submit' => t('Find'),