Request 3305 (superseded)

This request is superseded by request 3306 (Show diff)

Overview

Request 3305 (superseded)

New release 2.4.2.23

Created by mollekopf 10 months ago
In state superseded
Supersedes 3304
Superseded by 3306
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit kolab-syncroton

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

kolab-syncroton.spec Changed

@@ -17,12 +17,6 @@
 
 %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d}
 
-%if 0%{?suse_version} < 1 && 0%{?fedora} < 1 && 0%{?rhel} < 7
-%global with_systemd 0
-%else
-%global with_systemd 1
-%endif
-
 %if 0%{?suse_version}
 %global httpd_group www
 %global httpd_name apache2
@@ -43,7 +37,7 @@
 %global upstream_version 2.4.2
 
 Name:           kolab-syncroton
-Version: 2.4.2.45
+Version: 2.4.2.23
 Release:        1%{?dist}
 Summary:        ActiveSync for Kolab Groupware
 
@@ -112,7 +106,6 @@
 
 cp -a lib %{buildroot}/%{_datadir}/%{name}/.
 cp -a index.php %{buildroot}/%{_datadir}/%{name}/.
-cp -a bin %{buildroot}/%{_datadir}/%{name}/.
 
 %if 0%{?plesk}
 cp -a %SOURCE2 %{buildroot}/%{_sysconfdir}/roundcubemail/kolab_syncroton.inc.php
@@ -171,7 +164,7 @@
 %post
 if  -f "%{php_inidir}/apc.ini" -o -f "%{php_inidir}/apcu.ini" ; then
     if  ! -z "`grep ^apc.enabled=1 %{php_inidir}/apc{,u}.ini 2>/dev/null`" ; then
-%if 0%{?with_systemd}
+%if 0%{?fedora} > 15
         /bin/systemctl condrestart %{httpd_name}.service
 %else
         /sbin/service %{httpd_name} condrestart
@@ -183,44 +176,17 @@
     /bin/systemctl reload php-fpm.service || :
 fi
 
-if  -f "/usr/lib/systemd/system/plesk-php74-fpm.service" ; then
-    /bin/systemctl reload plesk-php74-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php80-fpm.service" ; then
-    /bin/systemctl reload plesk-php80-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php81-fpm.service" ; then
-    /bin/systemctl reload plesk-php81-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php82-fpm.service" ; then
-    /bin/systemctl reload plesk-php82-fpm.service || :
-fi
-
-if  -f "/usr/lib/systemd/system/plesk-php83-fpm.service" ; then
-    /bin/systemctl reload plesk-php83-fpm.service || :
-fi
-
-
 
-%if 0%{?plesk} > 0 && 0%{?rhel} <= 8
-for version in 8.2 8.1 8.0 7.4; do
-    php="/opt/plesk/php/$version/bin/php"
+%if 0%{?plesk} > 0 && 0%{?rhel} == 7
+php="/opt/plesk/php/7.4/bin/php"
 %else
-for version in 1; do
-    php="/usr/bin/php"
+php="/usr/bin/php"
 %endif
 
-    if  -f "$php" ; then
-        ${php} /usr/share/roundcubemail/bin/updatedb.sh \
-            --dir /usr/share/doc/kolab-syncroton/SQL/ \
-            --package syncroton \
-            >/dev/null 2>&1 || :
-        break
-    fi
-done
+${php} /usr/share/roundcubemail/bin/updatedb.sh \
+    --dir /usr/share/doc/kolab-syncroton/SQL/ \
+    --package syncroton \
+    >/dev/null 2>&1 || :
 
 exit 0

debian.changelog Changed

debian.tar.gz/dirs Changed

debian.tar.gz/install Changed

kolab-syncroton-2.4.2.tar.gz/bin Deleted

kolab-syncroton-2.4.2.tar.gz/bin/analyzelogs.php Deleted

@@ -1,150 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/*
- +--------------------------------------------------------------------------+
- | Kolab Sync (ActiveSync for Kolab)                                        |
- |                                                                          |
- | Copyright (C) 2024, Apheleia IT AG <contact@apheleia-it.ch>         |
- |                                                                          |
- | This program is free software: you can redistribute it and/or modify     |
- | it under the terms of the GNU Affero General Public License as published |
- | by the Free Software Foundation, either version 3 of the License, or     |
- | (at your option) any later version.                                      |
- |                                                                          |
- | This program is distributed in the hope that it will be useful,          |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
- | GNU Affero General Public License for more details.                      |
- |                                                                          |
- | You should have received a copy of the GNU Affero General Public License |
- | along with this program. If not, see <http://www.gnu.org/licenses/>      |
- +--------------------------------------------------------------------------+
- | Author: Christian Mollekopf <mollekopf@apheleia-it.ch>                      |
- +--------------------------------------------------------------------------+
-*/
-
-
-define('RCUBE_INSTALL_PATH', realpath(dirname(__FILE__) . '/../') . '/');
-
-// Define include path
-$include_path  = RCUBE_INSTALL_PATH . 'lib' . PATH_SEPARATOR;
-$include_path .= RCUBE_INSTALL_PATH . 'lib/ext' . PATH_SEPARATOR;
-$include_path .= ini_get('include_path');
-set_include_path($include_path);
-
-require_once "Syncroton/Command/ICommand.php";
-require_once "Syncroton/Command/Wbxml.php";
-require_once "Syncroton/Command/Sync.php";
-require_once "Syncroton/Command/Ping.php";
-require_once "Syncroton/Command/MoveItems.php";
-require_once "Syncroton/Command/FolderSync.php";
-
-$filename = $argv1;
-
-$content = file_get_contents($filename);
-
-// Split up the log files into chunks that hopefully match the commands
-$parts = preg_split("/\.*\: " . preg_quote("DEBUG", '/') . " Syncroton_Server::handle::\d+ REQUEST METHOD: POST/", $content, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-
-function getStatusConstants($classname)
-{
-    $reflect = new ReflectionClass($classname);
-    $result = $reflect->getConstants();
-    $result = array_filter($result, function ($val) {
-        return str_starts_with($val, "STATUS_");
-    }, ARRAY_FILTER_USE_KEY);
-    $result = array_flip($result);
-    return $result;
-}
-
-function explainStatus($command, $status)
-{
-    if (!$status) {
-        return "none";
-    }
-    switch ($command) {
-        case "Ping":
-            $result = getStatusConstants("Syncroton_Command_Ping");
-            return $result$status ?? "Unknown";
-        case "Sync":
-            $result = getStatusConstants("Syncroton_Command_Sync");
-            return $result$status ?? "Unknown";
-        case "MoveItems":
-            $result = getStatusConstants("Syncroton_Command_MoveItems");
-            return $result$status ?? "Unknown";
-        case "FolderSync":
-            $result = getStatusConstants("Syncroton_Command_FolderSync");
-            return $result$status ?? "Unknown";
-    }
-    return "Unknown command";
-}
-
-foreach ($parts as $part) {
-    preg_match('/\(.*)\: /', $part, $matches);
-    $timestamp = $matches1;
-
-    preg_match('/\command\ => (.*)/', $part, $matches);
-    $command = $matches1;
-
-    preg_match('/\<Status\>(.*)\<\/Status\>/', $part, $matches);
-    $status = $matches1 ?? null;
-
-    $statusExplained = explainStatus($command, $status);
-
-    print(" Command: " . str_pad($command, 10) . str_pad("\tStatus: $status ($statusExplained)", 45) . "\tTimestamp: $timestamp\n");
-    if ($command == "Sync") {
-        // Find collections within this sync
-        // 25-Sep-2024 09:16:35.347730: INFO Syncroton_Command_Sync::handle::221 SyncKey is 7301 Class: Email CollectionId: 38b950ebd62cd9a66929c89615d0fc04
-        if (preg_match_all('/SyncKey is (.*) Class: (.*) CollectionId: (.*)/', $part, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER)) {
-            foreach ($matches as $set) {
-                $offset = $set01;
-                $collectionId = $set30;
-                $class = $set20;
-                $synckey = $set10;
-                print(str_pad("  Collection: $collectionId ($class)", 58) . "\tSyncKey: $synckey\n");
-
-                //Find the offset for this collections messages
-                if (preg_match("/Processing $collectionId\.\.\./", $part, $match, PREG_OFFSET_CAPTURE, $offset)) {
-                    // print_r($match);
-                    $offset = $match01 ?? null;
-                    //Find the actual changes
-                    if ($offset && preg_match('/found $added\/changed\/deleted$ (.*)\/(.*)\/(.*) entries for sync from server to client/', $part, $changesMatch, PREG_OFFSET_CAPTURE, $offset)) {
-                        // If the offset is too large we are looking at the next collection.
-                        if ($changesMatch01 - $offset < 200) {
-                            print("    " . $changesMatch00 . "\n");
-                        }
-                    }
-                }
-                //TODO We could figure out what the diff per collection was in terms of synckey to the last sync
-                //TODO We could figure out what we actually return in the response compared to the detected changeset
-                //TODO Warn if a collection is repeatedly synced with the same synckey, but changes are detected. It may be stuck in a sync loop.
-            }
-        }
-
-        // Detect entries that are being added from the client
-        if (preg_match_all('/found (.*) entries to be added on server/', $part, $matches)) {
-            foreach ($matches0 ??  as $match) {
-                print("  " . $match . "\n");
-            }
-        }
-
-        if (preg_match_all('/found (.*) entries to be updated on server/', $part, $matches)) {
-            foreach ($matches0 ??  as $match) {
-                print("  " . $match . "\n");
-            }
-        }
-
-        if (preg_match_all('/found (.*) entries to be deleted on server/', $part, $matches)) {
-            foreach ($matches0 ??  as $match) {
-                print("  " . $match . "\n");
-            }
-        }
-    }
-    //TODO on Sync:
-    //* number of Add/Change/Remove from client and from server
-    //* Synckey
-    //* list involved folders
-    //TODO on Sync:
-    //* Reason for interruption
-}

kolab-syncroton-2.4.2.tar.gz/bin/delete-device.php Deleted

@@ -1,102 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/*
- +--------------------------------------------------------------------------+
- | Kolab Sync (ActiveSync for Kolab)                                        |
- |                                                                          |
- | Copyright (C) 2024, Apheleia IT AG <contact@apheleia-it.ch>         |
- |                                                                          |
- | This program is free software: you can redistribute it and/or modify     |
- | it under the terms of the GNU Affero General Public License as published |
- | by the Free Software Foundation, either version 3 of the License, or     |
- | (at your option) any later version.                                      |
- |                                                                          |
- | This program is distributed in the hope that it will be useful,          |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
- | GNU Affero General Public License for more details.                      |
- |                                                                          |
- | You should have received a copy of the GNU Affero General Public License |
- | along with this program. If not, see <http://www.gnu.org/licenses/>      |
- +--------------------------------------------------------------------------+
- | Author: Christian Mollekopf <mollekopf@apheleia-it.ch>                      |
- +--------------------------------------------------------------------------+
-*/
-
-
-define('RCUBE_INSTALL_PATH', realpath(dirname(__FILE__) . '/../') . '/');
-define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'lib/plugins/');
-
-// Define include path
-$include_path  = RCUBE_INSTALL_PATH . 'lib' . PATH_SEPARATOR;
-$include_path .= RCUBE_INSTALL_PATH . 'lib/ext' . PATH_SEPARATOR;
-$include_path .= ini_get('include_path');
-set_include_path($include_path);
-
-// include composer autoloader (if available)
-if (@file_exists(RCUBE_INSTALL_PATH . 'vendor/autoload.php')) {
-    require RCUBE_INSTALL_PATH . 'vendor/autoload.php';
-}
-
-// include global functions from Roundcube Framework
-require_once 'Roundcube/bootstrap.php';
-
-$opts = rcube_utils::get_opt(
-    's' => 'since', // Deletes *all* devices that haven't been used since the given timestamp. Doesn't take owner and device id into account. Timestamp format e.g.: "2024-11-01"
-    'o' => 'owner',
-    'd' => 'deviceid',
-);
-
-$rcube = \rcube::get_instance();
-$db    = $rcube->get_dbh();
-
-if (!empty($opts'since')) {
-    $since = $opts'since';
-    $since = new DateTime($since);
-    print("Removing all devices that haven't been used since: " . $since->format('Y-m-d H:i:s') . "\n");
-
-    $db->query(
-        "DELETE FROM `syncroton_device`"
-        . " WHERE `lastping` < ? OR `lastping` = NULL",
-        $since->format('Y-m-d H:i:s')
-    );
-    return;
-}
-
-if (empty($opts'deviceid')) {
-    rcube::raise_error("Device id not specified (--deviceid).", false, true);
-}
-$device = $opts'deviceid';
-
-if (empty($opts'owner')) {
-    rcube::raise_error("owner not specified (--owner).", false, true);
-}
-$owner = $opts'owner';
-
-$host = $rcube->config->get('imap_host', $rcube->config->get('default_host'));
-$host = parse_url($host, PHP_URL_HOST) ?? $host;
-$select = $db->query(
-    "SELECT `user_id` FROM `users`"
-    . " WHERE `username` = ?"
-    . " AND `mail_host` = ?"
-    . " ORDER BY `user_id` DESC",
-    \strtolower($owner),
-    \strtolower($host)
-);
-
-if ($data = $db->fetch_assoc($select)) {
-    $userid = $data'user_id';
-} else {
-    rcube::raise_error("User not found in roundcube database, aborting: $email.", false, true);
-}
-
-print("Found the user with id: $userid\n");
-
-$db->query(
-    "DELETE FROM syncroton_device WHERE owner_id = ? AND deviceid = ?",
-    $userid,
-    $device
-);
-
-print("Deleted the device with the deviceid: $deviceid\n");

kolab-syncroton-2.4.2.tar.gz/bin/inspect.php Deleted

@@ -1,424 +0,0 @@
-#!/usr/bin/env php
-<?php
-
-/*
- +--------------------------------------------------------------------------+
- | Kolab Sync (ActiveSync for Kolab)                                        |
- |                                                                          |
- | Copyright (C) 2024, Apheleia IT AG <contact@apheleia-it.ch>         |
- |                                                                          |
- | This program is free software: you can redistribute it and/or modify     |
- | it under the terms of the GNU Affero General Public License as published |
- | by the Free Software Foundation, either version 3 of the License, or     |
- | (at your option) any later version.                                      |
- |                                                                          |
- | This program is distributed in the hope that it will be useful,          |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
- | GNU Affero General Public License for more details.                      |
- |                                                                          |
- | You should have received a copy of the GNU Affero General Public License |
- | along with this program. If not, see <http://www.gnu.org/licenses/>      |
- +--------------------------------------------------------------------------+
- | Author: Christian Mollekopf <mollekopf@apheleia-it.ch>                      |
- +--------------------------------------------------------------------------+
-*/
-
-
-define('RCUBE_INSTALL_PATH', realpath(dirname(__FILE__) . '/../') . '/');
-define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'lib/plugins/');
-
-// Define include path
-$include_path  = RCUBE_INSTALL_PATH . 'lib' . PATH_SEPARATOR;
-$include_path .= RCUBE_INSTALL_PATH . 'lib/ext' . PATH_SEPARATOR;
-$include_path .= ini_get('include_path');
-set_include_path($include_path);
-
-// include composer autoloader (if available)
-if (@file_exists(RCUBE_INSTALL_PATH . 'vendor/autoload.php')) {
-    require RCUBE_INSTALL_PATH . 'vendor/autoload.php';
-}
-
-// include global functions from Roundcube Framework
-require_once 'Roundcube/bootstrap.php';
-
-
-function filterTypeToIMAPSearch($filter_type = 0)
-{
-    switch ($filter_type) {
-        case 1:
-            $mod = '-1 day';
-            break;
-        case 2:
-            $mod = '-3 days';
-            break;
-        case 3:
-            $mod = '-1 week';
-            break;
-        case 4:
-            $mod = '-2 weeks';
-            break;
-        case 5:
-            $mod = '-1 month';
-            break;
-    }
-
-    if (!empty($mod)) {
-        $dt = new DateTime('now', new DateTimeZone('UTC'));
-        $dt->modify($mod);
-        // RFC3501: IMAP SEARCH
-        return 'SINCE ' . $dt->format('d-M-Y');
-    }
-
-    return "";
-}
-
-
-$opts = rcube_utils::get_opt(
-    'e' => 'email',
-    'p' => 'adminpassword',
-    'd' => 'debug',
-    'k' => 'dump',
-);
-
-if (empty($opts'email')) {
-    rcube::raise_error("Email address not specified (--email).", false, true);
-}
-$email = $opts'email';
-
-$proxyAuth = false;
-if ($password = $opts'adminpassword') {
-    $proxyAuth = true;
-    $user = "cyrus-admin";
-} else {
-    $password = $opts'password';
-}
-
-if (empty($password)) {
-    rcube::raise_error("Password not specified (--adminpassword/--password).", false, true);
-}
-
-$rcube = rcube::get_instance();
-$default_port = $rcube->config->get('default_port', 143);
-
-$host = $rcube->config->get('imap_host', $rcube->config->get('default_host'));
-
-// parse $host
-$a_host = parse_url($host);
-$port = null;
-$ssl = null;
-if (!empty($a_host'host')) {
-    $host = $a_host'host';
-    $ssl = (isset($a_host'scheme') && in_array($a_host'scheme', 'ssl','imaps','tls')) ? $a_host'scheme' : null;
-    if (!empty($a_host'port')) {
-        $port = $a_host'port';
-    } elseif ($ssl && $ssl != 'tls' && (!$default_port || $default_port == 143)) {
-        $port = 993;
-    }
-}
-
-if (!$port) {
-    $port = $default_port;
-}
-
-$imap = new \rcube_imap_generic();
-if ($proxyAuth) {
-    $options'auth_cid' = $user;
-    $options'auth_pw' = $password;
-}
-$options'auth_type' = 'PLAIN';
-$options'port' = $port;
-
-$options'socket_options' = 
-    'ssl' => 
-        'verify_peer_name' => false,
-        'verify_peer' => false,
-        'allow_self_signed' => true,
-    ,
-;
-
-ini_set('display_errors', 1);
-error_reporting(E_ALL);
-
-$debug = !empty($opts'debug');
-
-$imap->setDebug($debug);
-if (!$imap->connect($host, $email, $password, $options)) {
-    rcube::raise_error("Failed to connect to imap.", false, true);
-}
-
-$rcube = \rcube::get_instance();
-$db    = $rcube->get_dbh();
-
-$select = $db->query(
-    "SELECT `user_id` FROM `users`"
-    . " WHERE `username` = ?"
-    . " AND `mail_host` = ?"
-    . " ORDER BY `user_id` DESC",
-    \strtolower($email),
-    \strtolower($host)
-);
-
-if ($data = $db->fetch_assoc($select)) {
-    $userid = $data'user_id';
-} else {
-    rcube::raise_error("User not found in roundcube database (only available after first login): $email.", false, true);
-}
-
-print("Found the user with id: $userid\n");
-
-$devicesSelect = $db->query(
-    "SELECT `id`, `deviceid`, `devicetype` FROM `syncroton_device`"
-    . " WHERE `owner_id` = ?",
-    $userid
-);
-
-$result = ;
-while ($data = $db->fetch_assoc($devicesSelect)) {
-    $deviceid = $data"deviceid";
-    $device_id = $data"id";
-
-    $result$device_id'deviceid' = $deviceid;
-    $result$device_id'device_id' = $device_id;
-    $result$device_id'devicetype' = $data"devicetype";
-
-    $select = $db->limitquery(
-        "SELECT `counter`, `lastsync` FROM `syncroton_synckey`"
-        . " WHERE `device_id` = ? AND `type` = 'FolderSync'"
-        . " ORDER BY `counter` DESC",
-        0,
-        1,
-        $device_id
-    );
-
-    if ($data = $db->fetch_assoc($select)) {
-        $result$device_id'FolderSync' = 
-            "counter" => $data'counter',
-            "lastsync" => $data'lastsync',
-        ;
-    } else {
-        echo("Synckey not found.\n");
-    }
-
-    $folderSelect = $db->query(
-        "SELECT * FROM `syncroton_folder`"
-        . " WHERE `device_id` = ?",
-        $device_id
-    );
-
-    while ($folder = $db->fetch_assoc($folderSelect)) {
-        $select = $db->limitquery(
-            "SELECT `counter`, `lastsync`, `extra_data` FROM `syncroton_synckey`"
-            . " WHERE `device_id` = ? AND `type` = ?"
-            . " ORDER BY `counter` DESC",
-            0,
-            1,
-            $device_id,
-            $folder'id'
-        );
-
-        if ($data = $db->fetch_assoc($select)) {
-            $result$device_id'folders'$folder'id' = 
-                "counter" => $data'counter',
-                "lastsync" => $data'lastsync',
-                "modseq" => $data'extra_data' ? json_decode($data'extra_data')->modseq : null,
-            ;
-        }
-
-        $result$device_id'folders'$folder'id''name' = $folder'displayname';
-        $result$device_id'folders'$folder'id''folderid' = $folder'folderid';
-        $result$device_id'folders'$folder'id''class' = $folder'class';
-        $result$device_id'folders'$folder'id''lastfiltertype' = $folder'lastfiltertype' ?? null;
-
-        $imap->select($folder'displayname');
-        $result$device_id'folders'$folder'id''imapModseq' = $imap->data'HIGHESTMODSEQ' ?? null;
-
-        $index = $imap->search(
-            $folder'displayname',
-            'ALL UNDELETED ' . filterTypeToIMAPSearch($folder'lastfiltertype'),
-            false,
-            'COUNT'
-        );
-        if (!$index->is_error()) {
-            $result$device_id'folders'$folder'id''imapMessagecount' = $index->count();
-        }
-
-        $select = $db->query(
-            "SELECT count(*) FROM `syncroton_content`"
-            . " WHERE `device_id` = ? AND `folder_id` = ?",
-            $device_id,
-            $folder'id'
-        );
-
-        if ($data = $db->fetch_assoc($select)) {
-            $result$device_id'folders'$folder'id''contentCount' = array_values($data)0;
-        }
-    }
-}
-
-if ($debug) {
-    var_export($result);
-}
-
-function println($output)
-{
-    print("{$output}\n");
-}
-
-function filterType($value)
-{
-    if (!$value) {
-        return "No filter";
-    }
-    switch ($value) {
-        case 0: return "No filter";
-        case 1: return "1 day";
-        case 2: return "3 days";
-        case 3: return "1 week";
-        case 4: return "2 weeks";
-        case 5: return "1 month";
-        case 6: return "3 months (WARNING: not implemented)";
-        case 7: return "6 months (WARNING: not implemented)";
-        case 8: return "Filter by incomplete tasks";
-    }
-    return "Unknown value: $value";
-}
-
-
-function getContentIds($db, $device_id, $folder_id)
-{
-    $contentSelect = $db->query(
-        "SELECT contentid FROM `syncroton_content`"
-        . " WHERE `device_id` = ? AND `folder_id` = ? AND `is_deleted` = 0",
-        $device_id,
-        $folder_id
-    );
-
-    $contentUids = ;
-    while ($content = $db->fetch_assoc($contentSelect)) {
-        $contentUids = $content'contentid';
-    }
-    return $contentUids;
-}
-
-function getContentUids($db, $device_id, $folder_id)
-{
-    $contentSelect = $db->query(
-        "SELECT contentid FROM `syncroton_content`"
-        . " WHERE `device_id` = ? AND `folder_id` = ? AND `is_deleted` = 0",
-        $device_id,
-        $folder_id
-    );
-
-    $contentUids = ;
-    while ($content = $db->fetch_assoc($contentSelect)) {
-        $contentUids = explode('::', $content'contentid')1;
-    }
-    return $contentUids;
-}
-
-function getImapUids($imap, $folder, $lastfiltertype)
-{
-    $imap->select($folder);
-    $index = $imap->search($folder, 'ALL UNDELETED ' . filterTypeToIMAPSearch($lastfiltertype), true);
-    if (!$index->is_error()) {
-        return $index->get();
-    }
-    return ;
-}
-
-println("");
-foreach ($result as $deviceId => $values) {
-    $device_id = $values'deviceid';
-    println("Device: $device_id ($deviceId)");
-    println("  Last folder sync: " . $values'FolderSync''lastsync');
-    println("  Folder sync count: " . $values'FolderSync''counter');
-    println("  Folders:");
-    foreach ($values'folders' ??  as $folderId => $folder) {
-        $folder_id = $folder'folderid';
-        println("    " . $folder'name' . " $folder_id ($folderId)");
-        $messageCount = $folder'contentCount';
-        $totalCount = $folder'imapMessagecount' ?? "unknown";
-        $modseq = $folder'modseq' ?? "none";
-        $imapModseq = $folder'imapModseq';
-        // We're not using modseq for groupware folders
-        if ($messageCount == $totalCount && ($modseq == "none" || $modseq == $imapModseq)) {
-            println("    Status: Fully Synced ($messageCount messages)");
-        } else {
-            println("    Status: Incomplete ($messageCount/$totalCount messages)");
-            println("    Modseq: " . $modseq . "/" . $imapModseq);
-        }
-        println("    Last sync: " . ($folder'lastsync' ?? "None"));
-        println("    Number of syncs: " . ($folder'counter' ?? "None"));
-        println("    Filter type: " . filterType($folder'lastfiltertype' ?? null));
-
-
-        if (!empty($opts'dump') && $opts'dump' == $folder'name') {
-            $contentUids = getContentUids($db, $deviceId, $folderId);
-            $imapUids = getImapUids($imap, $folder'name', $folder'lastfiltertype' ?? null);
-
-            $entries = array_diff($imapUids, $contentUids);
-            if (!empty($entries)) {
-                println("       The following messages are on the server, but not the device:");
-                foreach ($entries as $uid) {
-                    println("           $uid");
-                    //TODO get details from imap?
-                }
-            }
-
-            $entries = array_diff($contentUids, $imapUids);
-            if (!empty($entries)) {
-                println("       The following messages are on the device, but not the server:");
-                foreach ($entries as $uid) {
-                    println("           $uid");
-                    //TODO get details from the content part?
-                    //TODO display creation_synckey?
-                }
-            }
-
-            $contentUids = getContentUids($db, $deviceId, $folderId);
-            foreach (array_slice($contentUids, -10, 10) as $uid) {
-                println($uid);
-            }
-
-            $contentIds = getContentIds($db, $deviceId, $folderId);
-            foreach (array_slice($contentIds, -10, 10) as $uid) {
-                println($uid);
-            }
-        }
-
-        if (($folder'class' == "Email") && ($folder'counter' ?? false) && $messageCount != $totalCount && ($modseq == "none" || $modseq == $imapModseq)) {
-            if (($folder'lastfiltertype' ?? false) && $messageCount > $totalCount) {
-                // This doesn't have to indicate an issue, since the timewindow of the filter wanders, so some messages that have been synchronized may no longer match the window.
-            } else {
-                println("    Issue Detected: The sync state seems to be inconsistent. The device should be fully synced, but the sync counts differ.");
-                println("    There are $messageCount ContentParts (should match number of messages on the device), but $totalCount messages in IMAP matching the filter.");
-
-                $contentUids = getContentUids($db, $deviceId, $folderId);
-                $imapUids = getImapUids($imap, $folder'name', $folder'lastfiltertype' ?? null);
-
-                $entries = array_diff($imapUids, $contentUids);
-                if (!empty($entries)) {
-                    println("       The following messages are on the server, but not the device:");
-                    foreach ($entries as $uid) {
-                        println("           $uid");
-                        //TODO get details from imap?
-                    }
-                }
-
-                $entries = array_diff($contentUids, $imapUids);
-                if (!empty($entries)) {
-                    println("       The following messages are on the device, but not the server:");
-                    foreach ($entries as $uid) {
-                        println("           $uid");
-                        //TODO get details from the content part?
-                        //TODO display creation_synckey?
-                    }
-                }
-                println("");
-            }
-        }
-
-        println("");
-    }
-}

