Branch 'roundcubemail-plugins-kolab-3.1' - 2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar.php                           |    5 +++++
 plugins/calendar/drivers/database/SQL/mysql.initial.sql |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit b72aee51e56792688ad6193e64ff5dd55ab4e5d1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sun Oct 5 16:38:20 2014 +0200

    Avoid duplicate invitation boxes (#3585)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index b6b63d1..95240ab 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1928,6 +1928,7 @@ class calendar extends rcube_plugin
     }
 
     $html = '';
+    $seen = array();
     foreach ($this->ics_parts as $mime_id) {
       $part    = $this->message->mime_parts[$mime_id];
       $charset = $part->ctype_parameters['charset'] ? $part->ctype_parameters['charset'] : RCMAIL_CHARSET;
@@ -1944,6 +1945,10 @@ class calendar extends rcube_plugin
         if ($event['_type'] != 'event')  // skip non-event objects (#2928)
           continue;
 
+        // avoid duplicates with the same UID (e.g. from Google invitations, #3585)
+        if ($seen[$event['uid']]++)
+            continue;
+
         // define buttons according to method
         if ($this->ical->method == 'REPLY') {
           $title = $this->gettext('itipreply');


commit d5bfadb07944d2b35dc7647b938b764685711e02
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Sat Oct 4 12:37:14 2014 +0200

    No default value allowed for BLOB/LONGTEXT columns

diff --git a/plugins/calendar/drivers/database/SQL/mysql.initial.sql b/plugins/calendar/drivers/database/SQL/mysql.initial.sql
index 945d429..f2f5382 100644
--- a/plugins/calendar/drivers/database/SQL/mysql.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/mysql.initial.sql
@@ -61,7 +61,7 @@ CREATE TABLE IF NOT EXISTS `attachments` (
   `filename` varchar(255) NOT NULL DEFAULT '',
   `mimetype` varchar(255) NOT NULL DEFAULT '',
   `size` int(11) NOT NULL DEFAULT '0',
-  `data` longtext NOT NULL DEFAULT '',
+  `data` longtext NOT NULL,
   PRIMARY KEY(`attachment_id`),
   CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
     REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE