]> git.mxchange.org Git - friendica.git/blobdiff - mod/directory.php
Use short form array syntax everywhere
[friendica.git] / mod / directory.php
index e49e718a5e5e43aecd33b958966e05d6bd102630..59a3195b1b54d087fa7c35084b7e6b5fb3e03776 100644 (file)
@@ -1,39 +1,37 @@
 <?php
+/**
+ * @file mod/directory.php
+ */
+use Friendica\App;
+use Friendica\Content\Widget;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+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');
+       if(local_user()) {
+               $a->page['aside'] .= Widget::findPeople();
 
-               $a->page['aside'] .= findpeople_widget();
-
-               $a->page['aside'] .= follow_widget();
-
-       }
-       else {
+               $a->page['aside'] .= Widget::follow();
+       } else {
                unset($_SESSION['theme']);
                unset($_SESSION['mobile-theme']);
        }
-
-
 }
 
-
 function directory_post(App $a) {
-       if (x($_POST,'search'))
+       if(x($_POST,'search'))
                $a->data['search'] = $_POST['search'];
 }
 
-
-
 function directory_content(App $a) {
-       global $db;
-
        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())) {
+       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);
                return;
        }
@@ -41,18 +39,18 @@ function directory_content(App $a) {
        $o = '';
        nav_set_selected('directory');
 
-       if (x($a->data,'search'))
+       if(x($a->data,'search'))
                $search = notags(trim($a->data['search']));
        else
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
        $gdirpath = '';
-       $dirurl = get_config('system','directory');
-       if (strlen($dirurl)) {
-               $gdirpath = zrl($dirurl,true);
+       $dirurl = Config::get('system','directory');
+       if(strlen($dirurl)) {
+               $gdirpath = Profile::zrl($dirurl,true);
        }
 
-       if ($search) {
+       if($search) {
                $search = dbesc($search);
 
                $sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
@@ -72,25 +70,25 @@ function directory_content(App $a) {
                                (`profile`.`prv_keywords` LIKE '%$search%'))";
        }
 
-       $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " );
+       $publish = ((Config::get('system','publish_all')) ? '' : " AND `publish` = 1 " );
 
 
-       $r = $db->q("SELECT COUNT(*) AS `total` FROM `profile`
+       $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 (dbm::is_result($r))
+       if (DBM::is_result($r))
                $a->set_pager_total($r[0]['total']);
 
        $order = " ORDER BY `name` ASC ";
 
        $limit = 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`,
+       $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
                        `contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
                        LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                        LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-                       WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
-       if (dbm::is_result($r)) {
+                       WHERE `is-default` $publish AND `user`.`blocked` = 0 AND `contact`.`self` $sql_extra $order LIMIT ".$limit);
+       if (DBM::is_result($r)) {
 
                if (in_array('small', $a->argv)) {
                        $photo = 'thumb';
@@ -110,28 +108,28 @@ function directory_content(App $a) {
                        $pdesc = (($rr['pdesc']) ? $rr['pdesc'] . '<br />' : '');
 
                        $details = '';
-                       if (strlen($rr['locality']))
+                       if(strlen($rr['locality']))
                                $details .= $rr['locality'];
-                       if (strlen($rr['region'])) {
-                               if (strlen($rr['locality']))
+                       if(strlen($rr['region'])) {
+                               if(strlen($rr['locality']))
                                        $details .= ', ';
                                $details .= $rr['region'];
                        }
-                       if (strlen($rr['country-name'])) {
-                               if (strlen($details))
+                       if(strlen($rr['country-name'])) {
+                               if(strlen($details))
                                        $details .= ', ';
                                $details .= $rr['country-name'];
                        }
-//                     if (strlen($rr['dob'])) {
-//                             if (($years = age($rr['dob'],$rr['timezone'],'')) != 0)
+//                     if(strlen($rr['dob'])) {
+//                             if(($years = age($rr['dob'],$rr['timezone'],'')) != 0)
 //                                     $details .= '<br />' . t('Age: ') . $years ;
 //                     }
-//                     if (strlen($rr['gender']))
+//                     if(strlen($rr['gender']))
 //                             $details .= '<br />' . t('Gender: ') . $rr['gender'];
 
                        $profile = $rr;
 
-                       if ((x($profile,'address') == 1)
+                       if((x($profile,'address') == 1)
                                || (x($profile,'locality') == 1)
                                || (x($profile,'region') == 1)
                                || (x($profile,'postal-code') == 1)
@@ -146,18 +144,13 @@ function directory_content(App $a) {
 
                        $about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
-                       if ($a->theme['template_engine'] === 'internal') {
-                               $location_e = template_escape($location);
-                       }
-                       else {
-                               $location_e = $location;
-                       }
+                       $location_e = $location;
 
-                       $photo_menu = array(
-                               'profile' => array(t("View Profile"), zrl($profile_link))
-                       );
+                       $photo_menu = [
+                               'profile' => [t("View Profile"), Profile::zrl($profile_link)]
+                       ];
 
-                       $entry = array(
+                       $entry = [
                                'id' => $rr['id'],
                                'url' => $profile_link,
                                'itemurl' => $itemurl,
@@ -165,7 +158,7 @@ function directory_content(App $a) {
                                'img_hover' => $rr['name'],
                                'name' => $rr['name'],
                                'details' => $details,
-                               'account_type' => account_type($rr),
+                               'account_type' => Contact::getAccountType($rr),
                                'profile' => $profile,
                                'location' => $location_e,
                                'tags' => $rr['pub_keywords'],
@@ -176,18 +169,17 @@ 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);
 
                        unset($profile);
                        unset($location);
 
-                       if (! $arr['entry']) {
+                       if(! $arr['entry'])
                                continue;
-                       }
 
                        $entries[] = $arr['entry'];
 
@@ -195,7 +187,7 @@ function directory_content(App $a) {
 
                $tpl = get_markup_template('directory_header.tpl');
 
-               $o .= replace_macros($tpl, array(
+               $o .= replace_macros($tpl, [
                        '$search' => $search,
                        '$globaldir' => t('Global Directory'),
                        '$gdirpath' => $gdirpath,
@@ -206,7 +198,7 @@ function directory_content(App $a) {
                        '$title' => t('Site Directory'),
                        '$submit' => t('Find'),
                        '$paginate' => paginate($a),
-               ));
+               ]);
 
        }
        else