X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmatch.php;h=29d4e086a6b226a4e0139974ba0d91acc7fcfb16;hb=7789ea25079801ee1425368e9bf2f7ce80d16d88;hp=3b24c4097a482bc47d8643a200c64d0c12be2bfa;hpb=e6cd5a4d663c74213a572a5528c32f721b677c9e;p=friendica.git

diff --git a/mod/match.php b/mod/match.php
index 3b24c4097a..29d4e086a6 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Module\Contact as ModuleContact;
 
 /**
  * Controller for /match.
@@ -88,37 +88,14 @@ function match_content(App $a)
 			$profile = $msearch->results[$i];
 
 			// Already known contact
-			if (!$profile || Contact::getIdForURL($profile->url, local_user(), false)) {
+			if (!$profile || Contact::getIdForURL($profile->url, local_user())) {
 				continue;
 			}
 
-			// Workaround for wrong directory photo URL
-			$profile->photo = str_replace('http:///photo/', Search::getGlobalDirectory() . '/photo/', $profile->photo);
-
-			$connlnk = DI::baseUrl() . '/follow/?url=' . $profile->url;
-			$photo_menu = [
-				'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile->url)],
-				'follow' => [DI::l10n()->t("Connect/Follow"), $connlnk]
-			];
-
-			$contact_details = Contact::getByURL($profile->url, false);
-
-			$entry = [
-				'url'          => Contact::magicLink($profile->url),
-				'itemurl'      => $contact_details['addr'] ?? $profile->url,
-				'name'         => $profile->name,
-				'details'      => $contact_details['location'] ?? '',
-				'tags'         => $contact_details['keywords'] ?? '',
-				'about'        => $contact_details['about'] ?? '',
-				'account_type' => Contact::getAccountType($contact_details),
-				'thumb'        => ProxyUtils::proxifyUrl($profile->photo, false, ProxyUtils::SIZE_THUMB),
-				'conntxt'      => DI::l10n()->t('Connect'),
-				'connlnk'      => $connlnk,
-				'img_hover'    => $profile->tags,
-				'photo_menu'   => $photo_menu,
-				'id'           => $i,
-			];
-			$entries[] = $entry;
+			$contact = Contact::getByURLForUser($profile->url, local_user());
+			if (!empty($contact)) {
+				$entries[] = ModuleContact::getContactTemplateVars($contact);
+			}
 		}
 
 		$data = [