Merge pull request #5862 from nupplaphil/rename_App_Methods

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index 75e7403d74815b36e462ea8c207cc829ded53096..bb1e4542aed0004eab693cdba92b3c10e4475291 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -11,9 +11,9 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/text.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -67,8 +67,8 @@ function match_content(App $a)
                $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)) {
@@ -94,13 +94,13 @@ function match_content(App $a)
 
                                        $entry = [
                                                'url' => Contact::magicLink($jj->url),
-                                               'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $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,