kolab-syncroton-2.4.2.tar.gz/bin/resync.php Deleted

@@ -1,118 +0,0 @@
-#!/usr/bin/php
-<?php
-
-/*
- +--------------------------------------------------------------------------+
- | Kolab Sync (ActiveSync for Kolab)                                        |
- |                                                                          |
- | Copyright (C) 2024, Apheleia IT AG <contact@apheleia-it.ch>              |
- |                                                                          |
- | This program is free software: you can redistribute it and/or modify     |
- | it under the terms of the GNU Affero General Public License as published |
- | by the Free Software Foundation, either version 3 of the License, or     |
- | (at your option) any later version.                                      |
- |                                                                          |
- | This program is distributed in the hope that it will be useful,          |
- | but WITHOUT ANY WARRANTY; without even the implied warranty of           |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the             |
- | GNU Affero General Public License for more details.                      |
- |                                                                          |
- | You should have received a copy of the GNU Affero General Public License |
- | along with this program. If not, see <http://www.gnu.org/licenses/>      |
- +--------------------------------------------------------------------------+
- | Author: Aleksander Machniak <machniak@apheleia-it.ch>                    |
- +--------------------------------------------------------------------------+
-*/
-
-define('RCUBE_INSTALL_PATH', realpath(dirname(__FILE__) . '/../') . '/');
-define('RCUBE_PLUGINS_DIR', RCUBE_INSTALL_PATH . 'lib/plugins/');
-
-// Define include path
-$include_path  = RCUBE_INSTALL_PATH . 'lib' . PATH_SEPARATOR;
-$include_path .= RCUBE_INSTALL_PATH . 'lib/ext' . PATH_SEPARATOR;
-$include_path .= ini_get('include_path');
-set_include_path($include_path);
-
-// include composer autoloader (if available)
-if (@file_exists(RCUBE_INSTALL_PATH . 'vendor/autoload.php')) {
-    require RCUBE_INSTALL_PATH . 'vendor/autoload.php';
-}
-
-// include global functions from Roundcube Framework
-require_once 'Roundcube/bootstrap.php';
-
-$opts = rcube_utils::get_opt(
-    'o' => 'owner',
-    'f' => 'folder',
-    'd' => 'deviceid',
-    't' => 'devicetype', // e.g. WindowsOutlook15 or iPhone
-);
-
-$rcube = \rcube::get_instance();
-$db    = $rcube->get_dbh();
-
-if (empty($opts'owner')) {
-    rcube::raise_error("Owner not specified (--owner).", false, true);
-}
-if (empty($opts'folder')) {
-    rcube::raise_error("Folder name not specified (--folder).", false, true);
-}
-
-$select = $db->query(
-    "SELECT `user_id` FROM `users` WHERE `username` = ? ORDER BY `user_id` DESC",
-    \strtolower($opts'owner')
-);
-
-if ($data = $db->fetch_assoc($select)) {
-    $userid = $data'user_id';
-} else {
-    rcube::raise_error("User not found in Roundcube database.", false, true);
-}
-
-$devices = ;
-if (!empty($opts'deviceid')) {
-    $select = $db->query(
-        "SELECT `id` FROM `syncroton_device` WHERE `owner_id` = ? AND `deviceid` = ?",
-        $userid,
-        $opts'deviceid'
-    );
-    while ($record = $db->fetch_assoc($select)) {
-        $devices = $record'id';
-    }
-} elseif (!empty($opts'devicetype')) {
-    $select = $db->query(
-        "SELECT `id` FROM `syncroton_device` WHERE `owner_id` = ? AND `devicetype` = ?",
-        $userid,
-        $opts'devicetype'
-    );
-    while ($record = $db->fetch_assoc($select)) {
-        $devices = $record'id';
-    }
-} else {
-    $select = $db->query("SELECT `id` FROM `syncroton_device` WHERE `owner_id` = ?", $userid);
-    while ($record = $db->fetch_assoc($select)) {
-        $devices = $record'id';
-    }
-}
-
-if (empty($devices)) {
-    rcube::raise_error("Device not found.", false, true);
-}
-
-// TODO: Support not only top-level folders
-
-$select = $db->query(
-    "SELECT syncroton_folder.id, `displayname`, `folderid`, `deviceid` FROM `syncroton_folder`"
-    . " JOIN `syncroton_device` ON syncroton_device.id = syncroton_folder.device_id"
-    . " WHERE `device_id` IN (" . $db->array2list($devices) . ")"
-    . " AND `parentid` = '0' AND `displayname` = " . $db->quote($opts'folder')
-);
-
-while ($record = $db->fetch_assoc($select)) {
-    if (!empty($opts'dry-run')) {
-        print("DRY-RUN {$record'displayname'} {$record'deviceid'} ({$record'id'}:{$record'folderid'})\n");
-    } else {
-        $db->query("UPDATE `syncroton_folder` SET `resync` = 1 WHERE id = ?", $record'id');
-        print("{$record'displayname'} {$record'deviceid'} ({$record'id'}:{$record'folderid'})\n");
-    }
-}

kolab-syncroton-2.4.2.tar.gz/config/config.inc.php.dist Changed

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql.initial.sql Changed

@@ -44,14 +44,11 @@
     `displayname` varchar(254) NOT NULL,
     `type` int(11) NOT NULL,
     `creation_time` datetime NOT NULL,
-    `creation_synckey` int(11) NOT NULL DEFAULT '0',
     `lastfiltertype` int(11) DEFAULT NULL,
     `supportedfields` longblob DEFAULT NULL,
-    `resync` tinyint(1) DEFAULT NULL,
-    `is_deleted` tinyint(1) DEFAULT '0',
     PRIMARY KEY (`id`),
     UNIQUE KEY `device_id--class--folderid` (`device_id`(40),`class`(40),`folderid`(40)),
-    KEY `device_id--is_deleted` (`device_id`,`is_deleted`),
+    KEY `folderstates::device_id--devices::id` (`device_id`),
     CONSTRAINT `folderstates::device_id--devices::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE 
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
@@ -79,7 +76,7 @@
     `is_deleted` tinyint(1) DEFAULT '0',
     PRIMARY KEY (`id`),
     UNIQUE KEY `device_id--folder_id--contentid` (`device_id`(40),`folder_id`(40),`contentid`(128)),
-    KEY `device_id--is_deleted` (`device_id`,`is_deleted`),
+    KEY `syncroton_contents::device_id` (`device_id`),
     CONSTRAINT `syncroton_contents::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
@@ -110,22 +107,12 @@
     CONSTRAINT `syncroton_relations_state::device_id--syncroton_device::id` FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
-CREATE TABLE IF NOT EXISTS `syncroton_subscriptions` (
-    `device_id` varchar(40) NOT NULL,
-    `type` varchar(16) NOT NULL,
-    `data` longblob NOT NULL,
-    PRIMARY KEY (`device_id`, `type`),
-    KEY `syncroton_subscriptions::device_id` (`device_id`),
-    CONSTRAINT `syncroton_subscriptions::device_id--syncroton_device::id`
-        FOREIGN KEY (`device_id`) REFERENCES `syncroton_device` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
-
 -- Roundcube core table should exist if we're using the same database
 
 CREATE TABLE IF NOT EXISTS `system` (
-    `name` varchar(64) NOT NULL,
-    `value` mediumtext,
-    PRIMARY KEY (`name`)
+ `name` varchar(64) NOT NULL,
+ `value` mediumtext,
+ PRIMARY KEY(`name`)
 ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
 
-INSERT INTO `system` (`name`, `value`) VALUES ('syncroton-version', '2025060500');
+INSERT INTO `system` (`name`, `value`) VALUES ('syncroton-version', '2024031100');

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2024101700.sql Deleted

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2024102300.sql Deleted

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2025042900.sql Deleted

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2025043000.sql Deleted

kolab-syncroton-2.4.2.tar.gz/docs/SQL/mysql/2025060500.sql Deleted

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/ABackend.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/Content.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/Device.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/Folder.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/IBackend.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/IContent.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/IDevice.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/IFolder.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/ISyncState.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/Policy.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Backend/SyncState.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/AutoDiscover.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/FolderCreate.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/FolderDelete.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/FolderSync.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -69,11 +68,6 @@
     protected $_syncKey;
 
     /**
-     * @var bool
-     */
-    protected $_syncKeyReused = false;
-
-    /**
      * Parse FolderSync request
      */
     public function handle()
@@ -97,20 +91,9 @@
             $this->_syncStateBackend->resetState($this->_device, 'FolderSync');
 
             return;
-        } else {
-            // The synckey that is sent to us should already be existing, because we create it at the end,
-            // however, the next one shouldn't
-            if ($this->_syncStateBackend->haveNext($this->_device, 'FolderSync', $syncKey)) {
-                $this->_syncKeyReused = true;
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " already known synckey $syncKey provided");
-                }
-            }
         }
+
         if (!($this->_syncState = $this->_syncStateBackend->validate($this->_device, 'FolderSync', $syncKey)) instanceof Syncroton_Model_SyncState) {
-            if ($this->_logger instanceof Zend_Log) {
-                $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " invalid synckey $syncKey provided, invalidating sync state");
-            }
             $this->_syncStateBackend->resetState($this->_device, 'FolderSync');
         }
     }
@@ -144,7 +127,7 @@
         $updates = ;
         $deletes = ;
 
-        foreach ($this->_classes as $class) {
+        foreach($this->_classes as $class) {
             try {
                 $dataController = Syncroton_Data_Factory::factory($class, $this->_device, $this->_syncTimeStamp);
             } catch (Exception $e) {
@@ -160,7 +143,7 @@
                 $serverFolders = $dataController->getAllFolders();
 
                 // retrieve all folders sent to client
-                $clientFolders = $this->_folderBackend->getFolderState($this->_device, $class, $this->_syncState->counter);
+                $clientFolders = $this->_folderBackend->getFolderState($this->_device, $class);
 
                 if ($this->_syncState->counter > 0) {
                     // retrieve all folders changed since last sync
@@ -211,7 +194,6 @@
                 } else {
                     $add = $serverFolders$serverFolderId;
                     $add->creationTime = $this->_syncTimeStamp;
-                    $add->creationSynckey = $this->_syncState->counter + 1;
                     $add->deviceId     = $this->_device->id;
                     unset($add->id);
                 }
@@ -252,17 +234,6 @@
                 }
             }
 
-            // Handle folders set for forced re-sync, we'll send a delete action to the client,
-            // but because the folder is still existing and subscribed on the backend it should
-            // "immediately" be added again (and re-synced).
-            $forceDeleteIds = array_keys(array_filter($clientFolders, function ($f) { return !empty($f->resync); }));
-            if (!empty($forceDeleteIds)) {
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " forcing resync of: " . var_export($forceDeleteIds, true));
-                }
-            }
-            $serverFoldersIds = array_diff($serverFoldersIds, $forceDeleteIds);
-
             // calculate deleted entries
             $serverDiff = array_diff($clientFoldersIds, $serverFoldersIds);
             foreach ($serverDiff as $serverFolderId) {
@@ -272,53 +243,48 @@
 
         $folderSync->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Status', self::STATUS_SUCCESS));
 
-        $newSyncKey = $this->_syncState->counter;
         $count = count($adds) + count($updates) + count($deletes);
-        if ($count > 0) {
-            $newSyncKey++;
+        if($count > 0) {
+            $this->_syncState->counter++;
+            $this->_syncState->lastsync = $this->_syncTimeStamp;
         }
 
         // create xml output
-        $folderSync->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'SyncKey', $newSyncKey));
+        $folderSync->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'SyncKey', $this->_syncState->counter));
 
         $changes = $folderSync->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Changes'));
         $changes->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Count', $count));
 
-        foreach ($adds as $folder) {
+        foreach($adds as $folder) {
             $add = $changes->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Add'));
 
             $folder->appendXML($add, $this->_device);
 
-            if (!$this->_syncKeyReused && empty($folder->id)) {
-                // The folder could exist in the backend if we e.g. delete the same name and then recreate,
-                // or disable/reenable for syncing.
-                if (!$this->_folderBackend->exists($this->_device->id, $folder->serverId)) {
-                    $this->_folderBackend->create($folder);
-                }
+            // store folder in backend
+            if (empty($folder->id)) {
+                $this->_folderBackend->create($folder);
             }
         }
 
-        foreach ($updates as $folder) {
+        foreach($updates as $folder) {
             $update = $changes->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Update'));
 
             $folder->appendXML($update, $this->_device);
+
             $this->_folderBackend->update($folder);
         }
 
-        foreach ($deletes as $folder) {
+        foreach($deletes as $folder) {
             $delete = $changes->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'Delete'));
             $delete->appendChild($this->_outputDom->createElementNS('uri:FolderHierarchy', 'ServerId', $folder->serverId));
 
             $this->_folderBackend->delete($folder);
         }
 
-        if ($this->_syncState->counter != $newSyncKey) {
-            $this->_syncState->counter = $newSyncKey;
-            $this->_syncState->lastsync = $this->_syncTimeStamp;
-            // Keep previous sync states in case a sync key is re-sent.
-            // We always insert because deleteOtherStates is executed from _syncStateBackend->validate,
-            // which means we remove and re-insert the latest state on key resend.
-            $this->_syncStateBackend->create($this->_syncState, true); // @phpstan-ignore-line
+        if (empty($this->_syncState->id)) {
+            $this->_syncStateBackend->create($this->_syncState);
+        } else {
+            $this->_syncStateBackend->update($this->_syncState);
         }
 
         return $this->_outputDom;

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/FolderUpdate.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/GetAttachment.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/GetItemEstimate.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -60,7 +59,7 @@
                 $collectionData'folder' = $this->_folderBackend->getFolder($this->_device, $collectionData'collectionId');
                 $collectionData'folder'->lastfiltertype = $collectionData'filterType';
 
-                if ($collectionData'syncKey' === 0) {
+                if($collectionData'syncKey' === 0) {
                     $collectionData'syncState' = new Syncroton_Model_SyncState(
                         'device_id' => $this->_device,
                         'counter'   => 0,
@@ -93,7 +92,7 @@
     {
         $itemEstimate = $this->_outputDom->documentElement;
 
-        foreach ($this->_collections as $collectionData) {
+        foreach($this->_collections as $collectionData) {
             $response = $itemEstimate->appendChild($this->_outputDom->createElementNS('uri:ItemEstimate', 'Response'));
 
             // invalid collectionid provided
@@ -132,7 +131,7 @@
                 $response->appendChild($this->_outputDom->createElementNS('uri:ItemEstimate', 'Status', self::STATUS_SUCCESS));
                 $collection = $response->appendChild($this->_outputDom->createElementNS('uri:ItemEstimate', 'Collection'));
                 $collection->appendChild($this->_outputDom->createElementNS('uri:ItemEstimate', 'CollectionId', $collectionData'collectionId'));
-                if ($collectionData'syncState'->counter === 0) {
+                if($collectionData'syncState'->counter === 0) {
                     // this is the first sync. in most cases there are data on the server.
                     $count = count($dataController->getServerEntries($collectionData'collectionId', $collectionData'filterType'));
                 } else {

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/ICommand.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/ItemOperations.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/MeetingResponse.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/MoveItems.php Changed

@@ -59,11 +59,11 @@
             $response = $moves->appendChild($this->_outputDom->createElementNS('uri:Move', 'Response'));
             $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'SrcMsgId', $move'srcMsgId'));
 
-            if ($this->_logger instanceof Zend_Log) {
-                $this->_logger->info(__METHOD__ . '::' . __LINE__ . " Moving from " . $move'srcFldId' . " to " . $move'dstFldId');
-            }
-
             try {
+                if ($move'srcFldId' === $move'dstFldId') {
+                    throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::SAME_FOLDER);
+                }
+
                 try {
                     $sourceFolder = $this->_folderBackend->getFolder($this->_device, $move'srcFldId');
                 } catch (Syncroton_Exception_NotFound $e) {
@@ -76,30 +76,19 @@
                     throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_DESTINATION);
                 }
 
-                if ($move'srcFldId' === $move'dstFldId') {
-                    throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::SAME_FOLDER);
-                }
-
                 $dataController = Syncroton_Data_Factory::factory($sourceFolder->class, $this->_device, $this->_syncTimeStamp);
                 $newId          = $dataController->moveItem($move'srcFldId', $move'srcMsgId', $move'dstFldId');
+
                 if (!$newId) {
-                    // We don't actually know what the reason was that this failed, but from the resolution description this error seems to make the most sense,
-                    // and we rule out most other reasons before.
                     throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
                 }
 
                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Command_MoveItems::STATUS_SUCCESS));
                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'DstMsgId', $newId));
-            } catch (Syncroton_Exception_Status_MoveItems $e) {
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " Move failed: " . $e->getMessage());
-                }
+            } catch (Syncroton_Exception_Status $e) {
                 $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', $e->getCode()));
             } catch (Exception $e) {
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " Move failed: " . $e->getMessage());
-                }
-                $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Exception_Status_MoveItems::FOLDER_LOCKED));
+                $response->appendChild($this->_outputDom->createElementNS('uri:Move', 'Status', Syncroton_Exception_Status::SERVER_ERROR));
             }
         }

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Options.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Ping.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -37,24 +36,6 @@
     protected $_changesDetected = false;
     protected $_foldersWithChanges = ;
 
-    private function goToSleep($sleepInterval)
-    {
-        // take a break to save battery lifetime
-        call_user_func(Syncroton_Registry::getSleepCallback());
-        sleep($sleepInterval);
-
-        // make sure the connection is still alive, abort otherwise
-        if (connection_aborted()) {
-            if ($this->_logger instanceof Zend_Log) {
-                $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Exiting on aborted connection");
-            }
-            exit;
-        }
-
-        // reconnect external connections, etc.
-        call_user_func(Syncroton_Registry::getWakeupCallback());
-    }
-
     /**
      * process the XML file and add, change, delete or fetches data
      *
@@ -66,19 +47,13 @@
         $intervalStart = time();
         $status = self::STATUS_NO_CHANGES_FOUND;
 
-        $pingTimeout = Syncroton_Registry::getPingTimeout();
         // the client does not send a wbxml document, if the Ping parameters did not change compared with the last request
         if ($this->_requestBody instanceof DOMDocument) {
             $xml = simplexml_import_dom($this->_requestBody);
             $xml->registerXPathNamespace('Ping', 'Ping');
 
-            if (isset($xml->HeartbeatInterval)) {
+            if(isset($xml->HeartbeatInterval)) {
                 $this->_device->pinglifetime = (int)$xml->HeartbeatInterval;
-                // Magic value for testing
-                if ($this->_device->pinglifetime == 9999) {
-                    $pingTimeout = 1;
-                    $this->_device->pinglifetime = 900;
-                }
             }
 
             if (isset($xml->Folders->Folder)) {
@@ -93,10 +68,6 @@
                 $folders = ;
                 foreach ($xml->Folders->Folder as $folderXml) {
                     try {
-                        if (empty((string)$folderXml->Id)) {
-                            // Ignore empty folder ids
-                            continue;
-                        }
                         // does the folder exist?
                         $folder = $this->_folderBackend->getFolder($this->_device, (string)$folderXml->Id);
 
@@ -134,6 +105,7 @@
         }
 
         $intervalEnd = $intervalStart + $lifeTime;
+        $secondsLeft = $intervalEnd;
 
         $folders = $this->_device->pingfolder ? unserialize($this->_device->pingfolder) : ;
 
@@ -146,7 +118,29 @@
         }
 
         if ($status === self::STATUS_NO_CHANGES_FOUND) {
+            $sleepCallback  = Syncroton_Registry::getSleepCallback();
+            $wakeupCallback = Syncroton_Registry::getWakeupCallback();
+
             do {
+                // take a break to save battery lifetime
+                call_user_func($sleepCallback);
+                sleep(Syncroton_Registry::getPingTimeout());
+
+                // make sure the connection is still alive, abort otherwise
+                if (connection_aborted()) {
+                    if ($this->_logger instanceof Zend_Log) {
+                        $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Exiting on aborted connection");
+                    }
+                    exit;
+                }
+
+                // reconnect external connections, etc.
+                call_user_func($wakeupCallback);
+
+                // Calculate secondsLeft before any loop break just to have a correct value
+                // for logging purposes in case we breaked from the loop early
+                $secondsLeft = $intervalEnd - time();
+
                 try {
                     /** @var Syncroton_Model_Device $device */
                     $device = $this->_deviceBackend->get($this->_device->id);
@@ -197,10 +191,6 @@
                 $now = new DateTime('now', new DateTimeZone('UTC'));
 
                 foreach ($folders as $folderId) {
-                    if (empty($folderId)) {
-                        // Ignore empty folder ids
-                        continue;
-                    }
                     try {
                         /** @var Syncroton_Model_Folder $folder */
                         $folder         = $this->_folderBackend->get($folderId);
@@ -260,6 +250,7 @@
                     break;
                 }
 
+                // Update secondsLeft (again)
                 $secondsLeft = $intervalEnd - time();
 
                 if ($this->_logger instanceof Zend_Log) {
@@ -271,26 +262,19 @@
                 // break if there are less than PingTimeout + 10 seconds left for the next loop
                 // otherwise the response will be returned after the client has finished his Ping
                 // request already maybe
-                if ($secondsLeft < ($pingTimeout + 10)) {
-                    break;
-                } else {
-                    $this->goToSleep($pingTimeout);
-                }
-
-            } while (Syncroton_Server::validateSession());
+            } while (Syncroton_Server::validateSession() && $secondsLeft > (Syncroton_Registry::getPingTimeout() + 10));
         }
 
-        $secondsLeft = $intervalEnd - time();
         if ($this->_logger instanceof Zend_Log) {
             $this->_logger->info(__METHOD__ . '::' . __LINE__ . " DeviceId: " . $this->_device->deviceid . " Lifetime: $lifeTime SecondsLeft: $secondsLeft Status: $status)");
         }
 
         $ping = $this->_outputDom->documentElement;
         $ping->appendChild($this->_outputDom->createElementNS('uri:Ping', 'Status', $status));
