Merge pull request #8044 from annando/contact-adding

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

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 4674a9f8575548fd7f73ad3aa4a9b43e287de146..41f27502875207eab78f8326ac7b452ca02f072f 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -8,7 +8,9 @@ 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,22 +22,19 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseModule
 {
-       public static function content()
+       public static function content(array $parameters = [])
        {
-               $app = self::getApp();
-               $config = $app->getConfig();
+               $app = DI::app();
+               $config = DI::config();
 
-               if (($config->get('system', 'block_public') && !local_user() && !remote_user()) ||
-                       ($config->get('system', 'block_local_dir') && !local_user() && !remote_user())) {
+               if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
+                       ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
                        throw new HTTPException\ForbiddenException(L10n::t('Public access denied.'));
                }
 
                if (local_user()) {
-                       $app->page['aside'] .= Widget::findPeople();
-                       $app->page['aside'] .= Widget::follow();
-               } else {
-                       unset($_SESSION['theme']);
-                       unset($_SESSION['mobile-theme']);
+                       DI::page()['aside'] .= Widget::findPeople();
+                       DI::page()['aside'] .= Widget::follow();
                }
 
                $output = '';
@@ -53,7 +52,7 @@ 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);