Merge pull request #317 from CatoTH/master

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 0c60f04bf4be14cb8ff4a2b29363047813405924..367438845427d420f9139fd64ee817044ca88404 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -2,6 +2,17 @@
 
 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']);
+
+
 }
 
 
@@ -14,17 +25,13 @@ function directory_post(&$a) {
 
 function directory_content(&$a) {
 
-       $everything = (($a->argc > 1 && $a->argv[1] === 'all' && is_site_admin()) ? true : false);
-
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
                return;
        }
 
        $o = '';
-       $o .= '<script> $(document).ready(function() { $(\'#nav-directory-link\').addClass(\'nav-selected\'); });</script>';
-       if(x($_SESSION,'theme'))
-               unset($_SESSION['theme']);
+       nav_set_selected('directory');
 
        if(x($a->data,'search'))
                $search = notags(trim($a->data['search']));
@@ -37,20 +44,15 @@ function directory_content(&$a) {
        $gdirpath = dirname(get_config('system','directory_submit_url'));
        if(strlen($gdirpath)) {
                $globaldir = '<ul><li><div id="global-directory-link"><a href="'
-               . $gdirpath . '">' . t('Global Directory') . '</a></div></li></ul>';
+               . zrl($gdirpath,true) . '">' . t('Global Directory') . '</a></div></li></ul>';
        }
 
        $admin = '';
-       if(is_site_admin()) {
-               if($everything)
-                       $admin =  '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory' . '">' . t('Normal site view') . '</a></div></li></ul>';
-               else
-                       $admin = '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory/all' . '">' . t('View all site entries') . '</a></div></li></ul>';
-       }
 
        $o .= replace_macros($tpl, array(
                '$search' => $search,
                '$globaldir' => $globaldir,
+               '$desc' => t('Find on this site'),
                '$admin' => $admin,
                '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
                '$sitedir' => t('Site Directory'),
@@ -61,17 +63,14 @@ function directory_content(&$a) {
                $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) " : "");
 
-       $publish = ((get_config('system','publish_all') || $everything) ? '' : " AND `publish` = 1 " );
+       $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 ");
        if(count($r))
                $a->set_pager_total($r[0]['total']);
 
-       if($everything)
-               $order = " ORDER BY `register_date` DESC ";
-       else
-               $order = " ORDER BY `name` ASC "; 
+       $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 LIMIT %d , %d ",