Changeset b545d3e in github

Timestamp:

Feb 18, 2010 1:01:53 PM (3 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

29640bcf

Parents:

030db5b

Message:

Fix loading of plugin configs: user prefs will always survive (#1486368)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcmail.php (modified) (1 diff)
• program/include/rcube_config.php (modified) (3 diffs)
• program/include/rcube_plugin.php (modified) (1 diff)
• program/include/rcube_user.php (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- 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)

program/include/rcmail.php

@@ -179 +179 @@
       
       // overwrite config with user preferences
-      $this->config->merge((array)$this->user->get_prefs());
+      $this->config->set_user_prefs((array)$this->user->get_prefs());
     }
     

program/include/rcube_config.php

@@ -29 +29 @@
   private $prop = array();
   private $errors = array();
+  private $userprefs = array();
 
 
@@ -133 +134 @@
    * @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;
       }
@@ -179 +180 @@
   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);
   }

program/include/rcube_plugin.php

@@ -60 +60 @@
     $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__,

program/include/rcube_user.php

@@ -124 +124 @@
     $this->language = $_SESSION['language'];
     if ($this->db->affected_rows()) {
-      $config->merge($a_user_prefs);
+      $config->set_user_prefs($a_user_prefs);
       return true;
     }