Branch 'roundcubemail-plugins-kolab-0.8' - 2 commits - plugins/calendar plugins/kolab_addressbook plugins/kolab_core

Thomas Brüderli bruederli at kolabsys.com
Wed Jun 6 11:34:13 CEST 2012


 plugins/calendar/calendar.php                          |    4 ++--
 plugins/calendar/drivers/kolab/kolab_calendar.php      |    2 ++
 plugins/kolab_addressbook/lib/rcube_kolab_contacts.php |    3 +++
 plugins/kolab_core/rcube_kolab.php                     |    2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 62dc67ef402c7e7fbaae91f522a446e921408763
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed Jun 6 11:33:27 2012 +0200

    Adapt to changes in Roundcube 0.8 core

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);


commit ffaa1574a5c79405e47c52c2d65cecb061d8d7c6
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Wed May 30 18:28:49 2012 +0200

    Make contact sorting case-insensitive

diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index f028f52..aa2cca7 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -1042,6 +1042,9 @@ class rcube_kolab_contacts extends rcube_addressbook
         $a_value .= is_array($a['email']) ? $a['email'][0] : $a['email'];
         $b_value .= is_array($b['email']) ? $b['email'][0] : $b['email'];
 
+        $a_value = mb_strtolower($a_value);
+        $b_value = mb_strtolower($b_value);
+
         // return strcasecmp($a_value, $b_value);
         // make sorting unicode-safe and locale-dependent
         if ($a_value == $b_value)





More information about the commits mailing list