subscriptions_option: show \\Noselect folders greyed out (#5621)

CHANGELOG

@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- subscriptions_option: show \\Noselect folders greyed out (#5621)
 - Add option to not indent quoted text on top-posting reply (#5105)
 - Removed global $CONFIG variable
 - Password: Automatic virtualmin domain setting, removed password_virtualmin_format option (#5759)

plugins/subscriptions_option/composer.json

@@ -3,7 +3,7 @@
     "type": "roundcube-plugin",
     "description": "A plugin which can enable or disable the use of imap subscriptions. It includes a toggle on the settings page under \"Server Settings\". The preference can also be locked.",
     "license": "GPLv3+",
-    "version": "1.3",
+    "version": "1.4",
     "authors": [
         {
             "name": "Thomas Bruederli",

plugins/subscriptions_option/subscriptions_option.php

@@ -28,7 +28,6 @@ class subscriptions_option extends rcube_plugin
 
     function init()
     {
-        $this->add_texts('localization/', false);
         $dont_override = rcmail::get_instance()->config->get('dont_override', array());
         if (!in_array('use_subscriptions', $dont_override)) {
             $this->add_hook('preferences_list', array($this, 'settings_blocks'));
@@ -41,7 +40,8 @@ class subscriptions_option extends rcube_plugin
     function settings_blocks($args)
     {
         if ($args['section'] == 'server') {
-            $use_subscriptions = rcmail::get_instance()->config->get('use_subscriptions');
+            $this->add_texts('localization/', false);
+            $use_subscriptions = rcmail::get_instance()->config->get('use_subscriptions', true);
             $field_id = 'rcmfd_use_subscriptions';
             $checkbox = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
 
@@ -58,7 +58,7 @@ class subscriptions_option extends rcube_plugin
     {
         if ($args['section'] == 'server') {
             $rcmail = rcmail::get_instance();
-            $use_subscriptions = $rcmail->config->get('use_subscriptions');
+            $use_subscriptions = $rcmail->config->get('use_subscriptions', true);
 
             $args['prefs']['use_subscriptions'] = isset($_POST['_use_subscriptions']);
 
@@ -69,26 +69,38 @@ class subscriptions_option extends rcube_plugin
                     $storage->clear_cache('mailboxes');
             }
         }
+
         return $args;
     }
 
     function mailboxes_list($args)
     {
         $rcmail = rcmail::get_instance();
+
         if (!$rcmail->config->get('use_subscriptions', true)) {
-            $args['folders'] = $rcmail->get_storage()->list_folders_direct();
+            $storage = $rcmail->get_storage();
+            $folders = $storage->list_folders_direct();
+            $folders = array_filter($folders, function($folder) use ($storage) {
+                $attrs = $storage->folder_attributes($folder);
+                return !in_array_nocase('\\Noselect', $attrs);
+            });
+
+            $args['folders'] = $folders;
         }
+
         return $args;
     }
 
     function folders_list($args)
     {
         $rcmail = rcmail::get_instance();
+
         if (!$rcmail->config->get('use_subscriptions', true)) {
             foreach ($args['list'] as $idx => $data) {
                 $args['list'][$idx]['content'] = preg_replace('/<input [^>]+>/', '', $data['content']);
             }
         }
+
         return $args;
     }
 }