Changeset 2522 in subversion

Timestamp:

May 22, 2009 2:34:50 PM (4 years ago)

Author:

alec

Message:

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

Location:

trunk/roundcubemail/installer

Files:

• config.php (modified) (2 diffs)
• rcube_install.php (modified) (1 diff)

trunk/roundcubemail/installer/config.php

@@ -486 +486 @@
 <dl class="configblock" id="cgfblockdisplay">
 
-<dt class="propname">language</dt>
+<dt class="propname">language <span class="userconf">*</span></dt>
 <dd>
 <?php
@@ -560 +560 @@
 $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => 'cfgautosave'));
 $select_autosave->add('never', 0);
-foreach (array(3, 5, 10) as $i => $min)
+foreach (array(1, 3, 5, 10) as $i => $min)
   $select_autosave->add("$min min", $min*60);
 

trunk/roundcubemail/installer/rcube_install.php

@@ -176 +176 @@
       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)) {