Kolab Groupware OBS

roundcubemail.spec Changed

@@ -57,7 +57,7 @@
 Name:           roundcubemail
 Version:        %{rc_version}
 
-Release:        1%{?dot_rel_suffix}%{?dist}
+Release:        2%{?dot_rel_suffix}%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -217,8 +217,7 @@
 cp -vf %{SOURCE102} plugins/password/config.inc.php.dist
 cp -vf %{SOURCE103} plugins/calendar/config.inc.php.dist
 cp -vf %{SOURCE104} plugins/kolab_addressbook/config.inc.php.dist
-#TODO?
-#cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
+cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
 cp -vf %{SOURCE106} plugins/kolab_folders/config.inc.php.dist
 cp -vf %{SOURCE107} plugins/libkolab/config.inc.php.dist
 %endif
@@ -549,6 +548,9 @@
 %dir %{_localstatedir}/lib/rpm-state/roundcubemail/
 
 %changelog
+* Tue Nov  30 2021 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.4.11.20-2
+- Selfcontained build
+
 * Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.11.20-1
 - Check in release 1.4.11.20

buildroundcubemailtarball.sh Changed

roundcubemail-1.4.11.20.tar.gz/.git/ORIG_HEAD Added

roundcubemail-1.4.11.20.tar.gz/.git/index Changed

roundcubemail-1.4.11.20.tar.gz/.git/logs/HEAD Changed

roundcubemail-1.4.11.20.tar.gz/.git/logs/refs/heads/release-1.4 Changed

roundcubemail-1.4.11.20.tar.gz/.git/logs/refs/remotes/origin/HEAD Changed

roundcubemail-1.4.11.20.tar.gz/.git/objects/pack/pack-476be6ec5be9817870e3bd58a4b44ee2a8c58e6e.idx Added

roundcubemail-1.4.11.20.tar.gz/.git/objects/pack/pack-476be6ec5be9817870e3bd58a4b44ee2a8c58e6e.pack Added

roundcubemail-1.4.11.20.tar.gz/.git/objects/pack/pack-4c0d1e6b7e968a626c3f8694d9c8b399cba819af.idx Deleted

roundcubemail-1.4.11.20.tar.gz/.git/objects/pack/pack-4c0d1e6b7e968a626c3f8694d9c8b399cba819af.pack Deleted

roundcubemail-1.4.11.20.tar.gz/.git/packed-refs Changed

@@ -3,7 +3,7 @@
 3ebac0167bf20104fb7a2a55934765117760264c refs/remotes/origin/dev-zenmode
 c4948168c51eaba11b70cc6083aaf39af4ff9de1 refs/remotes/origin/dev/enigma-woat
 05db0f5d87b2476286216b3f2ee552d6bcbe2c7c refs/remotes/origin/dev/push
-f45f9c53aff90a8c497141d38bde67b6298606e3 refs/remotes/origin/master
+688320b4c6750c5260719d044d0812945bd7fbeb refs/remotes/origin/master
 63d6e6dfc35e6d82c4a64f37c408794c163becd4 refs/remotes/origin/release-0.6
 197203727417a03d87053a47e5aa5175a76e3e0b refs/remotes/origin/release-0.7
 f06aa8058b7e32ba32d4551074b6e0b8a300f751 refs/remotes/origin/release-0.8
@@ -11,9 +11,9 @@
 0ba44f0d921f5b812ce45559c255fc891d65e06f refs/remotes/origin/release-1.0
 d0a14ffc05654a2a18109f5785b701a2f229bfb4 refs/remotes/origin/release-1.1
 9b69cce641a8c34c7efcb34628287d4fadf7bbaf refs/remotes/origin/release-1.2
-ca5dd51990fef71a0ae32d7be236e5eeee4d322d refs/remotes/origin/release-1.3
-9dfa13f4dceb7892c0c648d25447d392f56dee9e refs/remotes/origin/release-1.4
-d517b8398d4fc7711479061c28cf444bc8706a6a refs/remotes/origin/release-1.5
+c23eef1a3aa73085818692cfff6abd0b09dccf25 refs/remotes/origin/release-1.3
+786fb18c437ae1211be4d4ad0573a62c1a48b768 refs/remotes/origin/release-1.4
+f767a684ad0682b9e6f93076d9c8cd0fda0975d4 refs/remotes/origin/release-1.5
 048a4e7d0ce4a4305ee07a464d30342d371dfbed refs/tags/0.7.4
 ^6233a6911f5db44092c9f473d656c8e8a1d43ff1
 0c81207992493c527c5e61789b0ad61f65661eca refs/tags/0.8.6
@@ -115,6 +115,8 @@
 ^e4dc3e942c79271f7e0933d91895e7fcd810ec44
 ee2022ab5189cb1879280e04f235dbc08345f6d4 refs/tags/1.3.16
 ^54bf3d0d1acba03db785d16bb53564e417c3883e
+1dae4feb0d0cd795c07564ceaf2e383a0079e60d refs/tags/1.3.17
+^c23eef1a3aa73085818692cfff6abd0b09dccf25
 cdf13b928e087d60c6d76a1df991d873f9f5fa03 refs/tags/1.3.2
 ^2c7f3751ab5a1b04d7bb300cdac419848ccc6f32
 8efb2a7fd24079e76c17f4b90b1c3be95a877f22 refs/tags/1.3.3
@@ -145,6 +147,8 @@
 ^4efec49a46a3f4aab58f606d06b669b6498a0811
 e23242cd76c1fd5f31668c3c3861bdab671bd3d0 refs/tags/1.4.11
 ^34c42f06e1a8b25c022f49ab59f5f26c21c9ec42
+4e3d9f5247c099e9d0b145e06311cbff469f0ea8 refs/tags/1.4.12
+^786fb18c437ae1211be4d4ad0573a62c1a48b768
 ad5bf429cbb52099e4c71467adcbd63edabb075f refs/tags/1.4.2
 ^51b8137170bc66a5e68b36710b0f05386d6c6f50
 97d4011fc9f825e01b59cca264147f854f5c2459 refs/tags/1.4.3
@@ -167,6 +171,8 @@
 ^6466d10339d44a077de4fe094c89ed35ae84da96
 802e9d4b1ea5e5b4f98cf58b8cb4454c84842fb2 refs/tags/1.5.0
 ^f1d376ba278aa4d9c739a0f3b3961df26cda3c07
+10b2998941ede9a81d084891da3cd64a984f5778 refs/tags/1.5.1
+^f767a684ad0682b9e6f93076d9c8cd0fda0975d4
 0abe813a19570dcb0d3d6ef0aaf7708791dfd274 refs/tags/v0.1-beta2
 ^aade7b98044ad4abb9021452688ec3af57f36acb
 9525c09ff7494a32118cad565dba9bc0aabfc2fa refs/tags/v0.1-rc1

roundcubemail-1.4.11.20.tar.gz/.git/refs/heads/release-1.4 Changed

