X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=06aeec622fffb5d0af21d163b12edeb8f6c6bae3;hb=71f9e500141f6c8787a4a648b4aa57448da2097f;hp=7ce1530efc5aa36e879d565346f4428f7c87f634;hpb=4d21671f75e35e7c2880467dddc0936e8c718d8c;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
index 7ce1530efc..06aeec622f 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,5 +1,5 @@
set_pager_itemspage(60);
@@ -16,23 +16,23 @@ function directory_init(&$a) {
unset($_SESSION['mobile-theme']);
}
-}
+
}
-if(! function_exists('directory_post')) {
+
function directory_post(&$a) {
if(x($_POST,'search'))
$a->data['search'] = $_POST['search'];
}
-}
-if(! function_exists('directory_content')) {
+
+
function directory_content(&$a) {
global $db;
require_once("mod/proxy.php");
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
+ if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) ||
(get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
@@ -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'] . '
' : '');
@@ -123,18 +122,11 @@ function directory_content(&$a) {
}
// if(strlen($rr['dob'])) {
// if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-// $details .= '
' . t('Age: ') . $years ;
+// $details .= '
' . t('Age: ') . $years ;
// }
// if(strlen($rr['gender']))
// $details .= '
' . 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,17 +151,19 @@ 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'],
'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'),
@@ -217,4 +211,3 @@ function directory_content(&$a) {
return $o;
}
-}