X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=50a0a93b9ce454e50ec8b604ce5e205e172527ff;hb=db2d0e009503539b134fd43837d440028d5b8de7;hp=531283936c61f567e8a5f9e172c5c5b042c436da;hpb=3e701b90ac1b2341833f6847c97c68a7f770afaa;p=friendica.git

diff --git a/mod/directory.php b/mod/directory.php
index 531283936c..50a0a93b9c 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -78,7 +78,7 @@ function directory_content(&$a) {
 	$r = $db->q("SELECT COUNT(*) AS `total` FROM `profile`
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ");
-	if(dba::is_result($r))
+	if (dbm::is_result($r))
 		$a->set_pager_total($r[0]['total']);
 
 	$order = " ORDER BY `name` ASC ";
@@ -90,16 +90,17 @@ function directory_content(&$a) {
 			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
 			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
 			WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
-	if(dba::is_result($r)) {
+	if (dbm::is_result($r)) {
 
-		if(in_array('small', $a->argv))
+		if (in_array('small', $a->argv)) {
 			$photo = 'thumb';
-		else
+		}
+		else {
 			$photo = 'photo';
+		}
 
-		foreach($r as $rr) {
+		foreach ($r as $rr) {
 
-			$community = '';
 			$itemurl= '';
 
 			$itemurl = (($rr['addr'] != "") ? $rr['addr'] : $rr['profile_url']);
@@ -128,13 +129,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 page types 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)
@@ -159,7 +153,9 @@ function directory_content(&$a) {
 				$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'],
@@ -169,7 +165,7 @@ function directory_content(&$a) {
 				'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 +200,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'),