Branch 'roundcubemail-plugins-kolab-3.1' - 2 commits - plugins/kolab_addressbook plugins/libcalendaring

[Thomas Brüderli]

 plugins/kolab_addressbook/kolab_addressbook.php |    2 +-
 plugins/libcalendaring/libvcalendar.php         |    8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 786aa6fd458b0303b9f36221431e7ae5c10f6851
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 9 19:05:28 2014 +0200

    Decode HTML entities in address book names (#3752)

diff --git a/plugins/kolab_addressbook/kolab_addressbook.php b/plugins/kolab_addressbook/kolab_addressbook.php
index bcaf97d..7ec6816 100644
--- a/plugins/kolab_addressbook/kolab_addressbook.php
+++ b/plugins/kolab_addressbook/kolab_addressbook.php
@@ -111,7 +111,7 @@ class kolab_addressbook extends rcube_plugin
             // register this address source
             $sources[$abook_id] = array(
                 'id'       => $abook_id,
-                'name'     => $name,
+                'name'     => html_entity_decode($name, ENT_NOQUOTES),
                 'readonly' => $abook->readonly,
                 'editable' => $abook->editable,
                 'groups'   => $abook->groups,


commit 90348caf5149eb4a945056cb6a3cb30e7d55be25
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 9 18:58:46 2014 +0200

    Filter empty recurrence attributes

diff --git a/plugins/libcalendaring/libvcalendar.php b/plugins/libcalendaring/libvcalendar.php
index bb43388..233213d 100644
--- a/plugins/libcalendaring/libvcalendar.php
+++ b/plugins/libcalendaring/libvcalendar.php
@@ -435,15 +435,17 @@ class libvcalendar implements Iterator
                 if (!$params['INTERVAL'])
                     $params['INTERVAL'] = 1;
 
-                $event['recurrence'] = $params;
+                $event['recurrence'] = array_filter($params);
                 break;
 
             case 'EXDATE':
-                $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], self::convert_datetime($prop, true));
+                if (!empty($prop->value))
+                    $event['recurrence']['EXDATE'] = array_merge((array)$event['recurrence']['EXDATE'], self::convert_datetime($prop, true));
                 break;
 
             case 'RDATE':
-                $event['recurrence']['RDATE'] = array_merge((array)$event['recurrence']['RDATE'], self::convert_datetime($prop, true));
+                if (!empty($prop->value))
+                    $event['recurrence']['RDATE'] = array_merge((array)$event['recurrence']['RDATE'], self::convert_datetime($prop, true));
                 break;
 
             case 'RECURRENCE-ID':