roundcubemail-1.4.11.20.tar.gz/composer.json Changed

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

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "59c76f0959021d7ce8f24269d438e96d",
+    "content-hash": "7d3579392baf5b35c391ae0ae452a2ba",
     "packages": [
         {
             "name": "caxy/php-htmldiff",
@@ -224,11 +224,11 @@
         },
         {
             "name": "kolab/calendar",
-            "version": "3.5.9",
+            "version": "3.5.10",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/calendar",
-                "reference": "03453c200f7b846caadd86a28db659a39f004adb"
+                "reference": "45103d5bdee63f976c918f8cfcf20b400310bcb0"
             },
             "require": {
                 "kolab/libcalendaring": ">=3.4.0",
@@ -303,11 +303,11 @@
         },
         {
             "name": "kolab/kolab_addressbook",
-            "version": "3.5.6",
+            "version": "3.5.10",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/kolab_addressbook",
-                "reference": "e69f6f6d8b3a3d2c26455233fb9accf43fcea3d1"
+                "reference": "29195279f672640ffe38f70ddabe87b56172e889"
             },
             "require": {
                 "kolab/libkolab": ">=3.4.0",
@@ -338,6 +338,37 @@
             }
         },
         {
+            "name": "kolab/kolab_chat",
+            "version": "3.5.4",
+            "dist": {
+                "type": "path",
+                "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/kolab_chat",
+                "reference": "b2f85fcb8324b9961dd02fb3e3acd92be33b558e"
+            },
+            "require": {
+                "kolab/libkolab": ">=3.4.0",
+                "php": ">=5.3.0",
+                "roundcube/plugin-installer": ">=0.1.3"
+            },
+            "type": "roundcube-plugin",
+            "license": [
+                "AGPLv3"
+            ],
+            "authors": [
+                {
+                    "name": "Aleksander Machniak",
+                    "email": "machniak@kolabsys.com",
+                    "role": "Lead"
+                }
+            ],
+            "description": "Chat integration plugin",
+            "homepage": "https://git.kolab.org/diffusion/RPK/",
+            "transport-options": {
+                "symlink": false,
+                "relative": false
+            }
+        },
+        {
             "name": "kolab/kolab_config",
             "version": "3.4.0",
             "dist": {
@@ -499,11 +530,11 @@
         },
         {
             "name": "kolab/libcalendaring",
-            "version": "3.5.9",
+            "version": "3.5.10",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/libcalendaring",
-                "reference": "e4df269b0381ce353d4e5bac5ee6367ec4bb958c"
+                "reference": "b9ab21ae1a5b134a06c66d55372712630171a590"
             },
             "require": {
                 "php": ">=5.4.0",
@@ -535,11 +566,11 @@
         },
         {
             "name": "kolab/libkolab",
-            "version": "3.5.9",
+            "version": "3.5.10",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/libkolab",
-                "reference": "b071295e155b5ddc0010c8087f5e3f63835adae7"
+                "reference": "a8abbba8039ee3bdde7be1b6758893aeff0287d8"
             },
             "require": {
                 "caxy/php-htmldiff": "~0.1.7",
@@ -632,11 +663,11 @@
         },
         {
             "name": "kolab/tasklist",
-            "version": "3.5.9",
+            "version": "3.5.10",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/tasklist",
-                "reference": "b924690e0ff5ef23969492f6d0bbda42050f6cb0"
+                "reference": "7ae02f72964925d19fb244754f9d3e9b20af677c"
             },
             "require": {
                 "kolab/libcalendaring": ">=3.4.0",
@@ -853,16 +884,16 @@
         },
         {
             "name": "pear/console_commandline",
-            "version": "v1.2.3",
+            "version": "v1.2.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Console_CommandLine.git",
-                "reference": "331b295d00c9fa2dae30fe14538d430d72d954c6"
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/331b295d00c9fa2dae30fe14538d430d72d954c6",
-                "reference": "331b295d00c9fa2dae30fe14538d430d72d954c6",
+                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/cce06166765c5da31f3e8c1acf42512c64344cdb",
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb",
                 "shasum": ""
             },
             "require": {
@@ -909,7 +940,7 @@
                 "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Console_CommandLine",
                 "source": "https://github.com/pear/Console_CommandLine"
             },
-            "time": "2020-04-16T15:04:15+00:00"
+            "time": "2021-11-15T19:53:25+00:00"
         },
         {
             "name": "pear/console_getopt",
@@ -3901,16 +3932,16 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.4.29",
+            "version": "v4.4.34",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a"
+                "reference": "2c309e258adeb9970229042be39b360d34986fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/3abcc4db06d4e776825eaa3ed8ad924d5bc7432a",
-                "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2c309e258adeb9970229042be39b360d34986fad",
+                "reference": "2c309e258adeb9970229042be39b360d34986fad",
                 "shasum": ""
             },
             "require": {
@@ -3952,7 +3983,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v4.4.29"
+                "source": "https://github.com/symfony/yaml/tree/v4.4.34"
             },
             "funding": [
                 {
@@ -3968,7 +3999,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-27T16:19:30+00:00"
+            "time": "2021-11-18T18:49:23+00:00"
         },
         {
             "name": "webmozart/assert",

roundcubemail-1.4.11.20.tar.gz/config/defaults.inc.php Changed

@@ -784,7 +784,7 @@
 // if in your system 0 quota means no limit set this option to true 
 $config['quota_zero_as_unlimited'] = false;
 
-// Make use of the built-in spell checker.
+// Make use of the built-in spell checker. It is based on GoogieSpell.
 $config['enable_spellcheck'] = false;
 
 // Enables spellchecker exceptions dictionary.
@@ -792,20 +792,17 @@
 $config['spellcheck_dictionary'] = false;
 
 // Set the spell checking engine. Possible values:
-// - 'googie'  - the default (also used for connecting to Nox Spell Server, see 'spellcheck_uri' setting)
+// - 'googie'  - requires 'spellcheck_uri' option to be set (also used for connecting to Nox Spell Server)
 // - 'pspell'  - requires the PHP Pspell module and aspell installed
 // - 'enchant' - requires the PHP Enchant module
 // - 'atd'     - install your own After the Deadline server or check with the people at http://www.afterthedeadline.com before using their API
-// Since Google shut down their public spell checking service, the default settings
-// connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
 // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
 $config['spellcheck_engine'] = 'googie';
 
 // For locally installed Nox Spell Server or After the Deadline services,
 // please specify the URI to call it.
-// Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or
-// the After the Deadline package from http://www.afterthedeadline.com.
-// Leave empty to use the public API of service.afterthedeadline.com
+// Get Nox Spell Server from https://github.com/handwritingio/nox_spell_server or
+// the After the Deadline package from http://www.afterthedeadline.com
 $config['spellcheck_uri'] = '';
 
 // These languages can be selected for spell checking.

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/composer.json Changed

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/database/SQL/mysql.initial.sql Changed

@@ -20,7 +20,7 @@
   INDEX `user_name_idx` (`user_id`, `name`),
   CONSTRAINT `fk_calendars_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `events` (
   `event_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -54,7 +54,7 @@
   INDEX `calendar_notify_idx` (`calendar_id`,`notifyat`),
   CONSTRAINT `fk_events_calendar_id` FOREIGN KEY (`calendar_id`)
     REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `attachments` (
   `attachment_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
@@ -66,7 +66,7 @@
   PRIMARY KEY(`attachment_id`),
   CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
     REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `itipinvitations` (
   `token` VARCHAR(64) NOT NULL,
@@ -79,6 +79,6 @@
   INDEX `uid_idx` (`user_id`,`event_uid`),
   CONSTRAINT `fk_itipinvitations_user_id` FOREIGN KEY (`user_id`)
     REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-REPLACE INTO `system` (`name`, `value`) VALUES ('calendar-database-version', '2015022700');
+REPLACE INTO `system` (`name`, `value`) VALUES ('calendar-database-version', '2021102600');

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/database/SQL/mysql/2021102600.sql Added

@@ -0,0 +1,24 @@
+-- changing table format and dropping foreign keys is needed for some versions of MySQL
+ALTER TABLE `calendars` DROP FOREIGN KEY `fk_calendars_user_id`;
+ALTER TABLE `events` DROP FOREIGN KEY`fk_events_calendar_id`;
+ALTER TABLE `attachments` DROP FOREIGN KEY`fk_attachments_event_id`;
+ALTER TABLE `itipinvitations` DROP FOREIGN KEY`fk_itipinvitations_user_id`;
+
+ALTER TABLE `calendars` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `events` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `attachments` ROW_FORMAT=DYNAMIC;
+ALTER TABLE `itipinvitations` ROW_FORMAT=DYNAMIC;
+
+ALTER TABLE `calendars` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `events` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `attachments` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ALTER TABLE `itipinvitations` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+ALTER TABLE `calendars` ADD CONSTRAINT `fk_calendars_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `events` ADD CONSTRAINT `fk_events_calendar_id` FOREIGN KEY (`calendar_id`)
+    REFERENCES `calendars`(`calendar_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `attachments` ADD CONSTRAINT `fk_attachments_event_id` FOREIGN KEY (`event_id`)
+    REFERENCES `events`(`event_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ALTER TABLE `itipinvitations` ADD CONSTRAINT `fk_itipinvitations_user_id` FOREIGN KEY (`user_id`)
+    REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/database/SQL/postgres.initial.sql Changed

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/database/SQL/postgres/2021102600.sql Added

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/database/SQL/sqlite.initial.sql Changed

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/database/SQL/sqlite/2021102600.sql Added

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/kolab/SQL/mysql.initial.sql Changed

roundcubemail-1.4.11.20.tar.gz/plugins/calendar/drivers/kolab/SQL/mysql/2021102600.sql Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_addressbook/composer.json Changed

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/LICENSE Added

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/composer.json Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/config.inc.php Added

@@ -0,0 +1,41 @@
+<?php
+
+/*
+  Mattermost integration.
+  -----------------------
+
+  0. Current implementation requires user credentials to be the same
+    as in the Kolab server. Thanks to this we can auto-login users.
+  1. It has to use the same domain, if it's using different we have to use a proxy:
+    Following Apache config worked for me with kolab_chat_url=https://kolab.example.com/mattermost
+
+    ProxyPreserveHost Off
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} (/mattermost)?/api/v[0-9]+/(users/)?websocket [NC,OR]
+    RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR]
+    RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
+    RewriteRule (/mattermost)?(/api/v[0-9]+/(users/)?websocket) ws://mattermost.example.com:8065$2 [P,QSA,L]
+    ProxyPass         /mattermost http://mattermost.example.com:8065
+
+    // replace Mattermost security headers allowing the webmail domain
+    Header set X-Frame-Options "allow-from https://webmail.example.com";
+    Header set Content-Security-Policy "frame-ancestors https://webmail.example.com";
+
+  2. Enabling CORS connections in Mattermost config: AllowCorsFrom:"webmail.example.com" (or "*")
+*/
+
+// Chat application name. For now only 'mattermost' is supported.
+$config['kolab_chat_driver'] = 'mattermost';
+
+// Chat application URL
+$config['kolab_chat_url'] = 'https://mattermost.example.com';
+
+// Optional chat application domain (for session cookies)
+$config['kolab_chat_session_domain'] = null;
+
+// Enables opening chat in a new window (or tab)
+$config['kolab_chat_extwin'] = false;
+
+// Default channel to select when opening the chat app.
+// Note: This has to be a channel ID.
+$config['kolab_chat_channel'] = null;

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/config.inc.php.dist Added

@@ -0,0 +1,41 @@
+<?php
+
+/*
+  Mattermost integration.
+  -----------------------
+
+  0. Current implementation requires user credentials to be the same
+    as in the Kolab server. Thanks to this we can auto-login users.
+  1. It has to use the same domain, if it's using different we have to use a proxy:
+    Following Apache config worked for me with kolab_chat_url=https://kolab.example.com/mattermost
+
+    ProxyPreserveHost Off
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} (/mattermost)?/api/v[0-9]+/(users/)?websocket [NC,OR]
+    RewriteCond %{HTTP:UPGRADE} ^WebSocket$ [NC,OR]
+    RewriteCond %{HTTP:CONNECTION} ^Upgrade$ [NC]
+    RewriteRule (/mattermost)?(/api/v[0-9]+/(users/)?websocket) ws://mattermost.example.com:8065$2 [P,QSA,L]
+    ProxyPass         /mattermost http://mattermost.example.com:8065
+
+    // replace Mattermost security headers allowing the webmail domain
+    Header set X-Frame-Options "allow-from https://webmail.example.com";
+    Header set Content-Security-Policy "frame-ancestors https://webmail.example.com";
+
+  2. Enabling CORS connections in Mattermost config: AllowCorsFrom:"webmail.example.com" (or "*")
+*/
+
+// Chat application name. For now only 'mattermost' is supported.
+$config['kolab_chat_driver'] = 'mattermost';
+
+// Chat application URL
+$config['kolab_chat_url'] = 'https://mattermost.example.com';
+
+// Optional chat application domain (for session cookies)
+$config['kolab_chat_session_domain'] = null;
+
+// Enables opening chat in a new window (or tab)
+$config['kolab_chat_extwin'] = false;
+
+// Default channel to select when opening the chat app.
+// Note: This has to be a channel ID.
+$config['kolab_chat_channel'] = null;

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/drivers Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/drivers/mattermost.php Added

@@ -0,0 +1,358 @@
+<?php
+
+/**
+ * Mattermost driver for Kolab Chat
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_chat_mattermost
+{
+    private $rc;
+    private $plugin;
+    private $token_valid = false;
+
+
+    /**
+     * Object constructor
+     *
+     * @param rcube_plugin $plugin Kolab_chat plugin object
+     */
+    public function __construct($plugin)
+    {
+        $this->rc     = rcube::get_instance();
+        $this->plugin = $plugin;
+    }
+
+    /**
+     * Returns location of the chat app
+     *
+     * @param bool $websocket Return websocket URL
+     *
+     * @return string The chat app location
+     */
+    public function url($websocket = false)
+    {
+        $url = rtrim($this->rc->config->get('kolab_chat_url'), '/');
+
+        if ($websocket) {
+            $url  = str_replace(array('http://', 'https://'), array('ws://', 'wss://'), $url);
+            $url .= '/api/v4/websocket';
+        }
+        else if ($this->rc->action == 'index' && $this->rc->task == 'kolab-chat') {
+            $channel = rcube_utils::get_input_value('_channel', rcube_utils::INPUT_GET);
+            if (empty($channel)) {
+                $channel = $this->rc->config->get('kolab_chat_channel');
+            }
+
+            if ($channel) {
+                $team = rcube_utils::get_input_value('_team', rcube_utils::INPUT_GET);
+                if (empty($team) && ($_channel = $this->get_channel($channel, true))) {
+                    $team = $_channel['team_name'];
+                }
+
+                if ($channel && $team) {
+                    $url .= '/' . urlencode($team) . '/channels/' . urlencode($channel);
+                }
+            }
+        }
+
+        return $url;
+    }
+
+    /**
+     * Add/register UI elements
+     */
+    public function ui()
+    {
+        if ($this->rc->task != 'kolab-chat') {
+            $this->plugin->include_script("js/mattermost.js");
+            $this->plugin->add_label('openchat', 'directmessage', 'mentionmessage');
+        }
+        else if ($this->get_token()) {
+            $this->setcookie('MMUSERID', $_SESSION['mattermost'][0]);
+            $this->setcookie('MMAUTHTOKEN', $_SESSION['mattermost'][1]);
+        }
+    }
+
+    /**
+     * Driver specific actions handler
+     */
+    public function action()
+    {
+        $result = array(
+            'url'     => $this->url(true),
+            'token'   => $this->get_token(),
+            'user_id' => $this->get_user_id(),
+        );
+
+        echo rcube_output::json_serialize($result);
+        exit;
+    }
+
+    /**
+     * Handler for preferences_list hook.
+     * Adds options blocks into Chat settings sections in Preferences.
+     *
+     * @param array &$p Hook parameters
+     */
+    public function preferences_list(&$p)
+    {
+        $no_override = array_flip((array) $this->rc->config->get('dont_override'));
+
+        if (!isset($no_override['kolab_chat_channel'])) {
+            $field_id = 'rcmfd_kolab_chat_channel';
+            $select   = new html_select(array('name' => '_kolab_chat_channel', 'id' => $field_id));
+
+            $select->add('---', '');
+            if ($channels = $this->get_channels_list()) {
+                foreach ($channels as $channel) {
+                    if ($channel['name'] && $channel['display_name']) {
+                        $select->add($channel['display_name'], $channel['id']);
+                    }
+                }
+            }
+
+            $p['blocks']['main']['options']['kolab_chat_channel'] = array(
+                'title'   => html::label($field_id, rcube::Q($this->plugin->gettext('defaultchannel'))),
+                'content' => $select->show($this->rc->config->get('kolab_chat_channel')),
+            );
+        }
+    }
+
+    /**
+     * Handler for preferences_save hook.
+     * Executed on Chat settings form submit.
+     *
+     * @param array &$p Hook parameters
+     */
+    public function preferences_save(&$p)
+    {
+        if (isset($_POST['_kolab_chat_channel'])) {
+            $p['prefs']['kolab_chat_channel'] = rcube_utils::get_input_value('_kolab_chat_channel', rcube_utils::INPUT_POST);
+        }
+    }
+
+    /**
+     * Returns the Mattermost session token
+     * Note: This works only if the user/pass is the same in Kolab and Mattermost
+     *
+     * @return string Session token
+     */
+    protected function get_token()
+    {
+        $user = $_SESSION['username'];
+        $pass = $this->rc->decrypt($_SESSION['password']);
+
+        // Use existing token if still valid
+        if (!empty($_SESSION['mattermost'])) {
+            $user_id = $_SESSION['mattermost'][0];
+            $token   = $_SESSION['mattermost'][1];
+
+            if ($this->token_valid) {
+                return $token;
+            }
+
+            try {
+                $request = $this->get_api_request('GET', '/users/me');
+                $request->setHeader('Authorization', "Bearer $token");
+
+                $response = $request->send();
+                $status   = $response->getStatus();
+
+                if ($status != 200) {
+                    $token = null;
+                }
+            }
+            catch (Exception $e) {
+                rcube::raise_error($e, true, false);
+                $token = null;
+            }
+        }
+
+        // Request a new session token
+        if (empty($token)) {
+            $request = $this->get_api_request('POST', '/users/login');
+            $request->setBody(json_encode(array(
+                    'login_id' => $user,
+                    'password' => $pass,
+            )));
+
+            // send request to the API, get token and user ID
+            try {
+                $response = $request->send();
+                $status   = $response->getStatus();

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/js Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/js/mattermost.js Added

@@ -0,0 +1,335 @@
+/**
+ * Mattermost driver
+ * Websocket code based on https://github.com/mattermost/mattermost-redux/master/client/websocket_client.js
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) 2015-2018, Kolab Systems AG <contact@kolabsys.com>
+ * Copyright (C) 2015-2018, Mattermost, Inc.
+ *
+ * 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/>.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+var MAX_WEBSOCKET_FAILS = 7;
+var MIN_WEBSOCKET_RETRY_TIME = 3000; // 3 sec
+var MAX_WEBSOCKET_RETRY_TIME = 300000; // 5 mins
+
+function MMWebSocketClient()
+{
+    var Socket;
+
+    this.conn = null;
+    this.connectionUrl = null;
+    this.token = null;
+    this.sequence = 1;
+    this.connectFailCount = 0;
+    this.eventCallback = null;
+    this.firstConnectCallback = null;
+    this.reconnectCallback = null;
+    this.errorCallback = null;
+    this.closeCallback = null;
+    this.connectingCallback = null;
+    this.dispatch = null;
+    this.getState = null;
+    this.stop = false;
+    this.platform = '';
+
+    this.initialize = function(token, dispatch, getState, opts)
+    {
+        var forceConnection = opts.forceConnection || true,
+            webSocketConnector = opts.webSocketConnector || WebSocket,
+            connectionUrl = opts.connectionUrl,
+            platform = opts.platform,
+            self = this;
+
+        if (platform) {
+            this.platform = platform;
+        }
+
+        if (forceConnection) {
+            this.stop = false;
+        }
+
+        return new Promise(function(resolve, reject) {
+            if (self.conn) {
+                resolve();
+                return;
+            }
+
+            if (connectionUrl == null) {
+                console.log('websocket must have connection url');
+                reject('websocket must have connection url');
+                return;
+            }
+
+            if (!dispatch) {
+                console.log('websocket must have a dispatch');
+                reject('websocket must have a dispatch');
+                return;
+            }
+
+            if (self.connectFailCount === 0) {
+                console.log('websocket connecting to ' + connectionUrl);
+            }
+
+            Socket = webSocketConnector;
+            if (self.connectingCallback) {
+                self.connectingCallback(dispatch, getState);
+            }
+
+            var regex = /^(?:https?|wss?):(?:\/\/)?[^/]*/;
+            var captured = (regex).exec(connectionUrl);
+            var origin;
+
+            if (captured) {
+                origin = captured[0];
+
+                if (platform === 'android') {
+                    // this is done cause for android having the port 80 or 443 will fail the connection
+                    // the websocket will append them
+                    var split = origin.split(':');
+                    var port = split[2];
+                    if (port === '80' || port === '443') {
+                        origin = split[0] + ':' + split[1];
+                    }
+                }
+            } else {
+                // If we're unable to set the origin header, the websocket won't connect, but the URL is likely malformed anyway
+                console.warn('websocket failed to parse origin from ' + connectionUrl);
+            }
+
+            self.conn = new Socket(connectionUrl, [], {headers: {origin}});
+            self.connectionUrl = connectionUrl;
+            self.token = token;
+            self.dispatch = dispatch;
+            self.getState = getState;
+
+            self.conn.onopen = function() {
+                if (token && platform !== 'android') {
+                    // we check for the platform as a workaround until we fix on the server that further authentications
+                    // are ignored
+                    self.sendMessage('authentication_challenge', {token});
+                }
+
+                if (self.connectFailCount > 0) {
+                    console.log('websocket re-established connection');
+                    if (self.reconnectCallback) {
+                        self.reconnectCallback(self.dispatch, self.getState);
+                    }
+                } else if (self.firstConnectCallback) {
+                    self.firstConnectCallback(self.dispatch, self.getState);
+                }
+
+                self.connectFailCount = 0;
+                resolve();
+            };
+
+            self.conn.onclose = function() {
+                self.conn = null;
+                self.sequence = 1;
+
+                if (self.connectFailCount === 0) {
+                    console.log('websocket closed');
+                }
+
+                self.connectFailCount++;
+
+                if (self.closeCallback) {
+                    self.closeCallback(self.connectFailCount, self.dispatch, self.getState);
+                }
+
+                var retryTime = MIN_WEBSOCKET_RETRY_TIME;
+
+                // If we've failed a bunch of connections then start backing off
+                if (self.connectFailCount > MAX_WEBSOCKET_FAILS) {
+                    retryTime = MIN_WEBSOCKET_RETRY_TIME * self.connectFailCount;
+                    if (retryTime > MAX_WEBSOCKET_RETRY_TIME) {
+                        retryTime = MAX_WEBSOCKET_RETRY_TIME;
+                    }
+                }
+
+                setTimeout(function() {
+                        if (self.stop) {
+                            return;
+                        }
+                        self.initialize(token, dispatch, getState, Object.assign({}, opts, {forceConnection: true}));
+                    },
+                    retryTime
+                );
+            };
+
+            self.conn.onerror = function(evt) {
+                if (self.connectFailCount <= 1) {
+                    console.log('websocket error');
+                    console.log(evt);
+                }
+
+                if (self.errorCallback) {
+                    self.errorCallback(evt, self.dispatch, self.getState);
+                }
+            };
+
+            self.conn.onmessage = function(evt) {
+                var msg = JSON.parse(evt.data);
+                if (msg.seq_reply) {
+                    if (msg.error) {
+                        console.warn(msg);
+                    }
+                } else if (self.eventCallback) {
+                    self.eventCallback(msg, self.dispatch, self.getState);
+                }
+            };
+        });

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/kolab_chat.php Added

@@ -0,0 +1,222 @@
+<?php
+
+/**
+ * Kolab Chat
+ *
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2014-2018, Kolab Systems AG <contact@kolabsys.com>
+ *
+ * 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/>.
+ */
+
+class kolab_chat extends rcube_plugin
+{
+    public $task = '^(?!login|logout).*$';
+
+    private $rc;
+    private $driver;
+
+
+    public function init()
+    {
+        $this->rc = rcube::get_instance();
+
+        $this->add_hook('startup', array($this, 'startup'));
+    }
+
+    /**
+     * Startup hook handler, initializes/enables Chat
+     */
+    public function startup($args)
+    {
+        // the files module can be enabled/disabled by the kolab_auth plugin
+        if ($this->rc->config->get('kolab_chat_disabled') || !$this->rc->config->get('kolab_chat_enabled', true)) {
+            return;
+        }
+
+        $this->load_config();
+
+        $extwin = $this->rc->config->get('kolab_chat_extwin');
+        $driver = $this->rc->config->get('kolab_chat_driver', 'mattermost');
+
+        if (!$driver || !file_exists(__DIR__ . "/drivers/$driver.php")) {
+            return;
+        }
+
+        // Load the driver
+        require_once __DIR__ . "/drivers/$driver.php";
+
+        $class_name = "kolab_chat_$driver";
+        $this->driver = new $class_name($this);
+
+        $this->add_texts('localization/');
+
+        // Register UI end-points
+        $this->register_task('kolab-chat');
+        $this->register_action('index', array($this, 'ui'));
+        $this->register_action('action', array($this, 'action'));
+
+        if ($this->rc->output->type == 'html' && !$this->rc->output->get_env('framed')) {
+            $this->include_stylesheet($this->local_skin_path() . '/kolab_chat.css');
+            $this->rc->output->set_env('kolab_chat_extwin', (bool) $extwin);
+            $this->rc->output->add_script(
+"rcmail.addEventListener('beforeswitch-task', function(p) {
+    if (p == 'kolab-chat' && rcmail.env.kolab_chat_extwin) {
+        rcmail.open_window('?_task=kolab-chat&redirect=1', false, false, true);
+        return false;
+    }
+});",
+                'foot'
+            );
+
+            $this->add_button(array(
+                    'command'    => 'kolab-chat',
+                    'class'      => 'button-chat',
+                    'classsel'   => 'button-chat button-selected',
+                    'innerclass' => 'button-inner',
+                    'label'      => 'kolab_chat.chat',
+                    'type'       => 'link',
+                ), 'taskbar');
+
+            $this->driver->ui();
+        }
+
+        if ($this->rc->output->type == 'html' && $args['task'] == 'settings') {
+            // add hooks for Chat settings
+            $this->add_hook('preferences_sections_list', array($this, 'preferences_sections_list'));
+            $this->add_hook('preferences_list', array($this, 'preferences_list'));
+            $this->add_hook('preferences_save', array($this, 'preferences_save')); 
+        }
+    }
+
+    /**
+     * Display chat iframe wrapped by Roundcube interface elements (taskmenu)
+     * or a dummy page with redirect to the chat app.
+     */
+    function ui()
+    {
+        $this->driver->ui();
+
+        $url = rcube::JQ($this->driver->url());
+
+        if (!empty($_GET['redirect'])) {
+            echo '<!DOCTYPE html><html><head>'
+                . '<meta http-equiv="refresh" content="0; url=' . $url . '">'
+                . '</head><body></body></html>';
+            exit;
+        }
+        else {
+            $this->rc->output->add_script(
+                "rcmail.addEventListener('init', function() {"
+                    . "rcmail.location_href('$url', rcmail.get_frame_window(rcmail.env.contentframe));"
+                . "});",
+                'foot'
+            );
+
+            $this->rc->output->send('kolab_chat.chat');
+        }
+    }
+
+    /**
+     * Handler for driver specific actions
+     */
+    function action()
+    {
+        $this->driver->action();
+    }
+
+    /**
+     * Handler for preferences_sections_list hook.
+     * Adds Chat settings section into preferences sections list.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_sections_list($p)
+    {
+        $p['list']['kolab-chat'] = array(
+            'id' => 'kolab-chat', 'section' => $this->gettext('chat'), 'class' => 'chat'
+        );
+
+        return $p;
+    }
+
+    /**
+     * Handler for preferences_list hook.
+     * Adds options blocks into Chat settings sections in Preferences.
+     *
+     * @param array Original parameters
+     *
+     * @return array Modified parameters
+     */
+    function preferences_list($p)
+    {
+        if ($p['section'] != 'kolab-chat') {
+            return $p;
+        }
+
+        $no_override = array_flip((array) $this->rc->config->get('dont_override'));
+
+        $p['blocks']['main']['name'] = $this->gettext('mainoptions');
+
+        if (!isset($no_override['kolab_chat_extwin'])) {
+            if (!$p['current']) {
+                $p['blocks']['main']['content'] = true;
+                return $p;
+            }
+
+            $field_id = 'rcmfd_kolab_chat_extwin';
+            $input    = new html_checkbox(array('name' => '_kolab_chat_extwin', 'id' => $field_id, 'value' => 1));
+
+            $p['blocks']['main']['options']['kolab_chat_extwin'] = array(
+                'title'   => html::label($field_id, rcube::Q($this->gettext('showinextwin'))),
+                'content' => $input->show($this->rc->config->get('kolab_chat_extwin') ? 1 : 0),
+            );
+        }
+
+        if ($p['current']) {
+            // update env flag in the parent window
+            $this->rc->output->command('parent.set_env', array('kolab_chat_extwin' => (bool) $this->rc->config->get('kolab_chat_extwin')));
+
+            // Add driver-specific options
+            $this->driver->preferences_list($p);
+        }
+
+        return $p;
+    }

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/de.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/en_US.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/es_AR.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/et_EE.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/fi_FI.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/pl.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/pl_PL.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/localization/ru_RU.inc Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/elastic Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/elastic/templates Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/elastic/templates/chat.html Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/larry Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/larry/images Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/larry/images/buttons.png Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/larry/kolab_chat.css Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/larry/templates Added

roundcubemail-1.4.11.20.tar.gz/plugins/kolab_chat/skins/larry/templates/chat.html Added

roundcubemail-1.4.11.20.tar.gz/plugins/libcalendaring/composer.json Changed

roundcubemail-1.4.11.20.tar.gz/plugins/libkolab/README Changed

roundcubemail-1.4.11.20.tar.gz/plugins/libkolab/SQL/mysql.initial.sql Changed

@@ -5,7 +5,7 @@
  * @licence GNU AGPL
  */
 
-/*!40014  SET FOREIGN_KEY_CHECKS=0 */;
+SET FOREIGN_KEY_CHECKS=0;
 
 DROP TABLE IF EXISTS `kolab_folders`;
 
@@ -19,7 +19,7 @@
   `objectcount` BIGINT DEFAULT NULL,
   PRIMARY KEY(`folder_id`),
   INDEX `resource_type` (`resource`, `type`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache`;
 
@@ -44,7 +44,7 @@
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `contact_type` (`folder_id`,`type`),
   INDEX `contact_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_event`;
 
@@ -63,7 +63,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `event_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_task`;
 
@@ -82,7 +82,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `task_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_journal`;
 
@@ -101,7 +101,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `journal_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_note`;
 
@@ -118,7 +118,7 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `note_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_file`;
 
@@ -137,7 +137,7 @@
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `folder_filename` (`folder_id`, `filename`),
   INDEX `file_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_configuration`;
 
@@ -156,7 +156,7 @@
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `configuration_type` (`folder_id`,`type`),
   INDEX `configuration_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
 DROP TABLE IF EXISTS `kolab_cache_freebusy`;
 
@@ -175,8 +175,8 @@
     REFERENCES `kolab_folders`(`folder_id`) ON DELETE CASCADE ON UPDATE CASCADE,
   PRIMARY KEY(`folder_id`,`msguid`),
   INDEX `freebusy_uid2msguid` (`folder_id`,`uid`,`msguid`)
-) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci */;
+) ROW_FORMAT=DYNAMIC ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
 
-/*!40014  SET FOREIGN_KEY_CHECKS=1 */;
+SET FOREIGN_KEY_CHECKS=1;
 
 REPLACE INTO `system` (`name`, `value`) VALUES ('libkolab-version', '2021101100');

roundcubemail-1.4.11.20.tar.gz/plugins/libkolab/composer.json Changed

roundcubemail-1.4.11.20.tar.gz/plugins/tasklist/composer.json Changed

roundcubemail-1.4.11.20.tar.gz/plugins/tasklist/drivers/database/SQL/mysql.initial.sql Changed

roundcubemail-1.4.11.20.tar.gz/plugins/tasklist/drivers/database/SQL/mysql/2021102600.sql Added

roundcubemail-1.4.11.20.tar.gz/program/lib/Roundcube/spellchecker/googie.php Changed

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

roundcubemail-1.4.11.20.tar.gz/vendor/composer/InstalledVersions.php Changed

@@ -24,8 +24,21 @@
  */
 class InstalledVersions
 {
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     */
     private static $installed;
+
+    /**
+     * @var bool|null
+     */
     private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     */
     private static $installedByVendor = array();
 
     /**
@@ -251,7 +264,7 @@
         if (null === self::$installed) {
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+            if (substr(__DIR__, -8, 1) !== 'C') {
                 self::$installed = include __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();
@@ -324,7 +337,7 @@
         if (null === self::$installed) {
             // only require the installed.php file if this file is loaded from its dumped location,
             // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937
-            if (substr(__DIR__, -8, 1) !== 'C' && is_file(__DIR__ . '/installed.php')) {
+            if (substr(__DIR__, -8, 1) !== 'C') {
                 self::$installed = require __DIR__ . '/installed.php';
             } else {
                 self::$installed = array();

roundcubemail-1.4.11.20.tar.gz/vendor/composer/LICENSE Changed

roundcubemail-1.4.11.20.tar.gz/vendor/composer/autoload_namespaces.php Changed

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

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

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

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit2c2ffc12864ff0f9d5c9c68f4ae4a4b7
+class ComposerStaticInit6ec73a1566ad3c1856b069108a08488e
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
@@ -218,8 +218,8 @@
         array (
             'Console' => 
             array (
-                0 => __DIR__ . '/..' . '/pear/console_commandline',
-                1 => __DIR__ . '/..' . '/pear/console_getopt',
+                0 => __DIR__ . '/..' . '/pear/console_getopt',
+                1 => __DIR__ . '/..' . '/pear/console_commandline',
             ),
             'Caxy\\HtmlDiff' => 
             array (
@@ -910,11 +910,11 @@
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit2c2ffc12864ff0f9d5c9c68f4ae4a4b7::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit2c2ffc12864ff0f9d5c9c68f4ae4a4b7::$prefixDirsPsr4;
-            $loader->prefixesPsr0 = ComposerStaticInit2c2ffc12864ff0f9d5c9c68f4ae4a4b7::$prefixesPsr0;
-            $loader->fallbackDirsPsr0 = ComposerStaticInit2c2ffc12864ff0f9d5c9c68f4ae4a4b7::$fallbackDirsPsr0;
-            $loader->classMap = ComposerStaticInit2c2ffc12864ff0f9d5c9c68f4ae4a4b7::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit6ec73a1566ad3c1856b069108a08488e::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit6ec73a1566ad3c1856b069108a08488e::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInit6ec73a1566ad3c1856b069108a08488e::$prefixesPsr0;
+            $loader->fallbackDirsPsr0 = ComposerStaticInit6ec73a1566ad3c1856b069108a08488e::$fallbackDirsPsr0;
+            $loader->classMap = ComposerStaticInit6ec73a1566ad3c1856b069108a08488e::$classMap;
 
         }, null, ClassLoader::class);
     }

roundcubemail-1.4.11.20.tar.gz/vendor/composer/include_paths.php Changed

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

@@ -302,12 +302,12 @@
         },
         {
             "name": "kolab/calendar",
-            "version": "3.5.9",
-            "version_normalized": "3.5.9.0",
+            "version": "3.5.10",
+            "version_normalized": "3.5.10.0",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/calendar",
-                "reference": "03453c200f7b846caadd86a28db659a39f004adb"
+                "reference": "45103d5bdee63f976c918f8cfcf20b400310bcb0"
             },
             "require": {
                 "kolab/libcalendaring": ">=3.4.0",
@@ -387,12 +387,12 @@
         },
         {
             "name": "kolab/kolab_addressbook",
-            "version": "3.5.6",
-            "version_normalized": "3.5.6.0",
+            "version": "3.5.10",
+            "version_normalized": "3.5.10.0",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/kolab_addressbook",
-                "reference": "e69f6f6d8b3a3d2c26455233fb9accf43fcea3d1"
+                "reference": "29195279f672640ffe38f70ddabe87b56172e889"
             },
             "require": {
                 "kolab/libkolab": ">=3.4.0",
@@ -425,6 +425,40 @@
             "install-path": "../../plugins/kolab_addressbook"
         },
         {
+            "name": "kolab/kolab_chat",
+            "version": "3.5.4",
+            "version_normalized": "3.5.4.0",
+            "dist": {
+                "type": "path",
+                "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/kolab_chat",
+                "reference": "b2f85fcb8324b9961dd02fb3e3acd92be33b558e"
+            },
+            "require": {
+                "kolab/libkolab": ">=3.4.0",
+                "php": ">=5.3.0",
+                "roundcube/plugin-installer": ">=0.1.3"
+            },
+            "type": "roundcube-plugin",
+            "installation-source": "dist",
+            "license": [
+                "AGPLv3"
+            ],
+            "authors": [
+                {
+                    "name": "Aleksander Machniak",
+                    "email": "machniak@kolabsys.com",
+                    "role": "Lead"
+                }
+            ],
+            "description": "Chat integration plugin",
+            "homepage": "https://git.kolab.org/diffusion/RPK/",
+            "transport-options": {
+                "symlink": false,
+                "relative": false
+            },
+            "install-path": "../../plugins/kolab_chat"
+        },
+        {
             "name": "kolab/kolab_config",
             "version": "3.4.0",
             "version_normalized": "3.4.0.0",
@@ -601,12 +635,12 @@
         },
         {
             "name": "kolab/libcalendaring",
-            "version": "3.5.9",
-            "version_normalized": "3.5.9.0",
+            "version": "3.5.10",
+            "version_normalized": "3.5.10.0",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/libcalendaring",
-                "reference": "e4df269b0381ce353d4e5bac5ee6367ec4bb958c"
+                "reference": "b9ab21ae1a5b134a06c66d55372712630171a590"
             },
             "require": {
                 "php": ">=5.4.0",
@@ -640,12 +674,12 @@
         },
         {
             "name": "kolab/libkolab",
-            "version": "3.5.9",
-            "version_normalized": "3.5.9.0",
+            "version": "3.5.10",
+            "version_normalized": "3.5.10.0",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/libkolab",
-                "reference": "b071295e155b5ddc0010c8087f5e3f63835adae7"
+                "reference": "a8abbba8039ee3bdde7be1b6758893aeff0287d8"
             },
             "require": {
                 "caxy/php-htmldiff": "~0.1.7",
@@ -746,12 +780,12 @@
         },
         {
             "name": "kolab/tasklist",
-            "version": "3.5.9",
-            "version_normalized": "3.5.9.0",
+            "version": "3.5.10",
+            "version_normalized": "3.5.10.0",
             "dist": {
                 "type": "path",
                 "url": "/tmp/roundcubemail-1.4.11.20/roundcubemail-plugins-kolab-latest/plugins/tasklist",
-                "reference": "b924690e0ff5ef23969492f6d0bbda42050f6cb0"
+                "reference": "7ae02f72964925d19fb244754f9d3e9b20af677c"
             },
             "require": {
                 "kolab/libcalendaring": ">=3.4.0",
@@ -1040,17 +1074,17 @@
         },
         {
             "name": "pear/console_commandline",
-            "version": "v1.2.3",
-            "version_normalized": "1.2.3.0",
+            "version": "v1.2.4",
+            "version_normalized": "1.2.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pear/Console_CommandLine.git",
-                "reference": "331b295d00c9fa2dae30fe14538d430d72d954c6"
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/331b295d00c9fa2dae30fe14538d430d72d954c6",
-                "reference": "331b295d00c9fa2dae30fe14538d430d72d954c6",
+                "url": "https://api.github.com/repos/pear/Console_CommandLine/zipball/cce06166765c5da31f3e8c1acf42512c64344cdb",
+                "reference": "cce06166765c5da31f3e8c1acf42512c64344cdb",
                 "shasum": ""
             },
             "require": {
@@ -1062,7 +1096,7 @@
             "require-dev": {
                 "phpunit/phpunit": "*"
             },
-            "time": "2020-04-16T15:04:15+00:00",
+            "time": "2021-11-15T19:53:25+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3537,17 +3571,17 @@
         },
         {
             "name": "symfony/yaml",
-            "version": "v4.4.29",
-            "version_normalized": "4.4.29.0",
+            "version": "v4.4.34",
+            "version_normalized": "4.4.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a"
+                "reference": "2c309e258adeb9970229042be39b360d34986fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/3abcc4db06d4e776825eaa3ed8ad924d5bc7432a",
-                "reference": "3abcc4db06d4e776825eaa3ed8ad924d5bc7432a",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2c309e258adeb9970229042be39b360d34986fad",
+                "reference": "2c309e258adeb9970229042be39b360d34986fad",
                 "shasum": ""
             },
             "require": {
@@ -3563,7 +3597,7 @@
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
             },
-            "time": "2021-07-27T16:19:30+00:00",
+            "time": "2021-11-18T18:49:23+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -3591,7 +3625,7 @@
             "description": "Loads and dumps YAML files",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/yaml/tree/v4.4.29"
+                "source": "https://github.com/symfony/yaml/tree/v4.4.34"
             },
             "funding": [
                 {

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

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '9dfa13f4dceb7892c0c648d25447d392f56dee9e',
+        'reference' => '4e1358b4dc1a8116357657ae5c8738e855aea85a',
         'name' => 'roundcube/roundcubemail',
         'dev' => true,
     ),
@@ -56,12 +56,12 @@
             'dev_requirement' => false,
         ),
         'kolab/calendar' => array(
-            'pretty_version' => '3.5.9',
-            'version' => '3.5.9.0',
+            'pretty_version' => '3.5.10',
+            'version' => '3.5.10.0',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/calendar',
             'aliases' => array(),
-            'reference' => '03453c200f7b846caadd86a28db659a39f004adb',
+            'reference' => '45103d5bdee63f976c918f8cfcf20b400310bcb0',
             'dev_requirement' => false,
         ),
         'kolab/kolab_activesync' => array(
@@ -74,12 +74,21 @@
             'dev_requirement' => false,
         ),
         'kolab/kolab_addressbook' => array(
-            'pretty_version' => '3.5.6',
-            'version' => '3.5.6.0',
+            'pretty_version' => '3.5.10',
+            'version' => '3.5.10.0',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/kolab_addressbook',
             'aliases' => array(),
-            'reference' => 'e69f6f6d8b3a3d2c26455233fb9accf43fcea3d1',
+            'reference' => '29195279f672640ffe38f70ddabe87b56172e889',
+            'dev_requirement' => false,
+        ),
+        'kolab/kolab_chat' => array(
+            'pretty_version' => '3.5.4',
+            'version' => '3.5.4.0',
+            'type' => 'roundcube-plugin',
+            'install_path' => __DIR__ . '/../../plugins/kolab_chat',
+            'aliases' => array(),
+            'reference' => 'b2f85fcb8324b9961dd02fb3e3acd92be33b558e',
             'dev_requirement' => false,
         ),
         'kolab/kolab_config' => array(
@@ -128,21 +137,21 @@
             'dev_requirement' => false,
         ),
         'kolab/libcalendaring' => array(
-            'pretty_version' => '3.5.9',
-            'version' => '3.5.9.0',
+            'pretty_version' => '3.5.10',
+            'version' => '3.5.10.0',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/libcalendaring',
             'aliases' => array(),
-            'reference' => 'e4df269b0381ce353d4e5bac5ee6367ec4bb958c',
+            'reference' => 'b9ab21ae1a5b134a06c66d55372712630171a590',
             'dev_requirement' => false,
         ),
         'kolab/libkolab' => array(
-            'pretty_version' => '3.5.9',
-            'version' => '3.5.9.0',
+            'pretty_version' => '3.5.10',
+            'version' => '3.5.10.0',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/libkolab',
             'aliases' => array(),
-            'reference' => 'b071295e155b5ddc0010c8087f5e3f63835adae7',
+            'reference' => 'a8abbba8039ee3bdde7be1b6758893aeff0287d8',
             'dev_requirement' => false,
         ),
         'kolab/odfviewer' => array(
@@ -164,12 +173,12 @@
             'dev_requirement' => false,
         ),
         'kolab/tasklist' => array(
-            'pretty_version' => '3.5.9',
-            'version' => '3.5.9.0',
+            'pretty_version' => '3.5.10',
+            'version' => '3.5.10.0',
             'type' => 'roundcube-plugin',
             'install_path' => __DIR__ . '/../../plugins/tasklist',
             'aliases' => array(),
-            'reference' => 'b924690e0ff5ef23969492f6d0bbda42050f6cb0',
+            'reference' => '7ae02f72964925d19fb244754f9d3e9b20af677c',
             'dev_requirement' => false,
         ),
         'kub-at/php-simple-html-dom-parser' => array(
@@ -212,12 +221,12 @@
             'dev_requirement' => false,
         ),
         'pear/console_commandline' => array(
-            'pretty_version' => 'v1.2.3',
-            'version' => '1.2.3.0',
+            'pretty_version' => 'v1.2.4',
+            'version' => '1.2.4.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pear/console_commandline',
             'aliases' => array(),
-            'reference' => '331b295d00c9fa2dae30fe14538d430d72d954c6',
+            'reference' => 'cce06166765c5da31f3e8c1acf42512c64344cdb',
             'dev_requirement' => false,
         ),
         'pear/console_getopt' => array(
@@ -433,7 +442,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '9dfa13f4dceb7892c0c648d25447d392f56dee9e',
+            'reference' => '4e1358b4dc1a8116357657ae5c8738e855aea85a',
             'dev_requirement' => false,
         ),
         'rsky/pear-core-min' => array(
@@ -587,12 +596,12 @@
             'dev_requirement' => true,
         ),
         'symfony/yaml' => array(
-            'pretty_version' => 'v4.4.29',
-            'version' => '4.4.29.0',
+            'pretty_version' => 'v4.4.34',
+            'version' => '4.4.34.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../symfony/yaml',
             'aliases' => array(),
-            'reference' => '3abcc4db06d4e776825eaa3ed8ad924d5bc7432a',
+            'reference' => '2c309e258adeb9970229042be39b360d34986fad',
             'dev_requirement' => true,
         ),
         'webmozart/assert' => array(

roundcubemail-1.4.11.20.tar.gz/vendor/pear/console_commandline/Console/CommandLine.php Changed

roundcubemail-1.4.11.20.tar.gz/vendor/pear/console_commandline/package.xml Deleted

@@ -1,637 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<package packagerversion="1.6.1" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
- <name>Console_CommandLine</name>
- <channel>pear.php.net</channel>
- <summary>A full featured command line options and arguments parser</summary>
- <description>Console_CommandLine is a full featured package for managing command-line 
-options and arguments highly inspired from python optparse module, it allows 
-the developer to easily build complex command line interfaces.
-
-Main features:
-  * handles sub commands (ie. $ myscript.php -q subcommand -f file),
-  * can be completely built from an xml definition file,
-  * generate --help and --version options automatically,
-  * can be completely customized,
-  * builtin support for i18n,
-  * and much more...</description>
- <lead>
-  <name>David JEAN LOUIS</name>
-  <user>izi</user>
-  <email>izimobil@gmail.com</email>
-  <active>yes</active>
- </lead>
- <lead>
-  <name>Richard Quadling</name>
-  <user>rquadling</user>
-  <email>rquadling@gmail.com</email>
-  <active>yes</active>
- </lead>
- <date>2016-07-14</date>
- <version>
-  <release>1.2.2</release>
-  <api>1.2.2</api>
- </version>
- <stability>
-  <release>stable</release>
-  <api>stable</api>
- </stability>
- <license uri="http://www.opensource.org/licenses/mit-license.html">MIT</license>
-
- <notes>
-  * Fix bug #21063: xmlschema.rng location does not work with composer [alec]
- </notes>
-
- <contents>
-  <dir baseinstalldir="" name="/">
-   <file name="Console/CommandLine/Action.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Argument.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Command.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/CustomMessageProvider.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Element.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Exception.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/MessageProvider.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Option.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Outputter.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Renderer.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Result.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/XmlParser.php" role="php">
-    <tasks:replace from="@data_dir@" to="data_dir" type="pear-config" />
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/Callback.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/Counter.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/Help.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/List.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/Password.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/StoreArray.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/StoreFalse.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/StoreFloat.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/StoreInt.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/StoreString.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/StoreTrue.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Action/Version.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/MessageProvider/Default.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Outputter/Default.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="Console/CommandLine/Renderer/Default.php" role="php">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="data/xmlschema.rng" role="data">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex1.php" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex2.php" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex2.xml" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex3.php" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex4.php" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex4.xml" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex5.php" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="docs/examples/ex5.xml" role="doc">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="tests/AllTests.php" role="test">
-    <tasks:replace from="@package_version@" to="version" type="package-info" />
-   </file>
-   <file name="tests/console_commandline_accept.phpt" role="test"/>
-   <file name="tests/console_commandline_addargument.phpt" role="test"/>
-   <file name="tests/console_commandline_addargument_2.phpt" role="test"/>
-   <file name="tests/console_commandline_addcommand.phpt" role="test"/>
-   <file name="tests/console_commandline_addcommand_2.phpt" role="test"/>
-   <file name="tests/console_commandline_addcommand_3.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_1.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_2.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_3.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_4.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_5.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_6.phpt" role="test"/>
-   <file name="tests/console_commandline_addoption_errors_7.phpt" role="test"/>
-   <file name="tests/console_commandline_bug18682.phpt" role="test"/>
-   <file name="tests/console_commandline_fromxmlfile.phpt" role="test"/>
-   <file name="tests/console_commandline_fromxmlfile_1.phpt" role="test"/>
-   <file name="tests/console_commandline_fromxmlfile_2.phpt" role="test"/>
-   <file name="tests/console_commandline_fromxmlfile_error.phpt" role="test"/>
-   <file name="tests/console_commandline_fromxmlstring.phpt" role="test"/>
-   <file name="tests/console_commandline_options_defaults.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_1.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_2.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_3.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_4.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_5.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_6.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_7.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_8.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_9.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_10.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_11.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_12.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_13.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_14.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_15.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_16.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_17.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_18.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_19.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_20.phpt" role="test"/>
-   <file name="tests/console_commandline_parse_21.phpt" role="test"/>

roundcubemail-1.4.11.20.tar.gz/vendor/symfony/yaml/Inline.php Changed

@@ -269,10 +269,11 @@
      *
      * @throws ParseException When malformed inline YAML string is parsed
      */
-    public static function parseScalar(string $scalar, int $flags = 0, array $delimiters = null, int &$i = 0, bool $evaluate = true, array &$references = [])
+    public static function parseScalar(string $scalar, int $flags = 0, array $delimiters = null, int &$i = 0, bool $evaluate = true, array &$references = [], bool &$isQuoted = null)
     {
         if (\in_array($scalar[$i], ['"', "'"])) {
             // quoted scalar
+            $isQuoted = true;
             $output = self::parseQuotedScalar($scalar, $i);
 
             if (null !== $delimiters) {
@@ -286,6 +287,8 @@
             }
         } else {
             // "normal" string
+            $isQuoted = false;
+
             if (!$delimiters) {
                 $output = substr($scalar, $i);
                 $i += \strlen($output);
@@ -308,7 +311,7 @@
             }
 
             if ($evaluate) {
-                $output = self::evaluateScalar($output, $flags, $references);
+                $output = self::evaluateScalar($output, $flags, $references, $isQuoted);
             }
         }
 
@@ -320,7 +323,7 @@
      *
      * @throws ParseException When malformed inline YAML string is parsed
      */
-    private static function parseQuotedScalar(string $scalar, int &$i): string
+    private static function parseQuotedScalar(string $scalar, int &$i = 0): string
     {
         if (!Parser::preg_match('/'.self::REGEX_QUOTED_STRING.'/Au', substr($scalar, $i), $match)) {
             throw new ParseException(sprintf('Malformed inline YAML string: "%s".', substr($scalar, $i)), self::$parsedLineNumber + 1, $scalar, self::$parsedFilename);
@@ -373,8 +376,7 @@
                     $value = self::parseMapping($sequence, $flags, $i, $references);
                     break;
                 default:
-                    $isQuoted = \in_array($sequence[$i], ['"', "'"]);
-                    $value = self::parseScalar($sequence, $flags, [',', ']'], $i, null === $tag, $references);
+                    $value = self::parseScalar($sequence, $flags, [',', ']'], $i, null === $tag, $references, $isQuoted);
 
                     // the value can be an array if a reference has been resolved to an array var
                     if (\is_string($value) && !$isQuoted && false !== strpos($value, ': ')) {
@@ -387,7 +389,7 @@
                         }
                     }
 
-                    if (\is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
+                    if (!$isQuoted && \is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
                         $references[$matches['ref']] = $matches['value'];
                         $value = $matches['value'];
                     }
@@ -521,7 +523,7 @@
                         }
                         break;
                     default:
-                        $value = self::parseScalar($mapping, $flags, [',', '}', "\n"], $i, null === $tag, $references);
+                        $value = self::parseScalar($mapping, $flags, [',', '}', "\n"], $i, null === $tag, $references, $isValueQuoted);
                         // Spec: Keys MUST be unique; first one wins.
                         // Parser cannot abort this mapping earlier, since lines
                         // are processed sequentially.
@@ -529,7 +531,7 @@
                         if ('<<' === $key) {
                             $output += $value;
                         } elseif ($allowOverwrite || !isset($output[$key])) {
-                            if (\is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
+                            if (!$isValueQuoted && \is_string($value) && '' !== $value && '&' === $value[0] && Parser::preg_match(Parser::REFERENCE_PATTERN, $value, $matches)) {
                                 $references[$matches['ref']] = $matches['value'];
                                 $value = $matches['value'];
                             }
@@ -560,8 +562,9 @@
      *
      * @throws ParseException when object parsing support was disabled and the parser detected a PHP object or when a reference could not be resolved
      */
-    private static function evaluateScalar(string $scalar, int $flags, array &$references = [])
+    private static function evaluateScalar(string $scalar, int $flags, array &$references = [], bool &$isQuotedString = null)
     {
+        $isQuotedString = false;
         $scalar = trim($scalar);
         $scalarLower = strtolower($scalar);
 
@@ -596,7 +599,14 @@
             case '!' === $scalar[0]:
                 switch (true) {
                     case 0 === strpos($scalar, '!!str '):
-                        return (string) substr($scalar, 6);
+                        $s = (string) substr($scalar, 6);
+
+                        if (\in_array($s[0] ?? '', ['"', "'"], true)) {
+                            $isQuotedString = true;
+                            $s = self::parseQuotedScalar($s);
+                        }
+
+                        return $s;
                     case 0 === strpos($scalar, '! '):
                         return substr($scalar, 2);
                     case 0 === strpos($scalar, '!php/object'):

Changes of Revision 2