Merge remote-tracking branch 'upstream/develop' into api4

[friendica.git] / src / Module / Directory.php

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 93d14cc176d705a895cedaac17cecf9bddef3fc5..a81780a28014f5b89af0ec3f5cb423e1d42c1a7d 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.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
  *
@@ -32,14 +32,13 @@ use Friendica\DI;
 use Friendica\Model;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
-use Friendica\Util\Strings;
 
 /**
  * Shows the local directory of this node
  */
 class Directory extends BaseModule
 {
-       public static function content(array $parameters = [])
+       public function content(): string
        {
                $app = DI::app();
                $config = DI::config();
@@ -59,9 +58,7 @@ 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');
@@ -76,12 +73,6 @@ 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) {
                                $contact = Model\Contact::getByURLForUser($entry['url'], local_user());
                                if (!empty($contact)) {