notags calls

[friendica.git] / mod / directory.php

diff --git a/mod/directory.php b/mod/directory.php
index 202132e3667abeb7a86c4ae36153a8b4040eb1ab..122fd1aa558403e441c55dedaf7b122a201ab368 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -5,19 +5,20 @@
 
 use Friendica\App;
 use Friendica\Content\Nav;
+use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 function directory_init(App $a)
 {
-       $a->setPagerItemsPage(60);
-
        if (local_user()) {
                $a->page['aside'] .= Widget::findPeople();
                $a->page['aside'] .= Widget::follow();
@@ -47,9 +48,9 @@ function directory_content(App $a)
        Nav::setSelected('directory');
 
        if (x($a->data, 'search')) {
-               $search = notags(trim($a->data['search']));
+               $search = Strings::removeTags(trim($a->data['search']));
        } else {
-               $search = ((x($_GET, 'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
+               $search = ((x($_GET, 'search')) ? Strings::removeTags(trim(rawurldecode($_GET['search']))) : '');
        }
 
        $gdirpath = '';
@@ -83,16 +84,18 @@ function directory_content(App $a)
        $publish = (Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 " );
 
 
+       $total = 0;
        $cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
                                LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
                                WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` $sql_extra");
        if (DBA::isResult($cnt)) {
-               $a->setPagerTotal($cnt['total']);
+               $total = $cnt['total'];
        }
+       $pager = new Pager($a->query_string, 60);
 
        $order = " ORDER BY `name` ASC ";
 
-       $limit = intval($a->pager['start'])."," . intval($a->pager['itemspage']);
+       $limit = $pager->getStart()."," . $pager->getItemsPerPage();
 
        $r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
                        `contact`.`addr`, `contact`.`url` AS profile_url FROM `profile`
@@ -200,9 +203,9 @@ function directory_content(App $a)
                }
                DBA::close($r);
 
-               $tpl = get_markup_template('directory_header.tpl');
+               $tpl = Renderer::getMarkupTemplate('directory_header.tpl');
 
-               $o .= replace_macros($tpl, [
+               $o .= Renderer::replaceMacros($tpl, [
                        '$search'    => $search,
                        '$globaldir' => L10n::t('Global Directory'),
                        '$gdirpath'  => $gdirpath,
@@ -212,7 +215,7 @@ function directory_content(App $a)
                        '$findterm'  => (strlen($search) ? $search : ""),
                        '$title'     => L10n::t('Site Directory'),
                        '$submit'    => L10n::t('Find'),
-                       '$paginate'  => paginate($a),
+                       '$paginate'  => $pager->renderFull($total),
                ]);
        } else {
                info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);