From 569654a8c350de5b34cb65ae561bf95418b15f1c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 22 May 2009 14:34:50 -0400
Subject: [PATCH] - overwrite default_imap_folders according to *_mbox settings (#1485600) + some small updates
---
installer/rcube_install.php | 12 ++++++++++++
installer/config.php | 4 ++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/installer/config.php b/installer/config.php
index d090312..e51b4bf 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -485,7 +485,7 @@
<legend>Display settings & user prefs</legend>
<dl class="configblock" id="cgfblockdisplay">
-<dt class="propname">language</dt>
+<dt class="propname">language <span class="userconf">*</span></dt>
<dd>
<?php
@@ -559,7 +559,7 @@
$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);
echo $select_autosave->show(intval($RCI->getprop('draft_autosave')));
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 14fe5ee..89ebe9d 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -176,6 +176,18 @@
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;
}
--
Gitblit v1.9.1