Request 2080 (accepted)

Overview

Request 2080 (accepted)

Fix recurrence element structure

Created by vanmeeuwen almost 7 years ago
In state accepted

Submit kolab-syncroton

Submit package Kolab:Winterfell / kolab-syncroton to package Kolab:16 / kolab-syncroton

kolab-syncroton.spec Changed

0001-T2477-GAL-for-Outlook.patch Changed

0002-Fix-MeetingStatus-value-Bifrost-T34257.patch Changed

0003-Add-important-note-about-uid-and-changed-fields-in-G.patch Added

@@ -0,0 +1,29 @@
+From c2cdb863178c682f544ffbfa9d7d1635c3714de2 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Tue, 20 Jun 2017 10:46:35 +0200
+Subject: [PATCH 3/4] Add important note about uid and changed fields in GAL
+ config
+
+---
+ config/config.inc.php.dist | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/config/config.inc.php.dist b/config/config.inc.php.dist
+index 2433475..5e66f59 100644
+--- a/config/config.inc.php.dist
++++ b/config/config.inc.php.dist
+@@ -54,6 +54,11 @@ $config['activesync_gal_fieldmap'] = null;
+ 
+ // List of device types that will sync the LDAP addressbook(s) as a normal folder.
+ // For devices that do not support GAL searching, e.g. Outlook.
++// Note: To make the LDAP addressbook sources working we need two additional
++//       fields ('uid' and 'changed') specified in the fieldmap array
++//       of the LDAP configuration ('ldap_public' option). For example:
++//          'uid'     => 'nsuniqueid',
++//          'changed' => 'modifytimestamp',
+ // Examples:
+ //     array('windowsoutlook')  # enable for Oultook only
+ //     true                     # enable for all
+-- 
+2.13.0
+

0004-T2519-Fix-Recurrence-element-structure.patch Added

@@ -0,0 +1,32 @@
+From 4e805ba57d9911e2382c11fb043d6b827de7e369 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <machniak@kolabsys.com>
+Date: Tue, 27 Jun 2017 10:14:27 +0000
+Subject: [PATCH 4/4] T2519: Fix Recurrence element structure
+
+For example DayOfWeek=0 is invalid. We make sure no such "empty" values are set.
+---
+ lib/kolab_sync_data.php | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/lib/kolab_sync_data.php b/lib/kolab_sync_data.php
+index b03d04b..c03be25 100644
+--- a/lib/kolab_sync_data.php
++++ b/lib/kolab_sync_data.php
+@@ -1562,8 +1562,13 @@ abstract class kolab_sync_data implements Syncroton_Data_IData
+             break;
+         }
+ 
++        // Skip all empty values (T2519)
++        if ($recurrence['type'] != self::RECUR_TYPE_DAILY) {
++            $recurrence = array_filter($recurrence);
++        }
++
+         // required field
+-        $recurrence['interval'] = $r['INTERVAL'] ? $r['INTERVAL'] : 1;
++        $recurrence['interval'] = $r['INTERVAL'] ?: 1;
+ 
+         if (!empty($r['UNTIL'])) {
+             $recurrence['until'] = self::date_from_kolab($r['UNTIL']);
+-- 
+2.13.0
+

debian.changelog Changed

debian.series Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2080 0

Request History

vanmeeuwen created request almost 7 years ago

Fix recurrence element structure

vanmeeuwen accepted review almost 7 years ago

vanmeeuwen approved review almost 7 years ago

vanmeeuwen accepted request almost 7 years ago