Merge pull request #3965 from tobiasd/20171126-docGettingStarted

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index cb0b1f4cd115d18af37ba4bbd55faf796d02132c..4ce919b08bd40ae46ff8e5dd7143ab0fc70f706b 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -1,6 +1,9 @@
 <?php
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Object\Contact;
 
 function directory_init(App $a) {
        $a->set_pager_itemspage(60);
@@ -24,12 +27,10 @@ function directory_post(App $a) {
 }
 
 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;
        }
@@ -43,7 +44,7 @@ function directory_content(App $a) {
                $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
 
        $gdirpath = '';
-       $dirurl = get_config('system','directory');
+       $dirurl = Config::get('system','directory');
        if(strlen($dirurl)) {
                $gdirpath = zrl($dirurl,true);
        }
@@ -68,25 +69,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';
@@ -161,7 +162,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'],