X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdirectory.php;h=6fd99256f0a80c06586c0f80b583ed150494526a;hb=61c3ce7a212156a06ee88285c3a76c823d761f1e;hp=7f18bd0268257890214b3fe5b741020e83823501;hpb=cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2;p=friendica.git
diff --git a/mod/directory.php b/mod/directory.php
old mode 100755
new mode 100644
index 7f18bd0268..6fd99256f0
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -9,8 +9,10 @@ function directory_init(&$a) {
$a->page['aside'] .= findpeople_widget();
}
- else
+ else {
unset($_SESSION['theme']);
+ unset($_SESSION['mobile-theme']);
+ }
}
@@ -24,8 +26,12 @@ function directory_post(&$a) {
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;
}
@@ -41,10 +47,10 @@ function directory_content(&$a) {
$tpl = get_markup_template('directory_header.tpl');
$globaldir = '';
- $gdirpath = dirname(get_config('system','directory_submit_url'));
+ $gdirpath = get_config('system','directory');
if(strlen($gdirpath)) {
$globaldir = '
';
+ . zrl($gdirpath,true) . '">' . t('Global Directory') . '';
}
$admin = '';
@@ -59,28 +65,40 @@ function directory_content(&$a) {
'$submit' => t('Find')
));
- if($search)
+ if($search) {
$search = dbesc($search);
- $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `pdesc`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`pub_keywords`,`prv_keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+
+ $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
+ (`user`.`nickname` LIKE '%$search%') OR
+ (`pdesc` LIKE '%$search%') OR
+ (`locality` LIKE '%$search%') OR
+ (`region` LIKE '%$search%') OR
+ (`country-name` LIKE '%$search%') OR
+ (`gender` LIKE '%$search%') OR
+ (`marital` LIKE '%$search%') OR
+ (`sexual` LIKE '%$search%') OR
+ (`about` LIKE '%$search%') OR
+ (`romance` LIKE '%$search%') OR
+ (`work` LIKE '%$search%') OR
+ (`education` LIKE '%$search%') OR
+ (`pub_keywords` LIKE '%$search%') OR
+ (`prv_keywords` LIKE '%$search%'))";
+ }
$publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
- $r = 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 ");
+ $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(count($r))
$a->set_pager_total($r[0]['total']);
- $order = " ORDER BY `name` ASC ";
+ $order = " ORDER BY `name` ASC ";
+ $limit = intval($a->pager['start']).",".intval($a->pager['itemspage']);
- $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 LIMIT %d , %d ",
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
- );
+ $r = $db->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 ".$limit);
if(count($r)) {
- $tpl = get_markup_template('directory_item.tpl');
-
if(in_array('small', $a->argv))
$photo = 'thumb';
else
@@ -90,7 +108,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 = '';
@@ -113,14 +131,58 @@ function directory_content(&$a) {
if(strlen($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]), false, PROXY_SIZE_THUMB),
+ '$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,
));
@@ -128,6 +190,9 @@ function directory_content(&$a) {
call_hooks('directory_item', $arr);
+ unset($profile);
+ unset($location);
+
$o .= $entry;
}