summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-10-16 09:43:31 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2013-10-16 09:47:21 (GMT)
commitc6471146b94e411726b902c3b05bf94255f4e0e6 (patch)
tree5b4770c425c8b9647d998e1f90f97585c6b8f3fb
parent1d97e50634dc9f206c49af595587d8f1da01744c (diff)
downloadroundcubemail-plugins-kolab-c6471146b94e411726b902c3b05bf94255f4e0e6.tar.gz
Catch exception when timezone is invalid
-rw-r--r--plugins/libcalendaring/libcalendaring.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php
index 9df9e00..47cf67e 100644
--- a/plugins/libcalendaring/libcalendaring.php
+++ b/plugins/libcalendaring/libcalendaring.php
@@ -75,10 +75,17 @@ class libcalendaring extends rcube_plugin
$this->rc = rcube::get_instance();
// set user's timezone
- $this->timezone = new DateTimeZone($this->rc->config->get('timezone', 'GMT'));
+ try {
+ $this->timezone = new DateTimeZone($this->rc->config->get('timezone', 'GMT'));
+ }
+ catch (Exception $e) {
+ $this->timezone = new DateTimeZone('GMT');
+ }
+
$now = new DateTime('now', $this->timezone);
- $this->gmt_offset = $now->getOffset();
- $this->dst_active = $now->format('I');
+
+ $this->gmt_offset = $now->getOffset();
+ $this->dst_active = $now->format('I');
$this->timezone_offset = $this->gmt_offset / 3600 - $this->dst_active;
$this->add_texts('localization/', false);