X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=eab337d07f058de9bbbd2a8852ea8c7d403757a8;hb=d6efc901946c91cf26a4436c4b58b1636e4bc9c9;hp=ae7cf73baa6f3305dd569a430651eba24d8ed447;hpb=6d7362da4134cce31f28a5efa2c623a11f89afc2;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index ae7cf73baa..eab337d07f 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -4,12 +4,10 @@
  */
 
 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\Core\Search;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -18,7 +16,7 @@ use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
 /**
- * @brief Controller for /match.
+ * Controller for /match.
  *
  * It takes keywords from your profile and queries the directory server for
  * matching keywords from other profiles.
@@ -47,7 +45,7 @@ function match_content(App $a)
 		return '';
 	}
 	if (!$profile['pub_keywords'] && (!$profile['prv_keywords'])) {
-		notice(L10n::t('No keywords to match. Please add keywords to your default profile.') . EOL);
+		notice(DI::l10n()->t('No keywords to match. Please add keywords to your default profile.') . EOL);
 		return '';
 	}
 
@@ -58,9 +56,9 @@ function match_content(App $a)
 	$params['n'] = 100;
 
 	if (strlen(Config::get('system', 'directory'))) {
-		$host = get_server();
+		$host = Search::getGlobalDirectory();
 	} else {
-		$host = System::baseUrl();
+		$host = DI::baseUrl();
 	}
 
 	$msearch_json = Network::post($host . '/msearch', $params)->getBody();
@@ -81,12 +79,12 @@ function match_content(App $a)
 			}
 
 			// Workaround for wrong directory photo URL
-			$profile->photo = str_replace('http:///photo/', get_server() . '/photo/', $profile->photo);
+			$profile->photo = str_replace('http:///photo/', Search::getGlobalDirectory() . '/photo/', $profile->photo);
 
-			$connlnk = System::baseUrl() . '/follow/?url=' . $profile->url;
+			$connlnk = DI::baseUrl() . '/follow/?url=' . $profile->url;
 			$photo_menu = [
-				'profile' => [L10n::t("View Profile"), Contact::magicLink($profile->url)],
-				'follow' => [L10n::t("Connect/Follow"), $connlnk]
+				'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile->url)],
+				'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk]
 			];
 
 			$contact_details = Contact::getDetailsByURL($profile->url, 0);
@@ -100,7 +98,7 @@ function match_content(App $a)
 				'about'        => $contact_details['about'] ?? '',
 				'account_type' => Contact::getAccountType($contact_details),
 				'thumb'        => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB),
-				'conntxt'      => L10n::t('Connect'),
+				'conntxt'      => DI::l10n()->t('Connect'),
 				'connlnk'      => $connlnk,
 				'img_hover'    => $profile->tags,
 				'photo_menu'   => $photo_menu,
@@ -113,12 +111,12 @@ function match_content(App $a)
 			'class' => 'pager',
 			'first' => [
 				'url'   => 'match',
-				'text'  => L10n::t('first'),
+				'text'  => DI::l10n()->t('first'),
 				'class' => 'previous' . ($start == 0 ? 'disabled' : '')
 			],
 			'next'  => [
 				'url'   => 'match?start=' . $i,
-				'text'  => L10n::t('next'),
+				'text'  => DI::l10n()->t('next'),
 				'class' =>  'next' . ($i >= $msearch->total ? ' disabled' : '')
 			]
 		];
@@ -128,12 +126,12 @@ function match_content(App $a)
 	}
 
 	if (empty($entries)) {
-		info(L10n::t('No matches') . EOL);
+		info(DI::l10n()->t('No matches') . EOL);
 	}
 
 	$tpl = Renderer::getMarkupTemplate('viewcontact_template.tpl');
 	$o = Renderer::replaceMacros($tpl, [
-		'$title'    => L10n::t('Profile Match'),
+		'$title'    => DI::l10n()->t('Profile Match'),
 		'$contacts' => $entries,
 		'$paginate' => $paginate
 	]);