Group selection: Respect "pubmail" and ignore atchived or blocked contacts

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

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 69588604db9b3f021463777626775ad6f8d274eb..f24c0665074d4f4f942c9aad427edd76e0ad45a9 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;
@@ -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();
+               $config = $app->getConfig();
+
+               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']);
-               }
-       }
-
-       public static function post()
-       {
-               if (!empty($_POST['search'])) {
-                       self::getApp()->data['search'] = $_POST['search'];
-               }
-       }
-
-       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();
                }
 
                $output = '';
@@ -90,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'),
@@ -151,10 +137,10 @@ class Directory extends BaseModule
                        $location = '';
                }
 
-               $gender = (!empty($profile['gender']) ? L10n::t('Gender:') : false);
-               $marital = (!empty($profile['marital']) ? L10n::t('Status:') : false);
+               $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);
+               $about =    (!empty($profile['about'])    ? L10n::t('About:')    : false);
 
                $location_e = $location;
 
@@ -164,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'],