Merge branch 'master' into dev/elastic

Conflicts:
	plugins/calendar/calendar_ui.js

plugins/calendar/calendar.php

@@ -2027,6 +2027,10 @@ class calendar extends rcube_plugin
    */
   private function write_preprocess(&$event, $action)
   {
+    // Remove double timezone specification (T2313)
+    $event['start'] = preg_replace('/\s*\(.*\)/', '', $event['start']);
+    $event['end']   = preg_replace('/\s*\(.*\)/', '', $event['end']);
+
     // convert dates into DateTime objects in user's current timezone
     $event['start']  = new DateTime($event['start'], $this->timezone);
     $event['end']    = new DateTime($event['end'], $this->timezone);

plugins/calendar/calendar_ui.js

@@ -3104,7 +3104,7 @@ function rcube_calendar_ui(settings)
               else if (range > 0)
                 start = 'today -' + range + ' months';
 
-              rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 });
+              rcmail.goto_url('export_events', { source:source, start:start, attachments:attachmt?1:0 }, false);
             }
             $dialog.dialog("close");
           }
@@ -3135,7 +3135,7 @@ function rcube_calendar_ui(settings)
     this.event_download = function(event)
     {
       if (event && event.id) {
-        rcmail.goto_url('export_events', { source:event.calendar, id:event.id, attachments:1 });
+        rcmail.goto_url('export_events', { source:event.calendar, id:event.id, attachments:1 }, false);
       }
     };
 

plugins/libcalendaring/lib/libcalendaring_itip.php

@@ -370,8 +370,9 @@ class libcalendaring_itip
         $latest = $rescheduled = false;
         $html   = '';
 
