Remove uneeded variable.

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

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 667f08616fb4d0e41878be96b55643eb624dc0aa..1cdd971e8ac21c8753c0b158112b16635473b46d 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -8,6 +8,7 @@ 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\Model\Contact;
 use Friendica\Model\Profile;
@@ -25,17 +26,14 @@ class Directory extends BaseModule
                $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())) {
+               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']);
                }
 
                $output = '';
@@ -78,7 +76,7 @@ class Directory extends BaseModule
                        '$globaldir'  => L10n::t('Global Directory'),
                        '$gDirPath'   => $gDirPath,
                        '$desc'       => L10n::t('Find on this site'),
-                       '$contacts'   => $profiles['entries'],
+                       '$contacts'   => $entries,
                        '$finding'    => L10n::t('Results for:'),
                        '$findterm'   => (strlen($search) ? $search : ""),
                        '$title'      => L10n::t('Site Directory'),