Request 2779 (accepted)

Overview

Request 2779 (accepted)

New upstream release

Created by mollekopf almost 4 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen

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.17.tar.gz/lib/ext/Syncroton/Command/Sync.php -> kolab-syncroton-2.3.18.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

@@ -414,7 +414,7 @@
                 if ($this->_logger instanceof Zend_Log) 
                     $this->_logger->info(__METHOD__ . '::' . __LINE__ . " found " . count($fetches) . " entries to be fetched from server");
                 
-                $toBeFecthed = array();
+                $toBeFetched = array();
                 
                 foreach ($fetches as $fetch) {
                     $serverId = (string)$fetch->ServerId;
@@ -548,6 +548,10 @@
         // First check for folders hierarchy changes
         foreach ($this->_collections as $collectionData) {
             if (! ($collectionData->folder instanceof Syncroton_Model_IFolder)) {
+
+                if ($this->_logger instanceof Zend_Log)
+                    $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " Detected a folder hierarchy change on {$collectionData->collectionId}.");
+
                 $sync->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Status', self::STATUS_FOLDER_HIERARCHY_HAS_CHANGED));
                 return $this->_outputDom;
             }

kolab-syncroton-2.3.17.tar.gz/lib/ext/Syncroton/Server.php -> kolab-syncroton-2.3.18.tar.gz/lib/ext/Syncroton/Server.php Changed

kolab-syncroton-2.3.17.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.18.tar.gz/lib/kolab_sync.php Changed

kolab-syncroton-2.3.17.tar.gz/lib/kolab_sync_data_tasks.php -> kolab-syncroton-2.3.18.tar.gz/lib/kolab_sync_data_tasks.php Changed

@@ -164,6 +164,23 @@
         return $as_array ? $result : new Syncroton_Model_Task($result);
     }
 
+
+
+    /**
+     * Apply a timezone matching the utc offset.
+     */
+    private static function applyTimezone($value, $utcValue)
+    {
+        $tzc = kolab_sync_timezone_converter::getInstance();
+        $tz = $tzc->getOffsetTimezone($value, $utcValue);
+        if ($tz) {
+            //Setting the timezone will change the time, so we set it on the utc variant instead to end up with the same time in the new timezone.
+            $value = $utcValue;
+            $value->setTimezone($tz);
+        }
+        return $value;
+    }
+
     /**
      * convert contact from xml to libkolab array
      *
@@ -186,6 +203,23 @@
             $value = $data->$key;
 
             switch ($name) {
+
+            case 'due':
+            case 'start':
+                // We expect to always get regular and utc variants, so we only need to take one into account.
+                if ($key == 'utcStartDate' || $key == 'utcDueDate') {
+                    continue 2;
+                }
+                if ($value) {
+                    if ($name =='due' && $data->utcDueDate) {
+                        $value = static::applyTimezone($value, $data->utcDueDate);
+                    }
+                    if ($name =='start' && $data->utcStartDate) {
+                        $value = static::applyTimezone($value, $data->utcStartDate);
+                    }
+                }
+                break;
+
             case 'sensitivity':
                 $map   = array_flip($this->sensitivityMap);
                 $value = $map[$value];

kolab-syncroton-2.3.17.tar.gz/lib/kolab_sync_timezone_converter.php -> kolab-syncroton-2.3.18.tar.gz/lib/kolab_sync_timezone_converter.php Changed

@@ -87,6 +87,43 @@
         return self::$_instance;
     }
 
+
+    /**
+     * Returns a timezone with an offset matching the time difference
+     * of $dt from $referenceDt.
+     *
+     * If set and matching the offset, kolab_format::$timezone is preferred.
+     *
+     * @param DateTime $dt          The date time value for which we
+     *                              calculate the offset.
+     * @param DateTime $referenceDt The reference value, for instance in UTC.
+     *
+     * @return DateTimeZone|null
+     */
+    public function getOffsetTimezone($dt, $referenceDt)
+    {
+        $interval = $referenceDt->diff($dt);
+        $tz = new DateTimeZone($interval->format('%R%H%I')); //e.g. +0200
+        $utcOffset = $tz->getOffset($dt);
+
+        //Prefer the configured timezone if it matches the offset.
+        if (kolab_format::$timezone) {
+            if (kolab_format::$timezone->getOffset($dt) == $utcOffset) {
+                return kolab_format::$timezone;
+            }
+        }
+
+        //Look for any timezone with a matching offset.
+        foreach (DateTimeZone::listIdentifiers() as $timezoneIdentifier) {
+            $timezone = new DateTimeZone($timezoneIdentifier);
+            if ($timezone->getOffset($dt) == $utcOffset) {
+                return $timezone;
+            }
+        }
+        return null;
+    }
+
+
     /**
      * Returns a list of timezones that match to the {@param $_offsets}
      *

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2779 0

Request History

mollekopf created request almost 4 years ago

New upstream release

mollekopf accepted request almost 4 years ago