Public commenting is now always enabled

diff --git a/include/conversation.php b/include/conversation.php
index af4bb0559efd752efa252f0535a447d6765c5dea..442ce4b8bbb97f048bcfaa877274fc526fc8eefc 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -578,9 +578,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
                                . " var profile_page = 1; </script>";
                }
        } elseif ($mode === 'community') {
-               if (!$community_readonly) {
-                       $items = community_add_items($items);
-               }
+               $items = community_add_items($items);
                $profile_owner = 0;
                if (!$update) {
                        $live_update_div = '<div id="live-community"></div>' . "\r\n"
@@ -614,33 +612,23 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
        $page_template = get_markup_template("conversation.tpl");
 
        if ($items && count($items)) {
-               $community_readonly = ($mode === 'community');
-
-               // Currently behind a config value. This allows the commenting and sharing of every public item.
-               if (Config::get('system', 'comment_public')) {
-                       if ($mode === 'community') {
-                               $community_readonly = false;
-                               $writable = true;
-                       } else {
-                               $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
-                       }
+               if ($mode === 'community') {
+                       $writable = true;
                } else {
-                       $writable = false;
+                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [NETWORK_OSTATUS, NETWORK_DIASPORA, NETWORK_DFRN]);
                }
 
                if (!local_user()) {
                        $writable = false;
                }
 
-               if (in_array($mode, ['network-new', 'search', 'contact-posts']) || $community_readonly) {
+               if (in_array($mode, ['network-new', 'search', 'contact-posts'])) {
 
                        /*
                         * "New Item View" on network page or search page results
                         * - just loop through the items and format them minimally for display
                         */
 
-                       /// @TODO old lost code?
-                       // $tpl = get_markup_template('search_item.tpl');
                        $tpl = 'search_item.tpl';
 
                        foreach ($items as $item) {

diff --git a/mod/community.php b/mod/community.php
index 7598f96ec507db7a6451aaf6d60ae6124f8946f6..f1b747917ce6100ff1398e6deec73e0b6e89e6e4 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -114,24 +114,21 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       if (Config::get('system', 'comment_public')) {
-               // check if we serve a mobile device and get the user settings
-               // accordingly
-               if ($a->is_mobile) {
-                       $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20);
-               } else {
-                       $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40);
-               }
-
-               // now that we have the user settings, see if the theme forces
-               // a maximum item number which is lower then the user choice
-               if (($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) {
-                       $itemspage_network = $a->force_max_items;
-               }
+       // check if we serve a mobile device and get the user settings accordingly
+       if ($a->is_mobile) {
+               $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20);
+       } else {
+               $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40);
+       }
 
-               $a->set_pager_itemspage($itemspage_network);
+       // now that we have the user settings, see if the theme forces
+       // a maximum item number which is lower then the user choice
+       if (($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network)) {
+               $itemspage_network = $a->force_max_items;
        }
 
+       $a->set_pager_itemspage($itemspage_network);
+
        $r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content);
 
        if (!DBM::is_result($r)) {
@@ -198,12 +195,10 @@ function community_getitems($start, $itemspage, $content)
                );
                return dba::inArray($r);
        } elseif ($content == 'global') {
-               $r = dba::p("SELECT " . item_fieldlists() . " FROM `thread`
-                       INNER JOIN `item` ON `item`.`id` = `thread`.`iid` " . item_joins() .
-                               "WHERE `thread`.`uid` = 0 AND `verb` = ?
-                       ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage),
-                       ACTIVITY_POST
-               );
+               $r = dba::p("SELECT `uri` FROM `thread`
+                               INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+                               WHERE `thread`.`uid` = 0
+                               ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
                return dba::inArray($r);
        }
 

diff --git a/mod/network.php b/mod/network.php
index 1d64fcbde5ddb6cbf243ac099a28ae2f45f0fedd..a1100352cdb0ab4d9ad33663c2d79233af49191e 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -783,7 +783,7 @@ function networkThreadedView(App $a, $update = 0)
        }
 
        // Only show it when unfiltered (no groups, no networks, ...)
-       if (Config::get('system', 'comment_public') && in_array($nets, ['', NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
+       if (in_array($nets, ['', NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]) && (strlen($sql_extra . $sql_extra2 . $sql_extra3) == 0)) {
                if (DBM::is_result($r)) {
                        $top_limit = current($r)['order_date'];
                        $bottom_limit = end($r)['order_date'];