Changeset 40a1860 in github

Timestamp:

May 23, 2011 7:03:52 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

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

Children:

c9f4e9b

Parents:

7ad8e2c

Message:

• Store user preferences in session when write-master is not available and session is stored in memcache, write them later

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcmail.php (modified) (1 diff)
• program/include/rcube_user.php (modified) (7 diffs)
• program/steps/mail/show.inc (modified) (1 diff)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Store user preferences in session when write-master is not available and session is stored in memcache, write them later
 - Improve performence of folder manager operations
 - Fix default_port option handling in Installer when config.inc.php file exists (#1487925)

program/include/rcmail.php

@@ -1126 +1126 @@
       $this->imap->expunge('INBOX');
     }
+
+    // Try to save unsaved user preferences
+    if (!empty($_SESSION['preferences'])) {
+      $this->user->save_prefs(unserialize($_SESSION['preferences']));
+    }
   }
 

program/include/rcube_user.php

@@ -30 +30 @@
 class rcube_user
 {
-    public $ID = null;
-    public $data = null;
-    public $language = null;
+    public $ID;
+    public $data;
+    public $language;
 
     /**
@@ -39 +39 @@
      * @var rcube_mdb2
      */
-    private $db = null;
+    private $db;
+
+    /**
+     * rcmail object.
+     *
+     * @var rcmail
+     */
+    private $rc;
 
 
@@ -50 +57 @@
     function __construct($id = null, $sql_arr = null)
     {
-        $this->db = rcmail::get_instance()->get_dbh();
+        $this->rc = rcmail::get_instance();
+        $this->db = $this->rc->get_dbh();
 
         if ($id && !$sql_arr) {
@@ -83 +91 @@
             // if no domain was provided...
             if (empty($domain)) {
-                $rcmail = rcmail::get_instance();
-                $domain = $rcmail->config->mail_domain($this->data['mail_host']);
+                $domain = $this->rc->config->mail_domain($this->data['mail_host']);
             }
 
@@ -111 +118 @@
             $prefs = array('language' => $this->language);
 
-        if ($this->ID && $this->data['preferences'])
-            $prefs += (array)unserialize($this->data['preferences']);
+        if ($this->ID) {
+            // Preferences from session (write-master is unavailable)
+            if (!empty($_SESSION['preferences'])) {
+                // Check last write attempt time, try to write again (every 5 minutes)
+                if ($_SESSION['preferences_time'] < time() - 5 * 60) {
+                    $this->save_prefs(unserialize($_SESSION['preferences']));
+                }
+                else {
+                    $this->data['preferences'] = $_SESSION['preferences'];
+                }
+            }
+
+            if ($this->data['preferences']) {
+                $prefs += (array)unserialize($this->data['preferences']);
+            }
+        }
 
         return $prefs;
@@ -129 +150 @@
             return false;
 
-        $config = rcmail::get_instance()->config;
+        $config    = $this->rc->config;
         $old_prefs = (array)$this->get_prefs();
 
@@ -155 +176 @@
         $this->language = $_SESSION['language'];
 
+        // Update success
         if ($this->db->affected_rows() !== false) {
             $config->set_user_prefs($a_user_prefs);
             $this->data['preferences'] = $save_prefs;
+
+            if (isset($_SESSION['preferences'])) {
+                $this->rc->session->remove('preferences');
+                $this->rc->session->remove('preferences_time');
+            }
             return true;
+        }
+        // Update error, but we are using replication (we have read-only DB connection)
+        // and we are storing session not in the SQL database
+        // we can store preferences in session and try to write later (see get_prefs())
+        else if ($this->db->is_replicated() && $config->get('session_storage', 'db') != 'db') {
+            $_SESSION['preferences'] = $save_prefs;
+            $_SESSION['preferences_time'] = time();
+            $config->set_user_prefs($a_user_prefs);
+            $this->data['preferences'] = $save_prefs;
         }
 

program/steps/mail/show.inc

@@ -65 +65 @@
   if ($MESSAGE->headers->others['list-post'])
     $OUTPUT->set_env('list_post', true);
-  if ($CONFIG['forward_attachment'])                                                                                                      
+  if ($CONFIG['forward_attachment'])
     $OUTPUT->set_env('forward_attachment', true);