Kolab Groupware OBS

roundcubemail.spec Changed

@@ -80,17 +80,13 @@
 Source106:      plesk.kolab_folders.inc.php
 Source107:      plesk.libkolab.inc.php
 Source108:      plesk.acl.inc.php
+Source109:      plesk.tasklist.inc.php
 
 Source200:      2017111400.sql
 
 Patch201:       default-configuration.patch
 Patch202:       roundcubemail-1.4-beta86-plugin-enigma-homedir.patch
-Patch203:       0001-Enigma-WOAT-Support-8626.patch
-Patch204:       0002-Update-changelog.patch
-Patch205:       0003-Introduce-optional-support-to-inject-PROXY-protocol-.patch
-Patch206:       0004-Use-rcube_utils-remote_addr-to-take-HTTP_X_FORWARDED.patch
-Patch207:       0005-Add-a-warning-regarding-implicit-ssl.patch
-Patch208:       0006-CS-fixes-update-changelog.patch
+Patch203:       0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.patch
 
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -310,6 +306,7 @@
 cp -vf %{SOURCE106} plugins/kolab_folders/config.inc.php.dist
 cp -vf %{SOURCE107} plugins/libkolab/config.inc.php.dist
 cp -vf %{SOURCE108} plugins/acl/config.inc.php.dist
+cp -vf %{SOURCE109} plugins/tasklist/config.inc.php.dist
 rm -rvf skins/kolab/ plugins/libkolab/skins/kolab/ public_html/assets/skins/kolab/
 %else
 rm -rvf skins/plesk/ plugins/libkolab/skins/plesk/ public_html/assets/skins/plesk/
@@ -320,12 +317,10 @@
 %if 0%{?plesk} < 1
 %patch202 -p1
 %endif
+
+%if 0%{?plesk} > 0 && 0%{?rhel} == 7
 %patch203 -p1
-%patch204 -p1
-%patch205 -p1
-%patch206 -p1
-%patch207 -p1
-%patch208 -p1
+%endif
 
 # Remove the results of patching when there's an incidental offset
 find . -type f -name "*.orig" | while read file; do
@@ -568,15 +563,19 @@
 
 %if 0%{?plesk} > 0 && 0%{?rhel} == 7
 php="/opt/plesk/php/7.4/bin/php"
+# Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
+${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+    --dir %{_datadir}/doc/roundcubemail-%{version}/SQL/ \
+    --package roundcube || : \
+    >/dev/null 2>&1
 %else
 php="/usr/bin/php"
-%endif
-
-# Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
 ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail/SQL/ \
     --package roundcube || : \
     >/dev/null 2>&1
+%endif
+
 
 for plugin in $(find /usr/share/roundcubemail/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
     if  ! -z "$(find ${plugin} -type d -name SQL)" ; then

0001-Enigma-WOAT-Support-8626.patch Deleted

@@ -1,240 +0,0 @@
-From 4f25da4f006bbf5bec15a88a08dca68df2bebdbe Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <cmollekopf@gmail.com>
-Date: Mon, 1 Aug 2022 11:51:32 +0200
-Subject: PATCH 1/6 Enigma: WOAT Support (#8626)
-
-* Enigma: WOAT Support
-* Fixed public key extraction from dns record
-
-Co-authored-by: Aleksander Machniak <alec@alec.pl>
-Co-authored-by: Christian Mollekopf <mollekopf@apheleia-it.ch>
----
- plugins/enigma/config.inc.php.dist      |  5 ++
- plugins/enigma/lib/enigma_engine.php    | 93 +++++++++++++++++++++++--
- plugins/enigma/lib/enigma_subkey.php    | 12 +++-
- program/lib/Roundcube/rcube_message.php | 10 +--
- 4 files changed, 108 insertions(+), 12 deletions(-)
-
-diff --git a/plugins/enigma/config.inc.php.dist b/plugins/enigma/config.inc.php.dist
-index a5a5233c2..d654c764d 100644
---- a/plugins/enigma/config.inc.php.dist
-+++ b/plugins/enigma/config.inc.php.dist
-@@ -78,3 +78,8 @@ $config'enigma_passwordless' = false;
- //     - enigma_options_lock = 'sign'
- //     - dont_override       = 'enigma_sign_all'
- $config'enigma_options_lock' = ;
-+
-+// Enable Kolab's Web Of Anti-Trust feature
-+// Fetches public keys from DNS. Default: false
-+// To enable set it to True or an array of domain names.
-+$config'enigma_woat' = false;
-diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
-index 113030db1..1717d41da 100644
---- a/plugins/enigma/lib/enigma_engine.php
-+++ b/plugins/enigma/lib/enigma_engine.php
-@@ -28,6 +28,7 @@ class enigma_engine
-     private $pgp_driver;
-     private $smime_driver;
-     private $password_time;
-+    private $sender;
-     private $cache = ;
- 
-     public $decryptions     = ;
-@@ -272,6 +273,9 @@ class enigma_engine
- 
-         $recipients = array_unique($recipients);
- 
-+        // Fetch keys from external sources, if configured
-+        $this->sync_keys($recipients);
-+
-         // find recipient public keys
-         foreach ((array) $recipients as $email) {
-             if ($email == $from && $sign_key) {
-@@ -380,6 +384,17 @@ class enigma_engine
-             return;
-         }
- 
-+        // Get the message/part sender
-+        if (!empty($p'object'->sender) && !empty($p'object'->sender'mailto')) {
-+            $this->sender = $p'object'->sender'mailto';
-+        }
-+        if (!empty($p'structure'->headers) && !empty($p'structure'->headers'from')) {
-+            $from = rcube_mime::decode_address_list($p'structure'->headers'from', 1, false);
-+            if (($from = current($from)) && !empty($from'mailto')) {
-+                $this->sender = $from'mailto';
-+            }
-+        }
-+
-         // Don't be tempted to support encryption in text/html parts
-         // Because of EFAIL vulnerability we should never support this (#6289)
- 
-@@ -881,6 +896,11 @@ class enigma_engine
-     {
-         // @TODO: Handle big bodies using (temp) files
- 
-+        // Import sender's key from external sources, if configured
-+        if ($this->sender) {
-+            $this->sync_keys($this->sender);
-+        }
-+
-         // Get rid of possible non-ascii characters (#5962)
-         $sig_body = preg_replace('/^\x00-\x7F/', '', $sig_body);
- 
-@@ -905,6 +925,11 @@ class enigma_engine
-     {
-         // @TODO: Handle big bodies using (temp) files
- 
-+        // Import sender's key from external sources, if configured
-+        if ($this->sender) {
-+            $this->sync_keys($this->sender);
-+        }
-+
-         // Get rid of possible non-ascii characters (#5962)
-         $msg_body = preg_replace('/^\x00-\x7F/', '', $msg_body);
- 
-@@ -1020,19 +1045,25 @@ class enigma_engine
-             return;
-         }
- 
--        $mode = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
--        $ret  = null;
-+        $mode  = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
-+        $found = ;
- 
-         // check key validity and type
-         foreach ($result as $key) {
-             if (($subkey = $key->find_subkey($email, $mode))
-                 && (!$can_sign || $key->get_type() == enigma_key::TYPE_KEYPAIR)
-             ) {
--                $ret = $key;
--                break;
-+                $found$subkey->get_creation_date(true) = $key;
-             }
-         }
- 
-+        // Use the most recent one
-+        if (count($found) > 1) {
-+            ksort($found, SORT_NUMERIC);
-+        }
-+
-+        $ret = count($found) > 0 ? array_pop($found) : null;
-+
-         // cache private key info for better performance
-         // we can skip one list_keys() call when signing and attaching a key
-         if ($can_sign) {
-@@ -1442,4 +1473,58 @@ class enigma_engine
-             );
-         }
-     }
-+
-+    /**
-+     * Import public keys from DNS according to Kolab Web-Of-Anti-Trust
-+     *
-+     * @param array $recipients List of email addresses
-+     */
-+    protected function sync_keys($recipients)
-+    {
-+        $import = ;
-+        $woat = $this->rc->config->get('enigma_woat');
-+
-+        if (empty($woat)) {
-+            return;
-+        }
-+
-+        foreach ($recipients as $recipient) {
-+            if (!strpos($recipient, '@')) {
-+                continue;
-+            }
-+
-+            list($local, $domain) = explode('@', $recipient);
-+
-+            // Do this for configured domains only
-+            if (is_array($woat) && !in_array_nocase($domain, $woat)) {
-+                continue;
-+            }
-+
-+            // remove parts behind a recipient delimiter ("jeroen+Trash" => "jeroen")
-+            $local = preg_replace('/\+.*$/', '', $local);
-+
-+            $fqdn = sha1($local) . '._woat.' . $domain;
-+
-+            // Fetch the TXT record(s)
-+            if (($records = dns_get_record($fqdn, DNS_TXT)) === false) {
-+                continue;
-+            }
-+
-+            foreach ($records as $record) {
-+                if (strpos($record'txt', 'v=woat1,') === 0) {
-+                    $entry = explode('public_key=', $record'txt');
-+                    if (count($entry) == 2) {
-+                        $import = $entry1;
-+                        // For now we support only one key
-+                        break;
-+                    }
-+                }
-+            }
-+        }
-+
-+        // Import the fetched keys
-+        if (!empty($import)) {
-+            $this->import_key(implode("\n", $import));
-+        }
-+    }
- }
-diff --git a/plugins/enigma/lib/enigma_subkey.php b/plugins/enigma/lib/enigma_subkey.php
-index ffdb3e8ce..014ab7de3 100644
---- a/plugins/enigma/lib/enigma_subkey.php
-+++ b/plugins/enigma/lib/enigma_subkey.php
-@@ -93,12 +93,18 @@ class enigma_subkey
-     /**
-      * Returns subkey creation date-time string
-      *
--     * @return string|null
-+     * @param bool $asInt Return the date as an integer
-+     *
-+     * @return string|null|int
-      */
--    function get_creation_date()
-+    function get_creation_date($asInt = false)
-     {

0001-On-mysql-5.6-191-bytes-length-is-the-best-we-can-do-.patch Added

@@ -0,0 +1,66 @@
+From 1afa0ac29bb2478ca527c68cc72825d11121c922 Mon Sep 17 00:00:00 2001
+From: Christian Mollekopf <mollekopf@apheleia-it.ch>
+Date: Mon, 20 Mar 2023 10:54:43 +0100
+Subject: PATCH On mysql 5.6 191 bytes length is the best we can do with
+ utf8mb4
+
+https://stackoverflow.com/questions/1814532/mysql-error-1071-specified-key-was-too-long-max-key-length-is-767-bytes
+
+These changes are only required on centos 7
+---
+ SQL/mysql/2020020101.sql | 16 +++++++++-------
+ SQL/mysql/2020091000.sql |  4 ++--
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/SQL/mysql/2020020101.sql b/SQL/mysql/2020020101.sql
+index 0a0402ba5..ec9620e93 100644
+--- a/SQL/mysql/2020020101.sql
++++ b/SQL/mysql/2020020101.sql
+@@ -26,6 +26,15 @@ ALTER TABLE `searches` ROW_FORMAT=DYNAMIC;
+ ALTER TABLE `filestore` ROW_FORMAT=DYNAMIC;
+ ALTER TABLE `system` ROW_FORMAT=DYNAMIC;
+ 
++
++ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
++ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
++ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(191) BINARY NOT NULL;
++ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
++ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
++ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(191) BINARY NOT NULL;
++
++
+ ALTER TABLE `session` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ ALTER TABLE `users` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ ALTER TABLE `cache` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+@@ -41,13 +50,6 @@ ALTER TABLE `searches` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_
+ ALTER TABLE `filestore` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ ALTER TABLE `system` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+ 
+-ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL;
+-ALTER TABLE `cache` CHANGE `cache_key` `cache_key` varchar(128) BINARY NOT NULL;
+-ALTER TABLE `cache_shared` CHANGE `cache_key` `cache_key` varchar(255) BINARY NOT NULL;
+-ALTER TABLE `cache_index` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
+-ALTER TABLE `cache_thread` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
+-ALTER TABLE `cache_messages` CHANGE `mailbox` `mailbox` varchar(255) BINARY NOT NULL;
+-
+ ALTER TABLE `cache`
+   ADD CONSTRAINT `user_id_fk_cache` FOREIGN KEY (`user_id`) REFERENCES `users` (`user_id`) ON DELETE CASCADE ON UPDATE CASCADE;
+ ALTER TABLE `cache_index`
+diff --git a/SQL/mysql/2020091000.sql b/SQL/mysql/2020091000.sql
+index aa098e35d..fd5698c35 100644
+--- a/SQL/mysql/2020091000.sql
++++ b/SQL/mysql/2020091000.sql
+@@ -1,8 +1,8 @@
+ CREATE TABLE `collected_addresses` (
+  `address_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
+- `name` varchar(255) NOT NULL DEFAULT '',
+- `email` varchar(255) NOT NULL,
++ `name` varchar(191) NOT NULL DEFAULT '',
++ `email` varchar(191) NOT NULL,
+  `user_id` int(10) UNSIGNED NOT NULL,
+  `type` int(10) UNSIGNED NOT NULL,
+  PRIMARY KEY(`address_id`),
+-- 
+2.39.2
+

0002-Update-changelog.patch Deleted

0003-Introduce-optional-support-to-inject-PROXY-protocol-.patch Deleted

@@ -1,153 +0,0 @@
-From 70e23efafae75b5604fd5206e64571cee59ba71a Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Thu, 14 Jul 2022 15:04:16 +0200
-Subject: PATCH 3/6 Introduce optional support to inject PROXY protocol
- headers after opening IMAP TCP streams.
-
-Version 1 (text based) and version 2 (binary) protocol header types are
-supported. Supports both IPv4 and IPv6 style headers.
-
-http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
----
- config/defaults.inc.php                      | 10 +++
- program/lib/Roundcube/rcube_imap_generic.php |  8 ++
- program/lib/Roundcube/rcube_utils.php        | 79 ++++++++++++++++++++
- 3 files changed, 97 insertions(+)
-
-diff --git a/config/defaults.inc.php b/config/defaults.inc.php
-index 018ad9af3..a6cd3b9a5 100644
---- a/config/defaults.inc.php
-+++ b/config/defaults.inc.php
-@@ -157,12 +157,22 @@ $config'imap_auth_type' = null;
- // IMAP socket context options
- // See http://php.net/manual/en/context.ssl.php
- // The example below enables server certificate validation
-+//
-+// proxy_protocol is used to inject HAproxy style headers in the TCP stream
-+// See http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
- //$config'imap_conn_options' = 
- //  'ssl'         => 
- //     'verify_peer'  => true,
- //     'verify_depth' => 3,
- //     'cafile'       => '/etc/openssl/certs/ca.crt',
- //   ,
-+//  'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
-+//       'version'       => 1 | 2, // required, if array
-+//       'remote_addr'   => $_SERVER'REMOTE_ADDR',
-+//       'remote_port'   => $_SERVER'REMOTE_PORT',
-+//       'local_addr'    => $_SERVER'SERVER_ADDR',
-+//       'local_port'    => $_SERVER'SERVER_PORT',
-+//   ,
- // ;
- // Note: These can be also specified as an array of options indexed by hostname
- $config'imap_conn_options' = null;
-diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php
-index 8f1285368..d2f5cf410 100644
---- a/program/lib/Roundcube/rcube_imap_generic.php
-+++ b/program/lib/Roundcube/rcube_imap_generic.php
-@@ -1070,6 +1070,14 @@ class rcube_imap_generic
-             return false;
-         }
- 
-+        // insert proxy protocol header, if enabled
-+        if (!empty($this->prefs'socket_options')) {
-+            $proxy_protocol_header = rcube_utils::proxy_protocol_header($this->prefs'socket_options', $this->fp);
-+            if (strlen($proxy_protocol_header) > 0) {
-+                fwrite($this->fp, $proxy_protocol_header);
-+            }
-+        }
-+        
-         if ($this->prefs'timeout' > 0) {
-             stream_set_timeout($this->fp, $this->prefs'timeout');
-         }
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index eb51f98ed..ec31fa11b 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -1645,4 +1645,83 @@ class rcube_utils
- 
-         return trim($subject);
-     }
-+
-+    /**
-+     * When proxy_protocol is configured for a connection type,
-+     * generate the HAproxy style PROXY protocol header for injection
-+     * into the TCP stream.
-+     * http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
-+     * 
-+     * PROXY protocol headers must be sent before any other data is sent on the TCP socket.
-+     *
-+     * @param array $conn_options preferences array which may contain proxy_protocol (generally {driver}_conn_options)
-+     *
-+     * @return string proxy protocol header data, if enabled, otherwise empty string
-+     */
-+    public static function proxy_protocol_header($conn_options = null)
-+    {
-+        if ($conn_options === null)
-+        {
-+            return "";
-+        }
-+        // verify that proxy_protocol option is present
-+        if (is_array($conn_options) && array_key_exists('proxy_protocol', $conn_options)) {
-+            if (is_array($conn_options'proxy_protocol')) {
-+                $proxy_protocol_version = $conn_options'proxy_protocol''version';
-+                $proxy_protocol_options = $conn_options'proxy_protocol';
-+            }
-+            else {
-+                $proxy_protocol_version = $conn_options'proxy_protocol';
-+                $proxy_protocol_options = null;
-+            }
-+
-+            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : $_SERVER'REMOTE_ADDR' );
-+            $proxy_protocol_remote_port = (array_key_exists('remote_port', $proxy_protocol_options) ? $proxy_protocol_options'remote_port' : $_SERVER'REMOTE_PORT' );
-+            $proxy_protocol_local_addr = (array_key_exists('local_addr' ,$proxy_protocol_options) ? $proxy_protocol_options'local_addr' : $_SERVER'SERVER_ADDR' );
-+            $proxy_protocol_local_port = (array_key_exists('local_port', $proxy_protocol_options) ? $proxy_protocol_options'local_port' : $_SERVER'SERVER_PORT' );
-+            $proxy_protocol_ip_version = (strpos($proxy_protocol_remote_addr, ":") === false ? 4 : 6);
-+
-+            if ($proxy_protocol_version === 1) {
-+                // text based PROXY protocol
-+
-+                // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
-+                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_remote_addr, ".") !== false) {
-+                    $proxy_protocol_remote_addr = inet_ntop(inet_pton($proxy_protocol_remote_addr));
-+                }
-+                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_local_addr, ".") !== false) {
-+                    $proxy_protocol_local_addr = inet_ntop(inet_pton($proxy_protocol_local_addr));
-+                }
-+
-+                $proxy_protocol_text = "PROXY " . // protocol header
-+                    ($proxy_protocol_ip_version === 6 ? "TCP6 " : "TCP4 ") . // IP version type
-+                    $proxy_protocol_remote_addr .
-+                    " " .
-+                    $proxy_protocol_local_addr .
-+                    " " .
-+                    $proxy_protocol_remote_port .
-+                    " " .
-+                    $proxy_protocol_local_port .
-+                    "\r\n";
-+                return $proxy_protocol_text;
-+            }
-+            else if ($proxy_protocol_version === 2) {
-+                // binary PROXY protocol
-+                $proxy_protocol_bin = pack("H*", "0D0A0D0A000D0A515549540A" . // protocol header
-+                    "21" . // protocol version and command
-+                    ($proxy_protocol_ip_version === 6 ? "2" : "1") . // IP version type
-+                    "1"); // TCP
-+                $proxy_protocol_addr = inet_pton($proxy_protocol_remote_addr) .
-+                    inet_pton($proxy_protocol_local_addr) .
-+                    pack("n", $proxy_protocol_remote_port) .
-+                    pack("n", $proxy_protocol_local_port);
-+                $proxy_protocol_bin .= pack("n", strlen($proxy_protocol_addr)) . $proxy_protocol_addr;
-+                return $proxy_protocol_bin;
-+            }
-+            else {
-+                // unknown proxy protocol version
-+                return "";
-+            }
-+        }
-+        return "";
-+    }
- }
--- 
-2.37.1
-

0004-Use-rcube_utils-remote_addr-to-take-HTTP_X_FORWARDED.patch Deleted

@@ -1,26 +0,0 @@
-From 9616178e5d8a62dca3cc77c1a287a29460530fe6 Mon Sep 17 00:00:00 2001
-From: Christian Mollekopf <mollekopf@apheleia-it.ch>
-Date: Thu, 21 Jul 2022 20:16:11 +0200
-Subject: PATCH 4/6 Use rcube_utils::remote_addr() to take
- HTTP_X_FORWARDED_FOR into account
-
----
- program/lib/Roundcube/rcube_utils.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index ec31fa11b..49eb1c06e 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -1675,7 +1675,7 @@ class rcube_utils
-                 $proxy_protocol_options = null;
-             }
- 
--            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : $_SERVER'REMOTE_ADDR' );
-+            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : self::remote_addr() );
-             $proxy_protocol_remote_port = (array_key_exists('remote_port', $proxy_protocol_options) ? $proxy_protocol_options'remote_port' : $_SERVER'REMOTE_PORT' );
-             $proxy_protocol_local_addr = (array_key_exists('local_addr' ,$proxy_protocol_options) ? $proxy_protocol_options'local_addr' : $_SERVER'SERVER_ADDR' );
-             $proxy_protocol_local_port = (array_key_exists('local_port', $proxy_protocol_options) ? $proxy_protocol_options'local_port' : $_SERVER'SERVER_PORT' );
--- 
-2.37.1
-

0005-Add-a-warning-regarding-implicit-ssl.patch Deleted

0006-CS-fixes-update-changelog.patch Deleted

@@ -1,195 +0,0 @@
-From b5b2e2043be22105987b369c935b259ea4421c73 Mon Sep 17 00:00:00 2001
-From: Aleksander Machniak <alec@alec.pl>
-Date: Mon, 1 Aug 2022 12:25:00 +0200
-Subject: PATCH 6/6 CS fixes, update changelog
-
----
- CHANGELOG.md                          |   1 +
- config/defaults.inc.php               |  26 +++---
- program/lib/Roundcube/rcube_utils.php | 109 +++++++++++---------------
- 3 files changed, 60 insertions(+), 76 deletions(-)
-
-diff --git a/CHANGELOG.md b/CHANGELOG.md
-index da04ede39..81c5d3572 100644
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -2,6 +2,7 @@
- 
- ## Release 1.5.3
- 
-+- Support for HAproxy protocol header in IMAP connections (#8625)
- - Enigma: Support Kolab's Web Of Anti-Trust feature (#8626)
- - Enigma: Fix initial synchronization of private keys
- - Enigma: Fix double quoted-printable encoding of pgp-signed messages with no attachments (#8413)
-diff --git a/config/defaults.inc.php b/config/defaults.inc.php
-index b25b419bf..ae1d1862d 100644
---- a/config/defaults.inc.php
-+++ b/config/defaults.inc.php
-@@ -163,19 +163,19 @@ $config'imap_auth_type' = null;
- // WARNING: Please note this is currently incompatible with implicit ssl,
- // since the proxy protocol preamble is expected before the ssl handshake.
- //$config'imap_conn_options' = 
--//  'ssl'         => 
--//     'verify_peer'  => true,
--//     'verify_depth' => 3,
--//     'cafile'       => '/etc/openssl/certs/ca.crt',
--//   ,
--//  'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
--//       'version'       => 1 | 2, // required, if array
--//       'remote_addr'   => $_SERVER'REMOTE_ADDR',
--//       'remote_port'   => $_SERVER'REMOTE_PORT',
--//       'local_addr'    => $_SERVER'SERVER_ADDR',
--//       'local_port'    => $_SERVER'SERVER_PORT',
--//   ,
--// ;
-+//    'ssl' => 
-+//        'verify_peer'  => true,
-+//        'verify_depth' => 3,
-+//        'cafile'       => '/etc/openssl/certs/ca.crt',
-+//    ,
-+//    'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
-+//        'version'       => 1 | 2, // required, if array
-+//        'remote_addr'   => $_SERVER'REMOTE_ADDR', // optional
-+//        'remote_port'   => $_SERVER'REMOTE_PORT', // optional
-+//        'local_addr'    => $_SERVER'SERVER_ADDR', // optional
-+//        'local_port'    => $_SERVER'SERVER_PORT', // optional
-+//    ,
-+//;
- // Note: These can be also specified as an array of options indexed by hostname
- $config'imap_conn_options' = null;
- 
-diff --git a/program/lib/Roundcube/rcube_utils.php b/program/lib/Roundcube/rcube_utils.php
-index 49eb1c06e..392c338c0 100644
---- a/program/lib/Roundcube/rcube_utils.php
-+++ b/program/lib/Roundcube/rcube_utils.php
-@@ -1647,81 +1647,64 @@ class rcube_utils
-     }
- 
-     /**
--     * When proxy_protocol is configured for a connection type,
--     * generate the HAproxy style PROXY protocol header for injection
--     * into the TCP stream.
-+     * Generates the HAproxy style PROXY protocol header for injection
-+     * into the TCP stream, if configured.
-+     *
-      * http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
-      * 
-      * PROXY protocol headers must be sent before any other data is sent on the TCP socket.
-      *
--     * @param array $conn_options preferences array which may contain proxy_protocol (generally {driver}_conn_options)
-+     * @param array $options Preferences array which may contain proxy_protocol (generally {driver}_conn_options)
-      *
--     * @return string proxy protocol header data, if enabled, otherwise empty string
-+     * @return string Proxy protocol header data, if enabled, otherwise empty string
-      */
--    public static function proxy_protocol_header($conn_options = null)
-+    public static function proxy_protocol_header($options = null)
-     {
--        if ($conn_options === null)
--        {
--            return "";
--        }
--        // verify that proxy_protocol option is present
--        if (is_array($conn_options) && array_key_exists('proxy_protocol', $conn_options)) {
--            if (is_array($conn_options'proxy_protocol')) {
--                $proxy_protocol_version = $conn_options'proxy_protocol''version';
--                $proxy_protocol_options = $conn_options'proxy_protocol';
--            }
--            else {
--                $proxy_protocol_version = $conn_options'proxy_protocol';
--                $proxy_protocol_options = null;
--            }
--
--            $proxy_protocol_remote_addr = (array_key_exists('remote_addr', $proxy_protocol_options) ? $proxy_protocol_options'remote_addr' : self::remote_addr() );
--            $proxy_protocol_remote_port = (array_key_exists('remote_port', $proxy_protocol_options) ? $proxy_protocol_options'remote_port' : $_SERVER'REMOTE_PORT' );
--            $proxy_protocol_local_addr = (array_key_exists('local_addr' ,$proxy_protocol_options) ? $proxy_protocol_options'local_addr' : $_SERVER'SERVER_ADDR' );
--            $proxy_protocol_local_port = (array_key_exists('local_port', $proxy_protocol_options) ? $proxy_protocol_options'local_port' : $_SERVER'SERVER_PORT' );
--            $proxy_protocol_ip_version = (strpos($proxy_protocol_remote_addr, ":") === false ? 4 : 6);
-+        if (empty($options) || !is_array($options) || !array_key_exists('proxy_protocol', $options)) {
-+            return '';
-+        }
- 
--            if ($proxy_protocol_version === 1) {
--                // text based PROXY protocol
-+        if (is_array($options'proxy_protocol')) {
-+            $version = $options'proxy_protocol''version';
-+            $options = $options'proxy_protocol';
-+        }
-+        else {
-+            $version = (int) $options'proxy_protocol';
-+            $options = ;
-+        }
- 
--                // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
--                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_remote_addr, ".") !== false) {
--                    $proxy_protocol_remote_addr = inet_ntop(inet_pton($proxy_protocol_remote_addr));
--                }
--                if ($proxy_protocol_ip_version === 6 && strpos($proxy_protocol_local_addr, ".") !== false) {
--                    $proxy_protocol_local_addr = inet_ntop(inet_pton($proxy_protocol_local_addr));
--                }
-+        $remote_addr = array_key_exists('remote_addr', $options) ? $options'remote_addr' : self::remote_addr();
-+        $remote_port = array_key_exists('remote_port', $options) ? $options'remote_port' : $_SERVER'REMOTE_PORT';
-+        $local_addr  = array_key_exists('local_addr', $options) ? $options'local_addr' : $_SERVER'SERVER_ADDR';
-+        $local_port  = array_key_exists('local_port', $options) ? $options'local_port' : $_SERVER'SERVER_PORT';
-+        $ip_version  = strpos($remote_addr, ':') === false ? 4 : 6;
- 
--                $proxy_protocol_text = "PROXY " . // protocol header
--                    ($proxy_protocol_ip_version === 6 ? "TCP6 " : "TCP4 ") . // IP version type
--                    $proxy_protocol_remote_addr .
--                    " " .
--                    $proxy_protocol_local_addr .
--                    " " .
--                    $proxy_protocol_remote_port .
--                    " " .
--                    $proxy_protocol_local_port .
--                    "\r\n";
--                return $proxy_protocol_text;
-+        // Text based PROXY protocol
-+        if ($version == 1) {
-+            // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
-+            if ($ip_version === 6 && strpos($remote_addr, '.') !== false) {
-+                $remote_addr = inet_ntop(inet_pton($remote_addr));
-             }
--            else if ($proxy_protocol_version === 2) {
--                // binary PROXY protocol
--                $proxy_protocol_bin = pack("H*", "0D0A0D0A000D0A515549540A" . // protocol header
--                    "21" . // protocol version and command
--                    ($proxy_protocol_ip_version === 6 ? "2" : "1") . // IP version type
--                    "1"); // TCP
--                $proxy_protocol_addr = inet_pton($proxy_protocol_remote_addr) .
--                    inet_pton($proxy_protocol_local_addr) .
--                    pack("n", $proxy_protocol_remote_port) .
--                    pack("n", $proxy_protocol_local_port);
--                $proxy_protocol_bin .= pack("n", strlen($proxy_protocol_addr)) . $proxy_protocol_addr;
--                return $proxy_protocol_bin;
--            }
--            else {
--                // unknown proxy protocol version
--                return "";
-+            if ($ip_version === 6 && strpos($local_addr, '.') !== false) {
-+                $local_addr = inet_ntop(inet_pton($local_addr));
-             }
-+
-+            return "PROXY TCP{$ip_version} {$remote_addr} {$local_addr} {$remote_port} {$local_port}\r\n";
-         }
--        return "";
-+
-+        // Binary PROXY protocol
-+        if ($version == 2) {
-+            $addr = inet_pton($remote_addr) . inet_pton($local_addr) . pack('n', $remote_port) . pack('n', $local_port);
-+            $head = implode(
-+                    '0D0A0D0A000D0A515549540A',     // protocol header
-+                    '21',                           // protocol version and command
-+                    $ip_version === 6 ? '2' : '1',  // IP version type
-+                    '1'                             // TCP
-+            );
-+
-+            return pack('H*', $head) . pack('n', strlen($addr)) . $addr;
-+        }
-+
-+        return '';
-     }
- }
--- 
-2.37.1
-

buildroundcubemailtarball.sh Changed

debian.series Changed

plesk.tasklist.inc.php Added

roundcubemail-1.5.3.tar.gz/CHANGELOG.md Changed

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

@@ -3731,16 +3731,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.0",
+            "version": "1.11.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                 "shasum": ""
             },
             "require": {
@@ -3778,7 +3778,7 @@
             ,
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
             },
             "funding": 
                 {
@@ -3786,7 +3786,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2022-03-03T13:19:32+00:00"
+            "time": "2023-03-08T13:26:56+00:00"
         },
         {
             "name": "phpcompatibility/php-compatibility",
@@ -4079,16 +4079,16 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.17",
+            "version": "1.10.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2"
+                "reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2",
-                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
+                "reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
                 "shasum": ""
             },
             "require": {
@@ -4118,7 +4118,7 @@
             ,
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.17"
+                "source": "https://github.com/phpstan/phpstan/tree/1.10.6"
             },
             "funding": 
                 {
@@ -4134,7 +4134,7 @@
                     "type": "tidelift"
                 }
             ,
-            "time": "2023-02-08T12:25:00+00:00"
+            "time": "2023-03-09T16:55:12+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
@@ -5120,16 +5120,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.1",
+            "version": "3.7.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
                 "shasum": ""
             },
             "require": {
@@ -5165,14 +5165,15 @@
             "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
             "keywords": 
                 "phpcs",
-                "standards"
+                "standards",
+                "static analysis"
             ,
             "support": {
                 "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
                 "source": "https://github.com/squizlabs/PHP_CodeSniffer",
                 "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
             },
-            "time": "2022-06-18T07:21:10+00:00"
+            "time": "2023-02-22T23:07:41+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",

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

@@ -157,13 +157,25 @@
 // IMAP socket context options
 // See http://php.net/manual/en/context.ssl.php
 // The example below enables server certificate validation
+//
+// proxy_protocol is used to inject HAproxy style headers in the TCP stream
+// See http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
+// WARNING: Please note this is currently incompatible with implicit ssl,
+// since the proxy protocol preamble is expected before the ssl handshake.
 //$config'imap_conn_options' = 
-//  'ssl'         => 
-//     'verify_peer'  => true,
-//     'verify_depth' => 3,
-//     'cafile'       => '/etc/openssl/certs/ca.crt',
-//   ,
-// ;
+//    'ssl' => 
+//        'verify_peer'  => true,
+//        'verify_depth' => 3,
+//        'cafile'       => '/etc/openssl/certs/ca.crt',
+//    ,
+//    'proxy_protocol' => 1 | 2 |  // required (either version number (1|2) or array with 'version' key)
+//        'version'       => 1 | 2, // required, if array
+//        'remote_addr'   => $_SERVER'REMOTE_ADDR', // optional
+//        'remote_port'   => $_SERVER'REMOTE_PORT', // optional
+//        'local_addr'    => $_SERVER'SERVER_ADDR', // optional
+//        'local_port'    => $_SERVER'SERVER_PORT', // optional
+//    ,
+//;
 // Note: These can be also specified as an array of options indexed by hostname
 $config'imap_conn_options' = null;

roundcubemail-1.5.3.tar.gz/logs/errors.log Deleted

@@ -1,102 +0,0 @@
-17-Feb-2023 10:46:24 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
-17-Feb-2023 10:46:24 UTC PHP Stack trace:
-17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
-17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
-17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:24 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'rcubeinitdb.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
-17-Feb-2023 10:46:24 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
-17-Feb-2023 10:46:24 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
-17-Feb-2023 10:46:24 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
-17-Feb-2023 10:46:24 UTC PHP Stack trace:
-17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
-17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
-17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:24 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
-17-Feb-2023 10:46:24 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
-17-Feb-2023 10:46:24 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
-17-Feb-2023 10:46:24 UTC PHP Stack trace:
-17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
-17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
-17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:24 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'rcubeinitdb.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
-17-Feb-2023 10:46:24 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
-17-Feb-2023 10:46:24 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
-17-Feb-2023 10:46:24 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
-17-Feb-2023 10:46:24 UTC PHP Stack trace:
-17-Feb-2023 10:46:24 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:0
-17-Feb-2023 10:46:24 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh:6
-17-Feb-2023 10:46:24 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:24 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:24 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
-17-Feb-2023 10:46:24 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
-17-Feb-2023 10:46:25 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
-17-Feb-2023 10:46:25 UTC PHP Stack trace:
-17-Feb-2023 10:46:25 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:0
-17-Feb-2023 10:46:25 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:23
-17-Feb-2023 10:46:25 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:25 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:25 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'install-jsdeps.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
-17-Feb-2023 10:46:25 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
-17-Feb-2023 10:46:25 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
-17-Feb-2023 10:46:25 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
-17-Feb-2023 10:46:25 UTC PHP Stack trace:
-17-Feb-2023 10:46:25 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:0
-17-Feb-2023 10:46:25 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/install-jsdeps.sh:23
-17-Feb-2023 10:46:25 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:25 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:25 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
-17-Feb-2023 10:46:25 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
-17-Feb-2023 10:46:39 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
-17-Feb-2023 10:46:39 UTC PHP Stack trace:
-17-Feb-2023 10:46:39 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
-17-Feb-2023 10:46:39 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
-17-Feb-2023 10:46:39 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:39 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:39 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
-17-Feb-2023 10:46:39 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
-17-Feb-2023 10:46:39 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
-17-Feb-2023 10:46:39 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
-17-Feb-2023 10:46:39 UTC PHP Stack trace:
-17-Feb-2023 10:46:39 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
-17-Feb-2023 10:46:39 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
-17-Feb-2023 10:46:39 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:39 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:39 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
-17-Feb-2023 10:46:39 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
-17-Feb-2023 10:46:41 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
-17-Feb-2023 10:46:41 UTC PHP Stack trace:
-17-Feb-2023 10:46:41 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
-17-Feb-2023 10:46:41 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
-17-Feb-2023 10:46:41 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:41 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:41 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
-17-Feb-2023 10:46:41 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
-17-Feb-2023 10:46:41 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
-17-Feb-2023 10:46:41 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
-17-Feb-2023 10:46:41 UTC PHP Stack trace:
-17-Feb-2023 10:46:41 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
-17-Feb-2023 10:46:41 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
-17-Feb-2023 10:46:41 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:41 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:41 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
-17-Feb-2023 10:46:41 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329
-17-Feb-2023 10:46:44 UTC PHP Deprecated:  substr(): Passing null to parameter #1 ($string) of type string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php on line 837
-17-Feb-2023 10:46:44 UTC PHP Stack trace:
-17-Feb-2023 10:46:44 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
-17-Feb-2023 10:46:44 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
-17-Feb-2023 10:46:44 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:44 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:44 UTC PHP   5. rcmail->set_user($user = class rcube_user { public $ID = NULL; public $data = NULL; public $language = NULL; public $prefs = ; private $db = class rcube_db_mysql { public $db_provider = 'mysql'; protected $db_dsnw = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnr = 'mysql://roundcube:@localhost/roundcubemail'; protected $db_dsnw_array = ...; protected $db_dsnr_array = ...; protected $db_connected = FALSE; protected $db_mode = NULL; protected $db_pconn = FALSE; protected $dbh = NULL; protected $dbhs = ...; protected $table_connections = ...; protected $db_error = FALSE; protected $db_error_msg = ''; protected $conn_failure = FALSE; protected $db_index = 0; protected $last_result = NULL; protected $tables = NULL; protected $variables = NULL; protected $options = ... }; private $rc = class rcmail { public $config = class rcube_config { ... }; public $db = class rcube_db_mysql { ... }; public $memcache = NULL; public $memcached = NULL; public $redis = NULL; public $session = NULL; public $smtp = NULL; public $storage = NULL; public $output = NULL; public $plugins = class rcube_plugin_api { ... }; public $user = ...; public $request_status = 0; protected $texts = NULL; protected $caches = ...; protected $shutdown_functions = ...; public $task = NULL; public $action = ''; public $comm_path = './'; public $filename = 'updatecss.sh'; public $default_skin = 'elastic'; public $login_error = NULL; public $oauth = NULL; private $address_books = ...; private $action_map = ...; private $action_args = ... }; private $identities = ; private $emails = NULL }) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:117
-17-Feb-2023 10:46:44 UTC PHP   6. rcube->language_prop($lang = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:201
-17-Feb-2023 10:46:44 UTC PHP   7. substr($string = NULL, $offset = 0, $length = 2) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/rcube.php:837
-17-Feb-2023 10:46:44 UTC PHP Deprecated:  preg_replace(): Passing null to parameter #3 ($subject) of type array|string is deprecated in /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php on line 329
-17-Feb-2023 10:46:44 UTC PHP Stack trace:
-17-Feb-2023 10:46:44 UTC PHP   1. {main}() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:0
-17-Feb-2023 10:46:44 UTC PHP   2. require_once() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/bin/updatecss.sh:22
-17-Feb-2023 10:46:44 UTC PHP   3. rcmail::get_instance($mode = *uninitialized*, $env = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/clisetup.php:30
-17-Feb-2023 10:46:44 UTC PHP   4. rcmail->startup() /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:86
-17-Feb-2023 10:46:44 UTC PHP   5. asciiwords($str = NULL, $css_id = *uninitialized*, $replace_with = *uninitialized*) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/include/rcmail.php:121
-17-Feb-2023 10:46:44 UTC PHP   6. preg_replace($pattern = '/^a-z0-9\\_\\-\\.+/i', $replacement = '', $subject = NULL) /tmp/roundcubemail-1.5.3/roundcubemail-1.5.3/program/lib/Roundcube/bootstrap.php:329

roundcubemail-1.5.3.tar.gz/phpstan.neon Deleted

roundcubemail-1.5.3.tar.gz/plugins/calendar/drivers/database/database_driver.php Changed

roundcubemail-1.5.3.tar.gz/plugins/enigma/config.inc.php.dist Changed

roundcubemail-1.5.3.tar.gz/plugins/enigma/lib/enigma_engine.php Changed

@@ -28,6 +28,7 @@
     private $pgp_driver;
     private $smime_driver;
     private $password_time;
+    private $sender;
     private $cache = ;
 
     public $decryptions     = ;
@@ -272,6 +273,9 @@
 
         $recipients = array_unique($recipients);
 
+        // Fetch keys from external sources, if configured
+        $this->sync_keys($recipients);
+
         // find recipient public keys
         foreach ((array) $recipients as $email) {
             if ($email == $from && $sign_key) {
@@ -380,6 +384,17 @@
             return;
         }
 
+        // Get the message/part sender
+        if (!empty($p'object'->sender) && !empty($p'object'->sender'mailto')) {
+            $this->sender = $p'object'->sender'mailto';
+        }
+        if (!empty($p'structure'->headers) && !empty($p'structure'->headers'from')) {
+            $from = rcube_mime::decode_address_list($p'structure'->headers'from', 1, false);
+            if (($from = current($from)) && !empty($from'mailto')) {
+                $this->sender = $from'mailto';
+            }
+        }
+
         // Don't be tempted to support encryption in text/html parts
         // Because of EFAIL vulnerability we should never support this (#6289)
 
@@ -881,6 +896,11 @@
     {
         // @TODO: Handle big bodies using (temp) files
 
+        // Import sender's key from external sources, if configured
+        if ($this->sender) {
+            $this->sync_keys($this->sender);
+        }
+
         // Get rid of possible non-ascii characters (#5962)
         $sig_body = preg_replace('/^\x00-\x7F/', '', $sig_body);
 
@@ -905,6 +925,11 @@
     {
         // @TODO: Handle big bodies using (temp) files
 
+        // Import sender's key from external sources, if configured
+        if ($this->sender) {
+            $this->sync_keys($this->sender);
+        }
+
         // Get rid of possible non-ascii characters (#5962)
         $msg_body = preg_replace('/^\x00-\x7F/', '', $msg_body);
 
@@ -1020,19 +1045,25 @@
             return;
         }
 
-        $mode = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
-        $ret  = null;
+        $mode  = $can_sign ? enigma_key::CAN_SIGN : enigma_key::CAN_ENCRYPT;
+        $found = ;
 
         // check key validity and type
         foreach ($result as $key) {
             if (($subkey = $key->find_subkey($email, $mode))
                 && (!$can_sign || $key->get_type() == enigma_key::TYPE_KEYPAIR)
             ) {
-                $ret = $key;
-                break;
+                $found$subkey->get_creation_date(true) = $key;
             }
         }
 
+        // Use the most recent one
+        if (count($found) > 1) {
+            ksort($found, SORT_NUMERIC);
+        }
+
+        $ret = count($found) > 0 ? array_pop($found) : null;
+
         // cache private key info for better performance
         // we can skip one list_keys() call when signing and attaching a key
         if ($can_sign) {
@@ -1442,4 +1473,58 @@
             );
         }
     }
+
+    /**
+     * Import public keys from DNS according to Kolab Web-Of-Anti-Trust
+     *
+     * @param array $recipients List of email addresses
+     */
+    protected function sync_keys($recipients)
+    {
+        $import = ;
+        $woat = $this->rc->config->get('enigma_woat');
+
+        if (empty($woat)) {
+            return;
+        }
+
+        foreach ($recipients as $recipient) {
+            if (!strpos($recipient, '@')) {
+                continue;
+            }
+
+            list($local, $domain) = explode('@', $recipient);
+
+            // Do this for configured domains only
+            if (is_array($woat) && !in_array_nocase($domain, $woat)) {
+                continue;
+            }
+
+            // remove parts behind a recipient delimiter ("jeroen+Trash" => "jeroen")
+            $local = preg_replace('/\+.*$/', '', $local);
+
+            $fqdn = sha1($local) . '._woat.' . $domain;
+
+            // Fetch the TXT record(s)
+            if (($records = dns_get_record($fqdn, DNS_TXT)) === false) {
+                continue;
+            }
+
+            foreach ($records as $record) {
+                if (strpos($record'txt', 'v=woat1,') === 0) {
+                    $entry = explode('public_key=', $record'txt');
+                    if (count($entry) == 2) {
+                        $import = $entry1;
+                        // For now we support only one key
+                        break;
+                    }
+                }
+            }
+        }
+
+        // Import the fetched keys
+        if (!empty($import)) {
+            $this->import_key(implode("\n", $import));
+        }
+    }
 }

roundcubemail-1.5.3.tar.gz/plugins/enigma/lib/enigma_subkey.php Changed

roundcubemail-1.5.3.tar.gz/program/include/rcmail.php Changed

@@ -300,27 +300,26 @@
      *                          - rcube_addressbook::TYPE_CONTACT (or 'sql') for the SQL addressbook
      *                          - rcube_addressbook::TYPE_DEFAULT for the default addressbook
      * @param bool   $writeable True if the address book needs to be writeable
-     * @param bool   $fallback  Fallback to the first existing source, if the configured default wasn't found
      *
      * @return rcube_contacts|null Address book object
      */
-    public function get_address_book($id, $writeable = false, $fallback = true)
+    public function get_address_book($id, $writeable = false)
     {
         $contacts    = null;
         $ldap_config = (array) $this->config->get('ldap_public');
         $default     = false;
 
-        $id = (string) $id;
-
         // 'sql' is the alias for '0' used by autocomplete
         if ($id == 'sql') {
-            $id = (string) rcube_addressbook::TYPE_CONTACT;
+            $id = rcube_addressbook::TYPE_CONTACT;
         }
-        else if ($id === strval(rcube_addressbook::TYPE_DEFAULT) || $id === '-1') { // -1 for BC
+        else if ($id == rcube_addressbook::TYPE_DEFAULT || $id == -1) { // -1 for BC
             $id = $this->config->get('default_addressbook');
             $default = true;
         }
 
+        $id = (string) $id;
+
         // use existing instance
         if (isset($this->address_books$id) && ($this->address_books$id instanceof rcube_addressbook)) {
             $contacts = $this->address_books$id;
@@ -353,13 +352,12 @@
 
         // Get first addressbook from the list if configured default doesn't exist
         // This can happen when user deleted the addressbook (e.g. Kolab folder)
-        if ($fallback && !$contacts && (!$id || $default)) {
+        if (!$contacts && (!$id || $default)) {
             $source = $this->get_address_sources($writeable, !$default);
             $source = reset($source);
 
             if (!empty($source)) {
-                // Note: No fallback here to prevent from an infinite loop
-                $contacts = $this->get_address_book($source'id', false, false);
+                $contacts = $this->get_address_book($source'id');
                 if ($contacts) {
                     $id = $source'id';
                 }
@@ -1532,7 +1530,7 @@
      * Convert the given date to a human readable form
      * This uses the date formatting properties from config
      *
-     * @param mixed  $date    Date representation (string, timestamp or DateTimeInterface)
+     * @param mixed  $date    Date representation (string, timestamp or DateTime object)
      * @param string $format  Date format to use
      * @param bool   $convert Enables date conversion according to user timezone
      *

roundcubemail-1.5.3.tar.gz/program/js/app.js Changed

@@ -1363,8 +1363,11 @@
           this.list_mailbox(this.env.mailbox, 1);
         }
         else if (s && this.task == 'addressbook') {
-          this.env.source = this.env.last_source || '';
-          this.env.group = this.env.last_group || '';
+          if (this.env.source == '') {
+            for (n in this.env.address_sources) break;
+            this.env.source = n;
+            this.env.group = '';
+          }
           this.list_contacts(this.env.source, this.env.group, 1);
         }
         break;
@@ -4264,7 +4267,7 @@
     var container = $(this.gui_objects.editform).find('.identity-encryption').first();
     var identity_email = $(this.gui_objects.editform).find('.ff_email').val().trim();
 
-    if (!container.length || !identity_email || !this.mailvelope_keyring.createKeyGenContainer)
+    if (!container.length || !identity_email || !this.mailvelope_keyring.createKeyGenContainer)
       return;
 
     var key_fingerprint;
@@ -6356,8 +6359,8 @@
     else if (!this.env.search_request)
       folder = group ? 'G'+src+group : src;
 
-    this.env.source = this.env.last_source = src;
-    this.env.group = this.env.last_group = group;
+    this.env.source = src;
+    this.env.group = group;
 
     // truncate groups listing stack
     $.each(this.env.address_group_stack, function(i, v) {

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/bootstrap.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube.php Changed

@@ -224,7 +224,7 @@
             $this->caches$name = rcube_cache::factory($type, $userid, $name, $ttl, $packed, $indexed);
         }
 
-        return $this->caches$name;
+        return $this->caches$name ?? null;
     }
 
     /**
@@ -727,8 +727,8 @@
      */
     public function read_localization($dir, $lang = null)
     {
-        if ($lang == null) {
-            $lang = $_SESSION'language';
+        if ($lang == null && isset($_SESSION)) {
+            $lang = $_SESSION'language' ?? null;
         }
         $langs  = array_unique('en_US', $lang);
         $locdir = slashify($dir);
@@ -833,7 +833,7 @@
             $lang = $rcube_language_aliases$lang;
         }
         // try the first two chars
-        else if (!isset($rcube_languages$lang)) {
+        else if ($lang && !isset($rcube_languages$lang)) {
             $short = substr($lang, 0, 2);
 
             // check if we have an alias for the short language code
@@ -968,7 +968,7 @@
     public function get_secure_url_token($generate = false)
     {
         if ($len = $this->config->get('use_secure_urls')) {
-            if (empty($_SESSION'secure_token') && $generate) {
+            if (empty($_SESSION'secure_token' ?? null) && $generate) {
                 // generate x characters long token
                 $length = $len > 1 ? $len : 16;
                 $token  = rcube_utils::random_bytes($length);
@@ -978,7 +978,7 @@
                 $_SESSION'secure_token' = $plugin'value';
             }
 
-            return $_SESSION'secure_token';
+            return $_SESSION'secure_token' ?? false;
         }
 
         return false;

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_db.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_imap_cache.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_imap_generic.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_ldap.php Changed

@@ -142,7 +142,7 @@
 
         // use fieldmap to advertise supported coltypes to the application
         foreach ($this->fieldmap as $colv => $lfv) {
-            list($col, $type) = explode(':', $colv);
+            list($col, $type) = array_pad(explode(':', $colv), 2, null);
             $params           = explode(':', $lfv);
 
             $lf    = array_shift($params);
@@ -164,7 +164,7 @@
                 }
             }
 
-            if (!is_array($this->coltypes$col)) {
+            if (!is_array($this->coltypes$col ?? null)) {
                 $subtypes = $type ? $type : null;
                 $this->coltypes$col = 'limit' => $limit, 'subtypes' => $subtypes, 'attributes' => $lf;
             }
@@ -227,7 +227,7 @@
         if (
             !empty($this->prop'LDAP_rdn')
             && !in_array($this->prop'LDAP_rdn', $this->prop'required_fields')
-            && !in_array($this->prop'LDAP_rdn', array_keys((array)$this->prop'autovalues'))
+            && !in_array($this->prop'LDAP_rdn', array_keys((array)($this->prop'autovalues' ?? )))
         ) {
             $this->prop'required_fields' = $this->prop'LDAP_rdn';
         }
@@ -315,12 +315,12 @@
             $conf  = $rcube->plugins->exec_hook('ldap_connected', $this->prop + 'host' => $host);
 
             $bind_pass   = $conf'bind_pass';
-            $bind_user   = $conf'bind_user';
+            $bind_user   = $conf'bind_user' ?? null;
             $bind_dn     = $conf'bind_dn';
-            $auth_method = $conf'auth_method';
+            $auth_method = $conf'auth_method' ?? null;
 
             $this->base_dn        = $conf'base_dn';
-            $this->groups_base_dn = $conf'groups''base_dn' ?: $this->base_dn;
+            $this->groups_base_dn = $conf'groups''base_dn' ?? $this->base_dn;
 
             // User specific access, generate the proper values to use.
             if (!empty($conf'user_specific')) {
@@ -641,7 +641,7 @@
         $last_row = $subset != 0 ? $start_row + abs($subset) : $last_row;
 
         // filter entries for this page
-        for ($i = $start_row; $i < min($entries'count', $last_row); $i++) {
+        for ($i = $start_row; $i < min($entries'count' ?? null, $last_row); $i++) {
             if (!empty($entries$i)) {
                 $this->result->add($this->_ldap2result($entries$i));
             }
@@ -1619,7 +1619,7 @@
 
         foreach ($fieldmap as $rf => $lf) {
             // we might be dealing with normalized and non-normalized data
-            $entry = $rec$lf;
+            $entry = $rec$lf ?? null;
             if (!is_array($entry) || !isset($entry'count')) {
                 $entry = (array) $entry;
                 $entry'count' = count($entry);
@@ -1630,7 +1630,7 @@
                     continue;
                 }
 
-                list($col, $subtype) = explode(':', $rf);
+                list($col, $subtype) = array_pad(explode(':', $rf), 2, null);
                 $out'_raw_attrib'$lf$i = $value;
 
                 if ($col == 'email' && $this->mail_domain && !strpos($value, '@')) {
@@ -1652,7 +1652,7 @@
             }
 
             // Make sure name fields aren't arrays (#1488108)
-            if (is_array($out$rf) && in_array($rf, 'name', 'surname', 'firstname', 'middlename', 'nickname')) {
+            if (is_array($out$rf ?? null) && in_array($rf, 'name', 'surname', 'firstname', 'middlename', 'nickname')) {
                 $out$rf = $out'_raw_attrib'$lf = $out$rf0;
             }
         }
@@ -1758,7 +1758,7 @@
             'pkcs9email'    => 'email',
         ;
 
-        list($name, $limit) = explode(':', $namev, 2);
+        list($name, $limit) = array_pad(explode(':', $namev, 2), 2, null);
         $suffix = $limit ? ':'.$limit : '';
         $name   = strtolower($name);
 
@@ -1877,8 +1877,8 @@
         $filter     = $this->prop'groups''filter';
         $scope      = $this->prop'groups''scope';
         $name_attr  = $this->prop'groups''name_attr';
-        $email_attr = $this->prop'groups''email_attr' ?: 'mail';
-        $sort_attrs = (array) ($this->prop'groups''sort' ? $this->prop'groups''sort' : $name_attr);
+        $email_attr = $this->prop'groups''email_attr' ?? 'mail';
+        $sort_attrs = (array) (($this->prop'groups''sort' ?? false) ? $this->prop'groups''sort' : $name_attr);
         $sort_attr  = $sort_attrs0;
         $page_size  = 200;
 
@@ -1895,7 +1895,7 @@
             $ldap->set_vlv_page($vlv_page+1, $page_size);
         }
 
-        $props = 'sort' => $this->prop'groups''sort';
+        $props = 'sort' => $this->prop'groups''sort' ?? null;
         $attrs = array_unique('dn', 'objectClass', $name_attr, $email_attr, $sort_attr);
 
         // add search filter

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_ldap_generic.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_message.php Changed

@@ -126,6 +126,11 @@
             )
         ;
 
+        $this->mime    = new rcube_mime($this->headers->charset);
+        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
+        $from          = $this->mime->decode_address_list($this->headers->from, 1);
+        $this->sender  = current($from);
+
         if (!empty($this->headers->structure)) {
             $this->get_mime_numbers($this->headers->structure);
             $this->parse_structure($this->headers->structure);
@@ -134,11 +139,6 @@
             $this->body = $this->storage->get_body($uid);
         }
 
-        $this->mime    = new rcube_mime($this->headers->charset);
-        $this->subject = str_replace("\n", '', $this->headers->get('subject'));
-        $from          = $this->mime->decode_address_list($this->headers->from, 1);
-        $this->sender  = current($from);
-
         // notify plugins and let them analyze this structured message object
         $this->app->plugins->exec_hook('message_load', 'object' => $this);
     }

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_plugin.php Changed

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_utils.php Changed

@@ -1645,4 +1645,66 @@
 
         return trim($subject);
     }
+
+    /**
+     * Generates the HAproxy style PROXY protocol header for injection
+     * into the TCP stream, if configured.
+     *
+     * http://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
+     * 
+     * PROXY protocol headers must be sent before any other data is sent on the TCP socket.
+     *
+     * @param array $options Preferences array which may contain proxy_protocol (generally {driver}_conn_options)
+     *
+     * @return string Proxy protocol header data, if enabled, otherwise empty string
+     */
+    public static function proxy_protocol_header($options = null)
+    {
+        if (empty($options) || !is_array($options) || !array_key_exists('proxy_protocol', $options)) {
+            return '';
+        }
+
+        if (is_array($options'proxy_protocol')) {
+            $version = $options'proxy_protocol''version';
+            $options = $options'proxy_protocol';
+        }
+        else {
+            $version = (int) $options'proxy_protocol';
+            $options = ;
+        }
+
+        $remote_addr = array_key_exists('remote_addr', $options) ? $options'remote_addr' : self::remote_addr();
+        $remote_port = array_key_exists('remote_port', $options) ? $options'remote_port' : $_SERVER'REMOTE_PORT';
+        $local_addr  = array_key_exists('local_addr', $options) ? $options'local_addr' : $_SERVER'SERVER_ADDR';
+        $local_port  = array_key_exists('local_port', $options) ? $options'local_port' : $_SERVER'SERVER_PORT';
+        $ip_version  = strpos($remote_addr, ':') === false ? 4 : 6;
+
+        // Text based PROXY protocol
+        if ($version == 1) {
+            // PROXY protocol does not support dual IPv6+IPv4 type addresses, e.g. ::127.0.0.1
+            if ($ip_version === 6 && strpos($remote_addr, '.') !== false) {
+                $remote_addr = inet_ntop(inet_pton($remote_addr));
+            }
+            if ($ip_version === 6 && strpos($local_addr, '.') !== false) {
+                $local_addr = inet_ntop(inet_pton($local_addr));
+            }
+
+            return "PROXY TCP{$ip_version} {$remote_addr} {$local_addr} {$remote_port} {$local_port}\r\n";
+        }
+
+        // Binary PROXY protocol
+        if ($version == 2) {
+            $addr = inet_pton($remote_addr) . inet_pton($local_addr) . pack('n', $remote_port) . pack('n', $local_port);
+            $head = implode(
+                    '0D0A0D0A000D0A515549540A',     // protocol header
+                    '21',                           // protocol version and command
+                    $ip_version === 6 ? '2' : '1',  // IP version type
+                    '1'                             // TCP
+            );
+
+            return pack('H*', $head) . pack('n', strlen($addr)) . $addr;
+        }
+
+        return '';
+    }
 }

roundcubemail-1.5.3.tar.gz/program/lib/Roundcube/rcube_vcard.php Changed

@@ -839,22 +839,17 @@
     {
         $vcard = '';
 
-        // Make sure FN is not empty (required by RFC2426)
-        if (empty($data'FN')) {
-            $data'FN' = !empty($data'EMAIL'00) ? $data'EMAIL'00 : '';
-        }
-
-        // Make sure N is not empty (required by RFC2426)
-        if (empty($data'N')) {
-            $data'N' = '', '', '', '', '';
-        }
+        foreach ((array)$data as $type => $entries) {
+            // valid N has 5 properties
+            while ($type == "N" && is_array($entries0) && count($entries0) < 5) {
+                $entries0 = "";
+            }
 
-        // Valid N has 5 properties
-        while (isset($data'N'0) && is_array($data'N'0) && count($data'N'0) < 5) {
-            $data'N'0 = '';
-        }
+            // make sure FN is not empty (required by RFC2426)
+            if ($type == "FN" && empty($entries) && !empty($data'EMAIL'00)) {
+                $entries0 = $data'EMAIL'00;
+            }
 
-        foreach ((array)$data as $type => $entries) {
             foreach ((array)$entries as $entry) {
                 $attr = '';
                 if (is_array($entry)) {
@@ -889,8 +884,8 @@
                     $value = $entry;
                 }
 
-                // Skip empty entries that aren't required by vCard v3 format
-                if (!in_array($type, 'N', 'FN') && self::is_empty($value)) {
+                // skip empty entries
+                if (self::is_empty($value)) {
                     continue;
                 }

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

roundcubemail-1.5.3.tar.gz/tests/Framework/VCard.php Changed

roundcubemail-1.5.3.tar.gz/tests/src/Csv2vcard/email.vcf Changed

roundcubemail-1.5.3.tar.gz/tests/src/Csv2vcard/outlook.vcf Changed

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

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

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

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

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

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

@@ -1409,17 +1409,17 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.11.0",
-            "version_normalized": "1.11.0.0",
+            "version": "1.11.1",
+            "version_normalized": "1.11.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
-                "reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
+                "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c",
                 "shasum": ""
             },
             "require": {
@@ -1434,7 +1434,7 @@
                 "doctrine/common": "^2.13.3 || ^3.2.2",
                 "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
             },
-            "time": "2022-03-03T13:19:32+00:00",
+            "time": "2023-03-08T13:26:56+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -1459,7 +1459,7 @@
             ,
             "support": {
                 "issues": "https://github.com/myclabs/DeepCopy/issues",
-                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1"
             },
             "funding": 
                 {
@@ -2574,17 +2574,17 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "1.9.17",
-            "version_normalized": "1.9.17.0",
+            "version": "1.10.6",
+            "version_normalized": "1.10.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpstan.git",
-                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2"
+                "reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/204e459e7822f2c586463029f5ecec31bb45a1f2",
-                "reference": "204e459e7822f2c586463029f5ecec31bb45a1f2",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
+                "reference": "50d089a3e0904b0fe7e2cf2d4fd37d427d64235a",
                 "shasum": ""
             },
             "require": {
@@ -2593,7 +2593,7 @@
             "conflict": {
                 "phpstan/phpstan-shim": "*"
             },
-            "time": "2023-02-08T12:25:00+00:00",
+            "time": "2023-03-09T16:55:12+00:00",
             "bin": 
                 "phpstan",
                 "phpstan.phar"
@@ -2616,7 +2616,7 @@
             ,
             "support": {
                 "issues": "https://github.com/phpstan/phpstan/issues",
-                "source": "https://github.com/phpstan/phpstan/tree/1.9.17"
+                "source": "https://github.com/phpstan/phpstan/tree/1.10.6"
             },
             "funding": 
                 {
@@ -4466,17 +4466,17 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.7.1",
-            "version_normalized": "3.7.1.0",
+            "version": "3.7.2",
+            "version_normalized": "3.7.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619"
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/1359e176e9307e906dc3d890bcc9603ff6d90619",
-                "reference": "1359e176e9307e906dc3d890bcc9603ff6d90619",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/ed8e00df0a83aa96acf703f8c2979ff33341f879",
+                "reference": "ed8e00df0a83aa96acf703f8c2979ff33341f879",
                 "shasum": ""
             },
             "require": {
@@ -4488,7 +4488,7 @@
             "require-dev": {
                 "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0"
             },
-            "time": "2022-06-18T07:21:10+00:00",
+            "time": "2023-02-22T23:07:41+00:00",
             "bin": 
                 "bin/phpcs",
                 "bin/phpcbf"
@@ -4514,7 +4514,8 @@
             "homepage": "https://github.com/squizlabs/PHP_CodeSniffer",
             "keywords": 
                 "phpcs",
-                "standards"
+                "standards",
+                "static analysis"
             ,
             "support": {
                 "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",

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

@@ -5,7 +5,7 @@
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'a30206bf6a3cb0f96e197802163399e82f0e44fc',
+        'reference' => 'b44757095937053c70ab52c94853b79035c65434',
         'name' => 'roundcube/roundcubemail',
         'dev' => true,
     ),
@@ -254,12 +254,12 @@
             'dev_requirement' => false,
         ),
         'myclabs/deep-copy' => array(
-            'pretty_version' => '1.11.0',
-            'version' => '1.11.0.0',
+            'pretty_version' => '1.11.1',
+            'version' => '1.11.1.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../myclabs/deep-copy',
             'aliases' => array(),
-            'reference' => '14daed4296fae74d9e3201d2c4925d1acb7aa614',
+            'reference' => '7284c22080590fb39f2ffa3e9057f10a4ddd0e0c',
             'dev_requirement' => true,
         ),
         'pear/auth_sasl' => array(
@@ -425,12 +425,12 @@
             'dev_requirement' => true,
         ),
         'phpstan/phpstan' => array(
-            'pretty_version' => '1.9.17',
-            'version' => '1.9.17.0',
+            'pretty_version' => '1.10.6',
+            'version' => '1.10.6.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../phpstan/phpstan',
             'aliases' => array(),
-            'reference' => '204e459e7822f2c586463029f5ecec31bb45a1f2',
+            'reference' => '50d089a3e0904b0fe7e2cf2d4fd37d427d64235a',
             'dev_requirement' => true,
         ),
         'phpunit/php-code-coverage' => array(
@@ -544,7 +544,7 @@
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'a30206bf6a3cb0f96e197802163399e82f0e44fc',
+            'reference' => 'b44757095937053c70ab52c94853b79035c65434',
             'dev_requirement' => false,
         ),
         'roundcube/rtf-html-php' => array(
@@ -716,12 +716,12 @@
             'dev_requirement' => false,
         ),
         'squizlabs/php_codesniffer' => array(
-            'pretty_version' => '3.7.1',
-            'version' => '3.7.1.0',
+            'pretty_version' => '3.7.2',
+            'version' => '3.7.2.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../squizlabs/php_codesniffer',
             'aliases' => array(),
-            'reference' => '1359e176e9307e906dc3d890bcc9603ff6d90619',
+            'reference' => 'ed8e00df0a83aa96acf703f8c2979ff33341f879',
             'dev_requirement' => true,
         ),
         'symfony/polyfill-ctype' => array(

roundcubemail-1.5.3.tar.gz/vendor/myclabs/deep-copy/README.md Changed

@@ -186,6 +186,9 @@
 - `DeepCopy\Filter` applies a transformation to the object attribute matched by `DeepCopy\Matcher`
 - `DeepCopy\TypeFilter` applies a transformation to any element matched by `DeepCopy\TypeMatcher`
 
+By design, matching a filter will stop the chain of filters (i.e. the next ones will not be applied).
+Using the (`ChainableFilter`(#chainablefilter-filter)) won't stop the chain of filters.
+
 
 #### `SetNullFilter` (filter)
 
@@ -226,6 +229,34 @@
 ```
 
 
+#### `ChainableFilter` (filter)
+
+If you use cloning on proxy classes, you might want to apply two filters for:
+1. loading the data
+2. applying a transformation
+
+You can use the `ChainableFilter` as a decorator of the proxy loader filter, which won't stop the chain of filters (i.e. 
+the next ones may be applied).
+
+
+```php
+use DeepCopy\DeepCopy;
+use DeepCopy\Filter\ChainableFilter;
+use DeepCopy\Filter\Doctrine\DoctrineProxyFilter;
+use DeepCopy\Filter\SetNullFilter;
+use DeepCopy\Matcher\Doctrine\DoctrineProxyMatcher;
+use DeepCopy\Matcher\PropertyNameMatcher;
+
+$copier = new DeepCopy();
+$copier->addFilter(new ChainableFilter(new DoctrineProxyFilter()), new DoctrineProxyMatcher());
+$copier->addFilter(new SetNullFilter(), new PropertyNameMatcher('id'));
+
+$copy = $copier->copy($object);
+
+echo $copy->id; // null
+```
+
+
 #### `DoctrineCollectionFilter` (filter)
 
 If you use Doctrine and want to copy an entity, you will need to use the `DoctrineCollectionFilter`:
@@ -268,6 +299,8 @@
 You can use the `DoctrineProxyFilter` to load the actual entity behind the Doctrine proxy class.
 **Make sure, though, to put this as one of your very first filters in the filter chain so that the entity is loaded
 before other filters are applied!**
+We recommend to decorate the `DoctrineProxyFilter` with the `ChainableFilter` to allow applying other filters to the
+cloned lazy loaded entities.
 
 ```php
 use DeepCopy\DeepCopy;
@@ -275,7 +308,7 @@
 use DeepCopy\Matcher\Doctrine\DoctrineProxyMatcher;
 
 $copier = new DeepCopy();
-$copier->addFilter(new DoctrineProxyFilter(), new DoctrineProxyMatcher());
+$copier->addFilter(new ChainableFilter(new DoctrineProxyFilter()), new DoctrineProxyMatcher());
 
 $copy = $copier->copy($object);

roundcubemail-1.5.3.tar.gz/vendor/myclabs/deep-copy/src/DeepCopy/DeepCopy.php Changed

roundcubemail-1.5.3.tar.gz/vendor/myclabs/deep-copy/src/DeepCopy/Filter/ChainableFilter.php Added

roundcubemail-1.5.3.tar.gz/vendor/phpstan/phpstan/README.md Changed

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

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

@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNATURE-----
 
-iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmPjlIQACgkQzxoQjQ56
-5yB1xQ/+Kz+VRo1rx8OsL3lOZhbmGalg8QC1+r9SfoBI2jxi/IqG4olCH1b9yXiE
-xaJU9xC5H+258a1JtfeUszm0zXgt/CHIHSVq3VAMlEajMbOHDSy7i9GrRA9OmG0H
-5AbwB9tql4qZ0cj1SriS2j8VolUjb1C1aSJNAwMbBWbd1QlZqGLJLgo0rvVnN71h
-kK5aYSZzV6XcbrJpNwWNjI9KNhbSlwHfWvsl2oW7Pl/ydyaWY+ZmL+i9MOT+TAuu
-jJFzKY98HQk3ESOpRn2wg0tKU9qzzl5d5/3P03iY/o0VCHnj8aNSdXy+6aBS81n4
-KPvBRclcwsncmBB4HNZxOpExVR2flaUM21ebSnmVv7Zofjcl/W+h49lrEAWFBjgy
-PkdAjlKSPOUYgqSSftKitDHFXtNOYi+qNot0gPEcDezWVOwWY/UorqL0V/PQp4bI
-SCKnkgw4SWDFGFY3R/m7qet0oomOvp6sTJZb/B37GZ6l9KKu4lXLsS8XRXmCGzTW
-Wu/taFkP35LYDQ9Y+HNzYXzNKFalCbJNj1Qdx31OvthBfK3/Jk0gG1YRrE3+0sAa
-J3qJX4nC/Zm7oK9wj5CvKMTS9tewbOBLgYNF1JuI2dlrhnc0VZXCdvg3M8SjI1zH
-5752T9NuxK5ot1i7TPcPHj8ln4t35aUT8c0f9S7ruFS0icobdyE=
-=SwMZ
+iQIzBAABCgAdFiEE0yaA1ZV9xxFr4pwUzxoQjQ565yAFAmQKD1cACgkQzxoQjQ56
+5yDePQ//ZtI/AKKhBlTvj6I6mw69TBuVi/7y+uU0CyrgKodCJlBCvprybXS2GItU
+rh2rMrX75IGOx8tEBs/6Ec5BuPF5rIQZdPndsYzT+sH8hBCLCQ/SlgtE/bZ7CIjr
+/WBkTjXd+T2lGmIe1e57rxNUiy+tgWlEa/mf963lY5Oy5zfuui6HEVzEofGtdq3c
+l9FSx+9pVX4rCHKZzCy1lNuh3xdHEYS52mMCsYuuOo0GZ9e1cqFBj4VwF9WkLlr5
+oEvJanpJx32YcYOkhD1tE5N/3Gxtw1AZMSq4onJvts8YyqGA2q7uTDdRmW2yyiB7
+DgPFrfE2rNGCymU6n04hPhKyMIBk8nJB89qYtInIzbpm7+xPRrt6pKWFGIvAXeNx
+qDHM3H+efvDadXl47z3aJLsgXxnefI6VJjXJF28mxEmwtm9Jt6tNvzEz+FHDgM11
+xat1m+oREXArPNA7cDTu5IIQY0BomKKc6H8X/X5OtKoVj0xoXbu/tfLVIJ8XYech
+oAc+F0eA1k3vNxd5owM3ZaNqAFsGCA0dAgUWm2sNliZZZcnx0pWDvl/CG/Qetktz
+15DvlfokTtCXPihy4tk1rYh/+EZfrwTJAMg4Xn3t9XlBapLUVH09EoRRi/0cVs9J
+7x1FBChPFcvMSwrPo+mPzmjTfJ59QCt0BqYk7q/84KtcX85KQlg=
+=3/5f
 -----END PGP SIGNATURE-----

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/composer.json Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Config.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Files/File.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Ruleset.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Runner.php Changed

@@ -53,6 +53,8 @@
      */
     public function runPHPCS()
     {
+        $this->registerOutOfMemoryShutdownMessage('phpcs');
+
         try {
             Util\Timing::startTiming();
             Runner::checkRequirements();
@@ -153,6 +155,8 @@
      */
     public function runPHPCBF()
     {
+        $this->registerOutOfMemoryShutdownMessage('phpcbf');
+
         if (defined('PHP_CODESNIFFER_CBF') === false) {
             define('PHP_CODESNIFFER_CBF', true);
         }
@@ -721,6 +725,11 @@
                 continue;
             }
 
+            $childProcessStatus = pcntl_wexitstatus($status);
+            if ($childProcessStatus !== 0) {
+                $success = false;
+            }
+
             $out = $childProcs$pid;
             unset($childProcs$pid);
             if (file_exists($out) === false) {
@@ -886,4 +895,42 @@
     }//end printProgress()
 
 
+    /**
+     * Registers a PHP shutdown function to provide a more informative out of memory error.
+     *
+     * @param string $command The command which was used to initiate the PHPCS run.
+     *
+     * @return void
+     */
+    private function registerOutOfMemoryShutdownMessage($command)
+    {
+        // Allocate all needed memory beforehand as much as possible.
+        $errorMsg    = PHP_EOL.'The PHP_CodeSniffer "%1$s" command ran out of memory.'.PHP_EOL;
+        $errorMsg   .= 'Either raise the "memory_limit" of PHP in the php.ini file or raise the memory limit at runtime'.PHP_EOL;
+        $errorMsg   .= 'using `%1$s -d memory_limit=512M` (replace 512M with the desired memory limit).'.PHP_EOL;
+        $errorMsg    = sprintf($errorMsg, $command);
+        $memoryError = 'Allowed memory size of';
+        $errorArray  = 
+            'type'    => 42,
+            'message' => 'Some random dummy string to take up memory and take up some more memory and some more',
+            'file'    => 'Another random string, which would be a filename this time. Should be relatively long to allow for deeply nested files',
+            'line'    => 31427,
+        ;
+
+        register_shutdown_function(
+            static function () use (
+                $errorMsg,
+                $memoryError,
+                $errorArray
+            ) {
+                $errorArray = error_get_last();
+                if (is_array($errorArray) === true && strpos($errorArray'message', $memoryError) !== false) {
+                    echo $errorMsg;
+                }
+            }
+        );
+
+    }//end registerOutOfMemoryShutdownMessage()
+
+
 }//end class

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Sniffs/AbstractArraySniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Classes/OpeningBraceSameLineStandard.xml Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/Formatting/SpaceAfterNotStandard.xml Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Docs/WhiteSpace/ArbitraryParenthesesSpacingStandard.xml Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/Functions/FunctionCallArgumentSpacingSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/DisallowRequestSuperglobalSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/LowerCaseTypeSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/PHP/UpperCaseConstantSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/DisallowTabIndentSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/ScopeIndentSniff.php Changed

@@ -142,12 +142,13 @@
             }
         }
 
-        $lastOpenTag     = $stackPtr;
-        $lastCloseTag    = null;
-        $openScopes      = ;
-        $adjustments     = ;
-        $setIndents      = ;
-        $disableExactEnd = 0;
+        $lastOpenTag       = $stackPtr;
+        $lastCloseTag      = null;
+        $openScopes        = ;
+        $adjustments       = ;
+        $setIndents        = ;
+        $disableExactStack = ;
+        $disableExactEnd   = 0;
 
         $tokens  = $phpcsFile->getTokens();
         $first   = $phpcsFile->findFirstOnLine(T_INLINE_HTML, $stackPtr);
@@ -232,6 +233,7 @@
             if ($tokens$i'code' === T_OPEN_PARENTHESIS
                 && isset($tokens$i'parenthesis_closer') === true
             ) {
+                $disableExactStack$tokens$i'parenthesis_closer' = $tokens$i'parenthesis_closer';
                 $disableExactEnd = max($disableExactEnd, $tokens$i'parenthesis_closer');
                 if ($this->debug === true) {
                     $line = $tokens$i'line';
@@ -616,11 +618,11 @@
 
             // Scope closers reset the required indent to the same level as the opening condition.
             if (($checkToken !== null
-                && isset($openScopes$checkToken) === true
+                && (isset($openScopes$checkToken) === true
                 || (isset($tokens$checkToken'scope_condition') === true
                 && isset($tokens$checkToken'scope_closer') === true
                 && $tokens$checkToken'scope_closer' === $checkToken
-                && $tokens$checkToken'line' !== $tokens$tokens$checkToken'scope_opener''line'))
+                && $tokens$checkToken'line' !== $tokens$tokens$checkToken'scope_opener''line')))
                 || ($checkToken === null
                 && isset($openScopes$i) === true)
             ) {
@@ -802,9 +804,17 @@
                 && isset($tokens$checkToken'scope_opener') === true
             ) {
                 $exact = true;
+
                 if ($disableExactEnd > $checkToken) {
-                    if ($tokens$checkToken'conditions' === $tokens$disableExactEnd'conditions') {
-                        $exact = false;
+                    foreach ($disableExactStack as $disableExactStackEnd) {
+                        if ($disableExactStackEnd < $checkToken) {
+                            continue;
+                        }
+
+                        if ($tokens$checkToken'conditions' === $tokens$disableExactStackEnd'conditions') {
+                            $exact = false;
+                            break;
+                        }
                     }
                 }
 
@@ -1035,6 +1045,7 @@
 
             // Don't check indents exactly between arrays as they tend to have custom rules.
             if ($tokens$i'code' === T_OPEN_SHORT_ARRAY) {
+                $disableExactStack$tokens$i'bracket_closer' = $tokens$i'bracket_closer';
                 $disableExactEnd = max($disableExactEnd, $tokens$i'bracket_closer');
                 if ($this->debug === true) {
                     $line    = $tokens$i'line';
@@ -1056,7 +1067,6 @@
             ) {
                 if ($this->debug === true) {
                     $line = $tokens$i'line';
-                    $type = $tokens$disableExactEnd'type';
                     echo "Here/nowdoc found on line $line".PHP_EOL;
                 }

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Sniffs/WhiteSpace/SpreadOperatorSpacingAfterSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Arrays/ArrayIndentUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/Functions/FunctionCallArgumentSpacingUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/PHP/LowerCaseTypeUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ArbitraryParenthesesSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc Added

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.3.inc.fixed Added

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/DisallowTabIndentUnitTest.php Changed

@@ -83,7 +83,7 @@
                 92 => 1,
                 93 => 1,
             ;
-            break;
+
         case 'DisallowTabIndentUnitTest.2.inc':
             return 
                 6  => 1,
@@ -96,23 +96,33 @@
                 13 => 1,
                 19 => 1,
             ;
-            break;
+
+        case 'DisallowTabIndentUnitTest.3.inc':
+            if (\PHP_VERSION_ID >= 70300) {
+                return 
+                    7  => 1,
+                    13 => 1,
+                ;
+            }
+
+            // PHP 7.2 or lower: PHP version which doesn't support flexible heredocs/nowdocs yet.
+            return ;
+
         case 'DisallowTabIndentUnitTest.js':
             return 
                 3 => 1,
                 5 => 1,
                 6 => 1,
             ;
-            break;
+
         case 'DisallowTabIndentUnitTest.css':
             return 
                 1 => 1,
                 2 => 1,
             ;
-            break;
+
         default:
             return ;
-            break;
         }//end switch
 
     }//end getErrorList()

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.1.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.2.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/ScopeIndentUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Generic/Tests/WhiteSpace/SpreadOperatorSpacingAfterUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Sniffs/Functions/FunctionCallSignatureSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PEAR/Tests/Functions/FunctionCallSignatureUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/AnonClassDeclarationSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Sniffs/Classes/ClassInstantiationSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/PSR12/Tests/Classes/ClassInstantiationUnitTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/ControlStructures/ForLoopDeclarationSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Formatting/OperatorBracketSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/PHP/DisallowComparisonAssignmentSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/Scope/StaticThisUsageSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Sniffs/WhiteSpace/OperatorSpacingSniff.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.js.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/Formatting/OperatorBracketUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/PHP/DisallowComparisonAssignmentUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Standards/Squiz/Tests/WhiteSpace/OperatorSpacingUnitTest.inc.fixed Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/PHP.php Changed

@@ -1223,7 +1223,7 @@
 
             /*
                 Tokenize the parameter labels for PHP 8.0 named parameters as a special T_PARAM_NAME
-                token and ensure that the colon after it is always T_COLON.
+                token and ensures that the colon after it is always T_COLON.
             */
 
             if ($tokenIsArray === true
@@ -2688,13 +2688,18 @@
                     }
 
                     if (isset(Util\Tokens::$emptyTokens$this->tokens$x'code') === false) {
-                        if (isset($allowed$this->tokens$x'code') === false) {
+                        // Allow for control structures without braces.
+                        if (($this->tokens$x'code' === T_CLOSE_PARENTHESIS
+                            && isset($this->tokens$x'parenthesis_owner') === true
+                            && isset(Util\Tokens::$scopeOpeners$this->tokens$this->tokens$x'parenthesis_owner''code') === true)
+                            || isset($allowed$this->tokens$x'code') === false
+                        ) {
                             $isShortArray = true;
                         }
 
                         break;
                     }
-                }
+                }//end for
 
                 if ($isShortArray === true) {
                     $this->tokens$i'code' = T_OPEN_SHORT_ARRAY;

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Tokenizers/Tokenizer.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Common.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/src/Util/Tokens.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Autoloader/DetermineLoadedClassTest.php Changed

@@ -1,6 +1,6 @@
 <?php
 /**
- * Tests for the \PHP_CodeSniffer\Util\Common::isCamelCaps method.
+ * Tests for the \PHP_CodeSniffer\Autoload::determineLoadedClass method.
  *
  * @author    Greg Sherwood <gsherwood@squiz.net>
  * @copyright 2006-2015 Squiz Pty Ltd (ABN 77 084 670 600)
@@ -9,6 +9,7 @@
 
 namespace PHP_CodeSniffer\Tests\Core\Autoloader;
 
+use PHP_CodeSniffer\Autoload;
 use PHPUnit\Framework\TestCase;
 
 class DetermineLoadedClassTest extends TestCase
@@ -51,7 +52,7 @@
             'traits'     => ,
         ;
 
-        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
     }//end testOrdered()
@@ -81,7 +82,7 @@
             'traits'     => ,
         ;
 
-        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
         $classesAfterLoad = 
@@ -95,7 +96,7 @@
             'traits'     => ,
         ;
 
-        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
         $classesAfterLoad = 
@@ -109,7 +110,7 @@
             'traits'     => ,
         ;
 
-        $className = \PHP_CodeSniffer\Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
+        $className = Autoload::determineLoadedClass($classesBeforeLoad, $classesAfterLoad);
         $this->assertEquals('PHP_CodeSniffer\Tests\Core\Autoloader\Sub\C', $className);
 
     }//end testUnordered()

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindEndOfStatementTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/FindStartOfStatementTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMemberPropertiesTest.php Changed

@@ -211,6 +211,17 @@
                 ,
             ,
             
+                '/* testNoPrefix */',
+                
+                    'scope'           => 'public',
+                    'scope_specified' => false,
+                    'is_static'       => false,
+                    'is_readonly'     => false,
+                    'type'            => '',
+                    'nullable_type'   => false,
+                ,
+            ,
+            
                 '/* testPublicStaticWithDocblock */',
                 
                     'scope'           => 'public',
@@ -288,17 +299,6 @@
                 ,
             ,
             
-                '/* testNoPrefix */',
-                
-                    'scope'           => 'public',
-                    'scope_specified' => false,
-                    'is_static'       => false,
-                    'is_readonly'     => false,
-                    'type'            => '',
-                    'nullable_type'   => false,
-                ,
-            ,
-            
                 '/* testGroupProtectedStatic 1 */',
                 
                     'scope'           => 'protected',

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodParametersTest.php Changed

@@ -62,173 +62,173 @@
 
 
     /**
-     * Verify type hint parsing.
+     * Verify variable.
      *
      * @return void
      */
-    public function testTypeHint()
+    public function testVariable()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => 'foo $var1',
-            'has_attributes'    => false,
-            'pass_by_reference' => false,
-            'variable_length'   => false,
-            'type_hint'         => 'foo',
-            'nullable_type'     => false,
-        ;
-
-        $expected1 = 
-            'name'              => '$var2',
-            'content'           => 'bar $var2',
+            'name'              => '$var',
+            'content'           => '$var',
             'has_attributes'    => false,
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => 'bar',
+            'type_hint'         => '',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testTypeHint()
+    }//end testVariable()
 
 
     /**
-     * Verify self type hint parsing.
+     * Verify default value parsing with a single function param.
      *
      * @return void
      */
-    public function testSelfTypeHint()
+    public function testSingleDefaultValue()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => 'self $var',
+            'name'              => '$var1',
+            'content'           => '$var1=self::CONSTANT',
             'has_attributes'    => false,
+            'default'           => 'self::CONSTANT',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => 'self',
+            'type_hint'         => '',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testSelfTypeHint()
+    }//end testSingleDefaultValue()
 
 
     /**
-     * Verify nullable type hint parsing.
+     * Verify default value parsing.
      *
      * @return void
      */
-    public function testNullableTypeHint()
+    public function testDefaultValues()
     {
         $expected    = ;
         $expected0 = 
             'name'              => '$var1',
-            'content'           => '?int $var1',
+            'content'           => '$var1=1',
             'has_attributes'    => false,
+            'default'           => '1',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '?int',
-            'nullable_type'     => true,
+            'type_hint'         => '',
+            'nullable_type'     => false,
         ;
-
         $expected1 = 
             'name'              => '$var2',
-            'content'           => '?\bar $var2',
+            'content'           => "\$var2='value'",
             'has_attributes'    => false,
+            'default'           => "'value'",
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '?\bar',
-            'nullable_type'     => true,
+            'type_hint'         => '',
+            'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testNullableTypeHint()
+    }//end testDefaultValues()
 
 
     /**
-     * Verify variable.
+     * Verify type hint parsing.
      *
      * @return void
      */
-    public function testVariable()
+    public function testTypeHint()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var',
-            'content'           => '$var',
+            'name'              => '$var1',
+            'content'           => 'foo $var1',
             'has_attributes'    => false,
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '',
+            'type_hint'         => 'foo',
+            'nullable_type'     => false,
+        ;
+
+        $expected1 = 
+            'name'              => '$var2',
+            'content'           => 'bar $var2',
+            'has_attributes'    => false,
+            'pass_by_reference' => false,
+            'variable_length'   => false,
+            'type_hint'         => 'bar',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testVariable()
+    }//end testTypeHint()
 
 
     /**
-     * Verify default value parsing with a single function param.
+     * Verify self type hint parsing.
      *
      * @return void
      */
-    public function testSingleDefaultValue()
+    public function testSelfTypeHint()
     {
         $expected    = ;
         $expected0 = 
-            'name'              => '$var1',
-            'content'           => '$var1=self::CONSTANT',
+            'name'              => '$var',
+            'content'           => 'self $var',
             'has_attributes'    => false,
-            'default'           => 'self::CONSTANT',
             'pass_by_reference' => false,
             'variable_length'   => false,
-            'type_hint'         => '',
+            'type_hint'         => 'self',
             'nullable_type'     => false,
         ;
 
         $this->getMethodParametersTestHelper('/* '.__FUNCTION__.' */', $expected);
 
-    }//end testSingleDefaultValue()
+    }//end testSelfTypeHint()
 
 
     /**
-     * Verify default value parsing.
+     * Verify nullable type hint parsing.
      *
      * @return void
      */
-    public function testDefaultValues()
+    public function testNullableTypeHint()
     {
         $expected    = ;
         $expected0 = 
             'name'              => '$var1',
-            'content'           => '$var1=1',
+            'content'           => '?int $var1',
             'has_attributes'    => false,

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/GetMethodPropertiesTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/File/IsReferenceTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/AttributesTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.inc Added

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocNowdocCloserTest.php Added

@@ -0,0 +1,150 @@
+<?php
+/**
+ * Tests the tokenization of goto declarations and statements.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2020 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
+
+use PHP_CodeSniffer\Config;
+use PHP_CodeSniffer\Ruleset;
+use PHP_CodeSniffer\Files\DummyFile;
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+/**
+ * Heredoc/nowdoc closer token test.
+ *
+ * @requires PHP 7.3
+ */
+class HeredocNowdocCloserTest extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Initialize & tokenize \PHP_CodeSniffer\Files\File with code from the test case file.
+     *
+     * {@internal This is a near duplicate of the original method. Only difference is that
+     * tab replacement is enabled for this test.}
+     *
+     * @return void
+     */
+    public static function setUpBeforeClass()
+    {
+        $config            = new Config();
+        $config->standards = 'PSR1';
+        $config->tabWidth  = 4;
+
+        $ruleset = new Ruleset($config);
+
+        // Default to a file with the same name as the test class. Extension is property based.
+        $relativeCN     = str_replace(__NAMESPACE__, '', get_called_class());
+        $relativePath   = str_replace('\\', DIRECTORY_SEPARATOR, $relativeCN);
+        $pathToTestFile = realpath(__DIR__).$relativePath.'.'.static::$fileExtension;
+
+        // Make sure the file gets parsed correctly based on the file type.
+        $contents  = 'phpcs_input_file: '.$pathToTestFile.PHP_EOL;
+        $contents .= file_get_contents($pathToTestFile);
+
+        self::$phpcsFile = new DummyFile($contents, $ruleset, $config);
+        self::$phpcsFile->process();
+
+    }//end setUpBeforeClass()
+
+
+    /**
+     * Verify that leading (indent) whitespace in a heredoc/nowdoc closer token get the tab replacement treatment.
+     *
+     * @param string $testMarker The comment prefacing the target token.
+     * @param array  $expected   Expectations for the token array.
+     *
+     * @dataProvider dataHeredocNowdocCloserTabReplacement
+     * @covers       PHP_CodeSniffer\Tokenizers\Tokenizer::createPositionMap
+     *
+     * @return void
+     */
+    public function testHeredocNowdocCloserTabReplacement($testMarker, $expected)
+    {
+        $tokens = self::$phpcsFile->getTokens();
+
+        $closer = $this->getTargetToken($testMarker, T_END_HEREDOC, T_END_NOWDOC);
+
+        foreach ($expected as $key => $value) {
+            if ($key === 'orig_content' && $value === null) {
+                $this->assertArrayNotHasKey($key, $tokens$closer, "Unexpected 'orig_content' key found in the token array.");
+                continue;
+            }
+
+            $this->assertArrayHasKey($key, $tokens$closer, "Key $key not found in the token array.");
+            $this->assertSame($value, $tokens$closer$key, "Value for key $key does not match expectation.");
+        }
+
+    }//end testHeredocNowdocCloserTabReplacement()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testHeredocNowdocCloserTabReplacement()
+     *
+     * @return array
+     */
+    public function dataHeredocNowdocCloserTabReplacement()
+    {
+        return 
+            
+                'testMarker' => '/* testHeredocCloserNoIndent */',
+                'expected'   => 
+                    'length'       => 3,
+                    'content'      => 'EOD',
+                    'orig_content' => null,
+                ,
+            ,
+            
+                'testMarker' => '/* testNowdocCloserNoIndent */',
+                'expected'   => 
+                    'length'       => 3,
+                    'content'      => 'EOD',
+                    'orig_content' => null,
+                ,
+            ,
+            
+                'testMarker' => '/* testHeredocCloserSpaceIndent */',
+                'expected'   => 
+                    'length'       => 7,
+                    'content'      => '    END',
+                    'orig_content' => null,
+                ,
+            ,
+            
+                'testMarker' => '/* testNowdocCloserSpaceIndent */',
+                'expected'   => 
+                    'length'       => 8,
+                    'content'      => '     END',
+                    'orig_content' => null,
+                ,
+            ,
+            
+                'testMarker' => '/* testHeredocCloserTabIndent */',
+                'expected'   => 
+                    'length'       => 8,
+                    'content'      => '     END',
+                    'orig_content' => '	 END',
+                ,
+            ,
+            
+                'testMarker' => '/* testNowdocCloserTabIndent */',
+                'expected'   => 
+                    'length'       => 7,
+                    'content'      => '    END',
+                    'orig_content' => '	END',
+                ,
+            ,
+        ;
+
+    }//end dataHeredocNowdocCloserTabReplacement()
+
+
+}//end class

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.inc Added

@@ -0,0 +1,193 @@
+<?php
+
+// Test source: https://gist.github.com/iluuu1994/72e2154fc4150f2258316b0255b698f2#file-test-php
+
+/* testSimple1 */
+$heredoc = <<<EOD
+$foo
+EOD;
+
+/* testSimple2 */
+$heredoc = <<<"EOD"
+{$foo}
+EOD;
+
+/* testSimple3 */
+$heredoc = <<<EOD
+${foo}
+EOD;
+
+/* testDIM1 */
+$heredoc = <<<"EOD"
+$foobar
+EOD;
+
+/* testDIM2 */
+$heredoc = <<<EOD
+{$foo'bar'}
+EOD;
+
+/* testDIM3 */
+$heredoc = <<<"EOD"
+${foo'bar'}
+EOD;
+
+/* testProperty1 */
+$heredoc = <<<EOD
+$foo->bar
+EOD;
+
+/* testProperty2 */
+$heredoc = <<<"EOD"
+{$foo->bar}
+EOD;
+
+/* testMethod1 */
+$heredoc = <<<EOD
+{$foo->bar()}
+EOD;
+
+/* testClosure1 */
+$heredoc = <<<"EOD"
+{$foo()}
+EOD;
+
+/* testChain1 */
+$heredoc = <<<EOD
+{$foo'bar'->baz()()}
+EOD;
+
+/* testVariableVar1 */
+$heredoc = <<<"EOD"
+${$bar}
+EOD;
+
+/* testVariableVar2 */
+$heredoc = <<<EOD
+${(foo)}
+EOD;
+
+/* testVariableVar3 */
+$heredoc = <<<"EOD"
+${foo->bar}
+EOD;
+
+/* testNested1 */
+$heredoc = <<<EOD
+${foo"${bar}"}
+EOD;
+
+/* testNested2 */
+$heredoc = <<<"EOD"
+${foo"${bar'baz'}"}
+EOD;
+
+/* testNested3 */
+$heredoc = <<<EOD
+${foo->{$baz}}
+EOD;
+
+/* testNested4 */
+$heredoc = <<<"EOD"
+${foo->{${'a'}}}
+EOD;
+
+/* testNested5 */
+$heredoc = <<<EOD
+${foo->{"${'a'}"}}
+EOD;
+
+/* testSimple1Wrapped */
+$heredoc = <<<EOD
+Do $foo Something
+EOD;
+
+/* testSimple2Wrapped */
+$heredoc = <<<"EOD"
+Do {$foo} Something
+EOD;
+
+/* testSimple3Wrapped */
+$heredoc = <<<EOD
+Do ${foo} Something
+EOD;
+
+/* testDIM1Wrapped */
+$heredoc = <<<"EOD"
+Do $foobar Something
+EOD;
+
+/* testDIM2Wrapped */
+$heredoc = <<<EOD
+Do {$foo'bar'} Something
+EOD;
+
+/* testDIM3Wrapped */
+$heredoc = <<<"EOD"
+Do ${foo'bar'} Something
+EOD;
+
+/* testProperty1Wrapped */
+$heredoc = <<<EOD
+Do $foo->bar Something
+EOD;
+
+/* testProperty2Wrapped */
+$heredoc = <<<"EOD"
+Do {$foo->bar} Something
+EOD;
+
+/* testMethod1Wrapped */
+$heredoc = <<<EOD
+Do {$foo->bar()} Something
+EOD;
+
+/* testClosure1Wrapped */
+$heredoc = <<<"EOD"
+Do {$foo()} Something
+EOD;
+
+/* testChain1Wrapped */
+$heredoc = <<<EOD
+Do {$foo'bar'->baz()()} Something
+EOD;
+
+/* testVariableVar1Wrapped */
+$heredoc = <<<"EOD"
+Do ${$bar} Something
+EOD;
+
+/* testVariableVar2Wrapped */
+$heredoc = <<<EOD
+Do ${(foo)} Something
+EOD;
+
+/* testVariableVar3Wrapped */
+$heredoc = <<<"EOD"
+Do ${foo->bar} Something
+EOD;
+
+/* testNested1Wrapped */
+$heredoc = <<<EOD
+Do ${foo"${bar}"} Something
+EOD;
+
+/* testNested2Wrapped */
+$heredoc = <<<"EOD"
+Do ${foo"${bar'baz'}"} Something
+EOD;
+
+/* testNested3Wrapped */
+$heredoc = <<<EOD
+Do ${foo->{$baz}} Something
+EOD;
+
+/* testNested4Wrapped */
+$heredoc = <<<"EOD"
+Do ${foo->{${'a'}}} Something
+EOD;
+
+/* testNested5Wrapped */
+$heredoc = <<<EOD
+Do ${foo->{"${'a'}"}} Something
+EOD;

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/HeredocStringTest.php Added

@@ -0,0 +1,153 @@
+<?php
+/**
+ * Tests that embedded variables and expressions in heredoc strings are tokenized
+ * as one heredoc string token.
+ *
+ * @author    Juliette Reinders Folmer <phpcs_nospam@adviesenzo.nl>
+ * @copyright 2022 Squiz Pty Ltd (ABN 77 084 670 600)
+ * @license   https://github.com/squizlabs/PHP_CodeSniffer/blob/master/licence.txt BSD Licence
+ */
+
+namespace PHP_CodeSniffer\Tests\Core\Tokenizer;
+
+use PHP_CodeSniffer\Tests\Core\AbstractMethodUnitTest;
+
+class HeredocStringTest extends AbstractMethodUnitTest
+{
+
+
+    /**
+     * Test that heredoc strings contain the complete interpolated string.
+     *
+     * @param string $testMarker      The comment which prefaces the target token in the test file.
+     * @param string $expectedContent The expected content of the heredoc string.
+     *
+     * @dataProvider dataHeredocString
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testHeredocString($testMarker, $expectedContent)
+    {
+        $tokens = self::$phpcsFile->getTokens();
+
+        $target = $this->getTargetToken($testMarker, T_HEREDOC);
+        $this->assertSame($expectedContent."\n", $tokens$target'content');
+
+    }//end testHeredocString()
+
+
+    /**
+     * Test that heredoc strings contain the complete interpolated string when combined with other texts.
+     *
+     * @param string $testMarker      The comment which prefaces the target token in the test file.
+     * @param string $expectedContent The expected content of the heredoc string.
+     *
+     * @dataProvider dataHeredocString
+     * @covers       PHP_CodeSniffer\Tokenizers\PHP::tokenize
+     *
+     * @return void
+     */
+    public function testHeredocStringWrapped($testMarker, $expectedContent)
+    {
+        $tokens = self::$phpcsFile->getTokens();
+
+        $testMarker = substr($testMarker, 0, -3).'Wrapped */';
+        $target     = $this->getTargetToken($testMarker, T_HEREDOC);
+        $this->assertSame('Do '.$expectedContent." Something\n", $tokens$target'content');
+
+    }//end testHeredocStringWrapped()
+
+
+    /**
+     * Data provider.
+     *
+     * @see testHeredocString()
+     *
+     * @return array
+     */
+    public function dataHeredocString()
+    {
+        return 
+            
+                'testMarker'      => '/* testSimple1 */',
+                'expectedContent' => '$foo',
+            ,
+            
+                'testMarker'      => '/* testSimple2 */',
+                'expectedContent' => '{$foo}',
+            ,
+            
+                'testMarker'      => '/* testSimple3 */',
+                'expectedContent' => '${foo}',
+            ,
+            
+                'testMarker'      => '/* testDIM1 */',
+                'expectedContent' => '$foobar',
+            ,
+            
+                'testMarker'      => '/* testDIM2 */',
+                'expectedContent' => '{$foo\'bar\'}',
+            ,
+            
+                'testMarker'      => '/* testDIM3 */',
+                'expectedContent' => '${foo\'bar\'}',
+            ,
+            
+                'testMarker'      => '/* testProperty1 */',
+                'expectedContent' => '$foo->bar',
+            ,
+            
+                'testMarker'      => '/* testProperty2 */',
+                'expectedContent' => '{$foo->bar}',
+            ,
+            
+                'testMarker'      => '/* testMethod1 */',
+                'expectedContent' => '{$foo->bar()}',
+            ,
+            
+                'testMarker'      => '/* testClosure1 */',
+                'expectedContent' => '{$foo()}',
+            ,
+            
+                'testMarker'      => '/* testChain1 */',
+                'expectedContent' => '{$foo\'bar\'->baz()()}',
+            ,
+            
+                'testMarker'      => '/* testVariableVar1 */',
+                'expectedContent' => '${$bar}',
+            ,
+            
+                'testMarker'      => '/* testVariableVar2 */',
+                'expectedContent' => '${(foo)}',
+            ,
+            
+                'testMarker'      => '/* testVariableVar3 */',
+                'expectedContent' => '${foo->bar}',
+            ,
+            
+                'testMarker'      => '/* testNested1 */',
+                'expectedContent' => '${foo"${bar}"}',
+            ,
+            
+                'testMarker'      => '/* testNested2 */',
+                'expectedContent' => '${foo"${bar\'baz\'}"}',
+            ,
+            
+                'testMarker'      => '/* testNested3 */',
+                'expectedContent' => '${foo->{$baz}}',
+            ,
+            
+                'testMarker'      => '/* testNested4 */',
+                'expectedContent' => '${foo->{${\'a\'}}}',
+            ,
+            
+                'testMarker'      => '/* testNested5 */',
+                'expectedContent' => '${foo->{"${\'a\'}"}}',
+            ,
+        ;
+
+    }//end dataHeredocString()
+
+
+}//end class

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/NamedFunctionCallArgumentsTest.php Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ScopeSettingWithNamespaceOperatorTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ShortArrayTest.inc Changed

roundcubemail-1.5.3.tar.gz/vendor/squizlabs/php_codesniffer/tests/Core/Tokenizer/ShortArrayTest.php Changed

@@ -52,29 +52,29 @@
     public function dataSquareBrackets()
     {
         return 
-            '/* testArrayAccess1 */',
-            '/* testArrayAccess2 */',
-            '/* testArrayAssignment */',
-            '/* testFunctionCallDereferencing */',
-            '/* testMethodCallDereferencing */',
-            '/* testStaticMethodCallDereferencing */',
-            '/* testPropertyDereferencing */',
-            '/* testPropertyDereferencingWithInaccessibleName */',
-            '/* testStaticPropertyDereferencing */',
-            '/* testStringDereferencing */',
-            '/* testStringDereferencingDoubleQuoted */',
-            '/* testConstantDereferencing */',
-            '/* testClassConstantDereferencing */',
-            '/* testMagicConstantDereferencing */',
-            '/* testArrayAccessCurlyBraces */',
-            '/* testArrayLiteralDereferencing */',
-            '/* testShortArrayLiteralDereferencing */',
-            '/* testClassMemberDereferencingOnInstantiation1 */',
-            '/* testClassMemberDereferencingOnInstantiation2 */',
-            '/* testClassMemberDereferencingOnClone */',
-            '/* testNullsafeMethodCallDereferencing */',
-            '/* testInterpolatedStringDereferencing */',
-            '/* testLiveCoding */',
+            'array access 1'                                => '/* testArrayAccess1 */',
+            'array access 2'                                => '/* testArrayAccess2 */',
+            'array assignment'                              => '/* testArrayAssignment */',
+            'function call dereferencing'                   => '/* testFunctionCallDereferencing */',
+            'method call dereferencing'                     => '/* testMethodCallDereferencing */',
+            'static method call dereferencing'              => '/* testStaticMethodCallDereferencing */',
+            'property dereferencing'                        => '/* testPropertyDereferencing */',
+            'property dereferencing with inaccessable name' => '/* testPropertyDereferencingWithInaccessibleName */',
+            'static property dereferencing'                 => '/* testStaticPropertyDereferencing */',
+            'string dereferencing single quotes'            => '/* testStringDereferencing */',
+            'string dereferencing double quotes'            => '/* testStringDereferencingDoubleQuoted */',
+            'global constant dereferencing'                 => '/* testConstantDereferencing */',
+            'class constant dereferencing'                  => '/* testClassConstantDereferencing */',
+            'magic constant dereferencing'                  => '/* testMagicConstantDereferencing */',
+            'array access with curly braces'                => '/* testArrayAccessCurlyBraces */',
+            'array literal dereferencing'                   => '/* testArrayLiteralDereferencing */',
+            'short array literal dereferencing'             => '/* testShortArrayLiteralDereferencing */',
+            'class member dereferencing on instantiation 1' => '/* testClassMemberDereferencingOnInstantiation1 */',
+            'class member dereferencing on instantiation 2' => '/* testClassMemberDereferencingOnInstantiation2 */',
+            'class member dereferencing on clone'           => '/* testClassMemberDereferencingOnClone */',
+            'nullsafe method call dereferencing'            => '/* testNullsafeMethodCallDereferencing */',
+            'interpolated string dereferencing'             => '/* testInterpolatedStringDereferencing */',
+            'live coding'                                   => '/* testLiveCoding */',
         ;
 
     }//end dataSquareBrackets()
@@ -117,13 +117,16 @@
     public function dataShortArrays()
     {
         return 
-            '/* testShortArrayDeclarationEmpty */',
-            '/* testShortArrayDeclarationWithOneValue */',
-            '/* testShortArrayDeclarationWithMultipleValues */',
-            '/* testShortArrayDeclarationWithDereferencing */',
-            '/* testShortListDeclaration */',
-            '/* testNestedListDeclaration */',
-            '/* testArrayWithinFunctionCall */',
+            'short array empty'                              => '/* testShortArrayDeclarationEmpty */',
+            'short array with value'                         => '/* testShortArrayDeclarationWithOneValue */',
+            'short array with values'                        => '/* testShortArrayDeclarationWithMultipleValues */',
+            'short array with dereferencing'                 => '/* testShortArrayDeclarationWithDereferencing */',
+            'short list'                                     => '/* testShortListDeclaration */',
+            'short list nested'                              => '/* testNestedListDeclaration */',
+            'short array within function call'               => '/* testArrayWithinFunctionCall */',
+            'short list after braced control structure'      => '/* testShortListDeclarationAfterBracedControlStructure */',
+            'short list after non-braced control structure'  => '/* testShortListDeclarationAfterNonBracedControlStructure */',
+            'short list after alternative control structure' => '/* testShortListDeclarationAfterAlternativeControlStructure */',
         ;
 
     }//end dataShortArrays()

Changes of Revision 20