Merge pull request #4328 from tobiasd/20180125-msg

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index d8ad6aeaba9c64c3039c54c2e61033ad8aed4188..d7d9ad8a6e8a19bbc7438b5164404bdb1e5a6dda 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,21 +1,25 @@
 <?php
-
+/**
+ * @file mod/directory.php
+ */
 use Friendica\App;
+use Friendica\Content\Nav;
+use Friendica\Content\Widget;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Database\DBM;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
+use Friendica\Model\Profile;
 
 function directory_init(App $a) {
        $a->set_pager_itemspage(60);
 
        if(local_user()) {
-               require_once('include/contact_widgets.php');
-
-               $a->page['aside'] .= findpeople_widget();
+               $a->page['aside'] .= Widget::findPeople();
 
-               $a->page['aside'] .= follow_widget();
-       }
-       else {
+               $a->page['aside'] .= Widget::follow();
+       } else {
                unset($_SESSION['theme']);
                unset($_SESSION['mobile-theme']);
        }
@@ -31,12 +35,12 @@ function directory_content(App $a) {
 
        if((Config::get('system','block_public')) && (! local_user()) && (! remote_user()) ||
                (Config::get('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
+               notice(L10n::t('Public access denied.') . EOL);
                return;
        }
 
        $o = '';
-       nav_set_selected('directory');
+       Nav::setSelected('directory');
 
        if(x($a->data,'search'))
                $search = notags(trim($a->data['search']));
@@ -46,7 +50,7 @@ function directory_content(App $a) {
        $gdirpath = '';
        $dirurl = Config::get('system','directory');
        if(strlen($dirurl)) {
-               $gdirpath = zrl($dirurl,true);
+               $gdirpath = Profile::zrl($dirurl,true);
        }
 
        if($search) {
@@ -121,10 +125,10 @@ function directory_content(App $a) {
                        }
 //                     if(strlen($rr['dob'])) {
 //                             if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
-//                                     $details .= '<br />' . t('Age: ') . $years ;
+//                                     $details .= '<br />' . L10n::t('Age: ') . $years ;
 //                     }
 //                     if(strlen($rr['gender']))
-//                             $details .= '<br />' . t('Gender: ') . $rr['gender'];
+//                             $details .= '<br />' . L10n::t('Gender: ') . $rr['gender'];
 
                        $profile = $rr;
 
@@ -133,23 +137,23 @@ function directory_content(App $a) {
                                || (x($profile,'region') == 1)
                                || (x($profile,'postal-code') == 1)
                                || (x($profile,'country-name') == 1))
-                       $location = t('Location:');
+                       $location = L10n::t('Location:');
 
-                       $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
+                       $gender = ((x($profile,'gender') == 1) ? L10n::t('Gender:') : False);
 
-                       $marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+                       $marital = ((x($profile,'marital') == 1) ?  L10n::t('Status:') : False);
 
-                       $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+                       $homepage = ((x($profile,'homepage') == 1) ?  L10n::t('Homepage:') : False);
 
-                       $about = ((x($profile,'about') == 1) ?  t('About:') : False);
+                       $about = ((x($profile,'about') == 1) ?  L10n::t('About:') : False);
 
                        $location_e = $location;
 
-                       $photo_menu = array(
-                               'profile' => array(t("View Profile"), zrl($profile_link))
-                       );
+                       $photo_menu = [
+                               'profile' => [L10n::t("View Profile"), Profile::zrl($profile_link)]
+                       ];
 
-                       $entry = array(
+                       $entry = [
                                'id' => $rr['id'],
                                'url' => $profile_link,
                                'itemurl' => $itemurl,
@@ -168,40 +172,39 @@ function directory_content(App $a) {
                                'about' => $about,
                                'photo_menu' => $photo_menu,
 
-                       );
+                       ];
 
-                       $arr = array('contact' => $rr, 'entry' => $entry);
+                       $arr = ['contact' => $rr, 'entry' => $entry];
 
-                       call_hooks('directory_item', $arr);
+                       Addon::callHooks('directory_item', $arr);
 
                        unset($profile);
                        unset($location);
 
-                       if(! $arr['entry'])
+                       if (!$arr['entry']) {
                                continue;
+                       }
 
                        $entries[] = $arr['entry'];
-
                }
 
                $tpl = get_markup_template('directory_header.tpl');
 
-               $o .= replace_macros($tpl, array(
+               $o .= replace_macros($tpl, [
                        '$search' => $search,
-                       '$globaldir' => t('Global Directory'),
+                       '$globaldir' => L10n::t('Global Directory'),
                        '$gdirpath' => $gdirpath,
-                       '$desc' => t('Find on this site'),
+                       '$desc' => L10n::t('Find on this site'),
                        '$contacts' => $entries,
-                       '$finding' => t('Results for:'),
+                       '$finding' => L10n::t('Results for:'),
                        '$findterm' => (strlen($search) ? $search : ""),
-                       '$title' => t('Site Directory'),
-                       '$submit' => t('Find'),
+                       '$title' => L10n::t('Site Directory'),
+                       '$submit' => L10n::t('Find'),
                        '$paginate' => paginate($a),
-               ));
-
+               ]);
+       } else {
+               info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
        }
-       else
-               info( t("No entries \x28some entries may be hidden\x29.") . EOL);
 
        return $o;
 }