[Svn] r1723 - in trunk/roundcubemail/program: include steps/settings

[trac at roundcube.net]

Author: thomasb
Date: 2008-09-03 12:17:17 -0500 (Wed, 03 Sep 2008)
New Revision: 1723

Modified:
   trunk/roundcubemail/program/include/main.inc
   trunk/roundcubemail/program/steps/settings/func.inc
Log:
Interesting: (0 == 'auto') => true

Modified: trunk/roundcubemail/program/include/main.inc
===================================================================
--- trunk/roundcubemail/program/include/main.inc	2008-09-03 16:03:19 UTC (rev 1722)
+++ trunk/roundcubemail/program/include/main.inc	2008-09-03 17:17:17 UTC (rev 1723)
@@ -706,8 +706,8 @@
     return '';
    
   // get user's timezone
-  if ($CONFIG['timezone'] == 'auto')
-    $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : intval(date('O'))/100;
+  if ($CONFIG['timezone'] === 'auto')
+    $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600;
   else {
     $tz = $CONFIG['timezone'];
     if ($CONFIG['dst_active'])

Modified: trunk/roundcubemail/program/steps/settings/func.inc
===================================================================
--- trunk/roundcubemail/program/steps/settings/func.inc	2008-09-03 16:03:19 UTC (rev 1722)
+++ trunk/roundcubemail/program/steps/settings/func.inc	2008-09-03 17:17:17 UTC (rev 1723)
@@ -105,7 +105,7 @@
   // daylight savings
   if (!isset($no_override['dst_active'])) {
     $field_id = 'rcmfd_dst';
-    $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] == 'auto')));
+    $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
     
     $table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
     $table->add(null, $input_dst->show($config['dst_active']));

_______________________________________________
http://lists.roundcube.net/mailman/listinfo/svn