Request 3135 (accepted)

debian.changelog Changed

roundcubemail-1.5.3.tar.gz/SQL/mysql/2020020101.sql Changed

@@ -26,15 +26,6 @@
 ALTER TABLE `filestore` ROW_FORMAT=DYNAMIC;
 ALTER TABLE `system` ROW_FORMAT=DYNAMIC;
 
-
-ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
-ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
-ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(191) BINARY NOT NULL;
-ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
-
-
 ALTER TABLE `session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `cache` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
@@ -50,6 +41,13 @@
 ALTER TABLE `filestore` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 ALTER TABLE `system` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
+ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
+ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
+ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(255) BINARY NOT NULL;
+ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
+ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
+ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
+
 ALTER TABLE `cache`
   ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
 ALTER TABLE `cache_index`

roundcubemail-1.5.3.tar.gz/SQL/mysql/2020091000.sql Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/caldav/SQL/mysql.initial.sql Changed

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/kolab/kolab_driver.php Changed

roundcubemail-1.5.3.tar.gz/plugins/kolab_addressbook/drivers/kolab/kolab_contacts.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_dav_client.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_format_contact.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_cache.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav.php Changed

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_dav_folder.php Changed

@@ -24,10 +24,16 @@
 #AllowDynamicProperties
 class kolab_storage_dav_folder extends kolab_storage_folder
 {
+    /** @var kolab_dav_client DAV Client */
     public $dav;
+
+    /** @var string Folder URL */
     public $href;
+
+    /** @var array Folder DAV attributes */
     public $attributes;
 
+
     /**
      * Object constructor
      */
@@ -76,6 +82,13 @@
      */
     public function get_ctag()
     {
+        // Refresh requested, get the current CTag from the DAV server
+        if ($this->attributes'ctag' === false) {
+            if ($fresh = $this->dav->folderInfo($this->href)) {
+                $this->attributes'ctag' = $fresh'ctag';
+            }
+        }
+
         return $this->attributes'ctag';
     }
 
@@ -330,6 +343,8 @@
 
         if ($success) {
             $this->cache->set($uid, false);
+            $target_folder->reset();
+            $this->reset();
         }
 
         return $success;
@@ -463,6 +478,15 @@
     }
 
     /**
+     * Reset the folder status
+     */
+    public function reset()
+    {
+        $this->cache->reset();
+        $this->attributes'ctag' = false;
+    }
+
+    /**
      * Convert DAV object into PHP array
      *
      * @param array Object data in kolab_dav_client::fetchData() format

roundcubemail-1.5.3.tar.gz/plugins/libkolab/lib/kolab_storage_folder.php Changed

@@ -69,7 +69,7 @@
         }
 
         $oldtype = $this->type;
-        list($this->type, $suffix) = explode('.', $type_annotation);
+        list($this->type, $suffix) = array_pad(explode('.', $type_annotation), 2, null);
         $this->default      = $suffix == 'default';
         $this->subtype      = $this->default ? '' : $suffix;
         $this->id           = kolab_storage::folder_id($name);
@@ -266,6 +266,25 @@
     }
 
     /**
+     * Getter for a single Kolab object identified by its UID
+     *
+     * @param string $uid Object UID
+     *
+     * @return array The Kolab object represented as hash array
+     */
+    public function get_object($uid)
+    {
+        if (!$this->valid || !$uid) {
+            return false;
+        }
+
+        // synchronize caches
+        $this->cache->synchronize();
+
+        return $this->cache->get_by_uid($uid);
+    }
+
+    /**
      * List Kolab objects matching the given query
      *
      * @param mixed Pseudo-SQL query as list of filter parameter triplets
@@ -366,25 +385,6 @@
     }
 
     /**
-     * Getter for a single Kolab object identified by its UID
-     *
-     * @param string $uid Object UID
-     *
-     * @return array The Kolab object represented as hash array
-     */
-    public function get_object($uid)
-    {
-        if (!$this->valid || !$uid) {
-            return false;
-        }
-
-        // synchronize caches
-        $this->cache->synchronize();
-
-        return $this->cache->get_by_uid($uid);
-    }
-
-    /**
      * Fetch a Kolab object attachment which is stored in a separate part
      * of the mail MIME message that represents the Kolab record.
      *

roundcubemail-1.5.3.tar.gz/temp/js_cache/tinymce-langs-5.8.2.zip Changed

roundcubemail-1.5.3.tar.gz/vendor/autoload.php Changed

roundcubemail-1.5.3.tar.gz/vendor/composer/autoload_real.php Changed

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitee8891559e48bc80a86f1e6d014fe94b
+class ComposerAutoloaderInit1d664382e5eafcfdffb85f2dfa64b0a5
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitee8891559e48bc80a86f1e6d014fe94b', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit1d664382e5eafcfdffb85f2dfa64b0a5', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitee8891559e48bc80a86f1e6d014fe94b', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit1d664382e5eafcfdffb85f2dfa64b0a5', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths = get_include_path();
@@ -36,7 +36,7 @@
         if ($useStaticLoader) {
             require __DIR__ . '/autoload_static.php';
 
-            call_user_func(\Composer\Autoload\ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::getInitializer($loader));
         } else {
             $map = require __DIR__ . '/autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
@@ -57,19 +57,19 @@
         $loader->register(true);
 
         if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireee8891559e48bc80a86f1e6d014fe94b($fileIdentifier, $file);
+            composerRequire1d664382e5eafcfdffb85f2dfa64b0a5($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequireee8891559e48bc80a86f1e6d014fe94b($fileIdentifier, $file)
+function composerRequire1d664382e5eafcfdffb85f2dfa64b0a5($fileIdentifier, $file)
 {
     if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
         require $file;

roundcubemail-1.5.3.tar.gz/vendor/composer/autoload_static.php Changed

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b
+class ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -1006,11 +1006,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInitee8891559e48bc80a86f1e6d014fe94b::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit1d664382e5eafcfdffb85f2dfa64b0a5::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.5.3.tar.gz/vendor/composer/installed.php Changed

roundcubemail.dsc Changed

Overview

Request 3135 (accepted)

Request History