X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=caa4c944cae6a660e0398098dc33836a1b16af22;hb=8841519c0dfae069aff6bee6325fa868e4b9b641;hp=563ce5bedcbcb3aaac8190b6edf553cf7f5bd8ee;hpb=e437c74d0e4e4ece4693a2e32513c3ecde7efb4d;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 563ce5bedc..caa4c944ca 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -2,15 +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\Util\Network;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/text.php';
-require_once 'include/contact_widgets.php';
-require_once 'mod/proxy.php';
 
 /**
  * @brief Controller for /match.
@@ -29,8 +32,8 @@ function match_content(App $a)
 		return;
 	}
 
-	$a->page['aside'] .= findpeople_widget();
-	$a->page['aside'] .= follow_widget();
+	$a->page['aside'] .= Widget::findPeople();
+	$a->page['aside'] .= Widget::follow();
 
 	$_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
 
@@ -38,15 +41,15 @@ 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;
 	}
 
-	$params = array();
+	$params = [];
 	$tags = trim($r[0]['pub_keywords'] . ' ' . $r[0]['prv_keywords']);
 
 	if ($tags) {
@@ -56,9 +59,9 @@ 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);
 		} else {
-			$x = post_url(System::baseUrl() . '/msearch', $params);
+			$x = Network::post(System::baseUrl() . '/msearch', $params);
 		}
 
 		$j = json_decode($x);
@@ -76,35 +79,35 @@ 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 = array(
-						'profile' => array(t("View Profile"), zrl($jj->url)),
-						'follow' => array(t("Connect/Follow"), $connlnk)
-					);
+					$photo_menu = [
+						'profile' => [L10n::t("View Profile"), Contact::magicLink($jj->url)],
+						'follow' => [L10n::t("Connect/Follow"), $connlnk]
+					];
 
 					$contact_details = Contact::getDetailsByURL($jj->url, local_user());
 
-					$entry = array(
-						'url' => zrl($jj->url),
-						'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $jj->url),
+					$entry = [
+						'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,
 						'id' => ++$id,
-					);
+					];
 					$entries[] = $entry;
 				}
 			}
@@ -113,13 +116,13 @@ function match_content(App $a)
 
 			$o .= replace_macros(
 				$tpl,
-				array(
-				'$title' => t('Profile Match'),
+				[
+				'$title' => L10n::t('Profile Match'),
 				'$contacts' => $entries,
-				'$paginate' => paginate($a))
+				'$paginate' => paginate($a)]
 			);
 		} else {
-			info(t('No matches') . EOL);
+			info(L10n::t('No matches') . EOL);
 		}
 	}