Remove unused template variable in dfrn_req_confirm

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index ad1e00101ea3f3ec465a53e101aa0f3011f61b3e..0ec753466267a738fd626ba922abecafec02332b 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -2,18 +2,21 @@
 /**
  * @file mod/match.php
  */
+
 use Friendica\App;
+use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
 require_once 'include/text.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -35,13 +38,13 @@ function match_content(App $a)
        $a->page['aside'] .= Widget::findPeople();
        $a->page['aside'] .= Widget::follow();
 
-       $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
+       $_SESSION['return_path'] = $a->cmd;
 
        $r = q(
                "SELECT `pub_keywords`, `prv_keywords` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
                intval(local_user())
        );
-       if (! DBM::is_result($r)) {
+       if (! DBA::isResult($r)) {
                return;
        }
        if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
@@ -53,54 +56,53 @@ function match_content(App $a)
        $tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
 
        if ($tags) {
+               $pager = new Pager($a->query_string);
+
                $params['s'] = $tags;
-               if ($a->pager['page'] != 1) {
-                       $params['p'] = $a->pager['page'];
+               if ($pager->getPage() != 1) {
+                       $params['p'] = $pager->getPage();
                }
 
                if (strlen(Config::get('system', 'directory'))) {
-                       $x = Network::postURL(get_server().'/msearch', $params);
+                       $x = Network::post(get_server().'/msearch', $params)->getBody();
                } else {
-                       $x = Network::postURL(System::baseUrl() . '/msearch', $params);
+                       $x = Network::post(System::baseUrl() . '/msearch', $params)->getBody();
                }
 
                $j = json_decode($x);
 
-               if ($j->total) {
-                       $a->set_pager_total($j->total);
-                       $a->set_pager_itemspage($j->items_page);
-               }
-
                if (count($j->results)) {
+                       $pager->setItemsPerPage($j->items_page);
+
                        $id = 0;
 
                        foreach ($j->results as $jj) {
-                               $match_nurl = normalise_link($jj->url);
+                               $match_nurl = Strings::normaliseLink($jj->url);
                                $match = q(
                                        "SELECT `nurl` FROM `contact` WHERE `uid` = '%d' AND nurl='%s' LIMIT 1",
                                        intval(local_user()),
-                                       dbesc($match_nurl)
+                                       DBA::escape($match_nurl)
                                );
 
                                if (!count($match)) {
                                        $jj->photo = str_replace("http:///photo/", get_server()."/photo/", $jj->photo);
                                        $connlnk = System::baseUrl() . '/follow/?url=' . $jj->url;
                                        $photo_menu = [
-                                               'profile' => [L10n::t("View Profile"), Profile::zrl($jj->url)],
+                                               'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
                                                'follow' => [L10n::t("Connect/Follow"), $connlnk]
                                        ];
 
                                        $contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
                                        $entry = [
-                                               'url' => Profile::zrl($jj->url),
-                                               'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
+                                               'url' => Contact::magicLink($jj->url),
+                                               'itemurl' => defaults($contact_details, 'addr', $jj->url),
                                                'name' => $jj->name,
-                                               'details'       => $contact_details['location'],
-                                               'tags'          => $contact_details['keywords'],
-                                               'about'         => $contact_details['about'],
+                                               'details'       => defaults($contact_details, 'location', ''),
+                                               'tags'          => defaults($contact_details, 'keywords', ''),
+                                               'about'         => defaults($contact_details, 'about', ''),
                                                'account_type'  => Contact::getAccountType($contact_details),
-                                               'thumb' => proxy_url($jj->photo, false, PROXY_SIZE_THUMB),
+                                               'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
                                                'inttxt' => ' ' . L10n::t('is interested in:'),
                                                'conntxt' => L10n::t('Connect'),
                                                'connlnk' => $connlnk,
@@ -112,15 +114,13 @@ function match_content(App $a)
                                }
                        }
 
-                       $tpl = get_markup_template('viewcontact_template.tpl');
+                       $tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 
-                       $o .= replace_macros(
-                               $tpl,
-                               [
-                               '$title' => L10n::t('Profile Match'),
+                       $o .= Renderer::replaceMacros($tpl, [
+                               '$title'    => L10n::t('Profile Match'),
                                '$contacts' => $entries,
-                               '$paginate' => paginate($a)]
-                       );
+                               '$paginate' => $pager->renderFull($j->total)
+                       ]);
                } else {
                        info(L10n::t('No matches') . EOL);
                }