X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDirectory.php;h=deb090e4872bbbe551182bf27297aa009b958141;hb=c62762297cf2a06bad998a2b950b96102cb6e682;hp=a81780a28014f5b89af0ec3f5cb423e1d42c1a7d;hpb=3bae52074a644b0ade3808bed9fc1268e1baa4e3;p=friendica.git

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index a81780a280..deb090e487 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -26,8 +26,8 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 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;
 use Friendica\Model\Profile;
@@ -38,17 +38,17 @@ use Friendica\Network\HTTPException;
  */
 class Directory extends BaseModule
 {
-	public function content(): string
+	protected function content(array $request = []): string
 	{
 		$app = DI::app();
 		$config = DI::config();
 
-		if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
-			($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
+		if (($config->get('system', 'block_public') && !DI::userSession()->isAuthenticated()) ||
+			($config->get('system', 'block_local_dir') && !DI::userSession()->isAuthenticated())) {
 			throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
 		}
 
-		if (local_user()) {
+		if (DI::userSession()->getLocalUserId()) {
 			DI::page()['aside'] .= Widget::findPeople();
 			DI::page()['aside'] .= Widget::follow();
 		}
@@ -61,7 +61,7 @@ class Directory extends BaseModule
 		$search = trim(rawurldecode($_REQUEST['search'] ?? ''));
 
 		$gDirPath = '';
-		$dirURL = $config->get('system', 'directory');
+		$dirURL = Search::getGlobalDirectory();
 		if (strlen($dirURL)) {
 			$gDirPath = Profile::zrl($dirURL, true);
 		}
@@ -71,10 +71,10 @@ class Directory extends BaseModule
 		$profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 
 		if ($profiles['total'] === 0) {
-			notice(DI::l10n()->t('No entries (some entries may be hidden).'));
+			DI::sysmsg()->addNotice(DI::l10n()->t('No entries (some entries may be hidden).'));
 		} else {
 			foreach ($profiles['entries'] as $entry) {
-				$contact = Model\Contact::getByURLForUser($entry['url'], local_user());
+				$contact = Model\Contact::getByURLForUser($entry['url'], DI::userSession()->getLocalUserId());
 				if (!empty($contact)) {
 					$entries[] = Contact::getContactTemplateVars($contact);
 				}
@@ -111,7 +111,7 @@ class Directory extends BaseModule
 	 *
 	 * @throws \Exception
 	 */
-	public static function formatEntry(array $contact, $photo_size = 'photo')
+	public static function formatEntry(array $contact, string $photo_size = 'photo'): array
 	{
 		$itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['url']);
 
@@ -165,7 +165,7 @@ class Directory extends BaseModule
 			'img_hover'    => $contact['name'],
 			'name'         => $contact['name'],
 			'details'      => $details,
-			'account_type' => Model\Contact::getAccountType($contact),
+			'account_type' => Model\Contact::getAccountType($contact['contact-type'] ?? 0),
 			'profile'      => $profile,
 			'location'     => $location_e,
 			'tags'         => $contact['pub_keywords'],