Changed "hidewall" behaviour

diff --git a/mod/community.php b/mod/community.php
index 5ffb00729fd8aa8a33aebc037174aea275795080..61cca730df07b00c8a3cef39568c439c1c4b694d 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -237,9 +237,9 @@ function community_getitems($start, $itemspage, $content, $accounttype)
                return DBA::toArray($r);
        } elseif ($content == 'global') {
                if (!is_null($accounttype)) {
-                       $condition = ["`uid` = ? AND `owner`.`contact-type` = ?", 0, $accounttype];
+                       $condition = ["`uid` = ? AND NOT `author`.`unsearchable` AND NOT `owner`.`unsearchable` AND `owner`.`contact-type` = ?", 0, $accounttype];
                } else {
-                       $condition = ['uid' => 0];
+                       $condition = ["`uid` = ? AND NOT `author`.`unsearchable` AND NOT `owner`.`unsearchable`", 0];
                }
 
                $r = Item::selectThreadForUser(0, ['uri'], $condition, ['order' => ['commented' => true], 'limit' => [$start, $itemspage]]);

diff --git a/mod/item.php b/mod/item.php
index 51bbc76e7270b54151ba3dbc567c0439864c4540..8bc394bcb9ef1aef42d5db73863a522c41e24216 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -284,10 +284,6 @@ function item_post(App $a) {
 
                $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0);
 
-               if ($user['hidewall']) {
-                       $private = 2;
-               }
-
                // If this is a comment, set the permissions from the parent.
 
                if ($toplevel_item) {

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 542ae95bca43ba5dee7d53afe146d7f96e960902..a5c14754ff90c656db5b755b6221a6c9efe2cf7b 100644 (file)
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -668,21 +668,21 @@ class Contact extends BaseObject
        public static function updateSelfFromUserID($uid, $update_avatar = false)
        {
                $fields = ['id', 'name', 'nick', 'location', 'about', 'keywords', 'gender', 'avatar',
-                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl',
+                       'xmpp', 'contact-type', 'forum', 'prv', 'avatar-date', 'url', 'nurl', 'unsearchable',
                        'photo', 'thumb', 'micro', 'addr', 'request', 'notify', 'poll', 'confirm', 'poco'];
                $self = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
                if (!DBA::isResult($self)) {
                        return;
                }
 
-               $fields = ['nickname', 'page-flags', 'account-type'];
+               $fields = ['nickname', 'page-flags', 'account-type', 'hidewall'];
                $user = DBA::selectFirst('user', $fields, ['uid' => $uid]);
                if (!DBA::isResult($user)) {
                        return;
                }
 
                $fields = ['name', 'photo', 'thumb', 'about', 'address', 'locality', 'region',
-                       'country-name', 'gender', 'pub_keywords', 'xmpp'];
+                       'country-name', 'gender', 'pub_keywords', 'xmpp', 'net-publish'];
                $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
                if (!DBA::isResult($profile)) {
                        return;
@@ -727,6 +727,7 @@ class Contact extends BaseObject
                $fields['avatar'] = System::baseUrl() . '/photo/profile/' .$uid . '.' . $file_suffix;
                $fields['forum'] = $user['page-flags'] == User::PAGE_FLAGS_COMMUNITY;
                $fields['prv'] = $user['page-flags'] == User::PAGE_FLAGS_PRVGROUP;
+               $fields['unsearchable'] = $user['hidewall'] || $profile['net-publish'];
 
                // it seems as if ported accounts can have wrong values, so we make sure that now everything is fine.
                $fields['url'] = System::baseUrl() . '/profile/' . $user['nickname'];