Ticket #1485171: imap_subscriptions_preference.patch

config/main.inc.php.dist

@@ -139 +139 @@
 // only list folders within this path
 $rcmail_config['imap_root'] = '';
 
+// only list subscribed folders
+$rcmail_config['use_subscriptions'] = TRUE;
+
 // store draft message is this mailbox
 // leave blank if draft messages should not be stored
 $rcmail_config['drafts_mbox'] = 'Drafts';

program/include/rcube_imap.php

@@ -420 +420 @@
       return $a_mboxes;
 
     // retrieve list of folders from IMAP server
-    $a_folders = iil_C_ListSubscribed($this->conn, $this->_mod_mailbox($root), $filter);
+    if (rcmail::get_instance()->config->get('use_subscriptions', TRUE)) {
+        $a_folders = iil_C_ListSubscribed($this->conn, $this->_mod_mailbox($root), $filter);
+    }
+    else {
+        $a_folders = iil_C_ListMailboxes($this->conn, $this->_mod_mailbox($root), $filter);
+    }
     
     if (!is_array($a_folders) || !sizeof($a_folders))
       $a_folders = array();

program/localization/en_US/labels.inc

@@ -272 +272 @@
 $labels['never']  = 'never';
 $labels['messagesdisplaying'] = 'Messages displaying';
 $labels['messagescomposition'] = 'Messages composition';
+$labels['usesubscriptions'] = 'Use IMAP subscriptions';
 
 $labels['folder']  = 'Folder';
 $labels['folders']  = 'Folders';

program/steps/settings/func.inc

@@ -302 +302 @@
                     $input_expunge->show($config['logout_expunge']?1:0));
     }
 
+  // Using IMAP subscription information
+  if (!isset($no_override['use_subscriptions']))
+    {
+    $field_id = 'rcmfd_use_subscriptions';
+    $use_subscriptions = new html_checkbox(array('name' => '_use_subscriptions', 'id' => $field_id, 'value' => 1));
+    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+                    $field_id,
+                    Q(rcube_label('usesubscriptions')),
+                    $use_subscriptions->show($config['use_subscriptions']?1:0));
+    }
+
   $out .= "\n</table></fieldset>$form_end";
 
   return $out;  

program/steps/settings/manage_folders.inc

@@ -182 +182 @@
 
   // add table header
   $out .= "<thead><tr>\n";
-  $out .= sprintf('<td class="name">%s</td><td class="msgcount">%s</td><td class="subscribed">%s</td>'.
-                  '<td class="rename">&nbsp;</td><td class="delete">&nbsp;</td>',
-                  rcube_label('foldername'), rcube_label('messagecount'), rcube_label('subscribed'));
-                  
+  $out .= sprintf('<td class="name">%s</td><td class="msgcount">%s</td>',
+                  rcube_label('foldername'), rcube_label('messagecount'));
+  if ($CONFIG['use_subscriptions']){
+      $out .= sprintf('<td class="subscribed">%s</td>', rcube_label('subscribed'));
+  }
+  $out .= '<td class="rename">&nbsp;</td><td class="delete">&nbsp;</td>';
   $out .= "\n</tr></thead>\n<tbody>\n";
 
 
@@ -229 +231 @@
                     $zebra_class,
                     Q($folder_html),
                     $IMAP->messagecount($folder));
-                    
-    if ($protected)
-      $out .= '<td class="subscribed">&nbsp;'.($subscribed ? '&#x2022;' : '-').'</td>';
-    else
-      $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder_utf8:'', array('value' => $folder_utf8)).'</td>';
+
+    if ($CONFIG['use_subscriptions']){
+        if ($protected)
+          $out .= '<td class="subscribed">&nbsp;'.($subscribed ? '&#x2022;' : '-').'</td>';
+        else
+          $out .= '<td class="subscribed">'.$checkbox_subscribe->show($subscribed?$folder_utf8:'', array('value' => $folder_utf8)).'</td>';
+    }
 
     // add rename and delete buttons
     if (!$protected)

program/steps/settings/save_prefs.inc

@@ -36 +36 @@
   'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
   'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
   'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
+  'use_subscriptions' => isset($_POST['_use_subscriptions']) ? TRUE : FALSE,
   );
 
+// if the use_subscriptions preference changes, flush the folder cache
+if (($CONFIG['use_subscriptions'] && !isset($_POST['_use_subscriptions'])) ||
+    (!$CONFIG['use_subscriptions'] && isset($_POST['_use_subscriptions']))) {
+  $RCMAIL->imap_init(true);
+  $IMAP->clear_cache('mailboxes');
+}
+
 // don't override these parameters
 foreach ((array)$CONFIG['dont_override'] as $p)
   $a_user_prefs[$p] = $CONFIG[$p];