X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDirectory.php;h=b79e7b1495a3c89ac99b60f2e26a6b4938499ed3;hb=036b565a7846916f763ce1dcbcaade0844ff1589;hp=507da6b94292ef97e22da1735462ff2cd3789d6c;hpb=e6cd5a4d663c74213a572a5528c32f721b677c9e;p=friendica.git

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 507da6b942..b79e7b1495 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -28,19 +28,18 @@ use Friendica\Content\Widget;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\DI;
-use Friendica\Model\Contact;
+use Friendica\Model;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
-use Friendica\Util\Proxy as ProxyUtils;
-use Friendica\Util\Strings;
 
 /**
  * Shows the local directory of this node
  */
 class Directory extends BaseModule
 {
-	public static function content(array $parameters = [])
+	protected function content(array $request = []): string
 	{
 		$app = DI::app();
 		$config = DI::config();
@@ -60,12 +59,10 @@ class Directory extends BaseModule
 
 		Nav::setSelected('directory');
 
-		$search = (!empty($_REQUEST['search']) ?
-			Strings::escapeTags(trim(rawurldecode($_REQUEST['search']))) :
-			'');
+		$search = trim(rawurldecode($_REQUEST['search'] ?? ''));
 
 		$gDirPath = '';
-		$dirURL = $config->get('system', 'directory');
+		$dirURL = Search::getGlobalDirectory();
 		if (strlen($dirURL)) {
 			$gDirPath = Profile::zrl($dirURL, true);
 		}
@@ -77,14 +74,11 @@ class Directory extends BaseModule
 		if ($profiles['total'] === 0) {
 			notice(DI::l10n()->t('No entries (some entries may be hidden).'));
 		} else {
-			if (in_array('small', $app->argv)) {
-				$photo = 'thumb';
-			} else {
-				$photo = 'photo';
-			}
-
 			foreach ($profiles['entries'] as $entry) {
-				$entries[] = self::formatEntry($entry, $photo);
+				$contact = Model\Contact::getByURLForUser($entry['url'], local_user());
+				if (!empty($contact)) {
+					$entries[] = Contact::getContactTemplateVars($contact);
+				}
 			}
 		}
 
@@ -161,18 +155,18 @@ class Directory extends BaseModule
 		$location_e = $location;
 
 		$photo_menu = [
-			'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile_link)]
+			'profile' => [DI::l10n()->t("View Profile"), Model\Contact::magicLink($profile_link)]
 		];
 
 		$entry = [
 			'id'           => $contact['id'],
-			'url'          => Contact::magicLink($profile_link),
+			'url'          => Model\Contact::magicLink($profile_link),
 			'itemurl'      => $itemurl,
-			'thumb'        => ProxyUtils::proxifyUrl($contact[$photo_size], false, ProxyUtils::SIZE_THUMB),
+			'thumb'        => Model\Contact::getThumb($contact),
 			'img_hover'    => $contact['name'],
 			'name'         => $contact['name'],
 			'details'      => $details,
-			'account_type' => Contact::getAccountType($contact),
+			'account_type' => Model\Contact::getAccountType($contact['contact-type']),
 			'profile'      => $profile,
 			'location'     => $location_e,
 			'tags'         => $contact['pub_keywords'],