From 62784a2ce5766058838ea5643b09cc2f7a573343 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 03 Sep 2008 13:17:17 -0400
Subject: [PATCH] Interesting: (0 == 'auto') => true
---
program/include/main.inc | 4 ++--
program/steps/settings/func.inc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 469d844..3fad9cb 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -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'])
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index ef3c24d..bb4b0d2 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -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']));
--
Gitblit v1.9.1