X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDirectory.php;h=1cdd971e8ac21c8753c0b158112b16635473b46d;hb=3940e804e3ee4ac921e109f62a73fac2becaa611;hp=cdf43b8f953432528a02d154a1ac0fb3c8f2ac0c;hpb=e17db489eee549f47c39c9b5494063476ed4aeb0;p=friendica.git diff --git a/src/Module/Directory.php b/src/Module/Directory.php index cdf43b8f95..1cdd971e8a 100644 --- 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; @@ -20,29 +21,21 @@ use Friendica\Util\Strings; */ class Directory extends BaseModule { - public static function init() - { - $app = self::getApp(); - - if (local_user()) { - $app->page['aside'] .= Widget::findPeople(); - $app->page['aside'] .= Widget::follow(); - } else { - unset($_SESSION['theme']); - unset($_SESSION['mobile-theme']); - } - } - 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())) { + 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(); + } + $output = ''; $entries = []; @@ -83,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'), @@ -157,7 +150,7 @@ class Directory extends BaseModule $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'],