Renamed functions

[friendica.git] / mod / match.php

diff --git a/mod/match.php b/mod/match.php
index f01768c70aea8606b755aacc6a4742de18e64e02..caa4c944cae6a660e0398098dc33836a1b16af22 100644 (file)
--- a/mod/match.php
+++ b/mod/match.php
@@ -2,6 +2,7 @@
 /**
  * @file mod/match.php
  */
+
 use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
@@ -9,11 +10,10 @@ use Friendica\Core\L10n;
 use Friendica\Core\System;
 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.
@@ -41,7 +41,7 @@ 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 (! DBA::is_result($r)) {
+       if (! DBA::isResult($r)) {
                return;
        }
        if (! $r[0]['pub_keywords'] && (! $r[0]['prv_keywords'])) {
@@ -79,7 +79,7 @@ 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)) {
@@ -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,