- Prevent from setting INBOX as any of special folders (#1486114)

CHANGELOG

@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Prevent from setting INBOX as any of special folders (#1486114)
 - Fix regular expression for e-mail address (#1486152)
 - Fix Received header format
 - Implemented sorting by message index - added 'index_sort' option (#1485936)

plugins/archive/archive.php

@@ -115,7 +115,8 @@ class archive extends rcube_plugin
       $this->add_texts('localization');
       
       $rcmail = rcmail::get_instance();
-      $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));
+      $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
+        'maxlength' => 30, 'exceptions' => array('INBOX')));
 
       $args['blocks']['main']['options']['archive_mbox'] = array(
           'title' => $this->gettext('archivefolder'),

program/include/main.inc

@@ -1152,11 +1152,12 @@ function rcmail_mailbox_select($p = array())
 {
   global $RCMAIL;
   
-  $p += array('maxlength' => 100, 'relanames' => false);
+  $p += array('maxlength' => 100, 'realnames' => false);
   $a_mailboxes = array();
   
   foreach ($RCMAIL->imap->list_mailboxes() as $folder)
-    rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter());
+    if (empty($p['exceptions']) || !in_array($folder, $p['exceptions']))
+      rcmail_build_folder_tree($a_mailboxes, $folder, $RCMAIL->imap->get_hierarchy_delimiter());
 
   $select = new html_select($p);
   

program/steps/settings/edit_prefs.inc

@@ -375,7 +375,8 @@ function rcmail_user_prefs_block($part, $attrib)
     // Configure special folders
     if (!isset($no_override['default_imap_folders'])) {
       $RCMAIL->imap_init(true);
-      $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));
+      $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true,
+        'maxlength' => 30, 'exceptions' => array('INBOX')));
 
       if (!isset($no_override['drafts_mbox']))
         $blocks['main']['options']['drafts_mbox'] = array(