Changeset 5285 in subversion

Timestamp:

Sep 28, 2011 7:49:37 AM (20 months ago)

Author:

thomasb

Message:

Distinguish standard timezone offset and DST of client

Location:

trunk/roundcubemail/program

Files:

• include/main.inc (modified) (1 diff)
• include/rcmail.php (modified) (1 diff)
• include/rcube_config.php (modified) (3 diffs)
• include/rcube_template.php (modified) (2 diffs)
• js/app.js (modified) (1 diff)
• js/common.js (modified) (1 diff)

trunk/roundcubemail/program/include/main.inc

@@ -1039 +1039 @@
     return '';
 
-  // get user's timezone
+  // get user's timezone offset
   $tz = $RCMAIL->config->get_timezone();
 

trunk/roundcubemail/program/include/rcmail.php

@@ -898 +898 @@
       if (isset($_REQUEST['_timezone']) && $_REQUEST['_timezone'] != '_default_')
         $_SESSION['timezone'] = floatval($_REQUEST['_timezone']);
+      if (isset($_REQUEST['_dstactive']) && $_REQUEST['_dstactive'] != '_default_')
+        $_SESSION['dst_active'] = intval($_REQUEST['_dstactive']);
 
       // force reloading complete list of subscribed mailboxes

trunk/roundcubemail/program/include/rcube_config.php

@@ -91 +91 @@
         // enable display_errors in 'show' level, but not for ajax requests
         ini_set('display_errors', intval(empty($_REQUEST['_remote']) && ($this->prop['debug_level'] & 4)));
+        
+        // set timezone auto settings values
+        if ($this->prop['timezone'] == 'auto') {
+          $this->prop['_timezone_auto'] = true;
+          $this->prop['dst_active'] = intval(date('I'));
+          $this->prop['timezone']   = date('Z') / 3600 - $this->prop['dst_active'];
+        }
 
         // export config data
@@ -208 +215 @@
         $this->userprefs = $prefs;
         $this->prop      = array_merge($this->prop, $prefs);
+
+        // override timezone settings with client values
+        if ($this->prop['_timezone_auto']) {
+            $this->prop['timezone']   = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : $this->prop['timezone'];
+            $this->prop['dst_active'] = isset($_SESSION['dst_active']) ? $_SESSION['dst_active'] : $this->prop['dst_active'];
+        }
     }
 
@@ -222 +235 @@
 
     /**
-     * Special getter for user's timezone
+     * Special getter for user's timezone offset including DST
+     *
+     * @return float  Timezone offset (in hours)
      */
     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 floatval($this->get('timezone')) + intval($this->get('dst_active'));
     }
 

trunk/roundcubemail/program/include/rcube_template.php

@@ -1106 +1106 @@
         $input_action = new html_hiddenfield(array('name' => '_action', 'value' => 'login'));
         $input_tzone  = new html_hiddenfield(array('name' => '_timezone', 'id' => 'rcmlogintz', 'value' => '_default_'));
+        $input_dst    = new html_hiddenfield(array('name' => '_dstactive', 'id' => 'rcmlogindst', 'value' => '_default_'));
         $input_url    = new html_hiddenfield(array('name' => '_url', 'id' => 'rcmloginurl', 'value' => $url));
         $input_user   = new html_inputfield(array('name' => '_user', 'id' => 'rcmloginuser')
@@ -1157 +1158 @@
         $out .= $input_action->show();
         $out .= $input_tzone->show();
+        $out .= $input_dst->show();
         $out .= $input_url->show();
         $out .= $table->show();

trunk/roundcubemail/program/js/app.js

@@ -381 +381 @@
 
         // detect client timezone
-        $('#rcmlogintz').val(new Date().getTimezoneOffset() / -60);
+        var tz = new Date().getTimezoneOffset() / -60;
+        var stdtz = new Date().getStdTimezoneOffset() / -60;
+        $('#rcmlogintz').val(stdtz);
+        $('#rcmlogindst').val(tz > stdtz ? 0 : 0);
 
         // display 'loading' message on form submit, lock submit button

trunk/roundcubemail/program/js/common.js

@@ -672 +672 @@
 };
 
+// Extend Date prototype to detect Standard timezone without DST
+// from http://www.michaelapproved.com/articles/timezone-detect-and-ignore-daylight-saving-time-dst/
+Date.prototype.getStdTimezoneOffset = function()
+{
+  var m = 12,
+    d = new Date(null, m, 1),
+    tzo = d.getTimezoneOffset();
+
+    while (--m) {
+      d.setUTCMonth(m);
+      if (tzo != d.getTimezoneOffset()) {
+        return Math.max(tzo, d.getTimezoneOffset());
+    }
+  }
+
+  return tzo;
+}
 
 // Make getElementById() case-sensitive on IE