Merge pull request #8208 from nupplaphil/bug/8205-notifcations_clear

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

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 69588604db9b3f021463777626775ad6f8d274eb..8335fb0cd46c1e49365661b8ea3b0d1874741c59 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -7,8 +7,9 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
+use Friendica\Core\Session;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
@@ -20,34 +21,19 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseModule
 {
-       public static function init()
+       public static function content(array $parameters = [])
        {
-               $app = self::getApp();
+               $app = DI::app();
+               $config = DI::config();
 
-               if (local_user()) {
-                       $app->page['aside'] .= Widget::findPeople();
-                       $app->page['aside'] .= Widget::follow();
-               } else {
-                       unset($_SESSION['theme']);
-                       unset($_SESSION['mobile-theme']);
-               }
-       }
-
-       public static function post()
-       {
-               if (!empty($_POST['search'])) {
-                       self::getApp()->data['search'] = $_POST['search'];
+               if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
+                       ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
+                       throw new HTTPException\ForbiddenException(DI::l10n()->t('Public access denied.'));
                }
-       }
 
-       public static function content()
-       {
-               $app = self::getApp();
-               $config = $app->getConfig();
-
-               if (($config->get('system', 'block_public') && !local_user() && !remote_user()) ||
-                       ($config->get('system', 'block_local_dir') && !local_user() && !remote_user())) {
-                       throw new HTTPException\ForbiddenException();
+               if (local_user()) {
+                       DI::page()['aside'] .= Widget::findPeople();
+                       DI::page()['aside'] .= Widget::follow();
                }
 
                $output = '';
@@ -65,12 +51,12 @@ class Directory extends BaseModule
                        $gDirPath = Profile::zrl($dirURL, true);
                }
 
-               $pager = new Pager($app->query_string, 60);
+               $pager = new Pager(DI::args()->getQueryString(), 60);
 
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
 
                if ($profiles['total'] === 0) {
-                       info(L10n::t('No entries (some entries may be hidden).') . EOL);
+                       info(DI::l10n()->t('No entries (some entries may be hidden).') . EOL);
                } else {
                        if (in_array('small', $app->argv)) {
                                $photo = 'thumb';
@@ -87,15 +73,15 @@ class Directory extends BaseModule
 
                $output .= Renderer::replaceMacros($tpl, [
                        '$search'     => $search,
-                       '$globaldir'  => L10n::t('Global Directory'),
+                       '$globaldir'  => DI::l10n()->t('Global Directory'),
                        '$gDirPath'   => $gDirPath,
-                       '$desc'       => L10n::t('Find on this site'),
-                       '$contacts'   => $profiles['entries'],
-                       '$finding'    => L10n::t('Results for:'),
+                       '$desc'       => DI::l10n()->t('Find on this site'),
+                       '$contacts'   => $entries,
+                       '$finding'    => DI::l10n()->t('Results for:'),
                        '$findterm'   => (strlen($search) ? $search : ""),
-                       '$title'      => L10n::t('Site Directory'),
+                       '$title'      => DI::l10n()->t('Site Directory'),
                        '$search_mod' => 'directory',
-                       '$submit'     => L10n::t('Find'),
+                       '$submit'     => DI::l10n()->t('Find'),
                        '$paginate'   => $pager->renderFull($profiles['total']),
                ]);
 
@@ -146,25 +132,22 @@ class Directory extends BaseModule
                        || !empty($profile['postal-code'])
                        || !empty($profile['country-name'])
                ) {
-                       $location = L10n::t('Location:');
+                       $location = DI::l10n()->t('Location:');
                } else {
                        $location = '';
                }
 
-               $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false);
-               $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false);
-               $homepage = (!empty($profile['homepage']) ? L10n::t('Homepage:') : false);
-               $about = (!empty($profile['about']) ? L10n::t('About:') : false);
+               $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
 
                $location_e = $location;
 
                $photo_menu = [
-                       'profile' => [L10n::t("View Profile"), Contact::magicLink($profile_link)]
+                       'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile_link)]
                ];
 
                $entry = [
                        'id'           => $contact['id'],
-                       'url'          => Contact::magicLInk($profile_link),
+                       'url'          => Contact::magicLink($profile_link),
                        'itemurl'      => $itemurl,
                        'thumb'        => ProxyUtils::proxifyUrl($contact[$photo_size], false, ProxyUtils::SIZE_THUMB),
                        'img_hover'    => $contact['name'],
@@ -174,11 +157,8 @@ class Directory extends BaseModule
                        'profile'      => $profile,
                        'location'     => $location_e,
                        'tags'         => $contact['pub_keywords'],
-                       'gender'       => $gender,
                        'pdesc'        => $pdesc,
-                       'marital'      => $marital,
                        'homepage'     => $homepage,
-                       'about'        => $about,
                        'photo_menu'   => $photo_menu,
 
                ];