Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
old mode 100644 (file)
new mode 100755 (executable)
index dfe8ec0..9621889
--- 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']);
+
+
 }
 
 
@@ -15,6 +26,8 @@ function directory_post(&$a) {
 function directory_content(&$a) {
 
        $everything = (($a->argc > 1 && $a->argv[1] === 'all' && is_site_admin()) ? true : false);
+       if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
+               $everything = false;
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
                notice( t('Public access denied.') . EOL);
@@ -22,9 +35,7 @@ function directory_content(&$a) {
        }
 
        $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']));
@@ -45,12 +56,13 @@ function directory_content(&$a) {
                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>';
+                       $admin = '<ul><li><div id="directory-admin-link"><a href="' . $a->get_baseurl() . '/directory/all' . '">' . t('Admin - 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'),
@@ -138,7 +150,7 @@ function directory_content(&$a) {
 
        }
        else
-               notice( t("No entries \x28some entries may be hidden\x29.") . EOL);
+               info( t("No entries \x28some entries may be hidden\x29.") . EOL);
 
        return $o;
-}
\ No newline at end of file
+}