-        if ($status === self::STATUS_CHANGES_FOUND) {
+        if($status === self::STATUS_CHANGES_FOUND) {
             $folders = $ping->appendChild($this->_outputDom->createElementNS('uri:Ping', 'Folders'));
 
-            foreach ($this->_foldersWithChanges as $changedFolder) {
+            foreach($this->_foldersWithChanges as $changedFolder) {
                 $folder = $folders->appendChild($this->_outputDom->createElementNS('uri:Ping', 'Folder', $changedFolder->serverId));
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->info(__METHOD__ . '::' . __LINE__ . " DeviceId: " . $this->_device->deviceid . " changes in folder: " . $changedFolder->serverId);

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Provision.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Search.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/SendMail.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Settings.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/SmartForward.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/SmartReply.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Sync.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -223,7 +222,7 @@
             }
 
             // initial synckey
-            if ($collectionData->syncKey === 0) {
+            if($collectionData->syncKey === 0) {
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->info(__METHOD__ . '::' . __LINE__ . " initial client synckey 0 provided");
                 }
@@ -251,7 +250,7 @@
                 }
             }
             // check for invalid synckey
-            if (($collectionData->syncState = $this->_syncStateBackend->validate($this->_device, $collectionData->folder, $collectionData->syncKey)) === false) {
+            if(($collectionData->syncState = $this->_syncStateBackend->validate($this->_device, $collectionData->folder, $collectionData->syncKey)) === false) {
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " invalid synckey {$collectionData->syncKey} provided");
                 }
@@ -267,7 +266,7 @@
 
             $dataController = Syncroton_Data_Factory::factory($collectionData->folder->class, $this->_device, $this->_syncTimeStamp);
 
-            switch ($collectionData->folder->class) {
+            switch($collectionData->folder->class) {
                 case Syncroton_Data_Factory::CLASS_CALENDAR:
                     $dataClass = 'Syncroton_Model_Event';
                     break;
@@ -302,7 +301,7 @@
             ;
 
             // handle incoming data
-            if ($collectionData->hasClientAdds()) {
+            if($collectionData->hasClientAdds()) {
                 $adds = $collectionData->getClientAdds();
 
                 if ($this->_logger instanceof Zend_Log) {
@@ -367,7 +366,7 @@
             }
 
             // handle changes, but only if not first sync
-            if (!$syncKeyReused && $collectionData->syncKey > 1 && $collectionData->hasClientChanges()) {
+            if(!$syncKeyReused && $collectionData->syncKey > 1 && $collectionData->hasClientChanges()) {
                 $changes = $collectionData->getClientChanges();
 
                 if ($this->_logger instanceof Zend_Log) {
@@ -400,7 +399,7 @@
             }
 
             // handle deletes, but only if not first sync
-            if (!$syncKeyReused && $collectionData->hasClientDeletes()) {
+            if(!$syncKeyReused && $collectionData->hasClientDeletes()) {
                 $deletes = $collectionData->getClientDeletes();
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->info(__METHOD__ . '::' . __LINE__ . " found " . count($deletes) . " entries to be deleted on server");
@@ -416,7 +415,7 @@
                         try {
                             $dataController->deleteEntry($collectionData->collectionId, $serverId, $collectionData);
 
-                        } catch (Syncroton_Exception_NotFound $e) {
+                        } catch(Syncroton_Exception_NotFound $e) {
                             if ($this->_logger instanceof Zend_Log) {
                                 $this->_logger->crit(__METHOD__ . '::' . __LINE__ . ' tried to delete entry ' . $serverId . ' but entry was not found');
                             }
@@ -442,7 +441,7 @@
             }
 
             // handle fetches, but only if not first sync
-            if ($collectionData->syncKey > 1 && $collectionData->hasClientFetches()) {
+            if($collectionData->syncKey > 1 && $collectionData->hasClientFetches()) {
                 // the default value for GetChanges is 1. If the phone don't want the changes it must set GetChanges to 0
                 // some prevoius versions of iOS did not set GetChanges to 0 for fetches. Let's enforce getChanges to false here.
                 $collectionData->getChanges = false;
@@ -468,93 +467,6 @@
         }
     }
 
-    private function getServerModifications($dataController, $collectionData, $clientModifications)
-    {
-        $serverModifications = 
-            'added'   => ,
-            'changed' => ,
-            'deleted' => ,
-        ;
-
-        // We first use hasChanges because it has a fast path for when there are no changes by fetching the count of messages only.
-        // However, in all other cases we will end up fetching the same entries as below, which is less than ideal.
-        // TODO: We should create a new method, which checks if there are no changes, and otherwise just let the code below figure out
-        // if there are any changes to process.
-        if (!$dataController->hasChanges($this->_contentStateBackend, $collectionData->folder, $collectionData->syncState)) {
-            return $serverModifications;
-        }
-
-        // update _syncTimeStamp as $dataController->hasChanges might have spent some time
-        $this->_syncTimeStamp = new DateTime('now', new DateTimeZone('UTC'));
-
-        // fetch entries added since last sync
-        $allClientEntries = $this->_contentStateBackend->getFolderState(
-            $this->_device,
-            $collectionData->folder,
-            $collectionData->syncState->counter
-        );
-
-        // fetch entries changed since last sync
-        $allChangedEntries = $dataController->getChangedEntries(
-            $collectionData->collectionId,
-            $collectionData->syncState,
-            $collectionData->options'filterType'
-        );
-
-        // fetch all entries
-        $allServerEntries = $dataController->getServerEntries(
-            $collectionData->collectionId,
-            $collectionData->options'filterType'
-        );
-
-        // add entries
-        $serverDiff = array_diff($allServerEntries, $allClientEntries);
-        // add entries which produced problems during delete from client
-        $serverModifications'added' = $clientModifications'forceAdd';
-        // add entries not yet sent to client
-        $serverModifications'added' = array_unique(array_merge($serverModifications'added', $serverDiff));
-
-        // @todo still needed?
-        foreach ($serverModifications'added' as $id => $serverId) {
-            // skip entries added by client during this sync session
-            if (isset($clientModifications'added'$serverId) && !isset($clientModifications'forceAdd'$serverId)) {
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->info(__METHOD__ . '::' . __LINE__ . " skipped added entry: " . $serverId);
-                }
-                unset($serverModifications'added'$id);
-            }
-        }
-
-        // entries to be deleted
-        $serverModifications'deleted' = array_diff($allClientEntries, $allServerEntries);
-
-        // entries changed since last sync
-        $serverModifications'changed' = array_merge($allChangedEntries, $clientModifications'forceChange');
-
-        foreach ($serverModifications'changed' as $id => $serverId) {
-            // skip entry, if it got changed by client during current sync
-            if (isset($clientModifications'changed'$serverId) && !isset($clientModifications'forceChange'$serverId)) {
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->info(__METHOD__ . '::' . __LINE__ . " skipped changed entry: " . $serverId);
-                }
-                unset($serverModifications'changed'$id);
-            }
-            // skip entry, make sure we don't sent entries already added by client in this request
-            elseif (isset($clientModifications'added'$serverId) && !isset($clientModifications'forceAdd'$serverId)) {
-                if ($this->_logger instanceof Zend_Log) {
-                    $this->_logger->info(__METHOD__ . '::' . __LINE__ . " skipped change for added entry: " . $serverId);
-                }
-                unset($serverModifications'changed'$id);
-            }
-        }
-
-        // entries comeing in scope are already in $serverModifications'added' and do not need to
-        // be send with $serverCanges
-        $serverModifications'changed' = array_diff($serverModifications'changed', $serverModifications'added');
-
-        return $serverModifications;
-    }
-
     /**
      * (non-PHPdoc)
      * @see Syncroton_Command_Wbxml::getResponse()
@@ -593,7 +505,7 @@
 
                 $now = new DateTime('now', new DateTimeZone('UTC'));
 
-                foreach ($this->_collections as $collectionData) {
+                foreach($this->_collections as $collectionData) {
                     // continue immediately if folder does not exist
                     if (! ($collectionData->folder instanceof Syncroton_Model_IFolder)) {
                         break 2;
@@ -660,7 +572,7 @@
                         $dataController = Syncroton_Data_Factory::factory($collectionData->folder->class, $this->_device, $this->_syncTimeStamp);
 
                         // countinue immediately if there are any changes available
-                        if ($dataController->hasChanges($this->_contentStateBackend, $collectionData->folder, $collectionData->syncState)) {
+                        if($dataController->hasChanges($this->_contentStateBackend, $collectionData->folder, $collectionData->syncState)) {
                             break 2;
                         }
                     }
@@ -751,17 +663,18 @@
                 ;
 
                 $status = self::STATUS_SUCCESS;
+                $hasChanges = 0;
 
                 if ($collectionData->getChanges === true) {
                     // continue sync session?
-                    if (is_array($collectionData->syncState->pendingdata)) {
+                    if(is_array($collectionData->syncState->pendingdata)) {
                         $serverModifications = $collectionData->syncState->pendingdata;
                         if ($this->_logger instanceof Zend_Log) {
-                            $this->_logger->info(__METHOD__ . '::' . __LINE__ . " restored from sync state.");
+                            $this->_logger->info(__METHOD__ . '::' . __LINE__ . " restored from sync state: (added/changed/deleted) " . count($serverModifications'added') . '/' . count($serverModifications'changed') . '/' . count($serverModifications'deleted') . ' entries for sync from server to client');
                         }
                     } else {
                         try {
-                            $serverModifications = $this->getServerModifications($dataController, $collectionData, $clientModifications);
+                            $hasChanges = $dataController->hasChanges($this->_contentStateBackend, $collectionData->folder, $collectionData->syncState);
                         } catch (Syncroton_Exception_NotFound $e) {
                             if ($this->_logger instanceof Zend_Log) {
                                 $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Folder changes checking failed (not found): " . $e->getTraceAsString());
@@ -773,6 +686,85 @@
                                 $this->_logger->crit(__METHOD__ . '::' . __LINE__ . " Folder changes checking failed: " . $e->getMessage());
                             }
 
+                            // Prevent from removing client entries when getServerEntries() fails
+                            // @todo: should we break the loop here?
+                            $status = self::STATUS_SERVER_ERROR;
+                        }
+                    }
+
+                    if ($hasChanges) {
+                        // update _syncTimeStamp as $dataController->hasChanges might have spent some time
+                        $this->_syncTimeStamp = new DateTime('now', new DateTimeZone('UTC'));
+
+                        try {
+                            // fetch entries added since last sync
+                            $allClientEntries = $this->_contentStateBackend->getFolderState(
+                                $this->_device,
+                                $collectionData->folder,
+                                $collectionData->syncState->counter
+                            );
+
+                            // fetch entries changed since last sync
+                            $allChangedEntries = $dataController->getChangedEntries(
+                                $collectionData->collectionId,
+                                $collectionData->syncState,
+                                $collectionData->options'filterType'
+                            );
+
+                            // fetch all entries
+                            $allServerEntries = $dataController->getServerEntries(
+                                $collectionData->collectionId,
+                                $collectionData->options'filterType'
+                            );
+
+                            // add entries
+                            $serverDiff = array_diff($allServerEntries, $allClientEntries);
+                            // add entries which produced problems during delete from client
+                            $serverModifications'added' = $clientModifications'forceAdd';
+                            // add entries not yet sent to client
+                            $serverModifications'added' = array_unique(array_merge($serverModifications'added', $serverDiff));
+
+                            // @todo still needed?
+                            foreach($serverModifications'added' as $id => $serverId) {
+                                // skip entries added by client during this sync session
+                                if(isset($clientModifications'added'$serverId) && !isset($clientModifications'forceAdd'$serverId)) {
+                                    if ($this->_logger instanceof Zend_Log) {
+                                        $this->_logger->info(__METHOD__ . '::' . __LINE__ . " skipped added entry: " . $serverId);
+                                    }
+                                    unset($serverModifications'added'$id);
+                                }
+                            }
+
+                            // entries to be deleted
+                            $serverModifications'deleted' = array_diff($allClientEntries, $allServerEntries);
+
+                            // entries changed since last sync
+                            $serverModifications'changed' = array_merge($allChangedEntries, $clientModifications'forceChange');
+
+                            foreach($serverModifications'changed' as $id => $serverId) {
+                                // skip entry, if it got changed by client during current sync
+                                if(isset($clientModifications'changed'$serverId) && !isset($clientModifications'forceChange'$serverId)) {
+                                    if ($this->_logger instanceof Zend_Log) {
+                                        $this->_logger->info(__METHOD__ . '::' . __LINE__ . " skipped changed entry: " . $serverId);
+                                    }
+                                    unset($serverModifications'changed'$id);
+                                }
+                                // skip entry, make sure we don't sent entries already added by client in this request
+                                elseif (isset($clientModifications'added'$serverId) && !isset($clientModifications'forceAdd'$serverId)) {
+                                    if ($this->_logger instanceof Zend_Log) {
+                                        $this->_logger->info(__METHOD__ . '::' . __LINE__ . " skipped change for added entry: " . $serverId);
+                                    }
+                                    unset($serverModifications'changed'$id);
+                                }
+                            }
+
+                            // entries comeing in scope are already in $serverModifications'added' and do not need to
+                            // be send with $serverCanges
+                            $serverModifications'changed' = array_diff($serverModifications'changed', $serverModifications'added');
+                        } catch (Exception $e) {
+                            if ($this->_logger instanceof Zend_Log) {
+                                $this->_logger->crit(__METHOD__ . '::' . __LINE__ . " Folder state checking failed: " . $e->getMessage());
+                            }
                             if ($this->_logger instanceof Zend_Log) {
                                 $this->_logger->debug(__METHOD__ . '::' . __LINE__ . " Folder state checking failed: " . $e->getTraceAsString());
                             }
@@ -781,10 +773,10 @@
                             // @todo: should we break the loop here?
                             $status = self::STATUS_SERVER_ERROR;
                         }
-                    }
 
-                    if ($this->_logger instanceof Zend_Log) {
-                        $this->_logger->info(__METHOD__ . '::' . __LINE__ . " found (added/changed/deleted) " . count($serverModifications'added') . '/' . count($serverModifications'changed') . '/' . count($serverModifications'deleted') . ' entries for sync from server to client');
+                        if ($this->_logger instanceof Zend_Log) {
+                            $this->_logger->info(__METHOD__ . '::' . __LINE__ . " found (added/changed/deleted) " . count($serverModifications'added') . '/' . count($serverModifications'changed') . '/' . count($serverModifications'deleted') . ' entries for sync from server to client');
+                        }
                     }
                 }
 
@@ -806,12 +798,12 @@
                 }
 
                 // send reponse for newly added entries
-                if (!empty($clientModifications'added')) {
-                    foreach ($clientModifications'added' as $entryData) {
+                if(!empty($clientModifications'added')) {
+                    foreach($clientModifications'added' as $entryData) {
                         $add = $responses->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Add'));
                         $add->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'ClientId', $entryData'clientId'));
                         // we have no serverId if the add failed
-                        if (isset($entryData'serverId')) {
+                        if(isset($entryData'serverId')) {
                             $add->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'ServerId', $entryData'serverId'));
                         }
                         $add->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Status', $entryData'status'));
@@ -819,8 +811,8 @@
                 }
 
                 // send reponse for changed entries
-                if (!empty($clientModifications'changed')) {
-                    foreach ($clientModifications'changed' as $serverId => $status) {
+                if(!empty($clientModifications'changed')) {
+                    foreach($clientModifications'changed' as $serverId => $status) {
                         if ($status !== Syncroton_Command_Sync::STATUS_SUCCESS) {
                             $change = $responses->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Change'));
                             $change->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'ServerId', $serverId));
@@ -830,19 +822,19 @@
                 }
 
                 // send response for to be fetched entries
-                if (!empty($collectionData->toBeFetched)) {
+                if(!empty($collectionData->toBeFetched)) {
                     // unset all truncation settings as entries are not allowed to be truncated during fetch
                     $fetchCollectionData = clone $collectionData;
 
                     // unset truncationSize
                     if (isset($fetchCollectionData->options'bodyPreferences') && is_array($fetchCollectionData->options'bodyPreferences')) {
-                        foreach ($fetchCollectionData->options'bodyPreferences' as $key => $bodyPreference) {
+                        foreach($fetchCollectionData->options'bodyPreferences' as $key => $bodyPreference) {
                             unset($fetchCollectionData->options'bodyPreferences'$key'truncationSize');
                         }
                     }
                     $fetchCollectionData->options'mimeTruncation' = Syncroton_Command_Sync::TRUNCATE_NOTHING;
 
-                    foreach ($collectionData->toBeFetched as $serverId) {
+                    foreach($collectionData->toBeFetched as $serverId) {
                         $fetch = $responses->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'Fetch'));
                         $fetch->appendChild($this->_outputDom->createElementNS('uri:AirSync', 'ServerId', $serverId));
 
@@ -874,8 +866,8 @@
 
                 $commands = $this->_outputDom->createElementNS('uri:AirSync', 'Commands');
 
-                foreach ($serverModifications'added' as $id => $serverId) {
-                    if ($collectionChanges == $collectionData->windowSize || $totalChanges + $collectionChanges >= $this->_globalWindowSize) {
+                foreach($serverModifications'added' as $id => $serverId) {
+                    if($collectionChanges == $collectionData->windowSize || $totalChanges + $collectionChanges >= $this->_globalWindowSize) {
                         break;
                     }
 
@@ -927,8 +919,8 @@
                 /**
                  * process entries changed on server side
                  */
-                foreach ($serverModifications'changed' as $id => $serverId) {
-                    if ($collectionChanges == $collectionData->windowSize || $totalChanges + $collectionChanges >= $this->_globalWindowSize) {
+                foreach($serverModifications'changed' as $id => $serverId) {
+                    if($collectionChanges == $collectionData->windowSize || $totalChanges + $collectionChanges >= $this->_globalWindowSize) {
                         break;
                     }
 
@@ -968,8 +960,8 @@
                     unset($serverModifications'changed'$id);
                 }
 
-                foreach ($serverModifications'deleted' as $id => $serverId) {
-                    if ($collectionChanges == $collectionData->windowSize || $totalChanges + $collectionChanges >= $this->_globalWindowSize) {
+                foreach($serverModifications'deleted' as $id => $serverId) {
+                    if($collectionChanges == $collectionData->windowSize || $totalChanges + $collectionChanges >= $this->_globalWindowSize) {
                         break;
                     }
 
@@ -1077,7 +1069,7 @@
                 if (!empty($clientModifications'added')) {
                     // Store a client id mapping in case we encounter a reused sync_key in a future request.
                     $newClientIdMap = ;
-                    foreach ($clientModifications'added' as $entryData) {
+                    foreach($clientModifications'added' as $entryData) {
                         // No serverId if we failed to add
                         if ($entryData'status' == self::STATUS_SUCCESS) {
                             $newClientIdMap$entryData'clientId' = $entryData'serverId';
@@ -1095,18 +1087,18 @@
                         $this->_syncStateBackend->create($collectionData->syncState, true); // @phpstan-ignore-line
 
                         // store contentstates for new entries added to client
-                        foreach ($newContentStates as $state) {
+                        foreach($newContentStates as $state) {
                             try {
                                 //This can happen if we rerun a previous sync-key
                                 $state = $this->_contentStateBackend->getContentState($state->device_id, $state->folder_id, $state->contentid);
                                 $this->_contentStateBackend->update($state);
-                            } catch (Exception $zdse) {
+                            } catch(Exception $zdse) {
                                 $this->_contentStateBackend->create($state);
                             }
                         }
 
                         // remove contentstates for entries to be deleted on client
-                        foreach ($deletedContentStates as $state) {
+                        foreach($deletedContentStates as $state) {
                             $this->_contentStateBackend->delete($state);
                         }

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Command/Wbxml.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/AData.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Calendar.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Contacts.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Email.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -31,7 +30,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::forwardEmail()
      */
-    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId)
+    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime)
     {
         if ($inputStream == 'triggerException') {
             throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAILBOX_SERVER_OFFLINE);
@@ -59,7 +58,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::replyEmail()
      */
-    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId)
+    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime)
     {
         // forward email
     }
@@ -78,7 +77,7 @@
      * (non-PHPdoc)
      * @see Syncroton_Data_IDataEmail::sendEmail()
      */
-    public function sendEmail($inputStream, $saveInSent, $clientId)
+    public function sendEmail($inputStream, $saveInSent)
     {
         if ($inputStream == 'triggerException') {
             throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAILBOX_SERVER_OFFLINE);

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Factory.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/IData.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/IDataCalendar.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/IDataEmail.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -21,31 +20,26 @@
     /**
      * send an email
      *
-     * @param resource $inputStream
-     * @param bool     $saveInSent
-     * @param ?string  $clientId
+     * @param  resource  $inputStream
+     * @param  boolean   $saveInSent
      */
-    public function sendEmail($inputStream, $saveInSent, $clientId);
+    public function sendEmail($inputStream, $saveInSent);
 
     /**
      * forward an email
      *
-     * @param string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
-     * @param string        $inputStream
-     * @param string        $saveInSent
-     * @param bool          $replaceMime
-     * @param ?string       $clientId
+     * @param  string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
+     * @param  string        $inputStream
+     * @param  string        $saveInSent
      */
-    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId);
+    public function forwardEmail($source, $inputStream, $saveInSent, $replaceMime);
 
     /**
      * reply to an email
      *
-     * @param string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
-     * @param string        $inputStream
-     * @param string        $saveInSent
-     * @param bool          $replaceMime
-     * @param ?string       $clientId
+     * @param  string|array  $source       is either a string(LongId) or an array with following properties collectionId, itemId and instanceId
+     * @param  string        $inputStream
+     * @param  string        $saveInSent
      */
-    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime, $clientId);
+    public function replyEmail($source, $inputStream, $saveInSent, $replaceMime);
 }

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/IDataSearch.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Notes.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Data/Tasks.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/AccessDenied.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/DeadlockDetected.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/MemoryExhausted.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/NotFound.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/PolicyKeyMissing.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/ProvisioningNeeded.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/Autodiscover.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/FolderCreate.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/FolderDelete.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/FolderSync.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/FolderUpdate.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/GetItemEstimate.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/ItemOperations.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/MeetingResponse.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/MoveItems.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/Settings.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/Status/Sync.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Exception/UnexpectedValue.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/AEntry.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/AXMLEntry.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -48,9 +47,9 @@
     {
         $this->_addXMLNamespaces($domParrent);
 
-        foreach ($this->_elements as $elementName => $value) {
+        foreach($this->_elements as $elementName => $value) {
             // skip empty values
-            if ($value === null || (is_array($value) && empty($value))) {
+            if($value === null || $value === '' || (is_array($value) && empty($value))) {
                 continue;
             }
 
@@ -70,7 +69,7 @@
 
             if (isset($elementProperties'childElement')) {
                 $element = $domParrent->ownerDocument->createElementNS($nameSpace, ucfirst($elementName));
-                foreach ($value as $subValue) {
+                foreach($value as $subValue) {
                     $subElement = $domParrent->ownerDocument->createElementNS($nameSpace, ucfirst($elementProperties'childElement'));
                     $this->_appendXMLElement($device, $subElement, $elementProperties, $subValue);
                     $element->appendChild($subElement);
@@ -103,7 +102,7 @@
     {
         $properties = ;
 
-        foreach ($this->_properties as $namespace => $namespaceProperties) {
+        foreach($this->_properties as $namespace => $namespaceProperties) {
             if ($selectedNamespace !== null && $namespace != $selectedNamespace) {
                 continue;
             }
@@ -256,7 +255,7 @@
      */
     protected function _getElementProperties($element)
     {
-        foreach ($this->_properties as $namespace => $namespaceProperties) {
+        foreach($this->_properties as $namespace => $namespaceProperties) {
             if (array_key_exists($element, $namespaceProperties)) {
                 return $namespace, $namespaceProperties$element;
             }

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Account.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Contact.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Content.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Device.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/DeviceInformation.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Email.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EmailAttachment.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EmailBody.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EmailFlag.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EmailMeetingRequest.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EmailRecurrence.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Event.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EventAttendee.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EventException.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/EventRecurrence.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/FileReference.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Folder.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/GAL.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/GALPicture.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/IContent.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/IDevice.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/IEntry.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/IFolder.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/IPolicy.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/ISyncState.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/IXMLEntry.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/MeetingResponse.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Note.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Policy.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/SendMail.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/SmartForward.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/SmartReply.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/StoreRequest.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/StoreResponseResult.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/SyncCollection.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/SyncState.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/Task.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Model/TaskRecurrence.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Registry.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Server.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -53,10 +52,7 @@
         $this->_request = $request instanceof Zend_Controller_Request_Http ? $request : new Zend_Controller_Request_Http();
         $this->_body    = $body !== null ? $body : fopen('php://input', 'r');
 
-        // Not available on unauthenticated OPTIONS request
-        if (!empty($this->_userId)) {
-            $this->_deviceBackend = Syncroton_Registry::getDeviceBackend();
-        }
+        $this->_deviceBackend = Syncroton_Registry::getDeviceBackend();
 
     }
 
@@ -66,17 +62,7 @@
             $this->_logger->debug(__METHOD__ . '::' . __LINE__ . ' REQUEST METHOD: ' . $this->_request->getMethod());
         }
 
-        if ($this->_request->getMethod() != "OPTIONS" && empty($this->_userId)) {
-            // Outlook on ios/android sends unauthenticated requests for Ping/FolderSync/Settings
-            // (which doesn't seem to make much sense), so we handle this case silently,
-            // even though it should normally be a warning.
-            $this->_logger->debug(__METHOD__ . '::' . __LINE__ . ' Not authenticated');
-            header('WWW-Authenticate: Basic realm="ActiveSync for Kolab"');
-            header('HTTP/1.1 401 Unauthorized');
-            exit;
-        }
-
-        switch ($this->_request->getMethod()) {
+        switch($this->_request->getMethod()) {
             case 'OPTIONS':
                 $this->_handleOptions();
                 break;
@@ -142,7 +128,7 @@
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logDomDocument($requestBody, 'request', __METHOD__, __LINE__);
                 }
-            } catch (Syncroton_Wbxml_Exception_UnexpectedEndOfFile $e) {
+            } catch(Syncroton_Wbxml_Exception_UnexpectedEndOfFile $e) {
                 if ($this->_logger instanceof Zend_Log) {
                     $this->_logger->warn(__METHOD__ . '::' . __LINE__ . " unexpected end of file.");
                 }
@@ -165,11 +151,6 @@
             if (!$response) {
                 $response = $command->getResponse();
             }
-
-            if ($response === null) {
-                // FIXME: Is this really needed? It is for PHP cli-server, but not really for a real http server
-                header('Content-Length: 0');
-            }
         } catch (Syncroton_Exception_ProvisioningNeeded $sepn) {
             if ($this->_logger instanceof Zend_Log) {
                 $this->_logger->info(__METHOD__ . '::' . __LINE__ . " provisioning needed");

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/TransactionManager.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/TransactionManagerInterface.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Abstract.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -112,7 +111,7 @@
      */
     public function getDPI($_uInt = 0)
     {
-        if (!defined('Syncroton_Wbxml_Abstract::DPI_' . $_uInt)) {
+        if(!defined('Syncroton_Wbxml_Abstract::DPI_' . $_uInt)) {
             throw new Syncroton_Wbxml_Exception('unknown wellknown identifier: ' . $_uInt);
         }
 
@@ -143,7 +142,7 @@
     {
         $byte = fread($this->_stream, 1);
 
-        if ($byte === false) {
+        if($byte === false) {
             throw new Syncroton_Wbxml_Exception("failed reading one byte");
         }
 
@@ -205,7 +204,7 @@
         do {
             $byte = ($remainder & 127);
             $remainder >>= 7;
-            if ($multibyte === null) {
+            if($multibyte === null) {
                 $multibyte = chr($byte);
             } else {
                 $multibyte = chr($byte | 128) . $multibyte;
@@ -241,7 +240,7 @@
         $this->_writeMultibyteUInt($length);
         $writenBytes = stream_copy_to_stream($stream, $this->_stream);
 
-        if ($writenBytes !== $length) {
+        if($writenBytes !== $length) {
             throw new Syncroton_Wbxml_Exception('blow');
         }

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Decoder.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -55,10 +54,10 @@
      */
     public function __construct($_stream, $_dpi = null)
     {
-        if (!is_resource($_stream) || get_resource_type($_stream) != 'stream') {
+        if(!is_resource($_stream) || get_resource_type($_stream) != 'stream') {
             throw new Syncroton_Wbxml_Exception('$_stream must be a stream');
         }
-        if ($_dpi !== null) {
+        if($_dpi !== null) {
             $this->_dpi = $_dpi;
         }
 
@@ -66,7 +65,7 @@
 
         $this->_version = $this->_getByte();
 
-        if (feof($this->_stream)) {
+        if(feof($this->_stream)) {
             throw new Syncroton_Wbxml_Exception_UnexpectedEndOfFile();
         }
 
@@ -78,7 +77,7 @@
 
         // resolve DPI as we have read the stringtable now
         // this->_dpi contains the string table index
-        if ($this->_dpiType === Syncroton_Wbxml_Abstract::DPI_STRINGTABLE) {
+        if($this->_dpiType === Syncroton_Wbxml_Abstract::DPI_STRINGTABLE) {
             $this->_dpi = $this->_stringTable$this->_dpi;
         }
 
@@ -121,7 +120,7 @@
         while (!feof($this->_stream)) {
             $byte = $this->_getByte();
 
-            switch ($byte) {
+            switch($byte) {
                 case Syncroton_Wbxml_Abstract::END:
                     $node = $node->parentNode;
                     $openTags--;
@@ -129,7 +128,7 @@
 
                 case Syncroton_Wbxml_Abstract::OPAQUE:
                     $length = $this->_getMultibyteUInt();
-                    if ($length > 0) {
+                    if($length > 0) {
                         $opaque = $this->_getOpaque($length);
                         try {
                             // let see if we can decode it. maybe the opaque data is wbxml encoded content
@@ -142,8 +141,8 @@
 
                             fclose($opaqueDataStream);
 
-                            foreach ($dom->childNodes as $newNode) {
-                                if ($newNode instanceof DOMElement) {
+                            foreach($dom->childNodes as $newNode) {
+                                if($newNode instanceof DOMElement) {
                                     $newNode = $this->_dom->importNode($newNode, true);
                                     $node->appendChild($newNode);
                                 }
@@ -241,7 +240,7 @@
     {
         $uInt = $this->_getMultibyteUInt();
 
-        if ($uInt == 0) {
+        if($uInt == 0) {
             // get identifier from stringtable
             $this->_dpiType = Syncroton_Wbxml_Abstract::DPI_STRINGTABLE;
             // string table identifier, can be resolved only after reading string table
@@ -261,7 +260,7 @@
     {
         $uInt = $this->_getMultibyteUInt();
 
-        switch ($uInt) {
+        switch($uInt) {
             case 106:
                 $this->_charSet = 'UTF-8';
                 break;
@@ -280,21 +279,21 @@
     {
         $length = $this->_getMultibyteUInt();
 
-        if ($length > 0) {
+        if($length > 0) {
             $rawStringTable = $this->_getOpaque($length);
             $index = null;
             $string = null;
 
-            for ($i = 0; $i < strlen($rawStringTable); $i++) {
-                if ($index === null) {
+            for($i = 0; $i < strlen($rawStringTable); $i++) {
+                if($index === null) {
                     $index = $i;
                 }
-                if (ord($rawStringTable$i) != 0) {
+                if(ord($rawStringTable$i) != 0) {
                     $string .= $rawStringTable$i;
                 }
 
                 // either the string has ended or we reached a \0
-                if ($i + 1 == strlen($rawStringTable) || ord($rawStringTable$i) == 0) {
+                if($i + 1 == strlen($rawStringTable) || ord($rawStringTable$i) == 0) {
                     $this->_stringTable$index = $string;
                     $index = null;
                     $string = null;

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/Abstract.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage0.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage1.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage10.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage11.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage12.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage13.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage14.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage15.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage16.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage17.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage18.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage19.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage2.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage20.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage21.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage22.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage23.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage24.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage254.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage3.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage4.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage5.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage6.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage7.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage8.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/ActiveSync/CodePage9.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/Exception/CodePageNotFound.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Dtd/Factory.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Encoder.php Changed

@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Syncroton
  *
@@ -55,7 +54,7 @@
         // the WBXML version
         $this->_writeByte($this->_version);
 
-        if ($this->_codePage->getDPI() === null) {
+        if($this->_codePage->getDPI() === null) {
             // the document public identifier
             $this->_writeMultibyteUInt(1);
         } else {
@@ -69,7 +68,7 @@
         // write the charSet
         $this->_writeCharSet($this->_charSet);
 
-        if ($this->_codePage->getDPI() === null) {
+        if($this->_codePage->getDPI() === null) {
             // the length of the string table
             $this->_writeMultibyteUInt(0);
         } else {
@@ -88,7 +87,7 @@
      */
     protected function _writeCharSet($_charSet)
     {
-        switch (strtoupper($_charSet)) {
+        switch(strtoupper($_charSet)) {
             case 'UTF-8':
                 $this->_writeMultibyteUInt(106);
                 break;
@@ -124,7 +123,7 @@
 
     private function writeNode($node, $withContent = false, $data = null)
     {
-        if ($this->_codePage->getNameSpace() != $node->namespaceURI) {
+        if($this->_codePage->getNameSpace() != $node->namespaceURI) {
             $this->_switchCodePage($node->namespaceURI);
         }
         $this->_writeTag($node->localName, $this->getAttributes($node), $withContent, $data);
@@ -190,7 +189,7 @@
      */
     protected function _writeTag($_tag, $_attributes = null, $_hasContent = false, $_data = null)
     {
-        if ($_hasContent == false && $_data !== null) {
+        if($_hasContent == false && $_data !== null) {
             throw new Syncroton_Wbxml_Exception('$_hasContent can not be false, when $_data !== NULL');
         }
 
@@ -204,18 +203,18 @@
             $encoding = 'termstring';
         }
 
-        if (!empty($_attributes)) {
+        if(!empty($_attributes)) {
             $identity |= 0x80;
         }
 
-        if ($_hasContent == true) {
+        if($_hasContent == true) {
             $identity |= 0x40;
         }
 
         $this->_writeByte($identity);
 
         // handle the data
-        if ($_data !== null) {
+        if($_data !== null) {
             if ($encoding == 'opaque') {
                 $this->_writeOpaqueString(base64_decode($_data));
             } else {
@@ -232,7 +231,7 @@
     protected function _switchCodePage($_nameSpace)
     {
         $codePageName = $this->_stripNameSpace($_nameSpace);
-        if (!defined('Syncroton_Wbxml_Dtd_ActiveSync::CODEPAGE_' . strtoupper($codePageName))) {
+        if(!defined('Syncroton_Wbxml_Dtd_ActiveSync::CODEPAGE_' . strtoupper($codePageName))) {
             throw new Syncroton_Wbxml_Exception('codepage ' . $codePageName . ' not found');
         }
         // switch to another codepage

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Exception.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/ext/Syncroton/Wbxml/Exception/UnexpectedEndOfFile.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync.php Changed

@@ -135,30 +135,30 @@
             $userid = $this->authenticate($_SERVER'PHP_AUTH_USER', $_SERVER'PHP_AUTH_PW');
         }
 
-        if (!empty($userid)) {
-            $this->plugins->exec_hook('ready', 'task' => 'syncroton');
+        if (empty($userid)) {
+            header('WWW-Authenticate: Basic realm="' . $this->app_name . '"');
+            header('HTTP/1.1 401 Unauthorized');
+            exit;
+        }
 
-            // Set log directory per-user (again, in case the username changed above)
-            $this->set_log_dir();
+        $this->plugins->exec_hook('ready', 'task' => 'syncroton');
 
-            // Save user password for Roundcube Framework
-            $this->password = $_SERVER'PHP_AUTH_PW';
-        }
+        // Set log directory per-user (again, in case the username changed above)
+        $this->set_log_dir();
+
+        // Save user password for Roundcube Framework
+        $this->password = $_SERVER'PHP_AUTH_PW';
 
         // Register Syncroton backends/callbacks
         Syncroton_Registry::set(Syncroton_Registry::LOGGERBACKEND, $this->logger);
         Syncroton_Registry::set(Syncroton_Registry::DATABASE, $this->get_dbh());
         Syncroton_Registry::set(Syncroton_Registry::TRANSACTIONMANAGER, kolab_sync_transaction_manager::getInstance());
-        // The unauthenticated OPTIONS request doesn't require these backends and we can't
-        // instantiate them without credentials for the underlying storage backend
-        if (!empty($userid)) {
-            Syncroton_Registry::set(Syncroton_Registry::DEVICEBACKEND, new kolab_sync_backend_device());
-            Syncroton_Registry::set(Syncroton_Registry::FOLDERBACKEND, new kolab_sync_backend_folder());
-            Syncroton_Registry::set(Syncroton_Registry::SYNCSTATEBACKEND, new kolab_sync_backend_state());
-            Syncroton_Registry::set(Syncroton_Registry::CONTENTSTATEBACKEND, new kolab_sync_backend_content());
-            Syncroton_Registry::set(Syncroton_Registry::POLICYBACKEND, new kolab_sync_backend_policy());
-            Syncroton_Registry::set(Syncroton_Registry::SLEEP_CALLBACK, $this, 'sleep');
-        }
+        Syncroton_Registry::set(Syncroton_Registry::DEVICEBACKEND, new kolab_sync_backend_device());
+        Syncroton_Registry::set(Syncroton_Registry::FOLDERBACKEND, new kolab_sync_backend_folder());
+        Syncroton_Registry::set(Syncroton_Registry::SYNCSTATEBACKEND, new kolab_sync_backend_state());
+        Syncroton_Registry::set(Syncroton_Registry::CONTENTSTATEBACKEND, new kolab_sync_backend_content());
+        Syncroton_Registry::set(Syncroton_Registry::POLICYBACKEND, new kolab_sync_backend_policy());
+        Syncroton_Registry::set(Syncroton_Registry::SLEEP_CALLBACK, $this, 'sleep');
 
         Syncroton_Registry::setContactsDataClass('kolab_sync_data_contacts');
         Syncroton_Registry::setCalendarDataClass('kolab_sync_data_calendar');
@@ -174,7 +174,7 @@
         Syncroton_Registry::set(Syncroton_Registry::MAX_COLLECTIONS, (int) $this->config->get('activesync_max_folders', 100));
 
         // Run Syncroton
-        $syncroton = new Syncroton_Server($userid ?? null);
+        $syncroton = new Syncroton_Server($userid);
         $syncroton->handle();
     }
 
@@ -386,10 +386,8 @@
 
     /**
      * Initializes and returns the storage backend object
-     *
-     * @param bool $init Reset the driver internal state
      */
-    public static function storage($init = false)
+    public static function storage()
     {
         $class = 'kolab_sync_storage';
         $self  = self::get_instance();
@@ -398,15 +396,6 @@
             $class .= '_' . strtolower($name);
         }
 
-        if ($init) {
-            // Reset storage driver internal state
-            $reflection = new ReflectionClass($class);
-            $property = $reflection->getProperty('instance');
-            $property->setAccessible(true);
-            $property->setValue($class::get_instance(), null);
-            $property->setAccessible(false);
-        }
-
         return $class::get_instance();
     }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_backend_device.php Changed

@@ -32,6 +32,23 @@
     protected $interface_name = 'Syncroton_Model_IDevice';
 
     /**
+     * Kolab Sync storage backend
+     *
+     * @var kolab_sync_storage
+     */
+    protected $backend;
+
+
+    /**
+     * Constructor
+     */
+    public function __construct()
+    {
+        parent::__construct();
+        $this->backend = kolab_sync::storage();
+    }
+
+    /**
      * Create (register) a new device
      *
      * @param Syncroton_Model_IDevice $device Device object
@@ -42,26 +59,36 @@
     {
         $device = parent::create($device);
 
-        $sync = kolab_sync::get_instance();
-
-        // Some devices create dummy devices with name "validate" (#1109)
-        // This device entry is used in two initial requests, but later
-        // the device registers a real name. We can remove this dummy entry
-        // on new device creation
-        if ($device->deviceid != 'validate') {
-            $this->db->query(
-                'DELETE FROM `' . $this->table_name . '` WHERE `deviceid` = ? AND `owner_id` = ?',
-                'validate', $sync->user->ID
-            );
-        }
+        // Create device entry in kolab backend
+        $created = $this->backend->device_create(
+            'ID'    => $device->id,
+            'TYPE'  => $device->devicetype,
+            'ALIAS' => $device->friendlyname,
+        , $device->deviceid);
 
-        // Auto-subscribe a default set of folders
-        $sync->storage()->device_init($device->deviceid);
+        if (!$created) {
+            throw new Syncroton_Exception_NotFound('Device creation failed');
+        }
 
         return $device;
     }
 
     /**
+     * Delete a device
+     *
+     * @param string|Syncroton_Model_IDevice $device Device object
+     *
+     * @return bool True on success, False on failure
+     */
+    public function delete($device)
+    {
+        // Update IMAP annotation
+        $this->backend->device_delete($device->deviceid);
+
+        return parent::delete($device);
+    }
+
+    /**
      * Return device for a given user
      *
      * @param string $ownerid  User identifier
@@ -82,7 +109,18 @@
             throw new Syncroton_Exception_NotFound('Device not found');
         }
 
-        return $this->get_object($device);
+        $device = $this->get_object($device);
+
+        // Make sure device exists (could be deleted by the user)
+        $dev = $this->backend->device_get($deviceid);
+        if (empty($dev)) {
+            // Remove the device (and related cached data) from database
+            $this->delete($device);
+
+            throw new Syncroton_Exception_NotFound('Device not found');
+        }
+
+        return $device;
     }
 
     /**

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_backend_folder.php Changed

@@ -46,38 +46,19 @@
     }
 
     /**
-     * mark folder as deleted. The state gets removed finally,
-     * when the synckey gets validated during next sync.
-     *
-     * @param Syncroton_Model_IFolder|string $id
-     */
-    public function delete($id)
-    {
-        $id = $id instanceof Syncroton_Model_IFolder ? $id->id : $id;
-
-        $result = $this->db->query("UPDATE `{$this->table_name}` SET `is_deleted` = 1 WHERE `id` = ?", $id);
-
-        return $result;
-    }
-
-    /**
      * Get array of ids which got send to the client for a given class
      *
      * @param Syncroton_Model_Device|string $deviceid Device object or identifier
      * @param string                        $class    Class name
-     * @param int                           $syncKey  Sync key
      *
      * @return array List of object identifiers
      */
-    public function getFolderState($deviceid, $class, $syncKey = null)
+    public function getFolderState($deviceid, $class)
     {
         $device_id = $deviceid instanceof Syncroton_Model_IDevice ? $deviceid->id : $deviceid;
 
         $where = $this->db->quote_identifier('device_id') . ' = ' . $this->db->quote($device_id);
         $where = $this->db->quote_identifier('class') . ' = ' . $this->db->quote($class);
-        if ($syncKey) {
-            $where = $this->db->quote_identifier('creation_synckey') . ' < ' . $this->db->quote($syncKey + 1);
-        }
 
         $select = $this->db->query('SELECT * FROM `' . $this->table_name . '` WHERE ' . implode(' AND ', $where));
         $result = ;
@@ -107,37 +88,14 @@
         $select = $this->db->query('SELECT * FROM `' . $this->table_name . '` WHERE ' . implode(' AND ', $where));
         $folder = $this->db->fetch_assoc($select);
 
-        if (!empty($folder'resync')) {
-            throw new Syncroton_Exception_NotFound("Folder $folderid not found because of resync");
-        }
         if (empty($folder)) {
-            throw new Syncroton_Exception_NotFound("Folder $folderid not found");
+            throw new Syncroton_Exception_NotFound('Folder not found');
         }
 
         return $this->get_object($folder);
     }
 
     /**
-     * Check if the folder already exists
-     *
-     * @param Syncroton_Model_Device|string  $deviceid Device object or identifier
-     * @param string                         $folderid Folder identifier
-     *
-     * @return bool true if it exists
-     */
-    public function exists($deviceid, $folderid)
-    {
-        $device_id = $deviceid instanceof Syncroton_Model_IDevice ? $deviceid->id : $deviceid;
-
-        $where = $this->db->quote_identifier('device_id') . ' = ' . $this->db->quote($device_id);
-        $where = $this->db->quote_identifier('folderid') . ' = ' . $this->db->quote($folderid);
-
-        $select = $this->db->query('SELECT 1 FROM `' . $this->table_name . '` WHERE ' . implode(' AND ', $where));
-        $folder = $this->db->fetch_assoc($select);
-        return !empty($folder);
-    }
-
-    /**
      * Find out if the folder hierarchy changed since the last FolderSync
      *
      * @param Syncroton_Model_Device $device Device object
@@ -159,24 +117,8 @@
             Syncroton_Data_Factory::CLASS_TASKS,
         ;
 
-        // Reset imap cache, metadata cache and the folder list cache so we work with up-to-date folders lists
+        // Reset imap cache so we work with up-to-date folders list
         rcube::get_instance()->get_storage()->clear_cache('mailboxes', true);
-        kolab_sync::storage()->reset();
-        foreach ($folder_classes as $class) {
-            Syncroton_Data_Factory::factory($class, $device, $timestamp)->clearCache();
-        }
-
-        // Retrieve all folders already sent to the client
-        $select = $this->db->query("SELECT * FROM `{$this->table_name}` WHERE `device_id` = ?", $device->id);
-
-        while ($folder = $this->db->fetch_assoc($select)) {
-            if (!empty($folder'resync')) {
-                // Folder re-sync requested
-                return true;
-            }
-
-            $client_folders$folder'folderid' = $this->get_object($folder);
-        }
 
         foreach ($folder_classes as $class) {
             try {
@@ -190,6 +132,13 @@
             }
         }
 
+        // retrieve all folders sent to the client
+        $select = $this->db->query("SELECT * FROM `{$this->table_name}` WHERE `device_id` = ?", $device->id);
+
+        while ($folder = $this->db->fetch_assoc($select)) {
+            $client_folders$folder'folderid' = $this->get_object($folder);
+        }
+
         ksort($client_folders);
         ksort($server_folders);

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_backend_state.php Changed

@@ -115,10 +115,6 @@
         $select = $this->db->limitquery("SELECT * FROM `{$this->table_name}` WHERE " . implode(' AND ', $where)
             . " ORDER BY `counter` DESC", 0, 1);
 
-        if ($err = $this->db->is_error($select)) {
-            throw new Exception("Query failed while fetching sync state: {$err}");
-        }
-
         $state = $this->db->fetch_assoc($select);
 
         if (empty($state)) {
@@ -146,28 +142,6 @@
     }
 
     /**
-     * Run a query and retry on deadlock
-     */
-    private function runAndRetry($query)
-    {
-        $retryCounter = 0;
-        while (true) {
-            $result = $this->db->query($query);
-            if ($this->db->is_error($result)) {
-                $retryCounter++;
-                // Retry on deadlock
-                if ($this->db->error_info()0 != '40001' || $retryCounter > 60) {
-                    throw new Exception("Failed to run query ($retryCounter retries): " . $query);
-                }
-            } else {
-                break;
-            }
-            // Give the other transactions some time before we try again
-            sleep(1);
-        }
-    }
-
-    /**
      * Validates specified sync state by checking for existance of newer keys
      *
      * @param Syncroton_Model_IDevice|string $deviceid Device object or identifier
@@ -190,10 +164,6 @@
 
         $select = $this->db->query("SELECT * FROM `{$this->table_name}` WHERE " . implode(' AND ', $where));
 
-        if ($err = $this->db->is_error($select)) {
-            throw new Exception("Query failed while validating sync state: {$err}");
-        }
-
         while ($row = $this->db->fetch_assoc($select)) {
             $states$row'counter' = $this->get_object($row);
         }
@@ -206,24 +176,32 @@
         $state = $states$sync_key;
         $next  = max(array_keys($states));
 
+        $where = ;
+        $where'device_id'  = $this->db->quote_identifier('device_id') . ' = ' . $this->db->quote($device_id);
+        $where'folder_id'  = $this->db->quote_identifier('folder_id') . ' = ' . $this->db->quote($folder_id);
+        $where'is_deleted' = $this->db->quote_identifier('is_deleted') . ' = 1';
+
         // found more recent synckey => the last sync response was not received by the client
         if ($next > $sync_key) {
             // We store the clientIdMap with the "next" sync state, so we need to copy it back.
             $state->clientIdMap = $states$next->clientIdMap;
             $state->counterNext = $next;
         } else {
-            // Cleanup deleted entries
-            if ($folderid == 'FolderSync') {
-                $where = ;
-                $where'device_id'  = $this->db->quote_identifier('device_id') . ' = ' . $this->db->quote($device_id);
-                $where'is_deleted' = $this->db->quote_identifier('is_deleted') . ' = 1';
-                $this->runAndRetry("DELETE FROM `syncroton_folder` WHERE " . implode(' AND ', $where));
-            } else {
-                $where = ;
-                $where'device_id'  = $this->db->quote_identifier('device_id') . ' = ' . $this->db->quote($device_id);
-                $where'folder_id'  = $this->db->quote_identifier('folder_id') . ' = ' . $this->db->quote($folder_id);
-                $where'is_deleted' = $this->db->quote_identifier('is_deleted') . ' = 1';
-                $this->runAndRetry("DELETE FROM `syncroton_content` WHERE " . implode(' AND ', $where));
+            // finally delete all entries marked for removal in syncroton_content table
+            $retryCounter = 0;
+            while (true) {
+                $result = $this->db->query("DELETE FROM `syncroton_content` WHERE " . implode(' AND ', $where));
+                if ($this->db->is_error($result)) {
+                    $retryCounter++;
+                    // Retry on deadlock
+                    if ($this->db->error_info()0 != '40001' || $retryCounter > 60) {
+                        throw new Exception('Failed to delete entries in sync_key check');
+                    }
+                } else {
+                    break;
+                }
+                //Give the other transactions some time before we try again
+                sleep(1);
             }
         }
 
@@ -245,9 +223,6 @@
         $where'counter'      = $this->db->quote_identifier('counter') . ' > ' . $this->db->quote($sync_key);
 
         $select = $this->db->query("SELECT id FROM `{$this->table_name}` WHERE " . implode(' AND ', $where));
-        if ($err = $this->db->is_error($select)) {
-            throw new Exception("Query failed while checking for sync state: {$err}");
-        }
         return $this->db->num_rows($select) > 0;
     }
 }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data.php Changed

@@ -334,13 +334,7 @@
      */
     public function updateFolder(Syncroton_Model_IFolder $folder)
     {
-        $result = $this->backend->folder_rename(
-            $folder->serverId,
-            $this->device->deviceid,
-            $this->modelName,
-            $folder->displayName,
-            $folder->parentId
-        );
+        $result = $this->backend->folder_rename($folder->serverId, $this->device->deviceid, $folder->displayName, $folder->parentId);
 
         if ($result) {
             return $folder;
@@ -359,7 +353,7 @@
         }
 
         // @TODO: throw exception
-        return $this->backend->folder_delete($folder, $this->device->deviceid, $this->modelName);
+        return $this->backend->folder_delete($folder, $this->device->deviceid);
     }
 
     /**
@@ -377,7 +371,7 @@
         // TODO: Respond with MailboxQuotaExceeded status. Where exactly?
 
         foreach ($this->extractFolders($folderid) as $folderid) {
-            if (!$this->backend->folder_empty($folderid, $this->device->deviceid, $this->modelName, !empty($options'deleteSubFolders'))) {
+            if (!$this->backend->folder_empty($folderid, $this->device->deviceid, !empty($options'deleteSubFolders'))) {
                 throw new Syncroton_Exception_Status_ItemOperations(Syncroton_Exception_Status_ItemOperations::ITEM_SERVER_ERROR);
             }
         }
@@ -593,16 +587,10 @@
         return $this->searchEntries($folderId, $filter, self::RESULT_COUNT, $syncState->extraData);
     }
 
-    /**
-     * Get additional metadata for a specified folder
-     *
-     * @param Syncroton_Model_IFolder $folder Folder object
-     *
-     * @return string|null JSON-encoded string
-     */
+
     public function getExtraData(Syncroton_Model_IFolder $folder)
     {
-        return $this->backend->getExtraData($folder->serverId, $this->device->deviceid, $this->modelName);
+        return $this->backend->getExtraData($folder->serverId, $this->device->deviceid);
     }
 
     /**
@@ -760,14 +748,6 @@
     }
 
     /**
-     * Clear the internal folder list cache
-     */
-    public function clearCache()
-    {
-        $this->folders = ;
-    }
-
-    /**
      * List of all IMAP folders (or subtree)
      *
      * @param string $parentid Parent folder identifier
@@ -1195,7 +1175,7 @@
         $r          = $data'recurrence';
 
         // required fields
-        switch ($r'FREQ') {
+        switch($r'FREQ') {
             case 'DAILY':
                 $recurrence'type' = self::RECUR_TYPE_DAILY;
                 break;

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_calendar.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_contacts.php Changed

@@ -192,21 +192,19 @@
             $result$key = $value;
         }
 
-        $emails = $this->getKolabContactEmails($data);
-
         // email address(es): email1Address, email2Address, email3Address
         for ($x = 0; $x < 3; $x++) {
-            if (!empty($emails$x)) {
-                $result'email' . ($x + 1) . 'Address' = $emails$x;
+            if (!empty($data'email'$x)) {
+                $email = $data'email'$x;
+                if (is_array($email)) {
+                    $email = $email'address';
+                }
+                if ($email) {
+                    $result'email' . ($x + 1) . 'Address' = $email;
+                }
             }
         }
 
-        // Outlook's synchronization will break with an empty contact (no nodes under ApplicationData),
-        // so we make sure to always set a property (an empty name is enough as long as there is an XML node).
-        if (empty($result)) {
-            $result'firstName' = '';
-        }
-
         return new Syncroton_Model_Contact($result);
     }
 
@@ -271,7 +269,30 @@
         }
 
         // email address(es): email1Address, email2Address, email3Address
-        $this->setKolabContactEmails($contact, $data);
+        $emails = ;
+        for ($x = 0; $x < 3; $x++) {
+            $key = 'email' . ($x + 1) . 'Address';
+            if ($value = $data->$key) {
+                // Android sends email address as: Lars Kneschke <l.kneschke@metaways.de>
+                if (preg_match('/(.*)<(.+@^@+)>/', $value, $matches)) {
+                    $value = trim($matches2);
+                }
+
+                // sanitize email address, it can contain broken (non-unicode) characters (#3287)
+                $value = rcube_charset::clean($value);
+
+                // try to find address type, at least we can do this if
+                // address wasn't changed
+                $type = '';
+                foreach ((array)$contact'email' as $email) {
+                    if ($email'address' == $value) {
+                        $type = $email'type';
+                    }
+                }
+                $emails = 'address' => $value, 'type' => $type;
+            }
+        }
+        $contact'email' = $emails;
 
         return $contact;
     }
@@ -616,99 +637,4 @@
 
         return ;
     }
-
-    /**
-     * Extract list of email addresses from a Kolab contact
-     */
-    protected function getKolabContactEmails($contact)
-    {
-        // Contacts from XML (Kolab3) contain 'email' item set with an array that contains address and type
-        // or is just an address.
-        // Contacts from DAV (Kolab4) contain 'email:<type>' items with an array of email addresses.
-
-        $emails = ;
-        foreach ('email', 'email:work', 'email:other', 'email:home' as $key) {
-            foreach ($contact$key ??  as $item) {
-                if (is_string($item) && strpos($item, '@')) {
-                    $emails = $item;
-                } elseif (is_array($item) && !empty($item)) {
-                    if (isset($item'address')) {
-                        $emails = $item'address';
-                    } else {
-                        $emails = array_merge($emails, $item);
-                    }
-                }
-            }
-        }
-
-        // Remove duplicates and empty values
-        return array_values(array_filter(array_unique($emails)));
-    }
-
-    /**
-     * Set Kolab contact email addresses
-     */
-    protected function setKolabContactEmails(&$contact, $data)
-    {
-        // On Kolab3 (XML) contacts have 'email' item that is a list of arrays that contain address and type
-        // or is just an address. No types.
-        // On Kolab4 (DAV) contacts have 'email:home', 'email:other' and 'email:home' items with
-        // an array of email addresses each.
-
-        // Get addresses from ActiveSync properties (email1Address, email2Address, email3Address)
-        $emails = ;
-        for ($x = 0; $x < 3; $x++) {
-            $key = 'email' . ($x + 1) . 'Address';
-            $email = $data->$key ?? null;
-            if ($email) {
-                // sanitize email address, it can contain broken (non-unicode) characters (#3287)
-                $email = rcube_charset::clean($email);
-
-                // Android sends email address as: Lars Kneschke <l.kneschke@metaways.de>
-                if (preg_match('/(.*)<(.+@^@+)>/', $email, $matches)) {
-                    $email = trim($matches2);
-                }
-
-                $emails = $email;
-            }
-        }
-
-        // Warning: If contact has more than 3 addresses in Kolab they will be removed
-
-        if ($this->backend instanceof kolab_sync_storage_kolab4) {
-            // Remove addresses that do not exist anymore
-            $existing = ;
-            foreach ('email:work', 'email:other', 'email:home' as $key) {
-                if (!empty($contact$key)) {
-                    $contact$key = array_values(array_intersect($contact$key, $emails));
-                    $existing = array_merge($existing, $contact$key);
-                    if (empty($contact$key)) {
-                        unset($contact$key);
-                    }
-                }
-            }
-
-            // Add new addresses
-            foreach (array_diff($emails, $existing) as $email) {
-                if (!isset($contact'email:other')) {
-                    $contact'email:other' = ;
-                }
-                $contact'email:other' = $email;
-            }
-        } else {
-            foreach ($emails as $idx => $email) {
-                // try to find address type, at least we can do this if address wasn't changed
-                $type = '';
-                foreach ($contact'email' ??  as $existing) {
-                    if (isset($existing'address') && $existing'address' == $email) {
-                        $type = $existing'type' ?? '';
-                    }
-                }
-
-                $emails$idx = 'address' => $email, 'type' => $type;
-            }
-
-            $contact'email' = $emails;
-        }
-    }
 }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_data_email.php Changed

@@ -30,9 +30,6 @@
 {
     public const MAX_SEARCH_RESULT = 200;
 
-    protected const MAIL_SUBMITTED = 1;
-    protected const MAIL_DONE = 2;
-
     /**
      * Mapping from ActiveSync Email namespace fields
      */
@@ -513,13 +510,9 @@
         $is_ios = preg_match('/(iphone|ipad)/i', $this->device->devicetype);
 
         // attachments
-        $attachments = $message->attachments;
-        if (isset($message->inline_parts)) {
-            $attachments = array_merge($attachments, $message->inline_parts);
-        }
+        $attachments = array_merge($message->attachments, $message->inline_parts);
         if (!empty($attachments)) {
             $result'attachments' = ;
-            $attachment_ids = ;
 
             foreach ($attachments as $attachment) {
                 $att = ;
@@ -528,37 +521,28 @@
                     continue;
                 }
 
-                // Eliminate possible duplicates in $attachments
-                if (in_array($attachment->mime_id, $attachment_ids)) {
-                    continue;
-                }
-
                 $filename = rcube_charset::clean($attachment->filename);
                 if (empty($filename) && $attachment->mimetype == 'text/html') {
                     $filename = 'HTML Part';
                 }
 
-                $att'displayName' = $filename;
+                $att'displayName'   = $filename;
                 $att'fileReference' = $serverId . '::' . $attachment->mime_id;
-                // Message/rfc822 parts have Method=5, anything else Method=1
-                // FIXME: Method=6 is for OLE objects, but is it inline images or sth else?
-                $att'method' = strcasecmp($attachment->mimetype, 'message/rfc822') === 0 ? 5 : 1;
+                $att'method'        = 1;
                 $att'estimatedDataSize' = $attachment->size;
 
                 if (!empty($attachment->content_id)) {
                     $att'contentId' = rcube_charset::clean($attachment->content_id);
                 }
-
                 if (!empty($attachment->content_location)) {
                     $att'contentLocation' = rcube_charset::clean($attachment->content_location);
                 }
 
-                if (strcasecmp($attachment->disposition, 'inline') === 0) {
+                if (in_array($attachment, $message->inline_parts)) {
                     $att'isInline' = 1;
                 }
 
                 $result'attachments' = new Syncroton_Model_EmailAttachment($att);
-                $attachment_ids = $attachment->mime_id;
             }
         }
 
@@ -690,7 +674,7 @@
         $result = ;
 
         if (!is_array($list)) {
-            throw new Syncroton_Exception_NotFound("Folder $folder_id not found: no folders available");
+            throw new Syncroton_Exception_NotFound('Folder not found');
         }
 
         // device supports multiple folders?
@@ -707,7 +691,7 @@
         }
 
         if (empty($result)) {
-            throw new Syncroton_Exception_NotFound("Folder $folder_id not found.");
+            throw new Syncroton_Exception_NotFound('Folder not found');
         }
 
         return $result;
@@ -829,43 +813,29 @@
      * Send an email
      *
      * @param mixed   $message    MIME message
-     * @param bool    $saveInSent Enables saving the sent message in Sent folder
-     * @param ?string $clientId   Message client-id
+     * @param boolean $saveInSent Enables saving the sent message in Sent folder
      *
      * @throws Syncroton_Exception_Status
      */
-    public function sendEmail($message, $saveInSent, $clientId)
+    public function sendEmail($message, $saveInSent)
     {
-        if (($status = $this->sentMailStatus($clientId, $cache, $cache_key)) === self::MAIL_DONE) {
-            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MESSAGE_PREVIOUSLY_SENT);
-        }
-
         if (!($message instanceof kolab_sync_message)) {
             $message = new kolab_sync_message($message);
         }
 
-        // Snet the message (if not sent previously)
-        if (!$status) {
-            $sent = $message->send($smtp_error);
+        $sent = $message->send($smtp_error);
 
-            if (!$sent) {
-                throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAIL_SUBMISSION_FAILED);
-            }
-
-            if (!empty($cache)) {
-                $cache->set($cache_key, self::MAIL_SUBMITTED);
-            }
+        if (!$sent) {
+            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MAIL_SUBMISSION_FAILED);
         }
 
         // Save sent message in Sent folder
         if ($saveInSent) {
-            if (!$message->saveInSent()) {
-                throw new Syncroton_Exception_Status(Syncroton_Exception_Status::SERVER_ERROR);
-            }
-        }
+            $sent_folder = kolab_sync::get_instance()->config->get('sent_mbox');
 
-        if (!empty($cache)) {
-            $cache->set($cache_key, self::MAIL_DONE);
+            if (strlen($sent_folder) && $this->storage->folder_exists($sent_folder)) {
+                return $this->storage->save_message($sent_folder, $message->source(), '', false, 'SEEN');
+            }
         }
     }
 
@@ -875,18 +845,13 @@
      * @param array|string    $itemId      A string LongId or an array with following properties:
      *                                     collectionId, itemId and instanceId
      * @param resource|string $body        MIME message
-     * @param bool            $saveInSent  Enables saving the sent message in Sent folder
-     * @param bool            $replaceMime If enabled, original message would be appended
-     * @param ?string         $clientId    Message client-id
+     * @param boolean         $saveInSent  Enables saving the sent message in Sent folder
+     * @param boolean         $replaceMime If enabled, original message would be appended
      *
      * @throws Syncroton_Exception_Status
      */
-    public function forwardEmail($itemId, $body, $saveInSent, $replaceMime, $clientId)
+    public function forwardEmail($itemId, $body, $saveInSent, $replaceMime)
     {
-        if ($this->sentMailStatus($clientId) === self::MAIL_DONE) {
-            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MESSAGE_PREVIOUSLY_SENT);
-        }
-
         /*
         @TODO:
         The SmartForward command can be applied to a meeting. When SmartForward is applied to a recurring meeting,
@@ -928,7 +893,7 @@
         }
 
         // Send message
-        $this->sendEmail($sync_msg, $saveInSent, $clientId);
+        $this->sendEmail($sync_msg, $saveInSent);
 
         // Set FORWARDED flag on the replied message
         if (empty($message->headers->flags'FORWARDED')) {
@@ -943,18 +908,13 @@
      * @param array|string    $itemId      A string LongId or an array with following properties:
      *                                     collectionId, itemId and instanceId
      * @param resource|string $body        MIME message
-     * @param bool            $saveInSent  Enables saving the sent message in Sent folder
-     * @param bool            $replaceMime If enabled, original message would be appended
-     * @param ?string         $clientId    Message client-id
+     * @param boolean         $saveInSent  Enables saving the sent message in Sent folder
+     * @param boolean         $replaceMime If enabled, original message would be appended
      *
      * @throws Syncroton_Exception_Status
      */
-    public function replyEmail($itemId, $body, $saveInSent, $replaceMime, $clientId)
+    public function replyEmail($itemId, $body, $saveInSent, $replaceMime)
     {
-        if ($this->sentMailStatus($clientId) === self::MAIL_DONE) {
-            throw new Syncroton_Exception_Status(Syncroton_Exception_Status::MESSAGE_PREVIOUSLY_SENT);
-        }
-
         $msg     = $this->parseMessageId($itemId);
         $message = $this->getObject($itemId);
 
@@ -984,7 +944,7 @@
         }
 
         // Send message
-        $this->sendEmail($sync_msg, $saveInSent, $clientId);
+        $this->sendEmail($sync_msg, $saveInSent);
 
         // Set ANSWERED flag on the replied message
         if (empty($message->headers->flags'ANSWERED')) {
@@ -1017,7 +977,7 @@
         // @TODO: caching with Options->RebuildResults support
 
         foreach ($folders as $folderid) {
-            $foldername = $this->backend->folder_id2name($folderid, $this->device->deviceid, $this->modelName);
+            $foldername = $this->backend->folder_id2name($folderid, $this->device->deviceid);
 
             if ($foldername === null) {
                 continue;
@@ -1172,14 +1132,14 @@
      */
     public function getFileReference($fileReference)
     {
+        $folderid, $uid, $part_id = explode('::', $fileReference);
+
         $message = $this->getObject($fileReference);
 
         if (!$message) {
-            throw new Syncroton_Exception_NotFound("Message $fileReference not found");
+            throw new Syncroton_Exception_NotFound('Message not found');
         }
 
-        $folderid, $uid, $part_id = explode('::', $fileReference);
-
         $part = $message->mime_parts$part_id;
         $body = $message->get_part_body($part_id);
 
@@ -1608,27 +1568,4 @@
             return kolab_sync_message::fake_message($headers, $msg);
         }
     }
-
-    /**
-     * Check in the cache if specified message (client-id) has been previously processed
-     * and with what result. It's used to prevent a duplicate submission.
-     */
-    protected function sentMailStatus($clientId, &$cache = null, &$cache_key = null)
-    {
-        // Note: ClientId is set with ActiveSync version >= 14.0
-        if ($clientId === null || $clientId === '') {
-            return 0;
-        }
-
-        $engine = kolab_sync::get_instance();
-        $status = null;
-        $cache_key = "ClientId:{$clientId}";
-
-        if ($cache_type = $engine->config->get('activesync_cache', 'db')) {
-            $cache = $engine->get_cache('activesync_cache', $cache_type, '1d', false);
-            $status = $cache->get($cache_key);
-        }
-
-        return (int) $status;
-    }
 }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_logger.php Changed

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_message.php Changed

@@ -216,22 +216,14 @@
         unset($smtp_headers'Bcc');
 
         // send message
-        if (isset($headers'X-Syncroton-Test')
-            && preg_match('/smtp=(true|false)/i', $headers'X-Syncroton-Test', $m)
-        ) {
-            $sent = $m1 == 'true';
-            $smtp_response = ;
-            $smtp_error = 999;
-        } else {
-            if (!is_object($rcube->smtp)) {
-                $rcube->smtp_init(true);
-            }
-
-            $sent = $rcube->smtp->send_mail($headers'From', $recipients, $smtp_headers, $this->body, $smtp_opts);
-            $smtp_response = $rcube->smtp->get_response();
-            $smtp_error    = $rcube->smtp->get_error();
+        if (!is_object($rcube->smtp)) {
+            $rcube->smtp_init(true);
         }
 
+        $sent = $rcube->smtp->send_mail($headers'From', $recipients, $smtp_headers, $this->body, $smtp_opts);
+        $smtp_response = $rcube->smtp->get_response();
+        $smtp_error    = $rcube->smtp->get_error();
+
         // log error
         if (!$sent) {
             rcube::raise_error('code' => 800, 'type' => 'smtp',
@@ -269,38 +261,6 @@
     }
 
     /**
-     * Save message in Sent folder
-     *
-     * @return bool True on success (or when the folder does not exist), False otherwise
-     */
-    public function saveInSent()
-    {
-        $engine = kolab_sync::get_instance();
-        $storage = $engine->get_storage();
-        $sent_folder = $engine->config->get('sent_mbox');
-
-        if (isset($this->headers'X-Syncroton-Test')
-            && preg_match('/imap=(true|false)/i', $this->headers'X-Syncroton-Test', $m)
-        ) {
-            return $m1 == 'true';
-        }
-
-        if (strlen($sent_folder) && $storage->folder_exists($sent_folder)) {
-            $source = $this->source();
-            $uid = $storage->save_message($sent_folder, $source, '', false, 'SEEN');
-
-            if (empty($uid)) {
-                rcube::raise_error('code' => 500, 'type' => 'imap',
-                    'line' => __LINE__, 'file' => __FILE__,
-                    'message' => "Failed to save message in {$sent_folder}", true, false);
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
      * Parses the message source and fixes 8bit data for ActiveSync.
      * This way any not UTF8 characters will be encoded before
      * sending to the device.

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_storage.php Changed

@@ -51,11 +51,12 @@
     public $syncTimeStamp;
 
     protected $storage;
+    protected $folder_meta;
     protected $folder_uids;
     protected $folders = ;
+    protected $root_meta;
     protected $relations = ;
-    protected $relationSupport = self::MODEL_TASKS, self::MODEL_NOTES, self::MODEL_EMAIL;
-    protected $subscriptions;
+    protected $relationSupport = true;
     protected $tag_rts = ;
     private $modseq = ;
 
@@ -108,15 +109,13 @@
         $this->storage->set_options(
             // @TODO: there can be Roundcube plugins defining additional headers,
             // we maybe would need to add them here
-            'fetch_headers' => 'X-KOLAB-TYPE X-KOLAB-MIME-VERSION MESSAGE-ID',
+            'fetch_headers' => 'X-KOLAB-TYPE X-KOLAB-MIME-VERSION',
             'skip_deleted'  => true,
             'threading'     => false,
         );
 
         // Disable paging
         $this->storage->set_pagesize(999999);
-
-        $this->subscriptions = new kolab_subscriptions();
     }
 
     /**
@@ -128,6 +127,29 @@
     }
 
     /**
+     * List known devices
+     *
+     * @return array Device list as hash array
+     */
+    public function devices_list()
+    {
+        if ($this->root_meta === null) {
+            // @TODO: consider server annotation instead of INBOX
+            if ($meta = $this->storage->get_metadata(self::ROOT_MAILBOX, self::ASYNC_KEY)) {
+                $this->root_meta = $this->unserialize_metadata($metaself::ROOT_MAILBOXself::ASYNC_KEY);
+            } else {
+                $this->root_meta = ;
+            }
+        }
+
+        if (!empty($this->root_meta'DEVICE') && is_array($this->root_meta'DEVICE')) {
+            return $this->root_meta'DEVICE';
+        }
+
+        return ;
+    }
+
+    /**
      * Get list of folders available for sync
      *
      * @param string $deviceid  Device identifier
@@ -138,15 +160,33 @@
      */
     public function folders_list($deviceid, $type, $flat_mode = false)
     {
-        $typedata = kolab_storage::folders_typedata();
+        // get all folders of specified type
+        $folders = kolab_storage::list_folders('', '*', $type, false, $typedata);
+
+        // get folders activesync config
+        $folderdata = $this->folder_meta();
+
+        if (!is_array($folders) || !is_array($folderdata)) {
+            return false;
+        }
 
         $folders_list = ;
 
         // check if folders are "subscribed" for activesync
-        foreach ($this->subscriptions->list_subscriptions($deviceid, $type) as $folder => $sub) {
+        foreach ($folderdata as $folder => $meta) {
+            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
+                || empty($meta'FOLDER'$deviceid'S')
+            ) {
+                continue;
+            }
+
             // force numeric folder name to be a string (T1283)
             $folder = (string) $folder;
 
+            if (!empty($type) && !in_array($folder, $folders)) {
+                continue;
+            }
+
             // Activesync folder identifier (serverId)
             $folder_type = !empty($typedata$folder) ? $typedata$folder : 'mail';
             $folder_id   = $this->folder_id($folder, $folder_type);
@@ -217,6 +257,35 @@
     }
 
     /**
+     * Getter for folder metadata
+     *
+     * @return array|bool Hash array with meta data for each folder, False on backend failure
+     */
+    protected function folder_meta()
+    {
+        if (!isset($this->folder_meta)) {
+            // get folders activesync config
+            $folderdata = $this->storage->get_metadata("*", self::ASYNC_KEY);
+
+            if (!is_array($folderdata)) {
+                return $this->folder_meta = false;
+            }
+
+            $this->folder_meta = ;
+
+            foreach ($folderdata as $folder => $meta) {
+                if (isset($metaself::ASYNC_KEY)) {
+                    if ($metadata = $this->unserialize_metadata($metaself::ASYNC_KEY)) {
+                        $this->folder_meta$folder = $metadata;
+                    }
+                }
+            }
+        }
+
+        return $this->folder_meta;
+    }
+
+    /**
      * Creates folder and subscribes to the device
      *
      * @param string  $name      Folder name (UTF8)
@@ -230,10 +299,9 @@
     {
         $parent = null;
         $name = rcube_charset::convert($name, kolab_sync::CHARSET, 'UTF7-IMAP');
-        $type = self::type_activesync2kolab($type);
 
         if ($parentid) {
-            $parent = $this->folder_id2name($parentid, $deviceid, $type);
+            $parent = $this->folder_id2name($parentid, $deviceid);
 
             if ($parent === null) {
                 throw new Syncroton_Exception_Status_FolderCreate(Syncroton_Exception_Status_FolderCreate::PARENT_NOT_FOUND);
@@ -249,10 +317,12 @@
             throw new Syncroton_Exception_Status_FolderCreate(Syncroton_Exception_Status_FolderCreate::FOLDER_EXISTS);
         }
 
+        $type    = self::type_activesync2kolab($type);
         $created = kolab_storage::folder_create($name, $type, true);
 
         if ($created) {
-            $this->subscriptions->folder_subscribe($deviceid, $name, 1, $type);
+            // Set ActiveSync subscription flag
+            $this->folder_set($name, $deviceid, 1);
 
             return $this->folder_id($name, $type);
         }
@@ -271,18 +341,17 @@
      *
      * @param string  $folderid Folder identifier
      * @param string  $deviceid Device identifier
-     * @param string  $type     Activesync model name (folder type)
      * @param string  $new_name New folder name (UTF8)
      * @param ?string $parentid Folder parent identifier
      *
      * @return bool True on success, False on failure
      */
-    public function folder_rename($folderid, $deviceid, $type, $new_name, $parentid)
+    public function folder_rename($folderid, $deviceid, $new_name, $parentid)
     {
-        $old_name = $this->folder_id2name($folderid, $deviceid, $type);
+        $old_name = $this->folder_id2name($folderid, $deviceid);
 
         if ($parentid) {
-            $parent = $this->folder_id2name($parentid, $deviceid, $type);
+            $parent = $this->folder_id2name($parentid, $deviceid);
         }
 
         $name = rcube_charset::convert($new_name, kolab_sync::CHARSET, 'UTF7-IMAP');
@@ -297,22 +366,18 @@
             return true;
         }
 
+        $this->folder_meta = null;
+
         // TODO: folder type change?
 
+        $type = kolab_storage::folder_type($old_name);
+
         // don't use kolab_storage for moving mail folders
-        if ($type == self::MODEL_EMAIL) {
-            $result = $this->storage->rename_folder($old_name, $name);
+        if (preg_match('/^mail/', $type)) {
+            return $this->storage->rename_folder($old_name, $name);
         } else {
-            $result = kolab_storage::folder_rename($old_name, $name);
-        }
-
-        if ($result) {
-            // Set ActiveSync subscription flag
-            // TODO: Use old subscription flag value
-            $this->subscriptions->folder_subscribe($deviceid, $name, 1, $type);
+            return kolab_storage::folder_rename($old_name, $name);
         }
-
-        return $result;
     }
 
     /**
@@ -320,16 +385,18 @@
      *
      * @param string $folderid Folder identifier
      * @param string $deviceid Device identifier
-     * @param string $type     Activesync model name (folder type)
      *
      * @return bool True on success, False otherwise
      */
-    public function folder_delete($folderid, $deviceid, $type)
+    public function folder_delete($folderid, $deviceid)
     {
-        $name = $this->folder_id2name($folderid, $deviceid, $type);
+        $name = $this->folder_id2name($folderid, $deviceid);
+        $type = kolab_storage::folder_type($name);
+
+        unset($this->folder_meta$name);
 
         // don't use kolab_storage for deleting mail folders
-        if ($type == self::MODEL_EMAIL) {
+        if (preg_match('/^mail/', $type)) {
             return $this->storage->delete_folder($name);
         }
 
@@ -341,27 +408,30 @@
      *
      * @param string $folderid  Folder identifier
      * @param string $deviceid  Device identifier
-     * @param string $type     Activesync model name (folder type)
      * @param bool   $recursive Apply to the folder and its subfolders
      *
      * @return bool True on success, False otherwise
      */
-    public function folder_empty($folderid, $deviceid, $type, $recursive = false)
+    public function folder_empty($folderid, $deviceid, $recursive = false)
     {
-        $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+        $foldername = $this->folder_id2name($folderid, $deviceid);
 
         // Remove all entries
         if (!$this->storage->clear_folder($foldername)) {
             return false;
         }
 
-        // Empty subfolders
+        // Remove subfolders
         if ($recursive) {
             $delim = $this->storage->get_hierarchy_delimiter();
-            $folders = $this->subscriptions->list_subscriptions($deviceid, $type);
+            $folderdata = $this->folder_meta();
+
+            if (!is_array($folderdata)) {
+                return false;
+            }
 
-            foreach (array_keys($folders) as $subfolder) {
-                if (strpos((string) $subfolder, $foldername . $delim)) {
+            foreach ($folderdata as $subfolder => $meta) {
+                if (!empty($meta'FOLDER'$deviceid'S') && strpos((string) $subfolder, $foldername . $delim)) {
                     if (!$this->storage->clear_folder((string) $subfolder)) {
                         return false;
                     }
@@ -373,6 +443,233 @@
     }
 
     /**
+     * Sets ActiveSync subscription flag on a folder
+     *
+     * @param string $name      Folder name (UTF7-IMAP)
+     * @param string $deviceid  Device identifier
+     * @param int    $flag      Flag value (0|1|2)
+     *
+     * @return bool True on success, False on failure
+     */
+    protected function folder_set($name, $deviceid, $flag)
+    {
+        if (empty($deviceid)) {
+            return false;
+        }
+
+        // get folders activesync config
+        $metadata = $this->folder_meta();
+
+        if (!is_array($metadata)) {
+            return false;
+        }
+
+        $metadata = $metadata$name ?? ;
+
+        if ($flag) {
+            if (empty($metadata)) {
+                $metadata = ;
+            }
+
+            if (empty($metadata'FOLDER')) {
+                $metadata'FOLDER' = ;
+            }
+
+            if (empty($metadata'FOLDER'$deviceid)) {
+                $metadata'FOLDER'$deviceid = ;
+            }
+
+            // Z-Push uses:
+            //  1 - synchronize, no alarms
+            //  2 - synchronize with alarms
+            $metadata'FOLDER'$deviceid'S' = $flag;
+        } else {
+            unset($metadata'FOLDER'$deviceid'S');
+
+            if (empty($metadata'FOLDER'$deviceid)) {
+                unset($metadata'FOLDER'$deviceid);
+            }
+
+            if (empty($metadata'FOLDER')) {
+                unset($metadata'FOLDER');
+            }
+
+            if (empty($metadata)) {
+                $metadata = null;
+            }
+        }
+
+        // Return if nothing's been changed
+        if (!self::data_array_diff($this->folder_meta$name ?? null, $metadata)) {
+            return true;
+        }
+
+        $this->folder_meta$name = $metadata;
+
+        return $this->storage->set_metadata($name, self::ASYNC_KEY => $this->serialize_metadata($metadata));
+    }
+
+    /**
+     * Returns device metadata
+     *
+     * @param string $id Device ID
+     *
+     * @return array|null Device metadata
+     */
+    public function device_get($id)
+    {
+        $devices_list = $this->devices_list();
+        return $devices_list$id ?? null;
+    }
+
+    /**
+     * Registers new device on server
+     *
+     * @param array  $device  Device data
+     * @param string $id      Device ID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function device_create($device, $id)
+    {
+        // Fill local cache
+        $this->devices_list();
+
+        // Some devices create dummy devices with name "validate" (#1109)
+        // This device entry is used in two initial requests, but later
+        // the device registers a real name. We can remove this dummy entry
+        // on new device creation
+        $this->device_delete('validate');
+
+        // Old Kolab_ZPush device parameters
+        // MODE:  -1 | 0 | 1  (not set | flatmode | foldermode)
+        // TYPE:  device type string
+        // ALIAS: user-friendly device name
+
+        // Syncroton (kolab_sync_backend_device) uses
+        // ID:    internal identifier in syncroton database
+        // TYPE:  device type string
+        // ALIAS: user-friendly device name
+
+        $metadata = $this->root_meta;
+        $metadata'DEVICE'$id = $device;
+        $metadata = self::ASYNC_KEY => $this->serialize_metadata($metadata);
+
+        $result = $this->storage->set_metadata(self::ROOT_MAILBOX, $metadata);
+
+        if ($result) {
+            // Update local cache
+            $this->root_meta'DEVICE'$id = $device;
+
+            // subscribe default set of folders
+            $this->device_init_subscriptions($id);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Device update.
+     *
+     * @param array  $device  Device data
+     * @param string $id      Device ID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function device_update($device, $id)
+    {
+        $devices_list = $this->devices_list();
+        $old_device   = $devices_list$id;
+
+        if (!$old_device) {
+            return false;
+        }
+
+        // Do nothing if nothing is changed
+        if (!self::data_array_diff($old_device, $device)) {
+            return true;
+        }
+
+        $device = array_merge($old_device, $device);
+
+        $metadata = $this->root_meta;
+        $metadata'DEVICE'$id = $device;
+        $metadata = self::ASYNC_KEY => $this->serialize_metadata($metadata);
+
+        $result = $this->storage->set_metadata(self::ROOT_MAILBOX, $metadata);
+
+        if ($result) {
+            // Update local cache
+            $this->root_meta'DEVICE'$id = $device;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Device delete.
+     *
+     * @param string $id Device ID
+     *
+     * @return bool True on success, False on failure
+     */
+    public function device_delete($id)
+    {
+        $device = $this->device_get($id);
+
+        if (!$device) {
+            return false;
+        }
+
+        unset($this->root_meta'DEVICE'$id, $this->root_meta'FOLDER'$id);
+
+        if (empty($this->root_meta'DEVICE')) {
+            unset($this->root_meta'DEVICE');
+        }
+        if (empty($this->root_meta'FOLDER')) {
+            unset($this->root_meta'FOLDER');
+        }
+
+        $metadata = $this->serialize_metadata($this->root_meta);
+        $metadata = self::ASYNC_KEY => $metadata;
+
+        // update meta data
+        $result = $this->storage->set_metadata(self::ROOT_MAILBOX, $metadata);
+
+        if ($result) {
+            // remove device annotation for every folder
+            foreach ($this->folder_meta() as $folder => $meta) {
+                // skip root folder (already handled above)
+                if ($folder == self::ROOT_MAILBOX) {
+                    continue;
+                }
+
+                if (!empty($meta'FOLDER') && isset($meta'FOLDER'$id)) {
+                    unset($meta'FOLDER'$id);
+
+                    if (empty($meta'FOLDER')) {
+                        unset($this->folder_meta$folder'FOLDER');
+                        unset($meta'FOLDER');
+                    }
+                    if (empty($meta)) {
+                        unset($this->folder_meta$folder);
+                        $meta = null;
+                    }
+
+                    $metadata = self::ASYNC_KEY => $this->serialize_metadata($meta);
+                    $res = $this->storage->set_metadata($folder, $metadata);
+
+                    if ($res && $meta) {
+                        $this->folder_meta$folder = $meta;
+                    }
+                }
+            }
+        }
+
+        return $result;
+    }
+
+    /**
      * Creates an item in a folder.
      *
      * @param string       $folderid Folder identifier
@@ -386,7 +683,7 @@
     public function createItem($folderid, $deviceid, $type, $data, $params = )
     {
         if ($type == self::MODEL_EMAIL) {
-            $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+            $foldername = $this->folder_id2name($folderid, $deviceid);
 
             $uid = $this->storage->save_message($foldername, $data, '', false, $params'flags' ?? );
 
@@ -397,7 +694,7 @@
             return $uid;
         }
 
-        $useTags = in_array($type, $this->relationSupport);
+        $useTags = $this->relationSupport && ($type == self::MODEL_TASKS || $type == self::MODEL_NOTES);
 
         // convert categories into tags, save them after creating an object
         if ($useTags && !empty($data'categories')) {
@@ -436,7 +733,7 @@
     public function deleteItem($folderid, $deviceid, $type, $uid, $moveToTrash = false)
     {
         if ($type == self::MODEL_EMAIL) {
-            $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+            $foldername = $this->folder_id2name($folderid, $deviceid);
             $trash = kolab_sync::get_instance()->config->get('trash_mbox');
 
             // move message to the Trash folder
@@ -455,7 +752,7 @@
             return $this->storage->delete_message($uid, $foldername);
         }
 
-        $useTags = in_array($type, $this->relationSupport);
+        $useTags = $this->relationSupport && ($type == self::MODEL_TASKS || $type == self::MODEL_NOTES);
 
         $folder = $this->getFolder($folderid, $deviceid, $type);
 
@@ -489,7 +786,7 @@
     public function updateItem($folderid, $deviceid, $type, $uid, $data, $params = )
     {
         if ($type == self::MODEL_EMAIL) {
-            $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+            $foldername = $this->folder_id2name($folderid, $deviceid);
 
             // Note: We do not support a message body update, as it's not needed
 
@@ -498,14 +795,14 @@
             }
 
             // Categories (Tags) change
-            if (isset($params'categories') && in_array($type, $this->relationSupport)) {
-                $headers = $this->storage->fetch_headers($foldername, $uid, false);
+            if (isset($params'categories') && $this->relationSupport) {
+                $message = new rcube_message($uid, $foldername);
 
-                if (empty($headers) || empty($headers$uid)) {
+                if (empty($message->headers)) {
                     throw new Syncroton_Exception_Status_Sync(Syncroton_Exception_Status_Sync::SYNC_SERVER_ERROR);
                 }
 
-                $this->setCategories($headers$uid, $params'categories');
+                $this->setCategories($message, $params'categories');
             }
 
             return $uid;
@@ -513,7 +810,7 @@
 
         $folder = $this->getFolder($folderid, $deviceid, $type);
 
-        $useTags = in_array($type, $this->relationSupport);
+        $useTags = $this->relationSupport && ($type == self::MODEL_TASKS || $type == self::MODEL_NOTES);
 
         // convert categories into tags, save them after updating an object
         if ($useTags && array_key_exists('categories', $data)) {
@@ -539,16 +836,16 @@
     /**
      * Returns list of categories assigned to an object
      *
-     * @param rcube_message_header|string $object     UID or mail message headers
-     * @param array                       $categories Addition tag names to merge with
+     * @param object|string $object     UID or rcube_message object
+     * @param array         $categories Addition tag names to merge with
      *
      * @return array List of categories
      */
-    protected function getCategories($object, $categories = )
+    public function getCategories($object, $categories = )
     {
         if (is_object($object)) {
             // support only messages with message-id
-            if (!($msg_id = $object->get('message-id', false))) {
+            if (!($msg_id = $object->headers->get('message-id', false))) {
                 return ;
             }
 
@@ -608,7 +905,7 @@
             return $this->folders$unique_key;
         }
 
-        $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+        $foldername = $this->folder_id2name($folderid, $deviceid);
 
         return $this->folders$unique_key = kolab_storage::get_folder($foldername, $type);
     }
@@ -624,12 +921,17 @@
      */
     public function getFolderConfig($folderid, $deviceid, $type)
     {
-        $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+        $foldername = $this->folder_id2name($folderid, $deviceid);
 
-        $subs = $this->subscriptions->folder_subscriptions($foldername, $type);
+        $metadata = $this->folder_meta();
+        $config = ;
+
+        if (!empty($metadata$foldername'FOLDER'$deviceid)) {
+            $config = $metadata$foldername'FOLDER'$deviceid;
+        }
 
         return 
-            'ALARMS' => ($subs$deviceid ?? 0) == 2,
+            'ALARMS' => ($config'S' ?? 0) == 2,
         ;
     }
 
@@ -646,14 +948,12 @@
     public function getItem($folderid, $deviceid, $type, $uid)
     {
         if ($type == self::MODEL_EMAIL) {
-            $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+            $foldername = $this->folder_id2name($folderid, $deviceid);
             $message = new rcube_message($uid, $foldername);
 
             if (!empty($message->headers)) {
-                if (in_array($type, $this->relationSupport)) {
-                    $message->headers->folder = $foldername;
-                    $message->headers->uid = $uid;
-                    $message->headers->others'categories' = $this->getCategories($message->headers);
+                if ($this->relationSupport) {
+                    $message->headers->others'categories' = $this->getCategories($message);
                 }
 
                 return $message;
@@ -674,7 +974,7 @@
             throw new Syncroton_Exception_Status(Syncroton_Exception_Status::SERVER_ERROR);
         }
 
-        $useTags = in_array($type, $this->relationSupport);
+        $useTags = $this->relationSupport && ($type == self::MODEL_TASKS || $type == self::MODEL_NOTES);
 
         if ($useTags) {
             $result'categories' = $this->getCategories($uid, $result'categories' ?? );
@@ -725,8 +1025,8 @@
     public function moveItem($srcFolderId, $deviceid, $type, $uid, $dstFolderId)
     {
         if ($type === self::MODEL_EMAIL) {
-            $src_name = $this->folder_id2name($srcFolderId, $deviceid, $type);
-            $dst_name = $this->folder_id2name($dstFolderId, $deviceid, $type);
+            $src_name = $this->folder_id2name($srcFolderId, $deviceid);
+            $dst_name = $this->folder_id2name($dstFolderId, $deviceid);
 
             if ($dst_name === null) {
                 throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_DESTINATION);
@@ -742,12 +1042,6 @@
 
             // Use COPYUID feature (RFC2359) to get the new UID of the copied message
             if (empty($this->storage->conn->data'COPYUID')) {
-                // Check if the source item actually exists. Cyrus IMAP reports
-                // OK on a MOVE with an invalid UID, But COPYUID will be empty.
-                // This way we only incur the cost of the extra check once the move fails.
-                if (!$this->storage->get_message_headers($uid, $src_name)) {
-                    throw new Syncroton_Exception_Status_MoveItems(Syncroton_Exception_Status_MoveItems::INVALID_SOURCE);
-                }
                 throw new Syncroton_Exception_Status(Syncroton_Exception_Status::SERVER_ERROR);
             }
 
@@ -771,10 +1065,10 @@
     /**
      * Set categories to an object
      *
-     * @param rcube_message_header|string $object     UID or mail message headers
-     * @param array                       $categories List of Category names
+     * @param object|string $object     UID or rcube_message object
+     * @param array         $categories List of Category names
      */
-    protected function setCategories($object, $categories)
+    public function setCategories($object, $categories)
     {
         if (!is_object($object)) {
             $config = kolab_storage_config::get_instance();
@@ -784,7 +1078,7 @@
 
         $config = kolab_storage_config::get_instance();
         $delta  = Syncroton_Registry::getPingTimeout();
-        $uri    = kolab_storage_config::get_message_uri($object, $object->folder);
+        $uri    = kolab_storage_config::get_message_uri($object->headers, $object->folder);
 
         // for all tag objects...
         foreach ($config->get_tags() as $relation) {
@@ -872,7 +1166,7 @@
 
         $result = $result_type == kolab_sync_data::RESULT_COUNT ? 0 : ;
 
-        $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+        $foldername = $this->folder_id2name($folderid, $deviceid);
 
         if ($foldername === null) {
             return $result;
@@ -950,7 +1244,7 @@
         }
 
         // get members of modified relations
-        if (in_array($type, $this->relationSupport)) {
+        if ($this->relationSupport) {
             $changed_msgs = $this->getChangesByRelations($folderid, $device_key, $type, $filter);
             // handle relation changes
             if (!empty($changed_msgs)) {
@@ -958,7 +1252,7 @@
 
                 switch ($result_type) {
                     case kolab_sync_data::RESULT_COUNT:
-                        $result += count($members); // @phpstan-ignore-line
+                        $result += count($members);
                         break;
 
                     case kolab_sync_data::RESULT_UID:
@@ -978,11 +1272,10 @@
      *
      * @param string $folderid Folder identifier
      * @param string $deviceid Device identifier
-     * @param string $type     Activesync model name (folder type)
      *
      * @return string|null Extra data (JSON-encoded)
      */
-    public function getExtraData($folderid, $deviceid, $type)
+    public function getExtraData($folderid, $deviceid)
     {
         //We explicitly return a cached value that was used during the search.
         //Otherwise we'd risk storing a higher modseq value and missing an update.
@@ -991,7 +1284,7 @@
         }
 
         //If we didn't fetch modseq in the first place we have to fetch it now.
-        $foldername = $this->folder_id2name($folderid, $deviceid, $type);
+        $foldername = $this->folder_id2name($folderid, $deviceid);
         if ($foldername !== null) {
             $folder_data = $this->storage->folder_data($foldername);
             if (!empty($folder_data'HIGHESTMODSEQ')) {
@@ -1020,7 +1313,7 @@
         // there's a PHP Warning from kolab_storage if $filter isn't an array
         if (empty($filter)) {
             $filter = ;
-        } elseif (in_array($type, $this->relationSupport)) {
+        } elseif ($this->relationSupport && ($type == self::MODEL_TASKS || $type == self::MODEL_NOTES)) {
             $changed_objects = $this->getChangesByRelations($folderid, $device_key, $type, $filter);
         }
 
@@ -1077,7 +1370,7 @@
                     // need a precise result here
                     $count = $folder->count($tag_filter);
                     if ($count !== null) {
-                        $result += (int) $count; // @phpstan-ignore-line
+                        $result += (int) $count;
                     }
 
                     break;
@@ -1271,19 +1564,9 @@
                 ;
             }
 
-            // If the new and the old timestamp are the same our cache breaks.
-            // We must preserve the previous changes, because if this function is rerun we must detect the same changes again.
-            $sinceFormatted = $since->format('Y-m-d H:i:s');
-            if ($this->syncTimeStamp->format('Y-m-d H:i:s') == $sinceFormatted) {
-                // Preserve the previous timestamp (relations_state_get just checks the overflow bucket first)
-                // FIXME: The one caveat is that we will still update the database and thus overwrite the old entry.
-                // That means if we rerun the same request, the changes will not be detected
-                // => We should not be dealing with timestamps really.
-                $this->relations$folderid$sinceFormatted . "-1" = $this->relations$folderid$sinceFormatted ?? null;
-                $this->relations$folderid$sinceFormatted = null;
-            }
+            $now = new DateTime('now', new DateTimeZone('UTC'));
 
-            $this->relations_state_set($device_key, $folderid, $this->syncTimeStamp, $data);
+            $this->relations_state_set($device_key, $folderid, $now, $data);
         }
 
         // in mail mode return only message URIs
@@ -1317,19 +1600,12 @@
     }
 
     /**
-     * Subscribes to a default set of folder on a new device registration
-     *
-     * @param string $deviceid Device ID
+     * Subscribe default set of folders on device registration
      */
-    public function device_init($deviceid)
+    protected function device_init_subscriptions($deviceid)
     {
-        $subscribed = 
-            'mail' => 'INBOX' => 1, // INBOX always exists
-            'event' => ,
-            'contact' => ,
-            'task' => ,
-            'note' => ,
-        ;
+        // INBOX always exists
+        $this->folder_set('INBOX', $deviceid, 1);
 
         $supported_types = 
             'mail.drafts',
@@ -1366,76 +1642,99 @@
                 // only personal folders
                 if ($this->storage->folder_namespace($folder) == 'personal') {
                     $flag = preg_match('/^(event|task)/', $type) ? 2 : 1;
-                    $type,  = explode('.', $type);
-                    $subscribed$type$folder = $flag;
+                    $this->folder_set($folder, $deviceid, $flag);
                     $folders = $folder;
                 }
             }
         }
 
-        if ($mode) {
-            // below we support additionally all mail folders
-            $supported_types = 'mail';
-            $supported_types = 'mail.junkemail';
+        // we're in default mode, exit
+        if (!$mode) {
+            return;
+        }
+
+        // below we support additionally all mail folders
+        $supported_types = 'mail';
+        $supported_types = 'mail.junkemail';
 
-            // get configured special folders
-            $special_folders = ;
-            $map             = 
-                'drafts' => 'mail.drafts',
-                'junk'   => 'mail.junkemail',
-                'sent'   => 'mail.sentitems',
-                'trash'  => 'mail.wastebasket',
-            ;
+        // get configured special folders
+        $special_folders = ;
+        $map             = 
+            'drafts' => 'mail.drafts',
+            'junk'   => 'mail.junkemail',
+            'sent'   => 'mail.sentitems',
+            'trash'  => 'mail.wastebasket',
+        ;
 
-            foreach ($map as $folder => $type) {
-                if ($folder = $config->get($folder . '_mbox')) {
-                    $special_folders$folder = $type;
-                }
+        foreach ($map as $folder => $type) {
+            if ($folder = $config->get($folder . '_mbox')) {
+                $special_folders$folder = $type;
             }
+        }
 
-            // get folders list(s)
-            if (($mode & self::INIT_ALL_PERSONAL) || ($mode & self::INIT_ALL_OTHER) || ($mode & self::INIT_ALL_SHARED)) {
-                $all_folders = $this->storage->list_folders();
-                if (($mode & self::INIT_SUB_PERSONAL) || ($mode & self::INIT_SUB_OTHER) || ($mode & self::INIT_SUB_SHARED)) {
-                    $subscribed_folders = $this->storage->list_folders_subscribed();
-                }
-            } else {
-                $all_folders = $this->storage->list_folders_subscribed();
+        // get folders list(s)
+        if (($mode & self::INIT_ALL_PERSONAL) || ($mode & self::INIT_ALL_OTHER) || ($mode & self::INIT_ALL_SHARED)) {
+            $all_folders = $this->storage->list_folders();
+            if (($mode & self::INIT_SUB_PERSONAL) || ($mode & self::INIT_SUB_OTHER) || ($mode & self::INIT_SUB_SHARED)) {
+                $subscribed_folders = $this->storage->list_folders_subscribed();
             }
+        } else {
+            $all_folders = $this->storage->list_folders_subscribed();
+        }
 
-            foreach ($all_folders as $folder) {
-                // folder already subscribed
-                if (in_array($folder, $folders)) {
-                    continue;
-                }
+        foreach ($all_folders as $folder) {
+            // folder already subscribed
+            if (in_array($folder, $folders)) {
+                continue;
+            }
 
-                $type = ($foldertypes$folder ?? null) ?: 'mail';
-                if ($type == 'mail' && isset($special_folders$folder)) {
-                    $type = $special_folders$folder;
-                }
+            $type = ($foldertypes$folder ?? null) ?: 'mail';
+            if ($type == 'mail' && isset($special_folders$folder)) {
+                $type = $special_folders$folder;
+            }
 
-                if (!in_array($type, $supported_types)) {
-                    continue;
-                }
+            if (!in_array($type, $supported_types)) {
+                continue;
+            }
 
-                $ns = strtoupper($this->storage->folder_namespace($folder));
+            $ns = strtoupper($this->storage->folder_namespace($folder));
 
-                // subscribe the folder according to configured mode
-                // and folder namespace/subscription status
-                if (($mode & constant("self::INIT_ALL_{$ns}"))
-                    || (($mode & constant("self::INIT_SUB_{$ns}"))
-                        && (!isset($subscribed_folders) || in_array($folder, $subscribed_folders)))
-                ) {
-                    $flag = preg_match('/^(event|task)/', $type) ? 2 : 1;
-                    $type,  = explode('.', $type);
-                    $subscribed$type$folder = $flag;
-                }
+            // subscribe the folder according to configured mode
+            // and folder namespace/subscription status
+            if (($mode & constant("self::INIT_ALL_{$ns}"))
+                || (($mode & constant("self::INIT_SUB_{$ns}"))
+                    && (!isset($subscribed_folders) || in_array($folder, $subscribed_folders)))
+            ) {
+                $flag = preg_match('/^(event|task)/', $type) ? 2 : 1;
+                $this->folder_set($folder, $deviceid, $flag);
             }
         }
+    }
+
+    /**
+     * Helper method to decode saved IMAP metadata
+     */
+    protected function unserialize_metadata($str)
+    {
+        if (!empty($str)) {
+            $data = json_decode($str, true);
+            return $data;
+        }
+
+        return null;
+    }
 
-        foreach ($subscribed as $type => $list) {
-            $this->subscriptions->set_subscriptions($deviceid, $type, $list);
+    /**
+     * Helper method to encode IMAP metadata for saving
+     */
+    protected function serialize_metadata($data)
+    {
+        if (!empty($data) && is_array($data)) {
+            $data = json_encode($data);
+            return $data;
         }
+
+        return null;
     }
 
     /**
@@ -1520,6 +1819,19 @@
             return $this->folder_uids$name;
         }
 
+        /*
+                @TODO: For now uniqueid annotation doesn't work, we will create UIDs by ourselves.
+                       There's one inconvenience of this solution: folder name/type change
+                       would be handled in ActiveSync as delete + create.
+
+                // get folders unique identifier
+                $folderdata = $this->storage->get_metadata($name, self::UID_KEY);
+
+                if ($folderdata && !empty($folderdata$name)) {
+                    $uid = $folderdata$nameself::UID_KEY;
+                    return $this->folder_uids$name = $uid;
+                }
+        */
         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).
@@ -1544,32 +1856,57 @@
     /**
      * Returns IMAP folder name
      *
-     * @param string $id       Folder identifier
-     * @param string $deviceid Device dentifier
-     * @param string $type     Folder type
+     * @param string $id        Folder identifier
+     * @param string $deviceid  Device dentifier
      *
      * @return string|null Folder name (UTF7-IMAP)
      */
-    public function folder_id2name($id, $deviceid, $type)
+    public function folder_id2name($id, $deviceid)
     {
-        // TODO: This method should become protected
-
         // check in cache first
         if (!empty($this->folder_uids)) {
             if (($name = array_search($id, $this->folder_uids)) !== false) {
                 return $name;
             }
         }
+        /*
+                @TODO: see folder_id()
 
-        $name = null;
+                // get folders unique identifier
+                $folderdata = $this->storage->get_metadata('*', self::UID_KEY);
+
+                foreach ((array)$folderdata as $folder => $data) {
+                    if (!empty($dataself::UID_KEY)) {
+                        $uid = $dataself::UID_KEY;
+                        $this->folder_uids$folder = $uid;
+                        if ($uid == $id) {
+                            $name = $folder;
+                        }
+                    }
+                }
+        */
+        // get all folders of specified type
+        $folderdata = $this->folder_meta();
 
-        if (strpos($type, '.')) {
-            $type,  = explode('.', $type);
+        if (!is_array($folderdata) || empty($id)) {
+            return null;
         }
 
-        // Get the uids of all folders subscribed for activesync
-        foreach ($this->subscriptions->list_subscriptions($deviceid, $type) as $folder => $props) {
-            if ($this->folder_id($folder) === $id) {
+        $name = null;
+
+        // check if folders are "subscribed" for activesync
+        foreach ($folderdata as $folder => $meta) {
+            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
+                || empty($meta'FOLDER'$deviceid'S')
+            ) {
+                continue;
+            }
+
+            if ($uid = $this->folder_id($folder)) {
+                $this->folder_uids$folder = $uid;
+            }
+
+            if ($uid === $id) {
                 $name = $folder;
             }
         }
@@ -1583,23 +1920,22 @@
     public function relations_state_set($device_key, $folderid, $synctime, $relations)
     {
         $synctime = $synctime->format('Y-m-d H:i:s');
+        $rcube    = rcube::get_instance();
+        $db       = $rcube->get_dbh();
+        $old_data = $this->relations$folderid$synctime ?? null;
 
-        // Protect against inserting the same values twice (this code can be executed twice in the same request)
-        if (!isset($this->relations$folderid$synctime)) {
-            $rcube = rcube::get_instance();
-            $db = $rcube->get_dbh();
+        if (empty($old_data)) {
             $this->relations$folderid$synctime = $relations;
-            $data = gzdeflate(json_encode($relations));
-
-            if ($data === false) {
-                throw new Exception("Failed to compress relation data");
-            }
+            $data = rcube_charset::clean(json_encode($relations));
 
-            $result = $db->insert_or_update(
-                'syncroton_relations_state',
-                'device_id' => $device_key, 'folder_id' => $folderid, 'synctime' => $synctime,
-                'data',
-                $data
+            $result = $db->query(
+                "INSERT INTO `syncroton_relations_state`"
+                . " (`device_id`, `folder_id`, `synctime`, `data`)"
+                . " VALUES (?, ?, ?, ?)",
+                $device_key,
+                $folderid,
+                $synctime,
+                $data
             );
 
             if ($err = $db->is_error($result)) {
@@ -1615,18 +1951,15 @@
     {
         $synctime = $synctime->format('Y-m-d H:i:s');
 
-        // If we had a collision before
-        if (isset($this->relations$folderid$synctime . "-1")) {
-            return $this->relations$folderid$synctime . "-1";
-        }
+        if (empty($this->relations$folderid$synctime)) {
+            $this->relations$folderid = ;
 
-        if (!isset($this->relations$folderid$synctime)) {
             $rcube = rcube::get_instance();
-            $db = $rcube->get_dbh();
+            $db    = $rcube->get_dbh();
 
             $db->limitquery(
                 "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
-                . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` < ?"
+                . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <= ?"
                 . " ORDER BY `synctime` DESC",
                 0,
                 1,
@@ -1635,50 +1968,21 @@
                 $synctime
             );
 
-            $row = $db->fetch_assoc();
-            if (!$row) {
-                // Only if we don't have a timestamp that is older than synctime do we return the next best.
-                // We MUST return an entry if there are any, because otherwise we will keep INSERTing new entries in,
-                // relations_state_set
-                $db->limitquery(
-                    "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
-                    . " WHERE `device_id` = ? AND `folder_id` = ?"
-                    . " ORDER BY `synctime` ASC",
-                    0,
-                    1,
-                    $device_key,
-                    $folderid,
-                    $synctime
-                );
-                $row = $db->fetch_assoc();
-            }
-
-            if ($row) {
-                // Don't use $row'synctime' for the internal cache, and use $synctime instead.
-                // The synctime of the found row is usually earlier than the requested synctime.
-                // Note: We use the internal cache because there's a call to both hasChanges() and
-                // getChangedEntries() in Sync. It's needed until we add some caching on a higher level.
-                $data = $row'data';
-                // Support data in both compressed and uncompressed format
-                if (strlen($data) && $data0 != '{' && $data0 != '') {
-                    $data = gzinflate($data);
-                }
-                $this->relations$folderid$synctime = json_decode($data, true);
-
-                // Cleanup: remove all records older than the current one.
-                // We must use the row's synctime, otherwise we would delete the record we just loaded
-                // We must delete all entries that are before the synctime to clean up old entries,
-                // but we must also delete all entries that are more recent in case the sync gets rerun
-                // with the same timestamp (e.g. when rerunning the same sync request).
-                // Otherwise the number of entries will start to grow with every sync.
-                $db->query(
-                    "DELETE FROM `syncroton_relations_state`"
-                    . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
-                    $device_key,
-                    $folderid,
-                    $row'synctime'
-                );
+            if ($row = $db->fetch_assoc()) {
+                // MariaDB's datetime output includes microseconds, we need to remove them,
+                // it must be "Y-m-d H:i:s" format
+                $synctime = preg_replace('/\.0-9+/', '', $row'synctime');
+                $this->relations$folderid$synctime = json_decode($row'data', true);
             }
+
+            // Cleanup: remove all records except the current one
+            $db->query(
+                "DELETE FROM `syncroton_relations_state`"
+                . " WHERE `device_id` = ? AND `folder_id` = ? AND `synctime` <> ?",
+                $device_key,
+                $folderid,
+                $synctime
+            );
         }
 
         return $this->relations$folderid$synctime ?? null;
@@ -1691,4 +1995,34 @@
     {
         return kolab_storage::$last_error;
     }
+
+    /**
+     * Compares two arrays
+     *
+     * @param array $array1
+     * @param array $array2
+     *
+     * @return bool True if arrays differs, False otherwise
+     */
+    protected static function data_array_diff($array1, $array2)
+    {
+        if (!is_array($array1) || !is_array($array2)) {
+            return $array1 != $array2;
+        }
+
+        if (count($array1) != count($array2)) {
+            return true;
+        }
+
+        foreach ($array1 as $key => $val) {
+            if (!array_key_exists($key, $array2)) {
+                return true;
+            }
+            if ($val !== $array2$key) {
+                return true;
+            }
+        }
+
+        return false;
+    }
 }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_storage_kolab4.php Changed

@@ -29,8 +29,7 @@
 class kolab_sync_storage_kolab4 extends kolab_sync_storage
 {
     protected $davStorage = null;
-    protected $tagStorage = null;
-    protected $relationSupport = self::MODEL_EMAIL;
+    protected $relationSupport = false;
 
     /**
      * This implements the 'singleton' design pattern
@@ -67,7 +66,6 @@
         // Inject user+password to the URL, there's no other way to pass it to the DAV client
         $url = str_replace('://', '://' . rawurlencode($sync->username) . ':' . rawurlencode($sync->password) . '@', $url);
 
-        $this->tagStorage = new kolab_storage_tags();
         $this->davStorage = new kolab_storage_dav($url); // DAV
         $this->storage = $sync->get_storage(); // IMAP
 
@@ -79,9 +77,6 @@
 
         // Disable paging
         $this->storage->set_pagesize(999999);
-
-        // Folders subscriptions engine
-        $this->subscriptions = new kolab_subscriptions($url);
     }
 
     /**
@@ -99,6 +94,12 @@
 
         // get mail folders subscribed for sync
         if ($type === self::MODEL_EMAIL) {
+            $folderdata = $this->folder_meta();
+
+            if (!is_array($folderdata)) {
+                return false;
+            }
+
             $special_folders = $this->storage->get_special_folders(true);
             $type_map = 
                 'drafts' => 3,
@@ -107,7 +108,13 @@
             ;
 
             // Get the folders "subscribed" for activesync
-            foreach ($this->subscriptions->list_subscriptions($deviceid, self::MODEL_EMAIL) as $folder => $meta) {
+            foreach ($folderdata as $folder => $meta) {
+                if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
+                    || empty($meta'FOLDER'$deviceid'S')
+                ) {
+                    continue;
+                }
+
                 // Force numeric folder name to be a string (T1283)
                 $folder = (string) $folder;
 
@@ -131,10 +138,10 @@
                 }
             }
 
+            // TODO: For now all DAV folders are subscribed
+
             if (empty($list)) {
-                foreach ($this->subscriptions->list_subscriptions($deviceid, $type) as $folder) {
-                    /** @var kolab_storage_dav_folder $folder */
-                    $folder = $folder2;
+                foreach ($this->davStorage->get_folders($type) as $folder) {
                     $folder_data = $this->folder_data($folder, $type);
                     $list$folder_data'serverId' = $folder_data;
 
@@ -172,7 +179,7 @@
             $name = rcube_charset::convert($name, kolab_sync::CHARSET, 'UTF7-IMAP');
 
             if ($parentid) {
-                $parent = $this->folder_id2name($parentid, $deviceid, self::MODEL_EMAIL);
+                $parent = $this->folder_id2name($parentid, $deviceid);
 
                 if ($parent === null) {
                     throw new Syncroton_Exception_Status_FolderCreate(Syncroton_Exception_Status_FolderCreate::PARENT_NOT_FOUND);
@@ -194,7 +201,7 @@
 
             if ($created) {
                 // Set ActiveSync subscription flag
-                $this->subscriptions->folder_subscribe($deviceid, $name, 1, self::MODEL_EMAIL);
+                $this->folder_set($name, $deviceid, 1);
 
                 return $this->folder_id($name, 'mail');
             }
@@ -222,10 +229,6 @@
             $props = 'name' => $name, 'type' => $type;
 
             if ($id = $this->davStorage->folder_update($props)) {
-                // Set ActiveSync subscription flag
-                $this->subscriptions->folder_subscribe($deviceid, $this->davStorage->new_location, 1, $type);
-                $this->folders = ;
-
                 return "DAV:{$type}:{$id}";
             }
 
@@ -240,13 +243,12 @@
      *
      * @param string  $folderid Folder identifier
      * @param string  $deviceid Device identifier
-     * @param string  $type     Activesync model name (folder type)
      * @param string  $new_name New folder name (UTF8)
      * @param ?string $parentid Folder parent identifier
      *
      * @return bool True on success, False on failure
      */
-    public function folder_rename($folderid, $deviceid, $type, $new_name, $parentid)
+    public function folder_rename($folderid, $deviceid, $new_name, $parentid)
     {
         // DAV folder
         if (strpos($folderid, 'DAV:') === 0) {
@@ -263,10 +265,10 @@
         }
 
         // Mail folder
-        $old_name = $this->folder_id2name($folderid, $deviceid, $type);
+        $old_name = $this->folder_id2name($folderid, $deviceid);
 
         if ($parentid) {
-            $parent = $this->folder_id2name($parentid, $deviceid, $type);
+            $parent = $this->folder_id2name($parentid, $deviceid);
         }
 
         $name = rcube_charset::convert($new_name, kolab_sync::CHARSET, 'UTF7-IMAP');
@@ -280,14 +282,9 @@
             return true;
         }
 
-        $result = $this->storage->rename_folder($old_name, $name);
-
-        if ($result) {
-            // Set ActiveSync subscription flag
-            $this->subscriptions->folder_subscribe($deviceid, $name, 1, self::MODEL_EMAIL);
-        }
+        $this->folder_meta = null;
 
-        return $result;
+        return $this->storage->rename_folder($old_name, $name);
     }
 
     /**
@@ -295,11 +292,10 @@
      *
      * @param string $folderid Folder identifier
      * @param string $deviceid Device identifier
-     * @param string $type     Activesync model name (folder type)
      *
      * @return bool True on success, False otherwise
      */
-    public function folder_delete($folderid, $deviceid, $type)
+    public function folder_delete($folderid, $deviceid)
     {
         // DAV folder
         if (strpos($folderid, 'DAV:') === 0) {
@@ -309,7 +305,9 @@
         }
 
         // Mail folder
-        $name = $this->folder_id2name($folderid, $deviceid, $type);
+        $name = $this->folder_id2name($folderid, $deviceid);
+
+        unset($this->folder_meta$name);
 
         return $this->storage->delete_folder($name);
     }
@@ -319,12 +317,11 @@
      *
      * @param string $folderid  Folder identifier
      * @param string $deviceid  Device identifier
-     * @param string $type      Activesync model name (folder type)
      * @param bool   $recursive Apply to the folder and its subfolders
      *
      * @return bool True on success, False otherwise
      */
-    public function folder_empty($folderid, $deviceid, $type, $recursive = false)
+    public function folder_empty($folderid, $deviceid, $recursive = false)
     {
         // DAV folder
         if (strpos($folderid, 'DAV:') === 0) {
@@ -340,7 +337,7 @@
         }
 
         // Mail folder
-        return parent::folder_empty($folderid, $deviceid, $type, $recursive);
+        return parent::folder_empty($folderid, $deviceid, $recursive);
     }
 
     /**
@@ -391,7 +388,20 @@
         if (isset($this->folder_uids$name)) {
             return $this->folder_uids$name;
         }
+        /*
+                @TODO: For now uniqueid annotation doesn't work, we will create UIDs by ourselves.
+                       There's one inconvenience of this solution: folder name/type change
+                       would be handled in ActiveSync as delete + create.
+                @TODO: Consider using MAILBOXID (RFC8474) that Cyrus v3 supports
 
+                // get folders unique identifier
+                $folderdata = $this->storage->get_metadata($name, self::UID_KEY);
+
+                if ($folderdata && !empty($folderdata$name)) {
+                    $uid = $folderdata$nameself::UID_KEY;
+                    return $this->folder_uids$name = $uid;
+                }
+        */
         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).
@@ -408,48 +418,50 @@
     /**
      * Returns IMAP folder name
      *
-     * @param string $id       Folder identifier
-     * @param string $deviceid Device dentifier
-     * @param string $type     Folder type
+     * @param string $id        Folder identifier
+     * @param string $deviceid  Device dentifier
      *
      * @return null|string Folder name (UTF7-IMAP)
      */
-    public function folder_id2name($id, $deviceid, $type)
+    public function folder_id2name($id, $deviceid)
     {
+        // TODO: This method should become protected and be used for mail folders only
         if (strpos($id, 'DAV:') === 0) {
             throw new Exception("Unsupported folder_id2name() call on a DAV folder");
         }
 
-        return parent::folder_id2name($id, $deviceid, $type);
-    }
+        // check in cache first
+        if (!empty($this->folder_uids)) {
+            if (($name = array_search($id, $this->folder_uids)) !== false) {
+                return $name;
+            }
+        }
 
-    /**
-     * Returns list of categories assigned to an object
-     *
-     * @param rcube_message_header|string $object     UID or mail message headers
-     * @param array                       $categories Addition tag names to merge with
-     *
-     * @return array List of categories
-     */
-    protected function getCategories($object, $categories = )
-    {
-        $tags = $this->tagStorage->get_tags_for($object);
+        // get all folders of specified type
+        $folderdata = $this->folder_meta();
 
-        // merge result with old categories
-        if (!empty($categories)) {
-            $tags = array_unique(array_merge($tags, (array) $categories));
+        if (!is_array($folderdata) || empty($id)) {
+            return null;
         }
 
-        return $tags;
-    }
+        // check if folders are "subscribed" for activesync
+        foreach ($folderdata as $folder => $meta) {
+            if (empty($meta'FOLDER') || empty($meta'FOLDER'$deviceid)
+                || empty($meta'FOLDER'$deviceid'S')
+            ) {
+                continue;
+            }
 
-    /**
-     * Detect changes of tag objects data and assigned messages
-     */
-    protected function getChangesByRelations($folderid, $device_key, $type, $filter)
-    {
-        // This is not needed with Kolab4 that uses METADATA/ANNOTATE and immutable tags
-        return ;
+            if ($uid = $this->folder_id($folder, 'mail')) {
+                $this->folder_uids$folder = $uid;
+            }
+
+            if ($uid === $id) {
+                $name = $folder;
+            }
+        }
+
+        return $name ?? null;
     }
 
     /**
@@ -459,7 +471,7 @@
      * @param string $deviceid Device identifier
      * @param string $type     Activesync model name (folder type)
      *
-     * @return ?kolab_storage_dav_folder
+     * @return ?kolab_storage_folder
      */
     public function getFolder($folderid, $deviceid, $type)
     {
@@ -489,15 +501,10 @@
      */
     public function getFolderConfig($folderid, $deviceid, $type)
     {
-        $alarms = 0;
-
-        if ($folder = $this->getFolder($folderid, $deviceid, $type)) {
-            $subs = $this->subscriptions->folder_subscriptions($folder->href, $type);
-            $alarms = $subs$deviceid ?? 0;
-        }
-
+        // TODO: Get "alarms" from the DAV folder props, or implement
+        // a storage for folder properties
         return 
-            'ALARMS' => $alarms == 2,
+            'ALARMS' => true,
         ;
     }
 
@@ -511,11 +518,9 @@
     }
 
     /**
-     * Subscribes to a default set of folder on a new device registration
-     *
-     * @param string $deviceid Device ID
+     * Subscribe default set of folders on device registration
      */
-    public function device_init($deviceid)
+    protected function device_init_subscriptions($deviceid)
     {
         $config  = rcube::get_instance()->config;
         $mode    = (int) $config->get('activesync_init_subscriptions');
@@ -539,13 +544,6 @@
             $all_folders = $this->storage->list_folders_subscribed();
         }
 
-        $subscribe = 
-            'mail' => 'INBOX' => 1,
-            'contact' => ,
-            'event' => ,
-            'task' => ,
-        ;
-
         foreach ($all_folders as $folder) {
             $ns = strtoupper($this->storage->folder_namespace($folder));
 
@@ -555,39 +553,19 @@
                 || ($mode & constant("self::INIT_ALL_{$ns}"))
                 || (($mode & constant("self::INIT_SUB_{$ns}")) && ($subscribed_folders === null || in_array($folder, $subscribed_folders)))
             ) {
-                $subscribe'mail'$folder = 1;
+                $this->folder_set($folder, $deviceid, 1);
             }
         }
 
-        foreach ($subscribe as $type => $list) {
-            if ($type != 'mail') {
-                foreach ($this->subscriptions->list_folders($type) as $folder) {
-                    // TODO: Subscribe personal DAV folders, for now we assume all are subscribed
-                    $list$folder0 = ($type == 'event' || $type == 'task') ? 2 : 1;
-                }
-            }
-
-            $this->subscriptions->set_subscriptions($deviceid, $type, $list);
-        }
+        // TODO: Subscribe personal DAV folders, for now we assume all are subscribed
+        // TODO: Subscribe shared DAV folders
     }
 
-    public function getExtraData($folderid, $deviceid, $type)
+    public function getExtraData($folderid, $deviceid)
     {
         if (strpos($folderid, 'DAV:') === 0) {
             return null;
         }
-
-        return parent::getExtraData($folderid, $deviceid, $type);
-    }
-
-    /**
-     * Set categories to an object
-     *
-     * @param rcube_message_header|string $object     UID or mail message headers
-     * @param array                       $categories List of Category names
-     */
-    protected function setCategories($object, $categories)
-    {
-        $this->tagStorage->set_tags_for($object, $categories);
+        return parent::getExtraData($folderid, $deviceid);
     }
 }

kolab-syncroton-2.4.2.tar.gz/lib/kolab_sync_timezone_converter.php Changed

kolab-syncroton-2.4.2.tar.gz/tests/Sync/FoldersTest.php Changed

@@ -3,283 +3,16 @@
 class FoldersTest extends Tests\SyncTestCase
 {
     /**
-     * Cleanup folders
+     * Test FolderSync command
      */
-    protected function foldersCleanup(): void
+    public function testFolderSync()
     {
         // Note: We essentially assume the test account is in an initial state, extra folders may break tests
         // Anyway, we first remove folders that might have been created during tests in this file
-        $this->deleteTestFolder('NewFolder', 'mail');
-        $this->deleteTestFolder('NewFolder2', 'mail');
         $this->deleteTestFolder('Test Folder', 'mail');
         $this->deleteTestFolder('Test Folder New', 'mail');
         $this->deleteTestFolder('Test Contacts Folder', 'contact');
         $this->deleteTestFolder('Test Contacts New', 'contact');
-        // Make sure the default folders exist
-        if (!$this->isStorageDriver('kolab4')) {
-            $this->createTestFolder('Calendar', 'event.default');
-            $this->createTestFolder('Contacts', 'contact.default');
-            $this->createTestFolder('Tasks', 'task.default');
-            $this->createTestFolder('Notes', 'note.default');
-        }
-        //TODO: handle kolab4 case?
-    }
-
-    /**
-     * Test FolderSync command
-     */
-    public function testFolderSyncBasic()
-    {
-        $this->registerDevice();
-        $this->foldersCleanup();
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        // We expect some folders to exist (dont' know how many)
-        $this->assertTrue(intval($xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue) > 2);
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        // No changes on second sync
-        $this->assertSame(strval(0), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //Clear the creation_synckey (that's the migration scenario)
-        //Shouldn't trigger a change
-        $rcube = \rcube::get_instance();
-        $db    = $rcube->get_dbh();
-        $result = $db->query(
-            "UPDATE `syncroton_folder` SET `creation_synckey` = 0",
-        );
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        // No changes on second sync
-        $this->assertSame(strval(0), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test invalid sync key
-     */
-    public function testFolderInvalidSyncKey()
-    {
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>999</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('9', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test synckey reuse
-     */
-    public function testSyncKeyResend()
-    {
-        $this->createTestFolder("NewFolderToRemove", "mail");
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-
-        //Now change something
-        $this->createTestFolder("NewFolder", "mail");
-        $this->deleteTestFolder('NewFolderToRemove', 'mail');
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(2), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //Resend the same synckey
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(2), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //And now make sure we can still move on
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>2</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-
-        //Now add another folder
-        $this->createTestFolder("NewFolder2", "mail");
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>2</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('3', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(1), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        //And finally make sure we can't go back two synckeys (because that has been cleaned up meanwhile)
-        $this->createTestFolder("NewFolder2", "mail");
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('9', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * This test recreates a previously deleted folder.
-     * Currently similar to disabling/reenabling a folder for sync, but should perhaps be tested separately
-     *
-     * @depends testSyncKeyResend
-     */
-    public function testRecreatePreviousFolder()
-    {
-        $this->deleteTestFolder('NewFolder', 'mail');
-        $this->deleteTestFolder('NewFolder2', 'mail');
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-
-        //Now change something
-        $this->createTestFolder("NewFolder", "mail");
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:FolderSync/ns:Status")->item(0)->nodeValue);
-        $this->assertSame('2', $xpath->query("//ns:FolderSync/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame(strval(1), $xpath->query("//ns:FolderSync/ns:Changes/ns:Count")->item(0)->nodeValue);
-
-        // Cleanup for the other tests
-        $this->deleteTestFolder('NewFolder', 'mail');
-        $this->deleteTestFolder('NewFolder2', 'mail');
-    }
-
-    /**
-     * Test FolderSync command
-     */
-    public function testFolderSync()
-    {
-        $this->foldersCleanup();
-        $this->resetDevice();
 
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>
@@ -388,7 +121,6 @@
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
 
-        // This depends on multifolder blacklists to be configured (otherwise we get no "collective" folders)
         $deleted = $this->isStorageDriver('kolab4') ? 3 : 4; // No Notes folder in Kolab4
         $syncKey = 2;

kolab-syncroton-2.4.2.tar.gz/tests/Sync/MoveItemsTest.php Changed

@@ -134,78 +134,15 @@
         $this->assertSame('test sync', $xpath->query("ns:Commands/ns:Add/ns:ApplicationData/Email:Subject", $root)->item(0)->nodeValue);
     }
 
-    public function testInvalidMove()
-    {
-        $this->emptyTestFolder('INBOX', 'mail');
-        $this->emptyTestFolder('Trash', 'mail');
-        $uid = $this->appendMail('INBOX', 'mail.sync1');
-        $this->registerDevice();
-        $inbox = array_search('INBOX', $this->folders);
-        $trash = array_search('Trash', $this->folders);
-
-        // Move item that doesn't exist
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <MoveItems xmlns="uri:Move">
-                <Move>
-                    <SrcMsgId>foobar::99999</SrcMsgId>
-                    <SrcFldId>foobar</SrcFldId>
-                    <DstFldId>foobar</DstFldId>
-                </Move>
-            </MoveItems>
-            EOF;
-
-        $response = $this->request($request, 'MoveItems');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $xpath->registerNamespace('Move', 'uri:Move');
-
-        $root = $xpath->query("//Move:MoveItems/Move:Response")->item(0);
-        $this->assertSame('1', $xpath->query("Move:Status", $root)->item(0)->nodeValue);
-
-        // Move item that doesn't exist
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <MoveItems xmlns="uri:Move">
-                <Move>
-                    <SrcMsgId>{$inbox}::99999</SrcMsgId>
-                    <SrcFldId>{$inbox}</SrcFldId>
-                    <DstFldId>{$trash}</DstFldId>
-                </Move>
-            </MoveItems>
-            EOF;
-
-        $response = $this->request($request, 'MoveItems');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $xpath->registerNamespace('Move', 'uri:Move');
-
-        $root = $xpath->query("//Move:MoveItems/Move:Response")->item(0);
-        $this->assertSame('1', $xpath->query("Move:Status", $root)->item(0)->nodeValue);
-    }
-
     /**
      * Test moving a contact
      */
     public function testMoveContact()
     {
-        if ($this->isStorageDriver('kolab')) {
-            // The Contacts folder is not available, and consequently appendObject fails
-            $this->markTestSkipped('This test only works with the DAV backend.');
-        }
-
         // Test with multi-folder support enabled
         self::$deviceType = 'iphone';
 
-        $davFolder = 'Contacts';
+        $davFolder = $this->isStorageDriver('kolab') ? 'Contacts' : 'Addressbook';
         $this->emptyTestFolder($davFolder, 'contact');
         $this->deleteTestFolder($folderName = 'Test Contacts Folder', 'contact');
         $this->appendObject($davFolder, 'contact.vcard1', 'contact');
@@ -213,7 +150,6 @@
         $this->registerDevice();
 
         $srcFolderId = array_search($davFolder, $this->folders);
-        $this->assertTrue(!empty($srcFolderId));
 
         // Create a contacts folder
         $folderType = Syncroton_Command_FolderSync::FOLDERTYPE_CONTACT_USER_CREATED;
@@ -260,8 +196,6 @@
         $response = $this->request($request, 'Sync');
 
         $this->assertEquals(200, $response->getStatusCode());
-        $root = $xpath->query("//ns:Sync/ns:Collections/ns:Collection")->item(0);
-        $this->assertSame('1', $xpath->query("ns:Status", $root)->item(0)->nodeValue);
 
         $request = <<<EOF
             <?xml version="1.0" encoding="utf-8"?>
@@ -308,7 +242,6 @@
         $xpath = $this->xpath($dom);
 
         $root = $xpath->query("//ns:Sync/ns:Collections/ns:Collection")->item(0);
-        $this->assertSame('1', $xpath->query("ns:Status", $root)->item(0)->nodeValue);
         $this->assertSame($srcFolderId, $xpath->query("ns:CollectionId", $root)->item(0)->nodeValue);
         $this->assertSame(1, $xpath->query("ns:Commands/ns:Add", $root)->count());
         $this->assertSame('Jane', $xpath->query("ns:Commands/ns:Add/ns:ApplicationData/Contacts:FirstName", $root)->item(0)->nodeValue);

kolab-syncroton-2.4.2.tar.gz/tests/Sync/OptionsTest.php Changed

kolab-syncroton-2.4.2.tar.gz/tests/Sync/PingTest.php Deleted

@@ -1,294 +0,0 @@
-<?php
-
-class PingTest extends Tests\SyncTestCase
-{
-    /**
-     * Test Ping command
-     */
-    public function testFolderSyncBasic()
-    {
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>900</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        // Initially we know no folders
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-
-
-        // We discover folders with a foldersync
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // Now we get to the actual ping
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>0</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        // We don't find the folder state because it was never synced
-        $this->assertSame('2', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-
-        // Sync inbox
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync" xmlns:AirSyncBase="uri:AirSyncBase">
-                <Collections>
-                    <Collection>
-                        <SyncKey>0</SyncKey>
-                        <CollectionId>38b950ebd62cd9a66929c89615d0fc04</CollectionId>
-                        <DeletesAsMoves>1</DeletesAsMoves>
-                        <GetChanges>1</GetChanges>
-                        <Options>
-                            <FilterType>0</FilterType>
-                            <Conflict>1</Conflict>
-                            <BodyPreference xmlns="uri:AirSyncBase">
-                                <Type>2</Type>
-                                <TruncationSize>51200</TruncationSize>
-                                <AllOrNone>0</AllOrNone>
-                            </BodyPreference>
-                        </Options>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
-
-        $response = $this->request($request, 'Sync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // Now we should get no change
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>0</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $this->assertSame('1', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test Unknown Folder
-     */
-    public function testUnknownFolder()
-    {
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>900</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>foobar</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test New Folder
-     */
-    public function testNewFolder()
-    {
-        // Initialize the folder state
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $this->createTestFolder("NewFolder", "mail");
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>900</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test Changed Subscription Folder
-     */
-    public function testNewFolderSubscriptionState()
-    {
-        // Initialize the folder state
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $this->setSubscriptionState("NewFolder", 'mail', null);
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>900</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-
-    /**
-     * Test changed subscription while ping is running
-     */
-    public function testNewFolderSubscriptionStateDuringPing()
-    {
-        // Initialize the folder state
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>0</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <FolderSync xmlns="uri:FolderHierarchy">
-                <SyncKey>1</SyncKey>
-            </FolderSync>
-            EOF;
-
-        $response = $this->request($request, 'FolderSync');
-        $this->assertEquals(200, $response->getStatusCode());
-
-        // Set the metadata via a background script, while Ping is running.
-        // This is essential to trigger a bug where the initial Ping seeds the roundcube metadata cache,
-        // and then subsequent checks don't update the cache. We have to use a separate process to set
-        // the metadata, because otherwise we update the cache (we could also not use the roundcube
-        // infrastructure instead).
-        $deviceId = self::$deviceId;
-        $username = self::$username;
-        $password = self::$password;
-        $script = TESTS_DIR . 'bootstrap.php';
-        exec("php {$script} subscribe --folder=NewFolder --type=mail --delay=5"
-            . " --device={$deviceId} --user={$username} --password={$password} &", $output);
-        $this->assertSame(, $output);
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>9999</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>38b950ebd62cd9a66929c89615d0fc04</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('7', $xpath->query("//ns:Ping/ns:Status")->item(0)->nodeValue);
-    }
-}

kolab-syncroton-2.4.2.tar.gz/tests/Sync/SendMailTest.php Deleted

@@ -1,112 +0,0 @@
-<?php
-
-class SendMailTest extends Tests\SyncTestCase
-{
-    /**
-     * Test SendMail command
-     */
-    public function testSendMail()
-    {
-        $this->emptyTestFolder('Sent', 'mail');
-
-        $clientId = microtime();
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <SendMail xmlns="uri:ComposeMail">
-                <ClientId>{$clientId}</ClientId>
-                <SaveInSentItems />
-                <Mime>From: testuser1@kolab.org
-            To: testuser2@kolab.org
-            Subject: Test
-            MIME-Version: 1.0
-            Content-Type: text/plain; charset="iso-8859-1"
-            Message-ID: &lt;msg1@kolab.org&gt;
-            X-Syncroton-Test: smtp=true
-
-            This is the email body content.</Mime>
-            </SendMail>
-            EOF;
-
-        $response = $this->request($request, 'SendMail');
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertSame('', (string) $response->getBody());
-        $emails = $this->listEmails('Sent', '*');
-        $this->assertCount(1, $emails);
-        // TODO: Assert mail content
-    }
-
-    /**
-     * Test SendMail command
-     */
-    public function testSendMailErrorHandling()
-    {
-        $this->emptyTestFolder('Sent', 'mail');
-
-        $clientId = microtime();
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <SendMail xmlns="uri:ComposeMail">
-                <ClientId>{$clientId}</ClientId>
-                <SaveInSentItems />
-                <Mime>From: testuser1@kolab.org
-            To: testuser2@kolab.org
-            Subject: Test
-            MIME-Version: 1.0
-            Content-Type: text/plain; charset="iso-8859-1"
-            Message-ID: &lt;msg1@kolab.org&gt;
-            X-Syncroton-Test: smtp=false imap=true
-
-            This is the email body content.</Mime>
-            </SendMail>
-            EOF;
-
-        // Expect a SMTP error
-        $response = $this->request($request, 'SendMail');
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertSame('120', $xpath->query("//ns:SendMail/ns:Status")->item(0)->nodeValue);
-        $this->assertCount(0, $this->listEmails('Sent', '*'));
-
-        // Test IMAP error handling
-        $request = str_replace('smtp=false', 'smtp=true', $request);
-        $request = str_replace('imap=true', 'imap=false', $request);
-
-        $response = $this->request($request, 'SendMail');
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertSame('110', $xpath->query("//ns:SendMail/ns:Status")->item(0)->nodeValue);
-        $this->assertCount(0, $this->listEmails('Sent', '*'));
-
-        // Test no error
-        // smtp=false would cause error, but the submission should get skipped now
-        $request = str_replace('smtp=true', 'smtp=false', $request);
-        $request = str_replace('imap=false', '', $request);
-
-        $response = $this->request($request, 'SendMail');
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertSame('', (string) $response->getBody());
-        $this->assertCount(1, $this->listEmails('Sent', '*'));
-
-        // Send the same mail again, expect an error
-        $response = $this->request($request, 'SendMail');
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertEquals(200, $response->getStatusCode());
-        $this->assertSame('118', $xpath->query("//ns:SendMail/ns:Status")->item(0)->nodeValue);
-        $this->assertCount(1, $this->listEmails('Sent', '*'));
-    }
-}

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/CalendarTest.php Changed

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/ContactsTest.php Changed

@@ -9,7 +9,7 @@
      */
     public function testSync()
     {
-        $davFolder = 'Contacts';
+        $davFolder = $this->isStorageDriver('kolab') ? 'Contacts' : 'Addressbook';
         $this->emptyTestFolder($davFolder, 'contact');
         $this->deleteTestFolder('Test Contacts Folder', 'contact'); // from other test files
         $this->registerDevice();
@@ -53,10 +53,6 @@
         $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
         $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
 
-        if ($this->isStorageDriver('kolab')) {
-            $this->markTestSkipped("Appending test objects does not work with 'kolab' storage yet.");
-        }
-
         // Append two contact objects and sync them
         // TODO: Test a folder with contact groups inside
         $this->appendObject($davFolder, 'contact.vcard1', 'contact');
@@ -79,19 +75,10 @@
 
         $root .= "/ns:Commands/ns:Add";
         $this->assertStringMatchesFormat("CRC%s", $xpath->query("{$root}/ns:ServerId")->item(0)->nodeValue);
-        $r = "{$root}1/ns:ApplicationData";
-        $this->assertSame('Jack', $xpath->query("{$r}/Contacts:FirstName")->item(0)->nodeValue);
-        $this->assertSame('Strong', $xpath->query("{$r}/Contacts:LastName")->item(0)->nodeValue);
-        $this->assertSame('jack@kolab.org', $xpath->query("{$r}/Contacts:Email1Address")->item(0)->nodeValue);
-        $this->assertNull($xpath->query("{$r}/Contacts:Email2Address")->item(0));
-        $this->assertNull($xpath->query("{$r}/Contacts:Email3Address")->item(0));
-        $r = "{$root}2/ns:ApplicationData";
-        $this->assertSame('Jane', $xpath->query("{$r}/Contacts:FirstName")->item(0)->nodeValue);
-        $this->assertSame('J.', $xpath->query("{$r}/Contacts:MiddleName")->item(0)->nodeValue);
-        $this->assertSame('Doe', $xpath->query("{$r}/Contacts:LastName")->item(0)->nodeValue);
-        $this->assertNull($xpath->query("{$r}/Contacts:Email1Address")->item(0));
-        $this->assertNull($xpath->query("{$r}/Contacts:Email2Address")->item(0));
-        $this->assertNull($xpath->query("{$r}/Contacts:Email3Address")->item(0));
+        $this->assertSame('Jack', $xpath->query("{$root}/ns:ApplicationData/Contacts:FirstName")->item(0)->nodeValue);
+        $this->assertSame('Strong', $xpath->query("{$root}/ns:ApplicationData/Contacts:LastName")->item(0)->nodeValue);
+        $this->assertSame('Jane', $xpath->query("{$root}/ns:ApplicationData/Contacts:FirstName")->item(1)->nodeValue);
+        $this->assertSame('Doe', $xpath->query("{$root}/ns:ApplicationData/Contacts:LastName")->item(1)->nodeValue);
 
         return $syncKey;
     }
@@ -126,10 +113,6 @@
                                 <ClientId>42</ClientId>
                                 <ApplicationData>
                                     <Contacts:FirstName>Lars</Contacts:FirstName>
-                                    <Contacts:LastName>Ulrich</Contacts:LastName>
-                                    <Contacts:Email1Address>lars@kolab.org</Contacts:Email1Address>
-                                    <Contacts:Email2Address>lars.tw@kolab.org</Contacts:Email2Address>
-                                    <Contacts:Email3Address>lars.th@kolab.org</Contacts:Email3Address>
                                 </ApplicationData>
                             </Add>
                         </Commands>
@@ -154,13 +137,7 @@
         $serverId = $xpath->query("ns:ServerId", $root)->item(0)->nodeValue;
         $this->assertStringMatchesFormat("CRC%s", $serverId);
 
-        // Assert the content on the server
-        $contacts = $this->getDavObjects('Contacts', 'contact');
-        $this->assertCount(3, $contacts);
-        usort($contacts, function ($c1, $c2) { return $c1'surname' <=> $c2'surname'; });
-        $this->assertSame('Lars', $contacts2'firstname');
-        $this->assertSame('Ulrich', $contacts2'surname');
-        $this->assertSame('lars@kolab.org', 'lars.tw@kolab.org', 'lars.th@kolab.org', $contacts2'email:other');
+        // TODO: Test the content on the server
 
         return $syncKey, $serverId;
     }

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/EmailITipTest.php Changed

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/EmailTest.php Changed

@@ -112,7 +112,29 @@
         $this->assertSame('test sync', $xpath->query("{$root}/ns:ApplicationData/Email:Subject")->item(0)->nodeValue);
 
         // List the rest of the mail
-        $request = preg_replace('|<SyncKey>\d</SyncKey>|', "<SyncKey>{$syncKey}</SyncKey>", $request);
+        $request = <<<EOF
+            <?xml version="1.0" encoding="utf-8"?>
+            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
+            <Sync xmlns="uri:AirSync" xmlns:AirSyncBase="uri:AirSyncBase">
+                <Collections>
+                    <Collection>
+                        <SyncKey>{$syncKey}</SyncKey>
+                        <CollectionId>{$folderId}</CollectionId>
+                        <DeletesAsMoves>1</DeletesAsMoves>
+                        <GetChanges>1</GetChanges>
+                        <Options>
+                            <FilterType>0</FilterType>
+                            <Conflict>1</Conflict>
+                            <BodyPreference xmlns="uri:AirSyncBase">
+                                <Type>2</Type>
+                                <TruncationSize>51200</TruncationSize>
+                                <AllOrNone>0</AllOrNone>
+                            </BodyPreference>
+                        </Options>
+                    </Collection>
+                </Collections>
+            </Sync>
+            EOF;
 
         $response = $this->request($request, 'Sync');
 
@@ -126,48 +148,12 @@
         $this->assertSame(strval(++$syncKey), $xpath->query("{$root}/ns:SyncKey")->item(0)->nodeValue);
         $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
         $this->assertSame(1, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-        $this->assertSame('0', $xpath->query("{$root}/ns:Commands/ns:Add/ns:ApplicationData/Email:Read")->item(0)->nodeValue);
 
         // Note: We assume messages are in IMAP default order, it may change in future
         $root .= "/ns:Commands/ns:Add";
         $this->assertStringMatchesFormat("{$folderId}::%d", $xpath->query("{$root}/ns:ServerId")->item(0)->nodeValue);
         $this->assertSame('sync test with attachment', $xpath->query("{$root}/ns:ApplicationData/Email:Subject")->item(0)->nodeValue);
         $this->assertSame(1, $xpath->query("{$root}/ns:ApplicationData/AirSyncBase:Body")->count());
-        $attachments = $xpath->query("{$root}/ns:ApplicationData/AirSyncBase:Attachments/AirSyncBase:Attachment");
-        $this->assertSame(3, $attachments->count());
-        $att = $attachments->item(0);
-        $this->assertSame('message.eml', $xpath->query('AirSyncBase:DisplayName', $att)->item(0)->nodeValue);
-        $this->assertSame('5', $xpath->query('AirSyncBase:Method', $att)->item(0)->nodeValue);
-        $this->assertSame('63', $xpath->query('AirSyncBase:EstimatedDataSize', $att)->item(0)->nodeValue);
-        $this->assertSame(0, $xpath->query('AirSyncBase:IsInline', $att)->count());
-        $att = $attachments->item(1);
-        $this->assertSame('logo1.gif', $xpath->query('AirSyncBase:DisplayName', $att)->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query('AirSyncBase:Method', $att)->item(0)->nodeValue);
-        $this->assertSame('76', $xpath->query('AirSyncBase:EstimatedDataSize', $att)->item(0)->nodeValue);
-        $this->assertSame(0, $xpath->query('AirSyncBase:IsInline', $att)->count());
-        $att = $attachments->item(2);
-        $this->assertSame('logo2.gif', $xpath->query('AirSyncBase:DisplayName', $att)->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query('AirSyncBase:Method', $att)->item(0)->nodeValue);
-        $this->assertSame('76', $xpath->query('AirSyncBase:EstimatedDataSize', $att)->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query('AirSyncBase:IsInline', $att)->item(0)->nodeValue);
-        $this->assertSame('foo4foo1@bar.net', $xpath->query('AirSyncBase:ContentId', $att)->item(0)->nodeValue);
-        $this->assertSame('fiction1/fiction2', $xpath->query('AirSyncBase:ContentLocation', $att)->item(0)->nodeValue);
-
-        // Test the empty Sync response
-        $request = preg_replace('|<SyncKey>\d</SyncKey>|', "<SyncKey>{$syncKey}</SyncKey>", $request);
-
-        $response = $this->request($request, 'Sync');
-
-        // According to https://learn.microsoft.com/en-us/openspecs/exchange_server_protocols/ms-ascmd/b4b366a5-7dfb-45a9-a256-af8fa7c53400
-        // the empty response should look like this
-        //
-        // HTTP/1.1 200 OK
-        // Date: Fri, 10 Apr 2009 20:32:39 GMT
-        // Content-Length: 0
-
-        $this->assertSame(200, $response->getStatusCode());
-        $this->assertSame('', (string) $response->getBody());
-        $this->assertSame('0', $response->getHeader('Content-Length'));
 
         return $syncKey;
     }
@@ -252,6 +238,7 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
+        // print($dom->saveXML());
 
         $root = "//ns:Sync/ns:Collections/ns:Collection";
         $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
@@ -260,10 +247,10 @@
         $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
         $this->assertSame(2, $xpath->query("{$root}/ns:Commands/ns:Change")->count());
         $this->assertSame(2, $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->count());
-        $this->assertSame('1', $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->item(0)->nodeValue);
-        $this->assertSame('1', $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->item(1)->nodeValue);
-        $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/AirSyncBase:Body")->count());
+        $this->assertSame('0', $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->item(0)->nodeValue);
+        $this->assertSame('0', $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/Email:Read")->item(1)->nodeValue);
 
+        $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Change/ns:ApplicationData/AirSyncBase:Body")->count());
         return $syncKey;
     }
 
@@ -306,6 +293,7 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
+        // print($dom->saveXML());
 
         $root = "//ns:Sync/ns:Collections/ns:Collection";
         $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
@@ -361,6 +349,7 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
+        // print($dom->saveXML());
 
         $root = "//ns:Sync/ns:Collections/ns:Collection";
         $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
@@ -415,6 +404,7 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
+        // print($dom->saveXML());
 
         $root = "//ns:Sync/ns:Collections/ns:Collection";
         $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
@@ -432,6 +422,7 @@
         return $syncKey;
     }
 
+
     /**
     * Test a sync key that doesn't exist yet.
     * @depends testDeleteFromClient
@@ -469,6 +460,7 @@
         $this->assertEquals(200, $response->getStatusCode());
         $dom = $this->fromWbxml($response->getBody());
         $xpath = $this->xpath($dom);
+        // print($dom->saveXML());
 
         $root = "//ns:Sync/ns:Collections/ns:Collection";
         $this->assertSame('3', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
@@ -477,4 +469,5 @@
         //We have to start over after this. The sync state was removed.
         return 0;
     }
+
 }

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/InconsistencyTest.php Deleted

@@ -1,141 +0,0 @@
-<?php
-
-namespace Tests\Sync\Sync;
-
-class InconsistencyTest extends \Tests\SyncTestCase
-{
-    /**
-     * Test Sync command
-     */
-    public function testSync()
-    {
-        $this->emptyTestFolder('INBOX', 'mail');
-        $this->registerDevice();
-
-        // Append two mail messages
-        $uid1 = $this->appendMail('INBOX', 'mail.sync1');
-        $this->appendMail('INBOX', 'mail.sync2');
-
-        // Initial sync
-        $folderId = '38b950ebd62cd9a66929c89615d0fc04';
-        $syncKey = 0;
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync">
-                <Collections>
-                    <Collection>
-                        <SyncKey>{$syncKey}</SyncKey>
-                        <CollectionId>{$folderId}</CollectionId>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
-
-        $response = $this->request($request, 'Sync');
-        $this->assertEquals(200, $response->getStatusCode());
-        $syncKey++;
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync" xmlns:AirSyncBase="uri:AirSyncBase">
-                <Collections>
-                    <Collection>
-                        <SyncKey>{$syncKey}</SyncKey>
-                        <CollectionId>{$folderId}</CollectionId>
-                        <DeletesAsMoves>1</DeletesAsMoves>
-                        <GetChanges>1</GetChanges>
-                        <WindowSize>2</WindowSize>
-                        <Options>
-                            <FilterType>0</FilterType>
-                            <Conflict>1</Conflict>
-                            <BodyPreference xmlns="uri:AirSyncBase">
-                                <Type>2</Type>
-                                <TruncationSize>51200</TruncationSize>
-                                <AllOrNone>0</AllOrNone>
-                            </BodyPreference>
-                        </Options>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
-
-        $response = $this->request($request, 'Sync');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $root = "//ns:Sync/ns:Collections/ns:Collection";
-        $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
-        $this->assertSame(strval(++$syncKey), $xpath->query("{$root}/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
-        $this->assertSame(2, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-
-        // Initial sync is complete
-        // We now artifically create a sync inconsistency be deleting the content part of the first mail.
-        // This replicates a situation that we've seen, but don't know yet how it was created in the first place.
-        $rcube = \rcube::get_instance();
-        $db    = $rcube->get_dbh();
-        $result = $db->query(
-            "DELETE FROM `syncroton_content`"
-            . " WHERE `contentid` = ?",
-            "$folderId::$uid1"
-        );
-        $this->assertNull($db->is_error($result));
-
-        // Now sync again
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync" xmlns:AirSyncBase="uri:AirSyncBase">
-                <Collections>
-                    <Collection>
-                        <SyncKey>{$syncKey}</SyncKey>
-                        <CollectionId>{$folderId}</CollectionId>
-                        <DeletesAsMoves>1</DeletesAsMoves>
-                        <GetChanges>1</GetChanges>
-                        <Options>
-                            <FilterType>0</FilterType>
-                            <Conflict>1</Conflict>
-                            <BodyPreference xmlns="uri:AirSyncBase">
-                                <Type>2</Type>
-                                <TruncationSize>51200</TruncationSize>
-                                <AllOrNone>0</AllOrNone>
-                            </BodyPreference>
-                        </Options>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
-
-        $response = $this->request($request, 'Sync');
-
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $root = "//ns:Sync/ns:Collections/ns:Collection";
-        $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
-        $this->assertSame(strval(++$syncKey), $xpath->query("{$root}/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
-        $this->assertSame(1, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-
-        // Assert that we have all content parts back
-        $result = $db->query(
-            "SELECT `contentid` FROM `syncroton_content`"
-            . " WHERE `device_id` IN (SELECT `id` FROM `syncroton_device` WHERE `deviceid` = ?)",
-            self::$deviceId
-        );
-        $data = ;
-        while ($state = $db->fetch_assoc($result)) {
-            $data = $state;
-        }
-        $this->assertSame(2, count($data));
-
-        return $syncKey;
-    }
-}

kolab-syncroton-2.4.2.tar.gz/tests/Sync/Sync/RelationsTest.php Deleted

@@ -1,284 +0,0 @@
-<?php
-
-namespace Tests\Sync\Sync;
-
-class RelationsTest extends \Tests\SyncTestCase
-{
-    protected function initialSyncRequest($folderId)
-    {
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync">
-                <Collections>
-                    <Collection>
-                        <SyncKey>0</SyncKey>
-                        <CollectionId>{$folderId}</CollectionId>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
-        return $this->request($request, 'Sync');
-    }
-
-    protected function syncRequest($syncKey, $folderId, $windowSize = null)
-    {
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Sync xmlns="uri:AirSync" xmlns:AirSyncBase="uri:AirSyncBase">
-                <Collections>
-                    <Collection>
-                        <SyncKey>{$syncKey}</SyncKey>
-                        <CollectionId>{$folderId}</CollectionId>
-                        <DeletesAsMoves>1</DeletesAsMoves>
-                        <GetChanges>1</GetChanges>
-                        <WindowSize>{$windowSize}</WindowSize>
-                        <Options>
-                            <FilterType>0</FilterType>
-                            <Conflict>1</Conflict>
-                            <BodyPreference xmlns="uri:AirSyncBase">
-                                <Type>2</Type>
-                                <TruncationSize>51200</TruncationSize>
-                                <AllOrNone>0</AllOrNone>
-                            </BodyPreference>
-                        </Options>
-                    </Collection>
-                </Collections>
-            </Sync>
-            EOF;
-        return $this->request($request, 'Sync');
-    }
-
-    private function getRelationsState($device_id, $folderId)
-    {
-        $db    = \rcube::get_instance()->get_dbh();
-        $result = $db->query(
-            "SELECT `data`, `synctime` FROM `syncroton_relations_state`"
-            . " WHERE `device_id` IN (SELECT `id` FROM `syncroton_device` WHERE `deviceid` = ?) AND `folder_id` = ?"
-            . " ORDER BY `synctime` DESC",
-            $device_id,
-            $folderId
-        );
-        $data = ;
-        while ($state = $db->fetch_assoc($result)) {
-            $data = $state;
-        }
-        return $data;
-    }
-
-    /**
-     * Test Sync command
-     */
-    public function testRelationsSync()
-    {
-        $sync = \kolab_sync::get_instance();
-
-        $this->emptyTestFolder('INBOX', 'mail');
-        if ($this->isStorageDriver('kolab4')) {
-            $sync->get_storage()->set_metadata(\kolab_storage_tags::METADATA_ROOT, \kolab_storage_tags::METADATA_TAGS_KEY => null);
-        } else {
-            $this->emptyTestFolder('Configuration', 'configuration');
-        }
-        $this->registerDevice();
-
-        // Test INBOX
-        $folderId = '38b950ebd62cd9a66929c89615d0fc04';
-        $syncKey = 0;
-        $response = $this->initialSyncRequest($folderId);
-        $this->assertEquals(200, $response->getStatusCode());
-
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $this->assertSame('1', $xpath->query("//ns:Sync/ns:Collections/ns:Collection/ns:Status")->item(0)->nodeValue);
-        $this->assertSame(strval(++$syncKey), $xpath->query("//ns:Sync/ns:Collections/ns:Collection/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame('Email', $xpath->query("//ns:Sync/ns:Collections/ns:Collection/ns:Class")->item(0)->nodeValue);
-        $this->assertSame($folderId, $xpath->query("//ns:Sync/ns:Collections/ns:Collection/ns:CollectionId")->item(0)->nodeValue);
-
-        // First we append
-        $uid1 = $this->appendMail('INBOX', 'mail.sync1');
-        $uid2 = $this->appendMail('INBOX', 'mail.sync2');
-        $this->appendMail('INBOX', 'mail.sync1', 'sync1' => 'sync3');
-        $this->appendMail('INBOX', 'mail.sync1', 'sync1' => 'sync4');
-
-        $sync = \kolab_sync::get_instance();
-
-        // Add a tag
-        $sync->storage(true)->updateItem($folderId, self::$deviceId, \kolab_sync_storage::MODEL_EMAIL, $uid1, null, 'categories' => 'test1');
-        sleep(1);
-
-        $response = $this->syncRequest($syncKey, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-        $root = "//ns:Sync/ns:Collections/ns:Collection";
-        $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
-        $this->assertSame(strval(++$syncKey), $xpath->query("{$root}/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
-        $this->assertSame(4, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-
-        $root .= "/ns:Commands/ns:Add";
-        $this->assertSame(1, $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->count());
-        $this->assertSame("test1", $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->item(0)->nodeValue);
-
-        // Add a second tag
-        $sync->storage(true)->updateItem($folderId, self::$deviceId, \kolab_sync_storage::MODEL_EMAIL, $uid1, null, 'categories' => 'test1', 'test2');
-        sleep(1); // Necessary to make sure we pick up on the tag.
-
-        $response = $this->syncRequest($syncKey, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $root = "//ns:Sync/ns:Collections/ns:Collection";
-        $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
-        $this->assertSame(strval(++$syncKey), $xpath->query("{$root}/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
-        $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-        $this->assertSame(1, $xpath->query("{$root}/ns:Commands/ns:Change")->count());
-        $root .= "/ns:Commands/ns:Change";
-        $this->assertSame(1, $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->count());
-        //FIXME not sure what I'm doing wrong, but the xml looks ok
-        $this->assertSame("test1test2", $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->item(0)->nodeValue);
-
-        $retries = 2;
-        $syncKey--;
-        // Rerun the same command and make sure we get the same result
-        for ($i = 0; $i < $retries; $i++) {
-            $response = $this->syncRequest($syncKey, $folderId, 10);
-            $this->assertEquals(200, $response->getStatusCode());
-            $dom = $this->fromWbxml($response->getBody());
-            $xpath = $this->xpath($dom);
-
-            $root = "//ns:Sync/ns:Collections/ns:Collection";
-            $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
-            $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
-            $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-            $this->assertSame(1, $xpath->query("{$root}/ns:Commands/ns:Change")->count());
-            $root .= "/ns:Commands/ns:Change";
-            $this->assertSame(1, $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->count());
-            //FIXME not sure what I'm doing wrong, but the xml looks ok
-            $this->assertSame("test1test2", $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->item(0)->nodeValue);
-
-            // Assert the db state
-            if ($this->isStorageDriver('kolab')) {
-                $this->assertSame(2, count($this->getRelationsState(self::$deviceId, $folderId)));
-            }
-            // Make sure we have a new timestamp after the first iteration.
-            // This way we can potentially catch errors when we end up using the same or a different timestamp.
-            sleep(1);
-        }
-        $syncKey += ($retries + 1);
-
-        // Reset to no tags
-        $sync->storage(true)->updateItem($folderId, self::$deviceId, \kolab_sync_storage::MODEL_EMAIL, $uid1, null, 'categories' => );
-        sleep(1); // Necessary to make sure we pick up on the tag.
-
-        $response = $this->syncRequest($syncKey, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-        $dom = $this->fromWbxml($response->getBody());
-        $xpath = $this->xpath($dom);
-
-        $root = "//ns:Sync/ns:Collections/ns:Collection";
-        $this->assertSame('1', $xpath->query("{$root}/ns:Status")->item(0)->nodeValue);
-        $this->assertSame(strval(++$syncKey), $xpath->query("{$root}/ns:SyncKey")->item(0)->nodeValue);
-        $this->assertSame($folderId, $xpath->query("{$root}/ns:CollectionId")->item(0)->nodeValue);
-        $this->assertSame(0, $xpath->query("{$root}/ns:Commands/ns:Add")->count());
-        $this->assertSame(1, $xpath->query("{$root}/ns:Commands/ns:Change")->count());
-        $root .= "/ns:Commands/ns:Change";
-        $this->assertSame(0, $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->count());
-        //FIXME this currently fails because we omit the empty categories element
-        // $this->assertSame("", $xpath->query("{$root}/ns:ApplicationData/Email:Categories")->item(0)->nodeValue);
-
-        // Assert the db state
-        if ($this->isStorageDriver('kolab')) {
-            $this->assertSame(2, count($this->getRelationsState(self::$deviceId, $folderId)));
-        }
-
-        $response = $this->syncRequest($syncKey, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-        // We expect an empty response without a change
-        $this->assertEquals(0, $response->getBody()->getSize());
-        // print($dom->saveXML());
-
-        return $syncKey;
-    }
-
-    public function testPing()
-    {
-        // Setup with a tag and an initial sync completed
-        $folderId = '38b950ebd62cd9a66929c89615d0fc04';
-        $sync = \kolab_sync::get_instance();
-
-        $uid1 = $this->appendMail('INBOX', 'mail.sync1');
-        $sync->storage(true)->updateItem($folderId, self::$deviceId, \kolab_sync_storage::MODEL_EMAIL, $uid1, null, 'categories' => 'test1');
-        sleep(1);
-
-        $response = $this->syncRequest(0, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-        $response = $this->syncRequest(1, $folderId, 10);
-        $this->assertEquals(200, $response->getStatusCode());
-
-        if ($this->isStorageDriver('kolab')) {
-            $this->assertSame(2, count($this->getRelationsState(self::$deviceId, $folderId)));
-        }
-
-        // Make sure the timestamp changes
-        sleep(1);
-
-        // Pings should not change the number of relation states
-        for ($i = 0; $i < 2; $i++) {
-            $request = <<<EOF
-                <?xml version="1.0" encoding="utf-8"?>
-                <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-                <Ping xmlns="uri:Ping">
-                    <HeartbeatInterval>0</HeartbeatInterval>
-                    <Folders>
-                        <Folder>
-                            <Id>$folderId</Id>
-                            <Class>Email</Class>
-                        </Folder>
-                    </Folders>
-                </Ping>
-                EOF;
-
-            $response = $this->request($request, 'Ping');
-
-            $this->assertEquals(200, $response->getStatusCode());
-            if ($this->isStorageDriver('kolab')) {
-                $this->assertSame(1, count($this->getRelationsState(self::$deviceId, $folderId)));
-            }
-        }
-
-        // This simulates a specific case where we had:
-        // * An old lastsync timestamp (because the folders were not actively synchronized)
-        // * The folder was still included in the ping command
-        // => This resulted in the relations code never finding a relation, and thus not cleaning up, but it still inserted new entries
-        $db    = \rcube::get_instance()->get_dbh();
-        $result = $db->query(
-            "UPDATE `syncroton_synckey` SET `lastsync` = '2023-06-23 13:15:03'"
-        );
-
-        $request = <<<EOF
-            <?xml version="1.0" encoding="utf-8"?>
-            <!DOCTYPE AirSync PUBLIC "-//AIRSYNC//DTD AirSync//EN" "http://www.microsoft.com/">
-            <Ping xmlns="uri:Ping">
-                <HeartbeatInterval>0</HeartbeatInterval>
-                <Folders>
-                    <Folder>
-                        <Id>$folderId</Id>
-                        <Class>Email</Class>
-                    </Folder>
-                </Folders>
-            </Ping>
-            EOF;
-
-        $response = $this->request($request, 'Ping');
-
-        $this->assertEquals(200, $response->getStatusCode());
-        if ($this->isStorageDriver('kolab')) {
-            $this->assertSame(1, count($this->getRelationsState(self::$deviceId, $folderId)));
-        }
-    }
-}

kolab-syncroton-2.4.2.tar.gz/tests/SyncTestCase.php Changed

@@ -43,11 +43,14 @@
             return;
         }
 
-        self::$deviceId = 'test' . str_replace('.', '', microtime(true));
+        self::$deviceId = 'test' . time();
 
         $db->query('DELETE FROM syncroton_device');
+        $db->query('DELETE FROM syncroton_synckey');
+        $db->query('DELETE FROM syncroton_folder');
         $db->query('DELETE FROM syncroton_data');
         $db->query('DELETE FROM syncroton_data_folder');
+        $db->query('DELETE FROM syncroton_content');
 
         self::$client = new \GuzzleHttp\Client(
                 'http_errors' => false,
@@ -72,16 +75,18 @@
     {
         if (self::$deviceId) {
             $sync = \kolab_sync::get_instance();
-            /*
+
             if (self::$authenticated || $sync->authenticate(self::$username, self::$password)) {
                 $sync->password = self::$password;
+
+                $storage = $sync->storage();
+                $storage->device_delete(self::$deviceId);
             }
-            */
 
             $db = $sync->get_dbh();
             $db->query('DELETE FROM syncroton_device');
-            $db->query('DELETE FROM syncroton_data');
-            $db->query('DELETE FROM syncroton_data_folder');
+            $db->query('DELETE FROM syncroton_synckey');
+            $db->query('DELETE FROM syncroton_folder');
         }
     }
 
@@ -111,7 +116,7 @@
         $uid = $imap->save_message($folder, $source, '', $is_file);
 
         if ($uid === false) {
-            exit("Failed to append mail {$filename} into {$folder}");
+            exit("Failed to append mail into {$folder}");
         }
 
         return $uid;
@@ -168,9 +173,9 @@
             if ($imap->folder_exists($foldername)) {
                 // TODO
                 exit("Not implemented for Kolab v3 storage driver");
-            } else {
-                exit("Folder is missing");
             }
+
+            return;
         }
 
         $dav = $this->getDavStorage();
@@ -215,80 +220,6 @@
     }
 
     /**
-     * Create a folder
-     */
-    protected function createTestFolder($name, $type, $subscriptionState = '1')
-    {
-        // Create IMAP folders
-        if ($type == 'mail' || $this->isStorageDriver('kolab')) {
-            $imap = $this->getImapStorage();
-            $imap->create_folder($name, true);
-            if ($type != 'mail' && $this->isStorageDriver('kolab')) {
-                $imap->set_metadata($name, '/private/vendor/kolab/folder-type' => $type);
-            }
-            $this->setSubscriptionState($name, $type, $subscriptionState);
-        }
-    }
-
-    /**
-     * Subscribe a test folder
-     */
-    public static function setSubscriptionState($name, $type, $subscriptionState, $deviceid = null)
-    {
-        $sync = \kolab_sync::get_instance();
-        $db = $sync->get_dbh();
-        $query = $db->query("SELECT `id` FROM `syncroton_device` WHERE `deviceid` = ?", $deviceid ?: self::$deviceId);
-        $arr = $db->fetch_array($query);
-        $device_id = $arr0 ?? null;
-
-        if (!$device_id) {
-            throw new \Exception('Device ID not found');
-        }
-
-        $type,  = explode('.', $type);
-
-        $query = $db->query(
-            "SELECT `data` FROM `syncroton_subscriptions` WHERE `device_id` = ? AND `type` = ?",
-            $device_id,
-            $type
-        );
-
-        if ($record = $db->fetch_assoc($query)) {
-            $data = json_decode($record'data', true);
-        } else {
-            if (!$subscriptionState) {
-                return;
-            }
-        }
-
-        if ($subscriptionState) {
-            $data$name = (int) $subscriptionState;
-        } elseif (!isset($data$name)) {
-            return;
-        } else {
-            unset($data$name);
-        }
-
-        $data = json_encode($data);
-
-        if ($record) {
-            $db->query(
-                'UPDATE syncroton_subscriptions SET `data` = ? WHERE `device_id` = ? AND `type` = ?',
-                $data,
-                $device_id,
-                $type
-            );
-        } else {
-            $db->query(
-                'INSERT INTO `syncroton_subscriptions` (`data`, `device_id`, `type`) VALUES (?, ?, ?)',
-                $data,
-                $device_id,
-                $type
-            );
-        }
-    }
-
-    /**
      * Remove all objects from a folder
      */
     protected function emptyTestFolder($name, $type)
@@ -324,26 +255,6 @@
     }
 
     /**
-     * Get objects from a DAV folder
-     */
-    protected function getDavObjects($foldername, $type, $query = )
-    {
-        $dav = $this->getDavStorage();
-
-        foreach ($dav->get_folders($type) as $folder) {
-            if ($folder->get_name() === $foldername) {
-                $result = ;
-                foreach ($folder->select($query) as $object) {
-                    $result = $object;
-                }
-                return $result;
-            }
-        }
-
-        throw new \Exception("Folder not found");
-    }
-
-    /**
      * Initialize DAV storage
      */
     protected function getDavStorage()
@@ -360,7 +271,7 @@
 
         // Make sure user is authenticated
         $this->getImapStorage();
-        if ($sync->user) {
+        if (!empty($sync->user)) {
             // required e.g. for DAV client cache use
             \rcube::get_instance()->user = $sync->user;
         }
@@ -445,14 +356,6 @@
         }
     }
 
-    protected function resetDevice()
-    {
-        $sync = \kolab_sync::get_instance();
-
-        $db = $sync->get_dbh();
-        $db->query('DELETE FROM syncroton_device');
-    }
-
     /**
      * Convert XML into WBXML binary content
      */
@@ -479,7 +382,6 @@
         $xpath->registerNamespace("AirSyncBase", "uri:AirSyncBase");
         $xpath->registerNamespace("Calendar", "uri:Calendar");
         $xpath->registerNamespace("Contacts", "uri:Contacts");
-        $xpath->registerNamespace("ComposeMail", "uri:ComposeMail");
         $xpath->registerNamespace("Email", "uri:Email");
         $xpath->registerNamespace("Email2", "uri:Email2");
         $xpath->registerNamespace("Settings", "uri:Settings");
@@ -488,14 +390,6 @@
         return $xpath;
     }
 
-    /**
-      * Pretty print the DOM
-      */
-    protected function printDom($dom)
-    {
-        $dom->formatOutput = true;
-        print($dom->saveXML());
-    }
 
     /**
      * adapter for phpunit < 9
@@ -505,7 +399,7 @@
         if (method_exists("PHPUnit\Framework\TestCase", "assertMatchesRegularExpression")) {
             parent::assertMatchesRegularExpression($arg1, $arg2, $message);
         } else {
-            parent::assertRegExp($arg1, $arg2, $message);
+            parent::assertRegExp($arg1, $arg2);
         }
     }
 }

kolab-syncroton-2.4.2.tar.gz/tests/bootstrap.php Changed

kolab-syncroton-2.4.2.tar.gz/tests/src/contact.vcard1 Changed

kolab-syncroton-2.4.2.tar.gz/tests/src/contact.vcard2 Changed

kolab-syncroton-2.4.2.tar.gz/tests/src/mail.sync2 Changed

kolab-syncroton.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3305 0

Request History

mollekopf created request 10 months ago

New release 2.4.2.23

mollekopf superseded request 10 months ago

superseded by 3306