summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2012-06-06 09:33:27 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2012-06-06 09:33:27 (GMT)
commit62dc67ef402c7e7fbaae91f522a446e921408763 (patch)
treefb4154efe1c32848c1c9f5141017bc67521163cb
parentffaa1574a5c79405e47c52c2d65cecb061d8d7c6 (diff)
downloadroundcubemail-plugins-kolab-62dc67ef402c7e7fbaae91f522a446e921408763.tar.gz
Adapt to changes in Roundcube 0.8 core
-rw-r--r--plugins/calendar/calendar.php4
-rw-r--r--plugins/calendar/drivers/kolab/kolab_calendar.php2
-rw-r--r--plugins/kolab_core/rcube_kolab.php2
3 files changed, 5 insertions, 3 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 312a51e..3af2960 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -99,9 +99,9 @@ class calendar extends rcube_plugin
// set user's timezone
$this->timezone = new DateTimeZone($this->rc->config->get('timezone', 'GMT'));
$now = new DateTime('now', $this->timezone);
- $this->timezone_offset = $now->format('Z') / 3600;
- $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;
require($this->home . '/lib/calendar_ui.php');
$this->ui = new calendar_ui($this);
diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index ccd542a..a54ef28 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -725,6 +725,8 @@ class kolab_calendar
$object['_is_all_day'] = 1;
}
+ else
+ $object['_is_all_day'] = 0;
// in Horde attachments are indexed by name
$object['_attachments'] = array();
diff --git a/plugins/kolab_core/rcube_kolab.php b/plugins/kolab_core/rcube_kolab.php
index 6bd5f60..a3e1276 100644
--- a/plugins/kolab_core/rcube_kolab.php
+++ b/plugins/kolab_core/rcube_kolab.php
@@ -224,7 +224,7 @@ class rcube_kolab
if (!$subscribed) {
$rcmail = rcmail::get_instance();
$storage = $rcmail->get_storage();
- $subscribed = $storage->list_folders();
+ $subscribed = $storage->list_folders_subscribed();
}
return in_array($folder, $subscribed);