From da71783bc95f786968955a865943f6052eca83a4 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 25 Aug 2011 16:09:36 -0400
Subject: [PATCH] Move timezone computation to rcube_config; don't override SESSION['timezone'] when saving prefs
---
program/include/rcube_config.php | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 9379e9e..31b7ed6 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -220,6 +220,19 @@
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.
--
Gitblit v1.9.1