Remove network exception in handle_tag

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 8a0c66faf07e464d4e52b60c70142e238f84f898..7e805d5baf4c4d9272e462f5c62a7a365bfd8549 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -2,16 +2,18 @@
 /**
  * @file mod/match.php
  */
+
 use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 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;
 
 require_once 'include/text.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -39,11 +41,11 @@ function match_content(App $a)
                "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'])) {
-               notice(t('No keywords to match. Please add keywords to your default profile.') . EOL);
+               notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL);
                return;
        }
 
@@ -57,16 +59,16 @@ function match_content(App $a)
                }
 
                if (strlen(Config::get('system', 'directory'))) {
-                       $x = post_url(get_server().'/msearch', $params);
+                       $x = Network::post(get_server().'/msearch', $params)->getBody();
                } else {
-                       $x = post_url(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);
+                       $a->setPagerTotal($j->total);
+                       $a->setPagerItemsPage($j->items_page);
                }
 
                if (count($j->results)) {
@@ -77,30 +79,30 @@ function match_content(App $a)
                                $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' => [t("View Profile"), Profile::zrl($jj->url)],
-                                               'follow' => [t("Connect/Follow"), $connlnk]
+                                               '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),
-                                               'inttxt' => ' ' . t('is interested in:'),
-                                               'conntxt' => t('Connect'),
+                                               'thumb' => ProxyUtils::proxifyUrl($jj->photo, false, ProxyUtils::SIZE_THUMB),
+                                               'inttxt' => ' ' . L10n::t('is interested in:'),
+                                               'conntxt' => L10n::t('Connect'),
                                                'connlnk' => $connlnk,
                                                'img_hover' => $jj->tags,
                                                'photo_menu' => $photo_menu,
@@ -115,12 +117,12 @@ function match_content(App $a)
                        $o .= replace_macros(
                                $tpl,
                                [
-                               '$title' => t('Profile Match'),
+                               '$title' => L10n::t('Profile Match'),
                                '$contacts' => $entries,
                                '$paginate' => paginate($a)]
                        );
                } else {
-                       info(t('No matches') . EOL);
+                       info(L10n::t('No matches') . EOL);
                }
        }