Merge pull request #6055 from zeroadam/FileTagHotFix

[friendica.git] / mod / dirfind.php

diff --git a/mod/dirfind.php b/mod/dirfind.php
index ea5aae669ac233c74968fbb0413440f4546e8134..2451beb18cd3f5fbe184bf7879425a2c1af43b8e 100644 (file)
--- a/mod/dirfind.php
+++ b/mod/dirfind.php
@@ -5,10 +5,12 @@
 
 use Friendica\App;
 use Friendica\Content\ContactSelector;
+use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -66,12 +68,13 @@ function dirfind_content(App $a, $prefix = "") {
        $o = '';
 
        if ($search) {
+               $pager = new Pager($a->query_string);
 
                if ($discover_user) {
                        $j = new stdClass();
                        $j->total = 1;
                        $j->items_page = 1;
-                       $j->page = $a->pager['page'];
+                       $j->page = $pager->getPage();
 
                        $objresult = new stdClass();
                        $objresult->cid = 0;
@@ -93,14 +96,13 @@ function dirfind_content(App $a, $prefix = "") {
                                Model\GContact::update($user_data);
                        }
                } elseif ($local) {
-
-                       if ($community)
+                       if ($community) {
                                $extra_sql = " AND `community`";
-                       else
+                       } else {
                                $extra_sql = "";
+                       }
 
-                       $perpage = 80;
-                       $startrec = (($a->pager['page']) * $perpage) - $perpage;
+                       $pager->setItemsPerPage(80);
 
                        if (Config::get('system','diaspora_enabled')) {
                                $diaspora = Protocol::DIASPORA;
@@ -137,11 +139,11 @@ function dirfind_content(App $a, $prefix = "") {
                                        DBA::escape(Protocol::DFRN), DBA::escape($ostatus), DBA::escape($diaspora),
                                        DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
                                        DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)), DBA::escape(escape_tags($search2)),
-                                       intval($startrec), intval($perpage));
+                                       $pager->getStart(), $pager->getItemsPerPage());
                        $j = new stdClass();
                        $j->total = $count[0]["total"];
-                       $j->items_page = $perpage;
-                       $j->page = $a->pager['page'];
+                       $j->items_page = $pager->getItemsPerPage();
+                       $j->page = $pager->getPage();
                        foreach ($results AS $result) {
                                if (PortableContact::alternateOStatusUrl($result["nurl"])) {
                                        continue;
@@ -177,22 +179,18 @@ function dirfind_content(App $a, $prefix = "") {
                        // Add found profiles from the global directory to the local directory
                        Worker::add(PRIORITY_LOW, 'DiscoverPoCo', "dirsearch", urlencode($search));
                } else {
+                       $p = (($pager->getPage() != 1) ? '&p=' . $pager->getPage() : '');
 
-                       $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : '');
-
-                       if(strlen(Config::get('system','directory')))
-                               $x = Network::fetchUrl(get_server().'/lsearch?f=' . $p .  '&search=' . urlencode($search));
+                       if (strlen(Config::get('system','directory'))) {
+                               $x = Network::fetchUrl(get_server() . '/lsearch?f=' . $p .  '&search=' . urlencode($search));
+                       }
 
                        $j = json_decode($x);
-               }
 
-               if ($j->total) {
-                       $a->setPagerTotal($j->total);
-                       $a->setPagerItemsPage($j->items_page);
+                       $pager->setItemsPerPage($j->items_page);
                }
 
                if (!empty($j->results)) {
-
                        $id = 0;
 
                        foreach ($j->results as $jj) {
@@ -226,7 +224,7 @@ function dirfind_content(App $a, $prefix = "") {
                                                $photo_menu = [];
                                        }
 
-                                       $photo_menu['profile'] = [L10n::t("View Profile"), Module\Contact::magicLink($jj->url)];
+                                       $photo_menu['profile'] = [L10n::t("View Profile"), Model\Contact::magicLink($jj->url)];
                                        $photo_menu['follow'] = [L10n::t("Connect/Follow"), $connlnk];
                                }
 
@@ -252,14 +250,12 @@ function dirfind_content(App $a, $prefix = "") {
                                $entries[] = $entry;
                        }
 
-               $tpl = get_markup_template('viewcontact_template.tpl');
-
-               $o .= replace_macros($tpl,[
-                       'title' => $header,
-                       '$contacts' => $entries,
-                       '$paginate' => paginate($a),
-               ]);
-
+                       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
+                       $o .= Renderer::replaceMacros($tpl,[
+                               'title' => $header,
+                               '$contacts' => $entries,
+                               '$paginate' => $pager->renderFull($j->total),
+                       ]);
                } else {
                        info(L10n::t('No matches') . EOL);
                }