Move timezone computation to rcube_config; don't override SESSION['timezone'] when saving prefs

1 files changed, 13 insertions, 0 deletions

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 9379e9e7b..31b7ed6b7 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -220,6 +220,19 @@ class rcube_config
         return $this->prop;
     }
 
+    /**
+     * Special getter for user's timezone
+     */
+    public function get_timezone()
+    {
+      $tz = $this->get('timezone');
+      if ($tz == 'auto')
+        $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z') / 3600;
+      else
+        $tz = intval($tz) + intval($this->get('dst_active'));
+
+      return $tz;
+    }
 
     /**
      * Return requested DES crypto key.