default value for firstDay in events page

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 833a4f81cc0da7deb5c68b27c6997de2907b506d..6fd99256f0a80c06586c0f80b583ed150494526a 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -26,8 +26,12 @@ function directory_post(&$a) {
 
 
 function directory_content(&$a) {
+       global $db;
 
-       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+       require_once("mod/proxy.php");
+
+       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;
        }
@@ -43,7 +47,7 @@ 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 = '<ul><li><div id="global-directory-link"><a href="'
                . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
@@ -61,24 +65,38 @@ 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` , `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'])
-       );
+       $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)) {
 
                if(in_array('small', $a->argv))
@@ -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'] . '<br />' : '');
 
                        $details = '';
@@ -140,19 +158,26 @@ function directory_content(&$a) {
                        $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' => $a->get_cached_avatar_image($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,
-                               '$page-type' => $page_type,
+                               '$page_type' => $page_type,
                                '$profile' => $profile,
-                               '$location' => template_escape($location),
+                               '$location' => $location_e,
                                '$gender'   => $gender,
                                '$pdesc'        => $pdesc,
                                '$marital'  => $marital,
@@ -164,7 +189,7 @@ function directory_content(&$a) {
                        $arr = array('contact' => $rr, 'entry' => $entry);
 
                        call_hooks('directory_item', $arr);
-                       
+
                        unset($profile);
                        unset($location);