From b545d3e8388d18a64d50b6f7879804cf4e7812ca Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 18 Feb 2010 13:01:53 -0500
Subject: [PATCH] Fix loading of plugin configs: user prefs will always survive (#1486368)
---
program/include/rcube_plugin.php | 2 +-
CHANGELOG | 1 +
program/include/rcmail.php | 2 +-
program/include/rcube_user.php | 2 +-
program/include/rcube_config.php | 18 ++++++++++++++++--
5 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 8cb6822..e4d54f9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix merging of configuration parameters: user prefs always survive (#1486368)
- Fix quota indicator value after folder purge/expunge (#1486488)
- Fix external mailto links support for use as protocol handler (#1486037)
- Fix attachment excessive memory use, support messages of any size (#1484660)
diff --git a/program/include/rcmail.php b/program/include/rcmail.php
index 68ab500..5d20989 100644
--- a/program/include/rcmail.php
+++ b/program/include/rcmail.php
@@ -178,7 +178,7 @@
$GLOBALS['USER'] = $this->user;
// overwrite config with user preferences
- $this->config->merge((array)$this->user->get_prefs());
+ $this->config->set_user_prefs((array)$this->user->get_prefs());
}
$_SESSION['language'] = $this->user->language = $this->language_prop($this->config->get('language', $_SESSION['language']));
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 85ff714..1e2aae3 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -28,6 +28,7 @@
{
private $prop = array();
private $errors = array();
+ private $userprefs = array();
/**
@@ -132,12 +133,12 @@
* @param string Full path to the config file to be loaded
* @return booelan True on success, false on failure
*/
- public function load_from_file($fpath, $merge = true)
+ public function load_from_file($fpath)
{
if (is_file($fpath) && is_readable($fpath)) {
include($fpath);
if (is_array($rcmail_config)) {
- $this->prop = $merge ? array_merge($this->prop, $rcmail_config) : $this->prop + $rcmail_config;
+ $this->prop = array_merge($this->prop, $rcmail_config, $this->userprefs);
return true;
}
}
@@ -178,6 +179,19 @@
*/
public function merge($prefs)
{
+ $this->prop = array_merge($this->prop, $prefs, $this->userprefs);
+ }
+
+
+ /**
+ * Merge the given prefs over the current config
+ * and make sure that they survive further merging.
+ *
+ * @param array Hash array with user prefs
+ */
+ public function set_user_prefs($prefs)
+ {
+ $this->userprefs = $prefs;
$this->prop = array_merge($this->prop, $prefs);
}
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index c5eb884..8001c4c 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -59,7 +59,7 @@
{
$fpath = $this->home.'/'.$fname;
$rcmail = rcmail::get_instance();
- if (is_file($fpath) && !$rcmail->config->load_from_file($fpath, false)) {
+ if (is_file($fpath) && !$rcmail->config->load_from_file($fpath)) {
raise_error(array('code' => 527, 'type' => 'php',
'file' => __FILE__, 'line' => __LINE__,
'message' => "Failed to load config from $fpath"), true, false);
diff --git a/program/include/rcube_user.php b/program/include/rcube_user.php
index 5498709..41a8bb5 100644
--- a/program/include/rcube_user.php
+++ b/program/include/rcube_user.php
@@ -123,7 +123,7 @@
$this->language = $_SESSION['language'];
if ($this->db->affected_rows()) {
- $config->merge($a_user_prefs);
+ $config->set_user_prefs($a_user_prefs);
return true;
}
--
Gitblit v1.9.1