From cc4e8192042ac234822f31b4f3f9c3cf8a9726fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Tue, 19 Dec 2023 16:58:08 +0100 Subject: [PATCH 1/2] bound upper PHP version --- composer.json-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json-dist b/composer.json-dist index b241c2d4a5a..fc59e5e19d7 100644 --- a/composer.json-dist +++ b/composer.json-dist @@ -3,7 +3,7 @@ "description": "The Roundcube Webmail suite", "license": "GPL-3.0-or-later", "require": { - "php": ">=7.3.0", + "php": ">=7.3 <8.4", "bacon/bacon-qr-code": "^2.0.8", "guzzlehttp/guzzle": "^7.3.0", "masterminds/html5": "~2.8.0", From adadbe4454e7879d8245f7577240765b14299182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= Date: Sat, 9 Dec 2023 00:47:23 +0100 Subject: [PATCH 2/2] improve/replace all relative includes --- installer/index.php | 6 +++--- plugins/password/drivers/tinycp.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/index.php b/installer/index.php index 7828a261082..2664c9e6a00 100644 --- a/installer/index.php +++ b/installer/index.php @@ -140,9 +140,9 @@
    './check.php', - 2 => './config.php', - 3 => './test.php', + 1 => __DIR__ . '/check.php', + 2 => __DIR__ . '/config.php', + 3 => __DIR__ . '/test.php', ]; if (!in_array($RCI->step, array_keys($include_steps))) { diff --git a/plugins/password/drivers/tinycp.php b/plugins/password/drivers/tinycp.php index 9c74a2c6a8b..564bbd2472e 100644 --- a/plugins/password/drivers/tinycp.php +++ b/plugins/password/drivers/tinycp.php @@ -31,7 +31,7 @@ class rcube_tinycp_password { public function save($currpass, $newpass, $username) { - require_once 'TinyCPConnector.php'; + require_once __DIR__ . '/TinyCPConnector.php'; $tinycp_host = rcmail::get_instance()->config->get('password_tinycp_host'); $tinycp_port = rcmail::get_instance()->config->get('password_tinycp_port');