Request 3223 (accepted)

roundcubemail.spec Changed

debian.changelog Changed

roundcubemail-1.5.tar.gz/composer.lock Changed

@@ -4787,16 +4787,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.26",
+            "version": "1.10.28",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
+                "reference": "e4545b55904ebef470423d3ddddb74fa7325497a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
-                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e4545b55904ebef470423d3ddddb74fa7325497a",
+                "reference": "e4545b55904ebef470423d3ddddb74fa7325497a",
                 "shasum": ""
             },
             "require": {
@@ -4845,7 +4845,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-07-19T12:44:37+00:00"
+            "time": "2023-08-08T12:33:42+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

roundcubemail-1.5.tar.gz/plugins/calendar/drivers/kolab/kolab_calendar.php Changed

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

@@ -880,7 +880,7 @@
 
             switch ($savemode) {
             case 'current':
-                $_SESSION'calendar_restore_event_data' = $master;
+                $_SESSION'calendar_restore_event_data' = serialize(array_diff_key($master, '_formatobj' => 1));
 
                 // remove the matching RDATE entry
                 if (!empty($master'recurrence''RDATE')) {
@@ -901,7 +901,7 @@
             case 'future':
                 $master'_instance' = libcalendaring::recurrence_instance_identifier($master);
                 if ($master'_instance' != $event'_instance') {
-                    $_SESSION'calendar_restore_event_data' = $master;
+                    $_SESSION'calendar_restore_event_data' = serialize(array_diff_key($master, '_formatobj' => 1));
 
                     // set until-date on master event
                     $master'recurrence''UNTIL' = clone $event'start';
@@ -984,7 +984,7 @@
     {
         if ($storage = $this->get_calendar($event'calendar')) {
             if (!empty($_SESSION'calendar_restore_event_data')) {
-                $success = $storage->update_event($event = $_SESSION'calendar_restore_event_data');
+                $success = $storage->update_event($event = unserialize($_SESSION'calendar_restore_event_data'));
             }
             else {
                 $success = $storage->restore_event($event);

roundcubemail-1.5.tar.gz/plugins/kolab_delegation/kolab_delegation_engine.php Changed

roundcubemail-1.5.tar.gz/plugins/kolab_folders/kolab_folders.php Changed

roundcubemail-1.5.tar.gz/plugins/libcalendaring/libcalendaring.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage.php Changed

@@ -135,7 +135,7 @@
 
         if (!is_array($config)) {
             $ldap_config = (array)self::$config->get('ldap_public');
-            $config = $ldap_config$config;
+            $config = $ldap_config$config ?? null;
         }
 
         if (empty($config)) {
@@ -153,7 +153,7 @@
 
         // Fallback to kolab_auth_login, which is not attribute, but field name
         if (!$user_field && ($user_field = self::$config->get('kolab_auth_login', 'email'))) {
-            $user_attrib = $config'fieldmap'$user_field;
+            $user_attrib = $config'fieldmap'$user_field ?? null;
         }
 
         if ($user_field && $user_attrib) {
@@ -545,7 +545,7 @@
             }
         }
 
-        if (!empty($options) && ($options'protected' || $options'norename')) {
+        if (!empty($options) && (!empty($options'protected') || !empty($options'norename'))) {
             $folder = $oldfolder;
         }
         else if (strlen($parent)) {
@@ -785,6 +785,7 @@
         $delim = self::$imap->get_hierarchy_delimiter();
         $names = array();
         $len   = strlen($current);
+        $p_len = 0;
 
         if ($len && ($rpos = strrpos($current, $delim))) {
             $parent = substr($current, 0, $rpos);
@@ -809,11 +810,11 @@
                 }
             }
 
-            // always show the parent of current folder
             if ($p_len && $name == $parent) {
+                // always show the parent of current folder
             }
-            // skip folders where user have no rights to create subfolders
             else if ($c_folder->get_owner() != $_SESSION'username') {
+                // skip folders where user have no rights to create subfolders
                 $rights = $c_folder->get_myrights();
                 if (!preg_match('/ck/', $rights)) {
                     continue;
@@ -1101,13 +1102,13 @@
                 if (!empty($parents)) {
                     $parents = array_reverse($parents);
                     foreach ($parents as $parent) {
-                        $parent_node = $refs$parent->parent ?: $tree;
+                        $parent_node = !empty($refs$parent->parent) ? $refs$parent->parent : $tree;
                         $parent_node->children = $parent;
                         $_folders = $parent;
                     }
                 }
 
-                $parent_node = $refs$folder->parent ?: $tree;
+                $parent_node = !empty($refs$folder->parent) ? $refs$folder->parent : $tree;
                 $parent_node->children = $folder;
             }

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

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_storage_config.php Changed

roundcubemail-1.5.tar.gz/plugins/libkolab/lib/kolab_utils.php Changed

roundcubemail-1.5.tar.gz/program/lib/Roundcube/rcube_user.php Changed

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

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

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

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitbc42c90a0cd4784dec39e559d209b3cf
+class ComposerAutoloaderInit4584424bb96317cfa4fefec00b8bd9e9
 {
     private static $loader;
 
@@ -24,9 +24,9 @@
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitbc42c90a0cd4784dec39e559d209b3cf', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4584424bb96317cfa4fefec00b8bd9e9', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitbc42c90a0cd4784dec39e559d209b3cf', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4584424bb96317cfa4fefec00b8bd9e9', '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\ComposerStaticInitbc42c90a0cd4784dec39e559d209b3cf::getInitializer($loader));
+            call_user_func(\Composer\Autoload\ComposerStaticInit4584424bb96317cfa4fefec00b8bd9e9::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\ComposerStaticInitbc42c90a0cd4784dec39e559d209b3cf::$files;
+            $includeFiles = Composer\Autoload\ComposerStaticInit4584424bb96317cfa4fefec00b8bd9e9::$files;
         } else {
             $includeFiles = require __DIR__ . '/autoload_files.php';
         }
         foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequirebc42c90a0cd4784dec39e559d209b3cf($fileIdentifier, $file);
+            composerRequire4584424bb96317cfa4fefec00b8bd9e9($fileIdentifier, $file);
         }
 
         return $loader;
     }
 }
 
-function composerRequirebc42c90a0cd4784dec39e559d209b3cf($fileIdentifier, $file)
+function composerRequire4584424bb96317cfa4fefec00b8bd9e9($fileIdentifier, $file)
 {
     if (empty($GLOBALS'__composer_autoload_files'$fileIdentifier)) {
         require $file;

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

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

roundcubemail-1.5.tar.gz/vendor/composer/installed.json Changed

@@ -3044,17 +3044,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.10.26",
-            "version_normalized": "1.10.26.0",
+            "version": "1.10.28",
+            "version_normalized": "1.10.28.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f"
+                "reference": "e4545b55904ebef470423d3ddddb74fa7325497a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/5d660cbb7e1b89253a47147ae44044f49832351f",
-                "reference": "5d660cbb7e1b89253a47147ae44044f49832351f",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e4545b55904ebef470423d3ddddb74fa7325497a",
+                "reference": "e4545b55904ebef470423d3ddddb74fa7325497a",
                 "shasum": ""
             },
             "require": {
@@ -3063,7 +3063,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-07-19T12:44:37+00:00",
+            "time": "2023-08-08T12:33:42+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"

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

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '5e2fa3e88c8c57c5dccc374230ef5a4a46354e66',
+        'reference' => '51e6a56415b542d308704154deb509bc34488b45',
         'name' => 'roundcube/roundcubemail',
         'dev' => true,
     ),
@@ -510,12 +510,12 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.10.26',
-            'version' => '1.10.26.0',
+            'pretty_version' => '1.10.28',
+            'version' => '1.10.28.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
-            'reference' => '5d660cbb7e1b89253a47147ae44044f49832351f',
+            'reference' => 'e4545b55904ebef470423d3ddddb74fa7325497a',
             'dev_requirement' => true,
         ),
         'phpunit/php-code-coverage' => array(
@@ -644,7 +644,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '5e2fa3e88c8c57c5dccc374230ef5a4a46354e66',
+            'reference' => '51e6a56415b542d308704154deb509bc34488b45',
             'dev_requirement' => false,
         ),
         'roundcube/rtf-html-php' => array(

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/index Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/HEAD Changed

@@ -1,3 +1,3 @@
-0000000000000000000000000000000000000000 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691063432 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
-bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691063432 +0200	checkout: moving from master to master
-bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691063432 +0200	reset: moving to bc02cfe80148b88504627ea0163148f36f49b277
+0000000000000000000000000000000000000000 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691606032 +0200	clone: from /home/mollekopf/.cache/composer/vcs/https---git.kolab.org-diffusion-PNL-php-net-ldap.git/
+bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691606032 +0200	checkout: moving from master to master
+bc02cfe80148b88504627ea0163148f36f49b277 bc02cfe80148b88504627ea0163148f36f49b277 Christian Mollekopf <mollekopf@apheleia-it.ch> 1691606032 +0200	reset: moving to bc02cfe80148b88504627ea0163148f36f49b277

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/heads/master Changed

roundcubemail-1.5.tar.gz/vendor/kolab/net_ldap3/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar Changed

roundcubemail-1.5.tar.gz/vendor/phpstan/phpstan/phpstan.phar.asc Changed

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmS32poACgkQUcZzBf/C
-5cCvmg/+JJmyX663fa+FHy7ED2SexVuChivpbp82dyLx1gRAl15rtNG4zjxNRfnW
-6GpsysMhKqrN7p6xur18ZkLqdFKAjeNnpTunnh/ADetcrs8wzLNyAy7luQtyXAuj
-SOv5f/Yitg9yvZ2GHrbzchQuSjkbUR2KroBYsRhwVTH7pMIgdvysRBYiENfbz350
-n91WOCApDnVCygzEhBbhkwA/xklJnUxkRJX3AlbbCwES9K64ELyGd0BqJ1Ohy2a7
-4cFjwRJq9/tXf99fyncamN8xyBdvYBXSNRNMPYcjKqKIZCOePlR8Q3b7nt154w+e
-w2qnAevOB4dYzJaSjwJlaVQYR1YIQ7NlYkGboONq/lrtJlEejDdiRmGvgHZ8nSYW
-Ob2JwqgYDfUPfsnXAwXM+whpUNJi30MDB7MSw3SiDlyw690HheT/DCKOJ9yNUiOB
-TSGkbIGW/ASett78gowjwniYdryE5ufUPwZbkSaFC3CDysHfs6Jgc+lxe3wnOHtD
-WyPl1TqDRNuLOZ26TgxI3gGEYqMcVDYQfmuiOakoebHx6j0bpvyEaP51j0/JFpu6
-okKulXgC1DUluKFWMPhobPQRZ8zC29macnU74JvmJIiUhfiP2Pl16D+XcjFW++zH
-EDEghcCdgz0pIF6UI5j02rbNAfu7Oo685pnYeXq0DexgXjqoFOE=
-=NF4z
+iQIzBAABCgAdFiEEynwsejDI6OEnSoR2UcZzBf/C5cAFAmTSNgUACgkQUcZzBf/C
+5cA8rw/9EPjeTcTM6JkrBgoTxcowt5dQyQIlihqHZTymzi+sHyDRbCoE4/jXRRYL
+xDbyKn6rb0klsdRkWtcfPmzTyNmPby7Ue61M6TdO9MNPbHQ75GOW6B72Lhvm8uAW
+ackyZPO49hNsB2uT0ND5eVKKABQDa9qoiM+iiO06Sv6mvLyX5xP20SZTy/S7iEWd
+EpCWkqmVHcdym2nQEIZVlmuI1tedMIMHTUdpRQPplwpGCbp1NJj3mGjix2ioGxaQ
+EsfXWblsrG7zaYDSFRVBTFQHMfcsPD7vrXNC6/47Z+69467cCcsKf9xUnLKeJqcc
+2l5qTfV3nm9oiKs9zNlGeyoTIgVRpRnvXmpmtDfZn0eFgBaYp2rBmNWQKhMHtlyJ
+x1PFS3rWe3lgaKD4VRm9gcOVW12Ikpc0ZNez9wgldRx8gzYFUW8XgEGsT1nnnTdC
+80KKjd8AgCkoqR2NJs2Es1nFfJVKv8QkcndBAfzRTwTyMbI5716S2EMhcVBZxdS/
+xf07/geRkBZUjahqarNH0RnClEN2XpRyjnMMaReiMBerMuuCHD7YfwenivgVqnZ3
+MFvzw7/IGO2pnxGP7Mop+FzrB3me7OvOP6reyOj/wR7uJyZu4328XZ2cvlkTEuSI
+PyqJiQxkeuhX9I2NaYL8HMrNMgzPIrn4fRmsNjKGqfAnjevo2qQ=
+=UH7D
 -----END PGP SIGNATURE-----

roundcubemail.dsc Changed

Overview

Request 3223 (accepted)

Request History