- overwrite default_imap_folders according to *_mbox settings (#1485600) + some small updates

git-svn-id: https://svn.roundcube.net/trunk@2522 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 12 insertions, 0 deletions

diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index 14fe5ee47..89ebe9d89 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/installer/rcube_install.php
@@ -176,6 +176,18 @@ class rcube_install
       else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
         $value = '%p';
       }
+      else if ($prop == 'default_imap_folders'){
+	$value = Array();
+	foreach($this->config['default_imap_folders'] as $_folder){
+	  switch($_folder) {
+	  case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
+	  case 'Sent':   $_folder = $this->config['sent_mbox']; break;
+	  case 'Junk':   $_folder = $this->config['junk_mbox']; break;
+	  case 'Trash':  $_folder = $this->config['trash_mbox']; break;
+          }
+	  if (!in_array($_folder, $value))  $value[] = $_folder;
+        }
+      }
       else if (is_bool($default)) {
         $value = (bool)$value;
       }