X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fdirectory.php;h=7fab53b6807cadd363da70227b1f3c3a6679e5aa;hb=677f46c076ced8377a2ddf0df0a704b6ab389ed6;hp=825e2a375f7e59509f54507e0e3c5e552b2350a3;hpb=a0d2747d527221fc517e5d277035d6e5b07ebf93;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
index 825e2a375f..7fab53b680 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -2,6 +2,19 @@
function directory_init(&$a) {
$a->set_pager_itemspage(60);
+
+ if(local_user()) {
+ require_once('include/contact_widgets.php');
+
+ $a->page['aside'] .= findpeople_widget();
+
+ }
+ else {
+ unset($_SESSION['theme']);
+ unset($_SESSION['mobile-theme']);
+ }
+
+
}
@@ -13,29 +26,41 @@ function directory_post(&$a) {
function directory_content(&$a) {
+
+ require_once("mod/proxy.php");
+
+ if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ notice( t('Public access denied.') . EOL);
+ return;
+ }
+
$o = '';
- $o .= '';
- if(x($_SESSION,'theme'))
- unset($_SESSION['theme']);
+ nav_set_selected('directory');
if(x($a->data,'search'))
$search = notags(trim($a->data['search']));
else
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
- $tpl = load_view_file('view/directory_header.tpl');
+ $tpl = get_markup_template('directory_header.tpl');
$globaldir = '';
$gdirpath = dirname(get_config('system','directory_submit_url'));
if(strlen($gdirpath)) {
$globaldir = '
';
+ . zrl($gdirpath,true) . '">' . t('Global Directory') . '';
}
+ $admin = '';
+
$o .= replace_macros($tpl, array(
'$search' => $search,
'$globaldir' => $globaldir,
- '$finding' => (strlen($search) ? '' . t('Finding: ') . "'" . $search . "'" . '
' : "")
+ '$desc' => t('Find on this site'),
+ '$admin' => $admin,
+ '$finding' => (strlen($search) ? '' . t('Finding: ') . "'" . $search . "'" . '
' : ""),
+ '$sitedir' => t('Site Directory'),
+ '$submit' => t('Find')
));
if($search)
@@ -49,16 +74,15 @@ function directory_content(&$a) {
if(count($r))
$a->set_pager_total($r[0]['total']);
+ $order = " ORDER BY `name` ASC ";
- $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ",
+ $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
if(count($r)) {
- $tpl = load_view_file('view/directory_item.tpl');
-
if(in_array('small', $a->argv))
$photo = 'thumb';
else
@@ -68,7 +92,7 @@ function directory_content(&$a) {
$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
-
+
$pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '
' : '');
$details = '';
@@ -86,19 +110,63 @@ function directory_content(&$a) {
}
if(strlen($rr['dob'])) {
if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
- $details .= "
Age: $years" ;
+ $details .= '
' . t('Age: ') . $years ;
}
if(strlen($rr['gender']))
- $details .= '
Gender: ' . $rr['gender'];
+ $details .= '
' . t('Gender: ') . $rr['gender'];
+
+ if($rr['page-flags'] == PAGE_NORMAL)
+ $page_type = "Personal Profile";
+ if($rr['page-flags'] == PAGE_SOAPBOX)
+ $page_type = "Fan Page";
+ if($rr['page-flags'] == PAGE_COMMUNITY)
+ $page_type = "Community Forum";
+ if($rr['page-flags'] == PAGE_FREELOVE)
+ $page_type = "Open Forum";
+ if($rr['page-flags'] == PAGE_PRVGROUP)
+ $page_type = "Private Group";
+
+ $profile = $rr;
+
+ if((x($profile,'address') == 1)
+ || (x($profile,'locality') == 1)
+ || (x($profile,'region') == 1)
+ || (x($profile,'postal-code') == 1)
+ || (x($profile,'country-name') == 1))
+ $location = t('Location:');
+
+ $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+
+ $marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
+
+ $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
+
+ $about = ((x($profile,'about') == 1) ? t('About:') : False);
+
+ $tpl = get_markup_template('directory_item.tpl');
+
+ if($a->theme['template_engine'] === 'internal') {
+ $location_e = template_escape($location);
+ }
+ else {
+ $location_e = $location;
+ }
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
- '$profile-link' => $profile_link,
- '$photo' => $rr[$photo],
- '$alt-text' => $rr['name'],
+ '$profile_link' => $profile_link,
+ '$photo' => proxy_url($a->get_cached_avatar_image($rr[$photo])),
+ '$alt_text' => $rr['name'],
'$name' => $rr['name'],
- '$details' => $pdesc . $details
-
+ '$details' => $pdesc . $details,
+ '$page_type' => $page_type,
+ '$profile' => $profile,
+ '$location' => $location_e,
+ '$gender' => $gender,
+ '$pdesc' => $pdesc,
+ '$marital' => $marital,
+ '$homepage' => $homepage,
+ '$about' => $about,
));
@@ -106,6 +174,9 @@ function directory_content(&$a) {
call_hooks('directory_item', $arr);
+ unset($profile);
+ unset($location);
+
$o .= $entry;
}
@@ -115,7 +186,7 @@ function directory_content(&$a) {
}
else
- notice("No entries (some entries may be hidden).");
+ info( t("No entries \x28some entries may be hidden\x29.") . EOL);
return $o;
-}
\ No newline at end of file
+}