Request 2419 (accepted)

Overview

Request 2419 (accepted)

Check in 2.3.15

Created by vanmeeuwen about 6 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.14.tar.gz/lib/kolab_sync.php -> kolab-syncroton-2.3.15.tar.gz/lib/kolab_sync.php Changed

@@ -46,7 +46,7 @@
     public $password;
 
     const CHARSET = 'UTF-8';
-    const VERSION = "2.3.14";
+    const VERSION = "2.3.15";
 
 
     /**
@@ -453,13 +453,16 @@
 
         // write performance stats to logs/console
         if ($this->config->get('devel_mode') || $this->config->get('performance_stats')) {
+            // we have to disable per_user_logging to make sure stats end up in the main console log
+            $this->config->set('per_user_logging', false);
+
             // make sure logged numbers use unified format
             setlocale(LC_NUMERIC, 'en_US.utf8', 'en_US.UTF-8', 'en_US', 'C');
 
             if (function_exists('memory_get_usage'))
-                $mem = sprintf('%.1f', memory_get_usage() / 1048576);
+                $mem = round(memory_get_usage() / 1048576, 1);
             if (function_exists('memory_get_peak_usage'))
-                $mem .= '/' . sprintf('%.1f', memory_get_peak_usage() / 1048576);
+                $mem .= '/' . round(memory_get_peak_usage() / 1048576, 1);
 
             $query = $_SERVER['QUERY_STRING'];
             $log   = $query . ($mem ? ($query ? ' ' : '') . "[$mem]" : '');

kolab-syncroton-2.3.14.tar.gz/lib/kolab_sync_backend.php -> kolab-syncroton-2.3.15.tar.gz/lib/kolab_sync_backend.php Changed

@@ -776,11 +776,18 @@
         $folder_id = $this->folder_id($folder, $type);
 
         // Folder type
-        $type = self::type_kolab2activesync($type);
-        // fix type, if there's no type annotation it's detected as UNKNOWN
-        // we'll use 'mail' (12) or 'mail.inbox' (2)
-        if ($type == 1) {
-            $type = $folder == 'INBOX' ? 2 : 12;
+        if (strcasecmp($folder, 'INBOX') === 0) {
+            // INBOX is always inbox, prevent from issues related with a change of
+            // folder type annotation (it can be initially unset).
+            $type = 2;
+        }
+        else {
+            $type = self::type_kolab2activesync($type);
+
+            // fix type, if there's no type annotation it's detected as UNKNOWN we'll use 'mail' (12)
+            if ($type == 1) {
+                $type = 12;
+            }
         }
 
         // Syncroton folder data array
@@ -825,12 +832,18 @@
             return $this->folder_uids[$name] = $uid;
         }
 */
-
-        if ($type === null) {
-            $type = kolab_storage::folder_type($name);
+        if (strcasecmp($name, 'INBOX') === 0) {
+            // INBOX is always inbox, prevent from issues related with a change of
+            // folder type annotation (it can be initially unset).
+            $type = 'mail.inbox';
         }
+        else {
+            if ($type === null) {
+                $type = kolab_storage::folder_type($name);
+            }
 
-        $type = preg_replace('/\.(confidential|private)$/i', '', $type);
+            $type = preg_replace('/\.(confidential|private)$/i', '', $type);
+        }
 
         // Add type to folder UID hash, so type change can be detected by Syncroton
         $uid = $name . '!!' . $type;

kolab-syncroton-2.3.14.tar.gz/lib/kolab_sync_data.php -> kolab-syncroton-2.3.15.tar.gz/lib/kolab_sync_data.php Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2419 0

Request History

vanmeeuwen created request about 6 years ago

Check in 2.3.15

vanmeeuwen accepted review about 6 years ago

vanmeeuwen approved review about 6 years ago

vanmeeuwen accepted request about 6 years ago