Request 2909 (accepted)

Overview

Request 2909 (accepted)

Check in version 2.3.22

Created by vanmeeuwen over 2 years ago
In state accepted

Submit kolab-syncroton

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

kolab-syncroton.spec Changed

debian.changelog Changed

kolab-syncroton-2.3.21.tar.gz/composer.json-dist -> kolab-syncroton-2.3.22.tar.gz/composer.json-dist Changed

kolab-syncroton-2.3.21.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync.php Changed

@@ -46,7 +46,7 @@
     public $password;
 
     const CHARSET = 'UTF-8';
-    const VERSION = "2.3.19";
+    const VERSION = "2.3.22";
 
 
     /**
@@ -409,8 +409,34 @@
             return;
         }
 
+        $deviceId = null;
+
         if (!empty($_GET['DeviceId'])) {
-            $dev_dir = $log_dir . DIRECTORY_SEPARATOR . $_GET['DeviceId'];
+            $deviceId = $_GET['DeviceId'];
+        }
+        else if (
+            !empty($_SERVER['QUERY_STRING'])
+            && strpos($_SERVER['QUERY_STRING'], '&') == false
+            && ($query = base64_decode($_SERVER['QUERY_STRING']))
+            && strlen($query) > 8
+        ) {
+            // unpack the first 5 bytes, the last one is a length of the device id
+            $unpacked = unpack('Cversion/Ccommand/vlocale/Clength', substr($query, 0, 5));
+
+            // unpack the deviceId, with some input sanity checks
+            if (
+                !empty($unpacked['version'])
+                && !empty($unpacked['length'])
+                && $unpacked['version'] >= 121
+                && ($length = $unpacked['length']) > 0 && $length <= 32
+            ) {
+                $unpacked = unpack("H" . ($length * 2) . "string", $query, 5);
+                $deviceId = $unpacked['string'];
+            }
+        }
+
+        if (!empty($deviceId)) {
+            $dev_dir = $log_dir . DIRECTORY_SEPARATOR . $deviceId;
 
             if (is_dir($dev_dir) || mkdir($dev_dir, 0770)) {
                 $log_dir = $dev_dir;

kolab-syncroton-2.3.21.tar.gz/lib/kolab_sync_data_calendar.php -> kolab-syncroton-2.3.22.tar.gz/lib/kolab_sync_data_calendar.php Changed

@@ -308,7 +308,11 @@
                 $status = isset($attendee['status']) ? $this->attendeeStatusMap[$attendee['status']] : null;
 
                 if ($this->asversion >= 12) {
-                    $att['attendeeType']   = $type ?: self::ATTENDEE_TYPE_REQUIRED;
+                    if (isset($attendee['cutype']) && strtolower($attendee['cutype']) == 'resource') {
+                        $att['attendeeType'] = self::ATTENDEE_TYPE_RESOURCE;
+                    } else {
+                        $att['attendeeType']   = $type ?: self::ATTENDEE_TYPE_REQUIRED;
+                    }
                     $att['attendeeStatus'] = $status ?: self::ATTENDEE_STATUS_UNKNOWN;
                 }
 
@@ -503,6 +507,10 @@
                     'email' => $attendee->email,
                 );
 
+                if (isset($attendee->attendeeType) && $attendee->attendeeType == self::ATTENDEE_TYPE_RESOURCE) {
+                    $_attendee['cutype'] = 'RESOURCE';
+                }
+
                 if (isset($attendee->attendeeStatus)) {
                     $_attendee['status'] = $attendee->attendeeStatus ? array_search($attendee->attendeeStatus, $this->attendeeStatusMap) : null;
                     if (!$_attendee['status']) {

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2909 0

Request History

vanmeeuwen created request over 2 years ago

Check in version 2.3.22

vanmeeuwen accepted review over 2 years ago

vanmeeuwen approved review over 2 years ago

vanmeeuwen accepted request over 2 years ago