-      if (is_numeric($event['changed']))
+        if (is_numeric($event['changed'])) {
             $event['changed'] = new DateTime('@'.$event['changed']);
+        }
 
         // check if the given itip object matches the last state
         if ($existing) {
@@ -386,6 +387,7 @@ class libcalendaring_itip
             if ($existing) {
                 $rsvp   = $event['rsvp'];
                 $emails = $this->lib->get_user_emails();
+
                 foreach ($existing['attendees'] as $attendee) {
                     if ($attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
                         $status = strtoupper($attendee['status']);
@@ -413,11 +415,14 @@ class libcalendaring_itip
             else if (in_array($status_lc, $this->rsvp_status)) {
                 $status_text = $this->gettext(($latest ? 'youhave' : 'youhavepreviously') . $status_lc);
 
-          if ($existing && ($existing['sequence'] > $event['sequence'] || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))) {
+                if ($existing && ($existing['sequence'] > $event['sequence']
+                    || (!isset($event['sequence']) && $existing['changed'] && $existing['changed'] > $event['changed']))
+                ) {
                     $action = '';  // nothing to do here, outdated invitation
-            if ($status_lc == 'needs-action')
+                    if ($status_lc == 'needs-action') {
                         $status_text = $this->gettext('outdatedinvitation');
                     }
+                }
                 else if (!$existing && !$rsvp) {
                     $action = 'import';
                 }
@@ -441,8 +446,27 @@ class libcalendaring_itip
         else if ($event['method'] == 'REPLY') {
             // check whether the sender already is an attendee
             if ($existing) {
+                // Relax checking if that is a reply to the latest version of the event
+                // We accept versions with older SEQUENCE but no significant changes (Bifrost#T78144)
+                if (!$latest) {
+                    $num = $got = 0;
+                    foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                        if (isset($existing[$key])) {
+                            if ($key == 'allday') {
+                                $event[$key] = $event[$key] == 'true';
+                            }
+                            $value = $existing[$key] instanceof DateTime ? $existing[$key]->format('c') : $existing[$key];
+                            $num++;
+                            $got += intval($value == $event[$key]);
+                        }
+                    }
+
+                    $latest = $num === $got;
+                }
+
                 $action = $this->rc->config->get('calendar_allow_itip_uninvited', true) ? 'accept' : '';
                 $listed = false;
+
                 foreach ($existing['attendees'] as $attendee) {
                     if ($attendee['role'] != 'ORGANIZER' && strcasecmp($attendee['email'], $event['attendee']) == 0) {
                         $status_lc = strtolower($status);
@@ -454,6 +478,7 @@ class libcalendaring_itip
                                 )
                             )));
                         }
+
                         $action = $attendee['status'] == $status || !$latest ? '' : 'update';
                         $listed = true;
                         break;
@@ -612,6 +637,13 @@ class libcalendaring_itip
 
             $buttons[] = html::div(array('id' => 'update-'.$dom_id, 'style' => 'display:none'), $update_button);
             $buttons[] = html::div(array('id' => 'accept-'.$dom_id, 'style' => 'display:none'), $accept_buttons);
+
+            // For replies we need more metadata
+            foreach (array('start', 'end', 'due', 'allday', 'recurrence', 'location') as $key) {
+                if (isset($event[$key])) {
+                    $metadata[$key] = $event[$key] instanceof DateTime ? $event[$key]->format('c') : $event[$key];
+                }
+            }
         }
         // when receiving iTip REQUEST messages:
         else if ($method == 'REQUEST') {

plugins/libkolab/SQL/mysql.initial.sql

@@ -29,7 +29,7 @@ DROP TABLE IF EXISTS `kolab_cache_contact`;
 CREATE TABLE `kolab_cache_contact` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -53,7 +53,7 @@ DROP TABLE IF EXISTS `kolab_cache_event`;
 CREATE TABLE `kolab_cache_event` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -73,7 +73,7 @@ DROP TABLE IF EXISTS `kolab_cache_task`;
 CREATE TABLE `kolab_cache_task` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -93,7 +93,7 @@ DROP TABLE IF EXISTS `kolab_cache_journal`;
 CREATE TABLE `kolab_cache_journal` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -113,7 +113,7 @@ DROP TABLE IF EXISTS `kolab_cache_note`;
 CREATE TABLE `kolab_cache_note` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -131,7 +131,7 @@ DROP TABLE IF EXISTS `kolab_cache_file`;
 CREATE TABLE `kolab_cache_file` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -151,7 +151,7 @@ DROP TABLE IF EXISTS `kolab_cache_configuration`;
 CREATE TABLE `kolab_cache_configuration` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -171,7 +171,7 @@ DROP TABLE IF EXISTS `kolab_cache_freebusy`;
 CREATE TABLE `kolab_cache_freebusy` (
   `folder_id` BIGINT UNSIGNED NOT NULL,
   `msguid` BIGINT UNSIGNED NOT NULL,
-  `uid` VARCHAR(512) CHARACTER SET ascii NOT NULL,
+  `uid` VARCHAR(512) NOT NULL,
   `created` DATETIME DEFAULT NULL,
   `changed` DATETIME DEFAULT NULL,
   `data` LONGTEXT NOT NULL,
@@ -188,4 +188,4 @@ CREATE TABLE `kolab_cache_freebusy` (
 
 /*!40014  SET FOREIGN_KEY_CHECKS=1 */;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2017071900');
+REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2018021300');

plugins/libkolab/SQL/mysql/2018021300.sql

@@ -0,0 +1,9 @@
+-- accept utf8 in UID column
+ALTER TABLE `kolab_cache_contact` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_event` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_task` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_journal` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_note` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_file` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_configuration` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;
+ALTER TABLE `kolab_cache_freebusy` MODIFY `uid` VARCHAR(512) CHARACTER SET utf8 NOT NULL;

plugins/libkolab/SQL/oracle.initial.sql

@@ -183,4 +183,4 @@ CREATE TABLE "kolab_cache_freebusy" (
 CREATE INDEX "kolab_cache_fb_uid2msguid" ON "kolab_cache_freebusy" ("folder_id", "uid", "msguid");
 
 
-INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2017071900');
+INSERT INTO "system" ("name", "value") VALUES ('libkolab-version', '2018021300');

plugins/libkolab/SQL/oracle/2018021300.sql

@@ -0,0 +1 @@
+-- empty

plugins/libkolab/SQL/sqlite.initial.sql

@@ -156,4 +156,4 @@ CREATE TABLE kolab_cache_freebusy (
 
 CREATE INDEX ix_freebusy_uid2msguid ON kolab_cache_freebusy(folder_id,uid,msguid);
 
-INSERT INTO system (name, value) VALUES ('libkolab-version', '2017071900');
+INSERT INTO system (name, value) VALUES ('libkolab-version', '2018021300');

plugins/libkolab/SQL/sqlite/2018021300.sql

@@ -0,0 +1 @@
+-- empty