From 464f37fe46074074633ec6d65daa60d15b37c542 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 28 Jul 2022 21:09:57 +0200 Subject: [PATCH 0001/1214] [ticket/17010] Add dummy for web push notification method PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 163 ++++++++++++++++++++ 1 file changed, 163 insertions(+) create mode 100644 phpBB/phpbb/notification/method/webpush.php diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php new file mode 100644 index 00000000000..f88cfc7cf96 --- /dev/null +++ b/phpBB/phpbb/notification/method/webpush.php @@ -0,0 +1,163 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\notification\method; + +use phpbb\config\config; +use phpbb\db\driver\driver_interface; +use phpbb\notification\type\type_interface; +use phpbb\user; +use phpbb\user_loader; + +/** +* Web push notification method class +* This class handles sending push messages for notifications +*/ + +class webpush extends \phpbb\notification\method\messenger_base +{ + /** @var config */ + protected $config; + + /** @var driver_interface */ + protected $db; + + /** @var user */ + protected $user; + + /** @var string Notification web push table */ + protected $notification_webpush_table; + + /** + * Notification Method web push constructor + * + * @param user_loader $user_loader + * @param user $user + * @param config $config + * @param driver_interface $db + * @param string $phpbb_root_path + * @param string $php_ext + * @param string $notification_webpush_table + */ + public function __construct(user_loader $user_loader, user $user, config $config, driver_interface $db, string $phpbb_root_path, string $php_ext, string $notification_webpush_table) + { + parent::__construct($user_loader, $phpbb_root_path, $php_ext); + + $this->user = $user; + $this->config = $config; + $this->db = $db; + $this->notification_webpush_table = $notification_webpush_table; + } + + /** + * {@inheritDoc} + */ + public function get_type(): string + { + return 'notification.method.webpush'; + } + + /** + * {@inheritDoc} + */ + public function is_available(type_interface $notification_type = null): bool + { + return parent::is_available($notification_type) && $this->config['webpush_enable'] && !empty($this->user->data['user_push_subscriptions']); + } + + /** + * {@inheritdoc} + */ + public function get_notified_users($notification_type_id, array $options): array + { + $notified_users = []; + + $sql = 'SELECT user_id + FROM ' . $this->notification_webpush_table . ' + WHERE notification_type_id = ' . (int) $notification_type_id . + (isset($options['item_id']) ? ' AND item_id = ' . (int) $options['item_id'] : '') . + (isset($options['item_parent_id']) ? ' AND item_parent_id = ' . (int) $options['item_parent_id'] : '') . + (isset($options['user_id']) ? ' AND user_id = ' . (int) $options['user_id'] : ''); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + $notified_users[$row['user_id']] = $row; + } + $this->db->sql_freeresult($result); + + return $notified_users; + } + + /** + * Parse the queue and notify the users + */ + public function notify() + { + $insert_buffer = new \phpbb\db\sql_insert_buffer($this->db, $this->notification_webpush_table); + + /** @var type_interface $notification */ + foreach ($this->queue as $notification) + { + $data = self::clean_data($notification->get_insert_array()); + $insert_buffer->insert($data); + } + + $insert_buffer->flush(); + + // @todo: add actual web push code + + return false; + } + + /** + * {@inheritdoc} + */ + public function mark_notifications($notification_type_id, $item_id, $user_id, $time = false, $mark_read = true) + { + $sql = 'DELETE FROM ' . $this->notification_webpush_table . ' + WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', $notification_type_id) : '1=1') . + ($user_id !== false ? ' AND ' . $this->db->sql_in_set('user_id', $user_id) : '') . + ($item_id !== false ? ' AND ' . $this->db->sql_in_set('item_id', $item_id) : ''); + $this->db->sql_query($sql); + } + + /** + * {@inheritdoc} + */ + public function mark_notifications_by_parent($notification_type_id, $item_parent_id, $user_id, $time = false, $mark_read = true) + { + $sql = 'DELETE FROM ' . $this->notification_webpush_table . ' + WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', $notification_type_id) : '1=1') . + ($user_id !== false ? ' AND ' . $this->db->sql_in_set('user_id', $user_id) : '') . + ($item_parent_id !== false ? ' AND ' . $this->db->sql_in_set('item_parent_id', $item_parent_id, false, true) : ''); + $this->db->sql_query($sql); + } + + /** + * Clean data to contain only what we need for webpush notifications table + * + * @param array $data Notification data + * @return array Cleaned notification data + */ + public static function clean_data(array $data) + { + $row = [ + 'notification_type_id' => null, + 'item_id' => null, + 'item_parent_id' => null, + 'user_id' => null, + ]; + + return array_intersect_key($data, $row); + } +} From 07d3376612db776548d584f09397733c7414ddc9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 28 Jul 2022 22:19:53 +0200 Subject: [PATCH 0002/1214] [ticket/17010] Add web-push-lib dependency PHPBB3-17010 --- phpBB/composer.json | 1 + phpBB/composer.lock | 1607 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 1316 insertions(+), 292 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index da6875f9bc4..6d59cefe266 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -40,6 +40,7 @@ "google/recaptcha": "~1.1", "guzzlehttp/guzzle": "~6.3", "marc1706/fast-image-size": "^1.1", + "minishlink/web-push": "^8.0", "s9e/text-formatter": "^2.0", "symfony/config": "^6.3", "symfony/console": "^6.3", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 36d1379632c..287f56b08ba 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "75425a269d37301eb11d494437c2f5ff", + "content-hash": "26143c95732859f6f0849abd2fe74ae5", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -40,6 +40,66 @@ }, "time": "2014-09-15T13:12:35+00:00" }, + { + "name": "brick/math", + "version": "0.12.1", + "source": { + "type": "git", + "url": "https://github.com/brick/math.git", + "reference": "f510c0a40911935b77b86859eb5223d58d660df1" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/brick/math/zipball/f510c0a40911935b77b86859eb5223d58d660df1", + "reference": "f510c0a40911935b77b86859eb5223d58d660df1", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.2", + "phpunit/phpunit": "^10.1", + "vimeo/psalm": "5.16.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Brick\\Math\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Arbitrary-precision arithmetic library", + "keywords": [ + "Arbitrary-precision", + "BigInteger", + "BigRational", + "arithmetic", + "bigdecimal", + "bignum", + "bignumber", + "brick", + "decimal", + "integer", + "math", + "mathematics", + "rational" + ], + "support": { + "issues": "https://github.com/brick/math/issues", + "source": "https://github.com/brick/math/tree/0.12.1" + }, + "funding": [ + { + "url": "https://github.com/BenMorel", + "type": "github" + } + ], + "time": "2023-11-29T23:19:16+00:00" + }, { "name": "carlos-mg89/oauth", "version": "0.8.15", @@ -1974,6 +2034,276 @@ }, "time": "2022-01-12T16:29:39+00:00" }, + { + "name": "minishlink/web-push", + "version": "v8.0.0", + "source": { + "type": "git", + "url": "https://github.com/web-push-libs/web-push-php.git", + "reference": "ec034f1e287cd1e74235e349bd017d71a61e9d8d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/web-push-libs/web-push-php/zipball/ec034f1e287cd1e74235e349bd017d71a61e9d8d", + "reference": "ec034f1e287cd1e74235e349bd017d71a61e9d8d", + "shasum": "" + }, + "require": { + "ext-curl": "*", + "ext-json": "*", + "ext-mbstring": "*", + "ext-openssl": "*", + "guzzlehttp/guzzle": "^7.0.1|^6.2", + "php": ">=8.0", + "spomky-labs/base64url": "^2.0", + "web-token/jwt-key-mgmt": "^2.0|^3.0.2", + "web-token/jwt-signature": "^2.0|^3.0.2", + "web-token/jwt-signature-algorithm-ecdsa": "^2.0|^3.0.2", + "web-token/jwt-util-ecc": "^2.0|^3.0.2" + }, + "require-dev": { + "friendsofphp/php-cs-fixer": "^v3.13.2", + "phpstan/phpstan": "^1.9.8", + "phpunit/phpunit": "^9.5.27" + }, + "suggest": { + "ext-gmp": "Optional for performance." + }, + "type": "library", + "autoload": { + "psr-4": { + "Minishlink\\WebPush\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Louis Lagrange", + "email": "lagrange.louis@gmail.com", + "homepage": "https://github.com/Minishlink" + } + ], + "description": "Web Push library for PHP", + "homepage": "https://github.com/web-push-libs/web-push-php", + "keywords": [ + "Push API", + "WebPush", + "notifications", + "push", + "web" + ], + "support": { + "issues": "https://github.com/web-push-libs/web-push-php/issues", + "source": "https://github.com/web-push-libs/web-push-php/tree/v8.0.0" + }, + "time": "2023-01-10T17:14:44+00:00" + }, + { + "name": "paragonie/constant_time_encoding", + "version": "v2.6.3", + "source": { + "type": "git", + "url": "https://github.com/paragonie/constant_time_encoding.git", + "reference": "58c3f47f650c94ec05a151692652a868995d2938" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938", + "reference": "58c3f47f650c94ec05a151692652a868995d2938", + "shasum": "" + }, + "require": { + "php": "^7|^8" + }, + "require-dev": { + "phpunit/phpunit": "^6|^7|^8|^9", + "vimeo/psalm": "^1|^2|^3|^4" + }, + "type": "library", + "autoload": { + "psr-4": { + "ParagonIE\\ConstantTime\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com", + "role": "Maintainer" + }, + { + "name": "Steve 'Sc00bz' Thomas", + "email": "steve@tobtu.com", + "homepage": "https://www.tobtu.com", + "role": "Original Developer" + } + ], + "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)", + "keywords": [ + "base16", + "base32", + "base32_decode", + "base32_encode", + "base64", + "base64_decode", + "base64_encode", + "bin2hex", + "encoding", + "hex", + "hex2bin", + "rfc4648" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/constant_time_encoding/issues", + "source": "https://github.com/paragonie/constant_time_encoding" + }, + "time": "2022-06-14T06:56:20+00:00" + }, + { + "name": "paragonie/random_compat", + "version": "v9.99.100", + "source": { + "type": "git", + "url": "https://github.com/paragonie/random_compat.git", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", + "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", + "shasum": "" + }, + "require": { + "php": ">= 7" + }, + "require-dev": { + "phpunit/phpunit": "4.*|5.*", + "vimeo/psalm": "^1" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" + } + ], + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "keywords": [ + "csprng", + "polyfill", + "pseudorandom", + "random" + ], + "support": { + "email": "info@paragonie.com", + "issues": "https://github.com/paragonie/random_compat/issues", + "source": "https://github.com/paragonie/random_compat" + }, + "time": "2020-10-15T08:29:30+00:00" + }, + { + "name": "paragonie/sodium_compat", + "version": "v1.20.0", + "source": { + "type": "git", + "url": "https://github.com/paragonie/sodium_compat.git", + "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6", + "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6", + "shasum": "" + }, + "require": { + "paragonie/random_compat": ">=1", + "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8" + }, + "require-dev": { + "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9" + }, + "suggest": { + "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.", + "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security." + }, + "type": "library", + "autoload": { + "files": [ + "autoload.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "ISC" + ], + "authors": [ + { + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com" + }, + { + "name": "Frank Denis", + "email": "jedisct1@pureftpd.org" + } + ], + "description": "Pure PHP implementation of libsodium; uses the PHP extension if it exists", + "keywords": [ + "Authentication", + "BLAKE2b", + "ChaCha20", + "ChaCha20-Poly1305", + "Chapoly", + "Curve25519", + "Ed25519", + "EdDSA", + "Edwards-curve Digital Signature Algorithm", + "Elliptic Curve Diffie-Hellman", + "Poly1305", + "Pure-PHP cryptography", + "RFC 7748", + "RFC 8032", + "Salpoly", + "Salsa20", + "X25519", + "XChaCha20-Poly1305", + "XSalsa20-Poly1305", + "Xchacha20", + "Xsalsa20", + "aead", + "cryptography", + "ecdh", + "elliptic curve", + "elliptic curve cryptography", + "encryption", + "libsodium", + "php", + "public-key cryptography", + "secret-key cryptography", + "side-channel resistant" + ], + "support": { + "issues": "https://github.com/paragonie/sodium_compat/issues", + "source": "https://github.com/paragonie/sodium_compat/tree/v1.20.0" + }, + "time": "2023-04-30T00:54:53+00:00" + }, { "name": "psr/cache", "version": "3.0.0", @@ -2023,6 +2353,54 @@ }, "time": "2021-02-03T23:26:27+00:00" }, + { + "name": "psr/clock", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/clock.git", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/clock/zipball/e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "reference": "e41a24703d4560fd0acb709162f73b8adfc3aa0d", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Clock\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for reading the clock.", + "homepage": "https://github.com/php-fig/clock", + "keywords": [ + "clock", + "now", + "psr", + "psr-20", + "time" + ], + "support": { + "issues": "https://github.com/php-fig/clock/issues", + "source": "https://github.com/php-fig/clock/tree/1.0.0" + }, + "time": "2022-11-25T14:36:26+00:00" + }, { "name": "psr/container", "version": "2.0.2", @@ -2127,31 +2505,32 @@ "time": "2019-01-08T18:20:26+00:00" }, { - "name": "psr/http-message", - "version": "1.1", + "name": "psr/http-client", + "version": "1.0.3", "source": { "type": "git", - "url": "https://github.com/php-fig/http-message.git", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" + "url": "https://github.com/php-fig/http-client.git", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", - "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Http\\Message\\": "src/" + "Psr\\Http\\Client\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2161,50 +2540,49 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], - "description": "Common interface for HTTP messages", - "homepage": "https://github.com/php-fig/http-message", + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", "keywords": [ "http", - "http-message", + "http-client", "psr", - "psr-7", - "request", - "response" + "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-message/tree/1.1" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-04T09:50:52+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { - "name": "psr/log", - "version": "3.0.0", + "name": "psr/http-factory", + "version": "1.0.2", "source": { "type": "git", - "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "url": "https://github.com/php-fig/http-factory.git", + "reference": "e616d01114759c4c489f93b099585439f795fe35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", + "reference": "e616d01114759c4c489f93b099585439f795fe35", "shasum": "" }, "require": { - "php": ">=8.0.0" + "php": ">=7.0.0", + "psr/http-message": "^1.0 || ^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.x-dev" + "dev-master": "1.0.x-dev" } }, "autoload": { "psr-4": { - "Psr\\Log\\": "src" + "Psr\\Http\\Message\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -2217,38 +2595,145 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interface for logging libraries", - "homepage": "https://github.com/php-fig/log", + "description": "Common interfaces for PSR-7 HTTP message factories", "keywords": [ - "log", + "factory", + "http", + "message", "psr", - "psr-3" + "psr-17", + "psr-7", + "request", + "response" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/http-factory/tree/1.0.2" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2023-04-10T20:10:41+00:00" }, { - "name": "ralouphie/getallheaders", - "version": "3.0.3", + "name": "psr/http-message", + "version": "1.1", "source": { "type": "git", - "url": "https://github.com/ralouphie/getallheaders.git", - "reference": "120b605dfeb996808c31b6477290a714d356e822" + "url": "https://github.com/php-fig/http-message.git", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", - "reference": "120b605dfeb996808c31b6477290a714d356e822", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/cb6ce4845ce34a8ad9e68117c10ee90a29919eba", + "reference": "cb6ce4845ce34a8ad9e68117c10ee90a29919eba", "shasum": "" }, "require": { - "php": ">=5.6" + "php": "^7.2 || ^8.0" }, - "require-dev": { - "php-coveralls/php-coveralls": "^2.1", - "phpunit/phpunit": "^5 || ^6.5" + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/1.1" + }, + "time": "2023-04-04T09:50:52+00:00" + }, + { + "name": "psr/log", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/php-fig/log.git", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", + "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "shasum": "" + }, + "require": { + "php": ">=8.0.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Log\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common interface for logging libraries", + "homepage": "https://github.com/php-fig/log", + "keywords": [ + "log", + "psr", + "psr-3" + ], + "support": { + "source": "https://github.com/php-fig/log/tree/3.0.0" + }, + "time": "2021-07-14T16:46:02+00:00" + }, + { + "name": "ralouphie/getallheaders", + "version": "3.0.3", + "source": { + "type": "git", + "url": "https://github.com/ralouphie/getallheaders.git", + "reference": "120b605dfeb996808c31b6477290a714d356e822" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822", + "reference": "120b605dfeb996808c31b6477290a714d356e822", + "shasum": "" + }, + "require": { + "php": ">=5.6" + }, + "require-dev": { + "php-coveralls/php-coveralls": "^2.1", + "phpunit/phpunit": "^5 || ^6.5" }, "type": "library", "autoload": { @@ -2680,6 +3165,182 @@ }, "time": "2023-09-03T09:24:00+00:00" }, + { + "name": "spomky-labs/base64url", + "version": "v2.0.4", + "source": { + "type": "git", + "url": "https://github.com/Spomky-Labs/base64url.git", + "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Spomky-Labs/base64url/zipball/7752ce931ec285da4ed1f4c5aa27e45e097be61d", + "reference": "7752ce931ec285da4ed1f4c5aa27e45e097be61d", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "require-dev": { + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "^0.11|^0.12", + "phpstan/phpstan-beberlei-assert": "^0.11|^0.12", + "phpstan/phpstan-deprecation-rules": "^0.11|^0.12", + "phpstan/phpstan-phpunit": "^0.11|^0.12", + "phpstan/phpstan-strict-rules": "^0.11|^0.12" + }, + "type": "library", + "autoload": { + "psr-4": { + "Base64Url\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky-Labs/base64url/contributors" + } + ], + "description": "Base 64 URL Safe Encoding/Decoding PHP Library", + "homepage": "https://github.com/Spomky-Labs/base64url", + "keywords": [ + "base64", + "rfc4648", + "safe", + "url" + ], + "support": { + "issues": "https://github.com/Spomky-Labs/base64url/issues", + "source": "https://github.com/Spomky-Labs/base64url/tree/v2.0.4" + }, + "funding": [ + { + "url": "https://github.com/Spomky", + "type": "github" + }, + { + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" + } + ], + "time": "2020-11-03T09:10:25+00:00" + }, + { + "name": "spomky-labs/pki-framework", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/Spomky-Labs/pki-framework.git", + "reference": "86102bdd19379b2c6e5b0feb94fd490d40e7d133" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/86102bdd19379b2c6e5b0feb94fd490d40e7d133", + "reference": "86102bdd19379b2c6e5b0feb94fd490d40e7d133", + "shasum": "" + }, + "require": { + "brick/math": "^0.10|^0.11|^0.12", + "ext-mbstring": "*", + "php": ">=8.1" + }, + "require-dev": { + "ekino/phpstan-banned-code": "^1.0", + "ext-gmp": "*", + "ext-openssl": "*", + "infection/infection": "^0.27", + "php-parallel-lint/php-parallel-lint": "^1.3", + "phpstan/extension-installer": "^1.3", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-beberlei-assert": "^1.0", + "phpstan/phpstan-deprecation-rules": "^1.0", + "phpstan/phpstan-phpunit": "^1.1", + "phpstan/phpstan-strict-rules": "^1.3", + "phpunit/phpunit": "^10.1", + "rector/rector": "^0.19", + "roave/security-advisories": "dev-latest", + "symfony/phpunit-bridge": "^6.4|^7.0", + "symfony/string": "^6.4|^7.0", + "symfony/var-dumper": "^6.4|^7.0", + "symplify/easy-coding-standard": "^12.0" + }, + "suggest": { + "ext-bcmath": "For better performance (or GMP)", + "ext-gmp": "For better performance (or BCMath)", + "ext-openssl": "For OpenSSL based cyphering" + }, + "type": "library", + "autoload": { + "psr-4": { + "SpomkyLabs\\Pki\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Joni Eskelinen", + "email": "jonieske@gmail.com", + "role": "Original developer" + }, + { + "name": "Florent Morselli", + "email": "florent.morselli@spomky-labs.com", + "role": "Spomky-Labs PKI Framework developer" + } + ], + "description": "A PHP framework for managing Public Key Infrastructures. It comprises X.509 public key certificates, attribute certificates, certification requests and certification path validation.", + "homepage": "https://github.com/spomky-labs/pki-framework", + "keywords": [ + "DER", + "Private Key", + "ac", + "algorithm identifier", + "asn.1", + "asn1", + "attribute certificate", + "certificate", + "certification request", + "cryptography", + "csr", + "decrypt", + "ec", + "encrypt", + "pem", + "pkcs", + "public key", + "rsa", + "sign", + "signature", + "verify", + "x.509", + "x.690", + "x509", + "x690" + ], + "support": { + "issues": "https://github.com/Spomky-Labs/pki-framework/issues", + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.1.1" + }, + "funding": [ + { + "url": "https://github.com/Spomky", + "type": "github" + }, + { + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" + } + ], + "time": "2024-02-05T20:37:46+00:00" + }, { "name": "symfony/config", "version": "v6.4.3", @@ -3334,10 +3995,181 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Finds files and directories via an intuitive fluent interface", + "description": "Finds files and directories via an intuitive fluent interface", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/finder/tree/v6.4.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-10-31T17:30:12+00:00" + }, + { + "name": "symfony/http-client", + "version": "v6.4.3", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client.git", + "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client/zipball/a9034bc119fab8238f76cf49c770f3135f3ead86", + "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "psr/log": "^1|^2|^3", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/http-client-contracts": "^3", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "php-http/discovery": "<1.15", + "symfony/http-foundation": "<6.3" + }, + "provide": { + "php-http/async-client-implementation": "*", + "php-http/client-implementation": "*", + "psr/http-client-implementation": "1.0", + "symfony/http-client-implementation": "3.0" + }, + "require-dev": { + "amphp/amp": "^2.5", + "amphp/http-client": "^4.2.1", + "amphp/http-tunnel": "^1.0", + "amphp/socket": "^1.1", + "guzzlehttp/promises": "^1.4", + "nyholm/psr7": "^1.0", + "php-http/httplug": "^1.0|^2.0", + "psr/http-client": "^1.0", + "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/http-kernel": "^5.4|^6.0|^7.0", + "symfony/messenger": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.0|^7.0", + "symfony/stopwatch": "^5.4|^6.0|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", + "homepage": "https://symfony.com", + "keywords": [ + "http" + ], + "support": { + "source": "https://github.com/symfony/http-client/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-29T15:01:07+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v3.4.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "1ee70e699b41909c209a0c930f11034b93578654" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", + "reference": "1ee70e699b41909c209a0c930f11034b93578654", + "shasum": "" + }, + "require": { + "php": ">=8.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.4-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + }, + "exclude-from-classmap": [ + "/Test/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to HTTP clients", "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" }, "funding": [ { @@ -3353,7 +4185,7 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:30:12+00:00" + "time": "2023-07-30T20:28:31+00:00" }, { "name": "symfony/http-foundation", @@ -5161,127 +5993,489 @@ "conflict": { "symfony/console": "<5.4" }, - "require-dev": { - "symfony/console": "^5.4|^6.0|^7.0" + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0" + }, + "bin": [ + "Resources/bin/yaml-lint" + ], + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Loads and dumps YAML files", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/yaml/tree/v6.4.3" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-01-23T14:51:35+00:00" + }, + { + "name": "twig/twig", + "version": "v3.8.0", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php80": "^1.22" + }, + "require-dev": { + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "https://twig.symfony.com", + "keywords": [ + "templating" + ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2023-11-21T18:54:41+00:00" + }, + { + "name": "web-token/jwt-key-mgmt", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/web-token/jwt-key-mgmt.git", + "reference": "4d2a5a1a86477dd50b89aff76962816ddbd64590" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/web-token/jwt-key-mgmt/zipball/4d2a5a1a86477dd50b89aff76962816ddbd64590", + "reference": "4d2a5a1a86477dd50b89aff76962816ddbd64590", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "php": ">=8.1", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "web-token/jwt-library": "^3.3" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "homepage": "https://github.com/web-token", + "keywords": [ + "JOSE", + "JWE", + "JWK", + "JWKSet", + "JWS", + "Jot", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "bundle", + "jwa", + "jwt", + "symfony" + ], + "support": { + "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.3.0" + }, + "funding": [ + { + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" + } + ], + "abandoned": "web-token/jwt-library", + "time": "2024-02-22T07:19:34+00:00" + }, + { + "name": "web-token/jwt-library", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/web-token/jwt-library.git", + "reference": "5edf0f193425bb9c695a433180ddf9d263f55063" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/5edf0f193425bb9c695a433180ddf9d263f55063", + "reference": "5edf0f193425bb9c695a433180ddf9d263f55063", + "shasum": "" + }, + "require": { + "brick/math": "^0.9|^0.10|^0.11|^0.12", + "ext-json": "*", + "ext-mbstring": "*", + "paragonie/constant_time_encoding": "^2.6", + "paragonie/sodium_compat": "^1.20", + "php": ">=8.1", + "psr/clock": "^1.0", + "psr/http-client": "^1.0", + "psr/http-factory": "^1.0", + "spomky-labs/pki-framework": "^1.0", + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/polyfill-mbstring": "^1.12" + }, + "conflict": { + "spomky-labs/jose": "*" + }, + "suggest": { + "ext-bcmath": "GMP or BCMath is highly recommended to improve the library performance", + "ext-gmp": "GMP or BCMath is highly recommended to improve the library performance", + "ext-openssl": "For key management (creation, optimization, etc.) and some algorithms (AES, RSA, ECDSA, etc.)", + "ext-sodium": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys", + "paragonie/sodium_compat": "Sodium is required for OKP key creation, EdDSA signature algorithm and ECDH-ES key encryption with OKP keys", + "spomky-labs/aes-key-wrap": "For all Key Wrapping algorithms (A128KW, A192KW, A256KW, A128GCMKW, A192GCMKW, A256GCMKW, PBES2-HS256+A128KW, PBES2-HS384+A192KW, PBES2-HS512+A256KW...)", + "symfony/http-client": "To enable JKU/X5U support." + }, + "type": "library", + "autoload": { + "psr-4": { + "Jose\\Component\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "description": "JWT library", + "homepage": "https://github.com/web-token", + "keywords": [ + "JOSE", + "JWE", + "JWK", + "JWKSet", + "JWS", + "Jot", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "bundle", + "jwa", + "jwt", + "symfony" + ], + "support": { + "issues": "https://github.com/web-token/jwt-library/issues", + "source": "https://github.com/web-token/jwt-library/tree/3.3.0" + }, + "funding": [ + { + "url": "https://github.com/Spomky", + "type": "github" + }, + { + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" + } + ], + "time": "2024-02-22T08:15:45+00:00" + }, + { + "name": "web-token/jwt-signature", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/web-token/jwt-signature.git", + "reference": "eccfd59e658d4118414cf6d14229aa52eec387e7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/web-token/jwt-signature/zipball/eccfd59e658d4118414cf6d14229aa52eec387e7", + "reference": "eccfd59e658d4118414cf6d14229aa52eec387e7", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "web-token/jwt-library": "^3.3" + }, + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" + }, + { + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" + } + ], + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "homepage": "https://github.com/web-token", + "keywords": [ + "JOSE", + "JWE", + "JWK", + "JWKSet", + "JWS", + "Jot", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "bundle", + "jwa", + "jwt", + "symfony" + ], + "support": { + "source": "https://github.com/web-token/jwt-signature/tree/3.3.0" + }, + "funding": [ + { + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" + } + ], + "abandoned": "web-token/jwt-library", + "time": "2024-02-22T07:19:34+00:00" + }, + { + "name": "web-token/jwt-signature-algorithm-ecdsa", + "version": "3.3.0", + "source": { + "type": "git", + "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git", + "reference": "28516e170f6ee6d13766d9e2b912c2853e1ac5e4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/web-token/jwt-signature-algorithm-ecdsa/zipball/28516e170f6ee6d13766d9e2b912c2853e1ac5e4", + "reference": "28516e170f6ee6d13766d9e2b912c2853e1ac5e4", + "shasum": "" + }, + "require": { + "ext-openssl": "*", + "php": ">=8.1", + "web-token/jwt-library": "^3.3" }, - "bin": [ - "Resources/bin/yaml-lint" - ], "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\Yaml\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" }, { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" } ], - "description": "Loads and dumps YAML files", - "homepage": "https://symfony.com", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "homepage": "https://github.com/web-token", + "keywords": [ + "JOSE", + "JWE", + "JWK", + "JWKSet", + "JWS", + "Jot", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "bundle", + "jwa", + "jwt", + "symfony" + ], "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.3" + "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.3.0" }, "funding": [ { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" } ], - "time": "2024-01-23T14:51:35+00:00" + "abandoned": "web-token/jwt-library", + "time": "2024-02-22T07:19:34+00:00" }, { - "name": "twig/twig", - "version": "v3.8.0", + "name": "web-token/jwt-util-ecc", + "version": "3.3.0", "source": { "type": "git", - "url": "https://github.com/twigphp/Twig.git", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + "url": "https://github.com/web-token/jwt-util-ecc.git", + "reference": "667934c5c6e37238f4e67d51aa3ba55abc703e1a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "url": "https://api.github.com/repos/web-token/jwt-util-ecc/zipball/667934c5c6e37238f4e67d51aa3ba55abc703e1a", + "reference": "667934c5c6e37238f4e67d51aa3ba55abc703e1a", "shasum": "" }, "require": { - "php": ">=7.2.5", - "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" - }, - "require-dev": { - "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + "brick/math": "^0.9|^0.10|^0.11|^0.12", + "php": ">=8.1", + "web-token/jwt-library": "^3.3" }, "type": "library", - "autoload": { - "psr-4": { - "Twig\\": "src/" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, - { - "name": "Twig Team", - "role": "Contributors" + "name": "Florent Morselli", + "homepage": "https://github.com/Spomky" }, { - "name": "Armin Ronacher", - "email": "armin.ronacher@active-4.com", - "role": "Project Founder" + "name": "All contributors", + "homepage": "https://github.com/web-token/jwt-framework/contributors" } ], - "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "https://twig.symfony.com", + "description": "[DEPRECATED] Please use web-token/jwt-library instead.", + "homepage": "https://github.com/web-token", "keywords": [ - "templating" + "JOSE", + "JWE", + "JWK", + "JWKSet", + "JWS", + "Jot", + "RFC7515", + "RFC7516", + "RFC7517", + "RFC7518", + "RFC7519", + "RFC7520", + "bundle", + "jwa", + "jwt", + "symfony" ], "support": { - "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + "source": "https://github.com/web-token/jwt-util-ecc/tree/3.3.0" }, "funding": [ { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/twig/twig", - "type": "tidelift" + "url": "https://www.patreon.com/FlorentMorselli", + "type": "patreon" } ], - "time": "2023-11-21T18:54:41+00:00" + "abandoned": "web-token/jwt-library", + "time": "2024-02-22T07:19:34+00:00" } ], "packages-dev": [ @@ -8614,177 +9808,6 @@ ], "time": "2024-01-29T15:02:55+00:00" }, - { - "name": "symfony/http-client", - "version": "v6.4.3", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-client.git", - "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/a9034bc119fab8238f76cf49c770f3135f3ead86", - "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86", - "shasum": "" - }, - "require": { - "php": ">=8.1", - "psr/log": "^1|^2|^3", - "symfony/deprecation-contracts": "^2.5|^3", - "symfony/http-client-contracts": "^3", - "symfony/service-contracts": "^2.5|^3" - }, - "conflict": { - "php-http/discovery": "<1.15", - "symfony/http-foundation": "<6.3" - }, - "provide": { - "php-http/async-client-implementation": "*", - "php-http/client-implementation": "*", - "psr/http-client-implementation": "1.0", - "symfony/http-client-implementation": "3.0" - }, - "require-dev": { - "amphp/amp": "^2.5", - "amphp/http-client": "^4.2.1", - "amphp/http-tunnel": "^1.0", - "amphp/socket": "^1.1", - "guzzlehttp/promises": "^1.4", - "nyholm/psr7": "^1.0", - "php-http/httplug": "^1.0|^2.0", - "psr/http-client": "^1.0", - "symfony/dependency-injection": "^5.4|^6.0|^7.0", - "symfony/http-kernel": "^5.4|^6.0|^7.0", - "symfony/messenger": "^5.4|^6.0|^7.0", - "symfony/process": "^5.4|^6.0|^7.0", - "symfony/stopwatch": "^5.4|^6.0|^7.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Symfony\\Component\\HttpClient\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides powerful methods to fetch HTTP resources synchronously or asynchronously", - "homepage": "https://symfony.com", - "keywords": [ - "http" - ], - "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.3" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T15:01:07+00:00" - }, - { - "name": "symfony/http-client-contracts", - "version": "v3.4.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "1ee70e699b41909c209a0c930f11034b93578654" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", - "reference": "1ee70e699b41909c209a0c930f11034b93578654", - "shasum": "" - }, - "require": { - "php": ">=8.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "3.4-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\HttpClient\\": "" - }, - "exclude-from-classmap": [ - "/Test/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Generic abstractions related to HTTP clients", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2023-07-30T20:28:31+00:00" - }, { "name": "theseer/tokenizer", "version": "1.2.2", From 5c51f2ef7f56a4faee684999a701ef75a2e6bda2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Aug 2022 22:29:23 +0200 Subject: [PATCH 0003/1214] [ticket/17010] Add webpush to container definition PHPBB3-17010 --- .../default/container/services_notification.yml | 12 ++++++++++++ phpBB/config/default/container/tables.yml | 1 + tests/notification/base.php | 1 + .../notification/notification_method_email_test.php | 1 + tests/notification/submit_post_base.php | 1 + 5 files changed, 16 insertions(+) diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index a037ad73526..ebde7bcf5ab 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -243,3 +243,15 @@ services: - '%core.php_ext%' tags: - { name: notification.method } + + notification.method.webpush: + class: phpbb\notification\method\webpush + shared: false + arguments: + - '@user_loader' + - '@user' + - '@config' + - '@dbal.conn' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.notification_push%' diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml index 005f3ba9277..f3a4e1b4abd 100644 --- a/phpBB/config/default/container/tables.yml +++ b/phpBB/config/default/container/tables.yml @@ -38,6 +38,7 @@ parameters: tables.modules: '%core.table_prefix%modules' tables.notification_emails: '%core.table_prefix%notification_emails' tables.notification_types: '%core.table_prefix%notification_types' + tables.notification_push: '%core.table_prefix%notification_push' tables.notifications: '%core.table_prefix%notifications' tables.poll_options: '%core.table_prefix%poll_options' tables.poll_votes: '%core.table_prefix%poll_votes' diff --git a/tests/notification/base.php b/tests/notification/base.php index 545508eedd3..eb888cb0ae6 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -124,6 +124,7 @@ protected function setUp(): void $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); $this->notifications = new phpbb_notification_manager_helper( array(), diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index d9b52cae2d6..efcac83035f 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -91,6 +91,7 @@ protected function setUp(): void $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); $phpbb_container->set( 'text_formatter.s9e.mention_helper', new \phpbb\textformatter\s9e\mention_helper( diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index e8ad00e5ef9..cb5b8d0d2ae 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -154,6 +154,7 @@ protected function setUp(): void $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); $phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); $phpbb_container->compile(); From 3feeb237caaab696657c01624261d8fdf3d294d6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 19 Aug 2022 22:43:52 +0200 Subject: [PATCH 0004/1214] [ticket/17010] Add migration for notificatio_push table PHPBB3-17010 --- .../data/v400/add_notification_push_table.php | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php diff --git a/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php b/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php new file mode 100644 index 00000000000..0d71f5fb600 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php @@ -0,0 +1,55 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class add_notification_push_table extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function effectively_installed(): bool + { + return $this->db_tools->sql_table_exists($this->table_prefix . 'notification_push'); + } + + public function update_schema(): array + { + return [ + 'add_tables' => [ + $this->table_prefix . 'notification_push' => [ + 'COLUMNS' => [ + 'notification_type_id' => ['USINT', 0], + 'item_id' => ['ULINT', 0], + 'item_parent_id' => ['ULINT', 0], + 'user_id' => ['ULINT', 0], + ], + 'PRIMARY_KEY' => ['notification_type_id', 'item_id', 'item_parent_id', 'user_id'], + ], + ], + ]; + } + + public function revert_schema(): array + { + return [ + 'drop_tables' => [$this->table_prefix . 'notification_push'], + ]; + } +} From 769f5bc3977df5579c2d70812efabecc71f32087 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Aug 2022 22:56:34 +0200 Subject: [PATCH 0005/1214] [ticket/17010] Add settings and some more notification code PHPBB3-17010 --- phpBB/includes/acp/acp_board.php | 13 +++++ phpBB/includes/acp/info/acp_board.php | 1 + .../data/v400/add_notification_push_table.php | 27 ++++++++++ phpBB/phpbb/notification/method/webpush.php | 53 +++++++++++++++++++ 4 files changed, 94 insertions(+) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index df7c8bf6576..d6ce8f23c45 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -485,6 +485,19 @@ function main($id, $mode) ); break; + case 'webpush': + $display_vars = [ + 'title' => 'ACP_WEBPUSH_SETTINGS', + 'vars' => [ + 'legend1' => 'GENERAL_SETTINGS', + 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], + 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], + + 'legend3' => 'ACP_SUBMIT_CHANGES', + ], + ]; + break; + default: trigger_error('NO_MODE', E_USER_ERROR); break; diff --git a/phpBB/includes/acp/info/acp_board.php b/phpBB/includes/acp/info/acp_board.php index 1a3ee7b6be5..a1d9f4fdd1b 100644 --- a/phpBB/includes/acp/info/acp_board.php +++ b/phpBB/includes/acp/info/acp_board.php @@ -30,6 +30,7 @@ function module() 'auth' => array('title' => 'ACP_AUTH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')), 'email' => array('title' => 'ACP_EMAIL_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')), + 'webpush' => array('title' => 'ACP_WEBPUSH_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_CLIENT_COMMUNICATION')), 'cookie' => array('title' => 'ACP_COOKIE_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')), 'server' => array('title' => 'ACP_SERVER_SETTINGS', 'auth' => 'acl_a_server', 'cat' => array('ACP_SERVER_CONFIGURATION')), diff --git a/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php b/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php index 0d71f5fb600..e822a394057 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php +++ b/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php @@ -52,4 +52,31 @@ public function revert_schema(): array 'drop_tables' => [$this->table_prefix . 'notification_push'], ]; } + + public function update_data(): array + { + return [ + ['config.add', ['webpush_vapid_public', '']], + ['config.add', ['webpush_vapid_private', '']], + ['module.add', [ + 'acp', + 'ACP_BOARD_CONFIGURATION', + [ + 'module_basename' => 'acp_board', + 'module_langname' => 'ACP_WEBPUSH_SETTINGS', + 'module_mode' => 'webpush', + 'module_auth' => 'acl_a_board', + 'after' => ['settings', 'ACP_JABBER_SETTINGS'], + ], + ]], + ]; + } + + public function revert_data(): array + { + return [ + ['config.remove', ['webpush_vapid_public']], + ['config.remove', ['webpush_vapid_private']], + ]; + } } diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index f88cfc7cf96..48787901b03 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -115,10 +115,63 @@ public function notify() $insert_buffer->flush(); // @todo: add actual web push code + $this->notify_using_webpush(); return false; } + protected function notify_using_webpush() + { + if (empty($this->queue)) + { + return; + } + + // Load all users we want to notify (we need their email address) + $user_ids = []; + foreach ($this->queue as $notification) + { + $user_ids[] = $notification->user_id; + } + + // We do not send emails to banned users + if (!function_exists('phpbb_get_banned_user_ids')) + { + include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); + } + $banned_users = phpbb_get_banned_user_ids($user_ids); + + // Load all the users we need + $this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE)); + + // Time to go through the queue and send emails + /** @var type_interface $notification */ + foreach ($this->queue as $notification) + { + $user = $this->user_loader->get_user($notification->user_id); + + if ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL) + { + continue; + } + + // add actual web push data + $data['data'] = [ + 'badge' => '', // @todo: to be filled? + 'body' => $notification->get_title(), + 'icon' => '', // @todo: to be filled? + 'image' => '', // @todo: to be filled? + 'title' => $this->config['sitename'], + 'url' => $notification->get_url(), + ]; + + // @todo: start implementing actual web push code + } + + // We're done, empty the queue + $this->empty_queue(); + } + /** * {@inheritdoc} */ From d05e2dd043a6fe17517bb980062079b61dccc643 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Aug 2022 21:31:04 +0200 Subject: [PATCH 0006/1214] [ticket/17010] Add first web push settings to ACP PHPBB3-17010 --- phpBB/includes/acp/acp_board.php | 2 +- phpBB/language/en/acp/board.php | 8 ++++++++ phpBB/language/en/acp/common.php | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index d6ce8f23c45..2530c3e2548 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -491,7 +491,7 @@ function main($id, $mode) 'vars' => [ 'legend1' => 'GENERAL_SETTINGS', 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], - 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], + 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], 'legend3' => 'ACP_SUBMIT_CHANGES', ], diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index ec2d0236ecb..37303d481a9 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -599,6 +599,14 @@ 'USE_SMTP_EXPLAIN' => 'Select “Yes” if you want or have to send email via a named server instead of the local mail function.', )); +$lang = array_merge($lang, [ + 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Webpush for board notifications. Webpush is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', + 'WEBPUSH_VAPID_PUBLIC' => 'VAPID public key', + 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The VAPID public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all webpush subscriptions.', + 'WEBPUSH_VAPID_PRIVATE' => 'VAPID private key', + 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The VAPID private key will be used to create authenticated push messages sent by your site. The VAPID private key must be a valid public-private key pair with the VAPID public key.
Warning: Changing the VAPID private key will automatically invalidate all webpush subscriptions.', +]); + // Jabber settings $lang = array_merge($lang, array( 'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index aeab0af262c..84c047af54b 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -219,6 +219,7 @@ 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS' => 'View global moderation permissions', 'ACP_VIEW_USER_PERMISSIONS' => 'View user-based permissions', + 'ACP_WEBPUSH_SETTINGS' => 'Webpush settings', 'ACP_WORDS' => 'Word censoring', 'ACTION' => 'Action', From 873a22176dbe477ba6e3f4af2481feb0e6f81bf1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 30 Aug 2022 20:21:03 +0200 Subject: [PATCH 0007/1214] [ticket/17010] Add Webpush settings and language entries PHPBB3-17010 --- phpBB/includes/acp/acp_board.php | 23 +++++++++++++++++++ phpBB/install/schemas/schema_data.sql | 3 +++ phpBB/language/en/acp/board.php | 2 ++ ...ication_push_table.php => add_webpush.php} | 6 ++++- .../migrations_check_config_added_test.php | 4 ++-- 5 files changed, 35 insertions(+), 3 deletions(-) rename phpBB/phpbb/db/migration/data/v400/{add_notification_push_table.php => add_webpush.php} (88%) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 2530c3e2548..ceb7f47d58f 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -19,6 +19,7 @@ * @ignore */ +use Minishlink\WebPush\VAPID; use phpbb\config\config; use phpbb\language\language; use phpbb\user; @@ -490,6 +491,7 @@ function main($id, $mode) 'title' => 'ACP_WEBPUSH_SETTINGS', 'vars' => [ 'legend1' => 'GENERAL_SETTINGS', + 'webpush_enable' => ['lang' => 'WEBPUSH_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], @@ -537,6 +539,27 @@ function main($id, $mode) } } + if ($mode == 'webpush') + { + // Create VAPID keys if keys are empty and web push is enabled + if ($submit && $cfg_array['webpush_enable'] && $cfg_array['webpush_enable'] != $config['webpush_enable'] + && empty($cfg_array['webpush_vapid_public']) && empty($cfg_array['webpush_vapid_private']) + && empty($config['webpush_vapid_public']) && empty($config['webpush_vapid_private'])) + { + try + { + $vapid_keys = VAPID::createVapidKeys(); + $cfg_array['webpush_vapid_public'] = $vapid_keys['publicKey']; + $cfg_array['webpush_vapid_private'] = $vapid_keys['privateKey']; + } + catch (\ErrorException $exception) + { + // Nothing we can do about this, user will have to follow the + // documentation and manually create these. + } + } + } + // We validate the complete config if wished validate_config_vars($display_vars['vars'], $cfg_array, $error); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 844ba402b39..b924f706035 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -326,6 +326,9 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\avatar\pro INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\avatar\config\path', 'images/avatars/upload'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\provider', 'phpbb\storage\provider\local'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\config\path', 'store'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_enable', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_public', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_private', ''); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 37303d481a9..8fe9f832f2e 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -601,6 +601,8 @@ $lang = array_merge($lang, [ 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Webpush for board notifications. Webpush is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', + 'WEBPUSH_ENABLE' => 'Enable Webpush', + 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush.
Note: If VAPID keys have not been set, phpBB will try to automatically create them when enabling Webpush.', 'WEBPUSH_VAPID_PUBLIC' => 'VAPID public key', 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The VAPID public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all webpush subscriptions.', 'WEBPUSH_VAPID_PRIVATE' => 'VAPID private key', diff --git a/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php similarity index 88% rename from phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php rename to phpBB/phpbb/db/migration/data/v400/add_webpush.php index e822a394057..3230acfc8db 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_notification_push_table.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -13,9 +13,10 @@ namespace phpbb\db\migration\data\v400; +use Minishlink\WebPush\VAPID; use phpbb\db\migration\migration; -class add_notification_push_table extends migration +class add_webpush extends migration { public static function depends_on(): array { @@ -56,6 +57,7 @@ public function revert_schema(): array public function update_data(): array { return [ + ['config.add', ['webpush_enable', false]], ['config.add', ['webpush_vapid_public', '']], ['config.add', ['webpush_vapid_private', '']], ['module.add', [ @@ -75,8 +77,10 @@ public function update_data(): array public function revert_data(): array { return [ + ['config.remove', ['webpush_enable']], ['config.remove', ['webpush_vapid_public']], ['config.remove', ['webpush_vapid_private']], + ['module.remove', ['acp', 'ACP_BOARD_CONFIGURATION', 'ACP_WEBPUSH_SETTINGS']] ]; } } diff --git a/tests/migrations/migrations_check_config_added_test.php b/tests/migrations/migrations_check_config_added_test.php index 969a0f5e795..1472f9e3709 100644 --- a/tests/migrations/migrations_check_config_added_test.php +++ b/tests/migrations/migrations_check_config_added_test.php @@ -142,7 +142,7 @@ public function get_config_options_from_migrations() continue; } - // Fill error entries for configuration options which were not added to shema_data.sql + // Fill error entries for configuration options which were not added to schema_data.sql if (!isset($config_names[$config_name])) { $config_names[$config_name] = [$config_name, $class]; @@ -160,7 +160,7 @@ public function get_config_options_from_migrations() */ public function test_config_option_exists_in_schema_data($config_name, $class) { - $message = 'Migration: %1$s, config_name: %2$s; not added to shema_data.sql'; + $message = 'Migration: %1$s, config_name: %2$s; not added to schema_data.sql'; $this->assertNotFalse(strpos($this->schema_data, $config_name), sprintf($message, $class, $config_name) From 1c64c695a9832b8d00ff9546443e68b0ff6c4821 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 30 Aug 2022 20:49:07 +0200 Subject: [PATCH 0008/1214] [ticket/17010] Implement basic logic for webpush notifications PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 46 ++++++++++++++++++--- 1 file changed, 41 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 48787901b03..eab1dac6811 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -15,6 +15,7 @@ use phpbb\config\config; use phpbb\db\driver\driver_interface; +use phpbb\json\sanitizer; use phpbb\notification\type\type_interface; use phpbb\user; use phpbb\user_loader; @@ -72,7 +73,8 @@ public function get_type(): string */ public function is_available(type_interface $notification_type = null): bool { - return parent::is_available($notification_type) && $this->config['webpush_enable'] && !empty($this->user->data['user_push_subscriptions']); + return parent::is_available($notification_type) && $this->config['webpush_enable'] + && !empty($this->config['webpush_vapid_public']) && !empty($this->config['webpush_vapid_private']); } /** @@ -114,13 +116,17 @@ public function notify() $insert_buffer->flush(); - // @todo: add actual web push code $this->notify_using_webpush(); return false; } - protected function notify_using_webpush() + /** + * Notify using web push + * + * @return void + */ + protected function notify_using_webpush(): void { if (empty($this->queue)) { @@ -144,28 +150,58 @@ protected function notify_using_webpush() // Load all the users we need $this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE)); + $web_push = new \Minishlink\WebPush\WebPush(); + // Time to go through the queue and send emails /** @var type_interface $notification */ foreach ($this->queue as $notification) { $user = $this->user_loader->get_user($notification->user_id); - if ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL) + $user_subscriptions = sanitizer::decode($this->user->data['user_push_subscriptions']); + + if ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL + || empty($user_subscriptions)) { continue; } // add actual web push data $data['data'] = [ - 'badge' => '', // @todo: to be filled? 'body' => $notification->get_title(), 'icon' => '', // @todo: to be filled? 'image' => '', // @todo: to be filled? 'title' => $this->config['sitename'], 'url' => $notification->get_url(), + 'user_id' => $notification->user_id, ]; + $json_data = json_encode($data); // @todo: start implementing actual web push code + + foreach ($user_subscriptions as $subscription) + { + try + { + $push_subscription = \Minishlink\WebPush\Subscription::create($subscription); + $web_push->queueNotification($push_subscription, $json_data); + } + catch (\ErrorException $exception) + { + // @todo: decide whether we want to remove invalid subscriptions directly? + // Might need too many resources ... + } + } + } + + // @todo: Try offloading to after request + try + { + $web_push->flush(); + } + catch (\ErrorException $exception) + { + // @todo: Add to error log if we can't flush ... } // We're done, empty the queue From 83cf915758f830c0544165b12411f6f8b8d385a8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Aug 2022 20:06:07 +0200 Subject: [PATCH 0009/1214] [ticket/17010] Add column for user push subscriptions PHPBB3-17010 --- phpBB/phpbb/db/migration/data/v400/add_webpush.php | 7 +++++++ phpBB/phpbb/notification/method/webpush.php | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php index 3230acfc8db..abc0ffc0794 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -44,6 +44,13 @@ public function update_schema(): array 'PRIMARY_KEY' => ['notification_type_id', 'item_id', 'item_parent_id', 'user_id'], ], ], + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'COLUMNS' => [ + 'user_push_subscriptions' => ['MTEXT_UNI', ''] + ], + ], + ], ]; } diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index eab1dac6811..2532246624b 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -168,17 +168,15 @@ protected function notify_using_webpush(): void // add actual web push data $data['data'] = [ + 'title' => $this->config['sitename'], 'body' => $notification->get_title(), 'icon' => '', // @todo: to be filled? 'image' => '', // @todo: to be filled? - 'title' => $this->config['sitename'], 'url' => $notification->get_url(), 'user_id' => $notification->user_id, ]; $json_data = json_encode($data); - // @todo: start implementing actual web push code - foreach ($user_subscriptions as $subscription) { try From af3108044576586efb1d9b67697319fb1bba89a2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Sep 2022 21:28:25 +0200 Subject: [PATCH 0010/1214] [ticket/17010] Add web-push-testing for implementing web push tests PHPBB3-17010 --- package-lock.json | 1671 ++++++++++++++++++++++++++++++++++++++++++++- package.json | 3 +- 2 files changed, 1650 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7471a2fec21..5801393ff31 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,8 @@ "postcss": "^8.4.31", "postcss-sorting": "^7.0.1", "stylelint": "^14.7.0", - "stylelint-order": "^5.0.0" + "stylelint-order": "^5.0.0", + "web-push-testing": "^1.0.0" } }, "node_modules/@babel/code-frame": { @@ -325,6 +326,19 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dev": true, + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/acorn": { "version": "8.7.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", @@ -471,6 +485,12 @@ "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, + "node_modules/arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "dev": true + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -537,6 +557,12 @@ "node": ">=0.10.0" } }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true + }, "node_modules/array-initial": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", @@ -819,6 +845,45 @@ "file-uri-to-path": "1.0.0" } }, + "node_modules/body-parser": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "dev": true, + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/body-parser/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/body-parser/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -894,12 +959,27 @@ "node": ">=0.4.0" } }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "dev": true + }, "node_modules/buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -1377,6 +1457,53 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "dev": true }, + "node_modules/connected-domain": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz", + "integrity": "sha512-lHlohUiJxlpunvDag2Y0pO20bnvarMjnrdciZeuJUqRwrf/5JHNhdpiPIr5GQ8IkqrFj5TDMQwcCjblGo1oeuA==", + "dev": true + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-disposition/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -1386,6 +1513,21 @@ "safe-buffer": "~5.1.1" } }, + "node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "dev": true + }, "node_modules/copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", @@ -1754,6 +1896,25 @@ "node": ">=0.10.0" } }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "dev": true, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, "node_modules/detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", @@ -1885,6 +2046,21 @@ "node": ">=0.10.0" } }, + "node_modules/ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dev": true, + "dependencies": { + "safe-buffer": "^5.0.1" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true + }, "node_modules/electron-to-chromium": { "version": "1.4.111", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz", @@ -1897,6 +2073,15 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -1983,6 +2168,12 @@ "node": ">=6" } }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "dev": true + }, "node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -2170,6 +2361,15 @@ "node": ">=0.10.0" } }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -2317,6 +2517,83 @@ "node": ">=0.10.0" } }, + "node_modules/express": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", + "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "dev": true, + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.0", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.10.3", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/express/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/express/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/express/node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, "node_modules/ext": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", @@ -2549,6 +2826,39 @@ "node": ">=0.10.0" } }, + "node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dev": true, + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/finalhandler/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/finalhandler/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, "node_modules/find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -2664,6 +2974,15 @@ "node": ">=0.10.0" } }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fraction.js": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", @@ -2689,6 +3008,15 @@ "node": ">=0.10.0" } }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -3396,6 +3724,46 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/http_ece": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz", + "integrity": "sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==", + "dev": true, + "dependencies": { + "urlsafe-base64": "~1.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dev": true, + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -3506,6 +3874,15 @@ "node": ">=0.10.0" } }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true, + "engines": { + "node": ">= 0.10" + } + }, "node_modules/is-absolute": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", @@ -3830,12 +4207,64 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "node_modules/jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dev": true, + "dependencies": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "engines": { + "node": ">=4", + "npm": ">=1.4.28" + } + }, + "node_modules/jsonwebtoken/node_modules/semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true, + "bin": { + "semver": "bin/semver" + } + }, "node_modules/just-debounce": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==", "dev": true }, + "node_modules/jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dev": true, + "dependencies": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "node_modules/jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "dependencies": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "node_modules/kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", @@ -4065,6 +4494,12 @@ "lodash.restparam": "^3.0.0" } }, + "node_modules/lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "dev": true + }, "node_modules/lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -4077,6 +4512,36 @@ "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, + "node_modules/lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "dev": true + }, + "node_modules/lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "dev": true + }, + "node_modules/lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "dev": true + }, + "node_modules/lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "dev": true + }, + "node_modules/lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "dev": true + }, "node_modules/lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", @@ -4100,6 +4565,12 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "dev": true + }, "node_modules/lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -4251,6 +4722,15 @@ "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/memoizee": { "version": "0.4.15", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", @@ -4305,6 +4785,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "dev": true + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", @@ -4314,6 +4800,15 @@ "node": ">= 8" } }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -4384,6 +4879,39 @@ "node": ">=0.10.0" } }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true, + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -4405,6 +4933,12 @@ "node": "*" } }, + "node_modules/minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, "node_modules/minimist-options": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", @@ -4465,6 +4999,18 @@ "node": ">=0.10.0" } }, + "node_modules/mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "dependencies": { + "minimist": "^1.2.6" + }, + "bin": { + "mkdirp": "bin/cmd.js" + } + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -4546,45 +5092,111 @@ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, "dependencies": { - "is-plain-object": "^2.0.4" + "is-plain-object": "^2.0.4" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nanomatch/node_modules/is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "dependencies": { + "isobject": "^3.0.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/nanomatch/node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/next-tick": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", + "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", + "dev": true + }, + "node_modules/node-persist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz", + "integrity": "sha512-NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w==", + "dev": true, + "dependencies": { + "is-absolute": "^0.2.6", + "mkdirp": "~0.5.1", + "q": "~1.1.1" + } + }, + "node_modules/node-persist/node_modules/is-absolute": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", + "integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==", + "dev": true, + "dependencies": { + "is-relative": "^0.2.1", + "is-windows": "^0.2.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/node-persist/node_modules/is-relative": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", + "integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==", + "dev": true, + "dependencies": { + "is-unc-path": "^0.1.1" }, "engines": { "node": ">=0.10.0" } }, - "node_modules/nanomatch/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "node_modules/node-persist/node_modules/is-unc-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", + "integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==", "dev": true, "dependencies": { - "isobject": "^3.0.1" + "unc-path-regex": "^0.1.0" }, "engines": { "node": ">=0.10.0" } }, - "node_modules/nanomatch/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "node_modules/node-persist/node_modules/is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", "dev": true, "engines": { "node": ">=0.10.0" } }, - "node_modules/natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "node_modules/next-tick": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", - "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", - "dev": true - }, "node_modules/node-releases": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz", @@ -4775,6 +5387,15 @@ "node": ">=0.10.0" } }, + "node_modules/object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -4867,6 +5488,18 @@ "node": ">=0.10.0" } }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -5024,6 +5657,15 @@ "node": ">=0.10.0" } }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -5093,6 +5735,12 @@ "node": ">=0.10.0" } }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "dev": true + }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -5759,6 +6407,28 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/ps-node": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz", + "integrity": "sha512-w7QJhUTbu70hpDso0YXDRNKCPNuchV8UTUZsAv0m7Qj5g85oHOJfr9drA1EjvK4nQK/bG8P97W4L6PJ3IQLoOA==", + "dev": true, + "dependencies": { + "table-parser": "^0.1.3" + } + }, "node_modules/pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", @@ -5789,6 +6459,31 @@ "node": ">=6" } }, + "node_modules/q": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/q/-/q-1.1.2.tgz", + "integrity": "sha512-ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA==", + "dev": true, + "engines": { + "node": ">=0.6.0", + "teleport": ">=0.2.0" + } + }, + "node_modules/qs": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "dev": true, + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -5818,6 +6513,30 @@ "node": ">=8" } }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "dev": true, + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -6326,6 +7045,12 @@ "ret": "~0.1.10" } }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, "node_modules/semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -6353,6 +7078,66 @@ "node": ">= 0.10" } }, + "node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dev": true, + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/send/node_modules/debug/node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + }, + "node_modules/serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "dev": true, + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -6386,6 +7171,12 @@ "node": ">=0.10.0" } }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -6407,6 +7198,20 @@ "node": ">=8" } }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -6862,6 +7667,15 @@ "node": ">=0.10.0" } }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/stream-exhaust": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", @@ -7275,6 +8089,15 @@ "node": ">=10.0.0" } }, + "node_modules/table-parser": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz", + "integrity": "sha512-LCYeuvqqoPII3lzzYaXKbC3Forb+d2u4bNwhk/9FlivuGRxPE28YEWAYcujeSlLLDlMfvy29+WPybFJZFiKMYg==", + "dev": true, + "dependencies": { + "connected-domain": "^1.0.0" + } + }, "node_modules/table/node_modules/ajv": { "version": "8.11.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", @@ -7506,6 +8329,15 @@ "xtend": "~4.0.1" } }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true, + "engines": { + "node": ">=0.6" + } + }, "node_modules/trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -7545,6 +8377,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -7630,6 +8475,15 @@ "through2-filter": "^3.0.0" } }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -7716,6 +8570,12 @@ "node": ">=0.10.0" } }, + "node_modules/urlsafe-base64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz", + "integrity": "sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==", + "dev": true + }, "node_modules/use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -7731,6 +8591,15 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "dev": true, + "engines": { + "node": ">= 0.4.0" + } + }, "node_modules/v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -7768,6 +8637,15 @@ "node": ">= 0.10" } }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/vinyl": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", @@ -7871,6 +8749,27 @@ "node": ">=0.10.0" } }, + "node_modules/web-push-testing": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.0.0.tgz", + "integrity": "sha512-p14iWiQSPY4kjpbaz59QfczaxEyD4uWg1aBjUS+Y9LAzQPU4Z95Jnq3FiOIazrvrfY0/1uDBbQkjXVxHq6wI/Q==", + "dev": true, + "dependencies": { + "arg": "^5.0.1", + "express": "^4.17.2", + "http_ece": "^1.1.0", + "jsonwebtoken": "^8.5.1", + "node-persist": "^2.1.0", + "ps-node": "^0.1.6", + "urlsafe-base64": "^1.0.0" + }, + "bin": { + "web-push-testing": "src/bin/cli.js" + }, + "engines": { + "node": ">=15.0.0" + } + }, "node_modules/which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", @@ -8447,6 +9346,16 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", "dev": true }, + "accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dev": true, + "requires": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + } + }, "acorn": { "version": "8.7.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz", @@ -8556,6 +9465,12 @@ "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, + "arg": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", + "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", + "dev": true + }, "argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -8604,6 +9519,12 @@ "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", "dev": true }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", + "dev": true + }, "array-initial": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz", @@ -8813,6 +9734,43 @@ "file-uri-to-path": "1.0.0" } }, + "body-parser": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz", + "integrity": "sha512-DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==", + "dev": true, + "requires": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.10.3", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } + } + }, "boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", @@ -8866,12 +9824,24 @@ "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=", "dev": true }, + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", + "dev": true + }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", "dev": true }, + "bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "dev": true + }, "cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -9255,6 +10225,35 @@ "integrity": "sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==", "dev": true }, + "connected-domain": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz", + "integrity": "sha512-lHlohUiJxlpunvDag2Y0pO20bnvarMjnrdciZeuJUqRwrf/5JHNhdpiPIr5GQ8IkqrFj5TDMQwcCjblGo1oeuA==", + "dev": true + }, + "content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dev": true, + "requires": { + "safe-buffer": "5.2.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } + } + }, + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true + }, "convert-source-map": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", @@ -9264,6 +10263,18 @@ "safe-buffer": "~5.1.1" } }, + "cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "dev": true + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", + "dev": true + }, "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", @@ -9545,6 +10556,18 @@ "isobject": "^3.0.1" } }, + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "dev": true + }, + "destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "dev": true + }, "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", @@ -9645,6 +10668,21 @@ } } }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", + "dev": true + }, "electron-to-chromium": { "version": "1.4.111", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.111.tgz", @@ -9657,6 +10695,12 @@ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "dev": true }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true + }, "end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", @@ -9739,6 +10783,12 @@ "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", + "dev": true + }, "escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", @@ -9871,6 +10921,12 @@ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "dev": true + }, "event-emitter": { "version": "0.3.5", "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", @@ -9997,6 +11053,68 @@ "homedir-polyfill": "^1.0.1" } }, + "express": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.1.tgz", + "integrity": "sha512-zZBcOX9TfehHQhtupq57OF8lFZ3UZi08Y97dwFCkD8p9d/d2Y3M+ykKcwaMDEL+4qyUolgBDX6AblpR3fL212Q==", + "dev": true, + "requires": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.0", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.10.3", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + } + } + }, "ext": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/ext/-/ext-1.4.0.tgz", @@ -10196,6 +11314,38 @@ "to-regex-range": "^2.1.0" } }, + "finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } + } + }, "find-up": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", @@ -10289,6 +11439,12 @@ "for-in": "^1.0.1" } }, + "forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "dev": true + }, "fraction.js": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", @@ -10304,6 +11460,12 @@ "map-cache": "^0.2.2" } }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "dev": true + }, "fs-mkdirp-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz", @@ -10865,6 +12027,37 @@ "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", "dev": true }, + "http_ece": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz", + "integrity": "sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==", + "dev": true, + "requires": { + "urlsafe-base64": "~1.0.0" + } + }, + "http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dev": true, + "requires": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + } + }, + "iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, "ignore": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz", @@ -10945,6 +12138,12 @@ "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=", "dev": true }, + "ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "dev": true + }, "is-absolute": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", @@ -11202,12 +12401,59 @@ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", "dev": true }, + "jsonwebtoken": { + "version": "8.5.1", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", + "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "dev": true, + "requires": { + "jws": "^3.2.2", + "lodash.includes": "^4.3.0", + "lodash.isboolean": "^3.0.3", + "lodash.isinteger": "^4.0.4", + "lodash.isnumber": "^3.0.3", + "lodash.isplainobject": "^4.0.6", + "lodash.isstring": "^4.0.1", + "lodash.once": "^4.0.0", + "ms": "^2.1.1", + "semver": "^5.6.0" + }, + "dependencies": { + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", + "dev": true + } + } + }, "just-debounce": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz", "integrity": "sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==", "dev": true }, + "jwa": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", + "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "dev": true, + "requires": { + "buffer-equal-constant-time": "1.0.1", + "ecdsa-sig-formatter": "1.0.11", + "safe-buffer": "^5.0.1" + } + }, + "jws": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", + "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "dev": true, + "requires": { + "jwa": "^1.4.1", + "safe-buffer": "^5.0.1" + } + }, "kind-of": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", @@ -11405,6 +12651,12 @@ "lodash.restparam": "^3.0.0" } }, + "lodash.includes": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", + "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", + "dev": true + }, "lodash.isarguments": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", @@ -11417,6 +12669,36 @@ "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", "dev": true }, + "lodash.isboolean": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", + "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", + "dev": true + }, + "lodash.isinteger": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", + "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", + "dev": true + }, + "lodash.isnumber": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", + "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", + "dev": true + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "dev": true + }, + "lodash.isstring": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", + "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", + "dev": true + }, "lodash.keys": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", @@ -11440,6 +12722,12 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "lodash.once": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", + "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", + "dev": true + }, "lodash.restparam": { "version": "3.6.1", "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", @@ -11561,6 +12849,12 @@ "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", "dev": true }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "dev": true + }, "memoizee": { "version": "0.4.15", "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.4.15.tgz", @@ -11605,12 +12899,24 @@ } } }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "dev": true + }, "merge2": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "dev": true + }, "micromatch": { "version": "3.1.10", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", @@ -11668,6 +12974,27 @@ } } }, + "mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "dev": true + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "requires": { + "mime-db": "1.52.0" + } + }, "min-indent": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", @@ -11683,6 +13010,12 @@ "brace-expansion": "^1.1.7" } }, + "minimist": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", + "dev": true + }, "minimist-options": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", @@ -11732,6 +13065,15 @@ } } }, + "mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "requires": { + "minimist": "^1.2.6" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -11818,12 +13160,65 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "dev": true + }, "next-tick": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz", "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==", "dev": true }, + "node-persist": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz", + "integrity": "sha512-NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w==", + "dev": true, + "requires": { + "is-absolute": "^0.2.6", + "mkdirp": "~0.5.1", + "q": "~1.1.1" + }, + "dependencies": { + "is-absolute": { + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", + "integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==", + "dev": true, + "requires": { + "is-relative": "^0.2.1", + "is-windows": "^0.2.0" + } + }, + "is-relative": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", + "integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==", + "dev": true, + "requires": { + "is-unc-path": "^0.1.1" + } + }, + "is-unc-path": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", + "integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==", + "dev": true, + "requires": { + "unc-path-regex": "^0.1.0" + } + }, + "is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", + "dev": true + } + } + }, "node-releases": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz", @@ -11970,6 +13365,12 @@ } } }, + "object-inspect": { + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", + "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==", + "dev": true + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -12038,6 +13439,15 @@ "make-iterator": "^1.0.0" } }, + "on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dev": true, + "requires": { + "ee-first": "1.1.1" + } + }, "once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", @@ -12156,6 +13566,12 @@ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, + "parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "dev": true + }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", @@ -12207,6 +13623,12 @@ "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", "dev": true }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "dev": true + }, "path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -12629,6 +14051,25 @@ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "dev": true }, + "proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dev": true, + "requires": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + } + }, + "ps-node": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz", + "integrity": "sha512-w7QJhUTbu70hpDso0YXDRNKCPNuchV8UTUZsAv0m7Qj5g85oHOJfr9drA1EjvK4nQK/bG8P97W4L6PJ3IQLoOA==", + "dev": true, + "requires": { + "table-parser": "^0.1.3" + } + }, "pump": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", @@ -12656,6 +14097,21 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, + "q": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/q/-/q-1.1.2.tgz", + "integrity": "sha512-ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA==", + "dev": true + }, + "qs": { + "version": "6.10.3", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz", + "integrity": "sha512-wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==", + "dev": true, + "requires": { + "side-channel": "^1.0.4" + } + }, "queue-microtask": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", @@ -12668,6 +14124,24 @@ "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true }, + "range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "dev": true + }, + "raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "dev": true, + "requires": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + } + }, "read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", @@ -13072,6 +14546,12 @@ "ret": "~0.1.10" } }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true + }, "semver": { "version": "7.5.4", "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", @@ -13090,6 +14570,64 @@ "sver-compat": "^1.5.0" } }, + "send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dev": true, + "requires": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "dev": true + } + } + }, + "ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true + } + } + }, + "serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "dev": true, + "requires": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + } + }, "set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -13119,6 +14657,12 @@ } } }, + "setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", + "dev": true + }, "shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -13134,6 +14678,17 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, + "side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + } + }, "signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", @@ -13514,6 +15069,12 @@ } } }, + "statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "dev": true + }, "stream-exhaust": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", @@ -13855,6 +15416,15 @@ } } }, + "table-parser": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz", + "integrity": "sha512-LCYeuvqqoPII3lzzYaXKbC3Forb+d2u4bNwhk/9FlivuGRxPE28YEWAYcujeSlLLDlMfvy29+WPybFJZFiKMYg==", + "dev": true, + "requires": { + "connected-domain": "^1.0.0" + } + }, "text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -14044,6 +15614,12 @@ } } }, + "toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "dev": true + }, "trim-newlines": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", @@ -14071,6 +15647,16 @@ "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dev": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + } + }, "typedarray": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", @@ -14145,6 +15731,12 @@ "through2-filter": "^3.0.0" } }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "dev": true + }, "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -14215,6 +15807,12 @@ "ip-regex": "^1.0.1" } }, + "urlsafe-base64": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz", + "integrity": "sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==", + "dev": true + }, "use": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", @@ -14227,6 +15825,12 @@ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", "dev": true }, + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "dev": true + }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -14258,6 +15862,12 @@ "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=", "dev": true }, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "dev": true + }, "vinyl": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", @@ -14352,6 +15962,21 @@ } } }, + "web-push-testing": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.0.0.tgz", + "integrity": "sha512-p14iWiQSPY4kjpbaz59QfczaxEyD4uWg1aBjUS+Y9LAzQPU4Z95Jnq3FiOIazrvrfY0/1uDBbQkjXVxHq6wI/Q==", + "dev": true, + "requires": { + "arg": "^5.0.1", + "express": "^4.17.2", + "http_ece": "^1.1.0", + "jsonwebtoken": "^8.5.1", + "node-persist": "^2.1.0", + "ps-node": "^0.1.6", + "urlsafe-base64": "^1.0.0" + } + }, "which": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", diff --git a/package.json b/package.json index 932fb51f6d3..22103522f3f 100644 --- a/package.json +++ b/package.json @@ -111,6 +111,7 @@ "postcss": "^8.4.31", "postcss-sorting": "^7.0.1", "stylelint": "^14.7.0", - "stylelint-order": "^5.0.0" + "stylelint-order": "^5.0.0", + "web-push-testing": "^1.0.0" } } From ec3dc28b5107b19fc409dc8d02268e918e2d11cc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Sep 2022 21:29:25 +0200 Subject: [PATCH 0011/1214] [ticket/17010] Switch to using table for tracking push subscriptions PHPBB3-17010 --- .../container/services_notification.yml | 1 + phpBB/config/default/container/tables.yml | 1 + .../db/migration/data/v400/add_webpush.php | 20 ++++-- phpBB/phpbb/notification/method/webpush.php | 62 ++++++++++++++----- 4 files changed, 64 insertions(+), 20 deletions(-) diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index ebde7bcf5ab..c018416da36 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -255,3 +255,4 @@ services: - '%core.root_path%' - '%core.php_ext%' - '%tables.notification_push%' + - '%tables.push_subscriptions%' diff --git a/phpBB/config/default/container/tables.yml b/phpBB/config/default/container/tables.yml index f3a4e1b4abd..8e38c63a4b4 100644 --- a/phpBB/config/default/container/tables.yml +++ b/phpBB/config/default/container/tables.yml @@ -51,6 +51,7 @@ parameters: tables.profile_fields_data: '%core.table_prefix%profile_fields_data' tables.profile_fields_options_language: '%core.table_prefix%profile_fields_lang' tables.profile_fields_language: '%core.table_prefix%profile_lang' + tables.push_subscriptions: '%core.table_prefix%push_subscriptions' tables.ranks: '%core.table_prefix%ranks' tables.reports: '%core.table_prefix%reports' tables.reports_reasons: '%core.table_prefix%reports_reasons' diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php index abc0ffc0794..f426df5b9b8 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -43,13 +43,18 @@ public function update_schema(): array ], 'PRIMARY_KEY' => ['notification_type_id', 'item_id', 'item_parent_id', 'user_id'], ], - ], - 'add_columns' => [ - $this->table_prefix . 'users' => [ + $this->table_prefix . 'push_subscriptions' => [ 'COLUMNS' => [ - 'user_push_subscriptions' => ['MTEXT_UNI', ''] + 'subscription_id' => ['ULINT', null, 'auto_increment'], + 'user_id' => ['ULINT', 0], + 'device_name' => ['VCHAR:64', ''], + 'endpoint' => ['TEXT', ''], + 'p256dh' => ['VCHAR', ''], + 'auth' => ['VCHAR', ''], + 'encoding' => ['VCHAR:32', ''], ], - ], + 'PRIMARY_KEY' => ['subscription_id', 'user_id'], + ] ], ]; } @@ -57,7 +62,10 @@ public function update_schema(): array public function revert_schema(): array { return [ - 'drop_tables' => [$this->table_prefix . 'notification_push'], + 'drop_tables' => [ + $this->table_prefix . 'notification_push', + $this->table_prefix . 'push_subscriptions', + ], ]; } diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 2532246624b..0fc704e8de2 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -39,6 +39,9 @@ class webpush extends \phpbb\notification\method\messenger_base /** @var string Notification web push table */ protected $notification_webpush_table; + /** @var string Notification push subscriptions table */ + protected $push_subscriptions_table; + /** * Notification Method web push constructor * @@ -49,8 +52,10 @@ class webpush extends \phpbb\notification\method\messenger_base * @param string $phpbb_root_path * @param string $php_ext * @param string $notification_webpush_table + * @param string $push_subscriptions_table */ - public function __construct(user_loader $user_loader, user $user, config $config, driver_interface $db, string $phpbb_root_path, string $php_ext, string $notification_webpush_table) + public function __construct(user_loader $user_loader, user $user, config $config, driver_interface $db,string $phpbb_root_path, + string $php_ext, string $notification_webpush_table, string $push_subscriptions_table) { parent::__construct($user_loader, $phpbb_root_path, $php_ext); @@ -58,6 +63,7 @@ public function __construct(user_loader $user_loader, user $user, config $config $this->config = $config; $this->db = $db; $this->notification_webpush_table = $notification_webpush_table; + $this->push_subscriptions_table = $push_subscriptions_table; } /** @@ -148,9 +154,36 @@ protected function notify_using_webpush(): void $banned_users = phpbb_get_banned_user_ids($user_ids); // Load all the users we need - $this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE)); + $notify_users = array_diff($user_ids, $banned_users); + $this->user_loader->load_users($notify_users, array(USER_IGNORE)); + + // Get subscriptions for users + $user_subscription_map = []; + $sql = 'SELECT * FROM ' . $this->push_subscriptions_table . ' + WHERE ' . $this->db->sql_in_set('user_id', $notify_users) . ' + GROUP BY user_id'; + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + if (isset($user_subscriptions[$row['user_id']])) + { + $user_subscription_map[$row['user_id']] += $row; + } + else + { + $user_subscription_map[$row['user_id']] = [$row]; + } + } + + $auth = [ + 'VAPID' => [ + 'subject' => generate_board_url(false), + 'publicKey' => $this->config['webpush_vapid_public'], + 'privateKey' => $this->config['webpush_vapid_private'], + ], + ]; - $web_push = new \Minishlink\WebPush\WebPush(); + $web_push = new \Minishlink\WebPush\WebPush($auth); // Time to go through the queue and send emails /** @var type_interface $notification */ @@ -158,7 +191,7 @@ protected function notify_using_webpush(): void { $user = $this->user_loader->get_user($notification->user_id); - $user_subscriptions = sanitizer::decode($this->user->data['user_push_subscriptions']); + $user_subscriptions = $user_subscription_map[$notification->user_id] ?? []; if ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL || empty($user_subscriptions)) @@ -181,8 +214,17 @@ protected function notify_using_webpush(): void { try { - $push_subscription = \Minishlink\WebPush\Subscription::create($subscription); - $web_push->queueNotification($push_subscription, $json_data); + $push_subscription = \Minishlink\WebPush\Subscription::create([ + 'endpoint' => $subscription['endpoint'], + 'keys' => [ + 'p256dh' => $subscription['p256dh'], + 'auth' => $subscription['auth'], + ], + 'contentEncoding' => !empty($subscription['encoding']) ? $subscription['encoding'] : null, + ]); + //$web_push->queueNotification($push_subscription, $json_data); + $foo = $web_push->sendOneNotification($push_subscription, $json_data); + $meh = 2; } catch (\ErrorException $exception) { @@ -193,14 +235,6 @@ protected function notify_using_webpush(): void } // @todo: Try offloading to after request - try - { - $web_push->flush(); - } - catch (\ErrorException $exception) - { - // @todo: Add to error log if we can't flush ... - } // We're done, empty the queue $this->empty_queue(); From be21479b2a591e98526bb9d5862c3f0ba9e080f9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 18 Sep 2022 21:30:01 +0200 Subject: [PATCH 0012/1214] [ticket/17010] Add tests for push notification type PHPBB3-17010 --- tests/notification/base.php | 1 + .../webpush_notification.type.post.xml | 284 ++++++++++++ .../notification_method_email_test.php | 1 + .../notification_method_webpush_test.php | 433 ++++++++++++++++++ tests/notification/submit_post_base.php | 1 + 5 files changed, 720 insertions(+) create mode 100644 tests/notification/fixtures/webpush_notification.type.post.xml create mode 100644 tests/notification/notification_method_webpush_test.php diff --git a/tests/notification/base.php b/tests/notification/base.php index eb888cb0ae6..37718a85a95 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -125,6 +125,7 @@ protected function setUp(): void $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); $this->notifications = new phpbb_notification_manager_helper( array(), diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml new file mode 100644 index 00000000000..7654ed30aad --- /dev/null +++ b/tests/notification/fixtures/webpush_notification.type.post.xml @@ -0,0 +1,284 @@ + + + + forum_id + user_id + notify_status + + 1 + 6 + 0 + + + 1 + 7 + 0 + + + 1 + 8 + 0 + +
+ + notification_id + notification_type_id + user_id + item_id + item_parent_id + notification_read + notification_data + + 1 + 1 + 5 + 1 + 1 + 0 + + + + 2 + 1 + 8 + 1 + 1 + 0 + + +
+ +
+ + notification_type_id + notification_type_name + notification_type_enabled + + 1 + notification.type.post + 1 + + + 2 + notification.type.forum + 1 + +
+ + post_id + topic_id + forum_id + post_text + + 1 + 1 + 1 + + +
+ + subscription_id + user_id + endpoint +
+ + topic_id + forum_id + + 1 + 1 + + + 2 + 1 + +
+ + topic_id + user_id + notify_status + + 1 + 2 + 0 + + + 2 + 2 + 0 + + + 1 + 3 + 0 + + + 1 + 4 + 0 + + + 1 + 5 + 0 + + + 1 + 6 + 0 + +
+ + user_id + username_clean + user_permissions + user_sig + + 2 + poster + + + + + 3 + test + + + + + 4 + unauthorized + + + + + 5 + notified + + + + + 6 + disabled + + + + + 7 + default + + + + + 8 + latest + + + +
+ + item_type + item_id + user_id + method + notify + + notification.type.post + 0 + 2 + notification.method.webpush + 1 + + + notification.type.post + 0 + 3 + notification.method.webpush + 1 + + + notification.type.post + 0 + 4 + notification.method.webpush + 1 + + + notification.type.post + 0 + 5 + notification.method.webpush + 1 + + + notification.type.post + 0 + 6 + notification.method.webpush + 1 + + + notification.type.post + 0 + 7 + notification.method.webpush + 1 + + + notification.type.post + 0 + 8 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 2 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 3 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 4 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 5 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 6 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 7 + notification.method.webpush + 1 + + + notification.type.forum + 0 + 8 + notification.method.webpush + 1 + +
+ diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index efcac83035f..77db505c04d 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -92,6 +92,7 @@ protected function setUp(): void $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); $phpbb_container->set( 'text_formatter.s9e.mention_helper', new \phpbb\textformatter\s9e\mention_helper( diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php new file mode 100644 index 00000000000..90e1d14deb6 --- /dev/null +++ b/tests/notification/notification_method_webpush_test.php @@ -0,0 +1,433 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\notification\method\webpush; +use Symfony\Component\Config\FileLocator; +use Symfony\Component\DependencyInjection\ContainerBuilder; +use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; + +require_once __DIR__ . '/base.php'; + +/** + * @group + */ +class notification_method_webpush_test extends phpbb_tests_notification_base +{ + /** @var string[] VAPID keys for testing purposes */ + public const VAPID_KEYS = [ + 'publicKey' => 'BIcGkq1Ncj3a2-J0UW-1A0NETLjvxZzNLiYBiPVMKNjgwmwPi5jyK87VfS4FZn9n7S9pLMQzjV3LmFuOnRSOvmI', + 'privateKey' => 'SrlbBEVgibWmKHYbDPu4Y2XvDWPjeGcc9fC16jq01xU', + ]; + + /** @var webpush */ + protected $notification_method_webpush; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush_notification.type.post.xml'); + } + + protected function get_notification_methods() + { + return [ + 'notification.method.webpush', + ]; + } + + public static function setUpBeforeClass(): void + { + self::start_webpush_testing(); + } + + public static function tearDownAfterClass(): void + { + self::stop_webpush_testing(); + } + + protected static function start_webpush_testing(): void + { + // Stop first to ensure port is available + self::stop_webpush_testing(); + + $process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'start']); + $process->run(); + } + + protected static function stop_webpush_testing(): void + { + $process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'stop']); + $process->run(); + } + + protected function setUp(): void + { + phpbb_database_test_case::setUp(); + + global $phpbb_root_path, $phpEx; + + include_once(__DIR__ . '/ext/test/notification/type/test.' . $phpEx); + + global $db, $config, $user, $auth, $cache, $phpbb_container, $phpbb_dispatcher; + + $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') + ->disableOriginalConstructor() + ->getMock(); + $db = $this->db = $this->new_dbal(); + $config = $this->config = new \phpbb\config\config([ + 'allow_privmsg' => true, + 'allow_bookmarks' => true, + 'allow_topic_notify' => true, + 'allow_forum_notify' => true, + 'allow_board_notifications' => true, + 'webpush_vapid_public' => self::VAPID_KEYS['publicKey'], + 'webpush_vapid_private' => self::VAPID_KEYS['privateKey'], + ]); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $this->user = $user; + $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $auth = $this->auth = new phpbb_mock_notifications_auth(); + $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = $this->phpbb_dispatcher; + $cache_driver = new \phpbb\cache\driver\dummy(); + $cache = $this->cache = new \phpbb\cache\service( + $cache_driver, + $this->config, + $this->db, + $this->phpbb_dispatcher, + $phpbb_root_path, + $phpEx + ); + + $phpbb_container = $this->container = new ContainerBuilder(); + $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); + $loader->load('services_notification.yml'); + $phpbb_container->set('user_loader', $this->user_loader); + $phpbb_container->set('user', $user); + $phpbb_container->set('language', $lang); + $phpbb_container->set('config', $this->config); + $phpbb_container->set('dbal.conn', $this->db); + $phpbb_container->set('auth', $auth); + $phpbb_container->set('cache.driver', $cache_driver); + $phpbb_container->set('cache', $cache); + $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); + $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); + $phpbb_container->setParameter('core.root_path', $phpbb_root_path); + $phpbb_container->setParameter('core.php_ext', $phpEx); + $phpbb_container->setParameter('tables.notifications', 'phpbb_notifications'); + $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); + $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); + $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); + $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); + $phpbb_container->set( + 'text_formatter.s9e.mention_helper', + new \phpbb\textformatter\s9e\mention_helper( + $this->db, + $auth, + $this->user, + $phpbb_root_path, + $phpEx + ) + ); + + $this->notification_method_webpush = new \phpbb\notification\method\webpush( + $phpbb_container->get('user_loader'), + $phpbb_container->get('user'), + $phpbb_container->get('config'), + $phpbb_container->get('dbal.conn'), + $phpbb_root_path, + $phpEx, + $phpbb_container->getParameter('tables.notification_push'), + $phpbb_container->getParameter('tables.push_subscriptions') + ); + + $phpbb_container->set('notification.method.webpush', $this->notification_method_webpush); + + $this->notifications = new phpbb_notification_manager_helper( + array(), + array(), + $this->container, + $this->user_loader, + $this->phpbb_dispatcher, + $this->db, + $this->cache, + $lang, + $this->user, + 'phpbb_notification_types', + 'phpbb_user_notifications' + ); + + $phpbb_container->set('notification_manager', $this->notifications); + + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); + + $phpbb_container->compile(); + + $this->notifications->setDependencies($this->auth, $this->config); + + $types = array(); + foreach ($this->get_notification_types() as $type) + { + $class = $this->build_type($type); + + $types[$type] = $class; + } + + $this->notifications->set_var('notification_types', $types); + + $methods = array(); + foreach ($this->get_notification_methods() as $method) + { + $class = $this->container->get($method); + + $methods[$method] = $class; + } + + $this->notifications->set_var('notification_methods', $methods); + } + + public function data_notification_webpush() + { + return [ + /** + * Normal post + * + * User => State description + * 2 => Topic id=1 and id=2 subscribed, should receive a new topics post notification + * 3 => Topic id=1 subscribed, should receive a new topic post notification + * 4 => Topic id=1 subscribed, should receive a new topic post notification + * 5 => Topic id=1 subscribed, post id=1 already notified, should receive a new topic post notification + * 6 => Topic id=1 and forum id=1 subscribed, should receive a new topic/forum post notification + * 7 => Forum id=1 subscribed, should NOT receive a new topic post but a forum post notification + * 8 => Forum id=1 subscribed, post id=1 already notified, should NOT receive a new topic post but a forum post notification + */ + [ + 'notification.type.post', + [ + 'forum_id' => '1', + 'post_id' => '2', + 'topic_id' => '1', + ], + [ + 2 => ['user_id' => '2'], + 3 => ['user_id' => '3'], + 4 => ['user_id' => '4'], + 5 => ['user_id' => '5'], + 6 => ['user_id' => '6'], + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '1', + 'post_id' => '3', + 'topic_id' => '1', + ], + [ + 6 => ['user_id' => '6'], + 7 => ['user_id' => '7'], + 8 => ['user_id' => '8'] + ], + ], + [ + 'notification.type.post', + [ + 'forum_id' => '1', + 'post_id' => '4', + 'topic_id' => '2', + ], + [ + 2 => ['user_id' => '2'], + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '1', + 'post_id' => '5', + 'topic_id' => '2', + ], + [ + 6 => ['user_id' => '6'], + 7 => ['user_id' => '7'], + 8 => ['user_id' => '8'], + ], + ], + [ + 'notification.type.post', + [ + 'forum_id' => '2', + 'post_id' => '6', + 'topic_id' => '3', + ], + [ + ], + ], + [ + 'notification.type.forum', + [ + 'forum_id' => '2', + 'post_id' => '6', + 'topic_id' => '3', + ], + [ + ], + ], + ]; + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_notification_webpush($notification_type, $post_data, $expected_users) + { + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + $post_data['post_id']++; + $notification_options['item_id'] = $post_data['post_id']; + $post_data['post_time'] = 1349413323; + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users2 = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic'); + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_get_subscription($notification_type, $post_data, $expected_users): void + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id] = $this->create_subscription_for_user($user_id); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id]['clientHash']); + $this->assertNotEmpty($messages); + } + } + + protected function create_subscription_for_user($user_id): array + { + $client = new \GuzzleHttp\Client(); + try + { + $response = $client->request('POST', 'http://localhost:9012/subscribe', ['form_params' => [ + 'applicationServerKey' => self::VAPID_KEYS['publicKey'], + ]]); + } + catch (\GuzzleHttp\Exception\GuzzleException $exception) + { + $this->fail('Failed getting subscription from web-push-testing client'); + } + + $subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody()); + $subscription_data = $subscription_return['data']; + $this->assertNotEmpty($subscription_data['endpoint']); + $this->assertStringStartsWith('http://localhost:9012/notify/', $subscription_data['endpoint']); + $this->assertIsArray($subscription_data['keys']); + + // Add subscription data to admin user (user id 2) + + + $push_subscriptions_table = $this->container->getParameter('tables.push_subscriptions'); + + $sql = 'INSERT INTO ' . $push_subscriptions_table . ' ' . $this->db->sql_build_array('INSERT', [ + 'user_id' => $user_id, + 'endpoint' => $subscription_data['endpoint'], + 'p256dh' => $subscription_data['keys']['p256dh'], + 'auth' => $subscription_data['keys']['auth'], + ]); + $this->db->sql_query($sql); + + return $subscription_data; + } + + protected function get_messages_for_subscription($client_hash): array + { + $client = new \GuzzleHttp\Client(); + try + { + $response = $client->request('POST', 'http://localhost:9012/get-notifications', ['form_params' => [ + 'clientHash' => $client_hash, + ]]); + } + catch (\GuzzleHttp\Exception\GuzzleException $exception) + { + $this->fail('Failed getting messages from web-push-testing client'); + } + + $response_data = json_decode($response->getBody()->getContents(), true); + $this->assertNotEmpty($response_data); + $this->assertArrayHasKey('data', $response_data); + $this->assertArrayHasKey('messages', $response_data['data']); + + return $response_data['data']['messages']; + } +} diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index cb5b8d0d2ae..3219c85e27c 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -155,6 +155,7 @@ protected function setUp(): void $phpbb_container->setParameter('tables.notification_types', 'phpbb_notification_types'); $phpbb_container->setParameter('tables.notification_emails', 'phpbb_notification_emails'); $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); + $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); $phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); $phpbb_container->compile(); From af29f388dab44a8409fb548c2b17dc7a31dbbe71 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 19 Sep 2022 20:34:42 +0200 Subject: [PATCH 0013/1214] [ticket/17010] Queue notifications and use flush to send them PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 0fc704e8de2..550631ec773 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -185,6 +185,7 @@ protected function notify_using_webpush(): void $web_push = new \Minishlink\WebPush\WebPush($auth); + $number_of_notifications = 0; // Time to go through the queue and send emails /** @var type_interface $notification */ foreach ($this->queue as $notification) @@ -222,9 +223,8 @@ protected function notify_using_webpush(): void ], 'contentEncoding' => !empty($subscription['encoding']) ? $subscription['encoding'] : null, ]); - //$web_push->queueNotification($push_subscription, $json_data); - $foo = $web_push->sendOneNotification($push_subscription, $json_data); - $meh = 2; + $web_push->queueNotification($push_subscription, $json_data); + $number_of_notifications++; } catch (\ErrorException $exception) { @@ -235,6 +235,21 @@ protected function notify_using_webpush(): void } // @todo: Try offloading to after request + try + { + foreach ($web_push->flush($number_of_notifications) as $report) + { + if (!$report->isSuccess()) + { + // @todo: log errors / remove subscription + } + } + } + catch (\ErrorException $exception) + { + // @todo: write to log + } + // We're done, empty the queue $this->empty_queue(); From 5fba4682c34993b8780d389afac524f3c1f0ffc5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 20 Sep 2022 17:14:15 +0200 Subject: [PATCH 0014/1214] [ticket/17010] Resolve phing sniff issues PHPBB3-17010 --- phpBB/phpbb/db/migration/data/v400/add_webpush.php | 1 - phpBB/phpbb/notification/method/webpush.php | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php index f426df5b9b8..f2214fd934b 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -13,7 +13,6 @@ namespace phpbb\db\migration\data\v400; -use Minishlink\WebPush\VAPID; use phpbb\db\migration\migration; class add_webpush extends migration diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 550631ec773..064ee4507f9 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -15,7 +15,6 @@ use phpbb\config\config; use phpbb\db\driver\driver_interface; -use phpbb\json\sanitizer; use phpbb\notification\type\type_interface; use phpbb\user; use phpbb\user_loader; @@ -54,7 +53,7 @@ class webpush extends \phpbb\notification\method\messenger_base * @param string $notification_webpush_table * @param string $push_subscriptions_table */ - public function __construct(user_loader $user_loader, user $user, config $config, driver_interface $db,string $phpbb_root_path, + public function __construct(user_loader $user_loader, user $user, config $config, driver_interface $db, string $phpbb_root_path, string $php_ext, string $notification_webpush_table, string $push_subscriptions_table) { parent::__construct($user_loader, $phpbb_root_path, $php_ext); @@ -250,7 +249,6 @@ protected function notify_using_webpush(): void // @todo: write to log } - // We're done, empty the queue $this->empty_queue(); } From c4a8e32689f624daa503109ef4045d802a460180 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 20 Sep 2022 17:20:12 +0200 Subject: [PATCH 0015/1214] [ticket/17010] Adjust query to not trigger full group by issue PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 064ee4507f9..2d015600c3c 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -158,9 +158,9 @@ protected function notify_using_webpush(): void // Get subscriptions for users $user_subscription_map = []; - $sql = 'SELECT * FROM ' . $this->push_subscriptions_table . ' - WHERE ' . $this->db->sql_in_set('user_id', $notify_users) . ' - GROUP BY user_id'; + $sql = 'SELECT user_id, endpoint, p256dh, auth, encoding + FROM ' . $this->push_subscriptions_table . ' + WHERE ' . $this->db->sql_in_set('user_id', $notify_users); $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { From 9bd9962aeafd180fbac258a215968ebf95987ca2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 22 Sep 2022 21:08:54 +0200 Subject: [PATCH 0016/1214] [ticket/17010] Resolve test issues and add node install for webpush testing PHPBB3-17010 --- .github/workflows/tests.yml | 31 +++++++++++++++++++ .../webpush_notification.type.post.xml | 2 ++ .../notification_method_webpush_test.php | 6 +++- 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 982ca66a2ac..761d8e3e87a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -217,6 +217,15 @@ jobs: run: | .github/setup-ldap.sh + - name: Setup node + if: ${{ matrix.SLOWTESTS != 1 }} + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Setup node dependencies + if: ${{ matrix.SLOWTESTS != 1 }} + run: npm ci + - name: Setup SPHINX run: | .github/setup-sphinx.sh @@ -342,6 +351,13 @@ jobs: run: | .github/setup-database.sh $DB $MYISAM + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Setup node dependencies + run: npm ci + - name: Run unit tests env: DB: ${{steps.database-type.outputs.db}} @@ -447,6 +463,13 @@ jobs: run: | .github/setup-database.sh $DB $MYISAM + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Setup node dependencies + run: npm ci + - name: Run unit tests env: DB: ${{steps.database-type.outputs.db}} @@ -555,6 +578,14 @@ jobs: psql -c 'create database phpbb_tests;' -U postgres Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender Set-MpPreference -DisableRealtimeMonitoring $true + + - name: Setup node + uses: actions/setup-node@v3 + with: + node-version: 16 + - name: Setup node dependencies + run: npm ci + - name: Run unit tests if: ${{ matrix.type == 'unit' }} run: | diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml index 7654ed30aad..9d3d72d531d 100644 --- a/tests/notification/fixtures/webpush_notification.type.post.xml +++ b/tests/notification/fixtures/webpush_notification.type.post.xml @@ -1,5 +1,7 @@ + +
forum_iduser_id diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index 90e1d14deb6..f0e1f1cb50a 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -61,6 +61,10 @@ protected static function start_webpush_testing(): void $process = new \Symfony\Component\Process\Process(['node_modules/.bin/web-push-testing', '--port', '9012', 'start']); $process->run(); + if (!$process->isSuccessful()) + { + self::fail('Starting web push testing service failed: ' . $process->getErrorOutput()); + } } protected static function stop_webpush_testing(): void @@ -384,7 +388,7 @@ protected function create_subscription_for_user($user_id): array } catch (\GuzzleHttp\Exception\GuzzleException $exception) { - $this->fail('Failed getting subscription from web-push-testing client'); + $this->fail('Failed getting subscription from web-push-testing client: ' . $exception->getMessage()); } $subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody()); From 199bc8f964fcdb3da2be089389cdf5f0950c3dd9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Sep 2022 20:23:21 +0200 Subject: [PATCH 0017/1214] [ticket/17010] Add first webpush controller and start ucp integration PHPBB3-17010 --- .../container/services_notification.yml | 2 + .../config/default/container/services_ucp.yml | 5 ++ phpBB/config/default/routing/ucp.yml | 8 +++ phpBB/includes/ucp/ucp_notifications.php | 29 +++++++- phpBB/language/en/ucp.php | 4 ++ phpBB/phpbb/ucp/controller/webpush.php | 27 +++++++ .../prosilver/template/ucp_notifications.html | 34 --------- .../template/ucp_notifications_options.html | 71 +++++++++++++++++++ 8 files changed, 145 insertions(+), 35 deletions(-) create mode 100644 phpBB/phpbb/ucp/controller/webpush.php create mode 100644 phpBB/styles/prosilver/template/ucp_notifications_options.html diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index c018416da36..acb136641cd 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -256,3 +256,5 @@ services: - '%core.php_ext%' - '%tables.notification_push%' - '%tables.push_subscriptions%' + tags: + - { name: notification.method } diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index 69ef5ffbf88..1d0535a1168 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -15,3 +15,8 @@ services: - '%tables.users%' - '%core.root_path%' - '%core.php_ext%' + + phpbb.ucp.controller.push_worker: + class: phpbb\ucp\controller\webpush + arguments: + - '@config' diff --git a/phpBB/config/default/routing/ucp.yml b/phpBB/config/default/routing/ucp.yml index 06bd7c3a58f..a88b6fc5aeb 100644 --- a/phpBB/config/default/routing/ucp.yml +++ b/phpBB/config/default/routing/ucp.yml @@ -5,3 +5,11 @@ phpbb_ucp_reset_password_controller: phpbb_ucp_forgot_password_controller: path: /forgot_password defaults: { _controller: phpbb.ucp.controller.reset_password:request } + +phpbb_ucp_push_worker_controller: + path: /push/worker + defaults: { _controller: phpbb.ucp.controller.webpush:request } + +phpbb_ucp_push_subscribe_controller: + path: /push/subscribe + defaults: { _controller: phpbb.ucp.controller.webpush:request } diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 7a46d3e5aa9..7b07138595f 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -107,7 +107,12 @@ public function main($id, $mode) $this->output_notification_types($subscriptions, $phpbb_notifications, $template, $user, $phpbb_dispatcher, 'notification_types'); - $this->tpl_name = 'ucp_notifications'; + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + + $template->assign_var('U_WEBPUSH_SUBSCRIBE', $controller_helper->route('phpbb_ucp_push_subscribe_controller')); + + $this->tpl_name = 'ucp_notifications_options'; $this->page_title = 'UCP_NOTIFICATION_OPTIONS'; break; @@ -266,6 +271,11 @@ public function output_notification_methods(\phpbb\notification\manager $phpbb_n { $notification_methods = $phpbb_notifications->get_subscription_methods(); + if (isset($notification_methods['notification.method.webpush'])) + { + $this->output_webpush_data($template); + } + foreach ($notification_methods as $method => $method_data) { $template->assign_block_vars($block, array( @@ -275,4 +285,21 @@ public function output_notification_methods(\phpbb\notification\manager $phpbb_n )); } } + + /** + * Output data for webpush + * + * @param \phpbb\template\template $template + * + * @return void + */ + protected function output_webpush_data(\phpbb\template\template $template): void + { + global $config; + + $template->assign_vars([ + 'NOTIFICATIONS_WEBPUSH_ENABLE' => true, // already checked, otherwise we wouldn't be here + 'NOTIFICATIONS_WEBPUSH_VAPID_PUBLIC' => $config['webpush_vapid_public'], + ]); + } } diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index a4dcdf775d1..09bf7824e58 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -332,6 +332,7 @@ 'NOTIFICATION_METHOD_BOARD' => 'Notifications', 'NOTIFICATION_METHOD_EMAIL' => 'Email', 'NOTIFICATION_METHOD_JABBER' => 'Jabber', + 'NOTIFICATION_METHOD_WEBPUSH' => 'Web push', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', 'NOTIFICATION_TYPE_GROUP_REQUEST' => 'Someone requests to join a group you lead', @@ -355,6 +356,9 @@ 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Notify me on new private messages', + 'NOTIFY_WEBPUSH_ACTIVATE' => 'Activate push notifications', + 'NOTIFY_WEBPUSH_ENABLE' => 'Enable receiving webpush notifications', + 'NOTIFY_WEBPUSH_ENABLE_EXPLAIN' => 'Enable receiving browser-based push notifications.
The notifications can be turned off at any time in your browser settings or by disabling the push notifications below.', 'NOT_ADDED_FRIENDS_ANONYMOUS' => 'You cannot add the anonymous user to your friends list.', 'NOT_ADDED_FRIENDS_BOTS' => 'You cannot add bots to your friends list.', 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list.', diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php new file mode 100644 index 00000000000..67ef237d5b5 --- /dev/null +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -0,0 +1,27 @@ +config = $config; + } + + /** + * Handle password reset request + * + * @return Response + */ + public function request(): Response + { + return new Response('foo'); + } +} diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index d7019dee1c6..7c5715fb41d 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -12,38 +12,6 @@

{TITLE}

{TITLE_EXPLAIN}

- - -
- - - - - - - - - - - - - - - - - - - - - - - - -
{L_NOTIFICATION_TYPE}{notification_methods.NAME}
{notification_types.GROUP_NAME}
- {notification_types.NAME} -
   {notification_types.EXPLAIN} - 		checked="checked" disabled="disabled" />
-
diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html new file mode 100644 index 00000000000..6536fb56cd0 --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -0,0 +1,71 @@ +{% include('ucp_header.html') %} + +
+ +

{{ TITLE }}

+ {% if NOTIFICATIONS_WEBPUSH_ENABLE %} +
+
+
+
+

{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
+
+ {{ lang('NOTIFY_WEBPUSH_ACTIVATE') }} +
+
+
+
+
+ {% endif %} +
+
+

{{ TITLE_EXPLAIN }}

+ + + + + + {% for method in notification_methods %} + + {% endfor %} + + + + {% for notification_type in notification_types %} + {% if notification_type.GROUP_NAME %} + + + + {% else %} + + + {% for notification_method in notification_type.notification_methods %} + {% apply spaceless %} + + {% endapply %} + {% endfor %} + + {% endif %} + {% endfor %} + +
{{ lang('NOTIFICATION_TYPE') }}{{ method.NAME }}
{{ notification_type.GROUP_NAME }}
+ {{ notification_type.NAME }} + {% if notification_type.EXPLAIN %}
   {{ notification_type.EXPLAIN }}{% endif %} + 		+
+
+
+ + {% if notification_types or notification_list %} +
+ + {{ S_HIDDEN_FIELDS }} + + + {{ S_FORM_TOKEN }} +
+ {% endif %} + +
+ +{% include('ucp_footer.html') %} From ff27401ed2e3eae715fc2386c39c168117023120 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 22 Oct 2022 22:20:39 +0200 Subject: [PATCH 0018/1214] [ticket/17010] Add javascript for webpush subscribe/unsubscribe PHPBB3-17010 --- phpBB/styles/all/js/webpush.js.twig | 243 ++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 phpBB/styles/all/js/webpush.js.twig diff --git a/phpBB/styles/all/js/webpush.js.twig b/phpBB/styles/all/js/webpush.js.twig new file mode 100644 index 00000000000..1287f133d9b --- /dev/null +++ b/phpBB/styles/all/js/webpush.js.twig @@ -0,0 +1,243 @@ +/* global phpbb */ + +'use strict'; + +function PhpbbWebpush() { + /** @type {string} URL to service worker */ + const serviceWorkerUrl = '{{ U_WEBPUSH_WORKER_URL }}'; + + /** @type {string} URL to subscribe to push */ + const subscribeUrl = '{{ U_WEBPUSH_SUBSCRIBE }}'; + + /** @type {string} URL to unsubscribe from push */ + const unsubscribeUrl = '{{ U_WEBPUSH_UNSUBSCRIBE }}'; + + /** @type {{creationTime: number, formToken: string}} Form tokens */ + this.formTokens = { + creationTime: {{ FORM_TOKENS.creation_time }}, + formToken: '{{ FORM_TOKENS.form_token }}' + }; + + /** @type {string} VAPID public key */ + const VAPID_PUBLIC_KEY = '{{ VAPID_PUBLIC_KEY }}'; + + let subscribeButton, + unsubscribeButton; + + /** + * Init function for phpBB webpush + */ + this.init = function() { + subscribeButton = document.querySelector('#subscribe_webpush'); + unsubscribeButton = document.querySelector('#unsubscribe_webpush'); + let serviceWorkerRegistered = false; + + // Service workers are only supported in secure context + if (window.isSecureContext !== true) { + subscribeButton.disabled = true; + return; + } + + if ('serviceWorker' in navigator && 'PushManager' in window) { + navigator.serviceWorker.register(serviceWorkerUrl) + .then(() => { + serviceWorkerRegistered = true; + }) + .catch(error => { + console.info(error); + }); + } + + if (serviceWorkerRegistered) { + subscribeButton.addEventListener('click', subscribeButtonHandler); + unsubscribeButton.addEventListener('click', unsubscribeButtonHandler); + + updateButtonState(); + } else { + // Service worker could not be registered + subscribeButton.disabled = true; + } + }; + + /** + * Update button state depending on notifications state + * + * @return void + */ + function updateButtonState() { + if (Notification.permission === 'granted') { + navigator.serviceWorker.getRegistration(serviceWorkerUrl) + .then((registration) => { + if (typeof registration === 'undefined') { + return; + } + + registration.pushManager.getSubscription() + .then((subscribed) => { + if (subscribed) { + setSubscriptionState(true); + } + }) + }); + } + } + + /** + * Set subscription state for buttons + * + * @param {boolean} subscribed True if subscribed, false if not + */ + function setSubscriptionState(subscribed) { + if (subscribed) { + subscribeButton.classList.add('hidden'); + unsubscribeButton.classList.remove('hidden'); + } else { + subscribeButton.classList.remove('hidden'); + unsubscribeButton.classList.add('hidden'); + } + } + + /** + * Handler for pushing subscribe button + * + * @param {Object} event Subscribe button push event + * @returns {Promise} + */ + async function subscribeButtonHandler(event) { + event.preventDefault(); + + subscribeButton.addEventListener('click', subscribeButtonHandler); + + // Prevent the user from clicking the subscribe button multiple times. + const result = await Notification.requestPermission(); + if (result === 'denied') { + return; + } + + const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl); + if (typeof registration !== 'undefined') { + const subscribed = await registration.pushManager.getSubscription(); + if (subscribed) { + setSubscriptionState(true); + return; + } + } + const newSubscription = await registration.pushManager.subscribe({ + userVisibleOnly: true, + applicationServerKey: urlB64ToUint8Array(VAPID_PUBLIC_KEY) + }); + + fetch(subscribeUrl, { + method: 'POST', + headers: { + 'X-Requested-With': 'XMLHttpRequest' + }, + body: getFormData(newSubscription) + }) + .then((response) => response.json()) + .then(handleSubscribe) + .catch((error) => { + phpbb.alert({{ lang('AJAX_ERROR_TITLE') }}, error); + }); + } + + /** + * Handler for pushing unsubscribe button + * + * @param {Object} event Unsubscribe button push event + * @returns {Promise} + */ + async function unsubscribeButtonHandler(event) { + event.preventDefault(); + + const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl); + if (typeof registration === 'undefined') { + return; + } + + const subscription = await registration.pushManager.getSubscription(); + fetch(unsubscribeUrl, { + method: 'POST', + headers: { + 'X-Requested-With': 'XMLHttpRequest' + }, + body: getFormData({endpoint: subscription.endpoint}) + }).then(() => { + return subscription.unsubscribe(); + }).then((unsubscribed) => { + if (unsubscribed) { + setSubscriptionState(false); + } + }); + } + + /** + * Handle subscribe response + * + * @param {Object} response Response from subscription endpoint + */ + function handleSubscribe(response) { + if (response.success) { + setSubscriptionState(true); + if (response.hasOwnProperty('form_tokens')) { + updateFormTokens(response.form_tokens); + } + } + } + + /** + * Get form data object including form tokens + * + * @param {Object} data Data to create form data from + * @returns {FormData} Form data + */ + function getFormData(data) { + let formData = new FormData(); + formData.append('form_token', phpbb.webpush.formTokens.formToken); + formData.append('creation_time', phpbb.webpush.formTokens.creationTime); + formData.append('data', JSON.stringify(data)); + + return formData; + } + + /** + * Update form tokens with supplied ones + * + * @param {Object} formTokens + */ + function updateFormTokens(formTokens) { + phpbb.webpush.formTokens.creationTime = formTokens.creation_time; + phpbb.webpush.formTokens.formToken = formTokens.form_token; + } + + /** + * Convert a base64 string to Uint8Array + * + * @param base64String + * @returns {Uint8Array} + */ + function urlB64ToUint8Array(base64String) { + const padding = '='.repeat((4 - base64String.length % 4) % 4); + const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/'); + const rawData = window.atob(base64); + const outputArray = new Uint8Array(rawData.length); + for (let i = 0; i < rawData.length; ++i) { + outputArray[i] = rawData.charCodeAt(i); + } + return outputArray; + } +} + +function domReady(callBack) { + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', callBack); + } else { + callBack(); + } +} + +phpbb.webpush = new PhpbbWebpush(); + +domReady(() => { + phpbb.webpush.init(); +}); From 0395c8dbac1f2005164afb8f425a4e3a849c1a00 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 22 Oct 2022 22:25:06 +0200 Subject: [PATCH 0019/1214] [ticket/17010] Introduce form_helper to allow using form tokens in javascript PHPBB3-17010 --- phpBB/phpbb/form/form_helper.php | 104 +++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 phpBB/phpbb/form/form_helper.php diff --git a/phpBB/phpbb/form/form_helper.php b/phpBB/phpbb/form/form_helper.php new file mode 100644 index 00000000000..ca4ca14b01f --- /dev/null +++ b/phpBB/phpbb/form/form_helper.php @@ -0,0 +1,104 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\form; + +use phpbb\config\config; +use phpbb\request\request_interface; +use phpbb\user; + +class form_helper +{ + /** @var config */ + protected $config; + + /** @var request_interface */ + protected $request; + + /** @var user */ + protected $user; + + /** + * Constructor for form_helper + * + * @param config $config + * @param request_interface $request + * @param user $user + */ + public function __construct(config $config, request_interface $request, user $user) + { + $this->config = $config; + $this->request = $request; + $this->user = $user; + } + + /** + * Get form tokens for form + * + * @param string $form_name Name of form + * @param int $now Token generation time + * @param string $token_sid SID used for form token + * @param string $token Generated token + * + * @return array Array containing form_token and creation_time of form token + */ + public function get_form_tokens(string $form_name, int &$now = 0, string &$token_sid = '', string &$token = ''): array + { + $now = time(); + $token_sid = ($this->user->data['user_id'] == ANONYMOUS && !empty($this->config['form_token_sid_guests'])) ? $this->user->session_id : ''; + $token = sha1($now . $this->user->data['user_form_salt'] . $form_name . $token_sid); + + return [ + 'creation_time' => $now, + 'form_token' => $token, + ]; + } + + /** + * Check form token for form + * + * @param string $form_name Name of form + * @param int|null $timespan Lifetime of token or null if default value should be used + * @return bool True if form token is valid, false if not + */ + public function check_form_tokens(string $form_name, ?int $timespan = null): bool + { + if ($timespan === null) + { + // we enforce a minimum value of half a minute here. + $timespan = ($this->config['form_token_lifetime'] == -1) ? -1 : max(30, $this->config['form_token_lifetime']); + } + + if ($this->request->is_set_post('creation_time') && $this->request->is_set_post('form_token')) + { + $creation_time = abs($this->request->variable('creation_time', 0)); + $token = $this->request->variable('form_token', ''); + + $diff = time() - $creation_time; + + // If creation_time and the time() now is zero we can assume it was not a human doing this (the check for if ($diff)... + if (defined('DEBUG_TEST') || $diff && ($diff <= $timespan || $timespan === -1)) + { + $token_sid = ($this->user->data['user_id'] == ANONYMOUS && !empty($this->config['form_token_sid_guests'])) ? $this->user->session_id : ''; + $key = sha1($creation_time . $this->user->data['user_form_salt'] . $form_name . $token_sid); + + if (hash_equals($key, $token)) + { + return true; + } + } + } + + return false; + } +} From 35259056f0403a1ee36fdfbc85501e3eb104b6a0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 22 Oct 2022 22:26:18 +0200 Subject: [PATCH 0020/1214] [ticket/17010] Switch to using form_helper for form tokens PHPBB3-17010 --- phpBB/config/default/container/services.yml | 7 ++++ phpBB/includes/functions.php | 45 +++++---------------- 2 files changed, 17 insertions(+), 35 deletions(-) diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index d34a1ded9f3..14c0d40263a 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -126,6 +126,13 @@ services: arguments: - '%core.root_path%' + form_helper: + class: phpbb\form\form_helper + arguments: + - '@config' + - '@request' + - '@user' + group_helper: class: phpbb\group\helper arguments: diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 453e1d31504..2f330096bf2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2009,16 +2009,14 @@ function check_link_hash($token, $link_name) */ function add_form_key($form_name, $template_variable_suffix = '') { - global $config, $template, $user, $phpbb_dispatcher; + global $phpbb_container, $phpbb_dispatcher, $template; - $now = time(); - $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; - $token = sha1($now . $user->data['user_form_salt'] . $form_name . $token_sid); + /** @var \phpbb\form\form_helper $form_helper */ + $form_helper = $phpbb_container->get('form_helper'); - $s_fields = build_hidden_fields(array( - 'creation_time' => $now, - 'form_token' => $token, - )); + $form_tokens = $form_helper->get_form_tokens($form_name, $now, $token_sid, $token); + + $s_fields = build_hidden_fields($form_tokens); /** * Perform additional actions on creation of the form token @@ -2058,35 +2056,12 @@ function add_form_key($form_name, $template_variable_suffix = '') */ function check_form_key($form_name, $timespan = false) { - global $config, $request, $user; - - if ($timespan === false) - { - // we enforce a minimum value of half a minute here. - $timespan = ($config['form_token_lifetime'] == -1) ? -1 : max(30, $config['form_token_lifetime']); - } - - if ($request->is_set_post('creation_time') && $request->is_set_post('form_token')) - { - $creation_time = abs($request->variable('creation_time', 0)); - $token = $request->variable('form_token', ''); - - $diff = time() - $creation_time; - - // If creation_time and the time() now is zero we can assume it was not a human doing this (the check for if ($diff)... - if (defined('DEBUG_TEST') || $diff && ($diff <= $timespan || $timespan === -1)) - { - $token_sid = ($user->data['user_id'] == ANONYMOUS && !empty($config['form_token_sid_guests'])) ? $user->session_id : ''; - $key = sha1($creation_time . $user->data['user_form_salt'] . $form_name . $token_sid); + global $phpbb_container; - if ($key === $token) - { - return true; - } - } - } + /** @var \phpbb\form\form_helper $form_helper */ + $form_helper = $phpbb_container->get('form_helper'); - return false; + return $form_helper->check_form_tokens($form_name, $timespan !== false ? $timespan : null); } // Message/Login boxes From d4b6ad562096e85783afe237b64afaa3ffd0f6ff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 20:54:37 +0200 Subject: [PATCH 0021/1214] [ticket/17010] Add controller methods for subscribe/unsubscribe and others PHPBB3-17010 --- .../config/default/container/services_ucp.yml | 11 +- phpBB/config/default/routing/ucp.yml | 16 +- phpBB/includes/ucp/ucp_notifications.php | 4 +- phpBB/phpbb/ucp/controller/webpush.php | 246 +++++++++++++++++- .../template/ucp_notifications_options.html | 7 +- 5 files changed, 274 insertions(+), 10 deletions(-) diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index 1d0535a1168..a950ef8e354 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -16,7 +16,16 @@ services: - '%core.root_path%' - '%core.php_ext%' - phpbb.ucp.controller.push_worker: + phpbb.ucp.controller.webpush: class: phpbb\ucp\controller\webpush arguments: - '@config' + - '@controller.helper' + - '@dbal.conn' + - '@form_helper' + - '@path_helper' + - '@request' + - '@user' + - '@template.twig.environment' + - '%tables.notification_push%' + - '%tables.push_subscriptions%' diff --git a/phpBB/config/default/routing/ucp.yml b/phpBB/config/default/routing/ucp.yml index a88b6fc5aeb..dac6461ac5d 100644 --- a/phpBB/config/default/routing/ucp.yml +++ b/phpBB/config/default/routing/ucp.yml @@ -6,10 +6,22 @@ phpbb_ucp_forgot_password_controller: path: /forgot_password defaults: { _controller: phpbb.ucp.controller.reset_password:request } +phpbb_ucp_push_get_notification_controller: + path: /push/notification + defaults: { _controller: phpbb.ucp.controller.webpush:notification } + phpbb_ucp_push_worker_controller: path: /push/worker - defaults: { _controller: phpbb.ucp.controller.webpush:request } + defaults: { _controller: phpbb.ucp.controller.webpush:worker } phpbb_ucp_push_subscribe_controller: path: /push/subscribe - defaults: { _controller: phpbb.ucp.controller.webpush:request } + defaults: { _controller: phpbb.ucp.controller.webpush:subscribe } + +phpbb_ucp_push_unsubscribe_controller: + path: /push/unsubscribe + defaults: { _controller: phpbb.ucp.controller.webpush:unsubscribe } + +phpbb_ucp_push_js_controller: + path: /push/js + defaults: { _controller: phpbb.ucp.controller.webpush:js } diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 7b07138595f..9e03e68509c 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -110,7 +110,9 @@ public function main($id, $mode) /** @var \phpbb\controller\helper $controller_helper */ $controller_helper = $phpbb_container->get('controller.helper'); - $template->assign_var('U_WEBPUSH_SUBSCRIBE', $controller_helper->route('phpbb_ucp_push_subscribe_controller')); + $template->assign_vars([ + 'T_WEBPUSH_JS_PATH' => $controller_helper->route('phpbb_ucp_push_js_controller'), + ]); $this->tpl_name = 'ucp_notifications_options'; $this->page_title = 'UCP_NOTIFICATION_OPTIONS'; diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 67ef237d5b5..9181ad0e837 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -3,25 +3,263 @@ namespace phpbb\ucp\controller; use phpbb\config\config; +use phpbb\controller\helper as controller_helper; +use phpbb\db\driver\driver_interface; +use phpbb\exception\http_exception; +use phpbb\form\form_helper; +use phpbb\json\sanitizer as json_sanitizer; +use phpbb\path_helper; +use phpbb\request\request_interface; +use phpbb\symfony_request; +use phpbb\user; +use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; +use Twig\Environment; +use Twig\Error\LoaderError; +use Twig\Error\RuntimeError; +use Twig\Error\SyntaxError; class webpush { + /** @var string UCP form token name */ + private const FORM_TOKEN_UCP = 'ucp_webpush'; + + /** @var string Push worker form token name */ + private const FORM_TOKEN_WORKER = 'webpush_worker'; + /** @var config */ protected $config; - public function __construct(config $config) + /** @var controller_helper */ + protected $controller_helper; + + /** @var driver_interface */ + protected $db; + + /** @var form_helper */ + protected $form_helper; + + /** @var path_helper */ + protected $path_helper; + + /** @var request_interface */ + protected $request; + + /** @var user */ + protected $user; + + /** @var Environment */ + protected $template; + + /** @var string */ + protected $notification_webpush_table; + + /** @var string */ + protected $push_subscriptions_table; + + /** + * Constructor for webpush controller + * + * @param config $config + * @param controller_helper $controller_helper + * @param driver_interface $db + * @param form_helper $form_helper + * @param path_helper $path_helper + * @param request_interface $request + * @param user $user + * @param Environment $template + * @param string $notification_webpush_table + * @param string $push_subscriptions_table + */ + public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, form_helper $form_helper, path_helper $path_helper, + request_interface $request, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table) { $this->config = $config; + $this->controller_helper = $controller_helper; + $this->db = $db; + $this->form_helper = $form_helper; + $this->path_helper = $path_helper; + $this->request = $request; + $this->user = $user; + $this->template = $template; + $this->notification_webpush_table = $notification_webpush_table; + $this->push_subscriptions_table = $push_subscriptions_table; + } + + /** + * Handle request to retrieve notification data + * + * @return JsonResponse + */ + public function notification(): JsonResponse + { + // Subscribe should only be available for logged-in "normal" users + if (!$this->request->is_ajax() || $this->user->id() == ANONYMOUS || $this->user->data['is_bot'] + || $this->user->data['user_type'] == USER_IGNORE || $this->user->data['user_type'] == USER_INACTIVE) + { + throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); + } + + $item_id = $this->request->variable('item_id', 0); + $type_id = $this->request->variable('type_id', 0); + + $sql = 'SELECT push_data + FROM ' . $this->notification_webpush_table . ' + WHERE user_id = ' . $this->user->id() . ' + AND notification_type_id = ' . $type_id . ' + AND item_id = ' . $item_id; + $result = $this->db->sql_query($sql); + $notification_data = $this->db->sql_fetchfield('push_data'); + $this->db->sql_freeresult($result); + $data = json_decode($notification_data, true); + $data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : ''; + + return new JsonResponse($data); + } + + /** + * Handle request to push worker javascript + * + * @return Response + * @throws LoaderError + * @throws RuntimeError + * @throws SyntaxError + */ + public function worker(): Response + { + // @todo: only work for logged in users, no anonymous & bot + $content = $this->template->render('push_worker.js.twig', [ + 'U_WEBPUSH_GET_NOTIFICATION' => $this->controller_helper->route('phpbb_ucp_push_get_notification_controller'), + ]); + + $response = new Response($content); + $response->headers->set('Content-Type', 'text/javascript; charset=UTF-8'); + + if (!empty($this->user->data['is_bot'])) + { + // Let reverse proxies know we detected a bot. + $response->headers->set('X-PHPBB-IS-BOT', 'yes'); + } + + return $response; + } + + /** + * Get template variables for subscribe type pages + * + * @return array + */ + protected function get_subscribe_vars(): array + { + return [ + 'U_WEBPUSH_SUBSCRIBE' => $this->controller_helper->route('phpbb_ucp_push_subscribe_controller'), + 'U_WEBPUSH_UNSUBSCRIBE' => $this->controller_helper->route('phpbb_ucp_push_unsubscribe_controller'), + 'FORM_TOKENS' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP), + ]; + } + + /** + * Check (un)subscribe form for valid link hash + * + * @throws http_exception If form is invalid or user should not request (un)subscription + * @return void + */ + protected function check_subscribe_requests(): void + { + if (!$this->form_helper->check_form_tokens(self::FORM_TOKEN_UCP)) + { + throw new http_exception(Response::HTTP_BAD_REQUEST, 'FORM_INVALID'); + } + + // Subscribe should only be available for logged-in "normal" users + if (!$this->request->is_ajax() || $this->user->id() == ANONYMOUS || $this->user->data['is_bot'] + || $this->user->data['user_type'] == USER_IGNORE || $this->user->data['user_type'] == USER_INACTIVE) + { + throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); + } } /** - * Handle password reset request + * Handle request to web push javascript * * @return Response + * @throws LoaderError + * @throws RuntimeError + * @throws SyntaxError */ - public function request(): Response + public function js(): Response { - return new Response('foo'); + // @todo: return forbidden for guest & bot + + $template_data = $this->get_subscribe_vars(); + $template_data += [ + 'VAPID_PUBLIC_KEY' => $this->config['webpush_vapid_public'], + 'U_WEBPUSH_WORKER_URL' => $this->controller_helper->route('phpbb_ucp_push_worker_controller'), + ]; + + $content = $this->template->render('webpush.js.twig', $template_data); + + $response = new Response($content); + $response->headers->set('Content-Type', 'text/javascript; charset=UTF-8'); + + if (!empty($this->user->data['is_bot'])) + { + // Let reverse proxies know we detected a bot. + $response->headers->set('X-PHPBB-IS-BOT', 'yes'); + } + + return $response; + } + + /** + * Handle subscribe requests + * + * @param symfony_request $symfony_request + * @return JsonResponse + */ + public function subscribe(symfony_request $symfony_request): JsonResponse + { + $this->check_subscribe_requests(); + + $data = json_sanitizer::decode($symfony_request->get('data', '')); + + $sql = 'INSERT INTO ' . $this->push_subscriptions_table . ' ' . $this->db->sql_build_array('INSERT', [ + 'user_id' => $this->user->id(), + 'endpoint' => $data['endpoint'], + 'expiration_time' => $data['expiration_time'] ?? 0, + 'p256dh' => $data['keys']['p256dh'], + 'auth' => $data['keys']['auth'], + ]); + $this->db->sql_query($sql); + + return new JsonResponse([ + 'success' => true, + 'form_tokens' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP), + ]); + } + + /** + * Handle unsubscribe requests + * + * @param symfony_request $symfony_request + * @return JsonResponse + */ + public function unsubscribe(symfony_request $symfony_request): JsonResponse + { + $this->check_subscribe_requests(); + + $data = json_sanitizer::decode($symfony_request->get('data', '')); + + $endpoint = $data['endpoint']; + + $sql = 'DELETE FROM ' . $this->push_subscriptions_table . ' + WHERE user_id = ' . $this->user->id() . " + AND endpoint = '" . $this->db->sql_escape($endpoint) . "'"; + $this->db->sql_query($sql); + + return new JsonResponse([ + 'success' => true, + 'form_tokens' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP), + ]); } } diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index 6536fb56cd0..fc85b98af2f 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -1,5 +1,7 @@ {% include('ucp_header.html') %} +{% INCLUDEJS(T_WEBPUSH_JS_PATH) %} +

{{ TITLE }}

@@ -8,9 +10,10 @@

{{ TITLE }}

-

{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
+

{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
- {{ lang('NOTIFY_WEBPUSH_ACTIVATE') }} + +
From 7092f24645f9b5504379c675608711335c2834ff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 20:55:37 +0200 Subject: [PATCH 0022/1214] [ticket/17010] Change how notification data is passed to push notifications JS PHPBB3-17010 --- .../db/migration/data/v400/add_webpush.php | 6 ++-- phpBB/phpbb/notification/method/webpush.php | 30 ++++++++++++------- .../notification/type/type_interface.php | 2 +- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php index f2214fd934b..248be387bdb 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -39,6 +39,8 @@ public function update_schema(): array 'item_id' => ['ULINT', 0], 'item_parent_id' => ['ULINT', 0], 'user_id' => ['ULINT', 0], + 'push_data' => ['MTEXT', ''], + 'notification_time' => ['TIMESTAMP', 0] ], 'PRIMARY_KEY' => ['notification_type_id', 'item_id', 'item_parent_id', 'user_id'], ], @@ -46,11 +48,11 @@ public function update_schema(): array 'COLUMNS' => [ 'subscription_id' => ['ULINT', null, 'auto_increment'], 'user_id' => ['ULINT', 0], - 'device_name' => ['VCHAR:64', ''], +// 'device_name' => ['VCHAR:64', ''], 'endpoint' => ['TEXT', ''], + 'expiration_time' => ['TIMESTAMP', 0], 'p256dh' => ['VCHAR', ''], 'auth' => ['VCHAR', ''], - 'encoding' => ['VCHAR:32', ''], ], 'PRIMARY_KEY' => ['subscription_id', 'user_id'], ] diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 2d015600c3c..6e6cc7a1eb5 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -115,7 +115,18 @@ public function notify() /** @var type_interface $notification */ foreach ($this->queue as $notification) { - $data = self::clean_data($notification->get_insert_array()); + $data = $notification->get_insert_array(); + $data += [ + 'push_data' => json_encode([ + 'heading' => $this->config['sitename'], + 'title' => strip_tags($notification->get_title()), + 'text' => strip_tags($notification->get_reference()), + 'url' => $notification->get_url(), + 'avatar' => $notification->get_avatar(), + ]), + 'notification_time' => time(), + ]; + $data = self::clean_data($data); $insert_buffer->insert($data); } @@ -158,7 +169,7 @@ protected function notify_using_webpush(): void // Get subscriptions for users $user_subscription_map = []; - $sql = 'SELECT user_id, endpoint, p256dh, auth, encoding + $sql = 'SELECT user_id, endpoint, p256dh, auth FROM ' . $this->push_subscriptions_table . ' WHERE ' . $this->db->sql_in_set('user_id', $notify_users); $result = $this->db->sql_query($sql); @@ -200,13 +211,9 @@ protected function notify_using_webpush(): void } // add actual web push data - $data['data'] = [ - 'title' => $this->config['sitename'], - 'body' => $notification->get_title(), - 'icon' => '', // @todo: to be filled? - 'image' => '', // @todo: to be filled? - 'url' => $notification->get_url(), - 'user_id' => $notification->user_id, + $data = [ + 'item_id' => $notification->item_id, + 'type_id' => $notification->notification_type_id, ]; $json_data = json_encode($data); @@ -220,7 +227,6 @@ protected function notify_using_webpush(): void 'p256dh' => $subscription['p256dh'], 'auth' => $subscription['auth'], ], - 'contentEncoding' => !empty($subscription['encoding']) ? $subscription['encoding'] : null, ]); $web_push->queueNotification($push_subscription, $json_data); $number_of_notifications++; @@ -283,13 +289,15 @@ public function mark_notifications_by_parent($notification_type_id, $item_parent * @param array $data Notification data * @return array Cleaned notification data */ - public static function clean_data(array $data) + public static function clean_data(array $data): array { $row = [ 'notification_type_id' => null, 'item_id' => null, 'item_parent_id' => null, 'user_id' => null, + 'push_data' => null, + 'notification_time' => null, ]; return array_intersect_key($data, $row); diff --git a/phpBB/phpbb/notification/type/type_interface.php b/phpBB/phpbb/notification/type/type_interface.php index 65bd15d4aa0..4c45b634ba9 100644 --- a/phpBB/phpbb/notification/type/type_interface.php +++ b/phpBB/phpbb/notification/type/type_interface.php @@ -139,7 +139,7 @@ public function get_unsubscribe_url($method); /** * Get the user's avatar (the user who caused the notification typically) * - * @return string + * @return array */ public function get_avatar(); From 06458c95f558b9d05ef420851b4910a8d036bae3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 20:55:54 +0200 Subject: [PATCH 0023/1214] [ticket/17010] Add button disabled state CSS PHPBB3-17010 --- phpBB/styles/prosilver/theme/buttons.css | 14 ++++++++++++++ phpBB/styles/prosilver/theme/colours.css | 9 +++++++++ 2 files changed, 23 insertions(+) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index 4656128ab90..f4671ff58c9 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -32,6 +32,20 @@ outline: none; } +.button[disabled], +.button[disabled]:hover, +.button.disabled, +.button.disabled:hover { + background: #eee; + color: #aaa; + border-color: #aaa; + cursor: default; +} + +.button.hidden { + display: none; +} + .caret { border-left: 1px solid; position: relative; diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 7bdd5f4b87f..ae39635d654 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -697,6 +697,15 @@ dd.profile-warnings { color: #d41142; } +.button[disabled], +.button[disabled]:hover, +.button.disabled, +.button.disabled:hover { + background: #e0e0e0; + color: #9e9e9e; + border-color: #9e9e9e; +} + .button .icon, .button-secondary, .c-button-icon { From e177ee3750d723c9777bc3d9e6f6192558192d28 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 20:56:13 +0200 Subject: [PATCH 0024/1214] [ticket/17010] Add first version of push worker javascript PHPBB3-17010 --- phpBB/styles/all/js/push_worker.js.twig | 59 +++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 phpBB/styles/all/js/push_worker.js.twig diff --git a/phpBB/styles/all/js/push_worker.js.twig b/phpBB/styles/all/js/push_worker.js.twig new file mode 100644 index 00000000000..91dbf6f4ad6 --- /dev/null +++ b/phpBB/styles/all/js/push_worker.js.twig @@ -0,0 +1,59 @@ +/** + * Event listener for push event + */ +self.addEventListener('push', event => { + if (typeof event.data === 'undefined') { + return; + } + + let itemId = 0, + typeId = 0; + try { + const notificationData = event.data.json(); + itemId = notificationData['item_id']; + typeId = notificationData['type_id']; + } catch (e) { + self.registration.showNotification(event.data.text()); + return; + } + + const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}'; + + let formData = new FormData(); + formData.append('item_id', itemId.toString(10)); + formData.append('type_id', typeId.toString(10)); + + fetch(getNotificationUrl, { + method: 'POST', + headers: { + 'X-Requested-With': 'XMLHttpRequest' + }, + body: formData + }) + .then((response) => response.json()) + .then((response) => { + const responseBody = response.title + "\n" + response.text; + const options = { + body: responseBody, + data: response, + icon: response.avatar.src + // foo: '' + //icon: image + } + self.registration.showNotification( + response.heading, + options + ); + } + ); +}); + +/** + * Event listener for notification click + */ +self.addEventListener('notificationclick', event => { + event.notification.close(); + if (typeof event.notification.data !== 'undefined') { + event.waitUntil(self.clients.openWindow(event.notification.data.url)); + } +}); From 166f0deae90939f8fdd3187b7166586af71fb800 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 21:46:34 +0200 Subject: [PATCH 0025/1214] [ticket/17010] Make get_form_tokens() parameters optional PHPBB3-17010 --- phpBB/phpbb/form/form_helper.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/form/form_helper.php b/phpBB/phpbb/form/form_helper.php index ca4ca14b01f..7a266f2339d 100644 --- a/phpBB/phpbb/form/form_helper.php +++ b/phpBB/phpbb/form/form_helper.php @@ -46,13 +46,13 @@ public function __construct(config $config, request_interface $request, user $us * Get form tokens for form * * @param string $form_name Name of form - * @param int $now Token generation time - * @param string $token_sid SID used for form token - * @param string $token Generated token + * @param int|null $now Token generation time + * @param string|null $token_sid SID used for form token + * @param string|null $token Generated token * * @return array Array containing form_token and creation_time of form token */ - public function get_form_tokens(string $form_name, int &$now = 0, string &$token_sid = '', string &$token = ''): array + public function get_form_tokens(string $form_name, ?int &$now = 0, ?string &$token_sid = '', ?string &$token = ''): array { $now = time(); $token_sid = ($this->user->data['user_id'] == ANONYMOUS && !empty($this->config['form_token_sid_guests'])) ? $this->user->session_id : ''; From 98e0559a1d6205804486ad3c7c46a0f07f0e980c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 22:08:29 +0200 Subject: [PATCH 0026/1214] [ticket/17010] Remove wrong references to emails PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 6e6cc7a1eb5..ae6317a4cd9 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -149,14 +149,14 @@ protected function notify_using_webpush(): void return; } - // Load all users we want to notify (we need their email address) + // Load all users we want to notify $user_ids = []; foreach ($this->queue as $notification) { $user_ids[] = $notification->user_id; } - // We do not send emails to banned users + // Do not send push notifications to banned users if (!function_exists('phpbb_get_banned_user_ids')) { include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); @@ -196,7 +196,7 @@ protected function notify_using_webpush(): void $web_push = new \Minishlink\WebPush\WebPush($auth); $number_of_notifications = 0; - // Time to go through the queue and send emails + // Time to go through the queue and send notifications /** @var type_interface $notification */ foreach ($this->queue as $notification) { From ac6512da140cc27c88ab50e23d4cf7c77e570489 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Oct 2022 23:31:49 +0200 Subject: [PATCH 0027/1214] [ticket/17010] Add missing copyright header PHPBB3-17010 --- phpBB/phpbb/ucp/controller/webpush.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 9181ad0e837..f1f5c197be6 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -1,4 +1,15 @@ + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ namespace phpbb\ucp\controller; From b3777894cb26326d75ed71072dc1c0396aa2a718 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Oct 2022 11:44:59 +0100 Subject: [PATCH 0028/1214] [ticket/17010] Fix stylelint issues PHPBB3-17010 --- phpBB/styles/prosilver/theme/buttons.css | 6 +++--- phpBB/styles/prosilver/theme/colours.css | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index f4671ff58c9..e8f8fbe961a 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -36,9 +36,9 @@ .button[disabled]:hover, .button.disabled, .button.disabled:hover { - background: #eee; - color: #aaa; - border-color: #aaa; + background: #eeeeee; + border-color: #aaaaaa; + color: #aaaaaa; cursor: default; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index ae39635d654..fe5e4d7c851 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -702,8 +702,8 @@ dd.profile-warnings { .button.disabled, .button.disabled:hover { background: #e0e0e0; - color: #9e9e9e; border-color: #9e9e9e; + color: #9e9e9e; } .button .icon, From e97313839ee19c0ca0271ac6b4b5f7934ef07691 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 31 Oct 2022 17:03:04 +0100 Subject: [PATCH 0029/1214] [ticket/17010] Add missing words & loading indicator, fix invalid twig code PHPBB3-17010 --- phpBB/language/en/ucp.php | 5 +- phpBB/styles/all/js/webpush.js.twig | 51 +++++++++++-------- .../template/ucp_notifications_options.html | 4 +- 3 files changed, 35 insertions(+), 25 deletions(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 09bf7824e58..19d3a2c06e6 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -356,9 +356,10 @@ 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Notify me on new private messages', - 'NOTIFY_WEBPUSH_ACTIVATE' => 'Activate push notifications', 'NOTIFY_WEBPUSH_ENABLE' => 'Enable receiving webpush notifications', - 'NOTIFY_WEBPUSH_ENABLE_EXPLAIN' => 'Enable receiving browser-based push notifications.
The notifications can be turned off at any time in your browser settings or by disabling the push notifications below.', + 'NOTIFY_WEBPUSH_ENABLE_EXPLAIN' => 'Enable receiving browser-based push notifications.
The notifications can be turned off at any time in your browser settings, by unsubscribing, or by disabling the push notifications below.', + 'NOTIFY_WEBPUSH_SUBSCRIBE' => 'Subscribe', + 'NOTIFY_WEBPUSH_UNSUBSCRIBE' => 'Unsubscribe', 'NOT_ADDED_FRIENDS_ANONYMOUS' => 'You cannot add the anonymous user to your friends list.', 'NOT_ADDED_FRIENDS_BOTS' => 'You cannot add bots to your friends list.', 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list.', diff --git a/phpBB/styles/all/js/webpush.js.twig b/phpBB/styles/all/js/webpush.js.twig index 1287f133d9b..e634f4539c2 100644 --- a/phpBB/styles/all/js/webpush.js.twig +++ b/phpBB/styles/all/js/webpush.js.twig @@ -12,7 +12,7 @@ function PhpbbWebpush() { /** @type {string} URL to unsubscribe from push */ const unsubscribeUrl = '{{ U_WEBPUSH_UNSUBSCRIBE }}'; - /** @type {{creationTime: number, formToken: string}} Form tokens */ + /** @type { {creationTime: number, formToken: string} } Form tokens */ this.formTokens = { creationTime: {{ FORM_TOKENS.creation_time }}, formToken: '{{ FORM_TOKENS.form_token }}' @@ -30,7 +30,6 @@ function PhpbbWebpush() { this.init = function() { subscribeButton = document.querySelector('#subscribe_webpush'); unsubscribeButton = document.querySelector('#unsubscribe_webpush'); - let serviceWorkerRegistered = false; // Service workers are only supported in secure context if (window.isSecureContext !== true) { @@ -41,20 +40,17 @@ function PhpbbWebpush() { if ('serviceWorker' in navigator && 'PushManager' in window) { navigator.serviceWorker.register(serviceWorkerUrl) .then(() => { - serviceWorkerRegistered = true; + subscribeButton.addEventListener('click', subscribeButtonHandler); + unsubscribeButton.addEventListener('click', unsubscribeButtonHandler); + + updateButtonState(); }) .catch(error => { console.info(error); + // Service worker could not be registered + subscribeButton.disabled = true; }); - } - - if (serviceWorkerRegistered) { - subscribeButton.addEventListener('click', subscribeButtonHandler); - unsubscribeButton.addEventListener('click', unsubscribeButtonHandler); - - updateButtonState(); } else { - // Service worker could not be registered subscribeButton.disabled = true; } }; @@ -127,6 +123,7 @@ function PhpbbWebpush() { applicationServerKey: urlB64ToUint8Array(VAPID_PUBLIC_KEY) }); + const loadingIndicator = phpbb.loadingIndicator(); fetch(subscribeUrl, { method: 'POST', headers: { @@ -134,10 +131,14 @@ function PhpbbWebpush() { }, body: getFormData(newSubscription) }) - .then((response) => response.json()) + .then((response) => { + loadingIndicator.fadeOut(phpbb.alertTime); + return response.json(); + }) .then(handleSubscribe) .catch((error) => { - phpbb.alert({{ lang('AJAX_ERROR_TITLE') }}, error); + loadingIndicator.fadeOut(phpbb.alertTime); + phpbb.alert('{{ lang('AJAX_ERROR_TITLE') }}', error); }); } @@ -156,19 +157,27 @@ function PhpbbWebpush() { } const subscription = await registration.pushManager.getSubscription(); + const loadingIndicator = phpbb.loadingIndicator(); fetch(unsubscribeUrl, { method: 'POST', headers: { 'X-Requested-With': 'XMLHttpRequest' }, body: getFormData({endpoint: subscription.endpoint}) - }).then(() => { - return subscription.unsubscribe(); - }).then((unsubscribed) => { - if (unsubscribed) { - setSubscriptionState(false); - } - }); + }) + .then(() => { + loadingIndicator.fadeOut(phpbb.alertTime); + return subscription.unsubscribe(); + }) + .then((unsubscribed) => { + if (unsubscribed) { + setSubscriptionState(false); + } + }) + .catch((error) => { + loadingIndicator.fadeOut(phpbb.alertTime); + phpbb.alert('{{ lang('AJAX_ERROR_TITLE') }}', error); + }); } /** @@ -194,7 +203,7 @@ function PhpbbWebpush() { function getFormData(data) { let formData = new FormData(); formData.append('form_token', phpbb.webpush.formTokens.formToken); - formData.append('creation_time', phpbb.webpush.formTokens.creationTime); + formData.append('creation_time', phpbb.webpush.formTokens.creationTime.toString()); formData.append('data', JSON.stringify(data)); return formData; diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index fc85b98af2f..205e8d43940 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -12,8 +12,8 @@

{{ TITLE }}


{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
- - + +
From edaff6cd2d8f1b30c7ef66e69acc0277d357a4d2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 1 Nov 2022 12:44:22 +0100 Subject: [PATCH 0030/1214] [ticket/17010] Remove undeliverable subscriptions PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index ae6317a4cd9..994ccc35acd 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -13,6 +13,7 @@ namespace phpbb\notification\method; +use Minishlink\WebPush\Subscription; use phpbb\config\config; use phpbb\db\driver\driver_interface; use phpbb\notification\type\type_interface; @@ -24,7 +25,7 @@ * This class handles sending push messages for notifications */ -class webpush extends \phpbb\notification\method\messenger_base +class webpush extends messenger_base { /** @var config */ protected $config; @@ -169,7 +170,7 @@ protected function notify_using_webpush(): void // Get subscriptions for users $user_subscription_map = []; - $sql = 'SELECT user_id, endpoint, p256dh, auth + $sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth FROM ' . $this->push_subscriptions_table . ' WHERE ' . $this->db->sql_in_set('user_id', $notify_users); $result = $this->db->sql_query($sql); @@ -196,6 +197,8 @@ protected function notify_using_webpush(): void $web_push = new \Minishlink\WebPush\WebPush($auth); $number_of_notifications = 0; + $remove_subscriptions = []; + // Time to go through the queue and send notifications /** @var type_interface $notification */ foreach ($this->queue as $notification) @@ -221,7 +224,7 @@ protected function notify_using_webpush(): void { try { - $push_subscription = \Minishlink\WebPush\Subscription::create([ + $push_subscription = Subscription::create([ 'endpoint' => $subscription['endpoint'], 'keys' => [ 'p256dh' => $subscription['p256dh'], @@ -233,13 +236,19 @@ protected function notify_using_webpush(): void } catch (\ErrorException $exception) { - // @todo: decide whether we want to remove invalid subscriptions directly? - // Might need too many resources ... + $remove_subscriptions[] = $subscription['subscription_id']; } } } - // @todo: Try offloading to after request + // Remove any subscriptions that couldn't be queued, i.e. that have invalid data + if (count($remove_subscriptions)) + { + $sql = 'DELETE FROM ' . $this->push_subscriptions_table . ' + WHERE ' . $this->db->sql_in_set('subscription_id', $remove_subscriptions); + $this->db->sql_query($sql); + } + try { foreach ($web_push->flush($number_of_notifications) as $report) From ad196d1dba96cf8222a2e71438578094f7d95de2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 29 Jan 2023 09:48:23 +0100 Subject: [PATCH 0031/1214] [ticket/17010] Move web push testing to slow test group PHPBB3-17010 --- tests/notification/notification_method_webpush_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index f0e1f1cb50a..ce79f578383 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -19,7 +19,7 @@ require_once __DIR__ . '/base.php'; /** - * @group + * @group slow */ class notification_method_webpush_test extends phpbb_tests_notification_base { From a8dc08a21903b48fb2e43f60b4d71acea3f3ae32 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 29 Jan 2023 09:54:01 +0100 Subject: [PATCH 0032/1214] [ticket/17010] Add prune notification support to webpush PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 994ccc35acd..d11959319ca 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -292,6 +292,19 @@ public function mark_notifications_by_parent($notification_type_id, $item_parent $this->db->sql_query($sql); } + /** + * {@inheritDoc} + */ + public function prune_notifications($timestamp, $only_read = true): void + { + $sql = 'DELETE FROM ' . $this->notification_webpush_table . ' + WHERE notification_time < ' . (int) $timestamp . + (($only_read) ? ' AND notification_read = 1' : ''); + $this->db->sql_query($sql); + + $this->config->set('read_notification_last_gc', (string) time(), false); + } + /** * Clean data to contain only what we need for webpush notifications table * From 974b7a9184ff5764eca2531b8c34a465a00208da Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Jan 2023 21:39:49 +0100 Subject: [PATCH 0033/1214] [ticket/17010] Resolve use of undefined variable and possibly wrong type PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index d11959319ca..ea71e1cab83 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -176,7 +176,7 @@ protected function notify_using_webpush(): void $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - if (isset($user_subscriptions[$row['user_id']])) + if (isset($user_subscription_map[$row['user_id']])) { $user_subscription_map[$row['user_id']] += $row; } @@ -274,7 +274,7 @@ protected function notify_using_webpush(): void public function mark_notifications($notification_type_id, $item_id, $user_id, $time = false, $mark_read = true) { $sql = 'DELETE FROM ' . $this->notification_webpush_table . ' - WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', $notification_type_id) : '1=1') . + WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', is_array($notification_type_id) ? $notification_type_id : [$notification_type_id]) : '1=1') . ($user_id !== false ? ' AND ' . $this->db->sql_in_set('user_id', $user_id) : '') . ($item_id !== false ? ' AND ' . $this->db->sql_in_set('item_id', $item_id) : ''); $this->db->sql_query($sql); @@ -286,7 +286,7 @@ public function mark_notifications($notification_type_id, $item_id, $user_id, $t public function mark_notifications_by_parent($notification_type_id, $item_parent_id, $user_id, $time = false, $mark_read = true) { $sql = 'DELETE FROM ' . $this->notification_webpush_table . ' - WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', $notification_type_id) : '1=1') . + WHERE ' . ($notification_type_id !== false ? $this->db->sql_in_set('notification_type_id', is_array($notification_type_id) ? $notification_type_id : [$notification_type_id]) : '1=1') . ($user_id !== false ? ' AND ' . $this->db->sql_in_set('user_id', $user_id) : '') . ($item_parent_id !== false ? ' AND ' . $this->db->sql_in_set('item_parent_id', $item_parent_id, false, true) : ''); $this->db->sql_query($sql); From 3513c85ee61bdb88adffc3b732ac3e8cb9309adc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Jan 2023 23:09:57 +0100 Subject: [PATCH 0034/1214] [ticket/17010] Stop skipping node dependency setup on slow tests PHPBB3-17010 --- .github/workflows/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 761d8e3e87a..1c4de83e508 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -218,12 +218,10 @@ jobs: .github/setup-ldap.sh - name: Setup node - if: ${{ matrix.SLOWTESTS != 1 }} uses: actions/setup-node@v3 with: node-version: 16 - name: Setup node dependencies - if: ${{ matrix.SLOWTESTS != 1 }} run: npm ci - name: Setup SPHINX From 7410c3be6f31d566451caca8650d8f4adea67273 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 23 Jun 2023 17:44:21 +0200 Subject: [PATCH 0035/1214] [ticket/17010] Generate VAPID keys with javascript in ACP PHPBB3-17010 --- phpBB/adm/style/ajax.js | 62 +++++++++++++++++++++++++++++ phpBB/includes/acp/acp_board.php | 68 +++++++++++++++++++++----------- phpBB/language/en/acp/board.php | 1 + 3 files changed, 109 insertions(+), 22 deletions(-) diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 5949c73920d..25a65274810 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -157,6 +157,68 @@ phpbb.addAjaxCallback('row_delete', function(res) { } }); +/** + * This callback generates the VAPID keys for the web push notification service. + */ +phpbb.addAjaxCallback('generate_vapid_keys', (res) => { + function rawKeyToBase64(rawKey) { + const keyBuffer = new Uint8Array(rawKey); + let keyText = ''; + const keyLength = keyBuffer.byteLength; + for (let i = 0; i < keyLength; i++) { + keyText += String.fromCharCode(keyBuffer[i]); + } + + keyText = window.btoa(keyText); + return keyText; + } + + function base64SafeEncode(base64String) { + const base64URL = base64String.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''); + return base64URL; + } + + async function generateVAPIDKeys() { + try { + // Generate a new key pair using the Subtle Crypto API + const keyPair = await crypto.subtle.generateKey( + { + name: 'ECDH', + namedCurve: 'P-256', + }, + true, + ['deriveKey', 'deriveBits'] + ); + + // Export the private key as a JWK (JSON Web Key) object + const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey); + console.log(privateKeyJwk.d); + + const privateKeyString = privateKeyJwk.d; + + // Export the public key as a JWK object + const publicKeyBuffer = await crypto.subtle.exportKey('raw', keyPair.publicKey); + const publicKeyString = base64SafeEncode(rawKeyToBase64(publicKeyBuffer)); + console.log(publicKeyString); + + return { + privateKey: privateKeyString, + publicKey: publicKeyString + }; + } catch (error) { + console.error('Error generating private key:', error); + return null; + } + } + + generateVAPIDKeys().then(keyPair => { + const publicKeyInput = document.querySelector('#webpush_vapid_public'); + const privateKeyInput = document.querySelector('#webpush_vapid_private'); + publicKeyInput.value = keyPair.publicKey; + privateKeyInput.value = keyPair.privateKey; + }) +}) + /** * Handler for submitting permissions form in chunks * This call will submit permissions forms in chunks of 5 fieldsets. diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index ceb7f47d58f..d0ced6788f3 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -491,7 +491,7 @@ function main($id, $mode) 'title' => 'ACP_WEBPUSH_SETTINGS', 'vars' => [ 'legend1' => 'GENERAL_SETTINGS', - 'webpush_enable' => ['lang' => 'WEBPUSH_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], + 'webpush_enable' => ['lang' => 'WEBPUSH_ENABLE', 'validate' => 'bool', 'type' => 'custom', 'method' => 'webpush_enable', 'explain' => true], 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], @@ -539,27 +539,6 @@ function main($id, $mode) } } - if ($mode == 'webpush') - { - // Create VAPID keys if keys are empty and web push is enabled - if ($submit && $cfg_array['webpush_enable'] && $cfg_array['webpush_enable'] != $config['webpush_enable'] - && empty($cfg_array['webpush_vapid_public']) && empty($cfg_array['webpush_vapid_private']) - && empty($config['webpush_vapid_public']) && empty($config['webpush_vapid_private'])) - { - try - { - $vapid_keys = VAPID::createVapidKeys(); - $cfg_array['webpush_vapid_public'] = $vapid_keys['publicKey']; - $cfg_array['webpush_vapid_private'] = $vapid_keys['privateKey']; - } - catch (\ErrorException $exception) - { - // Nothing we can do about this, user will have to follow the - // documentation and manually create these. - } - } - } - // We validate the complete config if wished validate_config_vars($display_vars['vars'], $cfg_array, $error); @@ -1383,4 +1362,49 @@ function send_test_email($value, $key) return ' '; } + + /** + * Generate form data for web push enable + * + * @param string $value Webpush enable value + * @param string $key Webpush enable config key + * + * @return array[] Form data + */ + public function webpush_enable($value, $key): array + { + return [ + [ + 'tag' => 'radio', + 'buttons' => [ + [ + 'name' => "config[$key]", + 'label' => $this->language->lang('YES'), + 'type' => 'radio', + 'class' => 'radio', + 'value' => 1, + 'checked' => $value, + ], + [ + 'name' => "config[$key]", + 'label' => $this->language->lang('NO'), + 'type' => 'radio', + 'class' => 'radio', + 'value' => 0, + 'checked' => !$value, + ], + ], + ], + [ + 'tag' => 'input', + 'class' => 'button2', + 'name' => "config[$key]", + 'type' => 'button', + 'value' => $this->language->lang('WEBPUSH_GENERATE_VAPID_KEYS'), + 'data' => [ + 'ajax' => 'generate_vapid_keys', + ] + ], + ]; + } } diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 8fe9f832f2e..d2905d94e8f 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -603,6 +603,7 @@ 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Webpush for board notifications. Webpush is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', 'WEBPUSH_ENABLE' => 'Enable Webpush', 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush.
Note: If VAPID keys have not been set, phpBB will try to automatically create them when enabling Webpush.', + 'WEBPUSH_GENERATE_VAPID_KEYS' => 'Generate VAPID keys', 'WEBPUSH_VAPID_PUBLIC' => 'VAPID public key', 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The VAPID public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all webpush subscriptions.', 'WEBPUSH_VAPID_PRIVATE' => 'VAPID private key', From 3cbe14eb4a3fc2b4c69216cda41a508f1e405398 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 24 Jun 2023 09:40:35 +0200 Subject: [PATCH 0036/1214] [ticket/17010] Clean up code and move some functions to core js PHPBB3-17010 --- phpBB/adm/style/ajax.js | 35 +++++++++++---------------------- phpBB/assets/javascript/core.js | 27 +++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 24 deletions(-) diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index 25a65274810..67956e946a2 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -160,24 +160,13 @@ phpbb.addAjaxCallback('row_delete', function(res) { /** * This callback generates the VAPID keys for the web push notification service. */ -phpbb.addAjaxCallback('generate_vapid_keys', (res) => { - function rawKeyToBase64(rawKey) { - const keyBuffer = new Uint8Array(rawKey); - let keyText = ''; - const keyLength = keyBuffer.byteLength; - for (let i = 0; i < keyLength; i++) { - keyText += String.fromCharCode(keyBuffer[i]); - } - - keyText = window.btoa(keyText); - return keyText; - } - - function base64SafeEncode(base64String) { - const base64URL = base64String.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''); - return base64URL; - } +phpbb.addAjaxCallback('generate_vapid_keys', () => { + /** + * Generate VAPID keypair with public and private key string + * + * @returns {Promise<{privateKey: string, publicKey: string}|null>} + */ async function generateVAPIDKeys() { try { // Generate a new key pair using the Subtle Crypto API @@ -190,28 +179,26 @@ phpbb.addAjaxCallback('generate_vapid_keys', (res) => { ['deriveKey', 'deriveBits'] ); - // Export the private key as a JWK (JSON Web Key) object const privateKeyJwk = await crypto.subtle.exportKey('jwk', keyPair.privateKey); - console.log(privateKeyJwk.d); - const privateKeyString = privateKeyJwk.d; - // Export the public key as a JWK object const publicKeyBuffer = await crypto.subtle.exportKey('raw', keyPair.publicKey); - const publicKeyString = base64SafeEncode(rawKeyToBase64(publicKeyBuffer)); - console.log(publicKeyString); + const publicKeyString = phpbb.base64UrlEncode(phpbb.rawKeyToBase64(publicKeyBuffer)); return { privateKey: privateKeyString, publicKey: publicKeyString }; } catch (error) { - console.error('Error generating private key:', error); + console.error('Error generating keys with SubtleCrypto:', error); return null; } } generateVAPIDKeys().then(keyPair => { + if (!keyPair) { + return; + } const publicKeyInput = document.querySelector('#webpush_vapid_public'); const privateKeyInput = document.querySelector('#webpush_vapid_private'); publicKeyInput.value = keyPair.publicKey; diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js index d301cc8da87..c0b225214dd 100644 --- a/phpBB/assets/javascript/core.js +++ b/phpBB/assets/javascript/core.js @@ -1677,6 +1677,33 @@ phpbb.getFunctionByName = function (functionName) { return context[func]; }; +/** + * Convert raw key ArrayBuffer to base64 string. + * + * @param {ArrayBuffer} rawKey Raw key array buffer as exported by SubtleCrypto exportKey() + * @returns {string} Base64 encoded raw key string + */ +phpbb.rawKeyToBase64 = (rawKey) => { + const keyBuffer = new Uint8Array(rawKey); + let keyText = ''; + const keyLength = keyBuffer.byteLength; + for (let i = 0; i < keyLength; i++) { + keyText += String.fromCharCode(keyBuffer[i]); + } + + return window.btoa(keyText); +}; + +/** + * Base64URL encode base64 encoded string + * + * @param {string} base64String Base64 encoded string + * @returns {string} Base64URL encoded string + */ +phpbb.base64UrlEncode = (base64String) => { + return base64String.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''); +}; + /** * Register page dropdowns. */ From 21ccb804d3765d1fe2afbe9d06ee6bd875d35c44 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 24 Jun 2023 09:42:30 +0200 Subject: [PATCH 0037/1214] [ticket/17010] Update explain string in ACP for webpush enable PHPBB3-17010 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index d2905d94e8f..1c65cccbc4f 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -602,7 +602,7 @@ $lang = array_merge($lang, [ 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Webpush for board notifications. Webpush is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', 'WEBPUSH_ENABLE' => 'Enable Webpush', - 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush.
Note: If VAPID keys have not been set, phpBB will try to automatically create them when enabling Webpush.', + 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush.', 'WEBPUSH_GENERATE_VAPID_KEYS' => 'Generate VAPID keys', 'WEBPUSH_VAPID_PUBLIC' => 'VAPID public key', 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The VAPID public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all webpush subscriptions.', From 6cc8df5d95ec54394f72c06862ed17d018aa4894 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2023 09:26:06 +0200 Subject: [PATCH 0038/1214] [ticket/17010] Adjust wording on ACP page for webpush PHPBB3-17010 --- phpBB/language/en/acp/board.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 1c65cccbc4f..7a9b81ef1eb 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -602,12 +602,12 @@ $lang = array_merge($lang, [ 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Webpush for board notifications. Webpush is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', 'WEBPUSH_ENABLE' => 'Enable Webpush', - 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush.', - 'WEBPUSH_GENERATE_VAPID_KEYS' => 'Generate VAPID keys', - 'WEBPUSH_VAPID_PUBLIC' => 'VAPID public key', - 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The VAPID public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all webpush subscriptions.', - 'WEBPUSH_VAPID_PRIVATE' => 'VAPID private key', - 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The VAPID private key will be used to create authenticated push messages sent by your site. The VAPID private key must be a valid public-private key pair with the VAPID public key.
Warning: Changing the VAPID private key will automatically invalidate all webpush subscriptions.', + 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush. It is required to enter or generate valid VAPID identification keys to be able to use Webpush.', + 'WEBPUSH_GENERATE_VAPID_KEYS' => 'Generate Identification keys', + 'WEBPUSH_VAPID_PUBLIC' => 'Server identification public key', + 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all Webpush subscriptions.', + 'WEBPUSH_VAPID_PRIVATE' => 'Server identification private key', + 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) private key will be used to create authenticated push messages sent by your site. The VAPID private key must be a valid public-private key pair with the VAPID public key.
Warning: Changing the VAPID private key will automatically invalidate all Webpush subscriptions.', ]); // Jabber settings From c35e9c2438e5978ef8589906422e189853641807 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2023 16:51:29 +0200 Subject: [PATCH 0039/1214] [ticket/17010] Correctly fill subscription map for multiple subscriptions PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index ea71e1cab83..94e2e95c694 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -176,14 +176,7 @@ protected function notify_using_webpush(): void $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { - if (isset($user_subscription_map[$row['user_id']])) - { - $user_subscription_map[$row['user_id']] += $row; - } - else - { - $user_subscription_map[$row['user_id']] = [$row]; - } + $user_subscription_map[$row['user_id']][] = $row; } $auth = [ From b779ce5910b88cd995a97c4efac97797d52eee61 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 25 Jun 2023 21:03:08 +0200 Subject: [PATCH 0040/1214] [ticket/17010] Remove optional column check for non-existent column PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 94e2e95c694..5ec857af052 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -291,8 +291,7 @@ public function mark_notifications_by_parent($notification_type_id, $item_parent public function prune_notifications($timestamp, $only_read = true): void { $sql = 'DELETE FROM ' . $this->notification_webpush_table . ' - WHERE notification_time < ' . (int) $timestamp . - (($only_read) ? ' AND notification_read = 1' : ''); + WHERE notification_time < ' . (int) $timestamp; $this->db->sql_query($sql); $this->config->set('read_notification_last_gc', (string) time(), false); From 79ff21fdf583d2d71c78007170172ff2cbc0b9bb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 26 Jun 2023 08:53:26 +0200 Subject: [PATCH 0041/1214] [ticket/17010] Move get subscription map to separate function and extend tests Unit tests will also now ensure there are no special surprises with more than one subscription for users. PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 35 ++++++++++++++----- .../notification_method_webpush_test.php | 13 +++++-- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 5ec857af052..5091c2823d6 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -169,15 +169,7 @@ protected function notify_using_webpush(): void $this->user_loader->load_users($notify_users, array(USER_IGNORE)); // Get subscriptions for users - $user_subscription_map = []; - $sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth - FROM ' . $this->push_subscriptions_table . ' - WHERE ' . $this->db->sql_in_set('user_id', $notify_users); - $result = $this->db->sql_query($sql); - while ($row = $this->db->sql_fetchrow($result)) - { - $user_subscription_map[$row['user_id']][] = $row; - } + $user_subscription_map = $this->get_user_subscription_map($notify_users); $auth = [ 'VAPID' => [ @@ -316,4 +308,29 @@ public static function clean_data(array $data): array return array_intersect_key($data, $row); } + + /** + * Get subscriptions for notify users + * + * @param array $notify_users Users to notify + * + * @return array Subscription map + */ + protected function get_user_subscription_map(array $notify_users): array + { + // Get subscriptions for users + $user_subscription_map = []; + + $sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth + FROM ' . $this->push_subscriptions_table . ' + WHERE ' . $this->db->sql_in_set('user_id', $notify_users); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + $user_subscription_map[$row['user_id']][] = $row; + } + $this->db->sql_freeresult($result); + + return $user_subscription_map; + } } diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index ce79f578383..888ad11a3b0 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -338,7 +338,14 @@ public function test_get_subscription($notification_type, $post_data, $expected_ $subscription_info = []; foreach ($expected_users as $user_id => $user_data) { - $subscription_info[$user_id] = $this->create_subscription_for_user($user_id); + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + // Create second subscription for first user ID passed + if (count($expected_users)) + { + $first_user_id = array_key_first($expected_users); + $subscription_info[$first_user_id][] = $this->create_subscription_for_user($first_user_id); } $post_data = array_merge([ @@ -361,7 +368,7 @@ public function test_get_subscription($notification_type, $post_data, $expected_ foreach ($expected_users as $user_id => $data) { - $messages = $this->get_messages_for_subscription($subscription_info[$user_id]['clientHash']); + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); $this->assertEmpty($messages); } @@ -372,7 +379,7 @@ public function test_get_subscription($notification_type, $post_data, $expected_ foreach ($expected_users as $user_id => $data) { - $messages = $this->get_messages_for_subscription($subscription_info[$user_id]['clientHash']); + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); $this->assertNotEmpty($messages); } } From 5098f315fd6968ced4eadbcb3cdc14f2caa70b91 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 2 Jul 2023 17:27:50 +0200 Subject: [PATCH 0042/1214] [ticket/17010] Use special chars decode to have valid URL with amp PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 5091c2823d6..3298ee2e3c1 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -122,7 +122,7 @@ public function notify() 'heading' => $this->config['sitename'], 'title' => strip_tags($notification->get_title()), 'text' => strip_tags($notification->get_reference()), - 'url' => $notification->get_url(), + 'url' => htmlspecialchars_decode($notification->get_url()), 'avatar' => $notification->get_avatar(), ]), 'notification_time' => time(), From 6b00e9fe09c464b55a23076da684b744607dbd8a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 3 Jul 2023 14:38:01 +0200 Subject: [PATCH 0043/1214] [ticket/17010] Handle already existing subscriptions PHPBB3-17010 --- .../db/migration/data/v400/add_webpush.php | 1 - phpBB/phpbb/ucp/controller/webpush.php | 26 +++++++++-- phpBB/styles/all/js/webpush.js.twig | 45 ++++++++++++++++--- 3 files changed, 63 insertions(+), 9 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php index 248be387bdb..351e02a3611 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -48,7 +48,6 @@ public function update_schema(): array 'COLUMNS' => [ 'subscription_id' => ['ULINT', null, 'auto_increment'], 'user_id' => ['ULINT', 0], -// 'device_name' => ['VCHAR:64', ''], 'endpoint' => ['TEXT', ''], 'expiration_time' => ['TIMESTAMP', 0], 'p256dh' => ['VCHAR', ''], diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index f1f5c197be6..e292f35fac0 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -35,9 +35,6 @@ class webpush /** @var string UCP form token name */ private const FORM_TOKEN_UCP = 'ucp_webpush'; - /** @var string Push worker form token name */ - private const FORM_TOKEN_WORKER = 'webpush_worker'; - /** @var config */ protected $config; @@ -206,6 +203,7 @@ public function js(): Response $template_data += [ 'VAPID_PUBLIC_KEY' => $this->config['webpush_vapid_public'], 'U_WEBPUSH_WORKER_URL' => $this->controller_helper->route('phpbb_ucp_push_worker_controller'), + 'SUBSCRIPTIONS' => $this->get_subscriptions(), ]; $content = $this->template->render('webpush.js.twig', $template_data); @@ -273,4 +271,26 @@ public function unsubscribe(symfony_request $symfony_request): JsonResponse 'form_tokens' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP), ]); } + + /** + * Get subscriptions for current user + * + * @return array Subscriptions for user + */ + protected function get_subscriptions(): array + { + $subscriptions = []; + + $sql = 'SELECT endpoint, expiration_time + FROM ' . $this->push_subscriptions_table . ' + WHERE user_id = ' . $this->user->id(); + $result = $this->db->sql_query($sql); + while ($row = $this->db->sql_fetchrow($result)) + { + $subscriptions[] = $row; + } + $this->db->sql_freeresult($result); + + return $subscriptions; + } } diff --git a/phpBB/styles/all/js/webpush.js.twig b/phpBB/styles/all/js/webpush.js.twig index e634f4539c2..b9c776d5490 100644 --- a/phpBB/styles/all/js/webpush.js.twig +++ b/phpBB/styles/all/js/webpush.js.twig @@ -18,6 +18,13 @@ function PhpbbWebpush() { formToken: '{{ FORM_TOKENS.form_token }}' }; + /** @type [{endpoint: string, expiration: string}[]] Subscriptions */ + let subscriptions = [ + {% for sub in SUBSCRIPTIONS %} + {endpoint: '{{ sub.endpoint }}', expiration: '{{ sub.expiration }}' }, + {% endfor %} + ]; + /** @type {string} VAPID public key */ const VAPID_PUBLIC_KEY = '{{ VAPID_PUBLIC_KEY }}'; @@ -70,7 +77,7 @@ function PhpbbWebpush() { registration.pushManager.getSubscription() .then((subscribed) => { - if (subscribed) { + if (isValidSubscription(subscribed)) { setSubscriptionState(true); } }) @@ -78,6 +85,31 @@ function PhpbbWebpush() { } } + /** + * Check whether subscription is valid + * + * @param {PushSubscription} subscription + * @returns {boolean} + */ + const isValidSubscription = (subscription) => { + if (!subscription) { + return false; + } + + if (subscription.expirationTime && subscription.expirationTime <= Date.now()) { + return false; + } + + for (const curSubscription of subscriptions) { + if (subscription.endpoint === curSubscription.endpoint) { + return true; + } + } + + // Subscription is not in valid subscription list for user + return false; + }; + /** * Set subscription state for buttons * @@ -111,16 +143,19 @@ function PhpbbWebpush() { } const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl); + + // We might already have a subscription that is unknown to this instance of phpBB. + // Unsubscribe before trying to subscribe again. if (typeof registration !== 'undefined') { const subscribed = await registration.pushManager.getSubscription(); if (subscribed) { - setSubscriptionState(true); - return; + await subscribed.unsubscribe(); } } - const newSubscription = await registration.pushManager.subscribe({ + + let newSubscription = await registration.pushManager.subscribe({ userVisibleOnly: true, - applicationServerKey: urlB64ToUint8Array(VAPID_PUBLIC_KEY) + applicationServerKey: urlB64ToUint8Array(VAPID_PUBLIC_KEY), }); const loadingIndicator = phpbb.loadingIndicator(); From f3eb774abdb181f2dafc985186ba3b12590754b3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Jul 2023 09:02:19 +0200 Subject: [PATCH 0044/1214] [ticket/17010] Add missing language variable PHPBB3-17010 --- phpBB/language/en/acp/common.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 84c047af54b..85418652dad 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -593,6 +593,7 @@ 'LOG_CONFIG_SETTINGS' => 'Altered board settings', 'LOG_CONFIG_SIGNATURE' => 'Altered signature settings', 'LOG_CONFIG_VISUAL' => 'Altered anti-spambot settings', + 'LOG_CONFIG_WEBPUSH' => 'Altered webpush settings', 'LOG_APPROVE_TOPIC' => 'Approved topic
» %s', 'LOG_BUMP_TOPIC' => 'User bumped topic
» %s', From 479e54db932d09e748eef07d08386e1613ba546c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 15 Aug 2023 08:12:33 +0200 Subject: [PATCH 0045/1214] [ticket/17010] Add logging to webpush notifications PHPBB3-17010 --- .../container/services_notification.yml | 5 ++-- phpBB/language/en/acp/common.php | 3 +++ phpBB/phpbb/notification/method/webpush.php | 23 ++++++++++++++----- tests/notification/base.php | 1 + .../notification_method_email_test.php | 1 + tests/notification/submit_post_base.php | 1 + 6 files changed, 26 insertions(+), 8 deletions(-) diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index acb136641cd..92592850f9c 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -248,10 +248,11 @@ services: class: phpbb\notification\method\webpush shared: false arguments: - - '@user_loader' - - '@user' - '@config' - '@dbal.conn' + - '@log' + - '@user_loader' + - '@user' - '%core.root_path%' - '%core.php_ext%' - '%tables.notification_push%' diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 85418652dad..b9e24163419 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -814,6 +814,9 @@ ), 'LOG_WARNINGS_DELETED_ALL' => 'Deleted all user warnings
» %s', + 'LOG_WEBPUSH_MESSAGE_FAIL' => 'WebPush message could not be sent: %s', + 'LOG_WEBPUSH_SUBSCRIPTION_REMOVED' => 'Removed WebPush subscription:» %s', + 'LOG_WORD_ADD' => 'Added word censor
» %s', 'LOG_WORD_DELETE' => 'Deleted word censor
» %s', 'LOG_WORD_EDIT' => 'Edited word censor
» %s', diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 3298ee2e3c1..c4d44946edb 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -16,6 +16,7 @@ use Minishlink\WebPush\Subscription; use phpbb\config\config; use phpbb\db\driver\driver_interface; +use phpbb\log\log_interface; use phpbb\notification\type\type_interface; use phpbb\user; use phpbb\user_loader; @@ -33,6 +34,9 @@ class webpush extends messenger_base /** @var driver_interface */ protected $db; + /** @var log_interface */ + protected $log; + /** @var user */ protected $user; @@ -45,23 +49,25 @@ class webpush extends messenger_base /** * Notification Method web push constructor * - * @param user_loader $user_loader - * @param user $user * @param config $config * @param driver_interface $db + * @param log_interface $log + * @param user_loader $user_loader + * @param user $user * @param string $phpbb_root_path * @param string $php_ext * @param string $notification_webpush_table * @param string $push_subscriptions_table */ - public function __construct(user_loader $user_loader, user $user, config $config, driver_interface $db, string $phpbb_root_path, + public function __construct(config $config, driver_interface $db, log_interface $log, user_loader $user_loader, user $user, string $phpbb_root_path, string $php_ext, string $notification_webpush_table, string $push_subscriptions_table) { parent::__construct($user_loader, $phpbb_root_path, $php_ext); - $this->user = $user; $this->config = $config; $this->db = $db; + $this->log = $log; + $this->user = $user; $this->notification_webpush_table = $notification_webpush_table; $this->push_subscriptions_table = $push_subscriptions_table; } @@ -222,6 +228,10 @@ protected function notify_using_webpush(): void catch (\ErrorException $exception) { $remove_subscriptions[] = $subscription['subscription_id']; + $this->log->add('user', $user['user_id'], $user['user_ip'] ?? '', 'LOG_WEBPUSH_SUBSCRIPTION_REMOVED', false, [ + 'reportee_id' => $user['user_id'], + $user['username'], + ]); } } } @@ -240,13 +250,14 @@ protected function notify_using_webpush(): void { if (!$report->isSuccess()) { - // @todo: log errors / remove subscription + $report_data = \phpbb\json\sanitizer::sanitize($report->jsonSerialize()); + $this->log->add('admin', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$report_data['reason']]); } } } catch (\ErrorException $exception) { - // @todo: write to log + $this->log->add('critical', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$exception->getMessage()]); } // We're done, empty the queue diff --git a/tests/notification/base.php b/tests/notification/base.php index 37718a85a95..8e6f67c2198 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -106,6 +106,7 @@ protected function setUp(): void $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set( 'text_formatter.s9e.mention_helper', diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 77db505c04d..6b464b1c42d 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -83,6 +83,7 @@ protected function setUp(): void $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 3219c85e27c..124ac4d1b4d 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -135,6 +135,7 @@ protected function setUp(): void $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set( 'text_formatter.s9e.mention_helper', From 2da2211898e8931ac68977438f0d11b24881a531 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 15 Aug 2023 09:47:11 +0200 Subject: [PATCH 0046/1214] [ticket/17010] Update webpush test PHPBB3-17010 --- tests/notification/notification_method_webpush_test.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index 888ad11a3b0..9cf374da1a3 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -125,6 +125,7 @@ protected function setUp(): void $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); @@ -147,10 +148,11 @@ protected function setUp(): void ); $this->notification_method_webpush = new \phpbb\notification\method\webpush( - $phpbb_container->get('user_loader'), - $phpbb_container->get('user'), $phpbb_container->get('config'), $phpbb_container->get('dbal.conn'), + $phpbb_container->get('log'), + $phpbb_container->get('user_loader'), + $phpbb_container->get('user'), $phpbb_root_path, $phpEx, $phpbb_container->getParameter('tables.notification_push'), From d85da61c9a9b9203d0058bee10bf1312f926fa63 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 12:55:07 +0100 Subject: [PATCH 0047/1214] [ticket/17010] Move webpush js to assets folder PHPBB3-17010 --- .../all/js/webpush.js.twig => assets/javascript/webpush.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename phpBB/{styles/all/js/webpush.js.twig => assets/javascript/webpush.js} (100%) diff --git a/phpBB/styles/all/js/webpush.js.twig b/phpBB/assets/javascript/webpush.js similarity index 100% rename from phpBB/styles/all/js/webpush.js.twig rename to phpBB/assets/javascript/webpush.js From fa91bf791f125e63ef467dac760c34c778cbd881 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 12:56:01 +0100 Subject: [PATCH 0048/1214] [ticket/17010] Make webpush js not depend on twig compilation PHPBB3-17010 --- phpBB/assets/javascript/webpush.js | 93 +++++++++++-------- .../template/ucp_notifications_options.html | 4 +- .../template/ucp_notifications_webpush.html | 21 +++++ 3 files changed, 77 insertions(+), 41 deletions(-) create mode 100644 phpBB/styles/prosilver/template/ucp_notifications_webpush.html diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js index b9c776d5490..c326fe1cff3 100644 --- a/phpBB/assets/javascript/webpush.js +++ b/phpBB/assets/javascript/webpush.js @@ -4,37 +4,48 @@ function PhpbbWebpush() { /** @type {string} URL to service worker */ - const serviceWorkerUrl = '{{ U_WEBPUSH_WORKER_URL }}'; + let serviceWorkerUrl = ''; /** @type {string} URL to subscribe to push */ - const subscribeUrl = '{{ U_WEBPUSH_SUBSCRIBE }}'; + let subscribeUrl = ''; /** @type {string} URL to unsubscribe from push */ - const unsubscribeUrl = '{{ U_WEBPUSH_UNSUBSCRIBE }}'; + let unsubscribeUrl = ''; /** @type { {creationTime: number, formToken: string} } Form tokens */ this.formTokens = { - creationTime: {{ FORM_TOKENS.creation_time }}, - formToken: '{{ FORM_TOKENS.form_token }}' + creationTime: 0, + formToken: '', }; - /** @type [{endpoint: string, expiration: string}[]] Subscriptions */ - let subscriptions = [ - {% for sub in SUBSCRIPTIONS %} - {endpoint: '{{ sub.endpoint }}', expiration: '{{ sub.expiration }}' }, - {% endfor %} - ]; + /** @type {{endpoint: string, expiration: string}[]} Subscriptions */ + let subscriptions; + + /** @type {string} Title of error message */ + let ajaxErrorTitle = ''; /** @type {string} VAPID public key */ - const VAPID_PUBLIC_KEY = '{{ VAPID_PUBLIC_KEY }}'; + let vapidPublicKey = ''; + + /** @type {HTMLElement} Subscribe button */ + let subscribeButton; - let subscribeButton, - unsubscribeButton; + /** @type {HTMLElement} Unsubscribe button */ + let unsubscribeButton; /** - * Init function for phpBB webpush + * Init function for phpBB Web Push + * @type {array} options */ - this.init = function() { + this.init = function(options) { + serviceWorkerUrl = options.serviceWorkerUrl; + subscribeUrl = options.subscribeUrl; + unsubscribeUrl = options.unsubscribeUrl; + this.formTokens = options.formTokens; + subscriptions = options.subscriptions; + ajaxErrorTitle = options.ajaxErrorTitle; + vapidPublicKey = options.vapidPublicKey; + subscribeButton = document.querySelector('#subscribe_webpush'); unsubscribeButton = document.querySelector('#unsubscribe_webpush'); @@ -70,17 +81,17 @@ function PhpbbWebpush() { function updateButtonState() { if (Notification.permission === 'granted') { navigator.serviceWorker.getRegistration(serviceWorkerUrl) - .then((registration) => { + .then(registration => { if (typeof registration === 'undefined') { return; } registration.pushManager.getSubscription() - .then((subscribed) => { + .then(subscribed => { if (isValidSubscription(subscribed)) { setSubscriptionState(true); } - }) + }); }); } } @@ -91,7 +102,7 @@ function PhpbbWebpush() { * @param {PushSubscription} subscription * @returns {boolean} */ - const isValidSubscription = (subscription) => { + const isValidSubscription = subscription => { if (!subscription) { return false; } @@ -153,27 +164,27 @@ function PhpbbWebpush() { } } - let newSubscription = await registration.pushManager.subscribe({ + const newSubscription = await registration.pushManager.subscribe({ userVisibleOnly: true, - applicationServerKey: urlB64ToUint8Array(VAPID_PUBLIC_KEY), + applicationServerKey: urlB64ToUint8Array(vapidPublicKey), }); const loadingIndicator = phpbb.loadingIndicator(); fetch(subscribeUrl, { - method: 'POST', - headers: { - 'X-Requested-With': 'XMLHttpRequest' - }, - body: getFormData(newSubscription) - }) - .then((response) => { + method: 'POST', + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + body: getFormData(newSubscription), + }) + .then(response => { loadingIndicator.fadeOut(phpbb.alertTime); return response.json(); }) .then(handleSubscribe) - .catch((error) => { + .catch(error => { loadingIndicator.fadeOut(phpbb.alertTime); - phpbb.alert('{{ lang('AJAX_ERROR_TITLE') }}', error); + phpbb.alert(ajaxErrorTitle, error); }); } @@ -196,22 +207,22 @@ function PhpbbWebpush() { fetch(unsubscribeUrl, { method: 'POST', headers: { - 'X-Requested-With': 'XMLHttpRequest' + 'X-Requested-With': 'XMLHttpRequest', }, - body: getFormData({endpoint: subscription.endpoint}) + body: getFormData({ endpoint: subscription.endpoint }), }) .then(() => { loadingIndicator.fadeOut(phpbb.alertTime); return subscription.unsubscribe(); }) - .then((unsubscribed) => { + .then(unsubscribed => { if (unsubscribed) { setSubscriptionState(false); } }) - .catch((error) => { + .catch(error => { loadingIndicator.fadeOut(phpbb.alertTime); - phpbb.alert('{{ lang('AJAX_ERROR_TITLE') }}', error); + phpbb.alert(ajaxErrorTitle, error); }); } @@ -223,7 +234,7 @@ function PhpbbWebpush() { function handleSubscribe(response) { if (response.success) { setSubscriptionState(true); - if (response.hasOwnProperty('form_tokens')) { + if ('form_tokens' in response) { updateFormTokens(response.form_tokens); } } @@ -236,7 +247,7 @@ function PhpbbWebpush() { * @returns {FormData} Form data */ function getFormData(data) { - let formData = new FormData(); + const formData = new FormData(); formData.append('form_token', phpbb.webpush.formTokens.formToken); formData.append('creation_time', phpbb.webpush.formTokens.creationTime.toString()); formData.append('data', JSON.stringify(data)); @@ -261,13 +272,14 @@ function PhpbbWebpush() { * @returns {Uint8Array} */ function urlB64ToUint8Array(base64String) { - const padding = '='.repeat((4 - base64String.length % 4) % 4); + const padding = '='.repeat((4 - (base64String.length % 4)) % 4); const base64 = (base64String + padding).replace(/-/g, '+').replace(/_/g, '/'); const rawData = window.atob(base64); const outputArray = new Uint8Array(rawData.length); for (let i = 0; i < rawData.length; ++i) { outputArray[i] = rawData.charCodeAt(i); } + return outputArray; } } @@ -283,5 +295,6 @@ function domReady(callBack) { phpbb.webpush = new PhpbbWebpush(); domReady(() => { - phpbb.webpush.init(); + /* global phpbbWebpushOptions */ + phpbb.webpush.init(phpbbWebpushOptions); }); diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index 205e8d43940..a0d9caad12e 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -1,6 +1,8 @@ {% include('ucp_header.html') %} -{% INCLUDEJS(T_WEBPUSH_JS_PATH) %} +{% if NOTIFICATIONS_WEBPUSH_ENABLE %} + {% include('ucp_notifications_webpush.html') %} +{% endif %} diff --git a/phpBB/styles/prosilver/template/ucp_notifications_webpush.html b/phpBB/styles/prosilver/template/ucp_notifications_webpush.html new file mode 100644 index 00000000000..31c4790b33d --- /dev/null +++ b/phpBB/styles/prosilver/template/ucp_notifications_webpush.html @@ -0,0 +1,21 @@ + + +{% INCLUDEJS(T_ASSETS_PATH ~ '/javascript/webpush.js') %} + From 8d9a7aa62c3002c0545b856691f85677769aee15 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 12:56:39 +0100 Subject: [PATCH 0049/1214] [ticket/17010] Add new interface and create template data in type PHPBB3-17010 --- phpBB/includes/ucp/ucp_notifications.php | 59 +++++++++---------- .../method/extended_method_interface.php | 29 +++++++++ phpBB/phpbb/notification/method/webpush.php | 33 ++++++++++- phpBB/phpbb/ucp/controller/webpush.php | 2 +- 4 files changed, 89 insertions(+), 34 deletions(-) create mode 100644 phpBB/phpbb/notification/method/extended_method_interface.php diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 9e03e68509c..62d7fbd112e 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -14,6 +14,11 @@ /** * @ignore */ + +use phpbb\controller\helper; +use phpbb\form\form_helper; +use phpbb\notification\method\extended_method_interface; + if (!defined('IN_PHPBB')) { exit; @@ -23,17 +28,29 @@ class ucp_notifications { public $u_action; + private const FORM_TOKEN_NAME = 'ucp_notification'; + + /** @var helper */ + private helper $controller_helper; + + /** @var form_helper */ + private form_helper $form_helper; + public function main($id, $mode) { global $config, $template, $user, $request, $phpbb_container, $phpbb_dispatcher; global $phpbb_root_path, $phpEx; - add_form_key('ucp_notification'); + add_form_key(self::FORM_TOKEN_NAME); $start = $request->variable('start', 0); $form_time = $request->variable('form_time', 0); $form_time = ($form_time <= 0 || $form_time > time()) ? time() : $form_time; + + $this->controller_helper = $phpbb_container->get('controller.helper'); + $this->form_helper = $phpbb_container->get('form_helper'); + /* @var $phpbb_notifications \phpbb\notification\manager */ $phpbb_notifications = $phpbb_container->get('notification_manager'); @@ -48,7 +65,7 @@ public function main($id, $mode) // Add/remove subscriptions if ($request->is_set_post('submit')) { - if (!check_form_key('ucp_notification')) + if (!check_form_key(self::FORM_TOKEN_NAME)) { trigger_error('FORM_INVALID'); } @@ -103,15 +120,12 @@ public function main($id, $mode) trigger_error($message); } - $this->output_notification_methods($phpbb_notifications, $template, $user, 'notification_methods'); + $this->output_notification_methods($phpbb_notifications, $template, $user); $this->output_notification_types($subscriptions, $phpbb_notifications, $template, $user, $phpbb_dispatcher, 'notification_types'); - /** @var \phpbb\controller\helper $controller_helper */ - $controller_helper = $phpbb_container->get('controller.helper'); - $template->assign_vars([ - 'T_WEBPUSH_JS_PATH' => $controller_helper->route('phpbb_ucp_push_js_controller'), + 'FORM_TOKENS' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_NAME), ]); $this->tpl_name = 'ucp_notifications_options'; @@ -145,7 +159,7 @@ public function main($id, $mode) // Mark specific notifications read if ($request->is_set_post('submit')) { - if (!check_form_key('ucp_notification')) + if (!check_form_key(self::FORM_TOKEN_NAME)) { trigger_error('FORM_INVALID'); } @@ -273,35 +287,18 @@ public function output_notification_methods(\phpbb\notification\manager $phpbb_n { $notification_methods = $phpbb_notifications->get_subscription_methods(); - if (isset($notification_methods['notification.method.webpush'])) + foreach ($notification_methods as $method_data) { - $this->output_webpush_data($template); - } + if ($method_data['method'] instanceof extended_method_interface) + { + $ucp_template_data = $method_data['method']->get_ucp_template_data($this->controller_helper, $this->form_helper); + $template->assign_vars($ucp_template_data); + } - foreach ($notification_methods as $method => $method_data) - { $template->assign_block_vars($block, array( 'METHOD' => $method_data['id'], - 'NAME' => $user->lang($method_data['lang']), )); } } - - /** - * Output data for webpush - * - * @param \phpbb\template\template $template - * - * @return void - */ - protected function output_webpush_data(\phpbb\template\template $template): void - { - global $config; - - $template->assign_vars([ - 'NOTIFICATIONS_WEBPUSH_ENABLE' => true, // already checked, otherwise we wouldn't be here - 'NOTIFICATIONS_WEBPUSH_VAPID_PUBLIC' => $config['webpush_vapid_public'], - ]); - } } diff --git a/phpBB/phpbb/notification/method/extended_method_interface.php b/phpBB/phpbb/notification/method/extended_method_interface.php new file mode 100644 index 00000000000..866288ec3e2 --- /dev/null +++ b/phpBB/phpbb/notification/method/extended_method_interface.php @@ -0,0 +1,29 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\notification\method; + +use phpbb\controller\helper; +use phpbb\form\form_helper; + +interface extended_method_interface extends method_interface +{ + /** + * Get UCP template data for type + * + * @param helper $controller_helper + * @param form_helper $form_helper + * @return array Template data + */ + public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array; +} diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index c4d44946edb..273ddcddd51 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -15,7 +15,9 @@ use Minishlink\WebPush\Subscription; use phpbb\config\config; +use phpbb\controller\helper; use phpbb\db\driver\driver_interface; +use phpbb\form\form_helper; use phpbb\log\log_interface; use phpbb\notification\type\type_interface; use phpbb\user; @@ -26,7 +28,7 @@ * This class handles sending push messages for notifications */ -class webpush extends messenger_base +class webpush extends messenger_base implements extended_method_interface { /** @var config */ protected $config; @@ -320,6 +322,33 @@ public static function clean_data(array $data): array return array_intersect_key($data, $row); } + public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array + { + $subscription_map = $this->get_user_subscription_map([$this->user->id()]); + $subscriptions = []; + + if (isset($subscription_map[$this->user->id()])) + { + foreach ($subscription_map[$this->user->id()] as $subscription) + { + $subscriptions[] = [ + 'endpoint' => $subscription['endpoint'], + 'expirationTime' => $subscription['expiration_time'], + ]; + } + } + + return [ + 'NOTIFICATIONS_WEBPUSH_ENABLE' => true, + 'U_WEBPUSH_SUBSCRIBE' => $controller_helper->route('phpbb_ucp_push_subscribe_controller'), + 'U_WEBPUSH_UNSUBSCRIBE' => $controller_helper->route('phpbb_ucp_push_unsubscribe_controller'), + 'VAPID_PUBLIC_KEY' => $this->config['webpush_vapid_public'], + 'U_WEBPUSH_WORKER_URL' => $controller_helper->route('phpbb_ucp_push_worker_controller'), + 'SUBSCRIPTIONS' => $subscriptions, + 'WEBPUSH_FORM_TOKENS' => $form_helper->get_form_tokens(\phpbb\ucp\controller\webpush::FORM_TOKEN_UCP), + ]; + } + /** * Get subscriptions for notify users * @@ -332,7 +361,7 @@ protected function get_user_subscription_map(array $notify_users): array // Get subscriptions for users $user_subscription_map = []; - $sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth + $sql = 'SELECT subscription_id, user_id, endpoint, p256dh, auth, expiration_time FROM ' . $this->push_subscriptions_table . ' WHERE ' . $this->db->sql_in_set('user_id', $notify_users); $result = $this->db->sql_query($sql); diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index e292f35fac0..a9b5e133cf3 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -33,7 +33,7 @@ class webpush { /** @var string UCP form token name */ - private const FORM_TOKEN_UCP = 'ucp_webpush'; + public const FORM_TOKEN_UCP = 'ucp_webpush'; /** @var config */ protected $config; From bfc3a969eeabc410074ee82eec1f74ae63bc08ef Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 14:38:52 +0100 Subject: [PATCH 0050/1214] [ticket/17010] Remove no longer used route & handler PHPBB3-17010 --- phpBB/config/default/routing/ucp.yml | 4 ---- phpBB/phpbb/ucp/controller/webpush.php | 33 -------------------------- 2 files changed, 37 deletions(-) diff --git a/phpBB/config/default/routing/ucp.yml b/phpBB/config/default/routing/ucp.yml index dac6461ac5d..772910bfe13 100644 --- a/phpBB/config/default/routing/ucp.yml +++ b/phpBB/config/default/routing/ucp.yml @@ -21,7 +21,3 @@ phpbb_ucp_push_subscribe_controller: phpbb_ucp_push_unsubscribe_controller: path: /push/unsubscribe defaults: { _controller: phpbb.ucp.controller.webpush:unsubscribe } - -phpbb_ucp_push_js_controller: - path: /push/js - defaults: { _controller: phpbb.ucp.controller.webpush:js } diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index a9b5e133cf3..79f6b110cc0 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -187,39 +187,6 @@ protected function check_subscribe_requests(): void } } - /** - * Handle request to web push javascript - * - * @return Response - * @throws LoaderError - * @throws RuntimeError - * @throws SyntaxError - */ - public function js(): Response - { - // @todo: return forbidden for guest & bot - - $template_data = $this->get_subscribe_vars(); - $template_data += [ - 'VAPID_PUBLIC_KEY' => $this->config['webpush_vapid_public'], - 'U_WEBPUSH_WORKER_URL' => $this->controller_helper->route('phpbb_ucp_push_worker_controller'), - 'SUBSCRIPTIONS' => $this->get_subscriptions(), - ]; - - $content = $this->template->render('webpush.js.twig', $template_data); - - $response = new Response($content); - $response->headers->set('Content-Type', 'text/javascript; charset=UTF-8'); - - if (!empty($this->user->data['is_bot'])) - { - // Let reverse proxies know we detected a bot. - $response->headers->set('X-PHPBB-IS-BOT', 'yes'); - } - - return $response; - } - /** * Handle subscribe requests * From d79e10e032a474e072a540e719dcbf57d2141039 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 14:39:12 +0100 Subject: [PATCH 0051/1214] [ticket/17010] Unify naming of Web Push PHPBB3-17010 --- phpBB/language/en/acp/board.php | 6 +++--- phpBB/language/en/acp/common.php | 8 ++++---- phpBB/language/en/ucp.php | 4 ++-- phpBB/phpbb/notification/method/webpush.php | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 7a9b81ef1eb..58a256bb2c9 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -600,9 +600,9 @@ )); $lang = array_merge($lang, [ - 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Webpush for board notifications. Webpush is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', - 'WEBPUSH_ENABLE' => 'Enable Webpush', - 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Webpush. It is required to enter or generate valid VAPID identification keys to be able to use Webpush.', + 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Web Push for board notifications. Web Push is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', + 'WEBPUSH_ENABLE' => 'Enable Web Push', + 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Web Push. It is required to enter or generate valid VAPID identification keys to be able to use Web Push.', 'WEBPUSH_GENERATE_VAPID_KEYS' => 'Generate Identification keys', 'WEBPUSH_VAPID_PUBLIC' => 'Server identification public key', 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all Webpush subscriptions.', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index b9e24163419..ae2b54f62fa 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -219,7 +219,7 @@ 'ACP_VIEW_GLOBAL_MOD_PERMISSIONS' => 'View global moderation permissions', 'ACP_VIEW_USER_PERMISSIONS' => 'View user-based permissions', - 'ACP_WEBPUSH_SETTINGS' => 'Webpush settings', + 'ACP_WEBPUSH_SETTINGS' => 'Web Push settings', 'ACP_WORDS' => 'Word censoring', 'ACTION' => 'Action', @@ -593,7 +593,7 @@ 'LOG_CONFIG_SETTINGS' => 'Altered board settings', 'LOG_CONFIG_SIGNATURE' => 'Altered signature settings', 'LOG_CONFIG_VISUAL' => 'Altered anti-spambot settings', - 'LOG_CONFIG_WEBPUSH' => 'Altered webpush settings', + 'LOG_CONFIG_WEBPUSH' => 'Altered Web Push settings', 'LOG_APPROVE_TOPIC' => 'Approved topic
» %s', 'LOG_BUMP_TOPIC' => 'User bumped topic
» %s', @@ -814,8 +814,8 @@ ), 'LOG_WARNINGS_DELETED_ALL' => 'Deleted all user warnings
» %s', - 'LOG_WEBPUSH_MESSAGE_FAIL' => 'WebPush message could not be sent: %s', - 'LOG_WEBPUSH_SUBSCRIPTION_REMOVED' => 'Removed WebPush subscription:» %s', + 'LOG_WEBPUSH_MESSAGE_FAIL' => 'Web Push message could not be sent: %s', + 'LOG_WEBPUSH_SUBSCRIPTION_REMOVED' => 'Removed Web Push subscription:» %s', 'LOG_WORD_ADD' => 'Added word censor
» %s', 'LOG_WORD_DELETE' => 'Deleted word censor
» %s', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 19d3a2c06e6..3d90f15742d 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -332,7 +332,7 @@ 'NOTIFICATION_METHOD_BOARD' => 'Notifications', 'NOTIFICATION_METHOD_EMAIL' => 'Email', 'NOTIFICATION_METHOD_JABBER' => 'Jabber', - 'NOTIFICATION_METHOD_WEBPUSH' => 'Web push', + 'NOTIFICATION_METHOD_WEBPUSH' => 'Web Push', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', 'NOTIFICATION_TYPE_GROUP_REQUEST' => 'Someone requests to join a group you lead', @@ -356,7 +356,7 @@ 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Notify me on new private messages', - 'NOTIFY_WEBPUSH_ENABLE' => 'Enable receiving webpush notifications', + 'NOTIFY_WEBPUSH_ENABLE' => 'Enable receiving Web Push notifications', 'NOTIFY_WEBPUSH_ENABLE_EXPLAIN' => 'Enable receiving browser-based push notifications.
The notifications can be turned off at any time in your browser settings, by unsubscribing, or by disabling the push notifications below.', 'NOTIFY_WEBPUSH_SUBSCRIBE' => 'Subscribe', 'NOTIFY_WEBPUSH_UNSUBSCRIBE' => 'Unsubscribe', diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 273ddcddd51..386dfd25251 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -24,7 +24,7 @@ use phpbb\user_loader; /** -* Web push notification method class +* Web Push notification method class * This class handles sending push messages for notifications */ @@ -42,14 +42,14 @@ class webpush extends messenger_base implements extended_method_interface /** @var user */ protected $user; - /** @var string Notification web push table */ + /** @var string Notification Web Push table */ protected $notification_webpush_table; /** @var string Notification push subscriptions table */ protected $push_subscriptions_table; /** - * Notification Method web push constructor + * Notification Method Web Push constructor * * @param config $config * @param driver_interface $db @@ -147,7 +147,7 @@ public function notify() } /** - * Notify using web push + * Notify using Web Push * * @return void */ @@ -206,7 +206,7 @@ protected function notify_using_webpush(): void continue; } - // add actual web push data + // Add actual Web Push data $data = [ 'item_id' => $notification->item_id, 'type_id' => $notification->notification_type_id, From a86d222ab04459746843698bf1431c127ae377c4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 14:59:10 +0100 Subject: [PATCH 0052/1214] [ticket/17010] Remove not needed empty line PHPBB3-17010 --- phpBB/includes/ucp/ucp_notifications.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 62d7fbd112e..94a1586f9fd 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -47,7 +47,6 @@ public function main($id, $mode) $form_time = $request->variable('form_time', 0); $form_time = ($form_time <= 0 || $form_time > time()) ? time() : $form_time; - $this->controller_helper = $phpbb_container->get('controller.helper'); $this->form_helper = $phpbb_container->get('form_helper'); From adf639e871275da79265b18ba2bc29af187695dc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 15:15:11 +0100 Subject: [PATCH 0053/1214] [ticket/17010] Clean up code and remove unused method PHPBB3-17010 --- phpBB/phpbb/ucp/controller/webpush.php | 32 ++++---------------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 79f6b110cc0..f1cd513df43 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -113,9 +113,9 @@ public function notification(): JsonResponse $sql = 'SELECT push_data FROM ' . $this->notification_webpush_table . ' - WHERE user_id = ' . $this->user->id() . ' - AND notification_type_id = ' . $type_id . ' - AND item_id = ' . $item_id; + WHERE user_id = ' . (int) $this->user->id() . ' + AND notification_type_id = ' . (int) $type_id . ' + AND item_id = ' . (int) $item_id; $result = $this->db->sql_query($sql); $notification_data = $this->db->sql_fetchfield('push_data'); $this->db->sql_freeresult($result); @@ -229,8 +229,8 @@ public function unsubscribe(symfony_request $symfony_request): JsonResponse $endpoint = $data['endpoint']; $sql = 'DELETE FROM ' . $this->push_subscriptions_table . ' - WHERE user_id = ' . $this->user->id() . " - AND endpoint = '" . $this->db->sql_escape($endpoint) . "'"; + WHERE user_id = ' . (int) $this->user->id() . " + AND endpoint = '" . (int) $this->db->sql_escape($endpoint) . "'"; $this->db->sql_query($sql); return new JsonResponse([ @@ -238,26 +238,4 @@ public function unsubscribe(symfony_request $symfony_request): JsonResponse 'form_tokens' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP), ]); } - - /** - * Get subscriptions for current user - * - * @return array Subscriptions for user - */ - protected function get_subscriptions(): array - { - $subscriptions = []; - - $sql = 'SELECT endpoint, expiration_time - FROM ' . $this->push_subscriptions_table . ' - WHERE user_id = ' . $this->user->id(); - $result = $this->db->sql_query($sql); - while ($row = $this->db->sql_fetchrow($result)) - { - $subscriptions[] = $row; - } - $this->db->sql_freeresult($result); - - return $subscriptions; - } } From 4e9fb6ed4f71b9f84e52524a2ddfaffc9bf06f9e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 15:35:04 +0100 Subject: [PATCH 0054/1214] [ticket/17010] Clean up push worker PHPBB3-17010 --- phpBB/styles/all/js/push_worker.js.twig | 44 +++++++++++-------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/phpBB/styles/all/js/push_worker.js.twig b/phpBB/styles/all/js/push_worker.js.twig index 91dbf6f4ad6..8d6ec3c6af2 100644 --- a/phpBB/styles/all/js/push_worker.js.twig +++ b/phpBB/styles/all/js/push_worker.js.twig @@ -6,46 +6,40 @@ self.addEventListener('push', event => { return; } - let itemId = 0, - typeId = 0; + let itemId = 0; + let typeId = 0; try { const notificationData = event.data.json(); - itemId = notificationData['item_id']; - typeId = notificationData['type_id']; - } catch (e) { + itemId = notificationData.item_id; + typeId = notificationData.type_id; + } catch { self.registration.showNotification(event.data.text()); return; } const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}'; - let formData = new FormData(); + const formData = new FormData(); formData.append('item_id', itemId.toString(10)); formData.append('type_id', typeId.toString(10)); fetch(getNotificationUrl, { - method: 'POST', - headers: { - 'X-Requested-With': 'XMLHttpRequest' - }, - body: formData - }) - .then((response) => response.json()) - .then((response) => { - const responseBody = response.title + "\n" + response.text; + method: 'POST', + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + body: formData, + }) + .then(response => response.json()) + .then(response => { + const responseBody = response.title + '\n' + response.text; const options = { body: responseBody, data: response, - icon: response.avatar.src - // foo: '' - //icon: image - } - self.registration.showNotification( - response.heading, - options - ); - } - ); + icon: response.avatar.src, + }; + self.registration.showNotification(response.heading, options); + }); }); /** From 5ada5728ee40814840a96d4d5a3e1d5673888f2a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Nov 2023 15:41:17 +0100 Subject: [PATCH 0055/1214] [ticket/17010] Also check .js.twig files with eslint PHPBB3-17010 --- .github/check-js.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/check-js.sh b/.github/check-js.sh index 702ec03cbf1..03d040d25ef 100755 --- a/.github/check-js.sh +++ b/.github/check-js.sh @@ -15,4 +15,5 @@ sudo npm install -g > /dev/null npm ci > /dev/null set -x node_modules/eslint/bin/eslint.js "phpBB/**/*.js" +node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" node_modules/eslint/bin/eslint.js "gulpfile.js" From 44861c1f45cf1d69e040cae1517062f3fb471c7a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 24 Feb 2024 17:49:44 +0100 Subject: [PATCH 0056/1214] [ticket/17010] Add ban manager to webpush test PHPBB3-17010 --- .../webpush_notification.type.post.xml | 2 -- .../notification_method_webpush_test.php | 24 +++++++++++++++---- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml index 9d3d72d531d..7654ed30aad 100644 --- a/tests/notification/fixtures/webpush_notification.type.post.xml +++ b/tests/notification/fixtures/webpush_notification.type.post.xml @@ -1,7 +1,5 @@ - -
forum_iduser_id diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index 9cf374da1a3..0faff80576b 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -97,8 +97,8 @@ protected function setUp(): void 'webpush_vapid_private' => self::VAPID_KEYS['privateKey'], ]); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime'); + $language = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($language, '\phpbb\datetime'); $this->user = $user; $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); $auth = $this->auth = new phpbb_mock_notifications_auth(); @@ -113,19 +113,20 @@ protected function setUp(): void $phpbb_root_path, $phpEx ); + $phpbb_log = new \phpbb\log\dummy(); $phpbb_container = $this->container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); $phpbb_container->set('user_loader', $this->user_loader); $phpbb_container->set('user', $user); - $phpbb_container->set('language', $lang); + $phpbb_container->set('language', $language); $phpbb_container->set('config', $this->config); $phpbb_container->set('dbal.conn', $this->db); $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); - $phpbb_container->set('log', new \phpbb\log\dummy()); + $phpbb_container->set('log', $phpbb_log); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); @@ -147,6 +148,19 @@ protected function setUp(): void ) ); + $ban_type_email = new \phpbb\ban\type\email($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_user = new \phpbb\ban\type\user($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $ban_type_ip = new \phpbb\ban\type\ip($this->db, 'phpbb_bans', 'phpbb_users', 'phpbb_sessions', 'phpbb_sessions_keys'); + $phpbb_container->set('ban.type.email', $ban_type_email); + $phpbb_container->set('ban.type.user', $ban_type_user); + $phpbb_container->set('ban.type.ip', $ban_type_ip); + $collection = new \phpbb\di\service_collection($phpbb_container); + $collection->add('ban.type.email'); + $collection->add('ban.type.user'); + $collection->add('ban.type.ip'); + $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + $phpbb_container->set('ban.manager', $ban_manager); + $this->notification_method_webpush = new \phpbb\notification\method\webpush( $phpbb_container->get('config'), $phpbb_container->get('dbal.conn'), @@ -169,7 +183,7 @@ protected function setUp(): void $this->phpbb_dispatcher, $this->db, $this->cache, - $lang, + $language, $this->user, 'phpbb_notification_types', 'phpbb_user_notifications' From e993d82bc57f613b9555ac67738a818f93fd283e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 24 Feb 2024 20:53:03 +0100 Subject: [PATCH 0057/1214] [ticket/17010] Update language keys based on review recommendations PHPBB3-17010 --- phpBB/language/en/acp/board.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 58a256bb2c9..8dde2c72529 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -600,14 +600,14 @@ )); $lang = array_merge($lang, [ - 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Web Push for board notifications. Web Push is a simple protocol for the delivery of real-time events to user agents, more commonly known as push messages. It is supported by most modern browsers on desktop and mobile devices.', + 'ACP_WEBPUSH_SETTINGS_EXPLAIN' => 'Here you can enable Web Push for board notifications. Web Push is a protocol for the real-time delivery of events to user agents, commonly referred to as push messages. It is compatible with the majority of modern browsers on both desktop and mobile devices. Users can opt to receive Web Push alerts in their browser by subscribing and enabling their preferred notifications in the UCP.', 'WEBPUSH_ENABLE' => 'Enable Web Push', - 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow receiving notifications via Web Push. It is required to enter or generate valid VAPID identification keys to be able to use Web Push.', + 'WEBPUSH_ENABLE_EXPLAIN' => 'Allow users to receive notifications in their browser or device via Web Push. To utilize Web Push, you must input or generate valid VAPID identification keys.', 'WEBPUSH_GENERATE_VAPID_KEYS' => 'Generate Identification keys', 'WEBPUSH_VAPID_PUBLIC' => 'Server identification public key', - 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) public key will be shared to authenticate push messages sent by your site.
Warning: Changing the VAPID public key will automatically invalidate all Webpush subscriptions.', + 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) public key is shared to authenticate push messages from your site.
Caution: Modifying the VAPID public key will automatically render all Web Push subscriptions invalid.', 'WEBPUSH_VAPID_PRIVATE' => 'Server identification private key', - 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) private key will be used to create authenticated push messages sent by your site. The VAPID private key must be a valid public-private key pair with the VAPID public key.
Warning: Changing the VAPID private key will automatically invalidate all Webpush subscriptions.', + 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key must form a valid public-private key pair alongside the VAPID public key.
Caution: Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.', ]); // Jabber settings From a3f656356836e3b6436f6b136102d2a3dc22301b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 24 Feb 2024 22:29:48 +0100 Subject: [PATCH 0058/1214] [ticket/17010] Remove duplicated css for buttons PHPBB3-17010 --- phpBB/styles/prosilver/theme/colours.css | 9 --------- 1 file changed, 9 deletions(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index fe5e4d7c851..7bdd5f4b87f 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -697,15 +697,6 @@ dd.profile-warnings { color: #d41142; } -.button[disabled], -.button[disabled]:hover, -.button.disabled, -.button.disabled:hover { - background: #e0e0e0; - border-color: #9e9e9e; - color: #9e9e9e; -} - .button .icon, .button-secondary, .c-button-icon { From f36542c661a498dca9733cbb7a2189f95eff1e8f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 27 Feb 2024 17:30:46 +0100 Subject: [PATCH 0059/1214] [ticket/17010] Update web-push-testing to 1.1.0 PHPBB3-17010 --- package-lock.json | 55 ++++++++++++++++------------------------------- package.json | 2 +- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5801393ff31..4f0ec060d51 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "postcss-sorting": "^7.0.1", "stylelint": "^14.7.0", "stylelint-order": "^5.0.0", - "web-push-testing": "^1.0.0" + "web-push-testing": "^1.1.0" } }, "node_modules/@babel/code-frame": { @@ -4208,9 +4208,9 @@ "dev": true }, "node_modules/jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", "dev": true, "dependencies": { "jws": "^3.2.2", @@ -4222,20 +4222,11 @@ "lodash.isstring": "^4.0.1", "lodash.once": "^4.0.0", "ms": "^2.1.1", - "semver": "^5.6.0" + "semver": "^7.5.4" }, "engines": { - "node": ">=4", - "npm": ">=1.4.28" - } - }, - "node_modules/jsonwebtoken/node_modules/semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true, - "bin": { - "semver": "bin/semver" + "node": ">=12", + "npm": ">=6" } }, "node_modules/just-debounce": { @@ -8750,15 +8741,15 @@ } }, "node_modules/web-push-testing": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.0.0.tgz", - "integrity": "sha512-p14iWiQSPY4kjpbaz59QfczaxEyD4uWg1aBjUS+Y9LAzQPU4Z95Jnq3FiOIazrvrfY0/1uDBbQkjXVxHq6wI/Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.0.tgz", + "integrity": "sha512-VcQK/2u79/OKFgXtg8nxwC6CZCpS6eRyPF3TSy3mWIMmySv7s7yB+ugTGWiKOe+oKsR7ZdvpM+Nvbt/PhrTt5A==", "dev": true, "dependencies": { "arg": "^5.0.1", "express": "^4.17.2", "http_ece": "^1.1.0", - "jsonwebtoken": "^8.5.1", + "jsonwebtoken": "^9.0.0", "node-persist": "^2.1.0", "ps-node": "^0.1.6", "urlsafe-base64": "^1.0.0" @@ -12402,9 +12393,9 @@ "dev": true }, "jsonwebtoken": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", - "integrity": "sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==", + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", + "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", "dev": true, "requires": { "jws": "^3.2.2", @@ -12416,15 +12407,7 @@ "lodash.isstring": "^4.0.1", "lodash.once": "^4.0.0", "ms": "^2.1.1", - "semver": "^5.6.0" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } + "semver": "^7.5.4" } }, "just-debounce": { @@ -15963,15 +15946,15 @@ } }, "web-push-testing": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.0.0.tgz", - "integrity": "sha512-p14iWiQSPY4kjpbaz59QfczaxEyD4uWg1aBjUS+Y9LAzQPU4Z95Jnq3FiOIazrvrfY0/1uDBbQkjXVxHq6wI/Q==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.0.tgz", + "integrity": "sha512-VcQK/2u79/OKFgXtg8nxwC6CZCpS6eRyPF3TSy3mWIMmySv7s7yB+ugTGWiKOe+oKsR7ZdvpM+Nvbt/PhrTt5A==", "dev": true, "requires": { "arg": "^5.0.1", "express": "^4.17.2", "http_ece": "^1.1.0", - "jsonwebtoken": "^8.5.1", + "jsonwebtoken": "^9.0.0", "node-persist": "^2.1.0", "ps-node": "^0.1.6", "urlsafe-base64": "^1.0.0" diff --git a/package.json b/package.json index 22103522f3f..ecaa5d3c4f3 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,6 @@ "postcss-sorting": "^7.0.1", "stylelint": "^14.7.0", "stylelint-order": "^5.0.0", - "web-push-testing": "^1.0.0" + "web-push-testing": "^1.1.0" } } From fc14c5fd0b19c344717e3c01898224dbe70bd507 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 27 Feb 2024 20:43:27 +0100 Subject: [PATCH 0060/1214] [ticket/17010] Increase test coverage PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 69 +++++++- .../webpush_notification.type.post.xml | 6 + .../notification_method_webpush_test.php | 147 ++++++++++++++++-- 3 files changed, 204 insertions(+), 18 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 386dfd25251..c71256a29d1 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -239,12 +239,10 @@ protected function notify_using_webpush(): void } // Remove any subscriptions that couldn't be queued, i.e. that have invalid data - if (count($remove_subscriptions)) - { - $sql = 'DELETE FROM ' . $this->push_subscriptions_table . ' - WHERE ' . $this->db->sql_in_set('subscription_id', $remove_subscriptions); - $this->db->sql_query($sql); - } + $this->remove_subscriptions($remove_subscriptions); + + // List to fill with expired subscriptions based on return + $expired_endpoints = []; try { @@ -252,8 +250,16 @@ protected function notify_using_webpush(): void { if (!$report->isSuccess()) { - $report_data = \phpbb\json\sanitizer::sanitize($report->jsonSerialize()); - $this->log->add('admin', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$report_data['reason']]); + // Fill array of endpoints to remove if subscription has expired + if ($report->isSubscriptionExpired()) + { + $expired_endpoints = $report->getEndpoint(); + } + else + { + $report_data = \phpbb\json\sanitizer::sanitize($report->jsonSerialize()); + $this->log->add('admin', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$report_data['reason']]); + } } } } @@ -262,6 +268,8 @@ protected function notify_using_webpush(): void $this->log->add('critical', ANONYMOUS, '', 'LOG_WEBPUSH_MESSAGE_FAIL', false, [$exception->getMessage()]); } + $this->clean_expired_subscriptions($user_subscription_map, $expired_endpoints); + // We're done, empty the queue $this->empty_queue(); } @@ -373,4 +381,49 @@ protected function get_user_subscription_map(array $notify_users): array return $user_subscription_map; } + + /** + * Remove subscriptions + * + * @param array $subscription_ids Subscription ids to remove + * @return void + */ + public function remove_subscriptions(array $subscription_ids): void + { + if (count($subscription_ids)) + { + $sql = 'DELETE FROM ' . $this->push_subscriptions_table . ' + WHERE ' . $this->db->sql_in_set('subscription_id', $subscription_ids); + $this->db->sql_query($sql); + } + } + + /** + * Clean expired subscriptions from the database + * + * @param array $user_subscription_map User subscription map + * @param array $expired_endpoints Expired endpoints + * @return void + */ + protected function clean_expired_subscriptions(array $user_subscription_map, array $expired_endpoints): void + { + if (!count($expired_endpoints)) + { + return; + } + + $remove_subscriptions = []; + foreach ($expired_endpoints as $endpoint) + { + foreach ($user_subscription_map as $user_id => $subscriptions) + { + if (isset($subscriptions['endpoint']) && $subscriptions['endpoint'] == $endpoint) + { + $remove_subscriptions[] = $subscriptions[$endpoint]['subscription_id']; + } + } + } + + $this->remove_subscriptions($remove_subscriptions); + } } diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml index 7654ed30aad..896df4e1c1a 100644 --- a/tests/notification/fixtures/webpush_notification.type.post.xml +++ b/tests/notification/fixtures/webpush_notification.type.post.xml @@ -133,6 +133,12 @@ username_clean user_permissions user_sig + + 1 + Anonymous + + + 2 poster diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index 0faff80576b..3a0a48064c0 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -32,6 +32,12 @@ class notification_method_webpush_test extends phpbb_tests_notification_base /** @var webpush */ protected $notification_method_webpush; + /** @var \phpbb\language\language */ + protected $language; + + /** @var \phpbb\log\log_interface */ + protected $log; + public function getDataSet() { return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush_notification.type.post.xml'); @@ -97,9 +103,11 @@ protected function setUp(): void 'webpush_vapid_private' => self::VAPID_KEYS['privateKey'], ]); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); - $language = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($language, '\phpbb\datetime'); + $this->language = new \phpbb\language\language($lang_loader); + $this->language->add_lang('acp/common'); + $user = new \phpbb\user($this->language, '\phpbb\datetime'); $this->user = $user; + $this->user->data['user_options'] = 230271; $this->user_loader = new \phpbb\user_loader($avatar_helper, $this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); $auth = $this->auth = new phpbb_mock_notifications_auth(); $this->phpbb_dispatcher = new phpbb_mock_event_dispatcher(); @@ -113,20 +121,22 @@ protected function setUp(): void $phpbb_root_path, $phpEx ); - $phpbb_log = new \phpbb\log\dummy(); + + $log_table = 'phpbb_log'; + $this->log = new \phpbb\log\log($this->db, $user, $auth, $this->phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, $log_table); $phpbb_container = $this->container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); $phpbb_container->set('user_loader', $this->user_loader); $phpbb_container->set('user', $user); - $phpbb_container->set('language', $language); + $phpbb_container->set('language', $this->language); $phpbb_container->set('config', $this->config); $phpbb_container->set('dbal.conn', $this->db); $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); - $phpbb_container->set('log', $phpbb_log); + $phpbb_container->set('log', $this->log); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); @@ -158,7 +168,7 @@ protected function setUp(): void $collection->add('ban.type.email'); $collection->add('ban.type.user'); $collection->add('ban.type.ip'); - $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); + $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $this->language, $this->log, $user, 'phpbb_bans', 'phpbb_users'); $phpbb_container->set('ban.manager', $ban_manager); $this->notification_method_webpush = new \phpbb\notification\method\webpush( @@ -183,7 +193,7 @@ protected function setUp(): void $this->phpbb_dispatcher, $this->db, $this->cache, - $language, + $this->language, $this->user, 'phpbb_notification_types', 'phpbb_user_notifications' @@ -400,7 +410,122 @@ public function test_get_subscription($notification_type, $post_data, $expected_ } } - protected function create_subscription_for_user($user_id): array + /** + * @dataProvider data_notification_webpush + */ + public function test_notify_empty_queue($notification_type, $post_data, $expected_users): void + { + foreach ($expected_users as $user_id => $user_data) + { + $this->create_subscription_for_user($user_id); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + $post_data['post_id']++; + $notification_options['item_id'] = $post_data['post_id']; + $post_data['post_time'] = 1349413323; + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users2 = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users2, 'Assert that expected users stay the same after replying to same topic'); + } + + /** + * @dataProvider data_notification_webpush + */ + public function test_notify_invalid_endpoint($notification_type, $post_data, $expected_users): void + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + // Create second subscription for first user ID passed + if (count($expected_users)) + { + $first_user_id = array_key_first($expected_users); + $first_user_sub = $this->create_subscription_for_user($first_user_id, true); + $subscription_info[$first_user_id][] = $first_user_sub; + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages); + } + + if (isset($first_user_sub)) + { + $admin_logs = $this->log->get_logs('admin'); + $this->db->sql_query('DELETE FROM phpbb_log'); // Clear logs + $this->assertCount(1, $admin_logs, 'Assert that an admin log was created for invalid endpoint'); + + $log_entry = $admin_logs[0]; + + $this->assertStringStartsWith('Web Push message could not be sent:', $log_entry['action']); + $this->assertStringContainsString('400', $log_entry['action']); + } + } + + public function test_get_type(): void + { + $this->assertEquals('notification.method.webpush', $this->notification_method_webpush->get_type()); + } + + protected function create_subscription_for_user($user_id, bool $invalidate_endpoint = false): array { $client = new \GuzzleHttp\Client(); try @@ -420,8 +545,10 @@ protected function create_subscription_for_user($user_id): array $this->assertStringStartsWith('http://localhost:9012/notify/', $subscription_data['endpoint']); $this->assertIsArray($subscription_data['keys']); - // Add subscription data to admin user (user id 2) - + if ($invalidate_endpoint) + { + $subscription_data['endpoint'] .= 'invalid'; + } $push_subscriptions_table = $this->container->getParameter('tables.push_subscriptions'); From 93a6b8d87a46f3248d710b90b483da83bd13a57b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 29 Feb 2024 22:16:35 +0100 Subject: [PATCH 0061/1214] [ticket/17010] Update web-push-testing to 1.1.1 PHPBB3-17010 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4f0ec060d51..1bcd4497011 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "postcss-sorting": "^7.0.1", "stylelint": "^14.7.0", "stylelint-order": "^5.0.0", - "web-push-testing": "^1.1.0" + "web-push-testing": "^1.1.1" } }, "node_modules/@babel/code-frame": { @@ -8741,9 +8741,9 @@ } }, "node_modules/web-push-testing": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.0.tgz", - "integrity": "sha512-VcQK/2u79/OKFgXtg8nxwC6CZCpS6eRyPF3TSy3mWIMmySv7s7yB+ugTGWiKOe+oKsR7ZdvpM+Nvbt/PhrTt5A==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.1.tgz", + "integrity": "sha512-q+FcdmPeePLI7kwxIngl9jzOfqnbp8t5DD17tQ8j1VxdEtsYb8HAbaieZH5q7uudQn+LFniAn0V9xsOnFctV7Q==", "dev": true, "dependencies": { "arg": "^5.0.1", @@ -15946,9 +15946,9 @@ } }, "web-push-testing": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.0.tgz", - "integrity": "sha512-VcQK/2u79/OKFgXtg8nxwC6CZCpS6eRyPF3TSy3mWIMmySv7s7yB+ugTGWiKOe+oKsR7ZdvpM+Nvbt/PhrTt5A==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.1.tgz", + "integrity": "sha512-q+FcdmPeePLI7kwxIngl9jzOfqnbp8t5DD17tQ8j1VxdEtsYb8HAbaieZH5q7uudQn+LFniAn0V9xsOnFctV7Q==", "dev": true, "requires": { "arg": "^5.0.1", diff --git a/package.json b/package.json index ecaa5d3c4f3..58e6fe6ae7d 100644 --- a/package.json +++ b/package.json @@ -112,6 +112,6 @@ "postcss-sorting": "^7.0.1", "stylelint": "^14.7.0", "stylelint-order": "^5.0.0", - "web-push-testing": "^1.1.0" + "web-push-testing": "^1.1.1" } } From fcfed793858d44473cc242d73d0ba044cf0786ad Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 1 Mar 2024 19:40:26 +0100 Subject: [PATCH 0062/1214] [ticket/17010] Properly handle expired subscriptions and extend tests PHPBB3-17010 --- phpBB/phpbb/notification/method/webpush.php | 11 +- .../webpush_notification.type.post.xml | 2 + .../notification_method_webpush_test.php | 165 +++++++++++++++++- 3 files changed, 169 insertions(+), 9 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index c71256a29d1..e5b8910a074 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -253,7 +253,7 @@ protected function notify_using_webpush(): void // Fill array of endpoints to remove if subscription has expired if ($report->isSubscriptionExpired()) { - $expired_endpoints = $report->getEndpoint(); + $expired_endpoints[] = $report->getEndpoint(); } else { @@ -415,11 +415,14 @@ protected function clean_expired_subscriptions(array $user_subscription_map, arr $remove_subscriptions = []; foreach ($expired_endpoints as $endpoint) { - foreach ($user_subscription_map as $user_id => $subscriptions) + foreach ($user_subscription_map as $subscriptions) { - if (isset($subscriptions['endpoint']) && $subscriptions['endpoint'] == $endpoint) + foreach ($subscriptions as $subscription) { - $remove_subscriptions[] = $subscriptions[$endpoint]['subscription_id']; + if (isset($subscription['endpoint']) && $subscription['endpoint'] == $endpoint) + { + $remove_subscriptions[] = $subscription['subscription_id']; + } } } } diff --git a/tests/notification/fixtures/webpush_notification.type.post.xml b/tests/notification/fixtures/webpush_notification.type.post.xml index 896df4e1c1a..d59d5b92c4b 100644 --- a/tests/notification/fixtures/webpush_notification.type.post.xml +++ b/tests/notification/fixtures/webpush_notification.type.post.xml @@ -1,5 +1,7 @@ +
+
forum_iduser_id diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index 3a0a48064c0..ff95c74b093 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -406,7 +406,7 @@ public function test_get_subscription($notification_type, $post_data, $expected_ foreach ($expected_users as $user_id => $data) { $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); - $this->assertNotEmpty($messages); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); } } @@ -438,10 +438,10 @@ public function test_notify_empty_queue($notification_type, $post_data, $expecte $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); - $this->notifications->add_notifications($notification_type, $post_data); + $this->notification_method_webpush->notify(); // should have no effect $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); - $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); $post_data['post_id']++; $notification_options['item_id'] = $post_data['post_id']; @@ -504,7 +504,7 @@ public function test_notify_invalid_endpoint($notification_type, $post_data, $ex foreach ($expected_users as $user_id => $data) { $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); - $this->assertNotEmpty($messages); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); } if (isset($first_user_sub)) @@ -520,11 +520,139 @@ public function test_notify_invalid_endpoint($notification_type, $post_data, $ex } } + /** + * @dataProvider data_notification_webpush + */ + public function test_notify_expired($notification_type, $post_data, $expected_users) + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + $expected_delivered_users = $expected_users; + + // Expire subscriptions for first user + if (count($expected_users)) + { + + $first_user_id = array_key_first($expected_users); + $first_user_subs = $subscription_info[$first_user_id]; + unset($expected_delivered_users[$first_user_id]); + $this->expire_subscription($first_user_subs[0]['clientHash']); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_delivered_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_delivered_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); + } + } + public function test_get_type(): void { $this->assertEquals('notification.method.webpush', $this->notification_method_webpush->get_type()); } + /** + * @dataProvider data_notification_webpush + */ + public function test_prune_notifications($notification_type, $post_data, $expected_users): void + { + $subscription_info = []; + foreach ($expected_users as $user_id => $user_data) + { + $subscription_info[$user_id][] = $this->create_subscription_for_user($user_id); + } + + // Create second subscription for first user ID passed + if (count($expected_users)) + { + $first_user_id = array_key_first($expected_users); + $subscription_info[$first_user_id][] = $this->create_subscription_for_user($first_user_id); + } + + $post_data = array_merge([ + 'post_time' => 1349413322, + 'poster_id' => 1, + 'topic_title' => '', + 'post_subject' => '', + 'post_username' => '', + 'forum_name' => '', + ], + + $post_data); + $notification_options = [ + 'item_id' => $post_data['post_id'], + 'item_parent_id' => $post_data['topic_id'], + ]; + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals(0, count($notified_users), 'Assert no user has been notified yet'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertEmpty($messages); + } + + $this->notifications->add_notifications($notification_type, $post_data); + + $notified_users = $this->notification_method_webpush->get_notified_users($this->notifications->get_notification_type_id($notification_type), $notification_options); + $this->assertEquals($expected_users, $notified_users, 'Assert that expected users have been notified'); + + foreach ($expected_users as $user_id => $data) + { + $messages = $this->get_messages_for_subscription($subscription_info[$user_id][0]['clientHash']); + $this->assertNotEmpty($messages, 'Failed asserting that user ' . $user_id . ' has received messages.'); + } + + // Prune notifications with 0 time, shouldn't change anything + $prune_time = time(); + $this->notification_method_webpush->prune_notifications(0); + $this->assertGreaterThanOrEqual($prune_time, $this->config->offsetGet('read_notification_last_gc'), 'Assert that prune time was set'); + + $cur_notifications = $this->get_notifications(); + $this->assertSameSize($cur_notifications, $expected_users, 'Assert that no notifications have been pruned'); + + // Prune only read not supported, will prune all + $this->notification_method_webpush->prune_notifications($prune_time); + $this->assertGreaterThanOrEqual($prune_time, $this->config->offsetGet('read_notification_last_gc'), 'Assert that prune time was set'); + + $cur_notifications = $this->get_notifications(); + $this->assertCount(0, $cur_notifications, 'Assert that no notifications have been pruned'); + } + protected function create_subscription_for_user($user_id, bool $invalidate_endpoint = false): array { $client = new \GuzzleHttp\Client(); @@ -563,6 +691,22 @@ protected function create_subscription_for_user($user_id, bool $invalidate_endpo return $subscription_data; } + protected function expire_subscription(string $client_hash): void + { + $client = new \GuzzleHttp\Client(); + try + { + $response = $client->request('POST', 'http://localhost:9012/expire-subscription/' . $client_hash); + } + catch (\GuzzleHttp\Exception\GuzzleException $exception) + { + $this->fail('Failed expiring subscription with web-push-testing client: ' . $exception->getMessage()); + } + + $subscription_return = \phpbb\json\sanitizer::decode((string) $response->getBody()); + $this->assertEquals(200, $response->getStatusCode(), 'Expected response status to be 200'); + } + protected function get_messages_for_subscription($client_hash): array { $client = new \GuzzleHttp\Client(); @@ -574,7 +718,7 @@ protected function get_messages_for_subscription($client_hash): array } catch (\GuzzleHttp\Exception\GuzzleException $exception) { - $this->fail('Failed getting messages from web-push-testing client'); + $this->fail('Failed getting messages from web-push-testing client: ' . $exception->getMessage()); } $response_data = json_decode($response->getBody()->getContents(), true); @@ -584,4 +728,15 @@ protected function get_messages_for_subscription($client_hash): array return $response_data['data']['messages']; } + + protected function get_notifications(): array + { + $webpush_table = $this->container->getParameter('tables.notification_push'); + $sql = 'SELECT * FROM ' . $webpush_table; + $result = $this->db->sql_query($sql); + $sql_ary = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + return $sql_ary; + } } From bda99e1c359ddc6072ba5eaf8469769a22d12382 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 7 Mar 2024 20:57:19 +0100 Subject: [PATCH 0063/1214] [ticket/17296] Reduce complexity of relative paths on adm pages PHPBB3-17296 --- phpBB/adm/index.php | 4 ++-- phpBB/phpbb/path_helper.php | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index c648fdf1005..088f2f24dd1 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -61,8 +61,8 @@ ), ), $phpbb_admin_path . 'style'); -$template->assign_var('T_ASSETS_PATH', $phpbb_root_path . 'assets'); -$template->assign_var('T_TEMPLATE_PATH', $phpbb_admin_path . 'style'); +$template->assign_var('T_ASSETS_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'assets')); +$template->assign_var('T_TEMPLATE_PATH', $phpbb_path_helper->update_web_root_path($phpbb_root_path . 'style')); // Instantiate new module $module = new p_master(); diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index 7112412ec33..bcfb7381447 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -39,6 +39,9 @@ class path_helper /** @var string */ protected $web_root_path; + /** @var bool Flag whether we're in adm path */ + protected $in_adm_path = false; + /** * Constructor * @@ -117,7 +120,13 @@ public function update_web_root_path($path) $path = substr($path, 8); } - return $this->filesystem->clean_path($web_root_path . $path); + $path = $this->filesystem->clean_path($web_root_path . $path); + + // Further clean path if we're in adm + if ($this->in_adm_path && strpos($path, $this->phpbb_root_path . $this->adm_relative_path) === 0) + { + $path = substr($path, strlen($this->phpbb_root_path . $this->adm_relative_path)); + } } return $path; @@ -181,6 +190,11 @@ public function get_web_root_path() return $this->web_root_path = $this->filesystem->clean_path('./../' . $this->phpbb_root_path); } + if ($path_info === '/' && defined('ADMIN_START') && preg_match('/\/' . preg_quote($this->adm_relative_path, '/') . 'index\.' . $this->php_ext . '$/', $script_name)) + { + $this->in_adm_path = true; + } + /* * If the path info is empty (single /), then we're not using * a route like app.php/foo/bar From 51b3d9de639bf7b49dd5fcd8fb8a1693406e8c31 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 7 Mar 2024 21:11:26 +0100 Subject: [PATCH 0064/1214] [ticket/17296] Ensure session page update test actually runs PHPBB3-17296 --- tests/functional/session_page_update_test.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/functional/session_page_update_test.php b/tests/functional/session_page_update_test.php index b2e04c0deff..35a1647a7de 100644 --- a/tests/functional/session_page_update_test.php +++ b/tests/functional/session_page_update_test.php @@ -17,7 +17,16 @@ class phpbb_functional_session_page_update_test extends phpbb_functional_test_case { - protected function test_session_page_update() + public function setUp(): void + { + parent::setUp(); + + global $db; + + $db = $this->db; + } + + public function test_session_page_update() { $this->login(); $db = $this->get_db(); @@ -32,7 +41,7 @@ protected function test_session_page_update() } $user_ids = []; - $username = [$this->get_logged_in_user()]; + $username = ['admin']; user_get_id_name($user_ids, $username); $user_id = (int) $user_ids[0]; @@ -45,7 +54,7 @@ protected function test_session_page_update() $this->assertEquals('index.php', $db->sql_fetchfield('session_page')); // Request non-existent url - self::request('GET', 'nonexistent.jpg'); + self::request('GET', 'nonexistent.jpg', [], false); $this->assertEquals(404, self::$client->getResponse()->getStatus()); $db->sql_query_limit($sql, 1); From 9c51a7866b90f2429f1fe02e08083a5d931c81b7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 9 Mar 2024 09:54:57 +0100 Subject: [PATCH 0065/1214] [ticket/17296] Fix session page update test PHPBB3-17296 --- .../event/kernel_exception_subscriber.php | 9 ++++--- tests/functional/session_page_update_test.php | 26 ++++++------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index 0dc9ccaf9ca..ccc3107d82e 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -90,12 +90,15 @@ public function on_kernel_exception(GetResponseForExceptionEvent $event) } else if (!$this->debug && $exception instanceof NotFoundHttpException) { - // Do not update user session page if it does not exist - $this->user->update_session_page = false; - $message = $this->language->lang('PAGE_NOT_FOUND'); } + // Do not update user session page if it does not exist + if ($exception instanceof NotFoundHttpException) + { + $this->user->update_session_page = false; + } + // Show text in bold $message = preg_replace('#<(/?strong)>#i', '<$1>', $message); diff --git a/tests/functional/session_page_update_test.php b/tests/functional/session_page_update_test.php index 35a1647a7de..00f857223d2 100644 --- a/tests/functional/session_page_update_test.php +++ b/tests/functional/session_page_update_test.php @@ -24,41 +24,31 @@ public function setUp(): void global $db; $db = $this->db; + + $this->login(); } public function test_session_page_update() { - $this->login(); $db = $this->get_db(); - if (!function_exists('utf_clean_string')) - { - require_once(__DIR__ . '/../../phpBB/includes/utf/utf_tools.php'); - } - if (!function_exists('user_get_id_name')) - { - require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); - } - - $user_ids = []; - $username = ['admin']; - user_get_id_name($user_ids, $username); - $user_id = (int) $user_ids[0]; + // Sleep for 2 seconds to ensure we don't have session time race condition + sleep(2); // Request index page self::request('GET', 'index.php'); $this->assertEquals(200, self::$client->getResponse()->getStatus()); - $sql = 'SELECT session_page FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = ' . $user_id . ' ORDER BY session_time DESC'; + $sql = 'SELECT session_page FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2 ORDER BY session_time DESC'; $db->sql_query_limit($sql, 1); - $this->assertEquals('index.php', $db->sql_fetchfield('session_page')); + $this->assertEquals('index.php', $db->sql_fetchfield('session_page'), 'Failed asserting that session_page is index.php for admin user'); // Request non-existent url self::request('GET', 'nonexistent.jpg', [], false); - $this->assertEquals(404, self::$client->getResponse()->getStatus()); + $this->assertEquals(404, self::$client->getResponse()->getStatus(), 'Failed asserting that status of non-existent image is 404'); $db->sql_query_limit($sql, 1); // User page should not be updated to non-existent one - $this->assertEquals('index.php', $db->sql_fetchfield('session_page')); + $this->assertEquals('index.php', $db->sql_fetchfield('session_page'), 'Failed asserting that session page has not changed after 404'); } } From 6ee64c94a21f69bd2568f62f379bb6beedd596a5 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 13 Mar 2024 23:25:02 +0700 Subject: [PATCH 0066/1214] [ticket/17284] Add viewtopic_body_online_list_after template event PHPBB3-17284 --- phpBB/docs/events.md | 7 +++++++ phpBB/styles/prosilver/template/viewtopic_body.html | 2 ++ 2 files changed, 9 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 95d4a9515c0..d05cb876fdb 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -3200,6 +3200,13 @@ viewtopic_body_footer_before * Purpose: Add content to the bottom of the View topic screen below the posts and quick reply, directly before the jumpbox in Prosilver. +viewtopic_body_online_list_after +=== +* Locations: + + styles/prosilver/template/viewtopic_body.html +* Since: 3.3.12-RC1 +* Purpose: Add content after the online users list + viewtopic_body_online_list_before === * Locations: diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index ea65c7eac82..db4e51d772d 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -467,4 +467,6 @@

{L_WHO_IS_ONLINE}

+{% EVENT viewtopic_body_online_list_after %} + From 1ec51c99e57be2e6d34f6dab6138722d3edc999b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 19 Mar 2024 08:46:07 -0700 Subject: [PATCH 0067/1214] [ticket/17297] Fix broken no avatar source tag in HTML PHPBB3-17297 Signed-off-by: Matt Friedman --- phpBB/phpbb/avatar/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php index 51592b584fe..135bf22c88a 100644 --- a/phpBB/phpbb/avatar/helper.php +++ b/phpBB/phpbb/avatar/helper.php @@ -252,7 +252,7 @@ private function get_avatar_html(array $data): string { if ($data['lazy']) { - $data['src'] = $this->get_no_avatar_source() . ' data-src="' . $data['src']; + $data['src'] = $this->get_no_avatar_source() . '" data-src="' . $data['src']; } $src = ' src="' . $data['src'] . '"'; From b4a343bdc92343867470462ac925a0b90b61bde8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 19 Mar 2024 20:36:38 +0100 Subject: [PATCH 0068/1214] [ticket/17296] Enforce unique session entry for admin user with delete PHPBB3-17296 --- tests/functional/session_page_update_test.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/functional/session_page_update_test.php b/tests/functional/session_page_update_test.php index 00f857223d2..a967c771892 100644 --- a/tests/functional/session_page_update_test.php +++ b/tests/functional/session_page_update_test.php @@ -25,6 +25,10 @@ public function setUp(): void $db = $this->db; + // Delete previous session info for admin user + $sql = 'DELETE FROM ' . SESSIONS_TABLE . ' WHERE session_user_id = 2'; + $db->sql_query($sql); + $this->login(); } @@ -32,9 +36,6 @@ public function test_session_page_update() { $db = $this->get_db(); - // Sleep for 2 seconds to ensure we don't have session time race condition - sleep(2); - // Request index page self::request('GET', 'index.php'); $this->assertEquals(200, self::$client->getResponse()->getStatus()); From b38e8a2c84a7697feaf286a2e5883370ca058399 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 31 Mar 2024 09:55:57 +0700 Subject: [PATCH 0069/1214] [ticket/17299] Allow event to modify email core vars before sending a message PHPBB3-17299 --- phpBB/includes/functions_messenger.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index fa47c50b49a..f25ce82b8fa 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -582,6 +582,11 @@ function msg_email() ); extract($phpbb_dispatcher->trigger_event('core.notification_message_email', compact($vars))); + $this->addresses = $addresses; + $this->subject = $subject; + $this->msg = $msg; + unset($addresses, $subject, $msg); + if ($break) { return true; From 7c36c0c5bdf429feebe2cf3571661fa3179af5f4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 2 Apr 2024 21:26:15 +0200 Subject: [PATCH 0070/1214] [ticket/17010] Remove invalid int cast PHPBB3-17010 --- phpBB/phpbb/ucp/controller/webpush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index f1cd513df43..a7ebbffae8e 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -230,7 +230,7 @@ public function unsubscribe(symfony_request $symfony_request): JsonResponse $sql = 'DELETE FROM ' . $this->push_subscriptions_table . ' WHERE user_id = ' . (int) $this->user->id() . " - AND endpoint = '" . (int) $this->db->sql_escape($endpoint) . "'"; + AND endpoint = '" . $this->db->sql_escape($endpoint) . "'"; $this->db->sql_query($sql); return new JsonResponse([ From 12e9c3d08233eea033276c9830c33b394b770f0a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Mar 2024 21:34:44 +0100 Subject: [PATCH 0071/1214] [ticket/12960] Remove broken captchas and prepare for incomplete captcha PHPBB3-12960 --- phpBB/adm/style/captcha_gd_acp.html | 74 - .../default/container/services_captcha.yml | 22 +- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/language/en/acp/board.php | 20 +- phpBB/phpbb/captcha/char_cube3d.php | 277 --- phpBB/phpbb/captcha/colour_manager.php | 527 ----- phpBB/phpbb/captcha/gd.php | 1846 ----------------- phpBB/phpbb/captcha/gd_wave.php | 847 -------- phpBB/phpbb/captcha/non_gd.php | 387 ---- phpBB/phpbb/captcha/plugins/gd.php | 123 -- phpBB/phpbb/captcha/plugins/gd_wave.php | 42 - phpBB/phpbb/captcha/plugins/nogd.php | 42 - tests/auth/provider_db_test.php | 6 +- tests/functions/user_delete_test.php | 6 +- tests/session/garbage_collection_test.php | 10 +- 15 files changed, 16 insertions(+), 4215 deletions(-) delete mode 100644 phpBB/adm/style/captcha_gd_acp.html delete mode 100644 phpBB/phpbb/captcha/char_cube3d.php delete mode 100644 phpBB/phpbb/captcha/colour_manager.php delete mode 100644 phpBB/phpbb/captcha/gd.php delete mode 100644 phpBB/phpbb/captcha/gd_wave.php delete mode 100644 phpBB/phpbb/captcha/non_gd.php delete mode 100644 phpBB/phpbb/captcha/plugins/gd.php delete mode 100644 phpBB/phpbb/captcha/plugins/gd_wave.php delete mode 100644 phpBB/phpbb/captcha/plugins/nogd.php diff --git a/phpBB/adm/style/captcha_gd_acp.html b/phpBB/adm/style/captcha_gd_acp.html deleted file mode 100644 index 43d54adc0be..00000000000 --- a/phpBB/adm/style/captcha_gd_acp.html +++ /dev/null @@ -1,74 +0,0 @@ - - - - « {L_BACK} - -

{L_ACP_VC_SETTINGS}

- -

{L_ACP_VC_SETTINGS_EXPLAIN}

- - - - -
-{L_GENERAL_OPTIONS} - -
-

{L_CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN}
-
-
-
-
-

{L_CAPTCHA_GD_X_GRID_EXPLAIN}
-
-
-
-

{L_CAPTCHA_GD_Y_GRID_EXPLAIN}
-
-
-
-

{L_CAPTCHA_GD_WAVE_EXPLAIN}
-
- -
-
-
-

{L_CAPTCHA_GD_3D_NOISE_EXPLAIN}
-
- -
-
-
-

{L_CAPTCHA_GD_FONTS_EXPLAIN}
-
- - - -
-
- -
-
- {L_PREVIEW} - - - - -
- -
- {L_ACP_SUBMIT_CHANGES} -

-   -   -   -

- - - - - {S_FORM_TOKEN} -
- - - diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index ba102640930..f3f9476f861 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -14,27 +14,11 @@ services: tags: - { name: service_collection, tag: captcha.plugins } - core.captcha.plugins.gd: - class: phpbb\captcha\plugins\gd + core.captcha.plugins.incomplete: + class: phpbb\captcha\plugins\incomplete shared: false calls: - - [set_name, [core.captcha.plugins.gd]] - tags: - - { name: captcha.plugins } - - core.captcha.plugins.gd_wave: - class: phpbb\captcha\plugins\gd_wave - shared: false - calls: - - [set_name, [core.captcha.plugins.gd_wave]] - tags: - - { name: captcha.plugins } - - core.captcha.plugins.nogd: - class: phpbb\captcha\plugins\nogd - shared: false - calls: - - [set_name, [core.captcha.plugins.nogd]] + - [ set_name, [ core.captcha.plugins.incomplete ] ] tags: - { name: captcha.plugins } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index b924f706035..4b66815993f 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -76,7 +76,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_foregro INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_wave', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_x_grid', '25'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_gd_y_grid', '25'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'core.captcha.plugins.nogd'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('captcha_plugin', 'core.captcha.plugins.incomplete'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_attachment_content', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('check_dnsbl', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('chg_passforce', '0'); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 8dde2c72529..b86e0b6335c 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -308,25 +308,7 @@ 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com Extensions Database. For more information on preventing spam on your board, visit the phpBB.com Knowledge Base.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', - 'CAPTCHA_GD' => 'GD image', - 'CAPTCHA_GD_3D' => 'GD 3D image', - 'CAPTCHA_GD_FOREGROUND_NOISE' => 'Foreground noise', - 'CAPTCHA_GD_EXPLAIN' => 'Uses GD to make a more advanced anti-spambot image.', - 'CAPTCHA_GD_FOREGROUND_NOISE_EXPLAIN' => 'Use foreground noise to make the image harder to read.', - 'CAPTCHA_GD_X_GRID' => 'Background noise x-axis', - 'CAPTCHA_GD_X_GRID_EXPLAIN' => 'Use lower settings of this to make the image harder to read. 0 will disable x-axis background noise.', - 'CAPTCHA_GD_Y_GRID' => 'Background noise y-axis', - 'CAPTCHA_GD_Y_GRID_EXPLAIN' => 'Use lower settings of this to make the image harder to read. 0 will disable y-axis background noise.', - 'CAPTCHA_GD_WAVE' => 'Wave distortion', - 'CAPTCHA_GD_WAVE_EXPLAIN' => 'This applies a wave distortion to the image.', - 'CAPTCHA_GD_3D_NOISE' => 'Add 3D-noise objects', - 'CAPTCHA_GD_3D_NOISE_EXPLAIN' => 'This adds additional objects to the image, over the letters.', - 'CAPTCHA_GD_FONTS' => 'Use different fonts', - 'CAPTCHA_GD_FONTS_EXPLAIN' => 'This setting controls how many different letter shapes are used. You can just use the default shapes or introduce altered letters. Adding lowercase letters is also possible.', - 'CAPTCHA_FONT_DEFAULT' => 'Default', - 'CAPTCHA_FONT_NEW' => 'New Shapes', - 'CAPTCHA_FONT_LOWER' => 'Also use lowercase', - 'CAPTCHA_NO_GD' => 'Simple image', + 'CAPTCHA_INCOMPLETE' => 'Incomplete Captcha (Disabled Registration)', 'CAPTCHA_PREVIEW_MSG' => 'Your changes have not been saved, this is just a preview.', 'CAPTCHA_PREVIEW_EXPLAIN' => 'The plugin as it would look like using the current selection.', diff --git a/phpBB/phpbb/captcha/char_cube3d.php b/phpBB/phpbb/captcha/char_cube3d.php deleted file mode 100644 index 0255259ac4f..00000000000 --- a/phpBB/phpbb/captcha/char_cube3d.php +++ /dev/null @@ -1,277 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha; - -class char_cube3d -{ - var $bitmap; - var $bitmap_width; - var $bitmap_height; - - var $basis_matrix = array(array(1, 0, 0), array(0, 1, 0), array(0, 0, 1)); - var $abs_x = array(1, 0); - var $abs_y = array(0, 1); - var $x = 0; - var $y = 1; - var $z = 2; - var $letter = ''; - - /** - */ - function __construct(&$bitmaps, $letter) - { - $this->bitmap = $bitmaps['data'][$letter]; - $this->bitmap_width = $bitmaps['width']; - $this->bitmap_height = $bitmaps['height']; - - $this->basis_matrix[0][0] = mt_rand(-600, 600); - $this->basis_matrix[0][1] = mt_rand(-600, 600); - $this->basis_matrix[0][2] = (mt_rand(0, 1) * 2000) - 1000; - $this->basis_matrix[1][0] = mt_rand(-1000, 1000); - $this->basis_matrix[1][1] = mt_rand(-1000, 1000); - $this->basis_matrix[1][2] = mt_rand(-1000, 1000); - - $this->normalize($this->basis_matrix[0]); - $this->normalize($this->basis_matrix[1]); - $this->basis_matrix[2] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[1]); - $this->normalize($this->basis_matrix[2]); - - // $this->basis_matrix[1] might not be (probably isn't) orthogonal to $basis_matrix[0] - $this->basis_matrix[1] = $this->cross_product($this->basis_matrix[0], $this->basis_matrix[2]); - $this->normalize($this->basis_matrix[1]); - - // Make sure our cube is facing into the canvas (assuming +z == in) - for ($i = 0; $i < 3; ++$i) - { - if ($this->basis_matrix[$i][2] < 0) - { - $this->basis_matrix[$i][0] *= -1; - $this->basis_matrix[$i][1] *= -1; - $this->basis_matrix[$i][2] *= -1; - } - } - - // Force our "z" basis vector to be the one with greatest absolute z value - $this->x = 0; - $this->y = 1; - $this->z = 2; - - // Swap "y" with "z" - if ($this->basis_matrix[1][2] > $this->basis_matrix[2][2]) - { - $this->z = 1; - $this->y = 2; - } - - // Swap "x" with "z" - if ($this->basis_matrix[0][2] > $this->basis_matrix[$this->z][2]) - { - $this->x = $this->z; - $this->z = 0; - } - - // Still need to determine which of $x,$y are which. - // wrong orientation if y's y-component is less than it's x-component - // likewise if x's x-component is less than it's y-component - // if they disagree, go with the one with the greater weight difference. - // rotate if positive - $weight = (abs($this->basis_matrix[$this->x][1]) - abs($this->basis_matrix[$this->x][0])) + (abs($this->basis_matrix[$this->y][0]) - abs($this->basis_matrix[$this->y][1])); - - // Swap "x" with "y" - if ($weight > 0) - { - list($this->x, $this->y) = array($this->y, $this->x); - } - - $this->abs_x = array($this->basis_matrix[$this->x][0], $this->basis_matrix[$this->x][1]); - $this->abs_y = array($this->basis_matrix[$this->y][0], $this->basis_matrix[$this->y][1]); - - if ($this->abs_x[0] < 0) - { - $this->abs_x[0] *= -1; - $this->abs_x[1] *= -1; - } - - if ($this->abs_y[1] > 0) - { - $this->abs_y[0] *= -1; - $this->abs_y[1] *= -1; - } - - $this->letter = $letter; - } - - /** - * Draw a character - */ - function drawchar($scale, $xoff, $yoff, $img, $background, $colours) - { - $width = $this->bitmap_width; - $height = $this->bitmap_height; - $bitmap = $this->bitmap; - - $colour1 = $colours[array_rand($colours)]; - $colour2 = $colours[array_rand($colours)]; - - $swapx = ($this->basis_matrix[$this->x][0] > 0); - $swapy = ($this->basis_matrix[$this->y][1] < 0); - - for ($y = 0; $y < $height; ++$y) - { - for ($x = 0; $x < $width; ++$x) - { - $xp = ($swapx) ? ($width - $x - 1) : $x; - $yp = ($swapy) ? ($height - $y - 1) : $y; - - if ($bitmap[$height - $yp - 1][$xp]) - { - $dx = $this->scale($this->abs_x, ($xp - ($swapx ? ($width / 2) : ($width / 2) - 1)) * $scale); - $dy = $this->scale($this->abs_y, ($yp - ($swapy ? ($height / 2) : ($height / 2) - 1)) * $scale); - $xo = $xoff + $dx[0] + $dy[0]; - $yo = $yoff + $dx[1] + $dy[1]; - - $origin = array(0, 0, 0); - $xvec = $this->scale($this->basis_matrix[$this->x], $scale); - $yvec = $this->scale($this->basis_matrix[$this->y], $scale); - $face_corner = $this->sum2($xvec, $yvec); - - $zvec = $this->scale($this->basis_matrix[$this->z], $scale); - $x_corner = $this->sum2($xvec, $zvec); - $y_corner = $this->sum2($yvec, $zvec); - - imagefilledpolygon($img, $this->gen_poly($xo, $yo, $origin, $xvec, $x_corner,$zvec), 4, $colour1); - imagefilledpolygon($img, $this->gen_poly($xo, $yo, $origin, $yvec, $y_corner,$zvec), 4, $colour2); - - $face = $this->gen_poly($xo, $yo, $origin, $xvec, $face_corner, $yvec); - - imagefilledpolygon($img, $face, 4, $background); - imagepolygon($img, $face, 4, $colour1); - } - } - } - } - - /* - * return a roughly acceptable range of sizes for rendering with this texttype - */ - function range() - { - return array(3, 4); - } - - /** - * Vector length - */ - function vectorlen($vector) - { - return sqrt(pow($vector[0], 2) + pow($vector[1], 2) + pow($vector[2], 2)); - } - - /** - * Normalize - */ - function normalize(&$vector, $length = 1) - { - $length = (( $length < 1) ? 1 : $length); - $length /= $this->vectorlen($vector); - $vector[0] *= $length; - $vector[1] *= $length; - $vector[2] *= $length; - } - - /** - */ - function cross_product($vector1, $vector2) - { - $retval = array(0, 0, 0); - $retval[0] = (($vector1[1] * $vector2[2]) - ($vector1[2] * $vector2[1])); - $retval[1] = -(($vector1[0] * $vector2[2]) - ($vector1[2] * $vector2[0])); - $retval[2] = (($vector1[0] * $vector2[1]) - ($vector1[1] * $vector2[0])); - - return $retval; - } - - /** - */ - function sum($vector1, $vector2) - { - return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1], $vector1[2] + $vector2[2]); - } - - /** - */ - function sum2($vector1, $vector2) - { - return array($vector1[0] + $vector2[0], $vector1[1] + $vector2[1]); - } - - /** - */ - function scale($vector, $length) - { - if (count($vector) == 2) - { - return array($vector[0] * $length, $vector[1] * $length); - } - - return array($vector[0] * $length, $vector[1] * $length, $vector[2] * $length); - } - - /** - */ - function gen_poly($xoff, $yoff, &$vec1, &$vec2, &$vec3, &$vec4) - { - $poly = array(); - $poly[0] = $xoff + $vec1[0]; - $poly[1] = $yoff + $vec1[1]; - $poly[2] = $xoff + $vec2[0]; - $poly[3] = $yoff + $vec2[1]; - $poly[4] = $xoff + $vec3[0]; - $poly[5] = $yoff + $vec3[1]; - $poly[6] = $xoff + $vec4[0]; - $poly[7] = $yoff + $vec4[1]; - - return $poly; - } - - /** - * dimensions - */ - function dimensions($size) - { - $xn = $this->scale($this->basis_matrix[$this->x], -($this->bitmap_width / 2) * $size); - $xp = $this->scale($this->basis_matrix[$this->x], ($this->bitmap_width / 2) * $size); - $yn = $this->scale($this->basis_matrix[$this->y], -($this->bitmap_height / 2) * $size); - $yp = $this->scale($this->basis_matrix[$this->y], ($this->bitmap_height / 2) * $size); - - $p = array(); - $p[0] = $this->sum2($xn, $yn); - $p[1] = $this->sum2($xp, $yn); - $p[2] = $this->sum2($xp, $yp); - $p[3] = $this->sum2($xn, $yp); - - $min_x = $max_x = $p[0][0]; - $min_y = $max_y = $p[0][1]; - - for ($i = 1; $i < 4; ++$i) - { - $min_x = ($min_x > $p[$i][0]) ? $p[$i][0] : $min_x; - $min_y = ($min_y > $p[$i][1]) ? $p[$i][1] : $min_y; - $max_x = ($max_x < $p[$i][0]) ? $p[$i][0] : $max_x; - $max_y = ($max_y < $p[$i][1]) ? $p[$i][1] : $max_y; - } - - return array($min_x, $min_y, $max_x, $max_y); - } -} diff --git a/phpBB/phpbb/captcha/colour_manager.php b/phpBB/phpbb/captcha/colour_manager.php deleted file mode 100644 index 82332da8103..00000000000 --- a/phpBB/phpbb/captcha/colour_manager.php +++ /dev/null @@ -1,527 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha; - -class colour_manager -{ - var $img; - var $mode; - var $colours; - var $named_colours; - - /** - * Create the colour manager, link it to the image resource - */ - function __construct($img, $background = false, $mode = 'ahsv') - { - $this->img = $img; - $this->mode = $mode; - $this->colours = array(); - $this->named_colours = array(); - - if ($background !== false) - { - $bg = $this->allocate_named('background', $background); - imagefill($this->img, 0, 0, $bg); - } - } - - /** - * Lookup a named colour resource - */ - function get_resource($named_colour) - { - if (isset($this->named_colours[$named_colour])) - { - return $this->named_colours[$named_colour]; - } - - if (isset($this->named_rgb[$named_colour])) - { - return $this->allocate_named($named_colour, $this->named_rgb[$named_colour], 'rgb'); - } - - return false; - } - - /** - * Assign a name to a colour resource - */ - function name_colour($name, $resource) - { - $this->named_colours[$name] = $resource; - } - - /** - * names and allocates a colour resource - */ - function allocate_named($name, $colour, $mode = false) - { - $resource = $this->allocate($colour, $mode); - - if ($resource !== false) - { - $this->name_colour($name, $resource); - } - return $resource; - } - - /** - * allocates a specified colour into the image - */ - function allocate($colour, $mode = false) - { - if ($mode === false) - { - $mode = $this->mode; - } - - if (!is_array($colour)) - { - if (isset($this->named_rgb[$colour])) - { - return $this->allocate_named($colour, $this->named_rgb[$colour], 'rgb'); - } - - if (!is_int($colour)) - { - return false; - } - - $mode = 'rgb'; - $colour = array(255 & ($colour >> 16), 255 & ($colour >> 8), 255 & $colour); - } - - if (isset($colour['mode'])) - { - $mode = $colour['mode']; - unset($colour['mode']); - } - - if (isset($colour['random'])) - { - unset($colour['random']); - // everything else is params - return $this->random_colour($colour, $mode); - } - - $rgb = $this->model_convert($colour, $mode, 'rgb'); - $store = ($this->mode == 'rgb') ? $rgb : $this->model_convert($colour, $mode, $this->mode); - $resource = imagecolorallocate($this->img, $rgb[0], $rgb[1], $rgb[2]); - $this->colours[$resource] = $store; - - return $resource; - } - - /** - * randomly generates a colour, with optional params - */ - function random_colour($params = array(), $mode = false) - { - if ($mode === false) - { - $mode = $this->mode; - } - - switch ($mode) - { - case 'rgb': - // @TODO random rgb generation. do we intend to do this, or is it just too tedious? - break; - - case 'ahsv': - case 'hsv': - default: - - $default_params = array( - 'hue_bias' => false, // degree / 'r'/'g'/'b'/'c'/'m'/'y' /'o' - 'hue_range' => false, // if hue bias, then difference range +/- from bias - 'min_saturation' => 30, // 0 - 100 - 'max_saturation' => 80, // 0 - 100 - 'min_value' => 30, // 0 - 100 - 'max_value' => 80, // 0 - 100 - ); - - $alt = ($mode == 'ahsv') ? true : false; - $params = array_merge($default_params, $params); - - $min_hue = 0; - $max_hue = 359; - $min_saturation = max(0, $params['min_saturation']); - $max_saturation = min(100, $params['max_saturation']); - $min_value = max(0, $params['min_value']); - $max_value = min(100, $params['max_value']); - - if ($params['hue_bias'] !== false) - { - if (is_numeric($params['hue_bias'])) - { - $h = intval($params['hue_bias']) % 360; - } - else - { - switch ($params['hue_bias']) - { - case 'o': - $h = $alt ? 60 : 30; - break; - - case 'y': - $h = $alt ? 120 : 60; - break; - - case 'g': - $h = $alt ? 180 : 120; - break; - - case 'c': - $h = $alt ? 210 : 180; - break; - - case 'b': - $h = 240; - break; - - case 'm': - $h = 300; - break; - - case 'r': - default: - $h = 0; - break; - } - } - - $min_hue = $h + 360; - $max_hue = $h + 360; - - if ($params['hue_range']) - { - $min_hue -= min(180, $params['hue_range']); - $max_hue += min(180, $params['hue_range']); - } - } - - $h = mt_rand($min_hue, $max_hue); - $s = mt_rand($min_saturation, $max_saturation); - $v = mt_rand($min_value, $max_value); - - return $this->allocate(array($h, $s, $v), $mode); - - break; - } - } - - /** - */ - function colour_scheme($resource, $include_original = true) - { - $mode = 'hsv'; - - if (($pre = $this->get_resource($resource)) !== false) - { - $resource = $pre; - } - - $colour = $this->model_convert($this->colours[$resource], $this->mode, $mode); - $results = ($include_original) ? array($resource) : array(); - $colour2 = $colour3 = $colour4 = $colour; - $colour2[0] += 150; - $colour3[0] += 180; - $colour4[0] += 210; - - $results[] = $this->allocate($colour2, $mode); - $results[] = $this->allocate($colour3, $mode); - $results[] = $this->allocate($colour4, $mode); - - return $results; - } - - /** - */ - function mono_range($resource, $count = 5, $include_original = true) - { - if (is_array($resource)) - { - $results = array(); - for ($i = 0, $size = count($resource); $i < $size; ++$i) - { - $results = array_merge($results, $this->mono_range($resource[$i], $count, $include_original)); - } - return $results; - } - - $mode = (in_array($this->mode, array('hsv', 'ahsv'), true) ? $this->mode : 'ahsv'); - if (($pre = $this->get_resource($resource)) !== false) - { - $resource = $pre; - } - - $colour = $this->model_convert($this->colours[$resource], $this->mode, $mode); - - $results = array(); - if ($include_original) - { - $results[] = $resource; - $count--; - } - - // This is a hard problem. I chicken out and try to maintain readability at the cost of less randomness. - - while ($count > 0) - { - $colour[1] = ($colour[1] + mt_rand(40,60)) % 99; - $colour[2] = ($colour[2] + mt_rand(40,60)); - $results[] = $this->allocate($colour, $mode); - $count--; - } - return $results; - } - - /** - * Convert from one colour model to another - */ - function model_convert($colour, $from_model, $to_model) - { - if ($from_model == $to_model) - { - return $colour; - } - - switch ($to_model) - { - case 'hsv': - - switch ($from_model) - { - case 'ahsv': - return $this->ah2h($colour); - break; - - case 'rgb': - return $this->rgb2hsv($colour); - break; - } - break; - - case 'ahsv': - - switch ($from_model) - { - case 'hsv': - return $this->h2ah($colour); - break; - - case 'rgb': - return $this->h2ah($this->rgb2hsv($colour)); - break; - } - break; - - case 'rgb': - switch ($from_model) - { - case 'hsv': - return $this->hsv2rgb($colour); - break; - - case 'ahsv': - return $this->hsv2rgb($this->ah2h($colour)); - break; - } - break; - } - return false; - } - - /** - * Slightly altered from wikipedia's algorithm - */ - function hsv2rgb($hsv) - { - $this->normalize_hue($hsv[0]); - - $h = $hsv[0]; - $s = min(1, max(0, $hsv[1] / 100)); - $v = min(1, max(0, $hsv[2] / 100)); - - // calculate hue sector - $hi = floor($hsv[0] / 60); - - // calculate opposite colour - $p = $v * (1 - $s); - - // calculate distance between hex vertices - $f = ($h / 60) - $hi; - - // coming in or going out? - if (!($hi & 1)) - { - $f = 1 - $f; - } - - // calculate adjacent colour - $q = $v * (1 - ($f * $s)); - - switch ($hi) - { - case 0: - $rgb = array($v, $q, $p); - break; - - case 1: - $rgb = array($q, $v, $p); - break; - - case 2: - $rgb = array($p, $v, $q); - break; - - case 3: - $rgb = array($p, $q, $v); - break; - - case 4: - $rgb = array($q, $p, $v); - break; - - case 5: - $rgb = array($v, $p, $q); - break; - - default: - return array(0, 0, 0); - break; - } - - return array(255 * $rgb[0], 255 * $rgb[1], 255 * $rgb[2]); - } - - /** - * (more than) Slightly altered from wikipedia's algorithm - */ - function rgb2hsv($rgb) - { - $r = min(255, max(0, $rgb[0])); - $g = min(255, max(0, $rgb[1])); - $b = min(255, max(0, $rgb[2])); - $max = max($r, $g, $b); - $min = min($r, $g, $b); - - $v = $max / 255; - $s = (!$max) ? 0 : 1 - ($min / $max); - - // if max - min is 0, we want hue to be 0 anyway. - $h = $max - $min; - - if ($h) - { - switch ($max) - { - case $g: - $h = 120 + (60 * ($b - $r) / $h); - break; - - case $b: - $h = 240 + (60 * ($r - $g) / $h); - break; - - case $r: - $h = 360 + (60 * ($g - $b) / $h); - break; - } - } - $this->normalize_hue($h); - - return array($h, $s * 100, $v * 100); - } - - /** - */ - function normalize_hue(&$hue) - { - $hue %= 360; - - if ($hue < 0) - { - $hue += 360; - } - } - - /** - * Alternate hue to hue - */ - function ah2h($ahue) - { - if (is_array($ahue)) - { - $ahue[0] = $this->ah2h($ahue[0]); - return $ahue; - } - $this->normalize_hue($ahue); - - // blue through red is already ok - if ($ahue >= 240) - { - return $ahue; - } - - // ahue green is at 180 - if ($ahue >= 180) - { - // return (240 - (2 * (240 - $ahue))); - return (2 * $ahue) - 240; // equivalent - } - - // ahue yellow is at 120 (RYB rather than RGB) - if ($ahue >= 120) - { - return $ahue - 60; - } - - return $ahue / 2; - } - - /** - * hue to Alternate hue - */ - function h2ah($hue) - { - if (is_array($hue)) - { - $hue[0] = $this->h2ah($hue[0]); - return $hue; - } - $this->normalize_hue($hue); - - // blue through red is already ok - if ($hue >= 240) - { - return $hue; - } - else if ($hue <= 60) - { - return $hue * 2; - } - else if ($hue <= 120) - { - return $hue + 60; - } - else - { - return ($hue + 240) / 2; - } - } -} diff --git a/phpBB/phpbb/captcha/gd.php b/phpBB/phpbb/captcha/gd.php deleted file mode 100644 index 308bc73e0ba..00000000000 --- a/phpBB/phpbb/captcha/gd.php +++ /dev/null @@ -1,1846 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha; - -class gd -{ - var $width = 360; - var $height = 96; - - /** - * Create the image containing $code with a seed of $seed - */ - function execute($code, $seed) - { - global $config; - - mt_srand($seed); - - // Create image - $img = imagecreatetruecolor($this->width, $this->height); - - // Generate colours - $colour = new colour_manager($img, array( - 'random' => true, - 'min_value' => 60, - ), 'hsv'); - - $scheme = $colour->colour_scheme('background', false); - $scheme = $colour->mono_range($scheme, 10, false); - shuffle($scheme); - - $bg_colours = array_splice($scheme, mt_rand(6, 12)); - - // Generate code characters - $characters = $sizes = $bounding_boxes = $noise = array(); - $width_avail = $this->width - 15; - $code_len = strlen($code); - $captcha_bitmaps = $this->captcha_bitmaps(); - - for ($i = 0; $i < $code_len; ++$i) - { - $characters[$i] = new char_cube3d($captcha_bitmaps, $code[$i]); - - list($min, $max) = $characters[$i]->range(); - $sizes[$i] = mt_rand($min, $max); - - $box = $characters[$i]->dimensions($sizes[$i]); - $width_avail -= ($box[2] - $box[0]); - $bounding_boxes[$i] = $box; - } - - // Redistribute leftover x-space - $offset = array(); - for ($i = 0; $i < $code_len; ++$i) - { - $denom = ($code_len - $i); - $denom = max(1.3, $denom); - $offset[$i] = phpbb_mt_rand(0, (int) round((1.5 * $width_avail) / $denom)); - $width_avail -= $offset[$i]; - } - - if ($config['captcha_gd_x_grid']) - { - $grid = (int) $config['captcha_gd_x_grid']; - for ($y = 0; $y < $this->height; $y += mt_rand($grid - 2, $grid + 2)) - { - $current_colour = $scheme[array_rand($scheme)]; - imageline($img, mt_rand(0,4), mt_rand($y - 3, $y), mt_rand($this->width - 5, $this->width), mt_rand($y - 3, $y), $current_colour); - } - } - - if ($config['captcha_gd_y_grid']) - { - $grid = (int) $config['captcha_gd_y_grid']; - for ($x = 0; $x < $this->width; $x += mt_rand($grid - 2, $grid + 2)) - { - $current_colour = $scheme[array_rand($scheme)]; - imagedashedline($img, mt_rand($x -3, $x + 3), mt_rand(0, 4), mt_rand($x -3, $x + 3), mt_rand($this->height - 5, $this->height), $current_colour); - } - } - - if ($config['captcha_gd_wave'] && ($config['captcha_gd_x_grid'] || $config['captcha_gd_y_grid'])) - { - $this->wave($img); - } - - if ($config['captcha_gd_3d_noise']) - { - $noise_bitmaps = $this->captcha_noise_bg_bitmaps(); - for ($i = 0; $i < $code_len; ++$i) - { - $noise[$i] = new char_cube3d($noise_bitmaps, mt_rand(1, count($noise_bitmaps['data']))); - - $noise[$i]->range(); - //$box = $noise[$i]->dimensions($sizes[$i]); - } - $xoffset = 0; - for ($i = 0; $i < $code_len; ++$i) - { - $dimm = $bounding_boxes[$i]; - $xoffset += ($offset[$i] - $dimm[0]); - $yoffset = mt_rand(-$dimm[1], $this->height - $dimm[3]); - - $noise[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme); - $xoffset += $dimm[2]; - } - } - - $xoffset = 5; - for ($i = 0; $i < $code_len; ++$i) - { - $dimm = $bounding_boxes[$i]; - $xoffset += ($offset[$i] - $dimm[0]); - $yoffset = mt_rand(-$dimm[1], $this->height - $dimm[3]); - - $characters[$i]->drawchar($sizes[$i], $xoffset, $yoffset, $img, $colour->get_resource('background'), $scheme); - $xoffset += $dimm[2]; - } - - if ($config['captcha_gd_wave']) - { - $this->wave($img); - } - - if ($config['captcha_gd_foreground_noise']) - { - $this->noise_line($img, 0, 0, $this->width, $this->height, $colour->get_resource('background'), $scheme, $bg_colours); - } - - // Send image - header('Content-Type: image/png'); - header('Cache-control: no-cache, no-store'); - imagepng($img); - imagedestroy($img); - } - - /** - * Sinus - */ - function wave($img) - { - $period_x = mt_rand(12,18); - $period_y = mt_rand(7,14); - $amp_x = mt_rand(5,10); - $amp_y = mt_rand(2,4); - $socket = mt_rand(0,100); - - $dampen_x = mt_rand($this->width/5, $this->width/2); - $dampen_y = mt_rand($this->height/5, $this->height/2); - $direction_x = (mt_rand (0, 1)); - $direction_y = (mt_rand (0, 1)); - - for ($i = 0; $i < $this->width; $i++) - { - $dir = ($direction_x) ? $i : ($this->width - $i); - imagecopy($img, $img, $i-1, sin($socket+ $i/($period_x + $dir/$dampen_x)) * $amp_x, $i, 0, 1, $this->height); - } - $socket = mt_rand(0,100); - for ($i = 0; $i < $this->height; $i++) - { - $dir = ($direction_y) ? $i : ($this->height - $i); - imagecopy($img, $img ,sin($socket + $i/($period_y + ($dir)/$dampen_y)) * $amp_y, $i-1, 0, $i, $this->width, 1); - } - return $img; - } - - /** - * Noise line - */ - function noise_line($img, $min_x, $min_y, $max_x, $max_y, $bg, $font, $non_font) - { - imagesetthickness($img, 2); - - $x1 = $min_x; - $x2 = $max_x; - $y1 = $min_y; - $y2 = $min_y; - - do - { - $line = array_merge( - array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]), - array_fill(0, mt_rand(30, 60), $bg) - ); - - imagesetstyle($img, $line); - imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED); - - $y1 += mt_rand(12, 35); - $y2 += mt_rand(12, 35); - } - while ($y1 < $max_y && $y2 < $max_y); - - $x1 = $min_x; - $x2 = $min_x; - $y1 = $min_y; - $y2 = $max_y; - - do - { - $line = array_merge( - array_fill(0, mt_rand(30, 60), $non_font[array_rand($non_font)]), - array_fill(0, mt_rand(30, 60), $bg) - ); - - imagesetstyle($img, $line); - imageline($img, $x1, $y1, $x2, $y2, IMG_COLOR_STYLED); - - $x1 += mt_rand(20, 35); - $x2 += mt_rand(20, 35); - } - while ($x1 < $max_x && $x2 < $max_x); - imagesetthickness($img, 1); - } - - function captcha_noise_bg_bitmaps() - { - return array( - 'width' => 15, - 'height' => 5, - 'data' => array( - - 1 => array( - array(1,0,0,0,1,0,0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,1,0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,1,0,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0,0,0,1,0,0,0), - ), - 2 => array( - array(1,1,mt_rand(0,1),1,0,1,1,1,1,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,1,1,0,1,1,1), - ), - 3 => array( - array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0), - array(0,0,0,0,1,0,0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,1), - ), - 4 => array( - array(1,0,1,0,1,0,0,1,1,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0), - ), - 5 => array( - array(1,1,1,1,0,0,0,1,1,1,0,0,1,0,1), - array(0,0,0,0,0,0,0,1,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0,0,0,0,0,0,0), - ), - 6 => array( - array(mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),0,mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),mt_rand(0,1),0,mt_rand(0,1),mt_rand(0,1),mt_rand(0,1)), - array(0,0,0,0,0,0,0,mt_rand(0,1),0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(mt_rand(0,1),0,mt_rand(0,1),0,0,0,0,0,0,0,0,0,0,0,0), - ), - 7 => array( - array(0,0,0,0,0,0,0,0,0,0,1,1,0,1,1), - array(0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - array(0,0,1,1,0,0,0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,1,0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - ), - )); - } - - /** - * Return bitmaps - */ - function captcha_bitmaps() - { - global $config; - - $chars = array( - 'A' => array( - array( - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,1,0,1,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,0,0,0,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,1,1,0,0,0,1,1,0), - array(1,1,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,1), - array(0,0,0,0,0,1,1,1,1), - array(0,0,0,1,1,1,0,0,1), - array(0,1,1,1,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,1,0,0,0,0,1,1,1), - array(0,1,1,1,1,1,1,0,1), - ), - ), - 'B' => array( - array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - ), - array( - array(1,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - ), - array( - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,0,0), - ), - ), - 'C' => array( - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,1,1,1,1,1,0,1), - array(0,1,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,1), - array(0,0,1,1,1,1,1,0,1), - ), - ), - 'D' => array( - array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - ), - array( - array(1,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,1,1,1,1,1,0,1), - array(0,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,1,0,0,0,1,1,1), - array(0,0,1,1,1,1,1,0,1), - ), - ), - 'E' => array( - array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,1,1,0,0,0,1,1,0), - array(1,1,0,0,0,0,0,1,1), - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,1,0,0,0,0,0,1,1), - array(0,1,1,1,1,1,1,1,0), - ), - ), - 'F' => array( - array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - array( - array(0,1,1,1,1,1,1,1,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,0,0,0), - ), - array( - array(0,0,0,1,1,0,0,0,0), - array(0,0,1,1,0,0,0,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,1,1,1,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - ), - ), - 'G' => array( - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,1,1,1,1,1,0,1), - array(0,1,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,1,1,1,1,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,1), - array(0,0,1,1,1,1,1,0,1), - ), - array( - array(0,0,1,1,1,1,1,0,1), - array(0,1,1,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,0,0,0,0,0,1), - array(0,0,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,1), - array(1,1,1,1,1,1,1,1,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - ), - 'H' => array( - array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - array( - array(1,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,0,0,0,1,1,1), - ), - array( - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,1,1,1,0,0,0), - array(1,1,1,1,0,1,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - ), - ), - 'I' => array( - array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(0,0,0,1,1,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,1,1,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,1,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,1,1,0,0,0), - ), - ), - 'J' => array( - array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,0,1,1,0,0,0,0,0), - ), - array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,1,0,0,1,0,0,0,0), - array(1,0,1,1,0,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,0,1,1,0,0,0,0,0), - ), - ), - 'K' => array( - array( // New 'K', supplied by NeoThermic - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,1,0,0,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - ), - array( - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,1,0,0), - array(0,1,0,0,0,1,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,1,0,1,0,0,0,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,1,0,1,0,0,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,1,0,0,0,1,0,0,0), - array(0,1,0,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,0,0,0,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,1,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,1,0,1,0,0,0,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,1,0,1,0,0,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,1,0,0,0,1,0,0,0), - array(0,1,0,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - ), - ), - 'L' => array( - array( - array(0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,0,1,1,1,0,0,0,0), - ), - ), - 'M' => array( - array( - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,1,0,1,0,1,0,1,0), - array(0,1,0,1,0,1,0,1,0), - array(0,1,0,1,0,1,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,0,0,0,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,1,1,1,0,1,1,1,0), - array(1,1,0,1,1,1,0,1,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - ), - ), - 'N' => array( - array( - array(1,1,0,0,0,0,0,0,1), - array(1,1,0,0,0,0,0,0,1), - array(1,0,1,0,0,0,0,0,1), - array(1,0,1,0,0,0,0,0,1), - array(1,0,0,1,0,0,0,0,1), - array(1,0,0,1,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,0,1,0,1), - array(1,0,0,0,0,0,1,0,1), - array(1,0,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,0,0,0,0,1,0), - array(0,1,1,0,0,0,0,1,0), - array(0,1,1,0,0,0,0,1,0), - array(0,1,0,1,0,0,0,1,0), - array(0,1,0,1,0,0,0,1,0), - array(0,1,0,1,0,0,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,0,1,1,0,1,0), - array(0,1,0,0,0,1,0,1,0), - array(0,1,0,0,0,1,1,1,0), - array(0,1,0,0,0,0,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,0,0,0,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(1,0,1,1,1,1,0,0,0), - array(1,1,1,0,0,1,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - ), - ), - 'O' => array( - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,1,1,1,1,1,0,0,0), - array(1,1,1,0,0,1,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,1,0,0,0,1,1,0,0), - array(0,1,1,1,1,1,0,0,0), - ), - ), - 'P' => array( - array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - array( - array(1,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,1,1,0,0,0,0,0), - array(1,1,0,1,1,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,1,1,0,0,0,0), - array(1,1,1,1,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - ), - 'Q' => array( - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,0,1,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,1), - ), - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,1,0,0,1,1,0,1,1), - array(0,1,1,1,1,1,1,1,0), - array(0,0,0,0,0,0,1,1,0), - array(0,0,0,0,0,0,0,1,1), - array(0,0,0,0,0,0,0,0,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,1,1,1,1), - array(0,0,0,0,1,1,0,0,1), - array(0,0,0,0,1,0,0,0,1), - array(0,0,0,0,1,0,0,0,1), - array(0,0,0,0,1,1,0,1,1), - array(0,0,0,0,0,1,1,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - ), - ), - 'R' => array( - array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(1,1,1,0,0,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - ), - array( - array(1,1,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(0,1,1,0,0,0,0,0,0), - array(0,1,1,1,0,0,0,0,0), - array(0,1,0,1,1,0,0,0,0), - array(0,1,0,0,1,1,0,0,0), - array(0,1,0,0,0,1,1,0,0), - array(0,1,0,0,0,0,1,1,0), - array(1,1,1,0,0,0,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,0,0,0,0), - array(1,1,0,0,1,1,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - ), - 'S' => array( - array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,1,1,1,1,1,0,1), - array(0,1,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,1,0,0,0,0,0,1,0), - array(1,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,1,1,1,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,0,0,0,0,0,0,0), - array(0,1,1,1,1,0,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(1,0,0,0,1,1,0,0,0), - array(0,1,1,1,1,0,0,0,0), - ), - ), - 'T' => array( - array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,1,0,0,0,1), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,1,1,0,0,0), - ), - array( - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,1,1,1,1,1,1,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,1,0,0,0), - array(0,0,0,0,0,1,1,1,0), - ), - ), - 'U' => array( - array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,1,1), - array(0,0,1,1,0,0,1,1,1), - array(0,0,0,1,1,1,1,0,1), - ), - ), - 'V' => array( - array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - ), - 'W' => array( - array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,1,0,0,0,0,0,1,1), - array(1,1,0,0,0,0,0,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,1,1,1,0,1,0), - array(0,1,0,1,0,1,0,1,0), - array(0,1,1,1,0,1,1,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,1,1,1,0,1,0), - array(0,1,0,1,0,1,0,1,0), - array(0,1,1,1,0,1,1,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,0), - ), - ), - 'X' => array( - array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,1,1,0,0,0,1,1,1), - array(0,0,0,0,0,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,0,1,1,0,1,1,0,0), - array(0,0,0,1,1,1,0,0,0), - array(0,0,0,1,1,1,0,0,0), - array(0,0,1,1,0,1,1,0,0), - array(0,1,1,0,0,0,1,1,0), - array(0,0,0,0,0,0,0,0,0), - ), - ), - 'Y' => array( - array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(1,1,1,0,0,0,1,1,1), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,1,1,0,0,0), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,1,0,0,0,0,1), - array(0,0,0,1,1,0,0,0,1), - array(0,0,0,0,1,0,0,1,1), - array(0,0,0,0,1,1,0,1,0), - array(0,0,0,0,0,1,1,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,1,0,0,0), - array(0,0,1,1,1,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - ), - 'Z' => array( - array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - ), - array( - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,1,1,1,1,1,1,1,0), - array(0,0,0,0,0,1,1,0,0), - array(0,0,0,0,1,1,0,0,0), - array(0,0,0,1,1,0,0,0,0), - array(0,0,1,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,1,1,1,1,1,1,0), - ), - ), - ); - - /** @var 1|2|3 $config['captcha_gd_fonts'] */ - return array( - 'width' => 9, - 'height' => 15, - 'data' => array( - - 'A' => $chars['A'][mt_rand(0, min(count($chars['A']), $config['captcha_gd_fonts']) -1)], - 'B' => $chars['B'][mt_rand(0, min(count($chars['B']), $config['captcha_gd_fonts']) -1)], - 'C' => $chars['C'][mt_rand(0, min(count($chars['C']), $config['captcha_gd_fonts']) -1)], - 'D' => $chars['D'][mt_rand(0, min(count($chars['D']), $config['captcha_gd_fonts']) -1)], - 'E' => $chars['E'][mt_rand(0, min(count($chars['E']), $config['captcha_gd_fonts']) -1)], - 'F' => $chars['F'][mt_rand(0, min(count($chars['F']), $config['captcha_gd_fonts']) -1)], - 'G' => $chars['G'][mt_rand(0, min(count($chars['G']), $config['captcha_gd_fonts']) -1)], - 'H' => $chars['H'][mt_rand(0, min(count($chars['H']), $config['captcha_gd_fonts']) -1)], - 'I' => $chars['I'][mt_rand(0, min(count($chars['I']), $config['captcha_gd_fonts']) -1)], - 'J' => $chars['J'][mt_rand(0, min(count($chars['J']), $config['captcha_gd_fonts']) -1)], - 'K' => $chars['K'][mt_rand(0, min(count($chars['K']), $config['captcha_gd_fonts']) -1)], - 'L' => $chars['L'][mt_rand(0, min(count($chars['L']), $config['captcha_gd_fonts']) -1)], - 'M' => $chars['M'][mt_rand(0, min(count($chars['M']), $config['captcha_gd_fonts']) -1)], - 'N' => $chars['N'][mt_rand(0, min(count($chars['N']), $config['captcha_gd_fonts']) -1)], - 'O' => $chars['O'][mt_rand(0, min(count($chars['O']), $config['captcha_gd_fonts']) -1)], - 'P' => $chars['P'][mt_rand(0, min(count($chars['P']), $config['captcha_gd_fonts']) -1)], - 'Q' => $chars['Q'][mt_rand(0, min(count($chars['Q']), $config['captcha_gd_fonts']) -1)], - 'R' => $chars['R'][mt_rand(0, min(count($chars['R']), $config['captcha_gd_fonts']) -1)], - 'S' => $chars['S'][mt_rand(0, min(count($chars['S']), $config['captcha_gd_fonts']) -1)], - 'T' => $chars['T'][mt_rand(0, min(count($chars['T']), $config['captcha_gd_fonts']) -1)], - 'U' => $chars['U'][mt_rand(0, min(count($chars['U']), $config['captcha_gd_fonts']) -1)], - 'V' => $chars['V'][mt_rand(0, min(count($chars['V']), $config['captcha_gd_fonts']) -1)], - 'W' => $chars['W'][mt_rand(0, min(count($chars['W']), $config['captcha_gd_fonts']) -1)], - 'X' => $chars['X'][mt_rand(0, min(count($chars['X']), $config['captcha_gd_fonts']) -1)], - 'Y' => $chars['Y'][mt_rand(0, min(count($chars['Y']), $config['captcha_gd_fonts']) -1)], - 'Z' => $chars['Z'][mt_rand(0, min(count($chars['Z']), $config['captcha_gd_fonts']) -1)], - - '1' => array( - array(0,0,0,1,1,0,0,0,0), - array(0,0,1,0,1,0,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,1,1,1,1,1,1,1,0), - ), - '2' => array( // New '2' supplied by Anon - array(0,0,0,1,1,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,1,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,0), - ), - '3' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '4' => array( - array(0,0,0,0,0,0,1,1,0), - array(0,0,0,0,0,1,0,1,0), - array(0,0,0,0,1,0,0,1,0), - array(0,0,0,1,0,0,0,1,0), - array(0,0,1,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - ), - '5' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '6' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,1,1,1,1,0,0), - array(1,0,1,0,0,0,0,1,0), - array(1,1,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '7' => array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - ), - '8' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - '9' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,1), - array(0,1,0,0,0,0,1,0,1), - array(0,0,1,1,1,1,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - ), - ) - ); - } -} diff --git a/phpBB/phpbb/captcha/gd_wave.php b/phpBB/phpbb/captcha/gd_wave.php deleted file mode 100644 index e0801e7c504..00000000000 --- a/phpBB/phpbb/captcha/gd_wave.php +++ /dev/null @@ -1,847 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha; - -/** -* Wave3D CAPTCHA -*/ -class gd_wave -{ - var $width = 360; - var $height = 96; - - function execute($code, $seed) - { - // seed the random generator - mt_srand($seed); - - // set height and width - $img_x = $this->width; - $img_y = $this->height; - - // Generate image - $img = imagecreatetruecolor($img_x, $img_y); - $x_grid = mt_rand(6, 10); - $y_grid = mt_rand(6, 10); - - // Ok, so lets cut to the chase. We could accurately represent this in 3d and - // do all the appropriate linear transforms. my questions is... why bother? - // The computational overhead is unnecessary when you consider the simple fact: - // we're not here to accurately represent a model, but to just show off some random-ish - // polygons - - // Conceive of 3 spaces. - // 1) planar-space (discrete "pixel" grid) - // 2) 3-space. (planar-space with z/height aspect) - // 3) image space (pixels on the screen) - // resolution of the planar-space we're embedding the text code in - $plane_x = 100; - $plane_y = 30; - - $subdivision_factor = 3; - - // $box is the 4 points in img_space that correspond to the corners of the plane in 3-space - $box = array( - 'upper_left' => array( - 'x' => mt_rand(5, 15), - 'y' => mt_rand(10, 15) - ), - 'upper_right' => array( - 'x' => mt_rand($img_x - 35, $img_x - 19), - 'y' => mt_rand(10, 17) - ), - 'lower_left' => array( - 'x' => mt_rand($img_x - 45, $img_x - 5), - 'y' => mt_rand($img_y - 15, $img_y - 0), - ), - ); - - $box['lower_right'] = array( - 'x' => $box['lower_left']['x'] + $box['upper_left']['x'] - $box['upper_right']['x'], - 'y' => $box['lower_left']['y'] + $box['upper_left']['y'] - $box['upper_right']['y'], - ); - - // TODO - $background = imagecolorallocate($img, mt_rand(155, 255), mt_rand(155, 255), mt_rand(155, 255)); - imagefill($img, 0, 0, $background); - - $random = array(); - $fontcolors = array(); - - for ($i = 0; $i < 15; ++$i) - { - $random[$i] = imagecolorallocate($img, mt_rand(120, 255), mt_rand(120, 255), mt_rand(120, 255)); - } - - $fontcolors[0] = imagecolorallocate($img, mt_rand(0, 120), mt_rand(0, 120), mt_rand(0, 120)); - - $colors = array(); - - $minr = mt_rand(20, 30); - $ming = mt_rand(20, 30); - $minb = mt_rand(20, 30); - - $maxr = mt_rand(150, 230); - $maxg = mt_rand(150, 230); - $maxb = mt_rand(150, 230); - - for ($i = -30; $i <= 30; ++$i) - { - $coeff1 = ($i + 12) / 45; - $coeff2 = 1 - $coeff1; - - $red = ($coeff2 * $maxr) + ($coeff1 * $minr); - $green = ($coeff2 * $maxg) + ($coeff1 * $ming); - $blue = ($coeff2 * $maxb) + ($coeff1 * $minb); - - $colors[$i] = imagecolorallocate($img, min([255, (int) $red]), min([255, (int) $green]), min([255, (int) $blue])); - } - - // $img_buffer is the last row of 3-space positions (converted to img-space), cached - // (using this means we don't need to recalculate all 4 positions for each new polygon, - // merely the newest point that we're adding, which is then cached. - $img_buffer = array(array(), array()); - - // In image-space, the x- and y-offset necessary to move one unit in the x-direction in planar-space - $dxx = ($box['upper_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_x); - $dxy = ($box['upper_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_x); - - // In image-space, the x- and y-offset necessary to move one unit in the y-direction in planar-space - $dyx = ($box['lower_right']['x'] - $box['upper_left']['x']) / ($subdivision_factor * $plane_y); - $dyy = ($box['lower_right']['y'] - $box['upper_left']['y']) / ($subdivision_factor * $plane_y); - - // Initial captcha-letter offset in planar-space - $plane_offset_x = mt_rand(3, 8); - $plane_offset_y = mt_rand( 12, 15); - - // character map - $map = $this->captcha_bitmaps(); - - // matrix - $plane = array(); - - // for each character, we'll silkscreen it into our boolean pixel plane - for ($c = 0, $code_num = strlen($code); $c < $code_num; ++$c) - { - $letter = $code[$c]; - - for ($x = $map['width'] - 1; $x >= 0; --$x) - { - for ($y = $map['height'] - 1; $y >= 0; --$y) - { - if ($map['data'][$letter][$y][$x]) - { - $plane[$y + $plane_offset_y + (($c & 1) ? 1 : -1)][$x + $plane_offset_x] = true; - } - } - } - $plane_offset_x += 11; - } - - // calculate our first buffer, we can't actually draw polys with these yet - // img_pos_prev == screen x,y location to our immediate left. - // img_pos_cur == current screen x,y location - // we calculate screen position of our - // current cell based on the difference from the previous cell - // rather than recalculating from absolute coordinates - // What we cache into the $img_buffer contains the raised text coordinates. - $img_pos_prev = $img_buffer[0][0] = array($box['upper_left']['x'], $box['upper_left']['y']); - $prev_height = $this->wave_height(0, 0, $subdivision_factor); - $full_x = $plane_x * $subdivision_factor; - $full_y = $plane_y * $subdivision_factor; - - for ($x = 1; $x <= $full_x; ++$x) - { - $cur_height = $this->wave_height($x, 0, $subdivision_factor); - $offset = $cur_height - $prev_height; - $img_pos_cur = array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset); - - $img_buffer[0][$x] = $img_pos_cur; - $img_pos_prev = $img_pos_cur; - $prev_height = $cur_height; - } - - for ($y = 1; $y <= $full_y; ++$y) - { - // swap buffers - $buffer_cur = $y & 1; - $buffer_prev = 1 - $buffer_cur; - - $prev_height = $this->wave_height(0, $y, $subdivision_factor); - $offset = $prev_height - $this->wave_height(0, $y - 1, $subdivision_factor); - $img_pos_cur = array($img_buffer[$buffer_prev][0][0] + $dyx, min($img_buffer[$buffer_prev][0][1] + $dyy + $offset, $img_y - 1)); - - // make sure we don't try to write off the page - $img_pos_prev = $img_pos_cur; - - $img_buffer[$buffer_cur][0] = $img_pos_cur; - - for ($x = 1; $x <= $full_x; ++$x) - { - $cur_height = $this->wave_height($x, $y, $subdivision_factor) + $this->grid_height($x, $y, $x_grid, $y_grid, 1); - - // height is a z-factor, not a y-factor - $offset = $cur_height - $prev_height; - $img_pos_cur = array($img_pos_prev[0] + $dxx, $img_pos_prev[1] + $dxy + $offset); - - // height is float, index it to an int, get closest color - $color = $colors[intval($cur_height)]; - $img_pos_prev = $img_pos_cur; - $prev_height = $cur_height; - - $y_index_old = intval(($y - 1) / $subdivision_factor); - $y_index_new = intval($y / $subdivision_factor); - $x_index_old = intval(($x - 1) / $subdivision_factor); - $x_index_new = intval($x / $subdivision_factor); - - if ($plane[$y_index_new][$x_index_new]) - { - $img_pos_cur[1] += $this->wave_height($x, $y, $subdivision_factor, 1) - 30 - $cur_height; - $color = $colors[20]; - } - $img_pos_cur[1] = min($img_pos_cur[1], $img_y - 1); - $img_buffer[$buffer_cur][$x] = $img_pos_cur; - - // Smooth the edges as much as possible by having not more than one low<->high triangle per square - // Otherwise, just - $diag_down = !$plane[$y_index_old][$x_index_old] && !$plane[$y_index_new][$x_index_new]; - $diag_up = !$plane[$y_index_old][$x_index_new] && !$plane[$y_index_new][$x_index_old]; - - // natural switching - $mode = ($x + $y) & 1; - - // override if it requires it - if ($diag_down != $diag_up) - { - $mode = $diag_up; - } - - if ($mode) - { - // +-/ / - // 1 |/ 2 /| - // / /-+ - $poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x]); - $poly2 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_cur][$x], $img_buffer[$buffer_prev][$x]); - } - else - { - // \ \-+ - // 1 |\ 2 \| - // +-\ \ - $poly1 = array_merge($img_buffer[$buffer_cur][$x - 1], $img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_cur][$x]); - $poly2 = array_merge($img_buffer[$buffer_prev][$x - 1], $img_buffer[$buffer_prev][$x], $img_buffer[$buffer_cur][$x]); - } - - imagefilledpolygon($img, $poly1, 3, $color); - imagefilledpolygon($img, $poly2, 3, $color); - } - } - - // Output image - header('Content-Type: image/png'); - header('Cache-control: no-cache, no-store'); - //$mtime = explode(' ', microtime()); - //$totaltime = $mtime[0] + $mtime[1] - $starttime; - - //echo $totaltime . "
\n"; - //echo memory_get_usage() - $tmp; - imagepng($img); - imagedestroy($img); - } - - function wave_height($x, $y, $factor = 1, $tweak = 0.7) - { - // stretch the wave. TODO: pretty it up - $x = $x/5 + 180; - $y = $y/4; - return ((sin($x / (3 * $factor)) + sin($y / (3 * $factor))) * 10 * $tweak); - } - - function grid_height($x, $y, $x_grid, $y_grid, $factor = 1) - { - return ((!($x % ($x_grid * $factor)) || !($y % ($y_grid * $factor))) ? 3 : 0); - } - - function captcha_bitmaps() - { - return array( - 'width' => 9, - 'height' => 13, - 'data' => array( - 'A' => array( - array(0,0,1,1,1,1,0,0,0), - array(0,1,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'B' => array( - array(1,1,1,1,1,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,1,0,0), - array(1,1,1,1,1,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,1,0,0), - array(1,1,1,1,1,1,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'C' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'D' => array( - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'E' => array( - array(0,0,1,1,1,1,1,1,1), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'F' => array( - array(0,0,1,1,1,1,1,1,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,1,1,1,1,1,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'G' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'H' => array( - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,1,1,1,1,1,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'I' => array( - array(0,1,1,1,1,1,1,1,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,1,1,1,1,1,1,1,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'J' => array( - array(0,0,0,0,0,0,1,1,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,1,0), - array(0,0,0,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'K' => array( - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,1,0,0,0,0,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'L' => array( - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'M' => array( - array(0,1,0,0,0,0,0,1,0), - array(0,1,1,0,0,0,1,1,0), - array(0,1,0,1,0,1,0,1,0), - array(0,1,0,0,1,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'N' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,1,0,0,0,0,0,0,1), - array(1,0,1,0,0,0,0,0,1), - array(1,0,0,1,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,0,0,1,0,0,1), - array(1,0,0,0,0,0,1,0,1), - array(1,0,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'O' => array( - array(0,0,0,1,1,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,1,1,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'P' => array( - array(1,1,1,1,1,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,1,0,0), - array(1,1,1,1,1,1,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'Q' => array( - array(0,0,1,1,1,1,0,0,0), - array(0,1,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,1,0,0,1,0), - array(1,0,0,0,0,1,0,1,0), - array(0,1,0,0,0,0,1,0,0), - array(0,0,1,1,1,1,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'R' => array( - array(1,1,1,1,1,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,1,0,0), - array(1,1,1,1,1,1,0,0,0), - array(1,0,1,0,0,0,0,0,0), - array(1,0,0,1,0,0,0,0,0), - array(1,0,0,0,1,0,0,0,0), - array(1,0,0,0,0,1,0,0,0), - array(1,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'S' => array( - array(0,0,1,1,1,1,1,1,1), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(1,1,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'T' => array( - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'U' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'V' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'W' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,1,0,0,0,1), - array(1,0,0,1,0,1,0,0,1), - array(1,0,1,0,0,0,1,0,1), - array(1,1,0,0,0,0,0,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'X' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'Y' => array( - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,0,0,0,1,0,0), - array(0,0,0,1,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - 'Z' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,1), - array(1,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '1' => array( - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,1,0,0,0,0), - array(0,0,1,0,1,0,0,0,0), - array(0,1,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,1,1,1,1,1,1,1,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '2' => array( - array(0,0,0,1,1,1,0,0,0), - array(0,0,1,0,0,0,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,1,0,0,0,0,0), - array(0,0,1,0,0,0,0,0,0), - array(0,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,0,0), - ), - '3' => array( - array(0,0,0,1,1,1,1,0,0), - array(0,0,1,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,1,0), - array(0,0,0,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '4' => array( - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,1,0), - array(0,0,0,0,0,1,0,1,0), - array(0,0,0,0,1,0,0,1,0), - array(0,0,0,1,0,0,0,1,0), - array(0,0,1,0,0,0,0,1,0), - array(0,1,1,1,1,1,1,1,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '5' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(0,1,0,0,0,0,0,0,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '6' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,0,0,0,0,0,0), - array(1,0,0,1,1,1,1,0,0), - array(1,0,1,0,0,0,0,1,0), - array(1,1,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '7' => array( - array(1,1,1,1,1,1,1,1,1), - array(1,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,1,0), - array(0,0,0,0,0,0,1,0,0), - array(0,0,0,0,0,1,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,1,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '8' => array( - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,1,0,0,0,0,0,1,0), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(1,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,0), - array(0,0,1,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - '9' => array( - array(0,0,0,1,1,1,1,0,0), - array(0,0,1,0,0,0,0,1,0), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,1,1), - array(0,0,1,1,1,1,1,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,0,0,0,0,0,0,0,1), - array(0,1,0,0,0,0,0,0,1), - array(0,0,1,0,0,0,0,1,0), - array(0,0,0,1,1,1,1,0,0), - array(0,0,0,0,0,0,0,0,0), - array(0,0,0,0,0,0,0,0,0), - ), - ) - ); - } -} diff --git a/phpBB/phpbb/captcha/non_gd.php b/phpBB/phpbb/captcha/non_gd.php deleted file mode 100644 index 881701c7d39..00000000000 --- a/phpBB/phpbb/captcha/non_gd.php +++ /dev/null @@ -1,387 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha; - -/** -* Main non-gd captcha class -* @ignore -*/ -class non_gd -{ - var $filtered_pngs; - var $width = 320; - var $height = 50; - - /** - * Define filtered pngs on init - */ - function __construct() - { - // If we can we will generate a single filtered png, we avoid nastiness via emulation of some Zlib stuff - $this->define_filtered_pngs(); - } - - /** - * Create the image containing $code with a seed of $seed - */ - function execute($code, $seed) - { - $img_height = $this->height - 10; - $img_width = 0; - - mt_srand($seed); - - $char_widths = $hold_chars = array(); - $code_len = strlen($code); - - for ($i = 0; $i < $code_len; $i++) - { - $char = $code[$i]; - - $width = mt_rand(0, 4); - $raw_width = $this->filtered_pngs[$char]['width']; - $char_widths[$i] = $width; - $img_width += $raw_width - $width; - - // Split the char into chunks of $raw_width + 1 length - if (empty($hold_chars[$char])) - { - $hold_chars[$char] = str_split(base64_decode($this->filtered_pngs[$char]['data']), $raw_width + 1); - } - } - - $offset_x = mt_rand(0, $this->width - $img_width); - $offset_y = mt_rand(0, $this->height - $img_height); - - $image = ''; - for ($i = 0; $i < $this->height; $i++) - { - $image .= chr(0); - - if ($i > $offset_y && $i < $offset_y + $img_height) - { - for ($j = 0; $j < $offset_x; $j++) - { - $image .= chr(mt_rand(140, 255)); - } - - for ($j = 0; $j < $code_len; $j++) - { - /** @psalm-suppress InvalidArrayOffset */ - $image .= $this->randomise(substr($hold_chars[$code[$j]][$i - $offset_y - 1], 1), $char_widths[$j]); - } - - for ($j = $offset_x + $img_width; $j < $this->width; $j++) - { - $image .= chr(mt_rand(140, 255)); - } - } - else - { - for ($j = 0; $j < $this->width; $j++) - { - $image .= chr(mt_rand(140, 255)); - } - } - } - unset($hold_chars); - - $image = $this->create_png($image, $this->width, $this->height); - - // Output image - header('Content-Type: image/png'); - header('Cache-control: no-cache, no-store'); - echo $image; - exit; - } - - /** - * This is designed to randomise the pixels of the image data within - * certain limits so as to keep it readable. It also varies the image - * width a little - */ - function randomise($scanline, $width) - { - $new_line = ''; - - $end = strlen($scanline) - ceil($width/2); - for ($i = (int) floor($width / 2); $i < $end; $i++) - { - $pixel = ord($scanline[$i]); - - if ($pixel < 190) - { - $new_line .= chr(mt_rand(0, 205)); - } - else if ($pixel > 190) - { - $new_line .= chr(mt_rand(145, 255)); - } - else - { - $new_line .= $scanline[$i]; - } - } - - return $new_line; - } - - /** - * This creates a chunk of the given type, with the given data - * of the given length adding the relevant crc - */ - function png_chunk($length, $type, $data) - { - $raw = $type . $data; - - return pack('N', $length) . $raw . pack('N', crc32($raw)); - } - - /** - * Creates greyscale 8bit png - The PNG spec can be found at - * http://www.libpng.org/pub/png/spec/PNG-Contents.html we use - * png because it's a fully recognised open standard and supported - * by practically all modern browsers and OSs - */ - function create_png($raw_image, $width, $height) - { - // SIG - $image = pack('C8', 137, 80, 78, 71, 13, 10, 26, 10); - - // IHDR - $raw = pack('N2', $width, $height); - $raw .= pack('C5', 8, 0, 0, 0, 0); - $image .= $this->png_chunk(13, 'IHDR', $raw); - - // IDAT - if (@extension_loaded('zlib')) - { - $raw_image = gzcompress($raw_image); - $length = strlen($raw_image); - } - else - { - // The total length of this image, uncompressed, is just a calculation of pixels - $length = ($width + 1) * $height; - - // Adler-32 hash generation - // Note: The hash is _backwards_ so we must reverse it - - if (@extension_loaded('hash')) - { - $adler_hash = strrev(hash('adler32', $raw_image, true)); - } - else if (@extension_loaded('mhash')) - { - $adler_hash = strrev(mhash(MHASH_ADLER32, $raw_image)); - } - else - { - // Optimized Adler-32 loop ported from the GNU Classpath project - $temp_length = $length; - $s1 = 1; - $s2 = $index = 0; - - while ($temp_length > 0) - { - // We can defer the modulo operation: - // s1 maximally grows from 65521 to 65521 + 255 * 3800 - // s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31 - $substract_value = ($temp_length < 3800) ? $temp_length : 3800; - $temp_length -= $substract_value; - - while (--$substract_value >= 0) - { - $s1 += ord($raw_image[$index]); - $s2 += $s1; - - $index++; - } - - $s1 %= 65521; - $s2 %= 65521; - } - $adler_hash = pack('N', ($s2 << 16) | $s1); - } - - // This is the same thing as gzcompress($raw_image, 0) but does not need zlib - $raw_image = pack('C3v2', 0x78, 0x01, 0x01, $length, ~$length) . $raw_image . $adler_hash; - - // The Zlib header + Adler hash make us add on 11 - $length += 11; - } - - // IDAT - $image .= $this->png_chunk($length, 'IDAT', $raw_image); - - // IEND - $image .= $this->png_chunk(0, 'IEND', ''); - - return $image; - } - - /** - * png image data - * Each 'data' element is base64_encoded uncompressed IDAT - */ - function define_filtered_pngs() - { - $this->filtered_pngs = array( - '0' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////olFAkBAAAGDyA4P///M31/////////////wD////////////////0dAgAAAAAAAAAAAAEcPipFGHn////////////AP//////////////6DAAAAAAAAAAAAAAAAAALSEAN+T///////////8A//////////////xAAAAAAAAAAAAAAAAAAAAAACPA/////////////wD/////////////oAAAAAAAAAAAAAAAAAAAAAAAev//////////////AP////////////8oAAAAAAAAPNj/zDAAAAAAAABD//////////////8A////////////1AAAAAAAABjw////5BAAAAAAAADo/////////////wD///////////+QAAAAAAAAbP//////QgAAAAAAAKj/////////////AP///////////1wAAAAAAACs/////8AXAAAAAAAAcP////////////8A////////////OAAAAAAAAND////dNwAAAAAAAABI/////////////wD///////////8gAAAAAAAA4P//7koACwAAAAAAACT/////////////AP///////////wgAAAAAAAD///VqAwaPAAAAAAAAEP////////////8A////////////AAAAAAAAAP/8kQYDavUAAAAAAAAA/////////////wD///////////8AAAAAAAAA/6kNAEru/wAAAAAAAAD/////////////AP///////////wAAAAAAAADAIwA33f//AAAAAAAAAP////////////8A////////////FAAAAAAAADYAI8D///8AAAAAAAAQ/////////////wD///////////8kAAAAAAAAAA2p////5AAAAAAAACD/////////////AP///////////0gAAAAAAAAFkfz////UAAAAAAAAQP////////////8A////////////cAAAAAAAAET1/////7AAAAAAAABo/////////////wD///////////+oAAAAAAAAXfX/////sAAAAAAAAGj/////////////AAAAALgAAAAAAAAwAAAAAAAAAAAAAAD////////////oAAAAAAAACOT////oEAAAAAAAAOD/////////////AP////////////8+AAAAAAAAKMz/zDQAAAAAAAA0//////////////8A////////////7jgAAAAAAAAAAAAAAAAAAAAAAKT//////////////wD///////////VqAwIAAAAAAAAAAAAAAAAAAAA8////////////////AP//////////rQcDaVEAAAAAAAAAAAAAAAAAKOj///////////////8A///////////nblnu/IAIAAAAAAAAAAAAAFzw/////////////////wD////////////79////+iITCAAAAAgSITg////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////w==', - 'width' => 40 - ), - '1' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////8BAAAAAAAP//////////////////AP////////////////////////9sAAAAAAAA//////////////////8A////////////////////////pAAAAAAAAAD//////////////////wD//////////////////////6wEAAAAAAAAAP//////////////////AP////////////////////h4AAAAAAAAAAAA//////////////////8A//////////////////ygJAAAAAAAAAAAAAD//////////////////wD//////////////9x8HAAAAAAAAAAAAAAAAP//////////////////AP//////////////AAAAAAAAAAAAAAAAAAAA//////////////////8A//////////////8AAAAAAAAAAAAAAAAAAAD//////////////////wD//////////////wAAAAAAAAR4AAAAAAAAAP//////////////////AP//////////////AAAAAAA4zP8AAAAAAAAA//////////////////8A//////////////8AAAA4sP///wAAAAAAAAD//////////////////wD//////////////yR80P//////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////AAAAAAAAAP//////////////////AP////////////////////////8AAAAAAAAA//////////////////8A/////////////////////////wAAAAAAAAD//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '2' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////okFAkCAAABCBIfNT///////////////////8A///////////////8hAgAAAAAAAAAAAAAAFTo/////////////////wD//////////////1QAAAAAAAAAAAAAAAAAACjo////////////////AP////////////+MAAAAAAAAAAAAAAAAAAAAADj///////////////8A////////////9BAAAAAAAAAAAAAAAAAAAAAAALD//////////////wD///////////+gAAAAAAAAAHjs+KwMAAAAAAAAVP//////////////AP///////////1gAAAAAAABM/////6QAAAAAAAAU//////////////8A////////////KAAAAAAAALj/////+AAAAAAAAAD//////////////wD///////////+MfGBMOCAI8P/////wAAAAAAAACP//////////////AP///////////////////////////5wAAAAAAAAw//////////////8A///////////////////////////oFAAAAAAAAHz//////////////wD/////////////////////////6CgAAAAAAAAE3P//////////////AP///////////////////////9ggAAAAAAAAAHT///////////////8A//////////////////////+0DAAAAAAAAAA8+P///////////////wD/////////////////////gAAAAAAAAAAAKOj/////////////////AP//////////////////9FAAAAAAAAAAADzw//////////////////8A/////////////////+g4AAAAAAAAAABk/P///////////////////wD////////////////oKAAAAAAAAAAMqP//////////////////////AP//////////////6CgAAAAAAAAAMNz///////////////////////8A//////////////g4AAAAAAAAAFT0/////////////////////////wD/////////////bAAAAAAAAABU/P//////////////////////////AP///////////8wAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A////////////SAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////9AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////xAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '3' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////8sGg0FAAAACA4cLz8////////////////////AP//////////////rBgAAAAAAAAAAAAAACTA//////////////////8A/////////////3QAAAAAAAAAAAAAAAAAAASs/////////////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAjc////////////////AP//////////6AwAAAAAAAAAAAAAAAAAAAAAAGT///////////////8A//////////94AAAAAAAABJDw/8g4AAAAAAAAHP///////////////wD//////////yAAAAAAAACE/////9gAAAAAAAAA////////////////AP///////////NSwiGQ4FOT//////AAAAAAAABD///////////////8A//////////////////////////+YAAAAAAAAVP///////////////wD//////////////////////P/ggAQAAAAAAATM////////////////AP////////////////////9gAAAAAAAAAAAElP////////////////8A/////////////////////0AAAAAAAAAAHLj//////////////////wD/////////////////////OAAAAAAAAAAwkPj/////////////////AP////////////////////8gAAAAAAAAAAAAINj///////////////8A/////////////////////xAAAAAAAAAAAAAAIPD//////////////wD/////////////////////uOz/4HgEAAAAAAAAhP//////////////AP///////////////////////////3wAAAAAAAAw//////////////8A////////////////////////////6AAAAAAAAAj//////////////wD/////////////////////////////AAAAAAAAAP//////////////AP//////////tJh8YEQoDNz//////+AAAAAAAAAY//////////////8A//////////88AAAAAAAAaP//////dAAAAAAAAEz//////////////wD//////////6QAAAAAAAAAdOD/5HQAAAAAAAAApP//////////////AP///////////CgAAAAAAAAAAAAAAAAAAAAAACD4//////////////8A////////////yAQAAAAAAAAAAAAAAAAAAAAEuP///////////////wD/////////////rAQAAAAAAAAAAAAAAAAABJD/////////////////AP//////////////zDQAAAAAAAAAAAAAACTA//////////////////8A/////////////////8BwOCAAAAAUNGi0/P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '4' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////////////nAAAAAAAAAD///////////////8A/////////////////////////8AEAAAAAAAAAP///////////////wD////////////////////////gGAAAAAAAAAAA////////////////AP//////////////////////9DAAAAAAAAAAAAD///////////////8A//////////////////////9UAAAAAAAAAAAAAP///////////////wD/////////////////////hAAAAAAAAAAAAAAA////////////////AP///////////////////7QAAAAAAAAAAAAAAAD///////////////8A///////////////////UDAAAAAAUAAAAAAAAAP///////////////wD/////////////////7CQAAAAABMAAAAAAAAAA////////////////AP////////////////xEAAAAAACU/wAAAAAAAAD///////////////8A////////////////cAAAAAAAZP//AAAAAAAAAP///////////////wD//////////////6AAAAAAADz8//8AAAAAAAAA////////////////AP/////////////IBAAAAAAc6P///wAAAAAAAAD///////////////8A////////////5BgAAAAADMz/////AAAAAAAAAP///////////////wD///////////g0AAAAAACk//////8AAAAAAAAA////////////////AP//////////XAAAAAAAfP///////wAAAAAAAAD///////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP///////////////////////////wAAAAAAAAD///////////////8A////////////////////////////AAAAAAAAAP///////////////wD///////////////////////////8AAAAAAAAA////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '5' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////8AAAAAAAAAAAAAAAAAAAAAAA//////////////8A///////////////MAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////6wAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////iAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////////9kAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////////0QAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////////IAAAAAAAYP////////////////////////////8A//////////////wAAAAAAAB8/////////////////////////////wD/////////////3AAAAAAAAIj/////////////////////////////AP////////////+4AAAAAAAAoLRYHAAEKGTE//////////////////8A/////////////5QAAAAAAAAQAAAAAAAAAABY9P///////////////wD/////////////dAAAAAAAAAAAAAAAAAAAAAA89P//////////////AP////////////9QAAAAAAAAAAAAAAAAAAAAAABg//////////////8A/////////////zAAAAAAAAAAAAAAAAAAAAAAAADQ/////////////wD/////////////IAAAAAAAAGjY/+h4BAAAAAAAAGz/////////////AP//////////////9NS0lHSc//////90AAAAAAAALP////////////8A/////////////////////////////9QAAAAAAAAE/////////////wD//////////////////////////////wAAAAAAAAD/////////////AP/////////////////////////////8AAAAAAAAEP////////////8A////////////pIRwWEAgDOD//////8wAAAAAAAA8/////////////wD///////////9EAAAAAAAAaP//////ZAAAAAAAAHz/////////////AP///////////6QAAAAAAAAAaOD/4GQAAAAAAAAE4P////////////8A/////////////CQAAAAAAAAAAAAAAAAAAAAAAGD//////////////wD/////////////yAQAAAAAAAAAAAAAAAAAAAAc7P//////////////AP//////////////rAwAAAAAAAAAAAAAAAAAGNj///////////////8A////////////////0EAAAAAAAAAAAAAAAFTo/////////////////wD//////////////////8h4QCAAAAAcQHzU////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '6' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////+0ZCwMAAAUNGjI////////////////////AP/////////////////EMAAAAAAAAAAAAABM6P////////////////8A////////////////lAQAAAAAAAAAAAAAAAAo6P///////////////wD//////////////6wAAAAAAAAAAAAAAAAAAABI////////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAACw//////////////8A/////////////3AAAAAAAAAoxP/YPAAAAAAAAEj//////////////wD////////////4EAAAAAAACOD////YDCBAVGiAoP//////////////AP///////////7gAAAAAAABY//////////////////////////////8A////////////eAAAAAAAAJT//////////////////////////////wD///////////9MAAAAAAAAvP/IXBgABCx03P//////////////////AP///////////ygAAAAAAADcdAAAAAAAAAAEiP////////////////8A////////////FAAAAAAAAFAAAAAAAAAAAAAAcP///////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAlP//////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAQ8P////////////8A////////////AAAAAAAAAABAyP/kZAAAAAAAAACQ/////////////wD///////////8MAAAAAAAALPj/////WAAAAAAAAET/////////////AP///////////yQAAAAAAACY///////MAAAAAAAAFP////////////8A////////////SAAAAAAAAMD///////wAAAAAAAAA/////////////wD///////////9wAAAAAAAAvP///////wAAAAAAAAD/////////////AP///////////7QAAAAAAACI///////UAAAAAAAAJP////////////8A////////////+AwAAAAAACDw/////2wAAAAAAABY/////////////wD/////////////cAAAAAAAADC8/Ox4AAAAAAAAAKj/////////////AP/////////////oEAAAAAAAAAAAAAAAAAAAAAAk/P////////////8A//////////////+oAAAAAAAAAAAAAAAAAAAABLj//////////////wD///////////////+QAAAAAAAAAAAAAAAAAACQ////////////////AP////////////////+0JAAAAAAAAAAAAAAkuP////////////////8A///////////////////8sGg0FAAADCxgqPz//////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '7' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAABP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAy4/////////////wD//////////////////////////+QUAAAAAAAEuP//////////////AP/////////////////////////8QAAAAAAAAKT///////////////8A/////////////////////////4wAAAAAAAB0/////////////////wD////////////////////////cCAAAAAAANPz/////////////////AP///////////////////////0QAAAAAAATY//////////////////8A//////////////////////+0AAAAAAAAeP///////////////////wD//////////////////////CQAAAAAABTw////////////////////AP////////////////////+gAAAAAAAAkP////////////////////8A/////////////////////ywAAAAAABDw/////////////////////wD///////////////////+4AAAAAAAAbP//////////////////////AP///////////////////1wAAAAAAADQ//////////////////////8A///////////////////4DAAAAAAAMP///////////////////////wD//////////////////7QAAAAAAAB8////////////////////////AP//////////////////aAAAAAAAAMj///////////////////////8A//////////////////8oAAAAAAAM/P///////////////////////wD/////////////////8AAAAAAAAET/////////////////////////AP////////////////+0AAAAAAAAcP////////////////////////8A/////////////////4wAAAAAAACY/////////////////////////wD/////////////////WAAAAAAAAMD/////////////////////////AP////////////////80AAAAAAAA4P////////////////////////8A/////////////////xAAAAAAAAD4/////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '8' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD////////////////////IdDQUAAAEIEiA1P//////////////////AP/////////////////gRAAAAAAAAAAAAAAAROD///////////////8A////////////////0BgAAAAAAAAAAAAAAAAAEMj//////////////wD///////////////AcAAAAAAAAAAAAAAAAAAAAHPD/////////////AP//////////////hAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A//////////////8sAAAAAAAAKMz/zCgAAAAAAAAs/////////////wD//////////////wAAAAAAAADM////zAAAAAAAAAD/////////////AP//////////////BAAAAAAAAP//////AAAAAAAABP////////////8A//////////////8sAAAAAAAAzP///9QAAAAAAAAw/////////////wD//////////////3wAAAAAAAAoyP/YNAAAAAAAAIT/////////////AP//////////////7BgAAAAAAAAAAAAAAAAAAAAc8P////////////8A////////////////xBgAAAAAAAAAAAAAAAAAGNj//////////////wD/////////////////tAQAAAAAAAAAAAAAAACo////////////////AP///////////////HAAAAAAAAAAAAAAAAAAAAB8//////////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB8/////////////wD/////////////wAAAAAAAAABk4P/UWAAAAAAAAATQ////////////AP////////////9UAAAAAAAAaP//////XAAAAAAAAGT///////////8A/////////////xgAAAAAAADg///////cAAAAAAAAJP///////////wD/////////////AAAAAAAAAP////////8AAAAAAAAA////////////AP////////////8AAAAAAAAA4P//////3AAAAAAAAAT///////////8A/////////////ygAAAAAAABg//////9cAAAAAAAALP///////////wD/////////////ZAAAAAAAAABY1P/cXAAAAAAAAABw////////////AP/////////////QAAAAAAAAAAAAAAAAAAAAAAAABNz///////////8A//////////////9gAAAAAAAAAAAAAAAAAAAAAAB0/////////////wD///////////////Q8AAAAAAAAAAAAAAAAAAAAUPz/////////////AP////////////////x4CAAAAAAAAAAAAAAAEIT8//////////////8A///////////////////smFQwGAAAABg0ZKT0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - '9' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////////////ysYCwMAAAUNGiw/P//////////////////AP////////////////+4JAAAAAAAAAAAAAAkuP////////////////8A////////////////lAQAAAAAAAAAAAAAAAAAkP///////////////wD//////////////8AEAAAAAAAAAAAAAAAAAAAAqP//////////////AP/////////////8JAAAAAAAAAAAAAAAAAAAAAAQ7P////////////8A/////////////6wAAAAAAAAAfOz8vCwAAAAAAABw/////////////wD/////////////WAAAAAAAAHD/////7BgAAAAAAAz4////////////AP////////////8kAAAAAAAA1P//////hAAAAAAAALT///////////8A/////////////wAAAAAAAAD///////+4AAAAAAAAcP///////////wD/////////////AAAAAAAAAPz//////8AAAAAAAABI////////////AP////////////8UAAAAAAAAzP//////lAAAAAAAACT///////////8A/////////////0QAAAAAAABY//////gsAAAAAAAADP///////////wD/////////////kAAAAAAAAABw5P/IPAAAAAAAAAAA////////////AP/////////////wEAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A//////////////+UAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////9wAAAAAAAAAAAAAFAAAAAAAAAU////////////AP////////////////+IBAAAAAAAAABw3AAAAAAAACj///////////8A///////////////////cdCwEABhcxP+8AAAAAAAATP///////////wD//////////////////////////////5AAAAAAAAB4////////////AP//////////////////////////////UAAAAAAAALj///////////8A//////////////+kgGxUQCAM2P///+AIAAAAAAAQ+P///////////wD//////////////0gAAAAAAAA42P/EKAAAAAAAAHD/////////////AP//////////////sAAAAAAAAAAAAAAAAAAAAAAQ6P////////////8A////////////////TAAAAAAAAAAAAAAAAAAAAKz//////////////wD////////////////oKAAAAAAAAAAAAAAAAASU////////////////AP/////////////////sUAAAAAAAAAAAAAAwxP////////////////8A////////////////////yHA0FAAADCxktP///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'A' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////+QAAAAAAAAAAAAAAOT/////////////////AP//////////////////kAAAAAAAAAAAAAAAkP////////////////8A//////////////////88AAAAAAAAAAAAAAA8/////////////////wD/////////////////5AAAAAAAAAAAAAAAAADk////////////////AP////////////////+QAAAAAAAAAAAAAAAAAJD///////////////8A/////////////////zwAAAAAAAAAAAAAAAAAPP///////////////wD////////////////kAAAAAAAAAAgAAAAAAAAA5P//////////////AP///////////////5AAAAAAAAAAgAAAAAAAAACQ//////////////8A////////////////PAAAAAAAAAz8HAAAAAAAADz//////////////wD//////////////+QAAAAAAAAAWP9kAAAAAAAAANz/////////////AP//////////////kAAAAAAAAACk/7wAAAAAAAAAhP////////////8A//////////////88AAAAAAAABOz//BQAAAAAAAAw/////////////wD/////////////4AAAAAAAAAA8////ZAAAAAAAAADc////////////AP////////////+EAAAAAAAAAIj///+8AAAAAAAAAIT///////////8A/////////////zAAAAAAAAAA2P////wQAAAAAAAAMP///////////wD////////////cAAAAAAAAACT//////1wAAAAAAAAA3P//////////AP///////////4QAAAAAAAAAAAAAAAAAAAAAAAAAAACE//////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAAAAAADD//////////wD//////////9wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAANz/////////AP//////////hAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAhP////////8A//////////8wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAw/////////wD/////////3AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADc////////AP////////+EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIT///////8A/////////zAAAAAAAAAAhP///////////2QAAAAAAAAAMP///////wD////////cAAAAAAAAAADM////////////vAAAAAAAAAAA3P//////AP///////4QAAAAAAAAAHP/////////////4DAAAAAAAAACE//////8A////////MAAAAAAAAABk//////////////9cAAAAAAAAADD//////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'B' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAEDh83P///////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAEhP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAeP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAABY////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAABT///////////8A//////////8AAAAAAAAAAP/////4zEwAAAAAAAAAAP///////////wD//////////wAAAAAAAAAA////////7AAAAAAAAAAQ////////////AP//////////AAAAAAAAAAD////////sAAAAAAAAAEj///////////8A//////////8AAAAAAAAAAP/////4zEQAAAAAAAAAtP///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAFz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAiA/P////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAIjPj//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAGKz/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAJT///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAABNz//////////wD//////////wAAAAAAAAAA///////sqCAAAAAAAAAAbP//////////AP//////////AAAAAAAAAAD/////////yAAAAAAAAAAs//////////8A//////////8AAAAAAAAAAP//////////AAAAAAAAAAT//////////wD//////////wAAAAAAAAAA/////////7wAAAAAAAAAAP//////////AP//////////AAAAAAAAAAD//////+ikGAAAAAAAAAAY//////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFT//////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsP//////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAADj///////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAc6P///////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAATOj/////////////AP//////////AAAAAAAAAAAAAAAAAAAEIEBkkNj///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'C' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////////////5JRULBAAAAgkTIDQ//////////////////8A////////////////1FAAAAAAAAAAAAAAAABAyP///////////////wD//////////////4gEAAAAAAAAAAAAAAAAAAAElP//////////////AP////////////9wAAAAAAAAAAAAAAAAAAAAAAAAlP////////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAEyP///////////wD//////////9wIAAAAAAAAAAAAAAAAAAAAAAAAAAAw////////////AP//////////WAAAAAAAAAAAWMz/8JwQAAAAAAAAAACw//////////8A/////////+wEAAAAAAAAAID//////9QMAAAAAAAAAET//////////wD/////////nAAAAAAAAAAo/P///////3wAAAAABDBspP//////////AP////////9gAAAAAAAAAIz/////////3BxQjMT0//////////////8A/////////zQAAAAAAAAAzP///////////////////////////////wD/////////GAAAAAAAAADo////////////////////////////////AP////////8AAAAAAAAAAP////////////////////////////////8A/////////wAAAAAAAAAA/////////////////////////////////wD/////////AAAAAAAAAAD/////////////////////////////////AP////////8cAAAAAAAAAOj///////////////////////////////8A/////////zgAAAAAAAAA0P/////////kIGio7P///////////////wD/////////bAAAAAAAAACg/////////5wAAAAAMHS49P//////////AP////////+oAAAAAAAAAEz/////////PAAAAAAAAAAc//////////8A//////////QIAAAAAAAAALz//////6QAAAAAAAAAAGT//////////wD//////////3AAAAAAAAAADIzo/+SEBAAAAAAAAAAAyP//////////AP//////////7BAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////rAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD/////////////fAAAAAAAAAAAAAAAAAAAAAAAAJz/////////////AP//////////////iAQAAAAAAAAAAAAAAAAAAASY//////////////8A////////////////yEAAAAAAAAAAAAAAAAA8yP///////////////wD//////////////////9yIUCwQAAAAIEB4yP//////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'D' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////////8AAAAAAAAAAAAAAAAADChQkOT/////////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAABGjw//////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAACDY/////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAABjk////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAKj//////////wD///////////8AAAAAAAAAAP///+isSAAAAAAAAAAANP//////////AP///////////wAAAAAAAAAA////////hAAAAAAAAAAA2P////////8A////////////AAAAAAAAAAD/////////MAAAAAAAAACQ/////////wD///////////8AAAAAAAAAAP////////+MAAAAAAAAAFj/////////AP///////////wAAAAAAAAAA/////////8gAAAAAAAAAMP////////8A////////////AAAAAAAAAAD/////////5AAAAAAAAAAY/////////wD///////////8AAAAAAAAAAP//////////AAAAAAAAAAD/////////AP///////////wAAAAAAAAAA//////////8AAAAAAAAAAP////////8A////////////AAAAAAAAAAD//////////wAAAAAAAAAA/////////wD///////////8AAAAAAAAAAP/////////wAAAAAAAAABD/////////AP///////////wAAAAAAAAAA/////////9QAAAAAAAAAJP////////8A////////////AAAAAAAAAAD/////////qAAAAAAAAABI/////////wD///////////8AAAAAAAAAAP////////9QAAAAAAAAAHj/////////AP///////////wAAAAAAAAAA////////uAAAAAAAAAAAvP////////8A////////////AAAAAAAAAAD////w0HwEAAAAAAAAACT8/////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAADz8//////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAY6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAKNz/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAACHT0//////////////8A////////////AAAAAAAAAAAAAAAAABg4bKj0/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'E' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAD///////////////////////////////8A//////////8AAAAAAAAAAP///////////////////////////////wD//////////wAAAAAAAAAA////////////////////////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'F' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'G' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////////////////MB8TCgQAAAACCA4YJzs////////////////AP///////////////JQcAAAAAAAAAAAAAAAAAAhw8P////////////8A/////////////9gwAAAAAAAAAAAAAAAAAAAAAAAk2P///////////wD////////////EDAAAAAAAAAAAAAAAAAAAAAAAAAAc7P//////////AP//////////2AwAAAAAAAAAAAAAAAAAAAAAAAAAAABY//////////8A//////////wwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQ/////////wD/////////kAAAAAAAAAAAEHzQ/P/gmCAAAAAAAAAAAFz/////////AP////////wcAAAAAAAAACjg////////8CwAAAAAAAAgWP////////8A////////vAAAAAAAAAAI2P//////////yBRAcJjI8P///////////wD///////94AAAAAAAAAGD/////////////////////////////////AP///////0AAAAAAAAAAsP////////////////////////////////8A////////IAAAAAAAAADc/////////////////////////////////wD///////8AAAAAAAAAAP///////wAAAAAAAAAAAAAAAAD/////////AP///////wAAAAAAAAAA////////AAAAAAAAAAAAAAAAAP////////8A////////AAAAAAAAAAD///////8AAAAAAAAAAAAAAAAA/////////wD///////8gAAAAAAAAAOD//////wAAAAAAAAAAAAAAAAD/////////AP///////0AAAAAAAAAAtP//////AAAAAAAAAAAAAAAAAP////////8A////////cAAAAAAAAABw//////8AAAAAAAAAAAAAAAAA/////////wD///////+8AAAAAAAAABDs////////////AAAAAAAAAAD/////////AP////////wYAAAAAAAAADz0//////////AAAAAAAAAAAP////////8A/////////5AAAAAAAAAAACCY4P//3KhcCAAAAAAAAAAA/////////wD/////////+CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////AP//////////xAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIP////////8A////////////rAQAAAAAAAAAAAAAAAAAAAAAAAAAAGTw/////////wD/////////////vBQAAAAAAAAAAAAAAAAAAAAAADjI////////////AP//////////////8HAQAAAAAAAAAAAAAAAAAEiw//////////////8A//////////////////iwcEAgBAAABCA4aKDk/////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'H' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'I' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAP///////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAA////////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAD///////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'J' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAD//////////////wD///////////////////////////8AAAAAAAAAAP//////////////AP///////////////////////////wAAAAAAAAAA//////////////8A////////////////////////////AAAAAAAAAAj//////////////wD//////////+zMrIxwUDAQ//////wAAAAAAAAAIP//////////////AP//////////DAAAAAAAAADo////2AAAAAAAAAA0//////////////8A//////////8wAAAAAAAAAKj///+YAAAAAAAAAFj//////////////wD//////////2gAAAAAAAAAIND/yBgAAAAAAAAAkP//////////////AP//////////vAAAAAAAAAAAAAAAAAAAAAAAAADc//////////////8A////////////MAAAAAAAAAAAAAAAAAAAAAAAUP///////////////wD////////////EBAAAAAAAAAAAAAAAAAAAABjk////////////////AP////////////+sBAAAAAAAAAAAAAAAAAAY2P////////////////8A///////////////EMAAAAAAAAAAAAAAAVOj//////////////////wD/////////////////vHBAIAAAABg8fNT/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'K' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////8AAAAAAAAAAP//////////wAQAAAAAAAAAAABw////////AP///////wAAAAAAAAAA/////////9AMAAAAAAAAAAAAcP////////8A////////AAAAAAAAAAD////////cGAAAAAAAAAAAAHD//////////wD///////8AAAAAAAAAAP//////6CgAAAAAAAAAAABs////////////AP///////wAAAAAAAAAA//////Q0AAAAAAAAAAAAVPz///////////8A////////AAAAAAAAAAD////8RAAAAAAAAAAAAFT8/////////////wD///////8AAAAAAAAAAP///1gAAAAAAAAAAABU/P//////////////AP///////wAAAAAAAAAA//9wAAAAAAAAAAAASPz///////////////8A////////AAAAAAAAAAD/jAAAAAAAAAAAADz0/////////////////wD///////8AAAAAAAAAAKQAAAAAAAAAAAA89P//////////////////AP///////wAAAAAAAAAABAAAAAAAAAAAFPT///////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAApP///////////////////wD///////8AAAAAAAAAAAAAAAAAAAAAAAAU8P//////////////////AP///////wAAAAAAAAAAAAAAAAAAAAAAAABk//////////////////8A////////AAAAAAAAAAAAAAAAAAAAAAAAAADE/////////////////wD///////8AAAAAAAAAAAAAAAAoEAAAAAAAACz8////////////////AP///////wAAAAAAAAAAAAAAGNiAAAAAAAAAAIj///////////////8A////////AAAAAAAAAAAAABjY//gYAAAAAAAACOD//////////////wD///////8AAAAAAAAAAAAY2P///5wAAAAAAAAASP//////////////AP///////wAAAAAAAAAAGNj//////CgAAAAAAAAAqP////////////8A////////AAAAAAAAAADI////////sAAAAAAAAAAc8P///////////wD///////8AAAAAAAAAAP//////////QAAAAAAAAABs////////////AP///////wAAAAAAAAAA///////////IAAAAAAAAAATI//////////8A////////AAAAAAAAAAD///////////9YAAAAAAAAADD8/////////wD///////8AAAAAAAAAAP///////////9wEAAAAAAAAAJD/////////AP///////wAAAAAAAAAA/////////////3AAAAAAAAAADOT///////8A////////AAAAAAAAAAD/////////////7BAAAAAAAAAAUP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'L' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAD/////////////////////////////AP////////////8AAAAAAAAAAP////////////////////////////8A/////////////wAAAAAAAAAA/////////////////////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////8AAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////wAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////////AAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'M' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////8AAAAAAAAAAAAAAHz//////3wAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAATP//////UAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAc//////8cAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAADw////8AAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAAAAAAALz////AAAAAAAAAAAAAAAAA////////AP//////AAAAAAAAAAAAAAAAkP///5AAAAAAAAAAAAAAAAD///////8A//////8AAAAAAAAAAAAAAABc////ZAAAAAAAAAAAAAAAAP///////wD//////wAAAAAAAAAoAAAAADD///8wAAAAACQAAAAAAAAA////////AP//////AAAAAAAAAFwAAAAABPz//AgAAAAAXAAAAAAAAAD///////8A//////8AAAAAAAAAkAAAAAAA0P/UAAAAAACQAAAAAAAAAP///////wD//////wAAAAAAAADMAAAAAACg/6gAAAAAAMQAAAAAAAAA////////AP//////AAAAAAAAAPgEAAAAAHD/dAAAAAAE+AAAAAAAAAD///////8A//////8AAAAAAAAA/zQAAAAAQP9IAAAAADD/AAAAAAAAAP///////wD//////wAAAAAAAAD/bAAAAAAQ/xQAAAAAaP8AAAAAAAAA////////AP//////AAAAAAAAAP+gAAAAAADQAAAAAACc/wAAAAAAAAD///////8A//////8AAAAAAAAA/9QAAAAAAGgAAAAAAND/AAAAAAAAAP///////wD//////wAAAAAAAAD//wwAAAAAFAAAAAAM/P8AAAAAAAAA////////AP//////AAAAAAAAAP//RAAAAAAAAAAAADz//wAAAAAAAAD///////8A//////8AAAAAAAAA//94AAAAAAAAAAAAcP//AAAAAAAAAP///////wD//////wAAAAAAAAD//7AAAAAAAAAAAACo//8AAAAAAAAA////////AP//////AAAAAAAAAP//5AAAAAAAAAAAANz//wAAAAAAAAD///////8A//////8AAAAAAAAA////HAAAAAAAAAAQ////AAAAAAAAAP///////wD//////wAAAAAAAAD///9QAAAAAAAAAEz///8AAAAAAAAA////////AP//////AAAAAAAAAP///4gAAAAAAAAAfP///wAAAAAAAAD///////8A//////8AAAAAAAAA////vAAAAAAAAACw////AAAAAAAAAP///////wD//////wAAAAAAAAD////wAAAAAAAAAOz///8AAAAAAAAA////////AP//////AAAAAAAAAP////8sAAAAAAAc/////wAAAAAAAAD///////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'N' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAALD/////////////AAAAAAAAAP//////////AP////////8AAAAAAAAAFOj///////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAASP///////////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAkP//////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAI1P////////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAw+P///////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAABw////////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAC8//////8AAAAAAAAA//////////8A/////////wAAAAAAAAAAAAAAABzs/////wAAAAAAAAD//////////wD/////////AAAAAAAAAAAAAAAAAFD/////AAAAAAAAAP//////////AP////////8AAAAAAAAAAAAAAAAAAJz///8AAAAAAAAA//////////8A/////////wAAAAAAAAAUAAAAAAAADNz//wAAAAAAAAD//////////wD/////////AAAAAAAAALQAAAAAAAAANPz/AAAAAAAAAP//////////AP////////8AAAAAAAAA/2wAAAAAAAAAfP8AAAAAAAAA//////////8A/////////wAAAAAAAAD/+CwAAAAAAAAExAAAAAAAAAD//////////wD/////////AAAAAAAAAP//0AQAAAAAAAAgAAAAAAAAAP//////////AP////////8AAAAAAAAA////jAAAAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////RAAAAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP/////kFAAAAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA//////+sAAAAAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD///////9kAAAAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP////////QkAAAAAAAAAAAAAP//////////AP////////8AAAAAAAAA/////////8wEAAAAAAAAAAAA//////////8A/////////wAAAAAAAAD//////////4QAAAAAAAAAAAD//////////wD/////////AAAAAAAAAP///////////DwAAAAAAAAAAP//////////AP////////8AAAAAAAAA////////////4BAAAAAAAAAA//////////8A/////////wAAAAAAAAD/////////////qAAAAAAAAAD//////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'O' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A///////////////////0qGw4HAAAABw4aKT0/////////////////wD////////////////wcAwAAAAAAAAAAAAAAAho6P//////////////AP//////////////uBQAAAAAAAAAAAAAAAAAAAAMoP////////////8A/////////////6AEAAAAAAAAAAAAAAAAAAAAAAAAkP///////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP//////////8BQAAAAAAAAAAAAAAAAAAAAAAAAAAAAM5P////////8A//////////9wAAAAAAAAAAAsrPD/7KQsAAAAAAAAAABg/////////wD/////////+BAAAAAAAAAAUPj///////hQAAAAAAAAAAjs////////AP////////+sAAAAAAAAABDw//////////AYAAAAAAAAAKD///////8A/////////2wAAAAAAAAAdP///////////3wAAAAAAAAAYP///////wD/////////OAAAAAAAAAC4////////////xAAAAAAAAAAw////////AP////////8cAAAAAAAAAOD////////////oAAAAAAAAABT///////8A/////////wAAAAAAAAAA//////////////8AAAAAAAAAAP///////wD/////////AAAAAAAAAAD//////////////wAAAAAAAAAA////////AP////////8AAAAAAAAAAP/////////////8AAAAAAAAAAD///////8A/////////xwAAAAAAAAA5P///////////+AAAAAAAAAAHP///////wD/////////NAAAAAAAAAC8////////////uAAAAAAAAAA4////////AP////////9oAAAAAAAAAHj///////////98AAAAAAAAAGT///////8A/////////6gAAAAAAAAAGPD/////////+BgAAAAAAAAApP///////wD/////////9AwAAAAAAAAAUPz///////xcAAAAAAAAAAjs////////AP//////////cAAAAAAAAAAALKjs//CwOAAAAAAAAAAAYP////////8A///////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzk/////////wD///////////+4BAAAAAAAAAAAAAAAAAAAAAAAAAAAoP//////////AP////////////+QAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A//////////////+sEAAAAAAAAAAAAAAAAAAAAAyg/////////////wD////////////////oZAgAAAAAAAAAAAAAAARg4P//////////////AP//////////////////9KhsOCAAAAAUMFyc7P////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'P' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////////wAAAAAAAAAAAAAAAAAACCxguP////////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAOOD//////////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAGOD/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAARP////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAxP///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAABo////////////AP///////////wAAAAAAAAAA////6JwMAAAAAAAAADD///////////8A////////////AAAAAAAAAAD//////6AAAAAAAAAADP///////////wD///////////8AAAAAAAAAAP//////9AAAAAAAAAAA////////////AP///////////wAAAAAAAAAA///////0AAAAAAAAAAD///////////8A////////////AAAAAAAAAAD//////5gAAAAAAAAAHP///////////wD///////////8AAAAAAAAAAP///9iICAAAAAAAAABI////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAJD///////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////8AAAAAAAAAAAAAAAAAAAAAAAAAAIT/////////////AP///////////wAAAAAAAAAAAAAAAAAAAAAAAABU/P////////////8A////////////AAAAAAAAAAAAAAAAAAAAAAAIhPz//////////////wD///////////8AAAAAAAAAAAAAAAAABCRMkOz/////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP///////////wAAAAAAAAAA//////////////////////////////8A////////////AAAAAAAAAAD//////////////////////////////wD///////////8AAAAAAAAAAP//////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'Q' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////SoaDQcAAAAHDhoqPT///////////////////8A//////////////BwDAAAAAAAAAAAAAAACHDo/////////////////wD///////////+4FAAAAAAAAAAAAAAAAAAAABCo////////////////AP//////////nAQAAAAAAAAAAAAAAAAAAAAAAACQ//////////////8A/////////7gEAAAAAAAAAAAAAAAAAAAAAAAAAACg/////////////wD////////wFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzo////////////AP///////3AAAAAAAAAAACyo8P/sqCwAAAAAAAAAAGT///////////8A///////4EAAAAAAAAABM+P///////FQAAAAAAAAACPT//////////wD//////7AAAAAAAAAAFPD/////////9BgAAAAAAAAApP//////////AP//////bAAAAAAAAAB4////////////fAAAAAAAAABk//////////8A//////84AAAAAAAAALz///////////+8AAAAAAAAADT//////////wD//////xwAAAAAAAAA6P///////////+QAAAAAAAAAHP//////////AP//////AAAAAAAAAAD//////////////wAAAAAAAAAA//////////8A//////8AAAAAAAAAAP//////////////AAAAAAAAAAD//////////wD//////wAAAAAAAAAA/P////////////8AAAAAAAAAAP//////////AP//////GAAAAAAAAADg////////////4AAAAAAAAAAc//////////8A//////84AAAAAAAAALT////MJHTo//+8AAAAAAAAADT//////////wD//////2wAAAAAAAAAdP///2AAABCg/3wAAAAAAAAAZP//////////AP//////rAAAAAAAAAAY9P/sCAAAAABMGAAAAAAAAACk//////////8A///////4EAAAAAAAAABU/P+0OAAAAAAAAAAAAAAACPT//////////wD///////94AAAAAAAAAAA4sPD/gAAAAAAAAAAAAABk////////////AP////////AcAAAAAAAAAAAAAAAAAAAAAAAAAAAADOT///////////8A/////////7wEAAAAAAAAAAAAAAAAAAAAAAAAAACQ/////////////wD//////////6wEAAAAAAAAAAAAAAAAAAAAAAAAABSs////////////AP///////////7gUAAAAAAAAAAAAAAAAAAAAAAAAAABAwP////////8A//////////////BwDAAAAAAAAAAAAAAABAgAAAAAAAA8/////////wD////////////////0qGg0GAAAABgwXJjkxBgAAAAAALD/////////AP//////////////////////////////////5DQAAAAk/P////////8A////////////////////////////////////+GwAAJD//////////wD//////////////////////////////////////8A49P//////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'R' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////wAAAAAAAAAAAAAAAAAAAAQgOGSk+P///////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAcuP//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAEsP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ6P///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADD///////////8A/////////wAAAAAAAAAA///////svDgAAAAAAAAACP///////////wD/////////AAAAAAAAAAD/////////7AAAAAAAAAAA////////////AP////////8AAAAAAAAAAP/////////cAAAAAAAAABD///////////8A/////////wAAAAAAAAAA//////DQoCQAAAAAAAAAQP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAACU////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAIPj///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAzU/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAA02P//////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAxctPz///////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAEDY/////////////////wD/////////AAAAAAAAAAD/9LAsAAAAAAAAAAzc////////////////AP////////8AAAAAAAAAAP///+wkAAAAAAAAADD8//////////////8A/////////wAAAAAAAAAA/////8QAAAAAAAAAAJD//////////////wD/////////AAAAAAAAAAD//////1QAAAAAAAAAFPD/////////////AP////////8AAAAAAAAAAP//////3AQAAAAAAAAAgP////////////8A/////////wAAAAAAAAAA////////aAAAAAAAAAAM6P///////////wD/////////AAAAAAAAAAD////////oCAAAAAAAAABs////////////AP////////8AAAAAAAAAAP////////+AAAAAAAAAAATc//////////8A/////////wAAAAAAAAAA//////////AUAAAAAAAAAFj//////////wD/////////AAAAAAAAAAD//////////5AAAAAAAAAAAND/////////AP////////8AAAAAAAAAAP//////////+CQAAAAAAAAAQP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'S' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP/////////////////8vHBEIAgAAAQgQHC8/P////////////////8A////////////////pCQAAAAAAAAAAAAAAAAcoP///////////////wD//////////////FwAAAAAAAAAAAAAAAAAAAAAXP//////////////AP////////////9oAAAAAAAAAAAAAAAAAAAAAAAAhP////////////8A////////////zAAAAAAAAAAAAAAAAAAAAAAAAAAI6P///////////wD///////////9cAAAAAAAAAAAAAAAAAAAAAAAAAACA////////////AP///////////xgAAAAAAAAAUOD/8KwkAAAAAAAAADj///////////8A////////////AAAAAAAAAAD0/////8wABCAgICxASP///////////wD///////////8MAAAAAAAAAMz/////////////////////////////AP///////////0AAAAAAAAAACFiQxPT///////////////////////8A////////////oAAAAAAAAAAAAAAAADBwtPT//////////////////wD////////////8QAAAAAAAAAAAAAAAAAAACFTA////////////////AP/////////////oOAAAAAAAAAAAAAAAAAAAAABM6P////////////8A///////////////4fAgAAAAAAAAAAAAAAAAAAAAY2P///////////wD/////////////////7IwwAAAAAAAAAAAAAAAAAAAo+P//////////AP/////////////////////koGw0BAAAAAAAAAAAAACU//////////8A///////////////////////////4uFgAAAAAAAAAADz//////////wD//////////2BgSEA0IBwA6P///////5QAAAAAAAAADP//////////AP//////////JAAAAAAAAACc/////////AAAAAAAAAAA//////////8A//////////9YAAAAAAAAACDo///////AAAAAAAAAABT//////////wD//////////6QAAAAAAAAAACCk7P/snBQAAAAAAAAAUP//////////AP//////////+BAAAAAAAAAAAAAAAAAAAAAAAAAAAACs//////////8A////////////kAAAAAAAAAAAAAAAAAAAAAAAAAAAOP///////////wD////////////8RAAAAAAAAAAAAAAAAAAAAAAAABjc////////////AP/////////////0PAAAAAAAAAAAAAAAAAAAAAAg2P////////////8A///////////////8hBQAAAAAAAAAAAAAAAAMdPT//////////////wD/////////////////+LRwSCAMAAAAHDhoqPT/////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'T' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD///////////////////8AAAAAAAAAAP//////////////////////AP///////////////////wAAAAAAAAAA//////////////////////8A////////////////////AAAAAAAAAAD//////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'U' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////AAAAAAAAAAD///////////8AAAAAAAAAAP//////////AP////////8AAAAAAAAAAP///////////wAAAAAAAAAA//////////8A/////////wAAAAAAAAAA////////////AAAAAAAAAAD//////////wD/////////JAAAAAAAAADk/////////+gAAAAAAAAAHP//////////AP////////9MAAAAAAAAAJz/////////nAAAAAAAAABE//////////8A/////////4gAAAAAAAAAHOj//////+ggAAAAAAAAAHz//////////wD/////////0AAAAAAAAAAAIJzs/+ykIAAAAAAAAAAA0P//////////AP//////////QAAAAAAAAAAAAAAAAAAAAAAAAAAAAED///////////8A///////////IBAAAAAAAAAAAAAAAAAAAAAAAAAAE0P///////////wD///////////+YAAAAAAAAAAAAAAAAAAAAAAAAAJj/////////////AP////////////+UBAAAAAAAAAAAAAAAAAAAAASU//////////////8A///////////////IPAAAAAAAAAAAAAAAAAAwyP///////////////wD/////////////////0IxYOCAIAAAEIEiAyP//////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'V' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD//////zAAAAAAAAAAYP//////////////ZAAAAAAAAAAw////////AP//////kAAAAAAAAAAU/P////////////8UAAAAAAAAAJD///////8A///////oBAAAAAAAAADE////////////xAAAAAAAAAAE7P///////wD///////9MAAAAAAAAAHD///////////94AAAAAAAAAEz/////////AP///////6gAAAAAAAAAJP///////////yQAAAAAAAAArP////////8A////////+BAAAAAAAAAA1P/////////YAAAAAAAAABT4/////////wD/////////aAAAAAAAAACE/////////4QAAAAAAAAAbP//////////AP/////////EAAAAAAAAADT/////////OAAAAAAAAADM//////////8A//////////8kAAAAAAAAAOT//////+QAAAAAAAAAKP///////////wD//////////4QAAAAAAAAAmP//////nAAAAAAAAACI////////////AP//////////5AAAAAAAAABE//////9EAAAAAAAABOT///////////8A////////////QAAAAAAAAAT0////9AgAAAAAAABI/////////////wD///////////+gAAAAAAAAAKT///+kAAAAAAAAAKj/////////////AP////////////QIAAAAAAAAXP///1wAAAAAAAAM+P////////////8A/////////////1wAAAAAAAAM+P/8DAAAAAAAAGT//////////////wD/////////////vAAAAAAAAAC8/7wAAAAAAAAAxP//////////////AP//////////////HAAAAAAAAGj/aAAAAAAAACT///////////////8A//////////////94AAAAAAAAHP8cAAAAAAAAhP///////////////wD//////////////9gAAAAAAAAAkAAAAAAAAADk////////////////AP///////////////zgAAAAAAAAQAAAAAAAAQP////////////////8A////////////////lAAAAAAAAAAAAAAAAACg/////////////////wD////////////////sCAAAAAAAAAAAAAAADPT/////////////////AP////////////////9QAAAAAAAAAAAAAABg//////////////////8A/////////////////7AAAAAAAAAAAAAAAMD//////////////////wD//////////////////BQAAAAAAAAAAAAc////////////////////AP//////////////////cAAAAAAAAAAAAHz///////////////////8A///////////////////MAAAAAAAAAAAA3P///////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'W' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//8cAAAAAAAAALz/////4AAAAAAAAAAA6P////+8AAAAAAAAABz//wD//1QAAAAAAAAAjP////+gAAAAAAAAAACo/////4wAAAAAAAAAUP//AP//jAAAAAAAAABU/////2AAAAAAAAAAAGj/////VAAAAAAAAACM//8A///EAAAAAAAAACT/////IAAAAAAAAAAAKP////8kAAAAAAAAAMT//wD///gEAAAAAAAAAPD//+AAAAAAAAAAAAAA6P//8AAAAAAAAAAE9P//AP///zAAAAAAAAAAvP//oAAAAAAAAAAAAACo//+8AAAAAAAAADD///8A////bAAAAAAAAACM//9gAAAAAAAAAAAAAGT//4wAAAAAAAAAaP///wD///+kAAAAAAAAAFT//yAAAAAAAAAAAAAAIP//VAAAAAAAAACc////AP///9gAAAAAAAAAJP/gAAAAAAAAAAAAAAAA4P8kAAAAAAAAANT///8A/////xAAAAAAAAAA8KAAAAAAAAAAAAAAAACg8AAAAAAAAAAQ/////wD/////TAAAAAAAAAC8YAAAAAAAAAAAAAAAAGC8AAAAAAAAAET/////AP////+AAAAAAAAAAIwgAAAAAAAAAAAAAAAAIIwAAAAAAAAAfP////8A/////7gAAAAAAAAANAAAAAAAACwwAAAAAAAANAAAAAAAAACw/////wD/////8AAAAAAAAAAAAAAAAAAAdHgAAAAAAAAAAAAAAAAAAOz/////AP//////KAAAAAAAAAAAAAAAAAC4vAAAAAAAAAAAAAAAAAAg//////8A//////9gAAAAAAAAAAAAAAAACPj4CAAAAAAAAAAAAAAAAFj//////wD//////5QAAAAAAAAAAAAAAABE//9IAAAAAAAAAAAAAAAAkP//////AP//////0AAAAAAAAAAAAAAAAIj//4wAAAAAAAAAAAAAAADI//////8A///////8DAAAAAAAAAAAAAAAzP//1AAAAAAAAAAAAAAABPj//////wD///////88AAAAAAAAAAAAABT/////GAAAAAAAAAAAAAA0////////AP///////3QAAAAAAAAAAAAAWP////9gAAAAAAAAAAAAAHD///////8A////////sAAAAAAAAAAAAACg/////6QAAAAAAAAAAAAApP///////wD////////kAAAAAAAAAAAAAOT/////6AAAAAAAAAAAAADc////////AP////////8cAAAAAAAAAAAo////////MAAAAAAAAAAAEP////////8A/////////1QAAAAAAAAAAHD///////94AAAAAAAAAABM/////////wD/////////jAAAAAAAAAAAtP///////7wAAAAAAAAAAID/////////AP/////////EAAAAAAAAAAT0////////+AgAAAAAAAAAuP////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'X' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD///////9UAAAAAAAAAKz///////////+sAAAAAAAAAFD/////////AP///////+QQAAAAAAAAFOT/////////8BwAAAAAAAAM5P////////8A/////////5gAAAAAAAAATP////////9kAAAAAAAAAJD//////////wD//////////0AAAAAAAAAAoP//////wAAAAAAAAAA0/P//////////AP//////////2AgAAAAAAAAQ4P////gkAAAAAAAABMz///////////8A////////////iAAAAAAAAABA////dAAAAAAAAABw/////////////wD////////////8MAAAAAAAAACU/9AEAAAAAAAAHPD/////////////AP/////////////IBAAAAAAAAAzYMAAAAAAAAACs//////////////8A//////////////90AAAAAAAAABAAAAAAAAAATP///////////////wD///////////////QgAAAAAAAAAAAAAAAAAAzg////////////////AP///////////////7wAAAAAAAAAAAAAAAAAjP////////////////8A/////////////////2AAAAAAAAAAAAAAADD8/////////////////wD/////////////////7BQAAAAAAAAAAAAEyP//////////////////AP/////////////////gDAAAAAAAAAAAAAjY//////////////////8A/////////////////0AAAAAAAAAAAAAAADj8/////////////////wD///////////////+UAAAAAAAAAAAAAAAAAJD/////////////////AP//////////////4AwAAAAAAAAAAAAAAAAADOD///////////////8A//////////////9AAAAAAAAAAAAAAAAAAAAAQP///////////////wD/////////////nAAAAAAAAAAAWAAAAAAAAAAAlP//////////////AP///////////+QQAAAAAAAAAGD/YAAAAAAAAAAM4P////////////8A////////////TAAAAAAAAAAs9P/0LAAAAAAAAABM/////////////wD//////////6AAAAAAAAAADNT////UDAAAAAAAAACg////////////AP/////////kEAAAAAAAAACg//////+gAAAAAAAAABDk//////////8A/////////0wAAAAAAAAAYP////////9gAAAAAAAAAEz//////////wD///////+oAAAAAAAAACz0//////////QsAAAAAAAAAKT/////////AP//////7BQAAAAAAAAM1P///////////9QMAAAAAAAAFOz///////8A//////9UAAAAAAAAAKD//////////////6AAAAAAAAAAVP///////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'Y' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP///////1QAAAAAAAAAAGj//////////2gAAAAAAAAAAFT///////8A////////5BAAAAAAAAAAAMT////////EAAAAAAAAAAAQ5P///////wD/////////mAAAAAAAAAAAKPj/////+CgAAAAAAAAAAJj/////////AP//////////PAAAAAAAAAAAgP////+AAAAAAAAAAAA8//////////8A///////////YCAAAAAAAAAAE2P//2AQAAAAAAAAACNj//////////wD///////////+AAAAAAAAAAAA4//84AAAAAAAAAACA////////////AP////////////woAAAAAAAAAACUlAAAAAAAAAAAKPz///////////8A/////////////8gAAAAAAAAAABAQAAAAAAAAAADI/////////////wD//////////////2wAAAAAAAAAAAAAAAAAAAAAbP//////////////AP//////////////8BwAAAAAAAAAAAAAAAAAABzw//////////////8A////////////////tAAAAAAAAAAAAAAAAAAAtP///////////////wD/////////////////VAAAAAAAAAAAAAAAAFT/////////////////AP/////////////////oEAAAAAAAAAAAAAAQ6P////////////////8A//////////////////+cAAAAAAAAAAAAAJz//////////////////wD///////////////////9AAAAAAAAAAABA////////////////////AP///////////////////9gAAAAAAAAAANj///////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////8AAAAAAAAAAP////////////////////8A/////////////////////wAAAAAAAAAA/////////////////////wD/////////////////////AAAAAAAAAAD/////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - 'Z' => array( - 'data' => 'AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////8A//////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAD//////////////wD//////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAP//////////////AP//////////AAAAAAAAAAAAAAAAAAAAAAAAAAAQ//////////////8A/////////////////////////1AAAAAAAAAABLz//////////////wD///////////////////////98AAAAAAAAAACY////////////////AP//////////////////////pAAAAAAAAAAAaP////////////////8A/////////////////////8QIAAAAAAAAAET8/////////////////wD////////////////////gGAAAAAAAAAAo9P//////////////////AP//////////////////9CwAAAAAAAAAFNz///////////////////8A//////////////////xMAAAAAAAAAATA/////////////////////wD/////////////////eAAAAAAAAAAAnP//////////////////////AP///////////////5wAAAAAAAAAAHT///////////////////////8A///////////////ABAAAAAAAAABM/P///////////////////////wD/////////////3BQAAAAAAAAALPT/////////////////////////AP////////////QoAAAAAAAAABjg//////////////////////////8A///////////8SAAAAAAAAAAExP///////////////////////////wD//////////2wAAAAAAAAAAKD/////////////////////////////AP////////+YAAAAAAAAAAB8//////////////////////////////8A/////////wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////////////wD/////////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////AP////////8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8A/////////////////////////////////////////////////////wD/////////////////////////////////////////////////////AP////////////////////////////////////////////////////8=', - 'width' => 40 - ), - ); - } -} diff --git a/phpBB/phpbb/captcha/plugins/gd.php b/phpBB/phpbb/captcha/plugins/gd.php deleted file mode 100644 index 6d3c9bb3d28..00000000000 --- a/phpBB/phpbb/captcha/plugins/gd.php +++ /dev/null @@ -1,123 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha\plugins; - -class gd extends captcha_abstract -{ - var $captcha_vars = array( - 'captcha_gd_x_grid' => 'CAPTCHA_GD_X_GRID', - 'captcha_gd_y_grid' => 'CAPTCHA_GD_Y_GRID', - 'captcha_gd_foreground_noise' => 'CAPTCHA_GD_FOREGROUND_NOISE', -// 'captcha_gd' => 'CAPTCHA_GD_PREVIEWED', - 'captcha_gd_wave' => 'CAPTCHA_GD_WAVE', - 'captcha_gd_3d_noise' => 'CAPTCHA_GD_3D_NOISE', - 'captcha_gd_fonts' => 'CAPTCHA_GD_FONTS', - ); - - public function is_available() - { - return @extension_loaded('gd'); - } - - /** - * @return string the name of the class used to generate the captcha - */ - function get_generator_class() - { - return '\\phpbb\\captcha\\gd'; - } - - /** - * API function - */ - function has_config() - { - return true; - } - - public function get_name() - { - return 'CAPTCHA_GD'; - } - - function acp_page($id, $module) - { - global $user, $template, $phpbb_log, $request; - global $config; - - $user->add_lang('acp/board'); - - $module->tpl_name = 'captcha_gd_acp'; - $module->page_title = 'ACP_VC_SETTINGS'; - $form_key = 'acp_captcha'; - add_form_key($form_key); - - $submit = $request->variable('submit', ''); - - if ($submit && check_form_key($form_key)) - { - $captcha_vars = array_keys($this->captcha_vars); - foreach ($captcha_vars as $captcha_var) - { - $value = $request->variable($captcha_var, 0); - if ($value >= 0) - { - $config->set($captcha_var, $value); - } - } - - $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_VISUAL'); - trigger_error($user->lang['CONFIG_UPDATED'] . adm_back_link($module->u_action)); - } - else if ($submit) - { - trigger_error($user->lang['FORM_INVALID'] . adm_back_link($module->u_action)); - } - else - { - foreach ($this->captcha_vars as $captcha_var => $template_var) - { - $var = (isset($_REQUEST[$captcha_var])) ? $request->variable($captcha_var, 0) : $config[$captcha_var]; - $template->assign_var($template_var, $var); - } - - $template->assign_vars(array( - 'CAPTCHA_PREVIEW' => $this->get_demo_template($id), - 'CAPTCHA_NAME' => $this->get_service_name(), - 'U_ACTION' => $module->u_action, - )); - } - } - - function execute_demo() - { - global $config, $request; - - $config_old = $config; - - $config = new \phpbb\config\config(array()); - foreach ($config_old as $key => $value) - { - $config->set($key, $value); - } - - foreach ($this->captcha_vars as $captcha_var => $template_var) - { - $config->set($captcha_var, $request->variable($captcha_var, (int) $config[$captcha_var])); - } - parent::execute_demo(); - $config = $config_old; - } - -} diff --git a/phpBB/phpbb/captcha/plugins/gd_wave.php b/phpBB/phpbb/captcha/plugins/gd_wave.php deleted file mode 100644 index 4ac26ed2b72..00000000000 --- a/phpBB/phpbb/captcha/plugins/gd_wave.php +++ /dev/null @@ -1,42 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha\plugins; - -class gd_wave extends captcha_abstract -{ - public function is_available() - { - return @extension_loaded('gd'); - } - - public function get_name() - { - return 'CAPTCHA_GD_3D'; - } - - /** - * @return string the name of the class used to generate the captcha - */ - function get_generator_class() - { - return '\\phpbb\\captcha\\gd_wave'; - } - - function acp_page($id, $module) - { - global $user; - - trigger_error($user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action)); - } -} diff --git a/phpBB/phpbb/captcha/plugins/nogd.php b/phpBB/phpbb/captcha/plugins/nogd.php deleted file mode 100644 index da67cd2bf41..00000000000 --- a/phpBB/phpbb/captcha/plugins/nogd.php +++ /dev/null @@ -1,42 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\captcha\plugins; - -class nogd extends captcha_abstract -{ - public function is_available() - { - return true; - } - - public function get_name() - { - return 'CAPTCHA_NO_GD'; - } - - /** - * @return string the name of the class used to generate the captcha - */ - function get_generator_class() - { - return '\\phpbb\\captcha\\non_gd'; - } - - function acp_page($id, $module) - { - global $user; - - trigger_error($user->lang['CAPTCHA_NO_OPTIONS'] . adm_back_link($module->u_action)); - } -} diff --git a/tests/auth/provider_db_test.php b/tests/auth/provider_db_test.php index c3a0743e144..145e3c47cda 100644 --- a/tests/auth/provider_db_test.php +++ b/tests/auth/provider_db_test.php @@ -45,14 +45,14 @@ public function test_login() $phpbb_container = new phpbb_mock_container_builder(); $plugins = new \phpbb\di\service_collection($phpbb_container); - $plugins->add('core.captcha.plugins.nogd'); + $plugins->add('core.captcha.plugins.qa'); $phpbb_container->set( 'captcha.factory', new \phpbb\captcha\factory($phpbb_container, $plugins) ); $phpbb_container->set( - 'core.captcha.plugins.nogd', - new \phpbb\captcha\plugins\nogd() + 'core.captcha.plugins.qa', + new \phpbb\captcha\plugins\qa('', '', '') ); /** @var \phpbb\captcha\factory $captcha_factory */ $captcha_factory = $phpbb_container->get('captcha.factory'); diff --git a/tests/functions/user_delete_test.php b/tests/functions/user_delete_test.php index 41951c29bc4..956c61b15dd 100644 --- a/tests/functions/user_delete_test.php +++ b/tests/functions/user_delete_test.php @@ -62,14 +62,14 @@ protected function setUp(): void $passwords_manager = new \phpbb\passwords\manager($config, $passwords_drivers, $passwords_helper, array_keys($passwords_drivers)); $plugins = new \phpbb\di\service_collection($phpbb_container); - $plugins->add('core.captcha.plugins.nogd'); + $plugins->add('core.captcha.plugins.qa'); $phpbb_container->set( 'captcha.factory', new \phpbb\captcha\factory($phpbb_container, $plugins) ); $phpbb_container->set( - 'core.captcha.plugins.nogd', - new \phpbb\captcha\plugins\nogd() + 'core.captcha.plugins.qa', + new \phpbb\captcha\plugins\qa('', '', '') ); // Set up passwords manager $db_auth_provider = new \phpbb\auth\provider\db( diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 9080478a285..e8117f08c57 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -30,14 +30,14 @@ protected function setUp(): void global $phpbb_container; $plugins = new \phpbb\di\service_collection($phpbb_container); - $plugins->add('core.captcha.plugins.nogd'); + $plugins->add('core.captcha.plugins.recaptcha'); $phpbb_container->set( 'captcha.factory', new \phpbb\captcha\factory($phpbb_container, $plugins) ); $phpbb_container->set( - 'core.captcha.plugins.nogd', - new \phpbb\captcha\plugins\nogd() + 'core.captcha.plugins.recaptcha', + new \phpbb\captcha\plugins\recaptcha() ); } @@ -77,7 +77,7 @@ public function test_session_gc() ); // There is an error unless the captcha plugin is set - $config['captcha_plugin'] = 'core.captcha.plugins.nogd'; + $config['captcha_plugin'] = 'core.captcha.plugins.recaptcha'; $this->session->session_gc(); $this->check_expired_sessions_recent( [], @@ -132,7 +132,7 @@ public function test_cleanup_all() global $config; $config['session_length'] = 0; // There is an error unless the captcha plugin is set - $config['captcha_plugin'] = 'core.captcha.plugins.nogd'; + $config['captcha_plugin'] = 'core.captcha.plugins.recaptcha'; $this->session->session_gc(); $this->check_sessions_equals( [], From 5e9d8662d18cc743c978d7f5ef288fb26b6b6729 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 26 Mar 2024 17:28:33 +0100 Subject: [PATCH 0072/1214] [ticket/12960] Use test api key for recaptcha v2 demo PHPBB3-12960 --- phpBB/adm/style/captcha_recaptcha.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 563bd988354..fe274d5ca13 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -1,4 +1,3 @@ -
- -{L_RECAPTCHA_NOT_AVAILABLE} - From 716c1ca8eb397609857792f360dd3083326197a0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 26 Mar 2024 21:00:31 +0100 Subject: [PATCH 0073/1214] [ticket/12960] Add incomplete captcha to prevent registration PHPBB3-12960 --- .../default/container/services_captcha.yml | 5 ++ phpBB/language/en/ucp.php | 1 + phpBB/phpbb/captcha/plugins/incomplete.php | 66 +++++++++++++++++++ .../template/captcha_incomplete.html | 7 ++ 4 files changed, 79 insertions(+) create mode 100644 phpBB/phpbb/captcha/plugins/incomplete.php create mode 100644 phpBB/styles/prosilver/template/captcha_incomplete.html diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index f3f9476f861..8e9d829b47e 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -17,6 +17,11 @@ services: core.captcha.plugins.incomplete: class: phpbb\captcha\plugins\incomplete shared: false + arguments: + - '@config' + - '@template' + - '%core.root_path%' + - '%core.php_ext%' calls: - [ set_name, [ core.captcha.plugins.incomplete ] ] tags: diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 3d90f15742d..75964fde884 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -136,6 +136,7 @@ 'CONFIRMATION' => 'Confirmation of registration', 'CONFIRM_CHANGES' => 'Confirm changes', 'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', + 'CONFIRM_INCOMPLETE' => 'To prevent automated registrations the board requires you to enter a confirmation code. This has not been configured yet and hence cannot be used. Please try again later or contact the %sBoard Administrator%s.', 'VC_REFRESH' => 'Refresh confirmation code', 'VC_REFRESH_EXPLAIN' => 'If you cannot read the code you can request a new one by clicking the button.', diff --git a/phpBB/phpbb/captcha/plugins/incomplete.php b/phpBB/phpbb/captcha/plugins/incomplete.php new file mode 100644 index 00000000000..9669931761f --- /dev/null +++ b/phpBB/phpbb/captcha/plugins/incomplete.php @@ -0,0 +1,66 @@ +config, $this->phpbb_root_path, $this->phpEx); + + $this->template->assign_vars([ + 'CONFIRM_LANG' => $this->type != CONFIRM_POST ? 'CONFIRM_INCOMPLETE' : 'POST_CONFIRM_INCOMPLETE', + 'CONTACT_LINK' => $contact_link, + ]); + + return 'captcha_incomplete.html'; + } + + public function validate() + { + return false; + } + + public function is_solved() + { + return false; + } +} \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/captcha_incomplete.html b/phpBB/styles/prosilver/template/captcha_incomplete.html new file mode 100644 index 00000000000..ed6b0af156b --- /dev/null +++ b/phpBB/styles/prosilver/template/captcha_incomplete.html @@ -0,0 +1,7 @@ +
+
+ +

{{ lang('CONFIRMATION') }}

+

{{ lang(CONFIRM_LANG, '', '') }}

+
+
From e333d96eef40e90b1f954a4eeda7c1fdf269bfa4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 4 Apr 2024 21:02:52 +0200 Subject: [PATCH 0074/1214] [ticket/12960] Adjust incomplete captcha to fix tests PHPBB3-12960 --- phpBB/language/en/acp/board.php | 4 ++-- phpBB/language/en/common.php | 1 + phpBB/language/en/ucp.php | 1 - phpBB/styles/prosilver/template/captcha_incomplete.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b86e0b6335c..c57cefe6857 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -304,11 +304,11 @@ // Visual Confirmation Settings $lang = array_merge($lang, array( - 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve.', + 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you can select and configure plugins, which are designed to block automated form submissions by spambots. These plugins typically work by challenging the user with a CAPTCHA, a test which is designed to be difficult for computers to solve. phpBB defaults to "Incomplete Captcha," disabling verification and preventing functionality like registration that require CAPTCHA verification.', 'ACP_VC_EXT_GET_MORE' => 'For additional (and possibly better) anti-spam plugins, visit the phpBB.com Extensions Database. For more information on preventing spam on your board, visit the phpBB.com Knowledge Base.', 'AVAILABLE_CAPTCHAS' => 'Available plugins', 'CAPTCHA_UNAVAILABLE' => 'The plugin cannot be selected as its requirements are not met.', - 'CAPTCHA_INCOMPLETE' => 'Incomplete Captcha (Disabled Registration)', + 'CAPTCHA_INCOMPLETE' => 'Incomplete Captcha (Not configured)', 'CAPTCHA_PREVIEW_MSG' => 'Your changes have not been saved, this is just a preview.', 'CAPTCHA_PREVIEW_EXPLAIN' => 'The plugin as it would look like using the current selection.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5799137f5fb..79128293e25 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -173,6 +173,7 @@ 'CONFIRM_CODE' => 'Confirmation code', 'CONFIRM_CODE_EXPLAIN' => 'Enter the code exactly as it appears. All letters are case insensitive.', 'CONFIRM_CODE_WRONG' => 'The confirmation code you entered was incorrect.', + 'CONFIRM_INCOMPLETE' => 'To prevent automated registrations the board requires you to enter a confirmation code. This has not been configured yet and hence cannot be used. Please try again later or contact the %sBoard Administrator%s.', 'CONFIRM_OPERATION' => 'Are you sure you wish to carry out this operation?', 'CONFIRM_AVATAR_DELETE' => 'Are you sure you wish to delete this avatar?', 'CONGRATULATIONS' => 'Congratulations to', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 75964fde884..3d90f15742d 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -136,7 +136,6 @@ 'CONFIRMATION' => 'Confirmation of registration', 'CONFIRM_CHANGES' => 'Confirm changes', 'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', - 'CONFIRM_INCOMPLETE' => 'To prevent automated registrations the board requires you to enter a confirmation code. This has not been configured yet and hence cannot be used. Please try again later or contact the %sBoard Administrator%s.', 'VC_REFRESH' => 'Refresh confirmation code', 'VC_REFRESH_EXPLAIN' => 'If you cannot read the code you can request a new one by clicking the button.', diff --git a/phpBB/styles/prosilver/template/captcha_incomplete.html b/phpBB/styles/prosilver/template/captcha_incomplete.html index ed6b0af156b..6a9078a37bc 100644 --- a/phpBB/styles/prosilver/template/captcha_incomplete.html +++ b/phpBB/styles/prosilver/template/captcha_incomplete.html @@ -1,7 +1,7 @@
-

{{ lang('CONFIRMATION') }}

+

{{ lang('CONFIRM_CODE') }}

{{ lang(CONFIRM_LANG, '', '') }}

From c07c6816fca9b82d7009d1ab6b8d94f95f7876e5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Apr 2024 21:50:27 +0200 Subject: [PATCH 0075/1214] [ticket/17077] Improve handling of accidental double submission of posts PHPBB3-17077 --- .../default/container/services_content.yml | 8 ++ phpBB/phpbb/lock/posting.php | 82 +++++++++++++++++++ phpBB/posting.php | 10 ++- phpBB/styles/prosilver/template/ajax.js | 23 ++++++ .../prosilver/template/posting_editor.html | 2 +- 5 files changed, 123 insertions(+), 2 deletions(-) create mode 100644 phpBB/phpbb/lock/posting.php diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml index 8b240067e41..e2d53784c24 100644 --- a/phpBB/config/default/container/services_content.yml +++ b/phpBB/config/default/container/services_content.yml @@ -67,6 +67,14 @@ services: - '@controller.helper' - '@dispatcher' + posting.lock: + class: phpbb\lock\posting + shared: false + arguments: + - '@cache.driver' + - '@config' + - '@request' + viewonline_helper: class: phpbb\viewonline_helper arguments: diff --git a/phpBB/phpbb/lock/posting.php b/phpBB/phpbb/lock/posting.php new file mode 100644 index 00000000000..d9124758902 --- /dev/null +++ b/phpBB/phpbb/lock/posting.php @@ -0,0 +1,82 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\lock; + +use phpbb\cache\driver\driver_interface as cache_interface; +use phpbb\config\config; +use phpbb\request\request_interface; + +class posting +{ + /** @var cache_interface */ + private $cache; + + /** @var config */ + private $config; + + /** @var request_interface */ + private $request; + + /** @var string */ + private $lock_name = ''; + + /** + * Constructor for posting lock + * + * @param cache_interface $cache + * @param config $config + * @param request_interface $request + */ + public function __construct(cache_interface $cache, config $config, request_interface $request) + { + $this->cache = $cache; + $this->config = $config; + $this->request = $request; + } + + /** + * Get lock name + * @return string Lock name + */ + private function lock_name(): string + { + if ($this->lock_name) + { + return $this->lock_name; + } + + $creation_time = abs($this->request->variable('creation_time', 0)); + $token = $this->request->variable('form_token', ''); + + return sha1(((string) $creation_time) . $token) . '_posting_lock'; + } + + /** + * Acquire lock for current posting form submission + * + * @return bool True if lock could be acquired, false if not + */ + public function acquire(): bool + { + // Lock is held for session, cannot acquire it + if ($this->cache->_exists($this->lock_name())) + { + return false; + } + + $this->cache->put($this->lock_name(), true, $this->config['flood_interval']); + + return true; + } +} \ No newline at end of file diff --git a/phpBB/posting.php b/phpBB/posting.php index 724d8a8df18..7b3d2243ab6 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1429,7 +1429,10 @@ // Store message, sync counters if (!count($error) && $submit) { - if ($submit) + /** @var \phpbb\lock\posting $posting_lock */ + $posting_lock = $phpbb_container->get('posting.lock'); + + if ($posting_lock->acquire()) { // Lock/Unlock Topic $change_topic_status = $post_data['topic_status']; @@ -1620,6 +1623,11 @@ redirect($redirect_url); } + else + { + // Posting was already locked before, hence form submission was already attempted once and is now invalid + $error[] = $language->lang('FORM_INVALID'); + } } } diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 79187470d81..e01e7eb4d49 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -337,6 +337,29 @@ $('[data-ajax]').each(function() { } }); +// Prevent accidental double submission of form +$('[data-prevent-flood] input[type=submit]').click(function(event) { + const $submitButton = $(this); // Store the button element + const $form = $submitButton.closest('form'); + + // Always add the disabled class for visual feedback + $submitButton.addClass('disabled'); + + // Submit form if it hasn't been submitted yet + if (!$form.prop('data-form-submitted')) { + $form.prop('data-form-submitted', true); + + return; + } + + // Prevent default submission for subsequent clicks within 5 seconds + event.preventDefault(); + + setTimeout(() => { + $form.prop('removeProp', 'data-form-submitted'); + $submitButton.removeClass('disabled'); // Re-enable after 5 seconds + }, 5000); +}); /** * This simply appends #preview to the action of the diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 12790360d64..d3b2ecd68ed 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -100,7 +100,7 @@
-
+
{S_HIDDEN_ADDRESS_FIELD} {S_HIDDEN_FIELDS} From 6943fbba890a3ad3f315cf64f97901f88419036c Mon Sep 17 00:00:00 2001 From: LukeWCS Date: Tue, 9 Apr 2024 19:06:09 +0200 Subject: [PATCH 0076/1214] [ticket/17302] Fix password reset function Password reset function does not update all necessary data PHPBB3-17302 --- phpBB/phpbb/ucp/controller/reset_password.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 007258094bf..442de50ec77 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -407,6 +407,7 @@ public function reset() { $sql_ary = [ 'user_password' => $this->passwords_manager->hash($data['new_password']), + 'user_passchg' => time(), 'user_login_attempts' => 0, 'reset_token' => '', 'reset_token_expiration' => 0, From 3b5777f9008b49b7ceb4b80b75a091782a6e9b86 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Apr 2024 20:53:05 +0200 Subject: [PATCH 0077/1214] [ticket/17077] Move request handling outside locking and add release PHPBB3-17077 --- .../default/container/services_content.yml | 1 - phpBB/phpbb/lock/posting.php | 59 +++++++++++-------- phpBB/posting.php | 9 ++- 3 files changed, 44 insertions(+), 25 deletions(-) diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml index e2d53784c24..0dc0829d9e7 100644 --- a/phpBB/config/default/container/services_content.yml +++ b/phpBB/config/default/container/services_content.yml @@ -73,7 +73,6 @@ services: arguments: - '@cache.driver' - '@config' - - '@request' viewonline_helper: class: phpbb\viewonline_helper diff --git a/phpBB/phpbb/lock/posting.php b/phpBB/phpbb/lock/posting.php index d9124758902..1fee36e63f1 100644 --- a/phpBB/phpbb/lock/posting.php +++ b/phpBB/phpbb/lock/posting.php @@ -15,7 +15,6 @@ use phpbb\cache\driver\driver_interface as cache_interface; use phpbb\config\config; -use phpbb\request\request_interface; class posting { @@ -25,58 +24,72 @@ class posting /** @var config */ private $config; - /** @var request_interface */ - private $request; - /** @var string */ private $lock_name = ''; + /** @var bool Lock state */ + private $locked = false; + /** * Constructor for posting lock * * @param cache_interface $cache * @param config $config - * @param request_interface $request */ - public function __construct(cache_interface $cache, config $config, request_interface $request) + public function __construct(cache_interface $cache, config $config) { $this->cache = $cache; $this->config = $config; - $this->request = $request; } /** - * Get lock name - * @return string Lock name + * Set lock name + * + * @param int $creation_time Creation time of form, must be checked already + * @param string $form_token Form token used for form, must be checked already + * + * @return void */ - private function lock_name(): string + private function set_lock_name(int $creation_time, string $form_token): void { - if ($this->lock_name) - { - return $this->lock_name; - } - - $creation_time = abs($this->request->variable('creation_time', 0)); - $token = $this->request->variable('form_token', ''); - - return sha1(((string) $creation_time) . $token) . '_posting_lock'; + $this->lock_name = sha1(((string) $creation_time) . $form_token) . '_posting_lock'; } /** * Acquire lock for current posting form submission * + * @param int $creation_time Creation time of form, must be checked already + * @param string $form_token Form token used for form, must be checked already + * * @return bool True if lock could be acquired, false if not */ - public function acquire(): bool + public function acquire(int $creation_time, string $form_token): bool { + $this->set_lock_name($creation_time, $form_token); + // Lock is held for session, cannot acquire it - if ($this->cache->_exists($this->lock_name())) + if ($this->cache->_exists($this->lock_name)) { return false; } - $this->cache->put($this->lock_name(), true, $this->config['flood_interval']); + $this->locked = true; + + $this->cache->put($this->lock_name, true, $this->config['flood_interval']); return true; } -} \ No newline at end of file + + /** + * Release lock + * + * @return void + */ + public function release(): void + { + if ($this->locked) + { + $this->cache->destroy($this->lock_name); + } + } +} diff --git a/phpBB/posting.php b/phpBB/posting.php index 7b3d2243ab6..bea75081c14 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1432,7 +1432,11 @@ /** @var \phpbb\lock\posting $posting_lock */ $posting_lock = $phpbb_container->get('posting.lock'); - if ($posting_lock->acquire()) + // Get creation time and form token, must be already checked at this point + $creation_time = abs($request->variable('creation_time', 0)); + $form_token = $request->variable('form_token', ''); + + if ($posting_lock->acquire($creation_time, $form_token)) { // Lock/Unlock Topic $change_topic_status = $post_data['topic_status']; @@ -1561,6 +1565,9 @@ // The last parameter tells submit_post if search indexer has to be run $redirect_url = submit_post($mode, $post_data['post_subject'], $post_author_name, $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false); + // Release lock after submitting post + $posting_lock->release(); + /** * This event allows you to define errors after the post action is performed * From 98929ca9838a60d5dc8a5f454ab101170f1975bc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Apr 2024 21:13:28 +0200 Subject: [PATCH 0078/1214] [ticket/17077] Add test for posting lock PHPBB3-17077 --- tests/lock/posting_test.php | 54 +++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tests/lock/posting_test.php diff --git a/tests/lock/posting_test.php b/tests/lock/posting_test.php new file mode 100644 index 00000000000..e9a9cdfffb8 --- /dev/null +++ b/tests/lock/posting_test.php @@ -0,0 +1,54 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\cache\driver\file as file_cache; +use phpbb\config\config; +use phpbb\lock\posting; + +class phpbb_lock_posting_test extends phpbb_test_case +{ + /** @var \phpbb\cache\driver\file */ + protected $cache; + + /** @var config */ + protected $config; + + /** @var posting */ + protected $lock; + + public function setUp(): void + { + $this->cache = new file_cache(__DIR__ . '/../tmp/'); + $this->cache->purge(); // ensure cache is clean + $this->config = new config([ + 'flood_interval' => 15, + ]); + $this->lock = new posting($this->cache, $this->config); + } + + public function test_lock_acquire() + { + $this->assertTrue($this->lock->acquire(100, 'foo')); + $this->assertFalse($this->lock->acquire(100, 'foo')); + + $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); + $this->lock->release(); + $this->assertFalse($this->cache->_exists(sha1('100foo') . '_posting_lock')); + + $this->assertTrue($this->lock->acquire(100, 'foo')); + $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); + $this->lock->release(); + $this->lock->release(); // double release has no effect + $this->assertFalse($this->cache->_exists(sha1('100foo') . '_posting_lock')); + } +} \ No newline at end of file From abffd0f6622c2c662aa914cbaa564d7549d71d19 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 15 Apr 2024 00:19:52 +0700 Subject: [PATCH 0079/1214] [ticket/17303] Update jQuery to the version 3.7.1 PHPBB3-17303 --- phpBB/adm/style/installer_footer.html | 2 +- phpBB/adm/style/overall_footer.html | 2 +- phpBB/adm/style/simple_footer.html | 2 +- phpBB/assets/javascript/jquery-3.6.0.min.js | 2 -- phpBB/assets/javascript/jquery-3.7.1.min.js | 2 ++ phpBB/includes/functions.php | 2 +- phpBB/includes/functions_acp.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- .../migration/data/v33x/jquery_update_v3.php | 36 +++++++++++++++++++ phpBB/phpbb/install/controller/helper.php | 2 +- .../prosilver/template/overall_footer.html | 2 +- .../prosilver/template/simple_footer.html | 2 +- 12 files changed, 47 insertions(+), 11 deletions(-) delete mode 100644 phpBB/assets/javascript/jquery-3.6.0.min.js create mode 100644 phpBB/assets/javascript/jquery-3.7.1.min.js create mode 100644 phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html index 24c80b69e51..ce06f93223f 100644 --- a/phpBB/adm/style/installer_footer.html +++ b/phpBB/adm/style/installer_footer.html @@ -23,7 +23,7 @@ - + {$SCRIPTS} diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 7f7f2f82561..5f17eaf28ed 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -34,7 +34,7 @@

 

- + diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 50dba2f9108..706bd987d95 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -17,7 +17,7 @@
- + diff --git a/phpBB/assets/javascript/jquery-3.6.0.min.js b/phpBB/assets/javascript/jquery-3.6.0.min.js deleted file mode 100644 index c4c6022f298..00000000000 --- a/phpBB/assets/javascript/jquery-3.6.0.min.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */ -!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="",y.option=!!ce.lastChild;var ge={thead:[1,"
","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n",""]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="
",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 !empty($config['allow_cdn']) && !empty($config['load_font_awesome_url']) ? $config['load_font_awesome_url'] : "{$web_path}assets/css/font-awesome.min.css?assets_version=" . $config['assets_version'], - 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.6.0.min.js?assets_version=" . $config['assets_version'], + 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$web_path}assets/javascript/jquery-3.7.1.min.js?assets_version=" . $config['assets_version'], 'S_ALLOW_CDN' => !empty($config['allow_cdn']), 'S_COOKIE_NOTICE' => !empty($config['cookie_notice']), diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index a1c60c2807f..2155ae0519f 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -178,7 +178,7 @@ function adm_page_footer($copyright_html = true) 'TRANSLATION_INFO' => (!empty($user->lang['TRANSLATION_INFO'])) ? $user->lang['TRANSLATION_INFO'] : '', 'S_COPYRIGHT_HTML' => $copyright_html, 'CREDIT_LINE' => $user->lang('POWERED_BY', 'phpBB® Forum Software © phpBB Limited'), - 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery-3.6.0.min.js", + 'T_JQUERY_LINK' => !empty($config['allow_cdn']) && !empty($config['load_jquery_url']) ? $config['load_jquery_url'] : "{$phpbb_root_path}assets/javascript/jquery-3.7.1.min.js", 'S_ALLOW_CDN' => !empty($config['allow_cdn']), 'VERSION' => $config['version']) ); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 24580c414be..97ff395ac90 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -200,7 +200,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_cpf_viewtopic INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_font_awesome_url', 'https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_notifications', '1'); diff --git a/phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php b/phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php new file mode 100644 index 00000000000..f1f96071268 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/jquery_update_v3.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +use phpbb\db\migration\migration; + +class jquery_update_v3 extends migration +{ + public function effectively_installed() + { + return $this->config['load_jquery_url'] === '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js'; + } + + public static function depends_on() + { + return ['\phpbb\db\migration\data\v33x\v3311']; + } + + public function update_data() + { + return [ + ['config.update', ['load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js']], + ]; + } +} diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php index 1f936dda86f..0d3b48d76dd 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -267,7 +267,7 @@ protected function page_header($page_title, $selected_language = false) 'L_SKIP' => $this->language->lang('SKIP'), 'PAGE_TITLE' => $this->language->lang($page_title), 'T_IMAGE_PATH' => $this->path_helper->get_web_root_path() . $path . 'images', - 'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.6.0.min.js', + 'T_JQUERY_LINK' => $this->path_helper->get_web_root_path() . $path . '../assets/javascript/jquery-3.7.1.min.js', 'T_TEMPLATE_PATH' => $this->path_helper->get_web_root_path() . $path . 'style', 'T_ASSETS_PATH' => $this->path_helper->get_web_root_path() . $path . '../assets', diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html index 5d872e24150..465fe44f2a3 100644 --- a/phpBB/styles/prosilver/template/overall_footer.html +++ b/phpBB/styles/prosilver/template/overall_footer.html @@ -64,7 +64,7 @@

 

- + diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html index 98a43b89b90..06dba0f1621 100644 --- a/phpBB/styles/prosilver/template/simple_footer.html +++ b/phpBB/styles/prosilver/template/simple_footer.html @@ -36,7 +36,7 @@

 

- + From d0c48f3fde0886b7e4f010d8f8306ba2cbdf7b85 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 16 Apr 2024 20:46:40 +0200 Subject: [PATCH 0080/1214] [ticket/17305] Improve queries for unanswered posts/topics PHPBB3-17305 --- phpBB/search.php | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index cd2d65a4822..af4f8dcb6cc 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -337,7 +337,13 @@ } // define some variables needed for retrieving post_id/topic_id information - $sort_by_sql = array('a' => 'u.username_clean', 't' => (($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'), 'f' => 'f.forum_id', 'i' => 't.topic_title', 's' => (($show_results == 'posts') ? 'p.post_subject' : 't.topic_title')); + $sort_by_sql = [ + 'a' => 'u.username_clean', + 't' => (($show_results == 'posts') ? 'p.post_time' : 't.topic_last_post_time'), + 'f' => 'f.forum_id', + 'i' => 't.topic_title', + 's' => (($show_results == 'posts') ? 'p.post_subject' : 't.topic_title') + ]; /** * Event to modify the SQL parameters before pre-made searches @@ -403,11 +409,11 @@ $sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC'); $sort_join = ($sort_key == 'f') ? FORUMS_TABLE . ' f, ' : ''; - $sql_sort = ($sort_key == 'f') ? ' AND f.forum_id = p.forum_id ' . $sql_sort : $sql_sort; + $sql_sort = ($sort_key == 'f') ? ' AND f.forum_id = t.forum_id ' . $sql_sort : $sql_sort; if ($sort_days) { - $last_post_time = 'AND p.post_time > ' . (time() - ($sort_days * 24 * 3600)); + $last_post_time = 'AND ' . ($show_results == 'posts' ? 'p.post_time' : 't.topic_last_post_time') . ' > ' . (time() - ($sort_days * 24 * 3600)); } else { @@ -417,7 +423,7 @@ if ($sort_key == 'a') { $sort_join = USERS_TABLE . ' u, '; - $sql_sort = ' AND u.user_id = p.poster_id ' . $sql_sort; + $sql_sort = ' AND u.user_id = t.topic_last_poster_id ' . $sql_sort; } if ($show_results == 'posts') { @@ -433,14 +439,13 @@ } else { - $sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", p.topic_id - FROM $sort_join" . POSTS_TABLE . ' p, ' . TOPICS_TABLE . " t + $sql = 'SELECT DISTINCT ' . $sort_by_sql[$sort_key] . ", t.topic_id + FROM $sort_join" . TOPICS_TABLE . " t WHERE t.topic_posts_approved = 1 AND t.topic_moved_id = 0 - AND p.topic_id = t.topic_id $last_post_time AND $m_approve_topics_fid_sql - " . ((count($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('p.forum_id', $ex_fid_ary, true) : '') . " + " . ((count($ex_fid_ary)) ? ' AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '') . " $sql_sort"; $field = 'topic_id'; } From 3e23839c0491f2ff6303330245c28817f1d89d0f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Apr 2024 19:55:06 +0200 Subject: [PATCH 0081/1214] [ticket/12960] Add warning messages when captcha is disabled or incomplete PHPBB3-12960 --- phpBB/adm/style/acp_main.html | 9 +++++++++ phpBB/includes/acp/acp_main.php | 26 ++++++++++++++++++++++++++ phpBB/language/en/acp/common.php | 3 +++ 3 files changed, 38 insertions(+) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 05ccd106054..2fe84656dbe 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -35,6 +35,15 @@

{L_WELCOME_PHPBB}

{UPGRADE_INSTRUCTIONS}

+ {% if S_CAPTCHA_UNSAFE %} +
+

{{ lang('CAPTCHA_UNSAFE_WARNING') }}

+
+ {% elseif S_CAPTCHA_INCOMPLETE %} +
+

{{ lang('CAPTCHA_INCOMPLETE_WARNING') }}

+
+ {% endif %}
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 8b34b5fea83..cdf5895def4 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -641,6 +641,9 @@ function main($id, $mode) } } + // Warn if incomplete captcha is enabled + $this->check_captcha_type($config, $template); + if (!defined('PHPBB_DISABLE_CONFIG_CHECK')) { // World-Writable? (000x) @@ -673,4 +676,27 @@ function main($id, $mode) $this->tpl_name = 'acp_main'; $this->page_title = 'ACP_MAIN'; } + + /** + * Check CAPTCHA type and output warning if incomplete type or unsafe config is used + * + * @param \phpbb\config\config $config + * @param \phpbb\template\template $template + * @return void + */ + protected function check_captcha_type(\phpbb\config\config $config, \phpbb\template\template $template): void + { + $template_vars = []; + + if (!$config['enable_confirm']) + { + $template_vars['S_CAPTCHA_UNSAFE'] = true; + } + else if ($config['captcha_plugin'] == 'core.captcha.plugins.incomplete') + { + $template_vars['S_CAPTCHA_INCOMPLETE'] = true; + } + + $template->assign_vars($template_vars); + } } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index ae2b54f62fa..bcbbe5d931a 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -235,6 +235,9 @@ 'BACK' => 'Back', + 'CAPTCHA_UNSAFE_WARNING' => 'Your board is currently vulnerable to spam submissions because the Spambot countermeasures are either disabled or not configured correctly.', + 'CAPTCHA_INCOMPLETE_WARNING' => '“Incomplete Captcha“ is currently enabled. This placeholder CAPTCHA will prevent all form submissions requiring CAPTCHA verification, e.g. user registration. Please configure a proper CAPTCHA solution like Q&A or reCaptcha to ensure intended functionality.', + 'CONTAINER_EXCEPTION' => 'phpBB encountered an error building the container due to an installed extension. For this reason, all extensions have been temporarily disabled. Please try purging your forum cache. All extensions will automatically be re-enabled once the container error is resolved. If this error continues, please visit phpBB.com for support.', 'EXCEPTION' => 'Exception', From 1baf5c295e98ace3e4ea06d986820b445aa81448 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Apr 2024 20:08:16 +0200 Subject: [PATCH 0082/1214] [ticket/12960] Add missing docblocks to incomplete captcha PHPBB3-12960 --- phpBB/phpbb/captcha/plugins/incomplete.php | 86 ++++++++++++++++++++-- 1 file changed, 78 insertions(+), 8 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/incomplete.php b/phpBB/phpbb/captcha/plugins/incomplete.php index 9669931761f..5c2b7f9a66c 100644 --- a/phpBB/phpbb/captcha/plugins/incomplete.php +++ b/phpBB/phpbb/captcha/plugins/incomplete.php @@ -1,48 +1,108 @@ + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ namespace phpbb\captcha\plugins; use phpbb\config\config; use phpbb\template\template; -class incomplete extends \phpbb\captcha\plugins\captcha_abstract +class incomplete extends captcha_abstract { + /** + * Constructor for incomplete captcha + * + * @param config $config + * @param template $template + * @param string $phpbb_root_path + * @param string $phpEx + */ public function __construct(protected config $config, protected template $template, protected string $phpbb_root_path, protected string $phpEx) {} - public function is_available() + /** + * @return bool True if captcha is available, false if not + */ + public function is_available(): bool { return true; } + /** + * Dummy implementation + * + * @return void + */ public function get_generator_class() { } - public static function get_name() + /** + * Get CAPTCHA name language variable + * + * @return string Language variable + */ + public static function get_name(): string { return 'CAPTCHA_INCOMPLETE'; } + /** + * Init CAPTCHA + * + * @param int $type CAPTCHA type + * @return void + */ public function init($type) { } + /** + * Execute demo + * + * @return void + */ public function execute_demo() { } + /** + * Execute CAPTCHA + * + * @return void + */ public function execute() { } - public function get_demo_template($id) + /** + * Get template data for demo + * + * @param int|string $id ACP module ID + * + * @return string Demo template file name + */ + public function get_demo_template($id): string { return ''; } - public function get_template() + /** + * Get template data for CAPTCHA + * + * @return string CAPTCHA template file name + */ + public function get_template(): string { $contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx); @@ -54,13 +114,23 @@ public function get_template() return 'captcha_incomplete.html'; } - public function validate() + /** + * Validate CAPTCHA + * + * @return false Incomplete CAPTCHA will never validate + */ + public function validate(): bool { return false; } - public function is_solved() + /** + * Check whether CAPTCHA is solved + * + * @return false Incomplete CAPTCHA will never be solved + */ + public function is_solved(): bool { return false; } -} \ No newline at end of file +} From 5d11098753977688892a43c8918e08bdccd91c3f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Apr 2024 20:42:41 +0200 Subject: [PATCH 0083/1214] [ticket/12960] Do not try to enable removed captcha during install PHPBB3-12960 --- .../module/install_database/task/add_config_settings.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php index 5d5b7043256..bd3f0852e60 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php +++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php @@ -166,12 +166,6 @@ public function run() 'site_desc' => $this->install_config->get('board_description'), ]; - if (@extension_loaded('gd')) - { - $updates['captcha_plugin'] = 'core.captcha.plugins.gd'; - $updates['captcha_gd'] = '1'; - } - $ref = substr($referer, strpos($referer, '://') + 3); if (!(stripos($ref, $server_name) === 0)) { From 9d51ca3eb7edcedf141528636c1c936130eed0b0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 18 Apr 2024 22:14:52 +0200 Subject: [PATCH 0084/1214] [ticket/12960] Add migration for removing broken captcha PHPBB3-12960 --- .../data/v400/remove_broken_captcha.php | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php diff --git a/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php b/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php new file mode 100644 index 00000000000..5e901a9193d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php @@ -0,0 +1,67 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_broken_captcha extends migration +{ + private $removed_captchas = [ + 'core.captcha.plugins.gd', + 'core.captcha.plugins.gd_wave', + 'core.captcha.plugins.nogd' + ]; + + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function update_data(): array + { + return [ + ['config.remove', ['captcha_gd']], + ['config.remove', ['captcha_gd_3d_noise']], + ['config.remove', ['captcha_gd_fonts']], + ['config.remove', ['captcha_gd_foreground_noise']], + ['config.remove', ['captcha_gd_wave']], + ['config.remove', ['captcha_gd_x_grid']], + ['config.remove', ['captcha_gd_y_grid']], + ['custom', [[$this, 'replace_broken_captcha']]], + ]; + } + + public function revert_data(): array + { + return [ + ['config.add', ['captcha_gd', 0]], + ['config.add', ['captcha_gd_3d_noise', 1]], + ['config.add', ['captcha_gd_fonts', 1]], + ['config.add', ['captcha_gd_foreground_noise', 1]], + ['config.add', ['captcha_gd_wave', 0]], + ['config.add', ['captcha_gd_x_grid', 25]], + ['config.add', ['captcha_gd_y_grid', 25]], + ]; + } + + public function replace_broken_captcha(): void + { + if (in_array($this->config['captcha_plugin'], $this->removed_captchas)) + { + $this->config->set('captcha_plugin', 'core.captcha.plugins.incomplete'); + } + } +} From 7da461eac428d1681c75a4e9531e6f41f590b521 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 18 Apr 2024 22:16:36 +0200 Subject: [PATCH 0085/1214] [ticket/12960] Add docblock for removed_captchas array PHPBB3-12960 --- phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php b/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php index 5e901a9193d..1fb79f8f4b7 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_broken_captcha.php @@ -17,7 +17,8 @@ class remove_broken_captcha extends migration { - private $removed_captchas = [ + /** @var array List of broken captcha that have been removed */ + private array $removed_captchas = [ 'core.captcha.plugins.gd', 'core.captcha.plugins.gd_wave', 'core.captcha.plugins.nogd' From d1e2e39469ada88ddd219a8d306f42a6c3425f55 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 19 Apr 2024 08:43:49 +0200 Subject: [PATCH 0086/1214] [ticket/12960] Add tests for incomplete captcha PHPBB3-12960 --- phpBB/language/en/common.php | 1 + phpBB/phpbb/captcha/plugins/incomplete.php | 8 +- phpBB/phpbb/captcha/plugins/recaptcha.php | 5 +- phpBB/phpbb/captcha/plugins/recaptcha_v3.php | 6 +- tests/captcha/incomplete_test.php | 86 ++++++++++++++++++++ 5 files changed, 101 insertions(+), 5 deletions(-) create mode 100644 tests/captcha/incomplete_test.php diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 79128293e25..25851d738e2 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -525,6 +525,7 @@ 'NO_EMAIL_SUBJECT' => 'No email subject specified.', 'NO_FORUM' => 'The forum you selected does not exist.', 'NO_FORUMS' => 'This board has no forums.', + 'NO_GENERATOR_CLASS' => 'No generator class given.', 'NO_GROUP' => 'The requested usergroup does not exist.', 'NO_GROUP_MEMBERS' => 'This group currently has no members.', 'NO_IPS_DEFINED' => 'No IP addresses or hostnames defined', diff --git a/phpBB/phpbb/captcha/plugins/incomplete.php b/phpBB/phpbb/captcha/plugins/incomplete.php index 5c2b7f9a66c..37301c45f57 100644 --- a/phpBB/phpbb/captcha/plugins/incomplete.php +++ b/phpBB/phpbb/captcha/plugins/incomplete.php @@ -14,6 +14,7 @@ namespace phpbb\captcha\plugins; use phpbb\config\config; +use phpbb\exception\runtime_exception; use phpbb\template\template; class incomplete extends captcha_abstract @@ -39,12 +40,14 @@ public function is_available(): bool } /** - * Dummy implementation + * Dummy implementation, not supported by this captcha * + * @throws runtime_exception * @return void */ - public function get_generator_class() + public function get_generator_class(): void { + throw new runtime_exception('NO_GENERATOR_CLASS'); } /** @@ -65,6 +68,7 @@ public static function get_name(): string */ public function init($type) { + $this->type = (int) $type; } /** diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php index 399eb34b6b9..ef30baaa9bb 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha.php @@ -13,6 +13,8 @@ namespace phpbb\captcha\plugins; +use phpbb\exception\runtime_exception; + class recaptcha extends captcha_abstract { private $response; @@ -55,10 +57,11 @@ public static function get_name() /** * This function is implemented because required by the upper class, but is never used for reCaptcha. + * @throws runtime_exception */ function get_generator_class() { - throw new \Exception('No generator class given.'); + throw new runtime_exception('NO_GENERATOR_CLASS'); } function acp_page($id, $module) diff --git a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php index 02dacb4b51d..67035ab1c62 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php @@ -13,6 +13,8 @@ namespace phpbb\captcha\plugins; +use phpbb\exception\runtime_exception; + /** * Google reCAPTCHA v3 plugin. */ @@ -86,12 +88,12 @@ public function execute_demo() * * Not needed by this CAPTCHA plugin. * - * @throws \Exception + * @throws runtime_exception * @return void */ public function get_generator_class() { - throw new \Exception('No generator class given.'); + throw new runtime_exception('NO_GENERATOR_CLASS'); } /** diff --git a/tests/captcha/incomplete_test.php b/tests/captcha/incomplete_test.php new file mode 100644 index 00000000000..88b6825fa93 --- /dev/null +++ b/tests/captcha/incomplete_test.php @@ -0,0 +1,86 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\captcha\plugins\incomplete; +use phpbb\config\config; +use phpbb\template\template; + +class phpbb_captcha_incomplete_test extends phpbb_test_case +{ + protected config $config; + + protected template $template; + + + /** @var incomplete */ + protected incomplete $incomplete_captcha; + + protected array $assigned_vars = []; + + public function assign_vars(array $vars): void + { + $this->assigned_vars = array_merge($this->assigned_vars, $vars); + } + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $this->config = new config([]); + $this->template = $this->getMockBuilder('\phpbb\template\twig\twig') + ->setMethods(['assign_vars']) + ->disableOriginalConstructor() + ->getMock(); + $this->template->method('assign_vars') + ->willReturnCallback([$this, 'assign_vars']); + + $this->incomplete_captcha = new incomplete( + $this->config, + $this->template, + $phpbb_root_path, + $phpEx + ); + } + + public function test_miscellaneous_incomplete(): void + { + $this->assertTrue($this->incomplete_captcha->is_available()); + $this->assertFalse($this->incomplete_captcha->is_solved()); + $this->assertFalse($this->incomplete_captcha->validate()); + $this->assertSame('CAPTCHA_INCOMPLETE', incomplete::get_name()); + $this->incomplete_captcha->init(0); + $this->incomplete_captcha->execute(); + $this->incomplete_captcha->execute_demo(); + $this->assertEmpty($this->assigned_vars); + $this->assertEmpty($this->incomplete_captcha->get_demo_template(0)); + } + + public function test_get_generator_class(): void + { + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->incomplete_captcha->get_generator_class(); + } + + public function test_get_tempate(): void + { + $this->incomplete_captcha->init(CONFIRM_REG); + $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); + $this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); + + $this->assigned_vars = []; + + $this->incomplete_captcha->init(CONFIRM_POST); + $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); + $this->assertEquals('POST_CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); + } +} From e83f25a448f256515c0bf4967ef53bba77524962 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 19 Apr 2024 08:49:57 +0200 Subject: [PATCH 0087/1214] [ticket/12960] Remove not needed extra language variable PHPBB3-12960 --- phpBB/phpbb/captcha/plugins/incomplete.php | 3 +-- tests/captcha/incomplete_test.php | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/incomplete.php b/phpBB/phpbb/captcha/plugins/incomplete.php index 37301c45f57..ec3376c0a55 100644 --- a/phpBB/phpbb/captcha/plugins/incomplete.php +++ b/phpBB/phpbb/captcha/plugins/incomplete.php @@ -68,7 +68,6 @@ public static function get_name(): string */ public function init($type) { - $this->type = (int) $type; } /** @@ -111,7 +110,7 @@ public function get_template(): string $contact_link = phpbb_get_board_contact_link($this->config, $this->phpbb_root_path, $this->phpEx); $this->template->assign_vars([ - 'CONFIRM_LANG' => $this->type != CONFIRM_POST ? 'CONFIRM_INCOMPLETE' : 'POST_CONFIRM_INCOMPLETE', + 'CONFIRM_LANG' => 'CONFIRM_INCOMPLETE', 'CONTACT_LINK' => $contact_link, ]); diff --git a/tests/captcha/incomplete_test.php b/tests/captcha/incomplete_test.php index 88b6825fa93..c1da2b6c486 100644 --- a/tests/captcha/incomplete_test.php +++ b/tests/captcha/incomplete_test.php @@ -81,6 +81,6 @@ public function test_get_tempate(): void $this->incomplete_captcha->init(CONFIRM_POST); $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); - $this->assertEquals('POST_CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); + $this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); } } From 1c8128292caff906b21637fb8c5c246ac51b5be3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 21 Apr 2024 21:01:22 +0200 Subject: [PATCH 0088/1214] [ticket/17305] Change sql_sort to be more in line with previous code PHPBB3-17305 --- phpBB/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index af4f8dcb6cc..abd177f9d90 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -423,7 +423,7 @@ if ($sort_key == 'a') { $sort_join = USERS_TABLE . ' u, '; - $sql_sort = ' AND u.user_id = t.topic_last_poster_id ' . $sql_sort; + $sql_sort = ' AND u.user_id = ' . ($show_results == 'posts' ? 'p.poster_id' : 't.topic_last_poster_id ') . $sql_sort; } if ($show_results == 'posts') { From 17a50027b14689075f119a84b203d7137531d4a7 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sat, 20 Apr 2024 19:06:18 +0200 Subject: [PATCH 0089/1214] [ticket/17306] Change type description for get_context() PHPBB3-17306 --- phpBB/includes/functions_content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 1824533f22f..40e1b642395 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -320,7 +320,7 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po * Generates a text with approx. the specified length which contains the specified words and their context * * @param string $text The full text from which context shall be extracted -* @param string $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!) +* @param array $words An array of words which should be contained in the result, has to be a valid part of a PCRE pattern (escape with preg_quote!) * @param int $length The desired length of the resulting text, however the result might be shorter or longer than this value * * @return string Context of the specified words separated by "..." From 8f1a777c5f32434ce1eaee9a79738bb71f4ad108 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sat, 20 Apr 2024 19:06:18 +0200 Subject: [PATCH 0090/1214] [ticket/17306] Add type declaration to get_context and array for $words PHPBB3-17306 --- phpBB/includes/functions_content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 2f81c0db8da..941b2eb2462 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -324,7 +324,7 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po * * @return string Context of the specified words separated by "..." */ -function get_context($text, $words, $length = 400) +function get_context(string $text, array $words, int $length = 400) { // first replace all whitespaces with single spaces $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' ')); From 18a672c16e0b81b9881e0ab987274765d0e4bab4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Apr 2024 20:17:59 +0200 Subject: [PATCH 0091/1214] [ticket/17305] Add missing space to sql_sort PHPBB3-17305 --- phpBB/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index abd177f9d90..a81c42e6f00 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -423,7 +423,7 @@ if ($sort_key == 'a') { $sort_join = USERS_TABLE . ' u, '; - $sql_sort = ' AND u.user_id = ' . ($show_results == 'posts' ? 'p.poster_id' : 't.topic_last_poster_id ') . $sql_sort; + $sql_sort = ' AND u.user_id = ' . ($show_results == 'posts' ? 'p.poster_id ' : 't.topic_last_poster_id ') . $sql_sort; } if ($show_results == 'posts') { From 6c45c1ff6bbdb4d000c804e7e2d4ba36c30c0fdc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 25 Sep 2023 22:04:02 +0200 Subject: [PATCH 0092/1214] [ticket/15325] Do not show non-local permissions for local data PHPBB3-15325 --- phpBB/includes/acp/auth.php | 2 +- phpBB/phpbb/auth/auth.php | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/acp/auth.php b/phpBB/includes/acp/auth.php index efe0f0e5d17..85062896556 100644 --- a/phpBB/includes/acp/auth.php +++ b/phpBB/includes/acp/auth.php @@ -95,7 +95,7 @@ function get_mask($mode, $user_id = false, $group_id = false, $forum_id = false, } else { - $hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%', ($scope == 'global') ? 0 : false) : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false); + $hold_ary = ($group_id !== false) ? $this->acl_group_raw_data($group_id, $auth_option . '%') : $this->$acl_user_function($user_id, $auth_option . '%', ($scope == 'global') ? 0 : false); } } diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 55917ea9675..7e866bc20cd 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -776,6 +776,7 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false) $sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : ''; $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; + $is_local = $forum_id !== false ? 'AND ao.is_local <> 0' : ''; $sql_opts = ''; $hold_ary = $sql_ary = array(); @@ -787,9 +788,10 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false) // Grab group settings - non-role specific... $sql_ary[] = 'SELECT a.group_id, a.forum_id, a.auth_setting, a.auth_option_id, ao.auth_option - FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . ' ao + FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_OPTIONS_TABLE . " ao WHERE a.auth_role_id = 0 - AND a.auth_option_id = ao.auth_option_id ' . + AND a.auth_option_id = ao.auth_option_id + $is_local " . (($sql_group) ? 'AND a.' . $sql_group : '') . " $sql_forum $sql_opts @@ -797,9 +799,10 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false) // Now grab group settings - role specific... $sql_ary[] = 'SELECT a.group_id, a.forum_id, r.auth_setting, r.auth_option_id, ao.auth_option - FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . ' ao + FROM ' . ACL_GROUPS_TABLE . ' a, ' . ACL_ROLES_DATA_TABLE . ' r, ' . ACL_OPTIONS_TABLE . " ao WHERE a.auth_role_id = r.role_id - AND r.auth_option_id = ao.auth_option_id ' . + $is_local + AND r.auth_option_id = ao.auth_option_id " . (($sql_group) ? 'AND a.' . $sql_group : '') . " $sql_forum $sql_opts From 8dd6b5373dcde42c881a0c88821a04f3428b41af Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Apr 2024 21:33:09 +0200 Subject: [PATCH 0093/1214] [ticket/15325] Add test for displayed permissions PHPBB3-15325 --- tests/functional/acp_permissions_test.php | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php index ddd519506fe..92980dbfd7f 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -124,4 +124,29 @@ public function test_change_permission($description, $permission_type, $permissi $auth->acl($user_data); $this->assertEquals(0, $auth->acl_get($permission)); } + + public function test_forum_permissions_misc() + { + // Open forum moderators permissions page + $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=setting_mod_local&sid=" . $this->sid); + + // Select "Your first forum" + $form = $crawler->filter('#select_victim')->form(['forum_id' => [2]]); + $crawler = self::submit($form); + + // Select "Global moderators" + $form = $crawler->filter('#add_groups')->form(['group_id' => [4]]); + $crawler = self::submit($form); + + // Check that global permissions are not displayed + $this->add_lang('acp/permissions_phpbb'); + $page_text = $crawler->text(); + $this->assertNotContainsLang('ACL_M_BAN', $page_text); + $this->assertNotContainsLang('ACL_M_PM_REPORT', $page_text); + $this->assertNotContainsLang('ACL_M_WARN', $page_text); + + // Check that other permissions exist + $this->assertContainsLang('ACL_M_EDIT', $page_text); + $this->assertContainsLang('ACL_M_MOVE', $page_text); + } } From 6f45b467466c963d874bad1a442ce3c26b2e34dd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 1 May 2024 11:22:29 +0200 Subject: [PATCH 0094/1214] [ticket/17077] Add proper locking in PHP without releasing form tokens PHPBB3-17077 --- phpBB/phpbb/lock/posting.php | 22 ++----------------- phpBB/posting.php | 3 --- tests/lock/posting_test.php | 14 +++++++----- .../phpbb_functional_test_case.php | 16 ++++++++++++++ .../phpbb_test_case_helpers.php | 1 - 5 files changed, 26 insertions(+), 30 deletions(-) diff --git a/phpBB/phpbb/lock/posting.php b/phpBB/phpbb/lock/posting.php index 1fee36e63f1..569cad9971b 100644 --- a/phpBB/phpbb/lock/posting.php +++ b/phpBB/phpbb/lock/posting.php @@ -27,9 +27,6 @@ class posting /** @var string */ private $lock_name = ''; - /** @var bool Lock state */ - private $locked = false; - /** * Constructor for posting lock * @@ -67,29 +64,14 @@ public function acquire(int $creation_time, string $form_token): bool { $this->set_lock_name($creation_time, $form_token); - // Lock is held for session, cannot acquire it - if ($this->cache->_exists($this->lock_name)) + // Lock is held for session, cannot acquire it unless special flag for testing is set + if ($this->cache->_exists($this->lock_name) && !$this->config->offsetExists('ci_tests_no_lock_posting')) { return false; } - $this->locked = true; - $this->cache->put($this->lock_name, true, $this->config['flood_interval']); return true; } - - /** - * Release lock - * - * @return void - */ - public function release(): void - { - if ($this->locked) - { - $this->cache->destroy($this->lock_name); - } - } } diff --git a/phpBB/posting.php b/phpBB/posting.php index bea75081c14..f99b0db0061 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1565,9 +1565,6 @@ // The last parameter tells submit_post if search indexer has to be run $redirect_url = submit_post($mode, $post_data['post_subject'], $post_author_name, $post_data['topic_type'], $poll, $data, $update_message, ($update_message || $update_subject) ? true : false); - // Release lock after submitting post - $posting_lock->release(); - /** * This event allows you to define errors after the post action is performed * diff --git a/tests/lock/posting_test.php b/tests/lock/posting_test.php index e9a9cdfffb8..75716dd2bac 100644 --- a/tests/lock/posting_test.php +++ b/tests/lock/posting_test.php @@ -42,13 +42,15 @@ public function test_lock_acquire() $this->assertFalse($this->lock->acquire(100, 'foo')); $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); - $this->lock->release(); - $this->assertFalse($this->cache->_exists(sha1('100foo') . '_posting_lock')); + $this->assertFalse($this->lock->acquire(100, 'foo')); + $this->cache->put(sha1('100foo') . '_posting_lock', 'foo', -30); $this->assertTrue($this->lock->acquire(100, 'foo')); $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); - $this->lock->release(); - $this->lock->release(); // double release has no effect - $this->assertFalse($this->cache->_exists(sha1('100foo') . '_posting_lock')); + $this->config->offsetSet('ci_tests_no_lock_posting', true); + $this->assertTrue($this->lock->acquire(100, 'foo')); + $this->assertTrue($this->cache->_exists(sha1('100foo') . '_posting_lock')); + // Multiple acquires possible due to special ci test flag + $this->assertTrue($this->lock->acquire(100, 'foo')); } -} \ No newline at end of file +} diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index a90008c22ed..9e4cb364d0d 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -96,6 +96,14 @@ protected function setUp(): void $db = $this->get_db(); + // Special flag for testing without possibility to run into lock scenario. + // Unset entry and add it back if lock behavior for posting should be tested. + // Unset ci_tests_no_lock_posting from config + $db->sql_return_on_error(true); + $sql = 'INSERT INTO ' . CONFIG_TABLE . " (config_name, config_value) VALUES ('ci_tests_no_lock_posting', '1')"; + $this->db->sql_query($sql); + $db->sql_return_on_error(false); + foreach (static::setup_extensions() as $extension) { $this->purge_cache(); @@ -120,6 +128,11 @@ protected function tearDown(): void if ($this->db instanceof \phpbb\db\driver\driver_interface) { + // Unset ci_tests_no_lock_posting from config + $sql = 'DELETE FROM ' . CONFIG_TABLE . " + WHERE config_name = 'ci_tests_no_lock_posting'"; + $this->db->sql_query($sql); + // Close the database connections again this test $this->db->sql_close(); } @@ -193,6 +206,9 @@ public function __construct($name = NULL, array $data = [], $dataName = '') $this->excludeBackupStaticAttributes($backupStaticAttributesBlacklist); } + /** + * @return \phpbb\db\driver\driver_interface + */ protected function get_db() { global $phpbb_root_path, $phpEx; diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index c8cddb4352a..d22b1cb8fad 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -123,7 +123,6 @@ static public function get_test_config() { $config = array(); - if (extension_loaded('sqlite3')) { $config = array_merge($config, array( From 3f73ae8545fa0746519935ebe75b92988fb969fc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 May 2024 20:25:44 +0200 Subject: [PATCH 0095/1214] [ticket/17130] Reparse magic urls in posts based on actual content PHPBB3-17130 --- phpBB/phpbb/textreparser/base.php | 7 ++- .../text_reparser/plugins/post_text_test.php | 63 +++++++++++++++++++ .../plugins/test_row_based_plugin.php | 1 + 3 files changed, 69 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php index 2ee6ea2cb36..82a59a075d6 100644 --- a/phpBB/phpbb/textreparser/base.php +++ b/phpBB/phpbb/textreparser/base.php @@ -198,8 +198,8 @@ protected function guess_bbcodes(array $record) */ protected function guess_magic_url(array $record) { - // Look for or for a URL tag that's not immediately followed by - return (strpos($record['text'], '') !== false || preg_match('(]++>(?!))', $record['text'])); + // Look for magic URL markers or for a URL tag that's not immediately followed by + return preg_match('#.*?#', $record['text']) || preg_match('(]++>(?!))', $record['text']); } /** @@ -231,7 +231,10 @@ public function reparse_range($min_id, $max_id) */ protected function reparse_record(array $record) { + // Guess magic URL state based on actual record content before adding fields + $record['enable_magic_url'] = $this->guess_magic_url($record); $record = $this->add_missing_fields($record); + $flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0; $flags |= ($record['enable_smilies']) ? OPTION_FLAG_SMILIES : 0; $flags |= ($record['enable_magic_url']) ? OPTION_FLAG_LINKS : 0; diff --git a/tests/text_reparser/plugins/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php index 8ea71e65f50..ecd06ac9bf0 100644 --- a/tests/text_reparser/plugins/post_text_test.php +++ b/tests/text_reparser/plugins/post_text_test.php @@ -23,4 +23,67 @@ protected function get_reparser() { return new \phpbb\textreparser\plugins\post_text($this->db, POSTS_TABLE); } + + public function data_reparse_url(): array + { + return [ + [ // Reparse the same + 'https://www.example.com and some more text test included', + 'https://www.example.com and some more text test included', + ], + [ // Reparse without magic URL, shouldn't change + 'https://www.example.com and some more text test included', + 'https://www.example.com and some more text test included', + ], + [ // Reparse new format without magic URL, shouldn't change + 'https://www.example.com and some more text test included', + 'https://www.example.com and some more text test included', + ], + [ // Reparse with magic URL, should update to text formatter format + 'Foo is https://symfony.com/doc/current/service_container.html good', + 'Foo is https://symfony.com/doc/current/service_container.html good', + ], + [ // Reparse new format with magic URL, shouldn't change + 'Foo is https://symfony.com/doc/current/service_container.html good', + 'Foo is https://symfony.com/doc/current/service_container.html good', + ] + ]; + } + + /** + * @dataProvider data_reparse_url + */ + public function test_reparse_url(string $input_text, string $expected_text) + { + foreach ([true, false] as $enable_magic_url) + { + $record = [ + 'enable_bbcode' => true, + 'enable_smilies' => true, + 'enable_magic_url' => $enable_magic_url, + 'post_text' => $input_text, + 'bbcode_uid' => '', + ]; + + $sql = 'INSERT INTO ' . POSTS_TABLE . ' ' . $this->db->sql_build_array('INSERT', $record); + $this->db->sql_query($sql); + + $record['id'] = $this->db->sql_last_inserted_id(); + $record['text'] = $record['post_text']; + + // Call reparse_record via reflection + $reparser = $this->get_reparser(); + $reparser_reflection = new \ReflectionMethod($reparser, 'reparse_record'); + $reparser_reflection->setAccessible(true); + $reparser_reflection->invoke($reparser, $record); + + // Retrieve reparsed post text and compare with expectec + $sql = 'SELECT post_id, post_text FROM ' . POSTS_TABLE . ' WHERE post_id = ' . (int) $record['id']; + $result = $this->db->sql_query($sql); + $actual_text = $this->db->sql_fetchfield('post_text'); + $this->db->sql_freeresult($result); + + $this->assertSame($expected_text, $actual_text); + } + } } diff --git a/tests/text_reparser/plugins/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php index 700bead7e53..eca6b2dd67e 100644 --- a/tests/text_reparser/plugins/test_row_based_plugin.php +++ b/tests/text_reparser/plugins/test_row_based_plugin.php @@ -15,6 +15,7 @@ abstract class phpbb_textreparser_test_row_based_plugin extends phpbb_database_test_case { + /** @var \phpbb\db\driver\driver_interface */ protected $db; abstract protected function get_reparser(); From 42108b5e119efb149294cde85181aeecf483dae9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 May 2024 09:00:30 +0200 Subject: [PATCH 0096/1214] [ticket/15325] Remove no longer needed note about permissions being global PHPBB3-15325 --- phpBB/language/en/acp/permissions_phpbb.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index ab8939932b1..cd84dc1e968 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -159,9 +159,9 @@ 'ACL_M_MERGE' => 'Can merge topics', 'ACL_M_INFO' => 'Can view post details', - 'ACL_M_WARN' => 'Can issue warnings
This setting is only assigned globally. It is not forum based.', // This moderator setting is only global (and not local) - 'ACL_M_PM_REPORT' => 'Can close and delete reports of private messages
This setting is only assigned globally. It is not forum based.', // This moderator setting is only global (and not local) - 'ACL_M_BAN' => 'Can manage bans
This setting is only assigned globally. It is not forum based.', // This moderator setting is only global (and not local) + 'ACL_M_WARN' => 'Can issue warnings', + 'ACL_M_PM_REPORT' => 'Can close and delete reports of private messages', + 'ACL_M_BAN' => 'Can manage bans', )); // Admin Permissions From 4573e2eae02d8b8172c622c56f78034c3171392b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 4 May 2024 08:32:51 -0700 Subject: [PATCH 0097/1214] [ticket/17300] Replace Sticky and Announcement Icons PHPBB3-17300 Signed-off-by: Matt Friedman --- phpBB/phpbb/template/twig/extension/icon.php | 2 +- phpBB/styles/prosilver/imgs/svg/bullhorn.svg | 1 + phpBB/styles/prosilver/imgs/svg/globe.svg | 1 + phpBB/styles/prosilver/imgs/svg/thumbtack.svg | 1 + phpBB/styles/prosilver/template/mcp_forum.html | 6 +++--- phpBB/styles/prosilver/template/search_results.html | 6 +++--- phpBB/styles/prosilver/template/ucp_main_bookmarks.html | 6 +++--- phpBB/styles/prosilver/template/ucp_main_front.html | 6 +++--- phpBB/styles/prosilver/template/ucp_main_subscribed.html | 6 +++--- phpBB/styles/prosilver/template/viewforum_body.html | 6 +++--- tests/template/extension_test.php | 4 ++-- 11 files changed, 24 insertions(+), 21 deletions(-) create mode 100644 phpBB/styles/prosilver/imgs/svg/bullhorn.svg create mode 100644 phpBB/styles/prosilver/imgs/svg/globe.svg create mode 100644 phpBB/styles/prosilver/imgs/svg/thumbtack.svg diff --git a/phpBB/phpbb/template/twig/extension/icon.php b/phpBB/phpbb/template/twig/extension/icon.php index 8edd33bbc7d..37888538370 100644 --- a/phpBB/phpbb/template/twig/extension/icon.php +++ b/phpBB/phpbb/template/twig/extension/icon.php @@ -280,7 +280,7 @@ protected function prepare_svg(\Twig\TemplateWrapper $file, &$view_box = '') * * {{ Icon('font', { * 'bullhorn': topicrow.S_POST_GLOBAL or topicrow.S_POST_ANNOUNCE, - * 'star': topicrow.S_POST_STICKY, + * 'thumbtack': topicrow.S_POST_STICKY, * 'lock': topicrow.S_TOPIC_LOCKED, * 'fire': topicrow.S_TOPIC_HOT, * 'file': true, diff --git a/phpBB/styles/prosilver/imgs/svg/bullhorn.svg b/phpBB/styles/prosilver/imgs/svg/bullhorn.svg new file mode 100644 index 00000000000..2755c3b78bb --- /dev/null +++ b/phpBB/styles/prosilver/imgs/svg/bullhorn.svg @@ -0,0 +1 @@ + diff --git a/phpBB/styles/prosilver/imgs/svg/globe.svg b/phpBB/styles/prosilver/imgs/svg/globe.svg new file mode 100644 index 00000000000..c3405615094 --- /dev/null +++ b/phpBB/styles/prosilver/imgs/svg/globe.svg @@ -0,0 +1 @@ + diff --git a/phpBB/styles/prosilver/imgs/svg/thumbtack.svg b/phpBB/styles/prosilver/imgs/svg/thumbtack.svg new file mode 100644 index 00000000000..9a0adc18fa9 --- /dev/null +++ b/phpBB/styles/prosilver/imgs/svg/thumbtack.svg @@ -0,0 +1 @@ + diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index cff04e89bcc..786c09c5317 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -40,9 +40,9 @@

{L_FORUM}{L_COLON} {FORUM_NAME}

{{ Icon('svg', { - 'info-variant' : topicrow.S_POST_GLOBAL, - 'info-variant' : topicrow.S_POST_ANNOUNCE, - 'star' : topicrow.S_POST_STICKY, + 'globe' : topicrow.S_POST_GLOBAL, + 'bullhorn' : topicrow.S_POST_ANNOUNCE, + 'thumbtack' : topicrow.S_POST_STICKY, 'lock' : topicrow.S_TOPIC_LOCKED, 'arrow-right-bold' : topicrow.S_TOPIC_MOVED, 'fire' : topicrow.S_TOPIC_HOT, diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 8ea1bd05182..e7cd42ff4f9 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -82,9 +82,9 @@

{SEARCH_TITLE} - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 4de56d8fdbd..f5d8122628e 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.12-dev'); +@define('PHPBB_VERSION', '3.3.12-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index b7e85890e32..31072dbd6b8 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.12-dev'); +define('PHPBB_VERSION', '3.3.12-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 97ff395ac90..7ec43e3b547 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.12-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.12-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 74845a6b3a9215519888b712fe335a09ae6ae9e1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:36 +0200 Subject: [PATCH 0105/1214] [prep-release-3.3.12] Update version numbers to 3.3.12 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 54d7c7f8d69..2d6a868938d 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.11', + 'phpbb_version' => '3.3.12', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 8d7af0133e1..3f6f8a35d6f 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.11 -phpbb_version = 3.3.11 +style_version = 3.3.12 +phpbb_version = 3.3.12 # Defining a different template bitfield # template_bitfield = //g= From d2295b82f17ee8ed2da5a1584ebb3997a7a46d47 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:37 +0200 Subject: [PATCH 0106/1214] [prep-release-3.3.12] Add migration for 3.3.12-RC1 --- .../phpbb/db/migration/data/v33x/v3312rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3312rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php new file mode 100644 index 00000000000..77247b96f25 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3312rc1.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3312rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.12-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\jquery_update_v3', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.12-RC1']], + ]; + } +} From 6753961756da4998d98d651e6a09db763c088b38 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 12:59:38 +0200 Subject: [PATCH 0107/1214] [prep-release-3.3.12] Update stylesheet hashes for 3.3.12-RC1 --- phpBB/styles/prosilver/theme/stylesheet.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 5665c839baf..e866175bf71 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -12,10 +12,10 @@ @import url("utilities.css?hash=d8f72c42"); @import url("common.css?hash=a9741ba1"); @import url("links.css?hash=18286e16"); -@import url("content.css?hash=be57a41d"); +@import url("content.css?hash=d0e24377"); @import url("buttons.css?hash=56f0d25f"); @import url("cp.css?hash=50d868ab"); -@import url("forms.css?hash=b64464fb"); +@import url("forms.css?hash=9016b55c"); @import url("icons.css?hash=64da33ce"); @import url("colours.css?hash=fcb2f289"); -@import url("responsive.css?hash=87b53e08"); +@import url("responsive.css?hash=91525545"); From 7b734ef52996043b0ff940635ece56fe215de4fc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 13:01:53 +0200 Subject: [PATCH 0108/1214] [prep-release-3.3.12] Update changelog for 3.3.12-RC1 --- phpBB/docs/CHANGELOG.html | 46 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index b0e774b29e3..37fe4a2cb58 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

Changelog

  1. Changelog
      +
    • Changes since 3.3.11
    • Changes since 3.3.10
    • Changes since 3.3.10-RC1
    • Changes since 3.3.9
      • @@ -167,6 +168,51 @@

      Changelog

      +

      Changes since 3.3.11

      +

      Bug

      +
        +
      • [PHPBB3-14047] - Jabber discards messages when stream gets closed without waiting for acknowledgement
        • +
      • [PHPBB3-15325] - Global moderator permissions shown in forum moderator permissions
        • +
      • [PHPBB3-16470] - Memberlist bug - sorting by Last active date is incorrect
        • +
      • [PHPBB3-17077] - Multiple posts at once, even if the user shouldn't ignore the flood interval
        • +
      • [PHPBB3-17117] - Deactivated notification method leads to crash
        • +
      • [PHPBB3-17130] - Text reparser changes magic URL state in posts
        • +
      • [PHPBB3-17187] - Unread Topic URL Link Not Working On MCP View Forum Topic List
        • +
      • [PHPBB3-17200] - Color Parse Error In viewonline.php Legend
        • +
      • [PHPBB3-17201] - Redirect to installer might be invalid when accessing subfolder
        • +
      • [PHPBB3-17202] - The bidi.css File Is Loaded When Viewing LTR Topic Print View Page
        • +
      • [PHPBB3-17203] - Group Description With BBCode Ordered List Breaks Layout
        • +
      • [PHPBB3-17207] - Extensions are unable to use PHPBB_USE_BOARD_URL_PATH
        • +
      • [PHPBB3-17208] - Update Error YouTube Profilfeld
        • +
      • [PHPBB3-17212] - Who is online incorrectly reports page when posting with only post URL parameter
        • +
      • [PHPBB3-17237] - QUICKMOD_ACTION_NOT_ALLOWED uses " instead of '
        • +
      • [PHPBB3-17286] - Non-existent urls to be written down to session_page
        • +
      • [PHPBB3-17292] - Link to spamhaus.org no longer valid
        • +
      • [PHPBB3-17296] - mod_security false positive denies access to ACP
        • +
      • [PHPBB3-17302] - Password reset function does not update all necessary data
        • +
      • [PHPBB3-17306] - Wrong declaration of function input values
        • +
      +

      Improvement

      +
        +
      • [PHPBB3-17230] - Update doctum for PHP 8.1 support
        • +
      • [PHPBB3-17232] - Improve MySQL error messages in PHP 8.1+
        • +
      • [PHPBB3-17233] - Add PHP 8.3 tests to the 3.3.x branch
        • +
      • [PHPBB3-17235] - Missing autocomplete for username & password
        • +
      • [PHPBB3-17236] - Update symfony dependencies to improve PHP 8.3 compatibility
        • +
      • [PHPBB3-17277] - Add template events to UCP
        • +
      • [PHPBB3-17284] - Add event to add content after the online users list in viewtopic
        • +
      • [PHPBB3-17293] - Update composer and dependencies to latest versions
        • +
      • [PHPBB3-17299] - Allow core event to modify variables while sending email
        • +
      • [PHPBB3-17303] - Update jQuery to 3.7+
        • +
      • [PHPBB3-17305] - Improve queries for unanswered topics and posts
        • +
      • [PHPBB3-17310] - Update GitHub actions workflows to Node.js 20
        • +
      +

      Task

      +
        +
      • [PHPBB3-17204] - Update composer and node dependencies
        • +
      • [PHPBB3-17280] - Fallback to branch name on branches without ticket ID
        • +
      +

      Changes since 3.3.10

      Bug

        From de31c4e797e30173706536b43ee380b91724364b Mon Sep 17 00:00:00 2001 From: battye Date: Sun, 12 May 2024 09:53:07 +0000 Subject: [PATCH 0109/1214] [ticket/17175] Fix topic title in the breadcrumbs when emailing a topic PHPBB3-17175 --- phpBB/memberlist.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e9af6026d77..0c32adc6ba9 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -941,10 +941,19 @@ } else if ($topic_id) { - $sql = 'SELECT f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, f.forum_options, t.topic_title - FROM ' . FORUMS_TABLE . ' as f, - ' . TOPICS_TABLE . ' as t - WHERE t.forum_id = f.forum_id'; + // Generate the navlinks based on the selected topic + $navlinks_sql_array = [ + 'SELECT' => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, + f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, + f.forum_options, t.topic_title', + 'FROM' => [ + FORUMS_TABLE => 'f', + TOPICS_TABLE => 't', + ], + 'WHERE' => 't.forum_id = f.forum_id AND t.topic_id = ' . (int) $topic_id, + ]; + + $sql = $db->sql_build_query('SELECT', $navlinks_sql_array); $result = $db->sql_query($sql); $topic_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); From e195e2ad82523418dcefbc7b1596efbd926eabc8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 12 May 2024 21:10:16 +0200 Subject: [PATCH 0110/1214] [3.3.x] Update version to 3.3.13-dev --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index c3a741b8917..ce9bf52c65d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f5d8122628e..e7059af80d5 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.12-RC1'); +@define('PHPBB_VERSION', '3.3.13-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7ec43e3b547..cd8dc70e79d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.12-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 874fb8c59caacc34e17903835636d5cb5aa53cec Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Mon, 13 May 2024 19:21:52 +0200 Subject: [PATCH 0111/1214] [ticket/17311] Update PHP requirements and tested version PHPBB3-17176 --- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/README.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 2851151cddf..9262d2d612b 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -147,7 +147,7 @@

        Install

      • Oracle
      -
    • PHP 7.2.0+ up to and including PHP 8.1 with support for the database you intend to use.
      • +
    • PHP 7.2.0+ up to and including PHP 8.3 with support for the database you intend to use.
    • The following PHP modules are required:
      • json
        • diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 2560401cac2..97c18c82c9a 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -327,7 +327,7 @@

        Readme

        Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

        -

        This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 7.2.0 to 7.4.x, 8.0.x and 8.1.x.

        +

        This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 7.2.0 to 7.4.x and 8.0.x to 8.3.x.

        7.i. Notice on PHP security issues

        From 9cb10ec28d5920b06358084dc9cacedbebc96b22 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 13 May 2024 17:38:28 -0700 Subject: [PATCH 0112/1214] [ticket/17313] Add Push Module to Correct Parent PHPBB3-17313 Signed-off-by: Matt Friedman --- phpBB/phpbb/db/migration/data/v400/add_webpush.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush.php b/phpBB/phpbb/db/migration/data/v400/add_webpush.php index 351e02a3611..c0fabf722aa 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush.php @@ -77,7 +77,7 @@ public function update_data(): array ['config.add', ['webpush_vapid_private', '']], ['module.add', [ 'acp', - 'ACP_BOARD_CONFIGURATION', + 'ACP_CLIENT_COMMUNICATION', [ 'module_basename' => 'acp_board', 'module_langname' => 'ACP_WEBPUSH_SETTINGS', @@ -95,7 +95,7 @@ public function revert_data(): array ['config.remove', ['webpush_enable']], ['config.remove', ['webpush_vapid_public']], ['config.remove', ['webpush_vapid_private']], - ['module.remove', ['acp', 'ACP_BOARD_CONFIGURATION', 'ACP_WEBPUSH_SETTINGS']] + ['module.remove', ['acp', 'ACP_CLIENT_COMMUNICATION', 'ACP_WEBPUSH_SETTINGS']] ]; } } From a7a53de34d6372ccec79d3944741821b8592911e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 14 May 2024 21:42:02 +0200 Subject: [PATCH 0113/1214] [ticket/17312] Add migration for user_last_active column PHPBB3-17312 --- .../data/v33x/add_user_last_active.php | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php diff --git a/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php new file mode 100644 index 00000000000..58cc4f02401 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php @@ -0,0 +1,48 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +use phpbb\db\migration\migration; + +class add_user_last_active extends migration +{ + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3311', + ]; + } + + public function update_schema() + { + return [ + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'user_last_active' => ['TIMESTAMP', 0], + ], + ], + ]; + } + + public function revert_schema() + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'users' => [ + 'user_last_active' => ['TIMESTAMP', 0], + ], + ], + ]; + } +} From 766ecaed5a12bd01dfcd9b54f97ead8141739d1e Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 16 May 2024 11:55:24 +0100 Subject: [PATCH 0114/1214] [ticket/17315] Add template events to acp_groups PHPBB3-17315 --- phpBB/adm/style/acp_groups.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 8651b63b7f2..b91f91f12ef 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -225,6 +225,7 @@

        {L_ADD_USERS}

        {L_ADD_USERS} + {% EVENT acp_groups_add_user_form_before %}
        @@ -235,11 +236,13 @@

        {L_ADD_USERS}

        + {% EVENT acp_groups_add_user_form_during %}

        {L_USERNAMES_EXPLAIN}
        [ {L_FIND_USERNAME} ]
        + {% EVENT acp_groups_add_user_form_after %}

        From b2d2216b8741128cfa48a5af8540af0cd04c1535 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 16 May 2024 16:43:24 +0200 Subject: [PATCH 0115/1214] [ticket/17315] Rename events and add them to events.md PHPBB3-17315 --- phpBB/adm/style/acp_groups.html | 6 +++--- phpBB/docs/events.md | 18 ++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index b91f91f12ef..0df24bb1759 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -225,7 +225,7 @@

        {L_ADD_USERS}

        {L_ADD_USERS} - {% EVENT acp_groups_add_user_form_before %} + {% EVENT acp_groups_add_user_options_before %}
        @@ -236,13 +236,13 @@

        {L_ADD_USERS}

        - {% EVENT acp_groups_add_user_form_during %} + {% EVENT acp_groups_add_user_usernames_before %}

        {L_USERNAMES_EXPLAIN}
        [ {L_FIND_USERNAME} ]
        - {% EVENT acp_groups_add_user_form_after %} + {% EVENT acp_groups_add_user_options_after %}

        diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d05cb876fdb..48a6c22630a 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -184,6 +184,24 @@ acp_group_types_prepend * Since: 3.2.9-RC1 * Purpose: Add additional group type options to group settings (prepend the list) +acp_groups_add_user_options_after +=== +* Location: adm/style/acp_groups.html +* Since: 3.3.13-RC1 +* Purpose: Add content after options for adding user to group in the ACP + +acp_groups_add_user_options_before +=== +* Location: adm/style/acp_groups.html +* Since: 3.3.13-RC1 +* Purpose: Add content before options for adding user to group in the ACP + +acp_groups_add_user_usernames_before +=== +* Location: adm/style/acp_groups.html +* Since: 3.3.13-RC1 +* Purpose: Add content before usernames option for adding user to group in the ACP + acp_groups_find_username_append === * Location: adm/style/acp_groups.html From ed0b5020a9c2e2b1c7ee12ebf7ff0c3791f3f664 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 16 May 2024 20:40:56 +0200 Subject: [PATCH 0116/1214] [ticket/17312] Use user_last_active instead of user_lastvisit where possible PHPBB3-17312 --- phpBB/memberlist.php | 10 ++--- .../data/v33x/add_user_last_active.php | 39 +++++++++++++++-- phpBB/phpbb/session.php | 43 ++++++++++++++----- 3 files changed, 73 insertions(+), 19 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e9af6026d77..c36ebd697ac 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1036,7 +1036,7 @@ if ($auth->acl_get('u_viewonline')) { $sort_key_text['l'] = $user->lang['SORT_LAST_ACTIVE']; - $sort_key_sql['l'] = 'u.user_lastvisit'; + $sort_key_sql['l'] = 'u.user_last_active'; } $sort_key_text['m'] = $user->lang['SORT_RANK']; @@ -1138,15 +1138,15 @@ { if ($active_select === 'lt' && (int) $active[0] == 0 && (int) $active[1] == 0 && (int) $active[2] == 0) { - $sql_where .= ' AND u.user_lastvisit = 0'; + $sql_where .= ' AND u.user_last_active = 0'; } else if ($active_select === 'gt') { - $sql_where .= ' AND u.user_lastvisit ' . $find_key_match[$active_select] . ' ' . $active_time; + $sql_where .= ' AND u.user_last_active ' . $find_key_match[$active_select] . ' ' . $active_time; } else { - $sql_where .= ' AND (u.user_lastvisit > 0 AND u.user_lastvisit < ' . $active_time . ')'; + $sql_where .= ' AND (u.user_last_active > 0 AND u.user_last_active < ' . $active_time . ')'; } } } @@ -1713,7 +1713,7 @@ { $row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0; $row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0; - $row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_lastvisit']; + $row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_last_active']; $id_cache[$row['user_id']] = $row; } diff --git a/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php index 58cc4f02401..d4506eea392 100644 --- a/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php +++ b/phpBB/phpbb/db/migration/data/v33x/add_user_last_active.php @@ -29,7 +29,7 @@ public function update_schema() return [ 'add_columns' => [ $this->table_prefix . 'users' => [ - 'user_last_active' => ['TIMESTAMP', 0], + 'user_last_active' => ['TIMESTAMP', 0, 'after' => 'user_lastvisit'], ], ], ]; @@ -39,10 +39,41 @@ public function revert_schema() { return [ 'drop_columns' => [ - $this->table_prefix . 'users' => [ - 'user_last_active' => ['TIMESTAMP', 0], - ], + $this->table_prefix . 'users' => ['user_last_active'], ], ]; } + + public function update_data() + { + return [ + ['custom', [[$this, 'set_user_last_active']]], + ]; + } + + public function set_user_last_active($start = 0) + { + // Get maximum user id from database + $sql = "SELECT MAX(user_id) AS max_user_id + FROM {$this->table_prefix}users"; + $result = $this->db->sql_query($sql); + $max_id = (int) $this->db->sql_fetchfield('max_user_id'); + $this->db->sql_freeresult($result); + + if ($start > $max_id) + { + return; + } + + // Keep setting user_last_active time + $next_start = $start + 10000; + + $sql = 'UPDATE ' . $this->table_prefix . 'users + SET user_last_active = user_lastvisit + WHERE user_id > ' . (int) $start . ' + AND user_id <= ' . (int) ($next_start); + $this->db->sql_query($sql); + + return $next_start; + } } diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 7cb7e15d78f..af39ecf2fa0 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -440,10 +440,10 @@ function session_begin($update_session_page = true) // Is user banned? Are they excluded? Won't return on ban, exists within method $this->check_ban_for_current_session($config); - // Update user last visit time accordingly, but in a minute or so - if ((int) $this->data['session_time'] - (int) $this->data['user_lastvisit'] > 60) + // Update user last active time accordingly, but in a minute or so + if ((int) $this->data['session_time'] - (int) $this->data['user_last_active'] > 60) { - $this->update_user_lastvisit(); + $this->update_last_active_time(); } return true; @@ -690,8 +690,8 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f { $this->session_id = $this->data['session_id']; - // Only sync user last visit time in a minute or so after last session data update or if the page changes - if ((int) $this->data['session_time'] - (int) $this->data['user_lastvisit'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) + // Only update session DB a minute or so after last update or if page changes + if ($this->time_now - $this->data['session_time'] > 60 || ($this->update_session_page && $this->data['session_page'] != $this->page['page'])) { // Update the last visit time $this->update_user_lastvisit(); @@ -818,22 +818,26 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f $this->data['user_form_salt'] = unique_id(); // Update the form key $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\' + SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\', + user_last_active = ' . (int) $this->data['session_time'] . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } + else + { + $this->update_last_active_time(); + } } else { $this->data['session_time'] = $this->data['session_last_visit'] = $this->time_now; + $this->update_user_lastvisit(); + $SID = '?sid='; $_SID = ''; } - // Update the last visit time - $this->update_user_lastvisit(); - $session_data = $sql_ary; /** * Event to send new session data to extension @@ -1807,7 +1811,26 @@ public function update_user_lastvisit() if (isset($this->data['session_time'], $this->data['user_id'])) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ' + SET user_lastvisit = ' . (int) $this->data['session_time'] . ', + user_last_active = ' . (int) $this->data['session_time'] . ' + WHERE user_id = ' . (int) $this->data['user_id']; + $db->sql_query($sql); + } + } + + /** + * Update user's last active time + * + * @return void + */ + public function update_last_active_time() + { + global $db; + + if (isset($this->data['session_time'], $this->data['user_id'])) + { + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_last_active = ' . (int) $this->data['session_time'] . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } From 611faafaf3802a661814d9a7c1765017eed94630 Mon Sep 17 00:00:00 2001 From: battye Date: Fri, 17 May 2024 14:02:12 +0000 Subject: [PATCH 0117/1214] [ticket/17109] Check attach signature permissions Don't show the attach signature option if the user doesn't have permission or if the signature feature is disabled for the board. PHPBB3-17109 --- phpBB/includes/ucp/ucp_prefs.php | 2 ++ phpBB/posting.php | 2 +- phpBB/styles/prosilver/template/ucp_prefs_post.html | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 0d6a178c672..3bb575106a7 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -488,6 +488,8 @@ function main($id, $mode) } $template->assign_vars(array( + 'S_SIG_ALLOWED' => $config['allow_sig'] && $auth->acl_get('u_sig'), + 'S_BBCODE' => $data['bbcode'], 'S_SMILIES' => $data['smilies'], 'S_SIG' => $data['sig'], diff --git a/phpBB/posting.php b/phpBB/posting.php index f99b0db0061..b3562b48f03 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1966,7 +1966,7 @@ 'S_BBCODE_CHECKED' => ($bbcode_checked) ? ' checked="checked"' : '', 'S_SMILIES_ALLOWED' => $smilies_status, 'S_SMILIES_CHECKED' => ($smilies_checked) ? ' checked="checked"' : '', - 'S_SIG_ALLOWED' => ($auth->acl_get('f_sigs', $forum_id) && $config['allow_sig'] && $user->data['is_registered']) ? true : false, + 'S_SIG_ALLOWED' => ($user->data['is_registered'] && $config['allow_sig'] && $auth->acl_get('f_sigs', $forum_id) && $auth->acl_get('u_sig')) ? true : false, 'S_SIGNATURE_CHECKED' => ($sig_checked) ? ' checked="checked"' : '', 'S_NOTIFY_ALLOWED' => (!$user->data['is_registered'] || ($mode == 'edit' && $user->data['user_id'] != $post_data['poster_id']) || !$config['allow_topic_notify'] || !$config['email_enable']) ? false : true, 'S_NOTIFY_CHECKED' => ($notify_checked) ? ' checked="checked"' : '', diff --git a/phpBB/styles/prosilver/template/ucp_prefs_post.html b/phpBB/styles/prosilver/template/ucp_prefs_post.html index 39197c50623..4a7e7896672 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_post.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_post.html @@ -23,6 +23,7 @@

        {L_TITLE}

        + {% if S_SIG_ALLOWED %}
        @@ -30,6 +31,7 @@

        {L_TITLE}

        + {% endif %}
        From f9861384675725466a5210e00ed33bd3712636f3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 17 May 2024 16:41:40 +0200 Subject: [PATCH 0118/1214] [ticket/17312] Update tests for new column PHPBB3-17312 --- tests/auth/provider_apache_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index 567ec538f20..2dbb1f32a98 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -115,6 +115,7 @@ public function test_autologin() 'user_email' => 'example@example.com', 'user_birthday' => '', 'user_lastvisit' => 0, + 'user_last_active' => 0, 'user_lastmark' => 0, 'user_lastpost_time' => 0, 'user_lastpage' => '', From 8954a689538da6431b67fd215cc661b363fd5de2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 May 2024 09:37:09 +0200 Subject: [PATCH 0119/1214] [ticket/17308] Change project key to start with PHPBB- PHPBB-17308 --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- git-tools/hooks/commit-msg | 4 ++-- git-tools/hooks/prepare-commit-msg | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 179d83d8372..c7bec59af96 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -7,4 +7,4 @@ Checklist: Tracker ticket: -https://tracker.phpbb.com/browse/PHPBB3-12345 +https://tracker.phpbb.com/browse/PHPBB-12345 diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg index 5f5e9c29ceb..6405d5b7c80 100755 --- a/git-tools/hooks/commit-msg +++ b/git-tools/hooks/commit-msg @@ -224,7 +224,7 @@ do "footer") err=$ERR_FOOTER; # Each ticket is on its own line - echo "$line" | grep -Eq "^PHPBB3-[0-9]+$"; + echo "$line" | grep -Eq "^PHPBB3?-[0-9]+$"; ;; "eof") err=$ERR_EOF; @@ -356,7 +356,7 @@ echo "$expecting" | grep -q "eof" || ( # Check the branch ticket is mentioned, doesn't make sense otherwise if [ $ticket -gt 0 ] then - echo "$tickets" | grep -Eq "\bPHPBB3-$ticket\b" || ( + echo "$tickets" | grep -Eq "\bPHPBB3?-$ticket\b" || ( complain "Ticket ID [$ticket] of branch missing from list of tickets:" >&2; complain "$tickets" | sed 's/ /\n/g;s/^/* /g' >&2; quit $ERR_FOOTER; diff --git a/git-tools/hooks/prepare-commit-msg b/git-tools/hooks/prepare-commit-msg index 83db1f9ba16..6e5b701fdea 100755 --- a/git-tools/hooks/prepare-commit-msg +++ b/git-tools/hooks/prepare-commit-msg @@ -47,7 +47,7 @@ then # Branch is prefixed with 'ticket/', append ticket ID to message if [ "$branch" != "${branch##ticket/}" ]; then - tail="$(printf '\n\nPHPBB3-%s' "$ticket_id")"; + tail="$(printf '\n\nPHPBB-%s' "$ticket_id")"; fi fi From 9ecf09dbe8b88eef81e3a987cd30ece4e323ed98 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 18 May 2024 20:58:07 +0200 Subject: [PATCH 0120/1214] [ticket/17312] Add and use user_last_active where needed and useful PHPBB3-17312 --- phpBB/includes/acp/acp_users.php | 2 +- phpBB/includes/functions_display.php | 2 +- phpBB/includes/functions_user.php | 1 + phpBB/install/convertors/convert_phpbb20.php | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 14864cfdd48..7c3468f90df 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1084,7 +1084,7 @@ function main($id, $mode) $s_action_options .= ''; } - $last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_lastvisit']; + $last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_last_active']; $inactive_reason = ''; if ($user_row['user_type'] == USER_INACTIVE) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 8fd70855868..d995676e8fb 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1603,7 +1603,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) { - $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_lastvisit']; + $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_last_active']; } else { diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 0110034016e..25adf4215aa 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -227,6 +227,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'user_inactive_time' => 0, 'user_lastmark' => time(), 'user_lastvisit' => 0, + 'user_last_active' => 0, 'user_lastpost_time' => 0, 'user_lastpage' => '', 'user_posts' => 0, diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 2d6a868938d..7f9449609ef 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -901,6 +901,7 @@ array('user_email', 'users.user_email', 'strtolower'), array('user_birthday', ((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''), 'phpbb_get_birthday'), array('user_lastvisit', 'users.user_lastvisit', 'intval'), + array('user_last_active', 'users.user_lastvisit', 'intval'), array('user_lastmark', 'users.user_lastvisit', 'intval'), array('user_lang', $config['default_lang'], ''), array('', 'users.user_lang', ''), From 7d8b4d58174653a3655a49aa59950c6d8e7647e2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 18 May 2024 20:54:59 -0700 Subject: [PATCH 0121/1214] [ticket/17318] Fix notification avatars in dropdown PHPBB3-17318 Signed-off-by: Matt Friedman --- phpBB/styles/prosilver/template/notification_dropdown.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index e4fc984d8a5..31e7d4309e7 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -22,7 +22,7 @@ - {notifications.AVATAR_HTML} + {notifications.AVATAR_HTML}

        {notifications.FORMATTED_TITLE}

        {notifications.REFERENCE}

        From e850915190ab2907845b8a5c8dac5ff5ff0045ba Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 23 May 2024 16:35:28 +0100 Subject: [PATCH 0122/1214] [ticket/17320] Remove unused js code from prosilver The forum_fn.js file contained a small block of code that was commented out so there is no need to keep it in the codebase, especially as it was a fix for IE8 and older browsers. PHPBB3-17320 --- phpBB/styles/prosilver/template/forum_fn.js | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 60a2fd8faa9..009a9de6219 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -329,17 +329,6 @@ function parseDocument($container) { }, 100); }); - /** - * Adjust HTML code for IE8 and older versions - */ - // if (oldBrowser) { - // // Fix .linklist.bulletin lists - // $container - // .find('ul.linklist.bulletin > li') - // .filter(':first-child, .rightside:last-child') - // .addClass('no-bulletin'); - // } - /** * Resize navigation (breadcrumbs) block to keep all links on same line */ From cd34cdedee2e6470238b5ee12154fd056f6192e8 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 17 May 2024 12:48:37 +0100 Subject: [PATCH 0123/1214] [ticket/17317] Change button text for pm recipient to increase readability PHPBB3-17317 --- phpBB/styles/prosilver/template/posting_pm_header.html | 4 ++-- phpBB/styles/prosilver/theme/common.css | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 2fee21fd971..738d5b25f2d 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -31,7 +31,7 @@
        • - + {to_recipient.NAME}{to_recipient.NAME_FULL}
          • @@ -48,7 +48,7 @@
          • - + {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}
            • diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e1d9e757f9c..ebfb4782744 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -780,10 +780,10 @@ fieldset.fields1 dd.recipients { margin-left: 1em; } -fieldset.fields1 ul.recipients input.button2 { +fieldset.fields1 ul.recipients input.button2 { font-size: 0.8em; margin-right: 0; - padding: 0; + padding: 2px 0; } fieldset.fields1 dl.pmlist > dt { From 40ed6c6458b5db0ab3ce817cf0b2310af101fea3 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 17 May 2024 12:58:27 +0100 Subject: [PATCH 0124/1214] [ticket/17317] Fix padding on button, left and right not top and bottom PHPBB3-17317 --- phpBB/styles/prosilver/theme/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index ebfb4782744..eaa9cf332ab 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -783,7 +783,7 @@ fieldset.fields1 dd.recipients { fieldset.fields1 ul.recipients input.button2 { font-size: 0.8em; margin-right: 0; - padding: 2px 0; + padding: 0 2px; } fieldset.fields1 dl.pmlist > dt { From 9fcf956888c2f5fce21a0d1c072387b360deb225 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 22 May 2024 11:17:25 +0100 Subject: [PATCH 0125/1214] [ticket/17317] Replace button with small red fa-icon Updated the button to a small red X using Font Awesome rather than using the default phpBB button with text which adds a better visual distinction in the interface between the username and action. Credit to @iMattPro for the suggestion in the ticket comments. PHPBB3-17317 --- .../styles/prosilver/template/posting_pm_header.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index 738d5b25f2d..aecd98eacce 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -31,7 +31,11 @@
            • - + + + {to_recipient.NAME}{to_recipient.NAME_FULL}
              • @@ -48,7 +52,11 @@
              • - + + + {bcc_recipient.NAME}{bcc_recipient.NAME_FULL}
                • From c330500c4d46de0cd39c030217d1672a084d00e7 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 22 May 2024 17:39:24 +0100 Subject: [PATCH 0126/1214] [ticket/17317] Add new icon for groups and remove CSS change PHPBB3-17317 --- phpBB/styles/prosilver/template/posting_pm_header.html | 8 ++++++-- phpBB/styles/prosilver/theme/common.css | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/posting_pm_header.html b/phpBB/styles/prosilver/template/posting_pm_header.html index aecd98eacce..6b03febeec0 100644 --- a/phpBB/styles/prosilver/template/posting_pm_header.html +++ b/phpBB/styles/prosilver/template/posting_pm_header.html @@ -77,8 +77,12 @@ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index eaa9cf332ab..dc4d7e07bd2 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -783,7 +783,7 @@ fieldset.fields1 dd.recipients { fieldset.fields1 ul.recipients input.button2 { font-size: 0.8em; margin-right: 0; - padding: 0 2px; + padding: 0; } fieldset.fields1 dl.pmlist > dt { From 92e545fc26185ac236aa6a880a483ed33824bd45 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 23 May 2024 16:25:57 +0100 Subject: [PATCH 0127/1214] [ticket/17317] Remove unused CSS styling for inputs PHPBB3-17317 --- phpBB/styles/prosilver/theme/common.css | 6 ------ 1 file changed, 6 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index dc4d7e07bd2..e184557a894 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -780,12 +780,6 @@ fieldset.fields1 dd.recipients { margin-left: 1em; } -fieldset.fields1 ul.recipients input.button2 { - font-size: 0.8em; - margin-right: 0; - padding: 0; -} - fieldset.fields1 dl.pmlist > dt { width: auto !important; } From 05fafdc44555fd216adffe50eddc5a6a9452d087 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 25 May 2024 04:40:44 +0200 Subject: [PATCH 0128/1214] [ticket/17323] Fix division by 0 when there is 0 posts PHPBB3-17323 --- phpBB/includes/acp/acp_search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_search.php b/phpBB/includes/acp/acp_search.php index 48a3b103f5c..2cd7529222c 100644 --- a/phpBB/includes/acp/acp_search.php +++ b/phpBB/includes/acp/acp_search.php @@ -516,7 +516,7 @@ protected function get_post_index_progress(int $post_counter): array $this->db->sql_freeresult($result); $total_count = $done_count + $remain_count; - $percent = ($done_count / $total_count) * 100; + $percent = $total_count > 0 ? ($done_count / $total_count) * 100 : 100; return [ 'VALUE' => $done_count, From 72770937f216f8e6bbf168ec3647b45b1e32b342 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 19 Sep 2023 00:32:24 +0700 Subject: [PATCH 0129/1214] [ticket/17151] Make settings forms use macros PHPBB3-17151 --- phpBB/includes/acp/acp_board.php | 160 ++++++++++++++---- phpBB/includes/functions.php | 18 +- phpBB/includes/functions_acp.php | 55 +++--- phpBB/phpbb/template/twig/extension/forms.php | 13 +- .../all/template/macros/forms/select.twig | 11 +- .../all/template/macros/forms/textarea.twig | 3 +- .../template/ucp_prefs_personal.html | 4 +- 7 files changed, 187 insertions(+), 77 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index d0ced6788f3..1f8f632788f 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -851,7 +851,7 @@ function select_auth_method($selected_method, $key = '') /* @var $auth_providers \phpbb\auth\provider_collection */ $auth_providers = $phpbb_container->get('auth.provider_collection'); - $auth_plugins = array(); + $auth_plugins = []; foreach ($auth_providers as $key => $value) { @@ -864,14 +864,22 @@ function select_auth_method($selected_method, $key = '') sort($auth_plugins); - $auth_select = ''; + $auth_select_options = []; foreach ($auth_plugins as $method) { - $selected = ($selected_method == $method) ? ' selected="selected"' : ''; - $auth_select .= "'; + $auth_select_options[] = [ + 'value' => $method, + 'selected' => $selected_method == $method, + 'label' => ucfirst($method), + 'data' => [ + 'toggle-setting' => "#auth_{$method}_settings", + ], + ]; } - return $auth_select; + return [ + 'options' => $auth_select_options, + ]; } /** @@ -881,15 +889,21 @@ function mail_auth_select($selected_method, $key = '') { global $user; - $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP'); - $s_smtp_auth_options = ''; + $auth_methods = ['PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP']; + $s_smtp_auth_options = []; foreach ($auth_methods as $method) { - $s_smtp_auth_options .= ''; + $s_smtp_auth_options[] = [ + 'value' => $method, + 'selected' => $selected_method == $method, + 'label' => $user->lang('SMTP_' . str_replace('-', '_', $method)), + ]; } - return $s_smtp_auth_options; + return [ + 'options' => $s_smtp_auth_options, + ]; } /** @@ -899,7 +913,22 @@ function full_folder_select($value, $key = '') { global $user; - return ''; + $full_folder_select_options = [ + 0 => [ + 'value' => 1, + 'selected' => $value == 1, + 'label' => $user->lang('DELETE_OLDEST_MESSAGES'), + ], + 1 => [ + 'value' => 2, + 'selected' => $value == 2, + 'label' => $user->lang('HOLD_NEW_MESSAGES_SHORT'), + ], + ]; + + return [ + 'options' => $full_folder_select_options, + ]; } /** @@ -907,7 +936,7 @@ function full_folder_select($value, $key = '') */ function select_ip_check($value, $key = '') { - $radio_ary = array(4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION'); + $radio_ary = [4 => 'ALL', 3 => 'CLASS_C', 2 => 'CLASS_B', 0 => 'NO_IP_VALIDATION']; return h_radio('config[ip_check]', $radio_ary, $value, $key); } @@ -917,7 +946,7 @@ function select_ip_check($value, $key = '') */ function select_ref_check($value, $key = '') { - $radio_ary = array(REFERER_VALIDATE_PATH => 'REF_PATH', REFERER_VALIDATE_HOST => 'REF_HOST', REFERER_VALIDATE_NONE => 'NO_REF_VALIDATION'); + $radio_ary = [REFERER_VALIDATE_PATH => 'REF_PATH', REFERER_VALIDATE_HOST => 'REF_HOST', REFERER_VALIDATE_NONE => 'NO_REF_VALIDATION']; return h_radio('config[referer_validation]', $radio_ary, $value, $key); } @@ -929,23 +958,28 @@ function select_acc_activation($selected_value, $value) { global $user, $config; - $act_ary = array( - 'ACC_DISABLE' => array(true, USER_ACTIVATION_DISABLE), - 'ACC_NONE' => array(true, USER_ACTIVATION_NONE), - 'ACC_USER' => array($config['email_enable'], USER_ACTIVATION_SELF), - 'ACC_ADMIN' => array($config['email_enable'], USER_ACTIVATION_ADMIN), - ); + $act_ary = [ + 'ACC_DISABLE' => [true, USER_ACTIVATION_DISABLE], + 'ACC_NONE' => [true, USER_ACTIVATION_NONE], + 'ACC_USER' => [$config['email_enable'], USER_ACTIVATION_SELF], + 'ACC_ADMIN' => [$config['email_enable'], USER_ACTIVATION_ADMIN], + ]; - $act_options = ''; + $act_options = []; foreach ($act_ary as $key => $data) { list($available, $value) = $data; - $selected = ($selected_value == $value) ? ' selected="selected"' : ''; - $class = (!$available) ? ' class="disabled-option"' : ''; - $act_options .= ''; + $act_options[] = [ + 'value' => $value, + 'selected' => $selected_value == $value, + 'label' => $user->lang($key), + 'disabled' => !$available, + ]; } - return $act_options; + return [ + 'options' => $act_options, + ]; } /** @@ -955,7 +989,27 @@ function username_length($value, $key = '') { global $user; - return ' ' . $user->lang['MIN_CHARS'] . '   ' . $user->lang['MAX_CHARS']; + return [ + [ + 'tag' => 'input', + 'id' => $key, + 'type' => 'number', + 'name' => 'config[min_name_chars]', + 'min' => 1, + 'max' => 999, + 'value' => $value, + 'append' => $user->lang('MIN_CHARS') . '  ', + ], + [ + 'tag' => 'input', + 'type' => 'number', + 'name' => 'config[max_name_chars]', + 'min' => 8, + 'max' => 180, + 'value' => $this->new_config['max_name_chars'], + 'append' => $user->lang('MAX_CHARS'), + ], + ]; } /** @@ -965,15 +1019,20 @@ function select_username_chars($selected_value, $key) { global $user; - $user_char_ary = array('USERNAME_CHARS_ANY', 'USERNAME_ALPHA_ONLY', 'USERNAME_ALPHA_SPACERS', 'USERNAME_LETTER_NUM', 'USERNAME_LETTER_NUM_SPACERS', 'USERNAME_ASCII'); - $user_char_options = ''; + $user_char_ary = ['USERNAME_CHARS_ANY', 'USERNAME_ALPHA_ONLY', 'USERNAME_ALPHA_SPACERS', 'USERNAME_LETTER_NUM', 'USERNAME_LETTER_NUM_SPACERS', 'USERNAME_ASCII']; + $user_char_options = []; foreach ($user_char_ary as $user_type) { - $selected = ($selected_value == $user_type) ? ' selected="selected"' : ''; - $user_char_options .= ''; + $user_char_options[] = [ + 'value' => $user_type, + 'selected' => $selected_value == $user_type, + 'label' => $user->lang($user_type), + ]; } - return $user_char_options; + return [ + 'options' => $user_char_options, + ]; } /** @@ -983,7 +1042,16 @@ function password_length($value, $key) { global $user; - return ' ' . $user->lang['MIN_CHARS']; + return [ + [ + 'tag' => 'input', + 'id' => $key, + 'type' => 'number', + 'name' => 'config[min_pass_chars]', + 'value' => $value, + 'append' => $user->lang('MIN_CHARS'), + ], + ]; } /** @@ -994,14 +1062,20 @@ function select_password_chars($selected_value, $key) global $user; $pass_type_ary = array('PASS_TYPE_ANY', 'PASS_TYPE_CASE', 'PASS_TYPE_ALPHA', 'PASS_TYPE_SYMBOL'); - $pass_char_options = ''; + $pass_char_options = []; foreach ($pass_type_ary as $pass_type) { - $selected = ($selected_value == $pass_type) ? ' selected="selected"' : ''; - $pass_char_options .= ''; + $pass_char_options[] = [ + 'tag' => 'select', + 'value' => $pass_type, + 'selected' => $selected_value == $pass_type, + 'label' => $user->lang[$pass_type], + ]; } - return $pass_char_options; + return [ + 'options' => $pass_char_options, + ]; } /** @@ -1359,8 +1433,22 @@ function send_test_email($value, $key) { global $user; - return ' - '; + return [ + [ + 'tag' => 'input', + 'type' => 'submit', + 'name' => $key, + 'id' => $key, + 'class' => 'button2', + 'value' => $user->lang('SEND_TEST_EMAIL'), + ], + [ + 'tag' => 'textarea', + 'name' => $key . '_text', + 'id' => $key . '_text', + 'placeholder' => $user->lang('MESSAGE'), + ], + ]; } /** diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bca9a97c48c..0bdb36eb795 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -291,7 +291,9 @@ function phpbb_language_select(\phpbb\db\driver\driver_interface $db, string $de ]; } - return $lang_options; + return [ + 'options' => $lang_options + ]; } /** @@ -319,14 +321,20 @@ function style_select($default = '', $all = false, array $styledata = []) $db->sql_freeresult($result); } - $style_options = ''; + $style_options = []; foreach ($styledata as $row) { - $selected = ($row['style_id'] == $default) ? ' selected="selected"' : ''; - $style_options .= ''; + $style_options[] = [ + 'tag' => 'select', + 'value' => $row['style_id'], + 'selected' => $row['style_id'] == $default, + 'label' => $row['style_name'], + ]; } - return $style_options; + return [ + 'options' => $style_options, + ]; } /** diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index b8f007cdfd2..6058b948fb8 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -398,6 +398,32 @@ function phpbb_build_cfg_template(array $tpl_type, string $key, &$new_ary, $conf $tpl['buttons'] = [$no_button, $yes_button]; } break; + + case 'select': + $tpl = [ + 'tag' => 'select', + 'class' => $tpl_type['class'] ?? false, + 'id' => $key, + 'data' => $tpl_type['data'] ?? [], + 'name' => $name, + 'toggleable' => !empty($tpl_type[2]) || !empty($tpl_type['toggleable']), + 'options' => $tpl_type['options'], + 'group_only' => $tpl_type['group_only'] ?? false, + 'size' => $tpl_type[1] ?? $tpl_type['size'] ?? 1, + 'multiple' => $tpl_type['multiple'] ?? false, + ]; + break; + + case 'button': + $tpl = [ + 'tag' => 'input', + 'class' => $tpl_type['options']['class'], + 'id' => $key, + 'type' => $tpl_type['options']['type'], + 'name' => $tpl_type['options']['name'] ?? $name, + 'value' => $tpl_type['options']['value'], + ]; + break; } return $tpl; @@ -484,38 +510,15 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) $return = call_user_func_array($call, $args); - if ($tpl_type[0] == 'select') + if (in_array($tpl_type[0], ['select', 'button'])) { - $size = (isset($tpl_type[1])) ? (int) $tpl_type[1] : 1; - - if (is_string($return)) - { - $data_toggle = (!empty($tpl_type[2])) ? ' data-togglable-settings="true"' : ''; - - $tpl = ''; - } - else - { - $tpl = [ - 'tag' => 'select', - 'id' => $key, - 'name' => $name, - 'toggleable' => !empty($tpl_type[2]), - 'options' => $return, - ]; - - // Add size if it differs from default value of 1 - if ($size != 1) - { - $tpl['size'] = $size; - } - } + $tpl_type = array_merge($tpl_type, $return); + $tpl = phpbb_build_cfg_template($tpl_type, $key, $new_ary, $config_key, $vars); } else { $tpl = $return; } - break; default: diff --git a/phpBB/phpbb/template/twig/extension/forms.php b/phpBB/phpbb/template/twig/extension/forms.php index 4d8de94b9d3..ee47e19449c 100644 --- a/phpBB/phpbb/template/twig/extension/forms.php +++ b/phpBB/phpbb/template/twig/extension/forms.php @@ -179,7 +179,7 @@ public function select(environment $environment, array $form_data): string 'CLASS' => (string) ($form_data['class'] ?? ''), 'ID' => (string) ($form_data['id'] ?? ''), 'DATA' => $form_data['data'] ?? [], - 'NAME' => (string) $form_data['name'], + 'NAME' => (string) ($form_data['name'] ?? ''), 'TOGGLEABLE' => (bool) ($form_data['toggleable'] ?? false), 'OPTIONS' => $form_data['options'] ?? [], 'GROUP_ONLY' => (bool) ($form_data['group_only'] ?? false), @@ -206,13 +206,14 @@ public function textarea(environment $environment, array $form_data): string try { return $environment->render('macros/forms/textarea.twig', [ - 'CLASS' => (string) ($form_data['class'] ?? ''), + 'CLASS' => (string) ($form_data['class'] ?? ''), 'ID' => (string) $form_data['id'], - 'DATA' => $form_data['data'] ?? [], + 'DATA' => $form_data['data'] ?? [], 'NAME' => (string) $form_data['name'], - 'ROWS' => (int) $form_data['rows'], - 'COLS' => (int) $form_data['cols'], - 'CONTENT' => (string) $form_data['content'], + 'ROWS' => (int) ($form_data['rows'] ?? ''), + 'COLS' => (int) ($form_data['cols'] ?? ''), + 'CONTENT' => (string) ($form_data['content'] ?? ''), + 'PLACEHOLDER' => (string) ($form_data['placeholder'] ?? ''), ]); } catch (\Twig\Error\Error $e) diff --git a/phpBB/styles/all/template/macros/forms/select.twig b/phpBB/styles/all/template/macros/forms/select.twig index 3cab1e71998..1ff690268f5 100644 --- a/phpBB/styles/all/template/macros/forms/select.twig +++ b/phpBB/styles/all/template/macros/forms/select.twig @@ -21,11 +21,18 @@ label="{{ element.label }}"> {% endapply %} {% for option in element.options %} - + {% endfor %} {% else %} - + {% endif %} {% endfor %} diff --git a/phpBB/styles/all/template/macros/forms/textarea.twig b/phpBB/styles/all/template/macros/forms/textarea.twig index e4fada13f2b..a81c5a09cfe 100644 --- a/phpBB/styles/all/template/macros/forms/textarea.twig +++ b/phpBB/styles/all/template/macros/forms/textarea.twig @@ -7,4 +7,5 @@ {% endfor %} name="{{ NAME }}" rows="{{ ROWS }}" - cols="{{ COLS }}">{% endapply %}{{ CONTENT }} + cols="{{ COLS }}" + {% if PLACEHOLDER %}placeholder="{{ PLACEHOLDER }}"{% endif %}>{% endapply %}{{ CONTENT }} diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index 4e81b78fb36..fe1ea17c746 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -61,7 +61,9 @@

                {L_TITLE}

                -
                +
                + {{ FormsSelect(S_STYLE_OPTIONS) }} +
                From 9350e82d71f19ce29a63f3eec7c5e9c5365086a7 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 19 Sep 2023 10:23:08 +0700 Subject: [PATCH 0130/1214] [ticket/17151] Fix test error PHPBB3-17151 --- tests/functions_acp/build_cfg_template_test.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php index 76558152ff8..8153fdfabfd 100644 --- a/tests/functions_acp/build_cfg_template_test.php +++ b/tests/functions_acp/build_cfg_template_test.php @@ -506,13 +506,14 @@ public function test_build_cfg_template_select($tpl_type, $key, $new, $config_ke public function select_helper() { - return build_select( - array( - '1' => 'First_Option', - '2' => 'Second_Option', - '3' => 'Third_Option', - ), - '2' - ); + return [ + 'options' => build_select( + [ + '1' => 'First_Option', + '2' => 'Second_Option', + '3' => 'Third_Option', + ], + '2'), + ]; } } From 52517a5efde8805328fc20f7a2c0964b3dae6888 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 19 Sep 2023 13:16:57 +0700 Subject: [PATCH 0131/1214] [ticket/17151] Fix registration test error PHPBB3-17151 --- phpBB/adm/style/acp_bots.html | 8 ++++++-- phpBB/adm/style/acp_users_prefs.html | 4 +++- phpBB/includes/acp/acp_board.php | 16 ++++++++++++++-- phpBB/includes/acp/acp_bots.php | 23 +++++++++++++++++------ phpBB/includes/acp/acp_users.php | 6 +++++- phpBB/includes/functions.php | 9 ++------- phpBB/includes/ucp/ucp_prefs.php | 10 +++++++--- 7 files changed, 54 insertions(+), 22 deletions(-) diff --git a/phpBB/adm/style/acp_bots.html b/phpBB/adm/style/acp_bots.html index b4f8ea50721..8332df7e2b5 100644 --- a/phpBB/adm/style/acp_bots.html +++ b/phpBB/adm/style/acp_bots.html @@ -27,7 +27,9 @@

                {L_WARNING}


        {L_BOT_STYLE_EXPLAIN}
        -
        +
        + {{ FormsSelect(S_STYLE_OPTIONS) }} +

        {L_BOT_LANG_EXPLAIN}
        @@ -37,7 +39,9 @@

        {L_WARNING}

        -
        +
        + {{ FormsSelect(S_ACTIVE_OPTIONS) }} +

        {L_BOT_AGENT_EXPLAIN}
        diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index 68420389b42..d485d1e1132 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -48,7 +48,9 @@
        -
        +
        + {{ FormsSelect(S_STYLE_OPTIONS) }} +
        diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 1f8f632788f..1e82c0e6d53 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -86,8 +86,8 @@ function main($id, $mode) 'board_timezone' => array('lang' => 'SYSTEM_TIMEZONE', 'validate' => 'timezone', 'type' => 'custom', 'method' => 'timezone_select', 'explain' => true), 'legend2' => 'BOARD_STYLE', - 'default_style' => array('lang' => 'DEFAULT_STYLE', 'validate' => 'int', 'type' => 'select', 'function' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true), - 'guest_style' => array('lang' => 'GUEST_STYLE', 'validate' => 'int', 'type' => 'select', 'function' => 'style_select', 'params' => array($this->guest_style_get(), false), 'explain' => true), + 'default_style' => array('lang' => 'DEFAULT_STYLE', 'validate' => 'int', 'type' => 'select', 'method' => 'style_select', 'params' => array('{CONFIG_VALUE}', false), 'explain' => true), + 'guest_style' => array('lang' => 'GUEST_STYLE', 'validate' => 'int', 'type' => 'select', 'method' => 'style_select', 'params' => array($this->guest_style_get(), false), 'explain' => true), 'override_user_style' => array('lang' => 'OVERRIDE_STYLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'legend3' => 'WARNINGS', @@ -1127,6 +1127,18 @@ public function language_select(string $default = '', array $langdata = []): arr return phpbb_language_select($db, $default, $langdata); } + /** + * Wrapper function for style_select() + * + * @return array + */ + public function style_select(): array + { + global $db; + + return ['options' => style_select()]; + } + /** * Board disable option and message */ diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php index 323dd1baee6..982a8967b78 100644 --- a/phpBB/includes/acp/acp_bots.php +++ b/phpBB/includes/acp/acp_bots.php @@ -321,12 +321,15 @@ function main($id, $mode) unset($bot_row['user_lang'], $bot_row['user_style']); } - $s_active_options = ''; + $s_active_options = []; $_options = array('0' => 'NO', '1' => 'YES'); foreach ($_options as $value => $lang) { - $selected = ($bot_row['bot_active'] == $value) ? ' selected="selected"' : ''; - $s_active_options .= ''; + $s_active_options[] = [ + 'value' => $value, + 'selected' => $bot_row['bot_active'] == $value, + 'label' => $user->lang($lang), + ]; } $style_select = style_select($bot_row['bot_style'], true); @@ -345,14 +348,22 @@ function main($id, $mode) 'BOT_AGENT' => $bot_row['bot_agent'], 'S_EDIT_BOT' => true, - 'S_ACTIVE_OPTIONS' => $s_active_options, - 'S_STYLE_OPTIONS' => $style_select, + 'S_ACTIVE_OPTIONS' => [ + 'id' => 'bot_active', + 'name' => 'bot_active', + 'options' => $s_active_options, + ], + 'S_STYLE_OPTIONS' => [ + 'id' => 'bot_style', + 'name' => 'bot_style', + 'options' => $style_select, + ], 'LANG_OPTIONS' => [ 'id' => 'bot_lang', 'name' => 'bot_lang', 'options' => $lang_options, ], - 'S_ERROR' => (count($error)) ? true : false, + 'S_ERROR' => (bool) count($error), )); return; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 7a5036f9316..32be512d810 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1838,7 +1838,11 @@ function main($id, $mode) 'name' => 'lang', 'options' => $lang_options, ], - 'S_STYLE_OPTIONS' => style_select($data['style']), + 'S_STYLE_OPTIONS' => [ + 'id' => 'style', + 'name' => 'style', + 'options' => style_select($data['style']) + ], 'TIMEZONE_OPTIONS' => [ 'tag' => 'select', 'name' => 'tz', diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0bdb36eb795..68e4e75dda5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -291,9 +291,7 @@ function phpbb_language_select(\phpbb\db\driver\driver_interface $db, string $de ]; } - return [ - 'options' => $lang_options - ]; + return $lang_options; } /** @@ -325,16 +323,13 @@ function style_select($default = '', $all = false, array $styledata = []) foreach ($styledata as $row) { $style_options[] = [ - 'tag' => 'select', 'value' => $row['style_id'], 'selected' => $row['style_id'] == $default, 'label' => $row['style_name'], ]; } - return [ - 'options' => $style_options, - ]; + return $style_options; } /** diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index d2fc72621d5..103f647ab03 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -205,14 +205,18 @@ function main($id, $mode) 'name' => 'lang', 'options' => $lang_options, ], - 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : style_select($data['user_style'], false, $styles_row), + 'S_STYLE_OPTIONS' => ($config['override_user_style']) ? '' : [ + 'id' => 'user_style', + 'name' => 'user_style', + 'options' => style_select($data['user_style'], false, $styles_row) + ], 'TIMEZONE_OPTIONS' => [ 'tag' => 'select', 'name' => 'tz', 'options' => $timezone_select, ], - 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, - 'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false) + 'S_CAN_HIDE_ONLINE' => ($auth->acl_get('u_hideonline')) ? true : false, + 'S_SELECT_NOTIFY' => ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')) ? true : false) ); break; From 7b04e411b62423ea4c640331b2805786c069f03b Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 19 Sep 2023 15:30:52 +0700 Subject: [PATCH 0132/1214] [ticket/17151] Fix tests PHPBB3-17151 --- phpBB/includes/acp/acp_board.php | 8 +- .../all/template/macros/forms/select.twig | 4 +- tests/acp_board/select_auth_method_test.php | 32 ++++- .../fixtures/ext/foo/bar/acp/main_module.php | 24 +++- tests/functions/style_select_test.php | 121 ++++++++++++++++-- .../functions_acp/build_cfg_template_test.php | 15 ++- 6 files changed, 180 insertions(+), 24 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 1e82c0e6d53..1babdceb016 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -970,10 +970,10 @@ function select_acc_activation($selected_value, $value) { list($available, $value) = $data; $act_options[] = [ - 'value' => $value, - 'selected' => $selected_value == $value, - 'label' => $user->lang($key), - 'disabled' => !$available, + 'value' => $value, + 'selected' => $selected_value == $value, + 'label' => $user->lang($key), + 'class' => !$available ? 'disabled-option' : '', ]; } diff --git a/phpBB/styles/all/template/macros/forms/select.twig b/phpBB/styles/all/template/macros/forms/select.twig index 1ff690268f5..052cf89f9b8 100644 --- a/phpBB/styles/all/template/macros/forms/select.twig +++ b/phpBB/styles/all/template/macros/forms/select.twig @@ -24,14 +24,14 @@ + {% if option.disabled %} disabled="disabled"{% endif %}{% if option.class %} class="{{ option.class }}"{% endif %}>{{ option.label }} {% endfor %} {% else %} {% endif %} {% endfor %} diff --git a/tests/acp_board/select_auth_method_test.php b/tests/acp_board/select_auth_method_test.php index e06b5f845d8..a9efdbc0adf 100644 --- a/tests/acp_board/select_auth_method_test.php +++ b/tests/acp_board/select_auth_method_test.php @@ -22,8 +22,36 @@ class phpbb_acp_board_select_auth_method_test extends phpbb_test_case public static function select_auth_method_data() { return [ - ['acp_board_valid', ''], - ['acp_board_invalid', ''], + [ + 'acp_board_valid', + [ + 'options' => [ + 0 => [ + 'value' => 'acp_board_valid', + 'label' => 'Acp_board_valid', + 'selected' => true, + 'data' => [ + 'toggle-setting' => '#auth_acp_board_valid_settings', + ], + ] + ], + ] + ], + [ + 'acp_board_invalid', + [ + 'options' => [ + 0 => [ + 'value' => 'acp_board_valid', + 'label' => 'Acp_board_valid', + 'selected' => false, + 'data' => [ + 'toggle-setting' => '#auth_acp_board_valid_settings', + ], + ] + ], + ] + ], ]; } diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php index 08cb73da077..660d7eb1c90 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php @@ -125,11 +125,25 @@ function main($id, $mode) function create_select() { - return ' - - - - '; + return [ + 'options' => [ + [ + 'value' => 1, + 'selected' => true, + 'label' => 'Option 1', + ], + [ + 'value' => 2, + 'selected' => false, + 'label' => 'Option 2', + ], + [ + 'value' => 3, + 'selected' => false, + 'label' => 'Option 3', + ], + ] + ]; } function submit_button() diff --git a/tests/functions/style_select_test.php b/tests/functions/style_select_test.php index e36b799bde2..aadacadb02c 100644 --- a/tests/functions/style_select_test.php +++ b/tests/functions/style_select_test.php @@ -20,14 +20,119 @@ public function getDataSet() static public function style_select_data() { - return array( - array('', false, ''), - array('', true, ''), - array('1', false, ''), - array('1', true, ''), - array('3', false, ''), - array('3', true, ''), - ); + return [ + [ + '', + false, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + ] + ], + [ + '', + true, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + [ + 'value' => '3', + 'selected' => false, + 'label' => 'zoo', + ], + ] + ], + [ + '1', + false, + [ + [ + 'value' => '1', + 'selected' => true, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + ] + ], + [ + '1', + true, + [ + [ + 'value' => '1', + 'selected' => true, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + [ + 'value' => '3', + 'selected' => false, + 'label' => 'zoo', + ], + ] + ], + [ + '3', + false, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + ] + ], + [ + '3', + true, + [ + [ + 'value' => '1', + 'selected' => false, + 'label' => 'prosilver', + ], + [ + 'value' => '2', + 'selected' => false, + 'label' => 'subsilver2', + ], + [ + 'value' => '3', + 'selected' => true, + 'label' => 'zoo', + ], + ] + ], + ]; } /** diff --git a/tests/functions_acp/build_cfg_template_test.php b/tests/functions_acp/build_cfg_template_test.php index 8153fdfabfd..53a1ef3045f 100644 --- a/tests/functions_acp/build_cfg_template_test.php +++ b/tests/functions_acp/build_cfg_template_test.php @@ -431,8 +431,11 @@ public function build_cfg_template_select_data() ['method' => 'select_helper'], [ 'tag' => 'select', + 'class' => false, 'id' => 'key_name', + 'data' => [], 'name' => 'config[config_key_name]', + 'toggleable' => false, 'options' => [ [ 'value' => 1, @@ -450,7 +453,9 @@ public function build_cfg_template_select_data() 'selected' => false, ] ], - 'toggleable' => false, + 'group_only' => false, + 'size' => 1, + 'multiple' => false, ], ], [ @@ -461,9 +466,11 @@ public function build_cfg_template_select_data() ['method' => 'select_helper'], [ 'tag' => 'select', + 'class' => false, 'id' => 'key_name', + 'data' => [], 'name' => 'config[config_key_name]', - 'size' => 8, + 'toggleable' => false, 'options' => [ [ 'value' => 1, @@ -481,7 +488,9 @@ public function build_cfg_template_select_data() 'selected' => false, ] ], - 'toggleable' => false, + 'group_only' => false, + 'size' => 8, + 'multiple' => false, ], ], ]; From 7f365855ce3a848f365647f0a239bc40a8f28f5d Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 19 Sep 2023 22:34:18 +0700 Subject: [PATCH 0133/1214] [ticket/17151] Deduplicate code for building configuration options data PHPBB3-17151 --- phpBB/includes/functions_acp.php | 134 +++++++++++-------------------- 1 file changed, 46 insertions(+), 88 deletions(-) diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 6058b948fb8..277d992f3ab 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -247,18 +247,19 @@ function h_radio($name, $input_ary, $input_default = false, $id = false, $key = } /** - * HTML-less version of build_cfg_template + * Build configuration data arrays or templates for configuration settings * - * @param array $tpl_type Template type - * @param string $key Config key - * @param $new_ary - * @param $config_key - * @param $vars - * @return array + * @param array $tpl_type Configuration setting type data + * @param string $key Configuration option name + * @param array $new_ary Updated configuration data + * @param string $config_key Configuration option name + * @param Array $vars Configuration setting data + * + * @return array|string */ -function phpbb_build_cfg_template(array $tpl_type, string $key, &$new_ary, $config_key, $vars): array +function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) { - global $language; + global $language, $module, $phpbb_dispatcher; $tpl = []; $name = 'config[' . $config_key . ']'; @@ -399,78 +400,9 @@ function phpbb_build_cfg_template(array $tpl_type, string $key, &$new_ary, $conf } break; - case 'select': - $tpl = [ - 'tag' => 'select', - 'class' => $tpl_type['class'] ?? false, - 'id' => $key, - 'data' => $tpl_type['data'] ?? [], - 'name' => $name, - 'toggleable' => !empty($tpl_type[2]) || !empty($tpl_type['toggleable']), - 'options' => $tpl_type['options'], - 'group_only' => $tpl_type['group_only'] ?? false, - 'size' => $tpl_type[1] ?? $tpl_type['size'] ?? 1, - 'multiple' => $tpl_type['multiple'] ?? false, - ]; - break; - case 'button': - $tpl = [ - 'tag' => 'input', - 'class' => $tpl_type['options']['class'], - 'id' => $key, - 'type' => $tpl_type['options']['type'], - 'name' => $tpl_type['options']['name'] ?? $name, - 'value' => $tpl_type['options']['value'], - ]; - break; - } - - return $tpl; -} - -/** -* Build configuration template for acp configuration pages -*/ -function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) -{ - global $module, $phpbb_dispatcher; - - $tpl = ''; - $name = 'config[' . $config_key . ']'; - - // Make sure there is no notice printed out for non-existent config options (we simply set them) - if (!isset($new_ary[$config_key])) - { - $new_ary[$config_key] = ''; - } - - switch ($tpl_type[0]) - { - case 'password': - case 'text': - case 'url': - case 'email': - case 'tel': - case 'search': - case 'color': - case 'datetime': - case 'datetime-local': - case 'month': - case 'week': - case 'date': - case 'time': - case 'number': - case 'range': - case 'dimension': - case 'textarea': - case 'radio': - $tpl = phpbb_build_cfg_template($tpl_type, $key, $new_ary, $config_key, $vars); - break; - case 'select': case 'custom': - if (isset($vars['method'])) { $call = array($module->module, $vars['method']); @@ -513,7 +445,33 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) if (in_array($tpl_type[0], ['select', 'button'])) { $tpl_type = array_merge($tpl_type, $return); - $tpl = phpbb_build_cfg_template($tpl_type, $key, $new_ary, $config_key, $vars); + + if ($tpl_type[0] == 'select') + { + $tpl = [ + 'tag' => 'select', + 'class' => $tpl_type['class'] ?? false, + 'id' => $key, + 'data' => $tpl_type['data'] ?? [], + 'name' => $name, + 'toggleable' => !empty($tpl_type[2]) || !empty($tpl_type['toggleable']), + 'options' => $tpl_type['options'], + 'group_only' => $tpl_type['group_only'] ?? false, + 'size' => $tpl_type[1] ?? $tpl_type['size'] ?? 1, + 'multiple' => $tpl_type['multiple'] ?? false, + ]; + } + else + { + $tpl = [ + 'tag' => 'input', + 'class' => $tpl_type['options']['class'], + 'id' => $key, + 'type' => $tpl_type['options']['type'], + 'name' => $tpl_type['options']['name'] ?? $name, + 'value' => $tpl_type['options']['value'], + ]; + } } else { @@ -542,15 +500,15 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) * Overwrite the html code we display for the config value * * @event core.build_config_template - * @var array tpl_type Config type array: - * 0 => data type - * 1 [optional] => string: size, int: minimum - * 2 [optional] => string: max. length, int: maximum - * @var string key Should be used for the id attribute in html - * @var array new Array with the config values we display - * @var string name Should be used for the name attribute - * @var array vars Array with the options for the config - * @var string tpl The resulting html code we display + * @var array tpl_type Config type array: + * 0 => data type + * 1 [optional] => string: size, int: minimum + * 2 [optional] => string: max. length, int: maximum + * @var string key Should be used for the id attribute in html + * @var array new Array with the config values we display + * @var string name Should be used for the name attribute + * @var array vars Array with the options for the config + * @var array|string tpl The resulting html code we display * @since 3.1.0-a1 */ $vars = array('tpl_type', 'key', 'new', 'name', 'vars', 'tpl'); From 1cbe1d86da92ab652fc5a716a5d41486888b8d17 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 20 Sep 2023 17:36:46 +0700 Subject: [PATCH 0134/1214] [ticket/17151] Improve radio input type handling - allow more than 2 buttons count - allow custom buttons order - allow custom button labels Implemented by allowing JSON data format, backward compatibility preserved. PHPBB3-17151 --- phpBB/includes/functions_acp.php | 60 +++++++++++-------- phpBB/phpbb/template/twig/extension/forms.php | 5 +- .../template/macros/forms/radio_buttons.twig | 5 +- tests/functional/extension_module_test.php | 10 ++++ .../fixtures/ext/foo/bar/acp/main_module.php | 1 + 5 files changed, 49 insertions(+), 32 deletions(-) diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 277d992f3ab..cd7e8a382cd 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -270,6 +270,12 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) $new_ary[$config_key] = ''; } + // For BC check if parameter is json format and if yes split $tpl_type in 2 parts only + if (isset($tpl_type[1]) && strpos($tpl_type[1], '{') !== false) + { + $tpl_type = explode(':', $vars['type'], 2); + } + switch ($tpl_type[0]) { case 'password': @@ -369,35 +375,37 @@ function build_cfg_template($tpl_type, $key, &$new_ary, $config_key, $vars) break; case 'radio': - $tpl_type_cond = explode('_', $tpl_type[1]); - $type_no = $tpl_type_cond[0] != 'disabled' && $tpl_type_cond[0] != 'enabled'; - - $no_button = [ - 'type' => 'radio', - 'name' => $name, - 'value' => 0, - 'checked' => !$new_ary[$config_key], - 'label' => $type_no ? $language->lang('NO') : $language->lang('DISABLED'), - ]; - - $yes_button = [ - 'id' => $key, - 'type' => 'radio', - 'name' => $name, - 'value' => 1, - 'checked' => (bool) $new_ary[$config_key], - 'label' => $type_no ? $language->lang('YES') : $language->lang('ENABLED'), - ]; - - $tpl = ['tag' => 'radio']; - if ($tpl_type_cond[0] == 'yes' || $tpl_type_cond[0] == 'enabled') + // Convert 'old' radio button parameters to json encoded string for BC + if (in_array($tpl_type[1], ['yes_no', 'enabled_disabled'])) { - $tpl['buttons'] = [$yes_button, $no_button]; + $params = explode('_', $tpl_type[1]); + $tpl_type[1] = '{"' . $params[0] . '":1, "' . $params[1] . '":0}'; } - else + + $params = json_decode($tpl_type[1], true); + $id_assigned = false; + $buttons = []; + foreach ($params as $param => $value) { - $tpl['buttons'] = [$no_button, $yes_button]; - } + $buttons[] = [ + 'type' => 'radio', + 'name' => $name, + 'value' => $value, + 'checked' => $new_ary[$config_key] == $value, + 'label' => $language->lang(strtoupper($param)), + ]; + + // Only assign id to the one (1st) button in the list + if (!$id_assigned) + { + $buttons[key($buttons)]['id'] = $key; + } + }; + + $tpl = [ + 'tag' => 'radio', + 'buttons' => $buttons, + ]; break; case 'button': diff --git a/phpBB/phpbb/template/twig/extension/forms.php b/phpBB/phpbb/template/twig/extension/forms.php index ee47e19449c..72be295e220 100644 --- a/phpBB/phpbb/template/twig/extension/forms.php +++ b/phpBB/phpbb/template/twig/extension/forms.php @@ -151,10 +151,7 @@ public function radio_buttons(environment $environment, array $form_data): strin try { return $environment->render('macros/forms/radio_buttons.twig', [ - 'FIRST_BUTTON' => $form_data['buttons'][0], - 'FIRST_BUTTON_LABEL' => $form_data['buttons'][0]['label'], - 'SECOND_BUTTON' => $form_data['buttons'][1], - 'SECOND_BUTTON_LABEL' => $form_data['buttons'][1]['label'], + 'BUTTONS' => $form_data['buttons'], ]); } catch (\Twig\Error\Error $e) diff --git a/phpBB/styles/all/template/macros/forms/radio_buttons.twig b/phpBB/styles/all/template/macros/forms/radio_buttons.twig index 1ef7804c296..922eb1b432b 100644 --- a/phpBB/styles/all/template/macros/forms/radio_buttons.twig +++ b/phpBB/styles/all/template/macros/forms/radio_buttons.twig @@ -1,2 +1,3 @@ - - +{% for button in BUTTONS %} + +{% endfor %} diff --git a/tests/functional/extension_module_test.php b/tests/functional/extension_module_test.php index 67dc35ae737..6894f5d6449 100644 --- a/tests/functional/extension_module_test.php +++ b/tests/functional/extension_module_test.php @@ -101,6 +101,16 @@ public function test_acp() $this->assertStringContainsString('SETTING_9', $crawler->filter('dl')->eq(9)->filter('dt > label[for="setting_9"]')->text()); $this->assertStringContainsString('SETTING_9_EXPLAIN', $crawler->filter('dl')->eq(9)->filter('dt > span')->text()); $this->assertEquals(2, $crawler->filter('dl')->eq(9)->filter('dd > label > input[type="radio"]')->count()); + + $this->assertStringContainsString('SETTING_10', $crawler->filter('dl')->eq(10)->filter('dt > label[for="setting_10"]')->text()); + $this->assertStringContainsString('SETTING_10_EXPLAIN', $crawler->filter('dl')->eq(10)->filter('dt > span')->text()); + $this->assertEquals(3, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->count()); + $this->assertEquals(1, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(0)->attr('value')); + $this->assertStringContainsString('LABEL_1', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(0)->text()); + $this->assertEquals(3, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(1)->attr('value')); + $this->assertStringContainsString('LABEL_3', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(1)->text()); + $this->assertEquals(2, $crawler->filter('dl')->eq(10)->filter('dd > label > input[type="radio"]')->eq(2)->attr('value')); + $this->assertStringContainsString('LABEL_2', $crawler->filter('dl')->eq(10)->filter('dd > label')->eq(2)->text()); } public function test_ucp() diff --git a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php index 660d7eb1c90..77174c95f64 100644 --- a/tests/functional/fixtures/ext/foo/bar/acp/main_module.php +++ b/tests/functional/fixtures/ext/foo/bar/acp/main_module.php @@ -49,6 +49,7 @@ function main($id, $mode) 'setting_7' => ['lang' => 'SETTING_7', 'validate' => 'email', 'type' => 'email:0:100', 'explain' => true], 'setting_8' => ['lang' => 'SETTING_8', 'validate' => 'string', 'type' => 'textarea:5:30', 'explain' => true], 'setting_9' => ['lang' => 'SETTING_9', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true], + 'setting_10'=> ['lang' => 'SETTING_10', 'validate' => 'bool', 'type' => 'radio:{"LABEL_1":1, "LABEL_3":3, "LABEL_2":2}', 'explain' => true], ] ]; From 130366edfa7a1565007ff41e45a9e19ea37747e0 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 23 Sep 2023 01:27:00 +0700 Subject: [PATCH 0135/1214] [ticket/17151] Fix PHP warning on board settings page, add ACP pages test PHPBB3-17151 --- phpBB/includes/acp/acp_board.php | 2 +- tests/functional/acp_main_test.php | 38 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 1babdceb016..ff3dbba6d40 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -1124,7 +1124,7 @@ public function language_select(string $default = '', array $langdata = []): arr { global $db; - return phpbb_language_select($db, $default, $langdata); + return ['options' => phpbb_language_select($db, $default, $langdata)]; } /** diff --git a/tests/functional/acp_main_test.php b/tests/functional/acp_main_test.php index d392102e1a3..2caa3bbae26 100644 --- a/tests/functional/acp_main_test.php +++ b/tests/functional/acp_main_test.php @@ -28,4 +28,42 @@ public function test_acp_database_size() $this->assertContainsLang('DATABASE_SIZE', $crawler->filter('tbody > tr')->eq(2)->filter('td[class="tabled"]')->eq(0)->text()); $this->assertNotContainsLang('NOT_AVAILABLE', $crawler->filter('tbody > tr')->eq(2)->filter('td[class="tabled"]')->eq(1)->text()); } + + public function test_all_acp_module_links() + { + $this->add_lang('common'); + $this->login(); + $this->admin_login(); + + // Browse ACP main page + $crawler = self::request('GET', 'index.php'); + $crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link()); + + // Get all ACP module URLs array + $acp_modules = $crawler->filter('.tabs a')->each( + function ($node, $i) + { + return $node->link(); + } + ); + + // Browse all ACP modules and get their mode URLs array + $acp_submodules = []; + foreach ($acp_modules as $module) + { + $crawler = self::$client->click($module); + $acp_submodules = array_merge($acp_submodules, $crawler->filter('.menu-block > ul a')->each( + function ($node, $i) + { + return $node->link(); + } + )); + } + + // Browse all ACP submodules' modes + foreach ($acp_submodules as $acp_submodule) + { + self::$client->click($acp_submodule); + } + } } From 830c1f3dc3e7375ad9b95833d59e110c203d0e51 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 23 Sep 2023 10:21:07 +0700 Subject: [PATCH 0136/1214] [ticket/17151] Adjust template output formatting PHPBB3-17151 --- phpBB/styles/all/template/macros/forms/input.twig | 2 +- phpBB/styles/all/template/macros/forms/select.twig | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/phpBB/styles/all/template/macros/forms/input.twig b/phpBB/styles/all/template/macros/forms/input.twig index 1a2ff13fa39..dcfeddf369c 100644 --- a/phpBB/styles/all/template/macros/forms/input.twig +++ b/phpBB/styles/all/template/macros/forms/input.twig @@ -1,4 +1,4 @@ -{% apply replace({"\n": ' ', "\t": ''}) %} +{% apply replace({"\n\t": ' ', "\t": '', "\n": ''}) %} -{% endapply %} + {% if TOGGLEABLE %}data-togglable-settings="true"{% endif %} + {% if MULTIPLE %}multiple="multiple"{% endif %} + {% if SIZE %}size="{{ SIZE }}"{% endif %}> {% for element in OPTIONS %} {% if not GROUP_ONLY and element.options %} - {% apply replace({"\n": ' ', '\t': ''}) %} - {% endapply %} {% for option in element.options %}
      + {% EVENT notification_dropdown_footer_before %}
      {L_SEE_ALL}
      + {% EVENT notification_dropdown_footer_after %}
      • From a88040df85c6c0f91568c25df6e7cd03ebb4cda5 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 28 May 2024 07:21:11 +0700 Subject: [PATCH 0149/1214] [ticket/17324] Adjust target version PHPBB3-17324 --- phpBB/docs/events.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index fb8f9b1b19a..3e72be3e417 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1601,14 +1601,14 @@ notification_dropdown_footer_after === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12 +* Since: prep-release-3.3.12 * Purpose: Add content after notifications list footer. notification_dropdown_footer_before === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12 +* Since: prep-release-3.3.12 * Purpose: Add content before notifications list footer. overall_footer_after From 9ea4aabe9a3a43f785decfab0e5ba926faa1f4f7 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 28 May 2024 21:15:31 +0700 Subject: [PATCH 0150/1214] [ticket/17324] Allow targeting events to prep-releases PHPBB3-17324 --- phpBB/docs/events.md | 4 ++-- phpBB/phpbb/event/md_exporter.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 3e72be3e417..d8606c7e4c8 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1601,14 +1601,14 @@ notification_dropdown_footer_after === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: prep-release-3.3.12 +* Since: 3.3.12-prep-release * Purpose: Add content after notifications list footer. notification_dropdown_footer_before === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: prep-release-3.3.12 +* Since: 3.3.12-prep-release * Purpose: Add content before notifications list footer. overall_footer_after diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index 1a16a174130..7182ce697f4 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -489,7 +489,7 @@ public function validate_changed($changed) */ public function validate_version($version) { - return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?$#', $version); + return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+|(?:-prep-release))?$#', $version); } /** From ae18669fcd2ad61020d180f4fd00c85aef2853b5 Mon Sep 17 00:00:00 2001 From: LukeWCS Date: Tue, 28 May 2024 20:55:49 +0200 Subject: [PATCH 0151/1214] [ticket/17325] Show message for "Re-Check version" if phpBB is still up to date Show explicit message for "Re-Check version" if installed version is still up to date PHPBB3-17325 --- phpBB/adm/style/acp_main.html | 30 +++++++++++++++++------------- phpBB/includes/acp/acp_main.php | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 05ccd106054..8ae4f0721c1 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -14,27 +14,31 @@

      {L_WELCOME_PHPBB}

      {L_ADMIN_INTRO}

      - + {% if S_UPDATE_INCOMPLETE %}
      -

      {L_UPDATE_INCOMPLETE} {L_MORE_INFORMATION}

      +

      {{ lang('UPDATE_INCOMPLETE') }} {{ lang('MORE_INFORMATION') }}

      - + {% elseif S_VERSIONCHECK_FAIL %}
      -

      {L_VERSIONCHECK_FAIL}

      -

      {VERSIONCHECK_FAIL_REASON}

      -

      {L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

      +

      {{ lang('VERSIONCHECK_FAIL') }}

      +

      {{ VERSIONCHECK_FAIL_REASON }}

      +

      {{ lang('VERSIONCHECK_FORCE_UPDATE') }} · {{ lang('MORE_INFORMATION') }}

      - + {% elseif !S_VERSION_UP_TO_DATE %}
      -

      {L_VERSION_NOT_UP_TO_DATE_TITLE}

      -

      {L_VERSIONCHECK_FORCE_UPDATE} · {L_MORE_INFORMATION}

      +

      {{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}

      +

      {{ lang('VERSIONCHECK_FORCE_UPDATE') }} · {{ lang('MORE_INFORMATION') }}

      - - + {% elseif S_VERSION_UP_TO_DATE && S_VERSIONCHECK_FORCE %} +
      +

      {{ lang('VERSION_UP_TO_DATE_ACP') }}

      +
      + {% endif %} + {% if S_VERSION_UPGRADEABLE %}
      -

      {UPGRADE_INSTRUCTIONS}

      +

      {{ UPGRADE_INSTRUCTIONS }}

      - + {% endif %}
      diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 0451e2ee1fa..c39e984f736 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -454,6 +454,7 @@ function main($id, $mode) $template->assign_vars(array( 'S_VERSION_UP_TO_DATE' => empty($updates_available), 'S_VERSION_UPGRADEABLE' => !empty($upgrades_available), + 'S_VERSIONCHECK_FORCE' => (bool) $recheck, 'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false, )); } From 51da43f77fab61e07d0e04520e6190571d268320 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 29 May 2024 21:53:11 +0200 Subject: [PATCH 0152/1214] [prep-release-3.3.12] Fix since version and undo md exporter change --- phpBB/docs/events.md | 4 ++-- phpBB/phpbb/event/md_exporter.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d8606c7e4c8..fb8f9b1b19a 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1601,14 +1601,14 @@ notification_dropdown_footer_after === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12-prep-release +* Since: 3.3.12 * Purpose: Add content after notifications list footer. notification_dropdown_footer_before === * Locations: + styles/prosilver/template/notification_dropdown.html -* Since: 3.3.12-prep-release +* Since: 3.3.12 * Purpose: Add content before notifications list footer. overall_footer_after diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index 7182ce697f4..1a16a174130 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -489,7 +489,7 @@ public function validate_changed($changed) */ public function validate_version($version) { - return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+|(?:-prep-release))?$#', $version); + return preg_match('#^\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?$#', $version); } /** From a63a1913fa3960a2060d8febd70feec99136a1f5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Apr 2024 10:34:37 +0200 Subject: [PATCH 0153/1214] [ticket/security-276] Add migration for user_actkey expiration column SECURITY-276 --- .../v33x/add_resend_activation_expiration.php | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php diff --git a/phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php b/phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php new file mode 100644 index 00000000000..9ebbe9811a2 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/add_resend_activation_expiration.php @@ -0,0 +1,48 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +use phpbb\db\migration\migration; + +class add_resend_activation_expiration extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v33x\v3311', + ]; + } + + public function update_schema(): array + { + return [ + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'user_actkey_expiration' => ['TIMESTAMP', 0, 'after' => 'user_actkey'], + ], + ], + ]; + } + + public function revert_schema(): array + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'users' => [ + 'user_actkey_expiration', + ], + ], + ]; + } +} From f853f6523fbf5896816843c5a519bd033e54a257 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Apr 2024 13:46:25 +0200 Subject: [PATCH 0154/1214] [ticket/security/276] Prevent sending activation emails multiple times per day SECURITY-276 --- phpBB/includes/acp/acp_inactive.php | 5 ++-- phpBB/includes/acp/acp_users.php | 20 ++++++++------ phpBB/includes/functions_user.php | 23 ++++++++-------- phpBB/includes/ucp/ucp_profile.php | 7 ++--- phpBB/includes/ucp/ucp_register.php | 25 ++++++++--------- phpBB/includes/ucp/ucp_resend.php | 27 +++++++++++++++++++ phpBB/install/schemas/schema_data.sql | 4 +-- phpBB/phpbb/console/command/user/add.php | 34 +++++++++++++++++++++--- 8 files changed, 104 insertions(+), 41 deletions(-) diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 7b4536f755a..b85ed86ee59 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -238,10 +238,11 @@ function main($id, $mode) $messenger->save_queue(); - // Add the remind state to the database + // Add the remind state to the database and increase activation expiration by one day $sql = 'UPDATE ' . USERS_TABLE . ' SET user_reminded = user_reminded + 1, - user_reminded_time = ' . time() . ' + user_reminded_time = ' . time() . ', + user_actkey_expiration = ' . (int) strtotime('+1 day') . ' WHERE ' . $db->sql_in_set('user_id', $user_ids); $db->sql_query($sql); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 7c3468f90df..f54ff08db43 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -385,14 +385,18 @@ function main($id, $mode) $user_actkey = empty($user_activation_key) ? $user_actkey : $user_activation_key; } - if ($user_row['user_type'] == USER_NORMAL || empty($user_activation_key)) - { - $sql = 'UPDATE ' . USERS_TABLE . " - SET user_actkey = '" . $db->sql_escape($user_actkey) . "' - WHERE user_id = $user_id"; - $db->sql_query($sql); - } - + // Always update actkey even if same and also update actkey expiration to 24 hours from now + $sql_ary = [ + 'user_actkey' => $user_actkey, + 'user_actkey_expiration' => strtotime('+1 day'), + ]; + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE user_id = ' . $user_id; + $db->sql_query($sql); + + // Start sending email $messenger = new messenger(false); $messenger->template($email_template, $user_row['user_lang']); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 25adf4215aa..c33caba8e8d 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -210,18 +210,19 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) // These are the additional vars able to be specified $additional_vars = array( - 'user_permissions' => '', - 'user_timezone' => $config['board_timezone'], - 'user_dateformat' => $config['default_dateformat'], - 'user_lang' => $config['default_lang'], - 'user_style' => (int) $config['default_style'], - 'user_actkey' => '', - 'user_ip' => '', - 'user_regdate' => time(), - 'user_passchg' => time(), - 'user_options' => 230271, + 'user_permissions' => '', + 'user_timezone' => $config['board_timezone'], + 'user_dateformat' => $config['default_dateformat'], + 'user_lang' => $config['default_lang'], + 'user_style' => (int) $config['default_style'], + 'user_actkey' => '', + 'user_actkey_expiration' => 0, + 'user_ip' => '', + 'user_regdate' => time(), + 'user_passchg' => time(), + 'user_options' => 230271, // We do not set the new flag here - registration scripts need to specify it - 'user_new' => 0, + 'user_new' => 0, 'user_inactive_reason' => 0, 'user_inactive_time' => 0, diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 4a8abcd46ad..616792d9ac9 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -196,9 +196,10 @@ function main($id, $mode) { $notifications_manager = $phpbb_container->get('notification_manager'); $notifications_manager->add_notifications('notification.type.admin_activate_user', array( - 'user_id' => $user->data['user_id'], - 'user_actkey' => $user_actkey, - 'user_regdate' => time(), // Notification time + 'user_id' => $user->data['user_id'], + 'user_actkey' => $user_actkey, + 'user_actkey_expiration' => strtotime('+1 day'), // 24 hours until activation can be resent + 'user_regdate' => time(), // Notification time )); } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 5f7a87f74b6..4d6677567ad 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -381,18 +381,19 @@ function main($id, $mode) $passwords_manager = $phpbb_container->get('passwords.manager'); $user_row = array( - 'username' => $data['username'], - 'user_password' => $passwords_manager->hash($data['new_password']), - 'user_email' => $data['email'], - 'group_id' => (int) $group_id, - 'user_timezone' => $data['tz'], - 'user_lang' => $data['lang'], - 'user_type' => $user_type, - 'user_actkey' => $user_actkey, - 'user_ip' => $user->ip, - 'user_regdate' => time(), - 'user_inactive_reason' => $user_inactive_reason, - 'user_inactive_time' => $user_inactive_time, + 'username' => $data['username'], + 'user_password' => $passwords_manager->hash($data['new_password']), + 'user_email' => $data['email'], + 'group_id' => (int) $group_id, + 'user_timezone' => $data['tz'], + 'user_lang' => $data['lang'], + 'user_type' => $user_type, + 'user_actkey' => $user_actkey, + 'user_actkey_expiration' => strtotime('+1 day'), // 24 hours until activation can be resent + 'user_ip' => $user->ip, + 'user_regdate' => time(), + 'user_inactive_reason' => $user_inactive_reason, + 'user_inactive_time' => $user_inactive_time, ); if ($config['new_member_post_limit']) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 7f952af6c31..6ff1e53027b 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -73,6 +73,12 @@ function main($id, $mode) trigger_error('ACCOUNT_DEACTIVATED'); } + // Do not resend activation email if valid one still exists + if (!empty($user_row['user_actkey']) && (int) $user_row['user_actkey_expiration'] >= time()) + { + trigger_error('ACTIVATION_EMAIL_ALREADY_SENT'); + } + // Determine coppa status on group (REGISTERED(_COPPA)) $sql = 'SELECT group_name, group_type FROM ' . GROUPS_TABLE . ' @@ -144,6 +150,8 @@ function main($id, $mode) $db->sql_freeresult($result); } + $this->update_activation_expiration(); + meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); $message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACTIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT']; @@ -160,4 +168,23 @@ function main($id, $mode) $this->tpl_name = 'ucp_resend'; $this->page_title = 'UCP_RESEND'; } + + /** + * Update activation expiration to 1 day from now + * + * @return void + */ + protected function update_activation_expiration(): void + { + global $db, $user; + + $sql_ary = [ + 'user_actkey_expiration' => strtotime('+1 day'), + ]; + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE user_id = ' . (int) $user->id(); + $db->sql_query($sql); + } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7ec43e3b547..a9c8d4a0495 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -527,10 +527,10 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_freq, prune_days, prune_viewed, forum_parents, forum_flags) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 0, 0, 1, 0, 0, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 1, 7, 7, '', 48); # -- Users / Anonymous user -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', '', 0); +INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_actkey_expiration, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', 0, '', 0); # -- username: Admin password: admin (change this or remove it once everything is working!) -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', ''); +INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_actkey_expiration, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', 0, ''); # -- Groups INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, '', '', '', 5); diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 40f866c1761..334ff714153 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -290,18 +290,17 @@ protected function send_activation_email($user_id) { case USER_ACTIVATION_SELF: $email_template = 'user_welcome_inactive'; - $user_actkey = gen_rand_string(mt_rand(6, 10)); break; case USER_ACTIVATION_ADMIN: $email_template = 'admin_welcome_inactive'; - $user_actkey = gen_rand_string(mt_rand(6, 10)); break; default: $email_template = 'user_welcome'; - $user_actkey = ''; break; } + $user_actkey = $this->get_activation_key($user_id); + if (!class_exists('messenger')) { require($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); @@ -321,6 +320,35 @@ protected function send_activation_email($user_id) $messenger->send(NOTIFY_EMAIL); } + /** + * Get user activation key + * + * @param int $user_id User ID + * + * @return string User activation key for user + */ + protected function get_activation_key(int $user_id): string + { + $user_actkey = ''; + + if ($this->config['require_activation'] == USER_ACTIVATION_SELF || $this->config['require_activation'] == USER_ACTIVATION_ADMIN) + { + $user_actkey = gen_rand_string(mt_rand(6, 10)); + + $sql_ary = [ + 'user_actkey' => $user_actkey, + 'user_actkey_expiration' => strtotime('+1 day'), + ]; + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE user_id = ' . $user_id; + $this->db->sql_query($sql); + } + + return $user_actkey; + } + /** * Helper to translate questions to the user * From 24dd47adcf222fa12359ba2f39f00b6f8feda1fd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Apr 2024 13:51:29 +0200 Subject: [PATCH 0155/1214] [ticket/security/276] Add missing information message SECURITY-276 --- phpBB/includes/ucp/ucp_resend.php | 2 +- phpBB/language/en/common.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 6ff1e53027b..0c01838f4e7 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -76,7 +76,7 @@ function main($id, $mode) // Do not resend activation email if valid one still exists if (!empty($user_row['user_actkey']) && (int) $user_row['user_actkey_expiration'] >= time()) { - trigger_error('ACTIVATION_EMAIL_ALREADY_SENT'); + trigger_error('ACTIVATION_ALREADY_SENT'); } // Determine coppa status on group (REGISTERED(_COPPA)) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 1f4fc9f6a81..5694bbd5dcf 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -64,6 +64,7 @@ 'ACCOUNT_DEACTIVATED' => 'Your account has been manually deactivated and is only able to be reactivated by an administrator.', 'ACP' => 'Administration Control Panel', 'ACP_SHORT' => 'ACP', + 'ACTIVATION_ALREADY_SENT' => 'The activation email has already been sent to your email address. You can try again after 24 hours. If you continue to have problems activating your account, please contact a board administrator.', 'ACTIVE' => 'active', 'ACTIVE_ERROR' => 'The specified username is currently inactive. If you have problems activating your account, please contact a board administrator.', 'ADMINISTRATOR' => 'Administrator', From 7c661746cf31510f56f5cc5b1ed6b26d431aa581 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Apr 2024 20:10:24 +0200 Subject: [PATCH 0156/1214] [ticket/security/276] Add test for expiration timer SECURITY-276 --- phpBB/includes/ucp/ucp_resend.php | 2 +- tests/auth/provider_apache_test.php | 1 + tests/functional/user_password_reset_test.php | 84 ++++++++++++++----- 3 files changed, 67 insertions(+), 20 deletions(-) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 0c01838f4e7..609ef97b20f 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -45,7 +45,7 @@ function main($id, $mode) trigger_error('FORM_INVALID'); } - $sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_inactive_reason + $sql = 'SELECT user_id, group_id, username, user_email, user_type, user_lang, user_actkey, user_actkey_expiration, user_inactive_reason FROM ' . USERS_TABLE . " WHERE user_email = '" . $db->sql_escape($email) . "' AND username_clean = '" . $db->sql_escape(utf8_clean_string($username)) . "'"; diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index 2dbb1f32a98..df5b53841ca 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -162,6 +162,7 @@ public function test_autologin() 'user_sig_bbcode_bitfield' => '', 'user_jabber' => '', 'user_actkey' => '', + 'user_actkey_expiration' => 0, 'user_newpasswd' => '', 'user_form_salt' => '', 'user_new' => 1, diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php index e912b8ce08f..754e4de7d1c 100644 --- a/tests/functional/user_password_reset_test.php +++ b/tests/functional/user_password_reset_test.php @@ -18,10 +18,14 @@ class phpbb_functional_user_password_reset_test extends phpbb_functional_test_ca { protected $user_data; + protected const TEST_USER = 'reset-password-test-user'; + + protected const TEST_EMAIL = 'reset-password-test-user@test.com'; + public function test_password_reset() { $this->add_lang('ucp'); - $user_id = $this->create_user('reset-password-test-user', 'reset-password-test-user@test.com'); + $user_id = $this->create_user(self::TEST_USER, self::TEST_EMAIL); // test without email $crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}"); @@ -41,13 +45,13 @@ public function test_password_reset() // test with correct email $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( - 'email' => 'reset-password-test-user@test.com', + 'email' => self::TEST_EMAIL, )); $crawler = self::submit($form); $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); // Check if columns in database were updated for password reset - $this->get_user_data('reset-password-test-user'); + $this->get_user_data(self::TEST_USER); $this->assertNotEmpty($this->user_data['reset_token']); $this->assertNotEmpty($this->user_data['reset_token_expiration']); $reset_token = $this->user_data['reset_token']; @@ -56,31 +60,31 @@ public function test_password_reset() // Check that reset token is only created once per day $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( - 'email' => 'reset-password-test-user@test.com', + 'email' => self::TEST_EMAIL, )); $crawler = self::submit($form); $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); - $this->get_user_data('reset-password-test-user'); + $this->get_user_data(self::TEST_USER); $this->assertNotEmpty($this->user_data['reset_token']); $this->assertNotEmpty($this->user_data['reset_token_expiration']); $this->assertEquals($reset_token, $this->user_data['reset_token']); $this->assertEquals($reset_token_expiration, $this->user_data['reset_token_expiration']); // Create another user with the same email - $this->create_user('reset-password-test-user1', 'reset-password-test-user@test.com'); + $this->create_user('reset-password-test-user1', self::TEST_EMAIL); // Test that username is now also required $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( - 'email' => 'reset-password-test-user@test.com', + 'email' => self::TEST_EMAIL, )); $crawler = self::submit($form); $this->assertContainsLang('EMAIL_NOT_UNIQUE', $crawler->text()); // Provide both username and email $form = $crawler->selectButton('submit')->form(array( - 'email' => 'reset-password-test-user@test.com', + 'email' => self::TEST_EMAIL, 'username' => 'reset-password-test-user1', )); $crawler = self::submit($form); @@ -95,7 +99,7 @@ public function test_password_reset() public function test_login_after_reset() { - $this->login('reset-password-test-user'); + $this->login(self::TEST_USER); } public function data_reset_user_password() @@ -117,7 +121,7 @@ public function data_reset_user_password() public function test_reset_user_password($expected, $user_id, $token) { $this->add_lang('ucp'); - $this->get_user_data('reset-password-test-user'); + $this->get_user_data(self::TEST_USER); $user_id = !$user_id ? $this->user_data['user_id'] : $user_id; $token = !$token ? $this->user_data['reset_token'] : $token; @@ -131,8 +135,8 @@ public function test_reset_user_password($expected, $user_id, $token) { $form = $crawler->filter('input[type=submit]')->form(); $values = array_merge($form->getValues(), [ - 'new_password' => 'reset-password-test-user', - 'new_password_confirm' => 'reset-password-test-user', + 'new_password' => self::TEST_USER, + 'new_password_confirm' => self::TEST_USER, ]); $crawler = self::submit($form, $values); $this->assertContainsLang('PASSWORD_RESET', $crawler->text()); @@ -146,7 +150,7 @@ public function test_login() $this->assertStringContainsString($this->lang('LOGIN_EXPLAIN_UCP'), $crawler->filter('html')->text()); $form = $crawler->selectButton($this->lang('LOGIN'))->form(); - $crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-user')); + $crawler = self::submit($form, array('username' => self::TEST_USER, 'password' => self::TEST_USER)); $this->assertStringNotContainsString($this->lang('LOGIN'), $crawler->filter('.navbar')->text()); $cookies = self::$cookieJar->all(); @@ -167,17 +171,17 @@ public function test_login() $form = $crawler->selectButton($this->lang('LOGIN'))->form(); // Try logging in with the old password - $crawler = self::submit($form, array('username' => 'reset-password-test-user', 'password' => 'reset-password-test-userreset-password-test-user')); + $crawler = self::submit($form, array('username' => self::TEST_USER, 'password' => 'reset-password-test-userreset-password-test-user')); $this->assertStringContainsString($this->lang('LOGIN_ERROR_PASSWORD', '', ''), $crawler->filter('html')->text()); } /** * @depends test_login */ - public function test_acivateAfterDeactivate() + public function test_activateAfterDeactivate() { // User is active, actkey should not exist - $this->get_user_data('reset-password-test-user'); + $this->get_user_data(self::TEST_USER); $this->assertEmpty($this->user_data['user_actkey']); $this->login(); @@ -189,7 +193,7 @@ public function test_acivateAfterDeactivate() $this->assertContainsLang('FIND_USERNAME', $crawler->filter('html')->text()); $form = $crawler->selectButton('Submit')->form(); - $crawler = self::submit($form, array('username' => 'reset-password-test-user')); + $crawler = self::submit($form, array('username' => self::TEST_USER)); // Deactivate account and go back to overview of current user $this->assertContainsLang('USER_TOOLS', $crawler->filter('html')->text()); @@ -201,7 +205,7 @@ public function test_acivateAfterDeactivate() $crawler = self::request('GET', preg_replace('#(.+)(adm/index.php.+)#', '$2', $link->getUri())); // Ensure again that actkey is empty after deactivation - $this->get_user_data('reset-password-test-user'); + $this->get_user_data(self::TEST_USER); $this->assertEmpty($this->user_data['user_actkey']); // Force reactivation of account and check that act key is not empty anymore @@ -210,8 +214,50 @@ public function test_acivateAfterDeactivate() $crawler = self::submit($form, array('action' => 'reactivate')); $this->assertContainsLang('FORCE_REACTIVATION_SUCCESS', $crawler->filter('html')->text()); - $this->get_user_data('reset-password-test-user'); + $this->get_user_data(self::TEST_USER); + $this->assertNotEmpty($this->user_data['user_actkey']); + + // Logout and try resending activation email, account is deactivated though + $this->logout(); + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?mode=resend_act'); + $this->assertContainsLang('UCP_RESEND', $crawler->filter('html')->text()); + $form = $crawler->filter('input[name=submit]')->selectButton('Submit')->form(); + $crawler = self::submit($form, [ + 'username' => self::TEST_USER, + 'email' => self::TEST_EMAIL, + ]); + $this->assertContainsLang('ACCOUNT_DEACTIVATED', $crawler->filter('html')->text()); + } + + /** + * @depends test_activateAfterDeactivate + */ + public function test_resendActivation() + { + // User is deactivated and should have actkey, actkey should not exist + $this->get_user_data(self::TEST_USER); $this->assertNotEmpty($this->user_data['user_actkey']); + + // Change reason for inactivity + $db = $this->get_db(); + + $sql = 'UPDATE ' . USERS_TABLE . ' + SET user_inactive_reason = ' . INACTIVE_REMIND . ' + WHERE user_id = ' . (int) $this->user_data['user_id']; + $db->sql_query($sql); + + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?mode=resend_act'); + $this->assertContainsLang('UCP_RESEND', $crawler->filter('html')->text()); + $form = $crawler->filter('input[name=submit]')->selectButton('Submit')->form(); + $crawler = self::submit($form, [ + 'username' => self::TEST_USER, + 'email' => self::TEST_EMAIL, + ]); + $this->assertContainsLang('ACTIVATION_ALREADY_SENT', $crawler->filter('html')->text()); } protected function get_user_data($username) From 1c1c981b1778c1bbb57a79349a5cf813746e3b59 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 May 2024 11:51:59 +0200 Subject: [PATCH 0157/1214] [ticket/security/276] Centralise call for token expiration SECURITY-276 --- phpBB/includes/acp/acp_inactive.php | 2 +- phpBB/includes/acp/acp_users.php | 4 ++-- phpBB/includes/ucp/ucp_profile.php | 2 +- phpBB/includes/ucp/ucp_register.php | 2 +- phpBB/includes/ucp/ucp_resend.php | 2 +- phpBB/phpbb/console/command/user/add.php | 4 ++-- phpBB/phpbb/ucp/controller/reset_password.php | 2 +- phpBB/phpbb/user.php | 12 +++++++++++- 8 files changed, 20 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index b85ed86ee59..d74c09af3a0 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -242,7 +242,7 @@ function main($id, $mode) $sql = 'UPDATE ' . USERS_TABLE . ' SET user_reminded = user_reminded + 1, user_reminded_time = ' . time() . ', - user_actkey_expiration = ' . (int) strtotime('+1 day') . ' + user_actkey_expiration = ' . (int) $user::get_token_expiration() . ' WHERE ' . $db->sql_in_set('user_id', $user_ids); $db->sql_query($sql); diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index f54ff08db43..611e72a9b80 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -388,12 +388,12 @@ function main($id, $mode) // Always update actkey even if same and also update actkey expiration to 24 hours from now $sql_ary = [ 'user_actkey' => $user_actkey, - 'user_actkey_expiration' => strtotime('+1 day'), + 'user_actkey_expiration' => $user::get_token_expiration(), ]; $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user_id; + WHERE user_id = ' . (int) $user_id; $db->sql_query($sql); // Start sending email diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 616792d9ac9..2a04ed42a08 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -198,7 +198,7 @@ function main($id, $mode) $notifications_manager->add_notifications('notification.type.admin_activate_user', array( 'user_id' => $user->data['user_id'], 'user_actkey' => $user_actkey, - 'user_actkey_expiration' => strtotime('+1 day'), // 24 hours until activation can be resent + 'user_actkey_expiration' => $user::get_token_expiration(), 'user_regdate' => time(), // Notification time )); } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 4d6677567ad..a881a0e81d8 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -389,7 +389,7 @@ function main($id, $mode) 'user_lang' => $data['lang'], 'user_type' => $user_type, 'user_actkey' => $user_actkey, - 'user_actkey_expiration' => strtotime('+1 day'), // 24 hours until activation can be resent + 'user_actkey_expiration' => $user::get_token_expiration(), 'user_ip' => $user->ip, 'user_regdate' => time(), 'user_inactive_reason' => $user_inactive_reason, diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 609ef97b20f..31e08786638 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -179,7 +179,7 @@ protected function update_activation_expiration(): void global $db, $user; $sql_ary = [ - 'user_actkey_expiration' => strtotime('+1 day'), + 'user_actkey_expiration' => $user::get_token_expiration(), ]; $sql = 'UPDATE ' . USERS_TABLE . ' diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 334ff714153..11380373cdc 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -337,12 +337,12 @@ protected function get_activation_key(int $user_id): string $sql_ary = [ 'user_actkey' => $user_actkey, - 'user_actkey_expiration' => strtotime('+1 day'), + 'user_actkey_expiration' => \phpbb\user::get_token_expiration(), ]; $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user_id; + WHERE user_id = ' . (int) $user_id; $this->db->sql_query($sql); } diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 442de50ec77..a451856065b 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -242,7 +242,7 @@ public function request() $sql_ary = [ 'reset_token' => $reset_token, - 'reset_token_expiration' => strtotime('+1 day'), + 'reset_token_expiration' => $this->user::get_token_expiration(), ]; $sql = 'UPDATE ' . $this->users_table . ' diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 9f7b15bf69c..de556f99512 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -57,7 +57,7 @@ class user extends \phpbb\session * @param \phpbb\language\language $lang phpBB's Language loader * @param string $datetime_class Class name of datetime class */ - function __construct(\phpbb\language\language $lang, $datetime_class) + public function __construct(\phpbb\language\language $lang, $datetime_class) { global $phpbb_root_path; @@ -78,6 +78,16 @@ public function is_setup() return $this->is_setup_flag; } + /** + * Get expiration time for user tokens, e.g. activation or reset password tokens + * + * @return int Expiration for user tokens + */ + public static function get_token_expiration(): int + { + return strtotime('+1 day') ?: 0; + } + /** * Magic getter for BC compatibility * From 1fb7e6d2c85d48be5839cd3fd3a8004d54f13d78 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 18 May 2024 21:43:21 +0200 Subject: [PATCH 0158/1214] [ticket/security/278] Always release cron lock, even invalid task is passed SECURITY-278 --- phpBB/phpbb/cron/event/cron_runner_listener.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/cron/event/cron_runner_listener.php b/phpBB/phpbb/cron/event/cron_runner_listener.php index c9c13ddc069..ba030ca3268 100644 --- a/phpBB/phpbb/cron/event/cron_runner_listener.php +++ b/phpBB/phpbb/cron/event/cron_runner_listener.php @@ -85,9 +85,8 @@ public function on_kernel_terminate(PostResponseEvent $event) { $task->run(); } - - $this->cron_lock->release(); } + $this->cron_lock->release(); } } From bf55502c626affbd201f4f50b50253366741cbf4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 30 May 2024 10:40:25 +0200 Subject: [PATCH 0159/1214] [ticket/17325] Use not instead of ! in template PHPBB3-17325 --- phpBB/adm/style/acp_main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html index 8ae4f0721c1..95420bdb611 100644 --- a/phpBB/adm/style/acp_main.html +++ b/phpBB/adm/style/acp_main.html @@ -24,7 +24,7 @@

      {L_WELCOME_PHPBB}

      {{ VERSIONCHECK_FAIL_REASON }}

      {{ lang('VERSIONCHECK_FORCE_UPDATE') }} · {{ lang('MORE_INFORMATION') }}

      - {% elseif !S_VERSION_UP_TO_DATE %} + {% elseif not S_VERSION_UP_TO_DATE %}

      {{ lang('VERSION_NOT_UP_TO_DATE_TITLE') }}

      {{ lang('VERSIONCHECK_FORCE_UPDATE') }} · {{ lang('MORE_INFORMATION') }}

      From 166c4eeb7e391b6a6518c0791a79d8a3fba232b1 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 17 May 2024 03:56:10 +0100 Subject: [PATCH 0160/1214] [ticket/17316] Add template events to ucp_groups_manage PHPBB3-17316 --- phpBB/docs/events.md | 14 ++++++++++++++ .../prosilver/template/ucp_groups_manage.html | 2 ++ 2 files changed, 16 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index d05cb876fdb..2a8fd5002d1 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -2521,6 +2521,20 @@ ucp_friend_list_before * Since: 3.1.0-a4 * Purpose: Add optional elements before list of friends in UCP +ucp_group_settings_after +=== +* Locations: + + styles/prosilver/template/ucp_groups_manage.html +* Since: 3.3.13-RC1 +* Purpose: Add content after options for managing a group in the UCP + +ucp_group_settings_before +=== +* Locations: + + styles/prosilver/template/ucp_groups_manage.html +* Since: 3.3.13-RC1 +* Purpose: Add content before options for managing a group in the UCP + ucp_header_content_before === * Locations: diff --git a/phpBB/styles/prosilver/template/ucp_groups_manage.html b/phpBB/styles/prosilver/template/ucp_groups_manage.html index 63b9560a7a4..e592d12928b 100644 --- a/phpBB/styles/prosilver/template/ucp_groups_manage.html +++ b/phpBB/styles/prosilver/template/ucp_groups_manage.html @@ -52,6 +52,7 @@

      {L_GROUP_DETAILS}

      {L_GROUP_SETTINGS_SAVE}

      +

      {L_GROUP_COLOR_EXPLAIN}
      @@ -65,6 +66,7 @@

      {L_GROUP_SETTINGS_SAVE}

      +
      From 607fe555afaf2af861fc07d5ea51d25472bcfd86 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 30 May 2024 11:00:22 +0200 Subject: [PATCH 0161/1214] [prep-release-3.3.12] Update version numbers to 3.3.12 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index c3a741b8917..6eb00cf4fab 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f5d8122628e..d80ad6b5877 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.12-RC1'); +@define('PHPBB_VERSION', '3.3.12'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 31072dbd6b8..07b13ddda03 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.12-RC1'); +define('PHPBB_VERSION', '3.3.12'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index a9c8d4a0495..1400d986c19 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.12-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.12'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 6cef48af2fe3ef33f74e01689f38974ff742f4a8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 30 May 2024 11:00:23 +0200 Subject: [PATCH 0162/1214] [prep-release-3.3.12] Add migration for 3.3.12 --- phpBB/phpbb/db/migration/data/v33x/v3312.php | 38 ++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3312.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3312.php b/phpBB/phpbb/db/migration/data/v33x/v3312.php new file mode 100644 index 00000000000..36e78b95ef5 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3312.php @@ -0,0 +1,38 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3312 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.12', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\add_resend_activation_expiration', + '\phpbb\db\migration\data\v33x\add_user_last_active', + '\phpbb\db\migration\data\v33x\v3312rc1', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.12']], + ]; + } +} From 80a12f7108270de2dec30ddd847a0edfb59aa9fe Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 30 May 2024 11:03:06 +0200 Subject: [PATCH 0163/1214] [prep-release-3.3.12] Update changelog for 3.3.12 --- phpBB/docs/CHANGELOG.html | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 37fe4a2cb58..ccd3c88558c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

      Changelog

      1. Changelog
          +
        • Changes since 3.3.12-RC1
        • Changes since 3.3.11
        • Changes since 3.3.10
        • Changes since 3.3.10-RC1
          • @@ -168,6 +169,26 @@

          Changelog

          +

          Changes since 3.3.12-RC1

          +

          Bug

          +
            +
          • [PHPBB3-17312] - User last visit gets updated too often
            • +
          +

          Improvement

          +
            +
          • [PHPBB3-17324] - Add template event to notification_dropdown.html
            • +
          +

          Hardening

          +
            +
          • [SECURITY-132] - Limit CAPTCHA attempts at registration for single session
            • +
          • [SECURITY-279] - Escape smilies URL and prevent paths in .pak filename
            • +
          +

          Hardening

          +
            +
          • [SECURITY-276] - Prevent resending activation email too often
            • +
          • [SECURITY-278] - Always release cron lock, even invalid task is passed
            • +
          +

          Changes since 3.3.11

          Bug

            From 2aba9b0e3feea6504abc5892a4f8665a9404ec65 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 30 May 2024 20:39:52 +0200 Subject: [PATCH 0164/1214] [prep-release-3.3.12] Remove columns from user_add These have default values and do not require setting in user_add(). --- phpBB/includes/functions_user.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c33caba8e8d..4846436a72f 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -216,7 +216,6 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'user_lang' => $config['default_lang'], 'user_style' => (int) $config['default_style'], 'user_actkey' => '', - 'user_actkey_expiration' => 0, 'user_ip' => '', 'user_regdate' => time(), 'user_passchg' => time(), @@ -228,7 +227,6 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'user_inactive_time' => 0, 'user_lastmark' => time(), 'user_lastvisit' => 0, - 'user_last_active' => 0, 'user_lastpost_time' => 0, 'user_lastpage' => '', 'user_posts' => 0, From 902283c368e379f563ce3e716f4ac321d927161b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 09:47:37 +0200 Subject: [PATCH 0165/1214] [ticket/17153] Use twig and avatar helper to render avatars PHPBB3-17153 --- .../default/container/services_twig.yml | 2 + .../phpbb/template/twig/extension/avatar.php | 73 +++++++++++-------- phpBB/styles/all/template/macros/avatar.twig | 1 + tests/template/extension_test.php | 64 +++++++++++++++- tests/template/templates/avatar_group.html | 1 + 5 files changed, 109 insertions(+), 32 deletions(-) create mode 100644 phpBB/styles/all/template/macros/avatar.twig create mode 100644 tests/template/templates/avatar_group.html diff --git a/phpBB/config/default/container/services_twig.yml b/phpBB/config/default/container/services_twig.yml index 17ca9c75038..e7a7155deba 100644 --- a/phpBB/config/default/container/services_twig.yml +++ b/phpBB/config/default/container/services_twig.yml @@ -45,6 +45,8 @@ services: template.twig.extensions.avatar: class: phpbb\template\twig\extension\avatar + arguments: + - '@avatar.helper' tags: - { name: twig.extension } diff --git a/phpBB/phpbb/template/twig/extension/avatar.php b/phpBB/phpbb/template/twig/extension/avatar.php index fb7ec92655f..238caddaf50 100644 --- a/phpBB/phpbb/template/twig/extension/avatar.php +++ b/phpBB/phpbb/template/twig/extension/avatar.php @@ -13,16 +13,36 @@ namespace phpbb\template\twig\extension; +use phpbb\avatar\helper; +use phpbb\avatar\manager; +use phpbb\template\twig\environment; +use Twig\Error\Error; use Twig\Extension\AbstractExtension; +use Twig\TwigFunction; class avatar extends AbstractExtension { + /** + * @var helper + */ + private $avatar_helper; + + /** + * Constructor for avatar extension + * + * @param helper $avatar_helper + */ + public function __construct(helper $avatar_helper) + { + $this->avatar_helper = $avatar_helper; + } + /** * Get the name of this extension * * @return string */ - public function getName() + public function getName(): string { return 'avatar'; } @@ -30,13 +50,13 @@ public function getName() /** * Returns a list of global functions to add to the existing list. * - * @return \Twig\TwigFunction[] An array of global functions + * @return TwigFunction[] An array of global functions */ public function getFunctions(): array { - return array( - new \Twig\TwigFunction('avatar', array($this, 'get_avatar')), - ); + return [ + new TwigFunction('avatar', [$this, 'get_avatar'], ['needs_environment' => true]), + ]; } /** @@ -48,35 +68,30 @@ public function getFunctions(): array * The mode and row (group_row or user_row) are required. * The other fields (alt|ignore_config|lazy) are optional. * - * @uses \phpbb_get_group_avatar() - * @uses \phpbb_get_user_avatar() - * * @return string The avatar HTML for the specified mode */ - public function get_avatar() + public function get_avatar(environment $environment, string $mode, array $row, ?string $alt, ?bool $ignore_config, ?bool $lazy): string { - $args = func_get_args(); + $alt = $alt ?? false; + $ignore_config = $ignore_config ?? false; + $lazy = $lazy ?? false; + $row = manager::clean_row($row, $mode); + $avatar = $this->avatar_helper->get_avatar($row, $alt, $ignore_config, $lazy); - $mode = (string) $args[0]; - $row = (array) $args[1]; - $alt = isset($args[2]) ? (string) $args[2] : false; - $ignore_config = isset($args[3]) ? (bool) $args[3] : false; - $lazy = isset($args[4]) ? (bool) $args[4] : false; - - // To prevent having to redefine alt attribute ('USER_AVATAR'|'GROUP_AVATAR'), we check if an alternative has been provided - switch ($mode) + try { - case 'group': - return $alt ? phpbb_get_group_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_group_avatar($row); - break; - - case 'user': - return $alt ? phpbb_get_user_avatar($row, $alt, $ignore_config, $lazy) : phpbb_get_user_avatar($row); - break; - - default: - return ''; - break; + return $environment->render('macros/avatar.twig', [ + 'SRC' => $avatar['lazy'] ? $this->avatar_helper->get_no_avatar_source() : $avatar['src'], + 'DATA_SRC' => $avatar['lazy'] ? $avatar['src'] : '', + 'WIDTH' => $avatar['width'], + 'HEIGHT' => $avatar['height'], + 'TITLE' => $avatar['title'], + 'LAZY' => $avatar['lazy'], + ]); + } + catch (Error $e) + { + return ''; } } } diff --git a/phpBB/styles/all/template/macros/avatar.twig b/phpBB/styles/all/template/macros/avatar.twig new file mode 100644 index 00000000000..6c3a3809cde --- /dev/null +++ b/phpBB/styles/all/template/macros/avatar.twig @@ -0,0 +1 @@ +{% if SRC %}{{ lang(TITLE) }}{% endif %} diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index 207aa5e99f6..64da6b79b37 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -89,6 +89,14 @@ protected function setup_engine(array $new_config = []) $enabled_drivers = $class->getProperty('enabled_drivers'); $enabled_drivers->setAccessible(true); $enabled_drivers->setValue($class, false); + $avatar_helper = new phpbb\avatar\helper( + $config, + $phpbb_dispatcher, + $lang, + $phpbb_container->get('avatar.manager'), + $phpbb_path_helper, + new \phpbb\user($lang, '\phpbb\datetime') + ); $this->template_path = $this->test_path . '/templates'; @@ -122,7 +130,7 @@ protected function setup_engine(array $new_config = []) $this->user, [ new \phpbb\template\twig\extension($context, $twig, $this->lang), - new \phpbb\template\twig\extension\avatar(), + new \phpbb\template\twig\extension\avatar($avatar_helper), new \phpbb\template\twig\extension\config($config), new \phpbb\template\twig\extension\icon($this->user), new \phpbb\template\twig\extension\username(), @@ -153,7 +161,7 @@ public function data_template_extensions() ], [], [], - 'foo', + 'foo', [] ], [ @@ -171,7 +179,7 @@ public function data_template_extensions() ], [], [], - 'foo', + 'foo', [] ], [ @@ -190,6 +198,56 @@ public function data_template_extensions() '', [] ], + [ + 'avatar_group.html', + [ + 'row' => [ + 'group_avatar' => 'great_avatar.png', + 'group_avatar_type' => 'avatar.driver.upload', + 'group_avatar_width' => 90, + 'group_avatar_height' => 90, + ], + 'alt' => 'foo' + ], + [], + [], + 'foo', + [] + ], + [ + 'avatar_group.html', + [ + 'row' => [ + 'group_avatar' => 'great_avatar.png', + 'group_avatar_type' => 'avatar.driver.upload', + 'group_avatar_width' => 90, + 'group_avatar_height' => 90, + ], + 'alt' => 'foo', + 'ignore_config' => true, + 'lazy' => true, + ], + [], + [], + 'foo', + [] + ], + [ + 'avatar_group.html', + [ + 'row' => [ + 'group_avatar' => 'foo@bar.com', + 'group_avatar_type' => 'avatar.driver.gravatar', + 'group_avatar_width' => 90, + 'group_avatar_height' => 90, + ], + 'alt' => 'foo' + ], + [], + [], + '', + [] + ], [ 'extension_username_test.html', [ diff --git a/tests/template/templates/avatar_group.html b/tests/template/templates/avatar_group.html new file mode 100644 index 00000000000..95ae9c08c0f --- /dev/null +++ b/tests/template/templates/avatar_group.html @@ -0,0 +1 @@ +{{ avatar('group', row, alt, ignore_config, lazy) }} From cf44868393832ddad6c765b90682c3fc9482b16b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 09:48:15 +0200 Subject: [PATCH 0166/1214] [ticket/17153] Remove phpbb_get_group_avatar() PHPBB3-17153 --- phpBB/includes/functions.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bca9a97c48c..0c38e70eb6a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3559,24 +3559,6 @@ function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = return phpbb_get_avatar($row, $alt, $ignore_config, $lazy); } -/** -* Get group avatar -* -* @deprecated 4.0.0 Use \phpbb\avatar\helper::get_group_avatar() instead -* -* @param array $group_row Row from the groups table -* @param string $alt Optional language string for alt tag within image, can be a language key or text -* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP -* @param bool $lazy If true, will be lazy loaded (requires JS) -* -* @return string Avatar html -*/ -function phpbb_get_group_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = false, $lazy = false) -{ - $row = \phpbb\avatar\manager::clean_row($group_row, 'group'); - return phpbb_get_avatar($row, $alt, $ignore_config, $lazy); -} - /** * Get avatar * From 808b2f3a417eb16a4e325a42c3f8c224bc96f6a5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 09:48:56 +0200 Subject: [PATCH 0167/1214] [ticket/17153] Remove phpbb_get_user_avatar PHPBB3-17153 --- phpBB/includes/functions.php | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0c38e70eb6a..b2440a7cf31 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3541,24 +3541,6 @@ function phpbb_quoteattr($data, $entities = null) return $data; } -/** -* Get user avatar -* -* @deprecated 4.0.0 Use \phpbb\avatar\helper::get_user_avatar() instead -* -* @param array $user_row Row from the users table -* @param string $alt Optional language string for alt tag within image, can be a language key or text -* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP -* @param bool $lazy If true, will be lazy loaded (requires JS) -* -* @return string Avatar html -*/ -function phpbb_get_user_avatar($user_row, $alt = 'USER_AVATAR', $ignore_config = false, $lazy = false) -{ - $row = \phpbb\avatar\manager::clean_row($user_row, 'user'); - return phpbb_get_avatar($row, $alt, $ignore_config, $lazy); -} - /** * Get avatar * From f54bafec293229808417b3ba4f01011ad3728f28 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 09:50:32 +0200 Subject: [PATCH 0168/1214] [ticket/17153] Remove get_user_avatar PHPBB3-17153 --- phpBB/includes/functions_compatibility.php | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index c5ca053f560..85ec1bd449a 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,34 +19,6 @@ exit; } -/** -* Get user avatar -* -* @deprecated 3.1.0-a1 (To be removed: 4.0.0) -* -* @param string $avatar Users assigned avatar name -* @param int $avatar_type Type of avatar -* @param string $avatar_width Width of users avatar -* @param string $avatar_height Height of users avatar -* @param string $alt Optional language string for alt tag within image, can be a language key or text -* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP -* @param bool $lazy If true, will be lazy loaded (requires JS) -* -* @return string Avatar image -*/ -function get_user_avatar($avatar, $avatar_type, $avatar_width, $avatar_height, $alt = 'USER_AVATAR', $ignore_config = false, $lazy = false) -{ - // map arguments to new function phpbb_get_avatar() - $row = array( - 'avatar' => $avatar, - 'avatar_type' => $avatar_type, - 'avatar_width' => $avatar_width, - 'avatar_height' => $avatar_height, - ); - - return phpbb_get_avatar($row, $alt, $ignore_config, $lazy); -} - /** * Hash the password * From 4db4a5571b8f9af937956ecf86257b6080b44826 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 09:51:21 +0200 Subject: [PATCH 0169/1214] [ticket/17153] Remove phpbb_get_avatar() PHPBB3-17153 --- phpBB/includes/functions.php | 85 ------------------------------------ 1 file changed, 85 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b2440a7cf31..2568eb20b25 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3541,91 +3541,6 @@ function phpbb_quoteattr($data, $entities = null) return $data; } -/** -* Get avatar -* -* @deprecated 4.0.0 Use \phpbb\avatar\helper::get_avatar() instead -* -* @param array $row Row cleaned by \phpbb\avatar\manager::clean_row -* @param string $alt Optional language string for alt tag within image, can be a language key or text -* @param bool $ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP -* @param bool $lazy If true, will be lazy loaded (requires JS) -* -* @return string Avatar html -*/ -function phpbb_get_avatar($row, $alt, $ignore_config = false, $lazy = false) -{ - global $user, $config; - global $phpbb_container, $phpbb_dispatcher; - - if (!$config['allow_avatar'] && !$ignore_config) - { - return ''; - } - - $avatar_data = array( - 'src' => $row['avatar'], - 'width' => $row['avatar_width'], - 'height' => $row['avatar_height'], - ); - - /* @var $phpbb_avatar_manager \phpbb\avatar\manager */ - $phpbb_avatar_manager = $phpbb_container->get('avatar.manager'); - $driver = $phpbb_avatar_manager->get_driver($row['avatar_type'], !$ignore_config); - $html = ''; - - if ($driver) - { - $html = $driver->get_custom_html($user, $row, $alt); - $avatar_data = $driver->get_data($row); - } - else - { - $avatar_data['src'] = ''; - } - - if (empty($html) && !empty($avatar_data['src'])) - { - if ($lazy) - { - // This path is sent with the base template paths in the assign_vars() - // call below. We need to correct it in case we are accessing from a - // controller because the web paths will be incorrect otherwise. - $phpbb_path_helper = $phpbb_container->get('path_helper'); - $web_path = $phpbb_path_helper->get_web_root_path(); - - $theme = "{$web_path}styles/" . rawurlencode($user->style['style_path']) . '/theme'; - - $src = 'src="' . $theme . '/images/no_avatar.gif" data-src="' . $avatar_data['src'] . '"'; - } - else - { - $src = 'src="' . $avatar_data['src'] . '"'; - } - - $html = ''; - } - - /** - * Event to modify HTML tag of avatar - * - * @event core.get_avatar_after - * @var array row Row cleaned by \phpbb\avatar\manager::clean_row - * @var string alt Optional language string for alt tag within image, can be a language key or text - * @var bool ignore_config Ignores the config-setting, to be still able to view the avatar in the UCP - * @var array avatar_data The HTML attributes for avatar tag - * @var string html The HTML tag of generated avatar - * @since 3.1.6-RC1 - */ - $vars = array('row', 'alt', 'ignore_config', 'avatar_data', 'html'); - extract($phpbb_dispatcher->trigger_event('core.get_avatar_after', compact($vars))); - - return $html; -} - /** * Generate page header */ From aac7d5a99cdcfe3f32ff8edec02ac1d9099504af Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 19:31:00 +0200 Subject: [PATCH 0170/1214] [ticket/17153] Use routing helper instead of controller helper in upload avatar The controller helper class is not needed, routing helper brings all the needed functionality already. PHPBB3-17153 --- phpBB/config/default/container/services_avatar.yml | 2 +- phpBB/phpbb/avatar/driver/upload.php | 12 ++++++------ tests/avatar/manager_test.php | 3 ++- tests/template/extension_test.php | 9 +++------ 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/phpBB/config/default/container/services_avatar.yml b/phpBB/config/default/container/services_avatar.yml index e8048278c7b..a7c93869cc9 100644 --- a/phpBB/config/default/container/services_avatar.yml +++ b/phpBB/config/default/container/services_avatar.yml @@ -56,11 +56,11 @@ services: class: phpbb\avatar\driver\upload arguments: - '@config' - - '@controller.helper' - '%core.root_path%' - '%core.php_ext%' - '@storage.avatar' - '@path_helper' + - '@routing.helper' - '@event_dispatcher' - '@files.factory' - '@php_ini' diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 416034b6741..14b9e4026cb 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -15,10 +15,10 @@ use bantu\IniGetWrapper\IniGetWrapper; use phpbb\config\config; -use phpbb\controller\helper; use phpbb\event\dispatcher_interface; use phpbb\files\factory; use phpbb\path_helper; +use phpbb\routing\helper; use phpbb\storage\exception\exception as storage_exception; use phpbb\storage\storage; @@ -30,7 +30,7 @@ class upload extends \phpbb\avatar\driver\driver /** * @var helper */ - private $controller_helper; + private $routing_helper; /** * @var storage @@ -56,23 +56,23 @@ class upload extends \phpbb\avatar\driver\driver * Construct a driver object * * @param config $config phpBB configuration - * @param helper $controller_helper * @param string $phpbb_root_path Path to the phpBB root * @param string $php_ext PHP file extension * @param storage $storage phpBB avatar storage * @param path_helper $path_helper phpBB path helper + * @param helper $routing_helper phpBB routing helper * @param dispatcher_interface $dispatcher phpBB Event dispatcher object * @param factory $files_factory File classes factory * @param IniGetWrapper $php_ini ini_get() wrapper */ - public function __construct(config $config, helper $controller_helper, string $phpbb_root_path, string $php_ext, storage $storage, path_helper $path_helper, dispatcher_interface $dispatcher, factory $files_factory, IniGetWrapper $php_ini) + public function __construct(config $config, string $phpbb_root_path, string $php_ext, storage $storage, path_helper $path_helper, helper $routing_helper, dispatcher_interface $dispatcher, factory $files_factory, IniGetWrapper $php_ini) { $this->config = $config; - $this->controller_helper = $controller_helper; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $this->storage = $storage; $this->path_helper = $path_helper; + $this->routing_helper = $routing_helper; $this->dispatcher = $dispatcher; $this->files_factory = $files_factory; $this->php_ini = $php_ini; @@ -84,7 +84,7 @@ public function __construct(config $config, helper $controller_helper, string $p public function get_data($row) { return array( - 'src' => $this->controller_helper->route('phpbb_storage_avatar', ['file' => $row['avatar']]), + 'src' => $this->routing_helper->route('phpbb_storage_avatar', ['file' => $row['avatar']]), 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], ); diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 19b7797eb4f..c3210807b94 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -58,6 +58,7 @@ protected function setUp(): void $phpbb_dispatcher = $dispatcher; $controller_helper = $this->createMock('\phpbb\controller\helper'); + $routing_helper = $this->createMock('\phpbb\routing\helper'); // $this->avatar_foobar will be needed later on $this->avatar_foobar = $this->getMockBuilder('\phpbb\avatar\driver\foobar') @@ -96,7 +97,7 @@ protected function setUp(): void { $cur_avatar = $this->getMockBuilder('\phpbb\avatar\driver\\' . $driver) ->setMethods(array('get_name')) - ->setConstructorArgs(array($this->config, $controller_helper, $phpbb_root_path, $phpEx, $storage, $path_helper, $dispatcher, $files_factory, $php_ini)) + ->setConstructorArgs(array($this->config, $phpbb_root_path, $phpEx, $storage, $path_helper, $routing_helper, $dispatcher, $files_factory, $php_ini)) ->getMock(); } $cur_avatar->expects($this->any()) diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index 64da6b79b37..8295a613a02 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -11,8 +11,6 @@ * */ -use phpbb\controller\helper; - require_once __DIR__ . '/template_test_case.php'; class phpbb_template_extension_test extends phpbb_template_template_test_case @@ -68,9 +66,8 @@ protected function setup_engine(array $new_config = []) ->disableOriginalConstructor() ->getMock(); - $controller_helper = $this->createMock(helper::class); - $controller_helper - ->method('route') + $routing_helper = $this->createMock(\phpbb\routing\helper::class); + $routing_helper->method('route') ->willReturnCallback(function($route, $params) { return 'download/avatar/' . $params['file']; }); @@ -78,7 +75,7 @@ protected function setup_engine(array $new_config = []) $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $phpbb_container = new phpbb_mock_container_builder(); $files = new phpbb\files\factory($phpbb_container); - $upload_avatar_driver = new phpbb\avatar\driver\upload($config, $controller_helper, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper()); + $upload_avatar_driver = new phpbb\avatar\driver\upload($config, $phpbb_root_path, $phpEx, $storage, $phpbb_path_helper, $routing_helper, $phpbb_dispatcher, $files, new \bantu\IniGetWrapper\IniGetWrapper()); $upload_avatar_driver->set_name('avatar.driver.upload'); $phpbb_container->set('avatar.manager', new \phpbb\avatar\manager($config, $phpbb_dispatcher, [ $upload_avatar_driver, From ad7721368ce4f3505319fca4085314ce0c056072 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 19:32:38 +0200 Subject: [PATCH 0171/1214] [ticket/17153] Add basic avatar config file for installer It doesn't actually add proper avatar functionality to the installer but provides the necessary base classes for templating. PHPBB3-17153 --- phpBB/config/installer/container/services.yml | 1 + .../installer/container/services_avatar.yml | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 phpBB/config/installer/container/services_avatar.yml diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml index b4e731306d5..70fb0ee308d 100644 --- a/phpBB/config/installer/container/services.yml +++ b/phpBB/config/installer/container/services.yml @@ -1,5 +1,6 @@ imports: - { resource: services_installer.yml } + - { resource: services_avatar.yml } - { resource: ../../default/container/services_event.yml } - { resource: ../../default/container/services_filesystem.yml } - { resource: ../../default/container/services_http.yml } diff --git a/phpBB/config/installer/container/services_avatar.yml b/phpBB/config/installer/container/services_avatar.yml new file mode 100644 index 00000000000..31d28e77fb5 --- /dev/null +++ b/phpBB/config/installer/container/services_avatar.yml @@ -0,0 +1,25 @@ +services: + avatar.manager: + class: phpbb\avatar\manager + arguments: + - '@config' + - '@dispatcher' + - '@avatar.driver_collection' + + avatar.helper: + class: phpbb\avatar\helper + arguments: + - '@config' + - '@dispatcher' + - '@language' + - '@avatar.manager' + - '@path_helper' + - '@user' + + # ----- Avatar drivers ----- + avatar.driver_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: avatar.driver } From c495a26f98ecbf776a08b3a5282d1ee9a543ce3f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jul 2023 20:29:16 +0200 Subject: [PATCH 0172/1214] [ticket/17153] Use mocked user class in extension test PHPBB3-17153 --- tests/template/extension_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index 8295a613a02..5caae111ca8 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -32,7 +32,7 @@ protected function setup_engine(array $new_config = []) $this->user->style['style_parent_id'] = 0; global $auth, $request, $symfony_request, $user; - $user = new phpbb_mock_user(); + $user = $this->createMock(\phpbb\user::class); $user->optionset('user_id', 2); $user->style['style_path'] = ''; $user->data['user_id'] = 2; @@ -92,7 +92,7 @@ protected function setup_engine(array $new_config = []) $lang, $phpbb_container->get('avatar.manager'), $phpbb_path_helper, - new \phpbb\user($lang, '\phpbb\datetime') + $user ); $this->template_path = $this->test_path . '/templates'; From be6bb099845e7e32445b6dcd90b8f29b14cbd67d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 31 May 2024 20:05:39 +0200 Subject: [PATCH 0173/1214] [prep-release-3.3.12] Update changelog for 3.3.12 --- phpBB/docs/CHANGELOG.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index ccd3c88558c..8b20e374b16 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -179,11 +179,6 @@

            Improvement

          • [PHPBB3-17324] - Add template event to notification_dropdown.html

          Hardening

          -
            -
          • [SECURITY-132] - Limit CAPTCHA attempts at registration for single session
            • -
          • [SECURITY-279] - Escape smilies URL and prevent paths in .pak filename
            • -
          -

          Hardening

          • [SECURITY-276] - Prevent resending activation email too often
          • [SECURITY-278] - Always release cron lock, even invalid task is passed
            • From 56d8a7e43f6bbf9837227ea4da712a10287a7c64 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 31 May 2024 22:30:05 +0200 Subject: [PATCH 0174/1214] [ticket/17327] Use class name from use statement PHPBB3-17327 --- phpBB/phpbb/console/command/user/add.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 11380373cdc..1dadabb5a41 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -337,7 +337,7 @@ protected function get_activation_key(int $user_id): string $sql_ary = [ 'user_actkey' => $user_actkey, - 'user_actkey_expiration' => \phpbb\user::get_token_expiration(), + 'user_actkey_expiration' => user::get_token_expiration(), ]; $sql = 'UPDATE ' . USERS_TABLE . ' From efc8400694118d8c9d76070fa9e1c80bbbc6c855 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Jun 2024 15:55:00 +0200 Subject: [PATCH 0175/1214] [ticket/17328] Update requires for exporting events PHPBB-17328 --- phpBB/develop/export_events_for_bbcode.php | 3 ++- phpBB/develop/export_events_for_rst.php | 3 ++- phpBB/develop/export_events_for_wiki.php | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/phpBB/develop/export_events_for_bbcode.php b/phpBB/develop/export_events_for_bbcode.php index e30027bf94d..fc8c604f800 100644 --- a/phpBB/develop/export_events_for_bbcode.php +++ b/phpBB/develop/export_events_for_bbcode.php @@ -65,7 +65,8 @@ function validate_argument_count($arguments, $count) require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx; require __DIR__ . '/../includes/functions.' . $phpEx; require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx; -require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx; +require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx; +require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx; switch ($action) { diff --git a/phpBB/develop/export_events_for_rst.php b/phpBB/develop/export_events_for_rst.php index 908d4298d65..9ca58e6e69f 100644 --- a/phpBB/develop/export_events_for_rst.php +++ b/phpBB/develop/export_events_for_rst.php @@ -68,7 +68,8 @@ function validate_argument_count($arguments, $count) require __DIR__ . '/../phpbb/event/rst_exporter.' . $phpEx; require __DIR__ . '/../includes/functions.' . $phpEx; require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx; -require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx; +require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx; +require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx; switch ($action) { diff --git a/phpBB/develop/export_events_for_wiki.php b/phpBB/develop/export_events_for_wiki.php index 128d6f3c570..cf8bc3c61ce 100644 --- a/phpBB/develop/export_events_for_wiki.php +++ b/phpBB/develop/export_events_for_wiki.php @@ -67,7 +67,8 @@ function validate_argument_count($arguments, $count) require __DIR__ . '/../phpbb/event/md_exporter.' . $phpEx; require __DIR__ . '/../includes/functions.' . $phpEx; require __DIR__ . '/../phpbb/event/recursive_event_filter_iterator.' . $phpEx; -require __DIR__ . '/../phpbb/iterator/recursive_dot_prefix_filter_iterator.' . $phpEx; +require __DIR__ . '/../phpbb/finder/recursive_dot_prefix_filter_iterator.' . $phpEx; +require __DIR__ . '/../phpbb/finder/recursive_path_iterator.' . $phpEx; switch ($action) { From d499850532caa5f168e4109754271608c5d9013a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 2 Jun 2024 21:35:16 +0200 Subject: [PATCH 0176/1214] [ticket/17321] Add versioning to push worker to force updates PHPBB-17321 --- phpBB/phpbb/notification/method/webpush.php | 1 + phpBB/phpbb/ucp/controller/webpush.php | 1 + phpBB/styles/all/js/push_worker.js.twig | 22 ++++++++++++++++++++- 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index e5b8910a074..271e23dffe8 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -210,6 +210,7 @@ protected function notify_using_webpush(): void $data = [ 'item_id' => $notification->item_id, 'type_id' => $notification->notification_type_id, + 'version' => $this->config['assets_version'], ]; $json_data = json_encode($data); diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index a7ebbffae8e..b60fa437b3b 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -138,6 +138,7 @@ public function worker(): Response // @todo: only work for logged in users, no anonymous & bot $content = $this->template->render('push_worker.js.twig', [ 'U_WEBPUSH_GET_NOTIFICATION' => $this->controller_helper->route('phpbb_ucp_push_get_notification_controller'), + 'ASSETS_VERSION' => $this->config['assets_version'], ]); $response = new Response($content); diff --git a/phpBB/styles/all/js/push_worker.js.twig b/phpBB/styles/all/js/push_worker.js.twig index 8d6ec3c6af2..f9905c3d0bf 100644 --- a/phpBB/styles/all/js/push_worker.js.twig +++ b/phpBB/styles/all/js/push_worker.js.twig @@ -1,3 +1,15 @@ +/** + * Event listener for install event + */ +self.addEventListener('install', () => { + // Call to ensure service worker is correctly updated + self.skipWaiting(); +}); + +self.addEventListener('activate', event => { + event.waitUntil(clients.claim()); +}); + /** * Event listener for push event */ @@ -7,17 +19,25 @@ self.addEventListener('push', event => { } let itemId = 0; - let typeId = 0; + let typeId = 0; + let notificationVersion = 5; try { const notificationData = event.data.json(); itemId = notificationData.item_id; typeId = notificationData.type_id; + notificationVersion = parseInt(notificationData.version, 10); } catch { self.registration.showNotification(event.data.text()); return; } const getNotificationUrl = '{{ U_WEBPUSH_GET_NOTIFICATION }}'; + const assetsVersion = parseInt('{{ ASSETS_VERSION }}', 10); + + // Force update if versions differ + if (assetsVersion !== notificationVersion) { + self.registration.update(); + } const formData = new FormData(); formData.append('item_id', itemId.toString(10)); From 86064cb054a831fc70927a805e747ee3ab31907b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 3 Jun 2024 17:11:50 +0200 Subject: [PATCH 0177/1214] [ticket/17321] Use self.clients in activate event listener PHPBB-17321 --- phpBB/styles/all/js/push_worker.js.twig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/all/js/push_worker.js.twig b/phpBB/styles/all/js/push_worker.js.twig index f9905c3d0bf..f2807cb43ab 100644 --- a/phpBB/styles/all/js/push_worker.js.twig +++ b/phpBB/styles/all/js/push_worker.js.twig @@ -6,8 +6,11 @@ self.addEventListener('install', () => { self.skipWaiting(); }); +/** + * Event listener for activate event + */ self.addEventListener('activate', event => { - event.waitUntil(clients.claim()); + event.waitUntil(self.clients.claim()); }); /** From 03e2222dd70c28bcf38bec42f8e383d8d862b94a Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 4 Jun 2024 00:28:22 +0700 Subject: [PATCH 0178/1214] [ticket/17151] Add core.build_config_template event @changed information The event location's function has been renamed from build_config_template() to phpbb_build_cfg_template(). PHPBB3-17151 --- phpBB/includes/functions_acp.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index d2cc39aec8b..646d2f34d5a 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -515,6 +515,7 @@ function phpbb_build_cfg_template(array $tpl_type, string $key, array|object &$n * @var array vars Array with the options for the config * @var array|string tpl The resulting html code we display * @since 3.1.0-a1 + * @changed 4.0.0-a1 The event location's function renamed from build_config_template() to phpbb_build_cfg_template() */ $vars = array('tpl_type', 'key', 'new', 'name', 'vars', 'tpl'); extract($phpbb_dispatcher->trigger_event('core.build_config_template', compact($vars))); From e35a6f7aa5616e9d3ffe46c22c10bda0f4d3bfb5 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 08:26:21 -0700 Subject: [PATCH 0179/1214] [ticket/17333] ACP option to enable-disable all push notifications PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/includes/acp/acp_board.php | 1 + phpBB/install/schemas/schema_data.sql | 1 + phpBB/language/en/acp/board.php | 2 + .../data/v400/add_webpush_options.php | 45 +++++++++++++++++++ phpBB/phpbb/notification/method/webpush.php | 8 ++++ 5 files changed, 57 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/add_webpush_options.php diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index d0ced6788f3..8eaaa9fc883 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -494,6 +494,7 @@ function main($id, $mode) 'webpush_enable' => ['lang' => 'WEBPUSH_ENABLE', 'validate' => 'bool', 'type' => 'custom', 'method' => 'webpush_enable', 'explain' => true], 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], + 'webpush_method_enables' => ['lang' => 'WEBPUSH_METHOD_ENABLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], 'legend3' => 'ACP_SUBMIT_CHANGES', ], diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 68a97decb79..f57a9f466bf 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -329,6 +329,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\con INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_enable', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_public', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_private', ''); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_enables', '0'); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index c57cefe6857..484d651c75e 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -590,6 +590,8 @@ 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) public key is shared to authenticate push messages from your site.
            Caution: Modifying the VAPID public key will automatically render all Web Push subscriptions invalid.', 'WEBPUSH_VAPID_PRIVATE' => 'Server identification private key', 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key must form a valid public-private key pair alongside the VAPID public key.
            Caution: Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.', + 'WEBPUSH_METHOD_ENABLES' => 'Enable all user-based web push notification options by default', + 'WEBPUSH_METHOD_ENABLES_EXPLAIN'=> 'When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. Users only need to visit the UCP Notification settings to disable any unwanted notifications.

            If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notification options they wish to receive.', ]); // Jabber settings diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php new file mode 100644 index 00000000000..99ef6bd28f7 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php @@ -0,0 +1,45 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class add_webpush_options extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\add_webpush', + ]; + } + + public function effectively_installed(): bool + { + return $this->config->offsetExists('webpush_method_enables'); + } + + public function update_data(): array + { + return [ + ['config.add', ['webpush_method_enables', false]], + ]; + } + + public function revert_data(): array + { + return [ + ['config.remove', ['webpush_method_enables']], + ]; + } +} diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index e5b8910a074..e1fc1f04eea 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -91,6 +91,14 @@ public function is_available(type_interface $notification_type = null): bool && !empty($this->config['webpush_vapid_public']) && !empty($this->config['webpush_vapid_private']); } + /** + * {@inheritDoc} + */ + public function is_enabled_by_default() + { + return $this->config['webpush_method_enables']; + } + /** * {@inheritdoc} */ From d55ec608eceabe0b028ac33082545b2d205ff5a8 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 09:34:02 -0700 Subject: [PATCH 0180/1214] [ticket/17333] Add push subscribe toggle to notification dropdown PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/includes/acp/acp_board.php | 1 + phpBB/includes/functions.php | 16 ++++++++++++++-- phpBB/install/schemas/schema_data.sql | 1 + phpBB/language/en/acp/board.php | 2 ++ phpBB/language/en/common.php | 3 +++ .../migration/data/v400/add_webpush_options.php | 4 +++- phpBB/phpbb/notification/method/webpush.php | 2 +- .../template/notification_dropdown.html | 7 +++++++ .../prosilver/template/overall_header.html | 4 ++++ .../template/ucp_notifications_options.html | 4 ---- phpBB/styles/prosilver/theme/buttons.css | 6 ++++++ phpBB/styles/prosilver/theme/common.css | 9 +++++++++ 12 files changed, 51 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 8eaaa9fc883..53faa4bc7de 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -495,6 +495,7 @@ function main($id, $mode) 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], 'webpush_method_enables' => ['lang' => 'WEBPUSH_METHOD_ENABLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], + 'webpush_dropdown_subscribe'=> ['lang' => 'WEBPUSH_DROPDOWN_SUBSCRIBE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], 'legend3' => 'ACP_SUBMIT_CHANGES', ], diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bca9a97c48c..fdc2d42ab9a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3853,6 +3853,9 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $timezone_name = $user->lang['timezones'][$timezone_name]; } + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + // Output the notifications $notifications = false; if ($config['load_notifications'] && $config['allow_board_notifications'] && $user->data['user_id'] != ANONYMOUS && $user->data['user_type'] != USER_IGNORE) @@ -3869,10 +3872,19 @@ function page_header($page_title = '', $display_online_list = false, $item_id = { $template->assign_block_vars('notifications', $notification->prepare_for_display()); } + + // Get web push notification data + $methods = $phpbb_notifications->get_subscription_methods(); + if ($config['webpush_dropdown_subscribe'] && array_key_exists('notification.method.webpush', $methods)) + { + /** @var \phpbb\form\form_helper $form_helper */ + $form_helper = $phpbb_container->get('form_helper'); + + $template_ary = $methods['notification.method.webpush']['method']->get_ucp_template_data($controller_helper, $form_helper); + $template->assign_vars($template_ary); + } } - /** @var \phpbb\controller\helper $controller_helper */ - $controller_helper = $phpbb_container->get('controller.helper'); $notification_mark_hash = generate_link_hash('mark_all_notifications_read'); $phpbb_version_parts = explode('.', PHPBB_VERSION, 3); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index f57a9f466bf..9cabeb3e277 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -330,6 +330,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_enable', ' INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_public', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_private', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_enables', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_dropdown_subscribe', '0'); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 484d651c75e..3353a360e8a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -592,6 +592,8 @@ 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key must form a valid public-private key pair alongside the VAPID public key.
            Caution: Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.', 'WEBPUSH_METHOD_ENABLES' => 'Enable all user-based web push notification options by default', 'WEBPUSH_METHOD_ENABLES_EXPLAIN'=> 'When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. Users only need to visit the UCP Notification settings to disable any unwanted notifications.

            If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notification options they wish to receive.', + 'WEBPUSH_DROPDOWN_SUBSCRIBE' => 'Show “Subscribe” button in notification dropdown', + 'WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN'=> 'Display a “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from anywhere in the forum.', ]); // Jabber settings diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 71790e499b1..5933cc8f5cf 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -512,6 +512,9 @@ ), 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', + 'NOTIFY_WEB_PUSH_ENABLE' => 'Enable Web Push notifications', + 'NOTIFY_WEB_PUSH_SUBSCRIBE' => 'Subscribe', + 'NOTIFY_WEB_PUSH_SUBSCRIBED'=> 'Subscribed', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', 'NO_ACTION' => 'No action specified.', 'NO_ADMINISTRATORS' => 'There are no administrators.', diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php index 99ef6bd28f7..d7478edfeaf 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php @@ -26,13 +26,14 @@ public static function depends_on(): array public function effectively_installed(): bool { - return $this->config->offsetExists('webpush_method_enables'); + return $this->config->offsetExists('webpush_method_enables') || $this->config->offsetExists('webpush_dropdown_subscribe'); } public function update_data(): array { return [ ['config.add', ['webpush_method_enables', false]], + ['config.add', ['webpush_dropdown_subscribe', false]], ]; } @@ -40,6 +41,7 @@ public function revert_data(): array { return [ ['config.remove', ['webpush_method_enables']], + ['config.remove', ['webpush_dropdown_subscribe']], ]; } } diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index e1fc1f04eea..dcf1d1ebbf8 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -355,7 +355,7 @@ public function get_ucp_template_data(helper $controller_helper, form_helper $fo } return [ - 'NOTIFICATIONS_WEBPUSH_ENABLE' => true, + 'NOTIFICATIONS_WEBPUSH_ENABLE' => $this->config['webpush_dropdown_subscribe'] || stripos($this->user->page['page'], 'notification_options'), 'U_WEBPUSH_SUBSCRIBE' => $controller_helper->route('phpbb_ucp_push_subscribe_controller'), 'U_WEBPUSH_UNSUBSCRIBE' => $controller_helper->route('phpbb_ucp_push_unsubscribe_controller'), 'VAPID_PUBLIC_KEY' => $this->config['webpush_vapid_public'], diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index 52bc5469766..841f5417444 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -44,6 +44,13 @@
            {L_SEE_ALL}
            + {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %} +
            + {{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} + + +
            + {% endif %} {% EVENT notification_dropdown_footer_after %}
          diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index b88de2aaa87..790f793d8fb 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -63,6 +63,10 @@ +{% if NOTIFICATIONS_WEBPUSH_ENABLE %} + {% include('ucp_notifications_webpush.html') %} +{% endif %} + diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index a0d9caad12e..b3be983f169 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -1,9 +1,5 @@ {% include('ucp_header.html') %} -{% if NOTIFICATIONS_WEBPUSH_ENABLE %} - {% include('ucp_notifications_webpush.html') %} -{% endif %} -

          {{ TITLE }}

          diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index e8f8fbe961a..fda72c86138 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -220,3 +220,9 @@ button::-moz-focus-inner { .avatar-cropper-buttons > .button-group { margin: 4px; } + +/* Notification buttons +--------------------------------------------- */ +.notification-subscribe_toggle:disabled { + opacity: 0.7; +} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 240ba25d039..2300f9c611a 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1340,6 +1340,15 @@ ul.linklist:after, display: block; } +.dropdown-extended .notification-dropdown-footer { + white-space: nowrap; + border-top: solid 1px #b9b9b9; + display: flex; + flex-wrap: nowrap; + justify-content: space-between; + padding: 5px 10px; +} + .notification-avatar, .notification-menu .notification-list .notification-item .avatar, .notification-menu .notification-list .notification-item .gravatar { From 4afba5c9feec00a375a0ab86f05bc8aa0ba620ce Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 10:15:54 -0700 Subject: [PATCH 0181/1214] [ticket/17333] Enable new configs by default PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/install/schemas/schema_data.sql | 4 ++-- phpBB/phpbb/db/migration/data/v400/add_webpush_options.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9cabeb3e277..7756586c706 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -329,8 +329,8 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\con INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_enable', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_public', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_private', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_enables', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_dropdown_subscribe', '0'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_enables', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_dropdown_subscribe', '1'); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cron_lock', '0', 1); diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php index d7478edfeaf..1a1727b2568 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php @@ -32,8 +32,8 @@ public function effectively_installed(): bool public function update_data(): array { return [ - ['config.add', ['webpush_method_enables', false]], - ['config.add', ['webpush_dropdown_subscribe', false]], + ['config.add', ['webpush_method_enables', true]], + ['config.add', ['webpush_dropdown_subscribe', true]], ]; } From ef4db99709a650df0a0c24ebd7419f6963b229a7 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 5 Jun 2024 00:20:49 +0700 Subject: [PATCH 0182/1214] [ticket/17332] Fix permission migrator tool to work with copied permissions PHPBB-17332 --- phpBB/phpbb/db/migration/tool/permission.php | 61 +++++++++----------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index 66ca2ed0ee6..a0ae3ceddf2 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -435,15 +435,14 @@ public function permission_set($name, $auth_option, $type = 'role', $has_permiss } $this->db->sql_freeresult($result); - if (empty($new_auth)) + $type = (string) $type; // Prevent PHP bug. + if (empty($new_auth) || !in_array($type, ['role','group'])) { return; } $current_auth = array(); - $type = (string) $type; // Prevent PHP bug. - switch ($type) { case 'role': @@ -525,40 +524,32 @@ function ($option) use ($role_type) break; } - $sql_ary = array(); - switch ($type) + $sql_ary = $auth_update_list = []; + $table = $type == 'role' ? ACL_ROLES_DATA_TABLE : ACL_GROUPS_TABLE; + foreach ($new_auth as $auth_option_id) { - case 'role': - foreach ($new_auth as $auth_option_id) - { - if (!isset($current_auth[$auth_option_id])) - { - $sql_ary[] = array( - 'role_id' => $role_id, - 'auth_option_id' => $auth_option_id, - 'auth_setting' => $has_permission, - ); - } - } - - $this->db->sql_multi_insert(ACL_ROLES_DATA_TABLE, $sql_ary); - break; - - case 'group': - foreach ($new_auth as $auth_option_id) - { - if (!isset($current_auth[$auth_option_id])) - { - $sql_ary[] = array( - 'group_id' => $group_id, - 'auth_option_id' => $auth_option_id, - 'auth_setting' => $has_permission, - ); - } - } + if (!isset($current_auth[$auth_option_id])) + { + $sql_ary[] = [ + $type . '_id' => ${$type . '_id'}, + 'auth_option_id' => $auth_option_id, + 'auth_setting' => (int) $has_permission, + ]; + } + else + { + $auth_update_list[] = $auth_option_id; + } + } + $this->db->sql_multi_insert($table, $sql_ary); - $this->db->sql_multi_insert(ACL_GROUPS_TABLE, $sql_ary); - break; + if (count($auth_update_list)) + { + $sql = 'UPDATE ' . $table . ' + SET auth_setting = ' . (int) $has_permission . ' + WHERE ' . $this->db->sql_in_set('auth_option_id', $auth_update_list) . ' + AND ' . $type . '_id = ' . (int) ${$type . '_id'}; + $this->db->sql_query($sql); } $this->auth->acl_clear_prefetch(); From e162b67c48b0a84d8f388f5e705ffb95191554f3 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 10:25:35 -0700 Subject: [PATCH 0183/1214] [ticket/17333] Fix toggle icon colors PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/styles/prosilver/template/notification_dropdown.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index 841f5417444..ff52543d0a7 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -47,8 +47,8 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
          {{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} - - + +
          {% endif %} {% EVENT notification_dropdown_footer_after %} From 5c58fd2055c2cb137af9f1759712fbff2eff81e9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 11:10:44 -0700 Subject: [PATCH 0184/1214] [ticket/17333] Add tests and fixes PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/phpbb/notification/method/webpush.php | 2 +- .../functional/notification_webpush_test.php | 127 ++++++++++++++++++ 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 tests/functional/notification_webpush_test.php diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index dcf1d1ebbf8..a823aed6a07 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -96,7 +96,7 @@ public function is_available(type_interface $notification_type = null): bool */ public function is_enabled_by_default() { - return $this->config['webpush_method_enables']; + return (bool) $this->config['webpush_method_enables']; } /** diff --git a/tests/functional/notification_webpush_test.php b/tests/functional/notification_webpush_test.php new file mode 100644 index 00000000000..a07e0a89486 --- /dev/null +++ b/tests/functional/notification_webpush_test.php @@ -0,0 +1,127 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_notification_webpush_test extends phpbb_functional_test_case +{ + public function test_acp_module() + { + $this->login(); + $this->admin_login(); + + $this->add_lang(['acp/board', 'acp/common']); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid); + + $this->assertContainsLang('ACP_WEBPUSH_SETTINGS', $crawler->filter('div.main > h1')->text()); + $this->assertContainsLang('ACP_WEBPUSH_SETTINGS_EXPLAIN', $crawler->filter('div.main > p')->text()); + $this->assertContainsLang('WEBPUSH_GENERATE_VAPID_KEYS', $crawler->filter('input[type="button"]')->attr('value')); + + $form_data = [ + 'config[webpush_enable]' => 1, + 'config[webpush_vapid_public]' => 'BDnYSJHVZBxq834LqDGr893IfazEez7q-jYH2QBNlT0ji2C9UwGosiqz8Dp_ZN23lqAngBZyRjXVWF4ZLA8X2zI', + 'config[webpush_vapid_private]' => 'IE5OYlmfWsMbBU1lzvr0bxrxVAXIteSkAnwGlZIhmRk', + 'config[webpush_method_enables]' => 1, + 'config[webpush_dropdown_subscribe]' => 1, + ]; + $form = $crawler->selectButton('submit')->form($form_data); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid); + + foreach ($form_data as $config_name => $config_value) + { + $config_value = ($config_name === 'config[webpush_vapid_private]') ? '********' : $config_value; + $this->assertEquals($config_value, $crawler->filter('input[name="' . $config_name . '"]')->attr('value')); + } + } + + public function test_ucp_module() + { + $this->login(); + $this->admin_login(); + + $this->add_lang('ucp'); + + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + + $this->assertContainsLang('NOTIFY_WEBPUSH_ENABLE', $crawler->filter('label[for="subscribe_webpush"]')->text()); + $this->assertContainsLang('NOTIFICATION_METHOD_WEBPUSH', $crawler->filter('th.mark')->eq(2)->text()); + + // Assert checkbox is checked + $wp_list = $crawler->filter('.table1'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.bookmark_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.mention_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.post_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.quote_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.topic_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.forum_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.group_request_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.pm_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush'); + $this->assert_checkbox_is_checked($wp_list, 'notification.type.report_post_closed_notification.method.webpush'); + + $this->set_acp_option('webpush_method_enables', 0); + + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + + // Assert checkbox is unchecked + $wp_list = $crawler->filter('.table1'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.bookmark_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.mention_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.post_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.quote_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.topic_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.forum_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.group_request_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.pm_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush'); + $this->assert_checkbox_is_unchecked($wp_list, 'notification.type.report_post_closed_notification.method.webpush'); + } + + public function test_dropdown_subscribe_button() + { + $this->login(); + $this->admin_login(); + + // Assert subscribe dropdown is present + $crawler = self::request('GET', 'index.php'); + $this->assertCount(1, $crawler->filter('.notification-dropdown-footer')); + $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBE', $crawler->filter('.notification-dropdown-footer #subscribe_webpush')->text()); + $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBED', $crawler->filter('.notification-dropdown-footer #unsubscribe_webpush')->text()); + + // Assert subscribe button is not displayed in UCP when dropdown subscribe is present + $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); + $this->assertCount(0, $crawler->filter('.notification-dropdown-footer')); + + $this->set_acp_option('webpush_dropdown_subscribe', 0); + + // Assert subscribe dropdown is not present by default + $crawler = self::request('GET', 'index.php'); + $this->assertCount(0, $crawler->filter('.notification-dropdown-footer')); + } + + protected function set_acp_option($option, $value) + { + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=webpush&sid=' . $this->sid); + $form = $crawler->selectButton('Submit')->form(); + $values = $form->getValues(); + $values["config[{$option}]"] = $value; + $form->setValues($values); + $crawler = self::submit($form); + $this->assertEquals(1, $crawler->filter('.successbox')->count()); + } +} From 0ca85246331043bdf031ec7d8b9340b19c91abbb Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 12:29:42 -0700 Subject: [PATCH 0185/1214] [ticket/17333] Fix Subscribe text button color PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/styles/prosilver/theme/colours.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 7bdd5f4b87f..e803a3f6cf3 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1179,3 +1179,7 @@ input.disabled { background-color: #d41142; color: #ffffff; } + +.notification-subscribe_toggle { + color: #47536b; +} From 73e0412c88b38cd4a47b30202d93f3de41db9059 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 4 Jun 2024 14:19:37 -0700 Subject: [PATCH 0186/1214] [ticket/17333] Prevent double loading web push template data PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/includes/functions.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index fdc2d42ab9a..8228b29e374 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3873,15 +3873,17 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $template->assign_block_vars('notifications', $notification->prepare_for_display()); } - // Get web push notification data - $methods = $phpbb_notifications->get_subscription_methods(); - if ($config['webpush_dropdown_subscribe'] && array_key_exists('notification.method.webpush', $methods)) + // Assign notification web push template data (if not done already by ucp_notifications) + if ($config['webpush_dropdown_subscribe'] && $template->retrieve_var('NOTIFICATIONS_WEBPUSH_ENABLE') === null) { - /** @var \phpbb\form\form_helper $form_helper */ - $form_helper = $phpbb_container->get('form_helper'); + $methods = $phpbb_notifications->get_subscription_methods(); + if (isset($methods['notification.method.webpush'])) + { + $form_helper = $phpbb_container->get('form_helper'); - $template_ary = $methods['notification.method.webpush']['method']->get_ucp_template_data($controller_helper, $form_helper); - $template->assign_vars($template_ary); + $template_ary = $methods['notification.method.webpush']['method']->get_ucp_template_data($controller_helper, $form_helper); + $template->assign_vars($template_ary); + } } } From 51b773e588da76dc1070cdb9c34f3825dbc49a75 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 5 Jun 2024 12:38:58 +0700 Subject: [PATCH 0187/1214] [ticket/17332] Add test PHPBB-17332 --- .../migrator_tool_permission_role_test.php | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/dbal/migrator_tool_permission_role_test.php b/tests/dbal/migrator_tool_permission_role_test.php index 55bda8c0ce0..dc180dc1542 100644 --- a/tests/dbal/migrator_tool_permission_role_test.php +++ b/tests/dbal/migrator_tool_permission_role_test.php @@ -28,6 +28,12 @@ class phpbb_dbal_migrator_tool_permission_role_test extends phpbb_database_test_ 'ADMINISTRATORS' => 5, ]; + public $role_ids = [ + 'ROLE_ADMIN_STANDARD' => 1, + 'ROLE_USER_FULL' => 5, + 'ROLE_MOD_FULL' => 10, + ]; + public $new_roles = [ [ 'ROLE_ADMIN_NEW', @@ -196,4 +202,32 @@ public function test_permission_new_role_remove($ug_type, $forum_id, $group_name $this->assertFalse($this->db->sql_fetchfield('auth_role_id')); $this->db->sql_freeresult($result); } + + public function test_copied_permission_set() + { + $sql = 'SELECT rdt.auth_setting + FROM ' . ACL_OPTIONS_TABLE. ' ot, ' . ACL_ROLES_DATA_TABLE . ' rdt + WHERE rdt.role_id = ' . $this->role_ids['ROLE_ADMIN_STANDARD'] . " + AND auth_option = 'u_copied_permission' + AND ot.auth_option_id = rdt.auth_option_id"; + + // Add new local 'u_copied_permission' copied from 'u_test' + // It should be added to the ROLE_ADMIN_STANDARD role automatically similar to 'u_test' permission + $this->tool->add('u_copied_permission', false, 'u_test'); + $this->assertEquals(true, $this->tool->exists('u_copied_permission', false)); + + // Copied permission setting should be equal to what it was copied from + $result = $this->db->sql_query($sql); + $this->assertEquals(0, $this->db->sql_fetchfield('auth_setting')); + $this->db->sql_freeresult($result); + + // Set new permission for copied auth option for the role + $this->tool->permission_set('ROLE_ADMIN_STANDARD', 'u_copied_permission', 'role', true); + + // Copied permission setting should be updated + $result = $this->db->sql_query($sql); + $this->assertEquals(1, $this->db->sql_fetchfield('auth_setting')); + $this->db->sql_freeresult($result); + } + } From a90c59a8a17fc545082e0cf1ddba563344c95551 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 5 Jun 2024 22:27:06 +0200 Subject: [PATCH 0188/1214] [ticket/17330] Handle mozilla not properly handling webpush padding PHPBB-17330 --- phpBB/phpbb/notification/method/webpush.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 271e23dffe8..2ef52df5201 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -48,6 +48,9 @@ class webpush extends messenger_base implements extended_method_interface /** @var string Notification push subscriptions table */ protected $push_subscriptions_table; + /** @var int Fallback size for padding if endpoint is mozilla, see https://github.com/web-push-libs/web-push-php/issues/108#issuecomment-2133477054 */ + const MOZILLA_FALLBACK_PADDING = 2820; + /** * Notification Method Web Push constructor * @@ -218,6 +221,7 @@ protected function notify_using_webpush(): void { try { + $this->set_endpoint_padding($web_push, $subscription['endpoint']); $push_subscription = Subscription::create([ 'endpoint' => $subscription['endpoint'], 'keys' => [ @@ -430,4 +434,21 @@ protected function clean_expired_subscriptions(array $user_subscription_map, arr $this->remove_subscriptions($remove_subscriptions); } + + /** + * Set web push padding for endpoint + * + * @param \Minishlink\WebPush\WebPush $web_push + * @param string $endpoint + * + * @return void + * @throws \Exception + */ + protected function set_endpoint_padding(\Minishlink\WebPush\WebPush $web_push, string $endpoint): void + { + if (str_contains($endpoint, 'mozilla.com') || str_contains($endpoint, 'mozaws.net')) + { + $web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING); + } + } } From 36527a97b8ddc60b0dffea4d1ad53bc47a0afb1f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 5 Jun 2024 18:47:57 -0700 Subject: [PATCH 0189/1214] [ticket/17333] Optimize loading web push data only when needed PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/includes/functions.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8228b29e374..da22c4739d7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3873,15 +3873,18 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $template->assign_block_vars('notifications', $notification->prepare_for_display()); } - // Assign notification web push template data (if not done already by ucp_notifications) - if ($config['webpush_dropdown_subscribe'] && $template->retrieve_var('NOTIFICATIONS_WEBPUSH_ENABLE') === null) + // Assign web push template vars globally (if not done already by ucp_notifications) for the dropdown subscribe button + if ($config['webpush_enable'] + && $config['webpush_dropdown_subscribe'] + && $template->retrieve_var('NOTIFICATIONS_WEBPUSH_ENABLE') === null) { $methods = $phpbb_notifications->get_subscription_methods(); - if (isset($methods['notification.method.webpush'])) - { - $form_helper = $phpbb_container->get('form_helper'); + $webpush = $methods['notification.method.webpush'] ?? null; - $template_ary = $methods['notification.method.webpush']['method']->get_ucp_template_data($controller_helper, $form_helper); + if ($webpush) + { + $formHelper = $phpbb_container->get('form_helper'); + $template_ary = $webpush['method']->get_ucp_template_data($controller_helper, $formHelper); $template->assign_vars($template_ary); } } From e813bd02c608e6aacc5a4a0279930129896271d6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 6 Jun 2024 20:07:40 +0200 Subject: [PATCH 0190/1214] [ticket/17330] Add test for set_endpoint_padding PHPBB-17330 --- .../notification_method_webpush_test.php | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index ff95c74b093..1116a62c6f3 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -653,6 +653,47 @@ public function test_prune_notifications($notification_type, $post_data, $expect $this->assertCount(0, $cur_notifications, 'Assert that no notifications have been pruned'); } + public function data_set_endpoint_padding(): array + { + return [ + [ + 'foo.mozilla.com', + webpush::MOZILLA_FALLBACK_PADDING + ], + [ + 'foo.mozaws.net', + webpush::MOZILLA_FALLBACK_PADDING + ], + [ + 'foo.android.googleapis.com', + \Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH, + ], + ]; + } + + /** + * @dataProvider data_set_endpoint_padding + */ + public function test_set_endpoint_padding($endpoint, $expected_padding): void + { + $web_push_reflection = new \ReflectionMethod($this->notification_method_webpush, 'set_endpoint_padding'); + $web_push_reflection->setAccessible(true); + + $auth = [ + 'VAPID' => [ + 'subject' => generate_board_url(), + 'publicKey' => $this->config['webpush_vapid_public'], + 'privateKey' => $this->config['webpush_vapid_private'], + ], + ]; + + $web_push = new \Minishlink\WebPush\WebPush($auth); + + $this->assertEquals(\Minishlink\WebPush\Encryption::MAX_COMPATIBILITY_PAYLOAD_LENGTH, $web_push->getAutomaticPadding()); + $web_push_reflection->invoke($this->notification_method_webpush, $web_push, $endpoint); + $this->assertEquals($expected_padding, $web_push->getAutomaticPadding()); + } + protected function create_subscription_for_user($user_id, bool $invalidate_endpoint = false): array { $client = new \GuzzleHttp\Client(); From 35436f078c05fc6714cdf075172df6b4f1d0eea3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 6 Jun 2024 20:21:39 +0200 Subject: [PATCH 0191/1214] [ticket/17330] Add try/catch block though it's not really needed PHPBB-17330 --- phpBB/phpbb/notification/method/webpush.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 2ef52df5201..a5a3b5e6992 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -442,13 +442,19 @@ protected function clean_expired_subscriptions(array $user_subscription_map, arr * @param string $endpoint * * @return void - * @throws \Exception */ protected function set_endpoint_padding(\Minishlink\WebPush\WebPush $web_push, string $endpoint): void { if (str_contains($endpoint, 'mozilla.com') || str_contains($endpoint, 'mozaws.net')) { - $web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING); + try + { + $web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING); + } + catch (\Exception) + { + // This shouldn't happen since we won't pass padding length outside limits + } } } } From fd2e4592c3fc01c969c752d6da00f4ed7792c03b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 25 Jun 2018 20:04:13 +0200 Subject: [PATCH 0192/1214] [ticket/15699] Move files between filesystems PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 9 ++++ phpBB/includes/acp/acp_storage.php | 72 ++++++++++++++++++++++++++++++ phpBB/language/en/acp/storage.php | 20 +++++---- 3 files changed, 92 insertions(+), 9 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 3886f006d12..49535c1a74a 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -97,6 +97,15 @@

          {{ lang('WARNING') }}

          {% endfor %} {% endfor %} +
          +
          +

          {{ lang('STORAGE_REMOVE_OLD_FILES_EXPLAIN') }}
          +
          + +
          +
          +
          +
          {{ lang('SUBMIT') }}   diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 3ea1036167a..f9e0e75ae06 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -24,6 +24,9 @@ class acp_storage /** @var \phpbb\config\config $config */ protected $config; + /** @var \db\driver\driver_interface $db */ + protected $db; + /** @var \phpbb\language\language $lang */ protected $lang; @@ -33,6 +36,9 @@ class acp_storage /** @var \phpbb\template\template */ protected $template; + /** @var \phpbb\di\service_collection */ + protected $adapter_collection; + /** @var \phpbb\di\service_collection */ protected $provider_collection; @@ -63,10 +69,13 @@ public function main($id, $mode) global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path; $this->config = $phpbb_container->get('config'); + $this->db = $phpbb_container->get('dbal.conn'); $this->filesystem = $phpbb_container->get('filesystem'); $this->lang = $phpbb_container->get('language'); $this->request = $phpbb_container->get('request'); $this->template = $phpbb_container->get('template'); + $this->user = $phpbb_container->get('user'); + $this->adapter_collection = $phpbb_container->get('storage.adapter_collection'); $this->provider_collection = $phpbb_container->get('storage.provider_collection'); $this->storage_collection = $phpbb_container->get('storage.storage_collection'); $this->phpbb_root_path = $phpbb_root_path; @@ -153,6 +162,31 @@ public function overview($id, $mode) { foreach ($modified_storages as $storage_name) { + $current_adapter = $this->get_current_adapter($storage_name); + $new_adapter = $this->get_new_adapter($storage_name); + + $sql = 'SELECT file_path + FROM ' . STORAGE_TABLE . " + WHERE storage = '" . $storage_name . "'"; + $result = $this->db->sql_query($sql); + + while ($row = $this->db->sql_fetchrow($result)) + { + $stream = $current_adapter->read_stream($row['file_path']); + $new_adapter->write_stream($row['file_path'], $stream); + fclose($stream); + } + + $this->db->sql_rowseek(0, $result); + + if ($this->request->variable('remove_old', false)) + { + while ($row = $this->db->sql_fetchrow($result)) + { + $current_adapter->delete($row['file_path']); + } + } + $this->update_storage_config($storage_name); } @@ -375,4 +409,42 @@ protected function validate_path($storage_name, $options, &$messages) } } } + + protected function get_current_adapter($storage_name) + { + $provider = $this->get_current_provider($storage_name); + $provider_class = $this->provider_collection->get_by_class($provider); + + $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); + $definitions = $this->get_provider_options($provider); + + $options = []; + foreach (array_keys($definitions) as $definition) + { + $options[$definition] = $this->get_current_definition($storage_name, $definition); + } + + $adapter->configure($options); + + return $adapter; + } + + protected function get_new_adapter($storage_name) + { + $provider = $this->get_new_provider($storage_name); + $provider_class = $this->provider_collection->get_by_class($provider); + + $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); + $definitions = $this->get_provider_options($provider); + + $options = []; + foreach (array_keys($definitions) as $definition) + { + $options[$definition] = $this->get_new_definition($storage_name, $definition); + } + + $adapter->configure($options); + + return $adapter; + } } diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 98ad84df536..ae3c007c4a2 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -39,15 +39,17 @@ $lang = array_merge($lang, array( // Template - 'STORAGE_TITLE' => 'Storage Settings', - 'STORAGE_TITLE_EXPLAIN' => 'Change storage providers for the file storage types of phpBB. Choose local or remote providers to store files added to or created by phpBB.', - 'STORAGE_SELECT' => 'Select storage', - 'STORAGE_SELECT_DESC' => 'Select a storage from the list.', - 'STORAGE_NAME' => 'Storage name', - 'STORAGE_NUM_FILES' => 'Number of files', - 'STORAGE_SIZE' => 'Size', - 'STORAGE_FREE' => 'Available space', - 'STORAGE_UNKNOWN' => 'Unknown', + 'STORAGE_TITLE' => 'Storage Settings', + 'STORAGE_TITLE_EXPLAIN' => 'Change storage providers for the file storage types of phpBB. Choose local or remote providers to store files added to or created by phpBB.', + 'STORAGE_SELECT' => 'Select storage', + 'STORAGE_SELECT_DESC' => 'Select a storage from the list.', + 'STORAGE_NAME' => 'Storage name', + 'STORAGE_NUM_FILES' => 'Number of files', + 'STORAGE_SIZE' => 'Size', + 'STORAGE_FREE' => 'Available space', + 'STORAGE_UNKNOWN' => 'Unknown', + 'STORAGE_REMOVE_OLD_FILES' => 'Remove old files', + 'STORAGE_REMOVE_OLD_FILES_EXPLAIN' => 'Remove old files after they are copied to the new storage system.', // Storage names 'STORAGE_ATTACHMENT_TITLE' => 'Attachments storage', From 5e8bc99697e430def79d608a8d16b5c4b83c9437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 2 Jul 2018 03:34:14 +0200 Subject: [PATCH 0193/1214] [ticket/15699] Move line PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index f9e0e75ae06..8a027e4b071 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -177,10 +177,10 @@ public function overview($id, $mode) fclose($stream); } - $this->db->sql_rowseek(0, $result); - if ($this->request->variable('remove_old', false)) { + $this->db->sql_rowseek(0, $result); + while ($row = $this->db->sql_fetchrow($result)) { $current_adapter->delete($row['file_path']); From 8f7e5fec0b29428f09a047b98bf8770f5d14fcf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 18 Jul 2018 14:00:52 +0200 Subject: [PATCH 0194/1214] [ticket/15699] Update acp_storage PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 8a027e4b071..50d18c251e6 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -91,14 +91,17 @@ public function main($id, $mode) */ $phpbb_dispatcher->trigger_event('core.acp_storage_load'); - $this->overview($id, $mode); + @ini_set('memory_limit', '128M'); + + switch ($mode) + { + case 'settings': + $this->settings($id, $mode); + break; + } } - /** - * @param string $id - * @param string $mode - */ - public function overview($id, $mode) + public function settings($id, $mode) { $form_key = 'acp_storage'; add_form_key($form_key); From 683c99086cde66c8994803178012f17cee6bd803 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Tue, 24 Jul 2018 11:34:47 +0200 Subject: [PATCH 0195/1214] [ticket/15699] Move file between storages with progress bar PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 140 +++++++----- phpBB/includes/acp/acp_storage.php | 347 ++++++++++++++++++++++------- phpBB/language/en/acp/common.php | 2 + phpBB/language/en/acp/storage.php | 10 + 4 files changed, 365 insertions(+), 134 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 49535c1a74a..999d5622ea2 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -4,59 +4,83 @@

          {{ lang('STORAGE_TITLE') }}

          -

          {{ lang('STORAGE_TITLE_EXPLAIN') }}

          + + - - - - - - - - - - - {% for storage in STORAGE_STATS %} - - - - - - - {% endfor %} - -
          {{ lang('STORAGE_NAME') }}{{ lang('STORAGE_NUM_FILES') }}{{ lang('STORAGE_SIZE') }}{{ lang('STORAGE_FREE') }}
          {{ storage.name }}{{ storage.files }}{{ storage.size }}{{ storage.free_space }}
          +

          {L_CONTINUE_EXPLAIN}

          -{% if S_ERROR %} + +
          + {L_SUBMIT} +   + + {S_FORM_TOKEN} +
          + + + +

          {{ lang('STORAGE_TITLE_EXPLAIN') }}

          + + + + + + + + + + + + {% for storage in STORAGE_STATS %} + + + + + + + {% endfor %} + +
          {{ lang('STORAGE_NAME') }}{{ lang('STORAGE_NUM_FILES') }}{{ lang('STORAGE_SIZE') }}{{ lang('STORAGE_FREE') }}
          {{ storage.name }}{{ storage.files }}{{ storage.size }}{{ storage.free_space }}
          + + {% if S_ERROR %}

          {{ lang('WARNING') }}

          {{ ERROR_MSG }}

          -{% endif %} + {% endif %} -
          + - {% for storage in STORAGES %} -
          - {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} -
          -

          {{ lang('STORAGE_SELECT_DESC') }}
          -
          - + {% for provider in PROVIDERS if provider.is_available %} - {% endif %} - {% endfor %} - -
          -
          -
          + {% endfor %} + + + +
          - {% for provider in PROVIDERS %} - {% if provider.is_available %} + {% for provider in PROVIDERS if provider.is_available %}
          {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} {% for name, options in provider.get_options %} @@ -93,25 +117,25 @@

          {{ lang('WARNING') }}

          {% endfor %}
          - {% endif %} + {% endfor %} {% endfor %} - {% endfor %} -
          -
          -

          {{ lang('STORAGE_REMOVE_OLD_FILES_EXPLAIN') }}
          -
          - -
          -
          -
          +
          +
          +

          {{ lang('STORAGE_REMOVE_OLD_FILES_EXPLAIN') }}
          +
          + +
          +
          +
          -
          - {{ lang('SUBMIT') }} -   - - {{ S_FORM_TOKEN }} -
          - +
          + {{ lang('SUBMIT') }} +   + + {{ S_FORM_TOKEN }} +
          + + {% include 'overall_footer.html' %} diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 50d18c251e6..af7141dc927 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -24,11 +24,14 @@ class acp_storage /** @var \phpbb\config\config $config */ protected $config; + /** @var \phpbb\db_text $config_text */ + protected $config_text; + /** @var \db\driver\driver_interface $db */ protected $db; - /** @var \phpbb\language\language $lang */ - protected $lang; + /** @var \phpbb\path_helper $path_helper */ + protected $path_helper; /** @var \phpbb\request\request */ protected $request; @@ -60,6 +63,9 @@ class acp_storage /** @var string */ public $u_action; + /** @var mixed */ + protected $state; + /** * @param string $id * @param string $mode @@ -69,9 +75,10 @@ public function main($id, $mode) global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path; $this->config = $phpbb_container->get('config'); + $this->config_text = $phpbb_container->get('config_text'); $this->db = $phpbb_container->get('dbal.conn'); $this->filesystem = $phpbb_container->get('filesystem'); - $this->lang = $phpbb_container->get('language'); + $this->path_helper = $phpbb_container->get('path_helper'); $this->request = $phpbb_container->get('request'); $this->template = $phpbb_container->get('template'); $this->user = $phpbb_container->get('user'); @@ -81,7 +88,7 @@ public function main($id, $mode) $this->phpbb_root_path = $phpbb_root_path; // Add necesary language files - $this->lang->add_lang(['acp/storage']); + $this->user->add_lang(['acp/storage']); /** * Add language strings @@ -112,14 +119,172 @@ public function settings($id, $mode) // Set page title $this->page_title = 'STORAGE_TITLE'; + $action = $this->request->variable('action', ''); + $this->load_state(); + + // If user cancelled to continue, remove state + if ($this->request->is_set_post('cancel', false)) + { + if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + { + trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + } + + if ($this->request->variable('cancel', false)) + { + $action = ''; + $this->state = false; + $this->save_state(); + } + } + + if ($action) + { + switch ($action) + { + case 'progress_bar': + $this->display_progress_bar(); + break; + case 'update': + // Just continue + break; + default: + trigger_error('NO_ACTION', E_USER_ERROR); + break; + } + + if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + { + trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + } + + // TODO: If both providers are the same, and remove + // old files is checked, the files could be only moved + + // Copy files from the old to the new storage + $i = 0; + foreach ($this->state['storages'] as $storage_name => $storage_options) + { + // Skip storages that have already moved files + if ($this->state['storage_index'] > $i++) + { + continue; + } + + $current_adapter = $this->get_current_adapter($storage_name); + $new_adapter = $this->get_new_adapter($storage_name); + + $sql = 'SELECT file_id, file_path + FROM ' . STORAGE_TABLE . " + WHERE storage = '" . $this->db->sql_escape($storage_name) . "' + AND file_id > " . $this->state['file_index']; + $result = $this->db->sql_query($sql); + + $starttime = microtime(true); + while ($row = $this->db->sql_fetchrow($result)) + { + if (!still_on_time()) + { + $this->save_state(); + meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); + trigger_error($this->user->lang('STORAGE_UPDATE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + } + + $stream = $current_adapter->read_stream($row['file_path']); + $new_adapter->write_stream($row['file_path'], $stream); + fclose($stream); + + $this->state['file_index'] = $row['file_id']; // Set last uploaded file + } + + // Copied all files of a storage, increase storage index and reset file index + $this->state['storage_index']++; + $this->state['file_index'] = 0; + } + + if ($this->state['remove_old']) + { + $i = 0; + foreach ($this->state['storages'] as $storage_name => $storage_options) + { + // Skip storages that have already moved files + if ($this->state['remove_storage_index'] > $i++) + { + continue; + } + + $current_adapter = $this->get_current_adapter($storage_name); + + $sql = 'SELECT file_id, file_path + FROM ' . STORAGE_TABLE . " + WHERE storage = '" . $this->db->sql_escape($storage_name) . "' + AND file_id > " . $this->state['file_index']; + $result = $this->db->sql_query($sql); + + $starttime = microtime(true); + while ($row = $this->db->sql_fetchrow($result)) + { + if (!still_on_time()) + { + $this->save_state(); + meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); + trigger_error($this->user->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + } + + $current_adapter->delete($row['file_path']); + + $this->state['file_index'] = $row['file_id']; // Set last uploaded file + } + + // Remove all files of a storage, increase storage index and reset file index + $this->state['remove_storage_index']++; + $this->state['file_index'] = 0; + } + } + + // Here all files have been copied/moved, so save new configuration + foreach (array_keys($this->state['storages']) as $storage_name) + { + $this->update_storage_config($storage_name); + } + + $this->state = false; + $this->save_state(); + + //$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false); // todo + trigger_error($this->user->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); + } + + // There is an updating in progress, show the form to continue or cancel + if ($this->state != false) + { + $this->template->assign_vars(array( + 'UA_PROGRESS_BAR' => addslashes(append_sid($this->path_helper->get_phpbb_root_path() . $this->path_helper->get_adm_relative_path() . "index." . $this->path_helper->get_php_ext(), "i=$id&mode=$mode&action=progress_bar")), + 'S_CONTINUE_UPDATING' => true, + 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), + 'L_CONTINUE' => $this->user->lang('CONTINUE_UPDATING'), + 'L_CONTINUE_EXPLAIN' => $this->user->lang('CONTINUE_UPDATING_EXPLAIN'), + )); + + return; + } + + // Process form and create a "state" for the update, + // then show a confirm form $messages = []; + if ($this->request->is_set_post('submit')) { + if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + { + trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + } + $modified_storages = []; if (!check_form_key($form_key)) { - $messages[] = $this->lang->lang('FORM_INVALID'); + $messages[] = $this->user->lang('FORM_INVALID'); } foreach ($this->storage_collection as $storage) @@ -133,7 +298,7 @@ public function settings($id, $mode) $modified = false; // Check if provider have been modified - if ($this->get_new_provider($storage_name) != $this->get_current_provider($storage_name)) + if ($this->request->variable([$storage_name, 'provider'], '') != $this->get_current_provider($storage_name)) { $modified = true; } @@ -143,7 +308,7 @@ public function settings($id, $mode) { foreach (array_keys($options) as $definition) { - if ($this->get_new_definition($storage_name, $definition) != $this->get_current_definition($storage_name, $definition)) + if ($this->request->variable([$storage_name, $definition], '') != $this->get_current_definition($storage_name, $definition)) { $modified = true; break; @@ -163,37 +328,41 @@ public function settings($id, $mode) { if (empty($messages)) { + // Create state + $this->state = [ + // Save the value of the checkbox, to remove all files from the + // old storage once they have been successfully moved + 'remove_old' => $this->request->variable('remove_old', false), + 'storage_index' => 0, + 'file_index' => 0, + 'remove_storage_index' => 0, + ]; + + // Save in the state the selected storages and their configuration foreach ($modified_storages as $storage_name) { - $current_adapter = $this->get_current_adapter($storage_name); - $new_adapter = $this->get_new_adapter($storage_name); + $this->state['storages'][$storage_name]['provider'] = $this->request->variable([$storage_name, 'provider'], ''); - $sql = 'SELECT file_path - FROM ' . STORAGE_TABLE . " - WHERE storage = '" . $storage_name . "'"; - $result = $this->db->sql_query($sql); + $options = $this->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); - while ($row = $this->db->sql_fetchrow($result)) + foreach (array_keys($options) as $definition) { - $stream = $current_adapter->read_stream($row['file_path']); - $new_adapter->write_stream($row['file_path'], $stream); - fclose($stream); + $this->state['storages'][$storage_name]['config'][$definition] = $this->request->variable([$storage_name, $definition], ''); } + } - if ($this->request->variable('remove_old', false)) - { - $this->db->sql_rowseek(0, $result); - - while ($row = $this->db->sql_fetchrow($result)) - { - $current_adapter->delete($row['file_path']); - } - } + $this->save_state(); // A storage update is going to be done here - $this->update_storage_config($storage_name); - } + // Show the confirmation form to start the process + $this->template->assign_vars(array( + 'UA_PROGRESS_BAR' => addslashes(append_sid($this->path_helper->get_phpbb_root_path() . $this->path_helper->get_adm_relative_path() . "index." . $this->path_helper->get_php_ext(), "i=$id&mode=$mode&action=progress_bar")), // same + 'S_CONTINUE_UPDATING' => true, + 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), + 'L_CONTINUE' => $this->user->lang('START_UPDATING'), + 'L_CONTINUE_EXPLAIN' => $this->user->lang('START_UPDATING_EXPLAIN'), + )); - trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action), E_USER_NOTICE); + return; } else { @@ -202,9 +371,10 @@ public function settings($id, $mode) } // If there is no changes - trigger_error($this->lang->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($this->user->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING); } + // Top table with stats of each storage $storage_stats = []; foreach ($this->storage_collection as $storage) { @@ -219,11 +389,11 @@ public function settings($id, $mode) } catch (\phpbb\storage\exception\exception $e) { - $free_space = $this->lang->lang('STORAGE_UNKNOWN'); + $free_space = $this->user->lang('STORAGE_UNKNOWN'); } $storage_stats[] = [ - 'name' => $this->lang->lang('STORAGE_' . strtoupper($storage->get_name()) . '_TITLE'), + 'name' => $this->user->lang('STORAGE_' . strtoupper($storage->get_name()) . '_TITLE'), 'files' => $storage->get_num_files(), 'size' => get_formatted_filesize($storage->get_size()), 'free_space' => $free_space, @@ -231,15 +401,63 @@ public function settings($id, $mode) } $this->template->assign_vars([ - 'STORAGES' => $this->storage_collection, - 'STORAGE_STATS' => $storage_stats, - 'PROVIDERS' => $this->provider_collection, + 'STORAGES' => $this->storage_collection, + 'STORAGE_STATS' => $storage_stats, + 'PROVIDERS' => $this->provider_collection, + + 'ERROR_MSG' => implode('
          ', $messages), + 'S_ERROR' => !empty($messages), - 'ERROR_MSG' => implode('
          ', $messages), - 'S_ERROR' => !empty($messages), + 'U_ACTION' => $this->u_action . '&hash=' . generate_link_hash('acp_storage'), ]); } + protected function display_progress_bar() + { + adm_page_header($this->user->lang('STORAGE_UPDATE_IN_PROGRESS')); + $this->template->set_filenames(array( + 'body' => 'progress_bar.html') + ); + $this->template->assign_vars(array( + 'L_PROGRESS' => $this->user->lang('STORAGE_UPDATE_IN_PROGRESS'), + 'L_PROGRESS_EXPLAIN' => $this->user->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN')) + ); + adm_page_footer(); + } + + function close_popup_js() + { + return "\n"; + } + + protected function save_state() + { + $state = $this->state; + + if ($state == false) + { + $state = []; + } + + $this->config_text->set('storage_update_state', json_encode($state)); + } + + protected function load_state() + { + $state = json_decode($this->config_text->get('storage_update_state'), true); + + if ($state == null || empty($state)) + { + $state = false; + } + + $this->state = $state; + } + /** * Get the current provider from config * @@ -251,17 +469,6 @@ protected function get_current_provider($storage_name) return $this->config['storage\\' . $storage_name . '\\provider']; } - /** - * Get the new provider from the request - * - * @param string $storage_name Storage name - * @return string The new provider - */ - protected function get_new_provider($storage_name) - { - return $this->request->variable([$storage_name, 'provider'], ''); - } - /** * Get adapter definitions from a provider * @@ -285,18 +492,6 @@ protected function get_current_definition($storage_name, $definition) return $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; } - /** - * Get the new value of the definition of a storage from the request - * - * @param string $storage_name Storage name - * @param string $definition Definition - * @return string Definition value - */ - protected function get_new_definition($storage_name, $definition) - { - return $this->request->variable([$storage_name, $definition], ''); - } - /** * Validates data * @@ -305,56 +500,56 @@ protected function get_new_definition($storage_name, $definition) */ protected function validate_data($storage_name, &$messages) { - $storage_title = $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'); + $storage_title = $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'); // Check if provider exists try { - $new_provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name)); + $new_provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], '')); } catch (\Exception $e) { - $messages[] = $this->lang->lang('STORAGE_PROVIDER_NOT_EXISTS', $storage_title); + $messages[] = $this->user->lang('STORAGE_PROVIDER_NOT_EXISTS', $storage_title); return; } // Check if provider is available if (!$new_provider->is_available()) { - $messages[] = $this->lang->lang('STORAGE_PROVIDER_NOT_AVAILABLE', $storage_title); + $messages[] = $this->user->lang('STORAGE_PROVIDER_NOT_AVAILABLE', $storage_title); return; } // Check options - $new_options = $this->get_provider_options($this->get_new_provider($storage_name)); + $new_options = $this->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); foreach ($new_options as $definition_key => $definition_value) { - $provider = $this->provider_collection->get_by_class($this->get_new_provider($storage_name)); - $definition_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key)); + $provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], '')); + $definition_title = $this->user->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key)); - $value = $this->get_new_definition($storage_name, $definition_key); + $value = $this->request->variable([$storage_name, $definition_key], ''); switch ($definition_value['type']) { case 'email': if (!filter_var($value, FILTER_VALIDATE_EMAIL)) { - $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); + $messages[] = $this->user->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); } case 'text': case 'password': $maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255; if (strlen($value) > $maxlength) { - $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); + $messages[] = $this->user->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); } break; case 'radio': case 'select': if (!in_array($value, array_values($definition_value['options']))) { - $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); + $messages[] = $this->user->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); } break; } @@ -377,14 +572,14 @@ protected function update_storage_config($storage_name) } // Update provider - $this->config->set('storage\\' . $storage_name . '\\provider', $this->get_new_provider($storage_name)); + $this->config->set('storage\\' . $storage_name . '\\provider', $this->state['storages'][$storage_name]['provider']); // Set new storage config - $new_options = $this->get_provider_options($this->get_new_provider($storage_name)); + $new_options = $this->get_provider_options($this->state['storages'][$storage_name]['provider']); foreach (array_keys($new_options) as $definition) { - $this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $this->get_new_definition($storage_name, $definition)); + $this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $this->state['storages'][$storage_name]['config'][$definition]); } } @@ -434,7 +629,7 @@ protected function get_current_adapter($storage_name) protected function get_new_adapter($storage_name) { - $provider = $this->get_new_provider($storage_name); + $provider = $this->state['storages'][$storage_name]['provider']; $provider_class = $this->provider_collection->get_by_class($provider); $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); @@ -443,7 +638,7 @@ protected function get_new_adapter($storage_name) $options = []; foreach (array_keys($definitions) as $definition) { - $options[$definition] = $this->get_new_definition($storage_name, $definition); + $options[$definition] = $this->state['storages'][$storage_name]['config'][$definition]; } $adapter->configure($options); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index bcbbe5d931a..729888d509b 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -768,6 +768,8 @@ 'LOG_STYLE_EDIT_DETAILS' => 'Edited style
          » %s', 'LOG_STYLE_EXPORT' => 'Exported style
          » %s', + 'LOG_STORAGE_UPDATE' => 'Storage updated', + 'LOG_UPDATE_DATABASE' => 'Updated Database from version %1$s to version %2$s', 'LOG_UPDATE_PHPBB' => 'Updated phpBB from version %1$s to version %2$s', diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index ae3c007c4a2..7c921b46e21 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -50,6 +50,16 @@ 'STORAGE_UNKNOWN' => 'Unknown', 'STORAGE_REMOVE_OLD_FILES' => 'Remove old files', 'STORAGE_REMOVE_OLD_FILES_EXPLAIN' => 'Remove old files after they are copied to the new storage system.', + 'START_UPDATING' => 'Start update process', + 'START_UPDATING_EXPLAIN' => 'Start the storage update process', + 'CONTINUE_UPDATING' => 'Continue previous update process', + 'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.', + 'SORAGE_UPDATE_REDIRECT' => 'Files of %s (%d/%d) are being moved.
          ', + 'SORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.
          ', + + // Template progress bar + 'STORAGE_UPDATE_IN_PROGRESS' => 'Storage update in progress', + 'STORAGE_UPDATE_IN_PROGRESS_EXPLAIN' => 'Files are being moved between storages. This can take some minutes.', // Storage names 'STORAGE_ATTACHMENT_TITLE' => 'Attachments storage', From a2c7255b5b0d37455b4273e8f47330a1dcc78e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sat, 28 Jul 2018 12:25:54 +0200 Subject: [PATCH 0196/1214] [ticket/15699] Use twig syntax PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 999d5622ea2..031f453cddf 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -4,7 +4,7 @@

          {{ lang('STORAGE_TITLE') }}

          - +{% if S_CONTINUE_UPDATING %} -

          {L_CONTINUE_EXPLAIN}

          +

          {{ lang('CONTINUE_EXPLAIN') }}

          -
          +
          - {L_SUBMIT} -   - - {S_FORM_TOKEN} + {{ lang('SUBMIT }} +   + + {{ S_FORM_TOKEN }}
          - - +{% else %}

          {{ lang('STORAGE_TITLE_EXPLAIN') }}

          @@ -136,6 +135,6 @@

          {{ lang('WARNING') }}

          {{ S_FORM_TOKEN }} - +{% endif %} {% include 'overall_footer.html' %} From 6a54b01f6d01686045aaf38ac33ca01ee279552c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 30 Jul 2018 14:42:46 +0200 Subject: [PATCH 0197/1214] [ticket/15699] Remove comment PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index af7141dc927..bddf1cf460a 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -158,9 +158,6 @@ public function settings($id, $mode) trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } - // TODO: If both providers are the same, and remove - // old files is checked, the files could be only moved - // Copy files from the old to the new storage $i = 0; foreach ($this->state['storages'] as $storage_name => $storage_options) From 9dc67e81ff92bb20242ebaaa6b2579c0f76540f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 1 Aug 2018 20:59:23 +0200 Subject: [PATCH 0198/1214] [ticket/15699] Fix twig syntax PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 031f453cddf..97069b0b57b 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -23,7 +23,7 @@

          {{ lang('STORAGE_TITLE') }}

          - {{ lang('SUBMIT }} + {{ lang('SUBMIT') }}   {{ S_FORM_TOKEN }} @@ -91,7 +91,7 @@

          {{ lang('WARNING') }}

          {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %}
          - + {% if lang_defined(description) %}
          {{ lang(description) }} {% endif %} From 8cb5ea8e209e881b71b1eff2379adc703bb441f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 1 Aug 2018 21:04:55 +0200 Subject: [PATCH 0199/1214] [ticket/15699] Check if is resource before close PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index bddf1cf460a..3eb34498549 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -189,7 +189,11 @@ public function settings($id, $mode) $stream = $current_adapter->read_stream($row['file_path']); $new_adapter->write_stream($row['file_path'], $stream); - fclose($stream); + + if (is_resource($stream)) + { + fclose($stream); + } $this->state['file_index'] = $row['file_id']; // Set last uploaded file } From 9c51b3099a429652ae8fbf2ad78d8af01606e6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 1 Aug 2018 21:24:45 +0200 Subject: [PATCH 0200/1214] [ticket/15699] Fix messages PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 8 +++++--- phpBB/language/en/acp/storage.php | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 3eb34498549..967780745ea 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -153,7 +153,7 @@ public function settings($id, $mode) break; } - if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) { trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } @@ -163,8 +163,9 @@ public function settings($id, $mode) foreach ($this->state['storages'] as $storage_name => $storage_options) { // Skip storages that have already moved files - if ($this->state['storage_index'] > $i++) + if ($this->state['storage_index'] > $i) { + $i++; continue; } @@ -209,8 +210,9 @@ public function settings($id, $mode) foreach ($this->state['storages'] as $storage_name => $storage_options) { // Skip storages that have already moved files - if ($this->state['remove_storage_index'] > $i++) + if ($this->state['remove_storage_index'] > $i) { + $i++; continue; } diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 7c921b46e21..892aa42e724 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -54,8 +54,8 @@ 'START_UPDATING_EXPLAIN' => 'Start the storage update process', 'CONTINUE_UPDATING' => 'Continue previous update process', 'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.', - 'SORAGE_UPDATE_REDIRECT' => 'Files of %s (%d/%d) are being moved.
          ', - 'SORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.
          ', + 'STORAGE_UPDATE_REDIRECT' => 'Files of %s (%d/%d) are being moved.
          ', + 'STORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.
          ', // Template progress bar 'STORAGE_UPDATE_IN_PROGRESS' => 'Storage update in progress', From 0c71ff5eab070a67e2037ed712b965e4fd400991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Fri, 3 Aug 2018 12:08:23 +0200 Subject: [PATCH 0201/1214] [ticket/15699] Log update PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 967780745ea..5e2d4a2d4f2 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -30,6 +30,9 @@ class acp_storage /** @var \db\driver\driver_interface $db */ protected $db; + /** @var \log\log_interface $log */ + protected $log; + /** @var \phpbb\path_helper $path_helper */ protected $path_helper; @@ -78,6 +81,7 @@ public function main($id, $mode) $this->config_text = $phpbb_container->get('config_text'); $this->db = $phpbb_container->get('dbal.conn'); $this->filesystem = $phpbb_container->get('filesystem'); + $this->log = $phpbb_container->get('log'); $this->path_helper = $phpbb_container->get('path_helper'); $this->request = $phpbb_container->get('request'); $this->template = $phpbb_container->get('template'); @@ -254,7 +258,7 @@ public function settings($id, $mode) $this->state = false; $this->save_state(); - //$phpbb_log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false); // todo + $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false); // todo trigger_error($this->user->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); } From 9f641963d6cb158c3b3012a5048188eda92a1843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Fri, 3 Aug 2018 12:17:41 +0200 Subject: [PATCH 0202/1214] [ticket/15699] Fix docblocks PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 5e2d4a2d4f2..0941551c3e5 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -27,10 +27,10 @@ class acp_storage /** @var \phpbb\db_text $config_text */ protected $config_text; - /** @var \db\driver\driver_interface $db */ + /** @var \phpbb\db\driver\driver_interface $db */ protected $db; - /** @var \log\log_interface $log */ + /** @var \phpbb\log\log_interface $log */ protected $log; /** @var \phpbb\path_helper $path_helper */ From 6de2d44c8705cf6b741f3447708aa7833dcacb57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 20 Aug 2018 16:49:08 +0200 Subject: [PATCH 0203/1214] [ticket/15699] Make adapter to know the storage name PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 0941551c3e5..78ea0f941d6 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -630,6 +630,7 @@ protected function get_current_adapter($storage_name) } $adapter->configure($options); + $adapter->set_storage($storage_name); return $adapter; } @@ -649,6 +650,7 @@ protected function get_new_adapter($storage_name) } $adapter->configure($options); + $adapter->set_storage($storage_name); return $adapter; } From 3a25c0222b2d5ba097adc8b65b2907c697da8ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sat, 25 Aug 2018 17:54:18 +0200 Subject: [PATCH 0204/1214] [ticket/15699] Add option to udpate configuration only PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 6 +- phpBB/includes/acp/acp_storage.php | 110 +++++++++++++++-------------- phpBB/language/en/acp/storage.php | 6 +- 3 files changed, 65 insertions(+), 57 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 97069b0b57b..43bb855bf3d 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -121,9 +121,11 @@

          {{ lang('WARNING') }}

          -

          {{ lang('STORAGE_REMOVE_OLD_FILES_EXPLAIN') }}
          +
          - + + +
          diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 78ea0f941d6..dfa35bb35e4 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -162,65 +162,21 @@ public function settings($id, $mode) trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } - // Copy files from the old to the new storage - $i = 0; - foreach ($this->state['storages'] as $storage_name => $storage_options) - { - // Skip storages that have already moved files - if ($this->state['storage_index'] > $i) - { - $i++; - continue; - } - - $current_adapter = $this->get_current_adapter($storage_name); - $new_adapter = $this->get_new_adapter($storage_name); - - $sql = 'SELECT file_id, file_path - FROM ' . STORAGE_TABLE . " - WHERE storage = '" . $this->db->sql_escape($storage_name) . "' - AND file_id > " . $this->state['file_index']; - $result = $this->db->sql_query($sql); - - $starttime = microtime(true); - while ($row = $this->db->sql_fetchrow($result)) - { - if (!still_on_time()) - { - $this->save_state(); - meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->user->lang('STORAGE_UPDATE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); - } - - $stream = $current_adapter->read_stream($row['file_path']); - $new_adapter->write_stream($row['file_path'], $stream); - - if (is_resource($stream)) - { - fclose($stream); - } - - $this->state['file_index'] = $row['file_id']; // Set last uploaded file - } - - // Copied all files of a storage, increase storage index and reset file index - $this->state['storage_index']++; - $this->state['file_index'] = 0; - } - - if ($this->state['remove_old']) + // If update_type is copy or move, copy files from the old to the new storage + if ($this->state['update_type'] >= 1) { $i = 0; foreach ($this->state['storages'] as $storage_name => $storage_options) { // Skip storages that have already moved files - if ($this->state['remove_storage_index'] > $i) + if ($this->state['storage_index'] > $i) { $i++; continue; } $current_adapter = $this->get_current_adapter($storage_name); + $new_adapter = $this->get_new_adapter($storage_name); $sql = 'SELECT file_id, file_path FROM ' . STORAGE_TABLE . " @@ -235,18 +191,66 @@ public function settings($id, $mode) { $this->save_state(); meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->user->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + trigger_error($this->user->lang('STORAGE_UPDATE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); } - $current_adapter->delete($row['file_path']); + $stream = $current_adapter->read_stream($row['file_path']); + $new_adapter->write_stream($row['file_path'], $stream); + + if (is_resource($stream)) + { + fclose($stream); + } $this->state['file_index'] = $row['file_id']; // Set last uploaded file } - // Remove all files of a storage, increase storage index and reset file index - $this->state['remove_storage_index']++; + // Copied all files of a storage, increase storage index and reset file index + $this->state['storage_index']++; $this->state['file_index'] = 0; } + + // If update_type is move files, remove the old files + if ($this->state['update_type'] == 2) + { + $i = 0; + foreach ($this->state['storages'] as $storage_name => $storage_options) + { + // Skip storages that have already moved files + if ($this->state['remove_storage_index'] > $i) + { + $i++; + continue; + } + + $current_adapter = $this->get_current_adapter($storage_name); + + $sql = 'SELECT file_id, file_path + FROM ' . STORAGE_TABLE . " + WHERE storage = '" . $this->db->sql_escape($storage_name) . "' + AND file_id > " . $this->state['file_index']; + $result = $this->db->sql_query($sql); + + $starttime = microtime(true); + while ($row = $this->db->sql_fetchrow($result)) + { + if (!still_on_time()) + { + $this->save_state(); + meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); + trigger_error($this->user->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + } + + $current_adapter->delete($row['file_path']); + + $this->state['file_index'] = $row['file_id']; // Set last uploaded file + } + + // Remove all files of a storage, increase storage index and reset file index + $this->state['remove_storage_index']++; + $this->state['file_index'] = 0; + } + } } // Here all files have been copied/moved, so save new configuration @@ -339,7 +343,7 @@ public function settings($id, $mode) $this->state = [ // Save the value of the checkbox, to remove all files from the // old storage once they have been successfully moved - 'remove_old' => $this->request->variable('remove_old', false), + 'update_type' => $this->request->variable('update_type', 0), 'storage_index' => 0, 'file_index' => 0, 'remove_storage_index' => 0, diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 892aa42e724..1530af05229 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -48,8 +48,10 @@ 'STORAGE_SIZE' => 'Size', 'STORAGE_FREE' => 'Available space', 'STORAGE_UNKNOWN' => 'Unknown', - 'STORAGE_REMOVE_OLD_FILES' => 'Remove old files', - 'STORAGE_REMOVE_OLD_FILES_EXPLAIN' => 'Remove old files after they are copied to the new storage system.', + 'STORAGE_UPDATE_TYPE' => 'Update type', + 'STORAGE_UPDATE_TYPE_CONFIG' => 'Update configuration only', + 'STORAGE_UPDATE_TYPE_COPY' => 'Update configuration and copy files', + 'STORAGE_UPDATE_TYPE_MOVE' => 'Update configuration and move files', 'START_UPDATING' => 'Start update process', 'START_UPDATING_EXPLAIN' => 'Start the storage update process', 'CONTINUE_UPDATING' => 'Continue previous update process', From 2c9f9fa75efd3807d54245601a556806e2cce290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sat, 25 Aug 2018 18:01:58 +0200 Subject: [PATCH 0205/1214] [ticket/15699] Add information to logs PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 3 ++- phpBB/language/en/acp/common.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index dfa35bb35e4..160d49c1868 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -259,10 +259,11 @@ public function settings($id, $mode) $this->update_storage_config($storage_name); } + $storages = array_keys($this->state['storages']); $this->state = false; $this->save_state(); - $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false); // todo + $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false, $storages); trigger_error($this->user->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 729888d509b..62c08f02262 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -768,7 +768,7 @@ 'LOG_STYLE_EDIT_DETAILS' => 'Edited style
          » %s', 'LOG_STYLE_EXPORT' => 'Exported style
          » %s', - 'LOG_STORAGE_UPDATE' => 'Storage updated', + 'LOG_STORAGE_UPDATE' => 'Storage updated
          » %s', 'LOG_UPDATE_DATABASE' => 'Updated Database from version %1$s to version %2$s', 'LOG_UPDATE_PHPBB' => 'Updated phpBB from version %1$s to version %2$s', From 64e8bea62a5edef284534660bdd201dbf9fbb938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Sat, 25 Aug 2018 18:12:57 +0200 Subject: [PATCH 0206/1214] [ticket/15699] Lazy-load adapters PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 62 ++++++++++++++++++------------ 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 160d49c1868..23af6131b9b 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -622,41 +622,55 @@ protected function validate_path($storage_name, $options, &$messages) protected function get_current_adapter($storage_name) { - $provider = $this->get_current_provider($storage_name); - $provider_class = $this->provider_collection->get_by_class($provider); + static $adapters = []; - $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); - $definitions = $this->get_provider_options($provider); - - $options = []; - foreach (array_keys($definitions) as $definition) + if(!isset($adapters[$storage_name])) { - $options[$definition] = $this->get_current_definition($storage_name, $definition); - } + $provider = $this->get_current_provider($storage_name); + $provider_class = $this->provider_collection->get_by_class($provider); + + $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); + $definitions = $this->get_provider_options($provider); + + $options = []; + foreach (array_keys($definitions) as $definition) + { + $options[$definition] = $this->get_current_definition($storage_name, $definition); + } - $adapter->configure($options); - $adapter->set_storage($storage_name); + $adapter->configure($options); + //$adapter->set_storage($storage_name); + + $adapters[$storage_name] = $adapter; + } - return $adapter; + return $adapters[$storage_name]; } protected function get_new_adapter($storage_name) { - $provider = $this->state['storages'][$storage_name]['provider']; - $provider_class = $this->provider_collection->get_by_class($provider); + static $adapters = []; - $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); - $definitions = $this->get_provider_options($provider); - - $options = []; - foreach (array_keys($definitions) as $definition) + if(!isset($adapters[$storage_name])) { - $options[$definition] = $this->state['storages'][$storage_name]['config'][$definition]; - } + $provider = $this->state['storages'][$storage_name]['provider']; + $provider_class = $this->provider_collection->get_by_class($provider); + + $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); + $definitions = $this->get_provider_options($provider); + + $options = []; + foreach (array_keys($definitions) as $definition) + { + $options[$definition] = $this->state['storages'][$storage_name]['config'][$definition]; + } - $adapter->configure($options); - $adapter->set_storage($storage_name); + $adapter->configure($options); + //$adapter->set_storage($storage_name); + + $adapters[$storage_name] = $adapter; + } - return $adapter; + return $adapters[$storage_name]; } } From d426f9e3204d2bccb95e724d68c26d68d47d160a Mon Sep 17 00:00:00 2001 From: rubencm Date: Fri, 14 Sep 2018 09:58:16 +0000 Subject: [PATCH 0207/1214] [ticket/15699] Use language PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 54 ++++++++++++++++-------------- 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 23af6131b9b..b25ada9ce03 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -30,6 +30,9 @@ class acp_storage /** @var \phpbb\db\driver\driver_interface $db */ protected $db; + /** @var \phpbb\language\language $log */ + protected $lang; + /** @var \phpbb\log\log_interface $log */ protected $log; @@ -81,6 +84,7 @@ public function main($id, $mode) $this->config_text = $phpbb_container->get('config_text'); $this->db = $phpbb_container->get('dbal.conn'); $this->filesystem = $phpbb_container->get('filesystem'); + $this->lang = $phpbb_container->get('language'); $this->log = $phpbb_container->get('log'); $this->path_helper = $phpbb_container->get('path_helper'); $this->request = $phpbb_container->get('request'); @@ -92,7 +96,7 @@ public function main($id, $mode) $this->phpbb_root_path = $phpbb_root_path; // Add necesary language files - $this->user->add_lang(['acp/storage']); + $this->lang->add_lang(['acp/storage']); /** * Add language strings @@ -131,7 +135,7 @@ public function settings($id, $mode) { if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) { - trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } if ($this->request->variable('cancel', false)) @@ -159,7 +163,7 @@ public function settings($id, $mode) if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) { - trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } // If update_type is copy or move, copy files from the old to the new storage @@ -191,7 +195,7 @@ public function settings($id, $mode) { $this->save_state(); meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->user->lang('STORAGE_UPDATE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + trigger_error($this->lang->lang('STORAGE_UPDATE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); } $stream = $current_adapter->read_stream($row['file_path']); @@ -238,7 +242,7 @@ public function settings($id, $mode) { $this->save_state(); meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->user->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + trigger_error($this->lang->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); } $current_adapter->delete($row['file_path']); @@ -264,7 +268,7 @@ public function settings($id, $mode) $this->save_state(); $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false, $storages); - trigger_error($this->user->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); + trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); } // There is an updating in progress, show the form to continue or cancel @@ -274,8 +278,8 @@ public function settings($id, $mode) 'UA_PROGRESS_BAR' => addslashes(append_sid($this->path_helper->get_phpbb_root_path() . $this->path_helper->get_adm_relative_path() . "index." . $this->path_helper->get_php_ext(), "i=$id&mode=$mode&action=progress_bar")), 'S_CONTINUE_UPDATING' => true, 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), - 'L_CONTINUE' => $this->user->lang('CONTINUE_UPDATING'), - 'L_CONTINUE_EXPLAIN' => $this->user->lang('CONTINUE_UPDATING_EXPLAIN'), + 'L_CONTINUE' => $this->lang->lang('CONTINUE_UPDATING'), + 'L_CONTINUE_EXPLAIN' => $this->lang->lang('CONTINUE_UPDATING_EXPLAIN'), )); return; @@ -289,14 +293,14 @@ public function settings($id, $mode) { if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) { - trigger_error($this->user->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } $modified_storages = []; if (!check_form_key($form_key)) { - $messages[] = $this->user->lang('FORM_INVALID'); + $messages[] = $this->lang->lang('FORM_INVALID'); } foreach ($this->storage_collection as $storage) @@ -370,8 +374,8 @@ public function settings($id, $mode) 'UA_PROGRESS_BAR' => addslashes(append_sid($this->path_helper->get_phpbb_root_path() . $this->path_helper->get_adm_relative_path() . "index." . $this->path_helper->get_php_ext(), "i=$id&mode=$mode&action=progress_bar")), // same 'S_CONTINUE_UPDATING' => true, 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), - 'L_CONTINUE' => $this->user->lang('START_UPDATING'), - 'L_CONTINUE_EXPLAIN' => $this->user->lang('START_UPDATING_EXPLAIN'), + 'L_CONTINUE' => $this->lang->lang('START_UPDATING'), + 'L_CONTINUE_EXPLAIN' => $this->lang->lang('START_UPDATING_EXPLAIN'), )); return; @@ -383,7 +387,7 @@ public function settings($id, $mode) } // If there is no changes - trigger_error($this->user->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($this->lang->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING); } // Top table with stats of each storage @@ -401,11 +405,11 @@ public function settings($id, $mode) } catch (\phpbb\storage\exception\exception $e) { - $free_space = $this->user->lang('STORAGE_UNKNOWN'); + $free_space = $this->lang->lang('STORAGE_UNKNOWN'); } $storage_stats[] = [ - 'name' => $this->user->lang('STORAGE_' . strtoupper($storage->get_name()) . '_TITLE'), + 'name' => $this->lang->lang('STORAGE_' . strtoupper($storage->get_name()) . '_TITLE'), 'files' => $storage->get_num_files(), 'size' => get_formatted_filesize($storage->get_size()), 'free_space' => $free_space, @@ -426,13 +430,13 @@ public function settings($id, $mode) protected function display_progress_bar() { - adm_page_header($this->user->lang('STORAGE_UPDATE_IN_PROGRESS')); + adm_page_header($this->lang->lang('STORAGE_UPDATE_IN_PROGRESS')); $this->template->set_filenames(array( 'body' => 'progress_bar.html') ); $this->template->assign_vars(array( - 'L_PROGRESS' => $this->user->lang('STORAGE_UPDATE_IN_PROGRESS'), - 'L_PROGRESS_EXPLAIN' => $this->user->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN')) + 'L_PROGRESS' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'), + 'L_PROGRESS_EXPLAIN' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN')) ); adm_page_footer(); } @@ -512,7 +516,7 @@ protected function get_current_definition($storage_name, $definition) */ protected function validate_data($storage_name, &$messages) { - $storage_title = $this->user->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'); + $storage_title = $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'); // Check if provider exists try @@ -521,14 +525,14 @@ protected function validate_data($storage_name, &$messages) } catch (\Exception $e) { - $messages[] = $this->user->lang('STORAGE_PROVIDER_NOT_EXISTS', $storage_title); + $messages[] = $this->lang->lang('STORAGE_PROVIDER_NOT_EXISTS', $storage_title); return; } // Check if provider is available if (!$new_provider->is_available()) { - $messages[] = $this->user->lang('STORAGE_PROVIDER_NOT_AVAILABLE', $storage_title); + $messages[] = $this->lang->lang('STORAGE_PROVIDER_NOT_AVAILABLE', $storage_title); return; } @@ -538,7 +542,7 @@ protected function validate_data($storage_name, &$messages) foreach ($new_options as $definition_key => $definition_value) { $provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], '')); - $definition_title = $this->user->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key)); + $definition_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key)); $value = $this->request->variable([$storage_name, $definition_key], ''); @@ -547,21 +551,21 @@ protected function validate_data($storage_name, &$messages) case 'email': if (!filter_var($value, FILTER_VALIDATE_EMAIL)) { - $messages[] = $this->user->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); + $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); } case 'text': case 'password': $maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255; if (strlen($value) > $maxlength) { - $messages[] = $this->user->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); + $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); } break; case 'radio': case 'select': if (!in_array($value, array_values($definition_value['options']))) { - $messages[] = $this->user->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); + $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); } break; } From b260e9a6f200336ada12d940e614fee0b4abc9a9 Mon Sep 17 00:00:00 2001 From: rubencm Date: Fri, 14 Sep 2018 12:19:35 +0000 Subject: [PATCH 0208/1214] [ticket/15699] Fix code style PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index b25ada9ce03..c38dac57739 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -628,7 +628,7 @@ protected function get_current_adapter($storage_name) { static $adapters = []; - if(!isset($adapters[$storage_name])) + if (!isset($adapters[$storage_name])) { $provider = $this->get_current_provider($storage_name); $provider_class = $this->provider_collection->get_by_class($provider); @@ -655,7 +655,7 @@ protected function get_new_adapter($storage_name) { static $adapters = []; - if(!isset($adapters[$storage_name])) + if (!isset($adapters[$storage_name])) { $provider = $this->state['storages'][$storage_name]['provider']; $provider_class = $this->provider_collection->get_by_class($provider); From b10409cb8a6379d14f1efae227b5856040b4b540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 1 Oct 2018 21:52:26 +0200 Subject: [PATCH 0209/1214] [ticket/15699] Update comments PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index c38dac57739..a2350b59163 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -24,7 +24,7 @@ class acp_storage /** @var \phpbb\config\config $config */ protected $config; - /** @var \phpbb\db_text $config_text */ + /** @var \phpbb\config\db_text $config_text */ protected $config_text; /** @var \phpbb\db\driver\driver_interface $db */ From 958a43cb872f7c80c55af7a0a1b8b0998c2db517 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Tue, 9 Oct 2018 20:47:26 +0000 Subject: [PATCH 0210/1214] [ticket/15699] Remove unused variable and switch PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index a2350b59163..e575079ff35 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -148,17 +148,13 @@ public function settings($id, $mode) if ($action) { - switch ($action) + if ($action == 'progress_bar') { - case 'progress_bar': - $this->display_progress_bar(); - break; - case 'update': - // Just continue - break; - default: - trigger_error('NO_ACTION', E_USER_ERROR); - break; + $this->display_progress_bar(); + } + else if ($action != 'update') + { + trigger_error('NO_ACTION', E_USER_ERROR); } if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) @@ -188,7 +184,6 @@ public function settings($id, $mode) AND file_id > " . $this->state['file_index']; $result = $this->db->sql_query($sql); - $starttime = microtime(true); while ($row = $this->db->sql_fetchrow($result)) { if (!still_on_time()) @@ -235,7 +230,6 @@ public function settings($id, $mode) AND file_id > " . $this->state['file_index']; $result = $this->db->sql_query($sql); - $starttime = microtime(true); while ($row = $this->db->sql_fetchrow($result)) { if (!still_on_time()) From 43b402a7dab7b016cac3bfb98a14885e470e2f72 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Mar 2021 10:04:09 +0100 Subject: [PATCH 0211/1214] [ticket/15699] Update acp_storage to be compatible with twig 3 PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 82 +++++++++++++++++--------------- 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 43bb855bf3d..aa25b8feb3e 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -69,53 +69,57 @@

          {{ lang('WARNING') }}


          {{ lang('STORAGE_SELECT_DESC') }}
          - {% for provider in PROVIDERS if provider.is_available %} -
          - {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} - {% for name, options in provider.get_options %} - {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} - {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} - {% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %} - {% set input_type = options['type'] %} - {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} - {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %} -
          -
          - - {% if lang_defined(description) %} -
          {{ lang(description) }} - {% endif %} -
          -
          - {% if input_type in ['text', 'password', 'email'] %} - - {% elseif input_type == 'textarea' %} - - {% elseif input_type == 'radio' %} - {% for option_name, option_value in options['options'] %} - {{ lang(option_name) }} - {% endfor %} - {% elseif input_type == 'select' %} - + {% elseif input_type == 'textarea' %} + + {% elseif input_type == 'radio' %} {% for option_name, option_value in options['options'] %} - + {{ lang(option_name) }} {% endfor %} - - {% endif %} -
          -
          - {% endfor %} -
          + {% elseif input_type == 'select' %} + + {% endif %} + + + {% endfor %} + + {% endif %} {% endfor %} {% endfor %} From a6cf020639949b8ce915a904aa850fd5db7b2fa1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Mar 2021 10:30:04 +0100 Subject: [PATCH 0212/1214] [ticket/15699] Adjust validate path for removed method PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index e575079ff35..2ec086a232d 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -605,7 +605,7 @@ protected function validate_path($storage_name, $options, &$messages) { if ($this->provider_collection->get_by_class($this->get_current_provider($storage_name))->get_name() == 'local' && isset($options['path'])) { - $path = $this->request->is_set_post('submit') ? $this->get_new_definition($storage_name, 'path') : $this->get_current_definition($storage_name, 'path'); + $path = $this->request->is_set_post('submit') ? $this->request->variable([$storage_name, 'path'], '') : $this->get_current_definition($storage_name, 'path'); if (empty($path)) { From fba8990fa08f153158ee895e54dd033671f8e211 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Mar 2021 10:39:12 +0100 Subject: [PATCH 0213/1214] [ticket/15699] Add type hints, add use statements, improve code readability PHPBB3-15699 --- phpBB/includes/acp/acp_storage.php | 97 ++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 26 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 2ec086a232d..72de7997253 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -11,6 +11,17 @@ * */ +use phpbb\config\db as config; +use phpbb\config\db_text as config_text; +use phpbb\db\driver\driver_interface; +use phpbb\di\service_collection; +use phpbb\language\language; +use phpbb\log\log_interface; +use phpbb\path_helper; +use phpbb\request\request; +use phpbb\template\template; +use phpbb\user; + /** * @ignore */ @@ -21,37 +32,40 @@ class acp_storage { - /** @var \phpbb\config\config $config */ + /** @var config $config */ protected $config; - /** @var \phpbb\config\db_text $config_text */ + /** @var config_text $config_text */ protected $config_text; - /** @var \phpbb\db\driver\driver_interface $db */ + /** @var driver_interface $db */ protected $db; - /** @var \phpbb\language\language $log */ + /** @var language $log */ protected $lang; - /** @var \phpbb\log\log_interface $log */ + /** @var log_interface $log */ protected $log; - /** @var \phpbb\path_helper $path_helper */ + /** @var path_helper $path_helper */ protected $path_helper; - /** @var \phpbb\request\request */ + /** @var request */ protected $request; - /** @var \phpbb\template\template */ + /** @var template */ protected $template; - /** @var \phpbb\di\service_collection */ + /** @var user */ + protected $user; + + /** @var service_collection */ protected $adapter_collection; - /** @var \phpbb\di\service_collection */ + /** @var service_collection */ protected $provider_collection; - /** @var \phpbb\di\service_collection */ + /** @var service_collection */ protected $storage_collection; /** @var \phpbb\filesystem\filesystem */ @@ -422,7 +436,10 @@ public function settings($id, $mode) ]); } - protected function display_progress_bar() + /** + * Display progress bar + */ + protected function display_progress_bar() : void { adm_page_header($this->lang->lang('STORAGE_UPDATE_IN_PROGRESS')); $this->template->set_filenames(array( @@ -435,7 +452,12 @@ protected function display_progress_bar() adm_page_footer(); } - function close_popup_js() + /** + * Get JS code for closing popup + * + * @return string Popup JS code + */ + function close_popup_js() : string { return "\n"; } - protected function save_state() + /** + * Save state of storage update + */ + protected function save_state() : void { $state = $this->state; @@ -456,7 +481,10 @@ protected function save_state() $this->config_text->set('storage_update_state', json_encode($state)); } - protected function load_state() + /** + * Load state of storage update + */ + protected function load_state() : void { $state = json_decode($this->config_text->get('storage_update_state'), true); @@ -474,7 +502,7 @@ protected function load_state() * @param string $storage_name Storage name * @return string The current provider */ - protected function get_current_provider($storage_name) + protected function get_current_provider(string $storage_name) : string { return $this->config['storage\\' . $storage_name . '\\provider']; } @@ -485,7 +513,7 @@ protected function get_current_provider($storage_name) * @param string $provider Provider class * @return array Adapter definitions */ - protected function get_provider_options($provider) + protected function get_provider_options(string $provider) : array { return $this->provider_collection->get_by_class($provider)->get_options(); } @@ -497,7 +525,7 @@ protected function get_provider_options($provider) * @param string $definition Definition * @return string Definition value */ - protected function get_current_definition($storage_name, $definition) + protected function get_current_definition(string $storage_name, string $definition) : string { return $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; } @@ -508,7 +536,7 @@ protected function get_current_definition($storage_name, $definition) * @param string $storage_name Storage name * @param array $messages Reference to messages array */ - protected function validate_data($storage_name, &$messages) + protected function validate_data(string $storage_name, array &$messages) { $storage_title = $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'); @@ -547,6 +575,8 @@ protected function validate_data($storage_name, &$messages) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); } + // no break + case 'text': case 'password': $maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255; @@ -554,14 +584,15 @@ protected function validate_data($storage_name, &$messages) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); } - break; + break; + case 'radio': case 'select': if (!in_array($value, array_values($definition_value['options']))) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); } - break; + break; } } } @@ -571,7 +602,7 @@ protected function validate_data($storage_name, &$messages) * * @param string $storage_name Storage name */ - protected function update_storage_config($storage_name) + protected function update_storage_config(string $storage_name) : void { $current_options = $this->get_provider_options($this->get_current_provider($storage_name)); @@ -598,10 +629,10 @@ protected function update_storage_config($storage_name) * * @param string $storage_name Storage name * @param array $options Storage provider configuration keys - * @param array $messages Reference to error messages array + * @param array $messages Error messages array * @return void */ - protected function validate_path($storage_name, $options, &$messages) + protected function validate_path(string $storage_name, array $options, array &$messages) : void { if ($this->provider_collection->get_by_class($this->get_current_provider($storage_name))->get_name() == 'local' && isset($options['path'])) { @@ -618,7 +649,14 @@ protected function validate_path($storage_name, $options, &$messages) } } - protected function get_current_adapter($storage_name) + /** + * Get current storage adapter + * + * @param string $storage_name Storage adapter name + * + * @return object Storage adapter instance + */ + protected function get_current_adapter(string $storage_name): object { static $adapters = []; @@ -645,7 +683,14 @@ protected function get_current_adapter($storage_name) return $adapters[$storage_name]; } - protected function get_new_adapter($storage_name) + /** + * Get new storage adapter + * + * @param string $storage_name + * + * @return object Storage adapter instance + */ + protected function get_new_adapter(string $storage_name) : object { static $adapters = []; From 7b0fc16e640b081229efca45c028a32bd591a5f8 Mon Sep 17 00:00:00 2001 From: rubencm Date: Sun, 7 Mar 2021 21:19:11 +0100 Subject: [PATCH 0214/1214] [ticket/15699] Update language string PHPBB3-15699 --- phpBB/language/en/acp/storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 1530af05229..47ef2acdfc1 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -56,7 +56,7 @@ 'START_UPDATING_EXPLAIN' => 'Start the storage update process', 'CONTINUE_UPDATING' => 'Continue previous update process', 'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.', - 'STORAGE_UPDATE_REDIRECT' => 'Files of %s (%d/%d) are being moved.
          ', + 'STORAGE_UPDATE_REDIRECT' => 'Files of %1$s (%2$d/%3$d) are being moved.
          ', 'STORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.
          ', // Template progress bar From 43fb6ebe7a9539442f41fb2c646e311d3373d2d4 Mon Sep 17 00:00:00 2001 From: rubencm Date: Sun, 7 Mar 2021 21:19:32 +0100 Subject: [PATCH 0215/1214] [ticket/15699] Update language string PHPBB3-15699 --- phpBB/language/en/acp/storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 47ef2acdfc1..2ed3a1b2a51 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -57,7 +57,7 @@ 'CONTINUE_UPDATING' => 'Continue previous update process', 'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.', 'STORAGE_UPDATE_REDIRECT' => 'Files of %1$s (%2$d/%3$d) are being moved.
          ', - 'STORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %s (%d/%d) are being removed.
          ', + 'STORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %1$s (%2$d/%3$d) are being removed.
          ', // Template progress bar 'STORAGE_UPDATE_IN_PROGRESS' => 'Storage update in progress', From 4b46939258a4a474c63609b99984d6a2cb678d88 Mon Sep 17 00:00:00 2001 From: rubencm Date: Sun, 21 Mar 2021 17:59:45 +0100 Subject: [PATCH 0216/1214] [ticket/15699] Apply suggested fixes PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 3 +-- phpBB/includes/acp/acp_storage.php | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index aa25b8feb3e..59389f1e445 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -5,7 +5,7 @@

          {{ lang('STORAGE_TITLE') }}

          {% if S_CONTINUE_UPDATING %} - +

          {{ lang('STORAGE_TITLE_EXPLAIN') }}

          -

          {{ lang('CONTINUE_EXPLAIN') }}

          +
          + + + + + + + + + + {% for storage in STORAGE_STATS %} + + + + + + + {% endfor %} + +
          {{ lang('STORAGE_NAME') }}{{ lang('STORAGE_NUM_FILES') }}{{ lang('STORAGE_SIZE') }}{{ lang('STORAGE_FREE') }}
          {{ storage.name }}{{ storage.files }}{{ storage.size }}{{ storage.free_space }}
          - -
          - {{ lang('SUBMIT') }} -   - - {{ S_FORM_TOKEN }} -
          - -{% else %} -

          {{ lang('STORAGE_TITLE_EXPLAIN') }}

          - - - - - - - - - - - - {% for storage in STORAGE_STATS %} - - - - - - - {% endfor %} - -
          {{ lang('STORAGE_NAME') }}{{ lang('STORAGE_NUM_FILES') }}{{ lang('STORAGE_SIZE') }}{{ lang('STORAGE_FREE') }}
          {{ storage.name }}{{ storage.files }}{{ storage.size }}{{ storage.free_space }}
          - - {% if S_ERROR %} -
          -

          {{ lang('WARNING') }}

          -

          {{ ERROR_MSG }}

          -
          - {% endif %} - -
          - {% for storage in STORAGES %} -
          - {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} -
          -

          {{ lang('STORAGE_SELECT_DESC') }}
          -
          - -
          -
          -
          - - {% for provider in PROVIDERS %} - {% if provider.is_available %} -
          - {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} - {% for name, options in provider.get_options %} - {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} - {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} - {% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %} - {% set input_type = options['type'] %} - {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} - {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %} -
          -
          - - {% if lang_defined(description) %} -
          {{ lang(description) }} - {% endif %} -
          -
          - {% if input_type in ['text', 'password', 'email'] %} - - {% elseif input_type == 'textarea' %} - - {% elseif input_type == 'radio' %} - {% for option_name, option_value in options['options'] %} - {{ lang(option_name) }} - {% endfor %} - {% elseif input_type == 'select' %} - - {% endif %} -
          -
          - {% endfor %} -
          - {% endif %} - {% endfor %} - {% endfor %} +{% if ERROR_MESSAGES is not empty %} +
          +

          {{ lang('WARNING') }}

          + {% for ERROR_MESSAGE in ERROR_MESSAGES %} +

          {{ ERROR_MESSAGE }}

          + {% endfor %} +
          +{% endif %} + + {% for storage in STORAGES %}
          + {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}
          -
          +

          {{ lang('STORAGE_SELECT_DESC') }}
          - - - +
          -
          - {{ lang('SUBMIT') }} -   - - {{ S_FORM_TOKEN }} -
          -
          -{% endif %} + {% for provider in PROVIDERS %} + {% if provider.is_available %} +
          + {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} + {% for name, options in provider.get_options %} + {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} + {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} + {% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %} + {% set input_type = options['type'] %} + {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} + {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %} +
          +
          + + {% if lang_defined(description) %} +
          {{ lang(description) }} + {% endif %} +
          +
          + {% if input_type in ['text', 'password', 'email'] %} + + {% elseif input_type == 'textarea' %} + + {% elseif input_type == 'radio' %} + {% for option_name, option_value in options['options'] %} + {{ lang(option_name) }} + {% endfor %} + {% elseif input_type == 'select' %} + + {% endif %} +
          +
          + {% endfor %} +
          + {% endif %} + {% endfor %} + {% endfor %} + +
          +
          +
          +
          + + + +
          +
          +
          + +
          + {{ lang('SUBMIT') }} +   + + {{ S_FORM_TOKEN }} +
          + {% include 'overall_footer.html' %} diff --git a/phpBB/adm/style/acp_storage_update_inprogress.html b/phpBB/adm/style/acp_storage_update_inprogress.html new file mode 100644 index 00000000000..9c4b9fd8040 --- /dev/null +++ b/phpBB/adm/style/acp_storage_update_inprogress.html @@ -0,0 +1,32 @@ +{% include 'overall_header.html' %} + + + +

          {{ lang('STORAGE_TITLE') }}

          + + + +

          {{ lang('CONTINUE_EXPLAIN') }}

          + +
          +
          + {{ lang('SUBMIT') }} +   + + {{ S_FORM_TOKEN }} +
          +
          + +{% include 'overall_footer.html' %} diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml index 4ef28ccf3b6..401357861d3 100644 --- a/phpBB/config/default/container/services_storage.yml +++ b/phpBB/config/default/container/services_storage.yml @@ -107,3 +107,20 @@ services: - '@storage.attachment' - '@symfony_request' - '@user' + +# Helpers + storage.state_helper: + class: phpbb\storage\state_helper + arguments: + - '@config' + - '@config_text' + - '@storage.provider_collection' + + storage.helper: + class: phpbb\storage\helper + arguments: + - '@config' + - '@storage.provider_collection' + - '@storage.adapter_collection' + - '@storage.adapter.factory' + - '@storage.state_helper' diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 7b8dcc3ee52..85943dc5e49 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -287,7 +287,7 @@ function main($id, $mode) fclose($fp); fclose($stream); } - catch (\phpbb\storage\exception\exception $e) + catch (\phpbb\storage\exception\storage_exception $e) { trigger_error($user->lang['RESTORE_DOWNLOAD_FAIL'] . adm_back_link($this->u_action)); } diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index d268476b463..996a0f641b4 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -11,14 +11,14 @@ * */ -use phpbb\config\db as config; -use phpbb\config\db_text as config_text; use phpbb\db\driver\driver_interface; use phpbb\di\service_collection; use phpbb\language\language; use phpbb\log\log_interface; -use phpbb\path_helper; use phpbb\request\request; +use phpbb\storage\helper; +use phpbb\storage\state_helper; +use phpbb\storage\update_type; use phpbb\template\template; use phpbb\user; @@ -32,12 +32,6 @@ class acp_storage { - /** @var config $config */ - protected $config; - - /** @var config_text $config_text */ - protected $config_text; - /** @var driver_interface $db */ protected $db; @@ -47,9 +41,6 @@ class acp_storage /** @var log_interface $log */ protected $log; - /** @var path_helper $path_helper */ - protected $path_helper; - /** @var request */ protected $request; @@ -59,9 +50,6 @@ class acp_storage /** @var user */ protected $user; - /** @var service_collection */ - protected $adapter_collection; - /** @var service_collection */ protected $provider_collection; @@ -83,52 +71,44 @@ class acp_storage /** @var string */ public $u_action; - /** @var mixed */ - protected $state; + /** @var state_helper */ + private $state_helper; - /** - * Update type constants - */ - public const STORAGE_UPDATE_TYPE_CONFIG = 0; - public const STORAGE_UPDATE_TYPE_COPY = 1; - public const STORAGE_UPDATE_TYPE_MOVE = 2; + /** @var helper */ + private $storage_helper; /** * @param string $id * @param string $mode */ - public function main(string $id, string $mode) + public function main(string $id, string $mode): void { global $phpbb_container, $phpbb_dispatcher, $phpbb_root_path; - $this->config = $phpbb_container->get('config'); - $this->config_text = $phpbb_container->get('config_text'); $this->db = $phpbb_container->get('dbal.conn'); - $this->filesystem = $phpbb_container->get('filesystem'); $this->lang = $phpbb_container->get('language'); $this->log = $phpbb_container->get('log'); - $this->path_helper = $phpbb_container->get('path_helper'); $this->request = $phpbb_container->get('request'); $this->template = $phpbb_container->get('template'); $this->user = $phpbb_container->get('user'); - $this->adapter_collection = $phpbb_container->get('storage.adapter_collection'); $this->provider_collection = $phpbb_container->get('storage.provider_collection'); $this->storage_collection = $phpbb_container->get('storage.storage_collection'); + $this->filesystem = $phpbb_container->get('filesystem'); $this->phpbb_root_path = $phpbb_root_path; + $this->state_helper = $phpbb_container->get('storage.state_helper'); + $this->storage_helper = $phpbb_container->get('storage.helper'); - // Add necesary language files + // Add necessary language files $this->lang->add_lang(['acp/storage']); /** * Add language strings * * @event core.acp_storage_load - * @since 3.3.0-a1 + * @since 4.0.0-a1 */ $phpbb_dispatcher->trigger_event('core.acp_storage_load'); - @ini_set('memory_limit', '128M'); - switch ($mode) { case 'settings': @@ -141,173 +121,173 @@ public function main(string $id, string $mode) * @param string $id * @param string $mode */ - public function settings(string $id, string $mode) + private function settings(string $id, string $mode): void { - $form_key = 'acp_storage'; - add_form_key($form_key); - - // Template from adm/style - $this->tpl_name = 'acp_storage'; - - // Set page title - $this->page_title = 'STORAGE_TITLE'; - $action = $this->request->variable('action', ''); - $this->load_state(); - - // If user cancelled to continue, remove state - if ($this->request->is_set_post('cancel')) + if ($action && !$this->request->is_set_post('cancel')) { - if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + switch ($action) { - trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); - } + case 'progress_bar': + $this->display_progress_bar(); + break; - if ($this->request->variable('cancel', false)) - { - $action = ''; - $this->state = false; - $this->save_state(); + case 'update': + $this->update_action(); + break; + + default: + trigger_error('NO_ACTION', E_USER_ERROR); } } - - if ($action) + else { - if ($action == 'progress_bar') + // If clicked to cancel (acp_storage_update_progress form) + if ($this->request->is_set_post('cancel')) + { + $this->state_helper->clear_state(); + } + + // There is an updating in progress, show the form to continue or cancel + if ($this->state_helper->is_action_in_progress()) { - $this->display_progress_bar(); + $this->update_inprogress($id, $mode); } - else if ($action != 'update') + else { - trigger_error('NO_ACTION', E_USER_ERROR); + $this->settings_form($id, $mode); } + } + } + + private function update_action(): void + { + // Probably it has sense to disable the forum while this is in progress - if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) + { + trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + } + + // If update_type is copy or move, copy files from the old to the new storage + if (in_array($this->state_helper->update_type(), [update_type::COPY, update_type::MOVE], true)) + { + $i = 0; + foreach ($this->state_helper->storages() as $storage_name) { - trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); + // Skip storages that have already copied files + if ($this->state_helper->storage_index() > $i++) + { + continue; + } + + $sql = 'SELECT file_id, file_path + FROM ' . STORAGE_TABLE . " + WHERE storage = '" . $this->db->sql_escape($storage_name) . "' + AND file_id > " . $this->state_helper->file_index(); + $result = $this->db->sql_query($sql); + + while ($row = $this->db->sql_fetchrow($result)) + { + if (!still_on_time()) + { + $this->db->sql_freeresult($result); + meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); + // Here could be included the current file compared with the number of total files too + trigger_error($this->lang->lang('STORAGE_UPDATE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state_helper->storages()))); + } + + // Copy file from old adapter to the new one + $this->storage_helper->copy_file_to_new_adapter($storage_name, $row['file_path']); + + $this->state_helper->set_file_index($row['file_id']); // update last file index copied + } + + $this->db->sql_freeresult($result); + + // Copied all files of a storage, increase storage index and reset file index + $this->state_helper->set_storage_index($this->state_helper->storage_index()+1); + $this->state_helper->set_file_index(0); } - // If update_type is copy or move, copy files from the old to the new storage - if (in_array($this->state['update_type'], [self::STORAGE_UPDATE_TYPE_COPY, self::STORAGE_UPDATE_TYPE_MOVE], true)) + // If update_type is move files, remove the old files + if ($this->state_helper->update_type() === update_type::MOVE) { $i = 0; - foreach ($this->state['storages'] as $storage_name => $storage_options) + foreach ($this->state_helper->storages() as $storage_name) { // Skip storages that have already moved files - if ($this->state['storage_index'] > $i) + if ($this->state_helper->remove_storage_index() > $i++) { - $i++; continue; } - $current_adapter = $this->get_current_adapter($storage_name); - $new_adapter = $this->get_new_adapter($storage_name); - $sql = 'SELECT file_id, file_path - FROM ' . STORAGE_TABLE . " - WHERE storage = '" . $this->db->sql_escape($storage_name) . "' - AND file_id > " . (int) $this->state['file_index']; + FROM ' . STORAGE_TABLE . " + WHERE storage = '" . $this->db->sql_escape($storage_name) . "' + AND file_id > " . $this->state_helper->file_index(); $result = $this->db->sql_query($sql); while ($row = $this->db->sql_fetchrow($result)) { if (!still_on_time()) { - $this->save_state(); + $this->db->sql_freeresult($result); meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->lang->lang('self::STORAGE_UPDATE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); + trigger_error($this->lang->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state_helper->storages()))); } - $stream = $current_adapter->read_stream($row['file_path']); - $new_adapter->write_stream($row['file_path'], $stream); + // remove file from old (current) adapter + $current_adapter = $this->storage_helper->get_current_adapter($storage_name); + $current_adapter->delete($row['file_path']); - if (is_resource($stream)) - { - fclose($stream); - } - - $this->state['file_index'] = $row['file_id']; // Set last uploaded file + $this->state_helper->set_file_index($row['file_id']); } - // Copied all files of a storage, increase storage index and reset file index - $this->state['storage_index']++; - $this->state['file_index'] = 0; - } - - // If update_type is move files, remove the old files - if ($this->state['update_type'] === self::STORAGE_UPDATE_TYPE_MOVE) - { - $i = 0; - foreach ($this->state['storages'] as $storage_name => $storage_options) - { - // Skip storages that have already moved files - if ($this->state['remove_storage_index'] > $i) - { - $i++; - continue; - } + $this->db->sql_freeresult($result); - $current_adapter = $this->get_current_adapter($storage_name); - - $sql = 'SELECT file_id, file_path - FROM ' . STORAGE_TABLE . " - WHERE storage = '" . $this->db->sql_escape($storage_name) . "' - AND file_id > " . (int) $this->state['file_index']; - $result = $this->db->sql_query($sql); - - while ($row = $this->db->sql_fetchrow($result)) - { - if (!still_on_time()) - { - $this->save_state(); - meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->lang->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state['storages']))); - } - - $current_adapter->delete($row['file_path']); - - $this->state['file_index'] = $row['file_id']; // Set last uploaded file - } - - // Remove all files of a storage, increase storage index and reset file index - $this->state['remove_storage_index']++; - $this->state['file_index'] = 0; - } + // Remove all files of a storage, increase storage index and reset file index + $this->state_helper->set_remove_storage_index($this->state_helper->remove_storage_index()+1); + $this->state_helper->set_file_index(0); } } + } - // Here all files have been copied/moved, so save new configuration - foreach (array_keys($this->state['storages']) as $storage_name) - { - $this->update_storage_config($storage_name); - } + // Here all files have been copied/moved, so save new configuration + foreach ($this->state_helper->storages() as $storage_name) + { + $this->storage_helper->update_storage_config($storage_name); + } - $storages = array_keys($this->state['storages']); - $this->state = false; - $this->save_state(); + $storages = $this->state_helper->storages(); + $this->state_helper->clear_state(); + $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false, [implode(', ', $storages)]); + trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); + } - $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false, $storages); - trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); - } + private function update_inprogress(string $id, string $mode): void + { + // Template from adm/style + $this->tpl_name = 'acp_storage_update_inprogress'; - // There is an updating in progress, show the form to continue or cancel - if ($this->state != false) - { - $this->template->assign_vars(array( - 'UA_PROGRESS_BAR' => addslashes(append_sid($this->path_helper->get_phpbb_root_path() . $this->path_helper->get_adm_relative_path() . "index." . $this->path_helper->get_php_ext(), "i=$id&mode=$mode&action=progress_bar")), - 'S_CONTINUE_UPDATING' => true, - 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), - 'L_CONTINUE' => $this->lang->lang('CONTINUE_UPDATING'), - 'L_CONTINUE_EXPLAIN' => $this->lang->lang('CONTINUE_UPDATING_EXPLAIN'), - )); + // Set page title + $this->page_title = 'STORAGE_TITLE'; - return; - } + $this->template->assign_vars(array( + 'UA_PROGRESS_BAR' => addslashes(append_sid($this->u_action, "action=progress_bar")), + 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), + 'L_CONTINUE' => $this->lang->lang('CONTINUE_UPDATING'), + 'L_CONTINUE_EXPLAIN' => $this->lang->lang('CONTINUE_UPDATING_EXPLAIN'), + )); + } + + private function settings_form(string $id, string $mode): void + { + $form_key = 'acp_storage'; + add_form_key($form_key); // Process form and create a "state" for the update, // then show a confirm form - $messages = []; - if ($this->request->is_set_post('submit')) { if (!check_form_key($form_key) || !check_link_hash($this->request->variable('hash', ''), 'acp_storage')) @@ -315,109 +295,125 @@ public function settings(string $id, string $mode) trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); } - $modified_storages = []; + $modified_storages = $this->get_modified_storages(); - foreach ($this->storage_collection as $storage) + // validate submited paths if they are local + $messages = []; + foreach ($modified_storages as $storage_name) { - $storage_name = $storage->get_name(); - - $options = $this->get_provider_options($this->get_current_provider($storage_name)); + $this->validate_data($storage_name, $messages); + } + if (!empty($messages)) + { + trigger_error(implode('
          ', $messages) . adm_back_link($this->u_action), E_USER_WARNING); + } - $this->validate_path($storage_name, $options, $messages); + // Start process and show form + if (!empty($modified_storages)) + { + // Create state + $this->state_helper->init(update_type::from((int) $this->request->variable('update_type', update_type::CONFIG->value)), $modified_storages, $this->request); - $modified = false; + // Show the confirmation form to start the process + $this->template->assign_vars(array( + 'UA_PROGRESS_BAR' => addslashes(append_sid($this->u_action, "action=progress_bar")), + 'S_CONTINUE_UPDATING' => true, + 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), + 'L_CONTINUE' => $this->lang->lang('START_UPDATING'), + 'L_CONTINUE_EXPLAIN' => $this->lang->lang('START_UPDATING_EXPLAIN'), + )); - // Check if provider have been modified - if ($this->request->variable([$storage_name, 'provider'], '') != $this->get_current_provider($storage_name)) - { - $modified = true; - } + // Template from adm/style + $this->tpl_name = 'acp_storage_update_inprogress'; - // Check if options have been modified - if (!$modified) - { - foreach (array_keys($options) as $definition) - { - if ($this->request->variable([$storage_name, $definition], '') != $this->get_current_definition($storage_name, $definition)) - { - $modified = true; - break; - } - } - } + // Set page title + $this->page_title = 'STORAGE_TITLE'; - // If the storage have been modified, validate options - if ($modified) - { - $modified_storages[] = $storage_name; - $this->validate_data($storage_name, $messages); - } + return; } - if (!empty($modified_storages)) - { - if (empty($messages)) - { - // Create state - $this->state = [ - // Save the value of the checkbox, to remove all files from the - // old storage once they have been successfully moved - 'update_type' => (int) $this->request->variable('update_type', self::STORAGE_UPDATE_TYPE_CONFIG), - 'storage_index' => 0, - 'file_index' => 0, - 'remove_storage_index' => 0, - ]; - - // Save in the state the selected storages and their configuration - foreach ($modified_storages as $storage_name) - { - $this->state['storages'][$storage_name]['provider'] = $this->request->variable([$storage_name, 'provider'], ''); + // If there is no changes + trigger_error($this->lang->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING); + } - $options = $this->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); + // Template from adm/style + $this->tpl_name = 'acp_storage'; - foreach (array_keys($options) as $definition) - { - $this->state['storages'][$storage_name]['config'][$definition] = $this->request->variable([$storage_name, $definition], ''); - } - } + // Set page title + $this->page_title = 'STORAGE_TITLE'; - $this->save_state(); // A storage update is going to be done here + $this->storage_stats(); // Show table with storage stats - // Show the confirmation form to start the process - $this->template->assign_vars(array( - 'UA_PROGRESS_BAR' => addslashes(append_sid($this->path_helper->get_phpbb_root_path() . $this->path_helper->get_adm_relative_path() . "index." . $this->path_helper->get_php_ext(), "i=$id&mode=$mode&action=progress_bar")), // same - 'S_CONTINUE_UPDATING' => true, - 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), - 'L_CONTINUE' => $this->lang->lang('START_UPDATING'), - 'L_CONTINUE_EXPLAIN' => $this->lang->lang('START_UPDATING_EXPLAIN'), - )); + // Validate local paths to check if everything is fine + $messages = []; + foreach ($this->storage_collection as $storage) + { + $this->validate_path($storage->get_name(), $messages); + } - return; - } - else + $this->template->assign_vars([ + 'STORAGES' => $this->storage_collection, + 'PROVIDERS' => $this->provider_collection, + + 'ERROR_MESSAGES' => $messages, + + 'U_ACTION' => $this->u_action . '&hash=' . generate_link_hash('acp_storage'), + + 'STORAGE_UPDATE_TYPE_CONFIG' => update_type::CONFIG->value, + 'STORAGE_UPDATE_TYPE_COPY' => update_type::COPY->value, + 'STORAGE_UPDATE_TYPE_MOVE' => update_type::MOVE->value, + ]); + } + + private function get_modified_storages(): array + { + $modified_storages = []; + + foreach ($this->storage_collection as $storage) + { + $storage_name = $storage->get_name(); + $options = $this->storage_helper->get_provider_options($this->storage_helper->get_current_provider($storage_name)); + + $modified = false; + + // Check if provider have been modified + if ($this->request->variable([$storage_name, 'provider'], '') != $this->storage_helper->get_current_provider($storage_name)) + { + $modified = true; + } + else + { + // Check if options have been modified + foreach (array_keys($options) as $definition) { - trigger_error(implode('
          ', $messages) . adm_back_link($this->u_action), E_USER_WARNING); + if ($this->request->variable([$storage_name, $definition], '') != $this->storage_helper->get_current_definition($storage_name, $definition)) + { + $modified = true; + break; + } } } - // If there is no changes - trigger_error($this->lang->lang('STORAGE_NO_CHANGES') . adm_back_link($this->u_action), E_USER_WARNING); + if ($modified) + { + $modified_storages[] = $storage_name; + } } + return $modified_storages; + } + + protected function storage_stats() + { // Top table with stats of each storage $storage_stats = []; foreach ($this->storage_collection as $storage) { - $storage_name = $storage->get_name(); - $options = $this->get_provider_options($this->get_current_provider($storage_name)); - - $this->validate_path($storage_name, $options, $messages); - try { $free_space = get_formatted_filesize($storage->free_space()); } - catch (\phpbb\storage\exception\exception $e) + catch (\phpbb\storage\exception\storage_exception $e) { $free_space = $this->lang->lang('STORAGE_UNKNOWN'); } @@ -431,18 +427,7 @@ public function settings(string $id, string $mode) } $this->template->assign_vars([ - 'STORAGES' => $this->storage_collection, - 'STORAGE_STATS' => $storage_stats, - 'PROVIDERS' => $this->provider_collection, - - 'ERROR_MSG' => implode('
          ', $messages), - 'S_ERROR' => !empty($messages), - - 'U_ACTION' => $this->u_action . '&hash=' . generate_link_hash('acp_storage'), - - 'STORAGE_UPDATE_TYPE_CONFIG' => self::STORAGE_UPDATE_TYPE_CONFIG, - 'STORAGE_UPDATE_TYPE_COPY' => self::STORAGE_UPDATE_TYPE_COPY, - 'STORAGE_UPDATE_TYPE_MOVE' => self::STORAGE_UPDATE_TYPE_MOVE, + 'STORAGE_STATS' => $storage_stats, ]); } @@ -453,11 +438,11 @@ protected function display_progress_bar() : void { adm_page_header($this->lang->lang('STORAGE_UPDATE_IN_PROGRESS')); $this->template->set_filenames(array( - 'body' => 'progress_bar.html') + 'body' => 'progress_bar.html') ); $this->template->assign_vars(array( - 'L_PROGRESS' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'), - 'L_PROGRESS_EXPLAIN' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN')) + 'L_PROGRESS' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'), + 'L_PROGRESS_EXPLAIN' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN')) ); adm_page_footer(); } @@ -476,70 +461,6 @@ function close_popup_js() : string "\n"; } - /** - * Save state of storage update - */ - protected function save_state() : void - { - $state = $this->state; - - if ($state == false) - { - $state = []; - } - - $this->config_text->set('storage_update_state', json_encode($state)); - } - - /** - * Load state of storage update - */ - protected function load_state() : void - { - $state = json_decode($this->config_text->get('storage_update_state'), true); - - if ($state == null || empty($state)) - { - $state = false; - } - - $this->state = $state; - } - - /** - * Get the current provider from config - * - * @param string $storage_name Storage name - * @return string The current provider - */ - protected function get_current_provider(string $storage_name) : string - { - return $this->config['storage\\' . $storage_name . '\\provider']; - } - - /** - * Get adapter definitions from a provider - * - * @param string $provider Provider class - * @return array Adapter definitions - */ - protected function get_provider_options(string $provider) : array - { - return $this->provider_collection->get_by_class($provider)->get_options(); - } - - /** - * Get the current value of the definition of a storage from config - * - * @param string $storage_name Storage name - * @param string $definition Definition - * @return string Definition value - */ - protected function get_current_definition(string $storage_name, string $definition) : string - { - return $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; - } - /** * Validates data * @@ -569,7 +490,7 @@ protected function validate_data(string $storage_name, array &$messages) } // Check options - $new_options = $this->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); + $new_options = $this->storage_helper->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); foreach ($new_options as $definition_key => $definition_value) { @@ -594,6 +515,20 @@ protected function validate_data(string $storage_name, array &$messages) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); } + + if ($provider->get_name() == 'local' && $definition_key == 'path') + { + $path = $value; + + if (empty($path)) + { + $messages[] = $this->lang->lang('STORAGE_PATH_NOT_SET', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE')); + } + else if (!$this->filesystem->exists($this->phpbb_root_path . $path) || !$this->filesystem->is_writable($this->phpbb_root_path . $path)) + { + $messages[] = $this->lang->lang('STORAGE_PATH_NOT_EXISTS', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE')); + } + } break; case 'radio': @@ -608,122 +543,31 @@ protected function validate_data(string $storage_name, array &$messages) } /** - * Updates an storage with the info provided in the form - * - * @param string $storage_name Storage name - */ - protected function update_storage_config(string $storage_name) : void - { - $current_options = $this->get_provider_options($this->get_current_provider($storage_name)); - - // Remove old storage config - foreach (array_keys($current_options) as $definition) - { - $this->config->delete('storage\\' . $storage_name . '\\config\\' . $definition); - } - - // Update provider - $this->config->set('storage\\' . $storage_name . '\\provider', $this->state['storages'][$storage_name]['provider']); - - // Set new storage config - $new_options = $this->get_provider_options($this->state['storages'][$storage_name]['provider']); - - foreach (array_keys($new_options) as $definition) - { - $this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $this->state['storages'][$storage_name]['config'][$definition]); - } - } - - /** - * Validates path + * Validates path when the filesystem is local * * @param string $storage_name Storage name - * @param array $options Storage provider configuration keys * @param array $messages Error messages array * @return void */ - protected function validate_path(string $storage_name, array $options, array &$messages) : void + protected function validate_path(string $storage_name, array &$messages) : void { - if ($this->provider_collection->get_by_class($this->get_current_provider($storage_name))->get_name() == 'local' && isset($options['path'])) + $current_provider = $this->storage_helper->get_current_provider($storage_name); + $options = $this->storage_helper->get_provider_options($current_provider); + + if ($this->provider_collection->get_by_class($current_provider)->get_name() == 'local' && isset($options['path'])) { - $path = $this->request->is_set_post('submit') ? $this->request->variable([$storage_name, 'path'], '') : $this->get_current_definition($storage_name, 'path'); + $path = $this->storage_helper->get_current_definition($storage_name, 'path'); if (empty($path)) { $messages[] = $this->lang->lang('STORAGE_PATH_NOT_SET', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE')); } - else if (!$this->filesystem->is_writable($this->phpbb_root_path . $path) || !$this->filesystem->exists($this->phpbb_root_path . $path)) + else if (!$this->filesystem->exists($this->phpbb_root_path . $path) || !$this->filesystem->is_writable($this->phpbb_root_path . $path)) { $messages[] = $this->lang->lang('STORAGE_PATH_NOT_EXISTS', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE')); } } } - /** - * Get current storage adapter - * - * @param string $storage_name Storage adapter name - * - * @return object Storage adapter instance - */ - protected function get_current_adapter(string $storage_name): object - { - static $adapters = []; - - if (!isset($adapters[$storage_name])) - { - $provider = $this->get_current_provider($storage_name); - $provider_class = $this->provider_collection->get_by_class($provider); - - $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); - $definitions = $this->get_provider_options($provider); - - $options = []; - foreach (array_keys($definitions) as $definition) - { - $options[$definition] = $this->get_current_definition($storage_name, $definition); - } - - $adapter->configure($options); - //$adapter->set_storage($storage_name); - - $adapters[$storage_name] = $adapter; - } - - return $adapters[$storage_name]; - } - /** - * Get new storage adapter - * - * @param string $storage_name - * - * @return object Storage adapter instance - */ - protected function get_new_adapter(string $storage_name) : object - { - static $adapters = []; - - if (!isset($adapters[$storage_name])) - { - $provider = $this->state['storages'][$storage_name]['provider']; - $provider_class = $this->provider_collection->get_by_class($provider); - - $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); - $definitions = $this->get_provider_options($provider); - - $options = []; - foreach (array_keys($definitions) as $definition) - { - $options[$definition] = $this->state['storages'][$storage_name]['config'][$definition]; - } - - $adapter->configure($options); - //$adapter->set_storage($storage_name); - - $adapters[$storage_name] = $adapter; - } - - return $adapters[$storage_name]; - } } diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c41e54098e1..737332f4fac 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1789,7 +1789,7 @@ function avatar_delete($mode, $row, $clean_db = false) return true; } - catch (\phpbb\storage\exception\exception $e) + catch (\phpbb\storage\exception\storage_exception $e) { // Fail is covered by return statement below } @@ -2131,7 +2131,7 @@ function group_correct_avatar($group_id, $old_entry) WHERE group_id = $group_id"; $db->sql_query($sql); } - catch (\phpbb\storage\exception\exception $e) + catch (\phpbb\storage\exception\storage_exception $e) { // If rename fail, dont execute the query } diff --git a/phpBB/phpbb/attachment/delete.php b/phpBB/phpbb/attachment/delete.php index 80fd6b62d4b..2620a7a94f4 100644 --- a/phpBB/phpbb/attachment/delete.php +++ b/phpBB/phpbb/attachment/delete.php @@ -464,7 +464,7 @@ public function unlink_attachment($filename, $mode = 'file', $entry_removed = fa return true; } } - catch (\phpbb\storage\exception\exception $exception) + catch (\phpbb\storage\exception\storage_exception $exception) { // Fail is covered by return statement below } diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php index d5b961de5f6..c0b0c490c44 100644 --- a/phpBB/phpbb/attachment/upload.php +++ b/phpBB/phpbb/attachment/upload.php @@ -351,7 +351,7 @@ protected function check_disk_space() return false; } } - catch (\phpbb\storage\exception\exception $e) + catch (\phpbb\storage\exception\storage_exception $e) { // Do nothing } diff --git a/phpBB/phpbb/avatar/driver/upload.php b/phpBB/phpbb/avatar/driver/upload.php index 14b9e4026cb..51425b506ff 100644 --- a/phpBB/phpbb/avatar/driver/upload.php +++ b/phpBB/phpbb/avatar/driver/upload.php @@ -19,7 +19,7 @@ use phpbb\files\factory; use phpbb\path_helper; use phpbb\routing\helper; -use phpbb\storage\exception\exception as storage_exception; +use phpbb\storage\exception\storage_exception; use phpbb\storage\storage; /** diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php index 767eee5c0d3..7cf05503d65 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_track.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php @@ -14,7 +14,7 @@ namespace phpbb\db\migration\data\v400; use phpbb\db\migration\container_aware_migration; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; use phpbb\storage\storage; class storage_track extends container_aware_migration @@ -97,7 +97,7 @@ public function track_avatars() { $storage->track_file($this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext); } - catch (exception $e) + catch (storage_exception $e) { // If file doesn't exist, don't track it } @@ -121,7 +121,7 @@ public function track_attachments() { $storage->track_file($row['physical_filename']); } - catch (exception $e) + catch (storage_exception $e) { // If file doesn't exist, don't track it } @@ -132,7 +132,7 @@ public function track_attachments() { $storage->track_file('thumb_' . $row['physical_filename']); } - catch (exception $e) + catch (storage_exception $e) { // If file doesn't exist, don't track it } @@ -157,7 +157,7 @@ public function track_backups() { $storage->track_file($row['filename']); } - catch (exception $e) + catch (storage_exception $e) { // If file doesn't exist, don't track it } diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php index e7759357562..83678718b5a 100644 --- a/phpBB/phpbb/files/filespec_storage.php +++ b/phpBB/phpbb/files/filespec_storage.php @@ -453,7 +453,7 @@ public function move_file($storage, $overwrite = false, $skip_image_check = fals fclose($fp); } } - catch (\phpbb\storage\exception\exception $e) + catch (\phpbb\storage\exception\storage_exception $e) { $this->error[] = $this->language->lang($this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR', $this->destination_file); $this->file_moved = false; diff --git a/phpBB/phpbb/storage/adapter/adapter_interface.php b/phpBB/phpbb/storage/adapter/adapter_interface.php index 5bd6525a733..725b954c2d3 100644 --- a/phpBB/phpbb/storage/adapter/adapter_interface.php +++ b/phpBB/phpbb/storage/adapter/adapter_interface.php @@ -13,7 +13,7 @@ namespace phpbb\storage\adapter; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; interface adapter_interface { @@ -29,7 +29,7 @@ public function configure(array $options): void; * * @param string $path * @param string $content - * @throws exception When the file cannot be written + * @throws storage_exception When the file cannot be written */ public function put_contents(string $path, string $content): void; @@ -39,7 +39,7 @@ public function put_contents(string $path, string $content): void; * @param string $path The file to read * * @return string Returns file contents - * @throws exception When cannot read file contents + * @throws storage_exception When cannot read file contents */ public function get_contents(string $path): string; @@ -57,7 +57,7 @@ public function exists(string $path): bool; * * @param string $path file/directory to remove * - * @throws exception When removal fails. + * @throws storage_exception When removal fails. */ public function delete(string $path): void; @@ -67,7 +67,7 @@ public function delete(string $path): void; * @param string $path_orig The original file/direcotry * @param string $path_dest The target file/directory * - * @throws exception When file/directory cannot be renamed + * @throws storage_exception When file/directory cannot be renamed */ public function rename(string $path_orig, string $path_dest): void; @@ -77,7 +77,7 @@ public function rename(string $path_orig, string $path_dest): void; * @param string $path_orig The original filename * @param string $path_dest The target filename * - * @throws exception When the file cannot be copied + * @throws storage_exception When the file cannot be copied */ public function copy(string $path_orig, string $path_dest): void; @@ -94,7 +94,7 @@ public function get_link(string $path): string; * Get space available in bytes * * @return float Returns available space - * @throws exception When unable to retrieve available storage space + * @throws storage_exception When unable to retrieve available storage space */ public function free_space(): float; } diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php index be4b3399d69..9923a4fa441 100644 --- a/phpBB/phpbb/storage/adapter/local.php +++ b/phpBB/phpbb/storage/adapter/local.php @@ -14,7 +14,7 @@ namespace phpbb\storage\adapter; use phpbb\storage\stream_interface; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; use phpbb\filesystem\exception\filesystem_exception; use phpbb\filesystem\filesystem; use phpbb\filesystem\helper as filesystem_helper; @@ -117,7 +117,7 @@ public function put_contents(string $path, string $content): void } catch (filesystem_exception $e) { - throw new exception('STORAGE_CANNOT_WRITE_FILE', $path, array(), $e); + throw new storage_exception('STORAGE_CANNOT_WRITE_FILE', $path, array(), $e); } } @@ -130,7 +130,7 @@ public function get_contents(string $path): string if ($content === false) { - throw new exception('STORAGE_CANNOT_READ_FILE', $path); + throw new storage_exception('STORAGE_CANNOT_READ_FILE', $path); } return $content; @@ -155,7 +155,7 @@ public function delete(string $path): void } catch (filesystem_exception $e) { - throw new exception('STORAGE_CANNOT_DELETE', $path, array(), $e); + throw new storage_exception('STORAGE_CANNOT_DELETE', $path, array(), $e); } } @@ -172,7 +172,7 @@ public function rename(string $path_orig, string $path_dest): void } catch (filesystem_exception $e) { - throw new exception('STORAGE_CANNOT_RENAME', $path_orig, array(), $e); + throw new storage_exception('STORAGE_CANNOT_RENAME', $path_orig, array(), $e); } } @@ -189,7 +189,7 @@ public function copy(string $path_orig, string $path_dest): void } catch (filesystem_exception $e) { - throw new exception('STORAGE_CANNOT_COPY', $path_orig, array(), $e); + throw new storage_exception('STORAGE_CANNOT_COPY', $path_orig, array(), $e); } } @@ -198,7 +198,7 @@ public function copy(string $path_orig, string $path_dest): void * * @param string $path The directory path * - * @throws exception On any directory creation failure + * @throws storage_exception On any directory creation failure */ protected function create_dir(string $path): void { @@ -208,7 +208,7 @@ protected function create_dir(string $path): void } catch (filesystem_exception $e) { - throw new exception('STORAGE_CANNOT_CREATE_DIR', $path, array(), $e); + throw new storage_exception('STORAGE_CANNOT_CREATE_DIR', $path, array(), $e); } } @@ -217,7 +217,7 @@ protected function create_dir(string $path): void * * @param string $path The file path * - * @throws exception On any directory creation failure + * @throws storage_exception On any directory creation failure */ protected function ensure_directory_exists(string $path): void { @@ -264,7 +264,7 @@ public function read_stream(string $path) if (!$stream) { - throw new exception('STORAGE_CANNOT_OPEN_FILE', $path); + throw new storage_exception('STORAGE_CANNOT_OPEN_FILE', $path); } return $stream; @@ -281,13 +281,13 @@ public function write_stream(string $path, $resource): void if (!$stream) { - throw new exception('STORAGE_CANNOT_CREATE_FILE', $path); + throw new storage_exception('STORAGE_CANNOT_CREATE_FILE', $path); } if (stream_copy_to_stream($resource, $stream) === false) { fclose($stream); - throw new exception('STORAGE_CANNOT_COPY_RESOURCE'); + throw new storage_exception('STORAGE_CANNOT_COPY_RESOURCE'); } fclose($stream); @@ -298,10 +298,10 @@ public function write_stream(string $path, $resource): void * * @param string $path The file * - * @throws exception When cannot get size - * * @return array Properties - * @throws exception When cannot get size + * @throws storage_exception When cannot get size + * + * @throws storage_exception When cannot get size * */ public function file_size(string $path): array @@ -310,7 +310,7 @@ public function file_size(string $path): array if ($size === null) { - throw new exception('STORAGE_CANNOT_GET_FILESIZE'); + throw new storage_exception('STORAGE_CANNOT_GET_FILESIZE'); } return ['size' => $size]; @@ -392,12 +392,12 @@ public function free_space(): float if ($free_space === false) { - throw new exception('STORAGE_CANNOT_GET_FREE_SPACE'); + throw new storage_exception('STORAGE_CANNOT_GET_FREE_SPACE'); } } else { - throw new exception('STORAGE_CANNOT_GET_FREE_SPACE'); + throw new storage_exception('STORAGE_CANNOT_GET_FREE_SPACE'); } return $free_space; diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php index 5d08bfa7c20..b358328525f 100644 --- a/phpBB/phpbb/storage/adapter_factory.php +++ b/phpBB/phpbb/storage/adapter_factory.php @@ -15,7 +15,7 @@ use phpbb\config\config; use phpbb\di\service_collection; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; class adapter_factory { @@ -62,7 +62,7 @@ public function get($storage_name) if (!$provider->is_available()) { - throw new exception('STORAGE_ADAPTER_NOT_AVAILABLE'); + throw new storage_exception('STORAGE_ADAPTER_NOT_AVAILABLE'); } $adapter = $this->adapters->get_by_class($provider->get_adapter_class()); diff --git a/phpBB/phpbb/storage/controller/controller.php b/phpBB/phpbb/storage/controller/controller.php index 54f95aa2242..d1ea9f29f77 100644 --- a/phpBB/phpbb/storage/controller/controller.php +++ b/phpBB/phpbb/storage/controller/controller.php @@ -16,7 +16,7 @@ use phpbb\cache\service; use phpbb\db\driver\driver_interface; use phpbb\exception\http_exception; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; use phpbb\storage\storage; use Symfony\Component\HttpFoundation\Request as symfony_request; use Symfony\Component\HttpFoundation\Response; @@ -63,7 +63,7 @@ public function __construct(service $cache, driver_interface $db, storage $stora * @return Response a Symfony response object * * @throws http_exception when can't access $file - * @throws exception when there is an error reading the file + * @throws storage_exception when there is an error reading the file */ public function handle(string $file): Response { @@ -120,7 +120,7 @@ protected function file_exists(string $file): bool * @param string $file File path * * @return void - * @throws exception when there is an error reading the file + * @throws storage_exception when there is an error reading the file */ protected function prepare(StreamedResponse $response, string $file): void { @@ -133,7 +133,7 @@ protected function prepare(StreamedResponse $response, string $file): void { $content_type = $file_info->get('mimetype'); } - catch (exception $e) + catch (storage_exception $e) { $content_type = 'application/octet-stream'; } @@ -148,7 +148,7 @@ protected function prepare(StreamedResponse $response, string $file): void { $response->headers->set('Content-Length', $file_info->get('size')); } - catch (exception $e) + catch (storage_exception $e) { // Just don't send this header } diff --git a/phpBB/phpbb/storage/exception/action_in_progress_exception.php b/phpBB/phpbb/storage/exception/action_in_progress_exception.php new file mode 100644 index 00000000000..1e6f01495e6 --- /dev/null +++ b/phpBB/phpbb/storage/exception/action_in_progress_exception.php @@ -0,0 +1,18 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\storage\exception; + +class action_in_progress_exception extends storage_exception +{ +} diff --git a/phpBB/phpbb/storage/exception/no_action_in_progress_exception.php b/phpBB/phpbb/storage/exception/no_action_in_progress_exception.php new file mode 100644 index 00000000000..5b5e63fc07e --- /dev/null +++ b/phpBB/phpbb/storage/exception/no_action_in_progress_exception.php @@ -0,0 +1,18 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\storage\exception; + +class no_action_in_progress_exception extends storage_exception +{ +} diff --git a/phpBB/phpbb/storage/exception/exception.php b/phpBB/phpbb/storage/exception/storage_exception.php similarity index 96% rename from phpBB/phpbb/storage/exception/exception.php rename to phpBB/phpbb/storage/exception/storage_exception.php index 8268530c160..08c0cfa4ef1 100644 --- a/phpBB/phpbb/storage/exception/exception.php +++ b/phpBB/phpbb/storage/exception/storage_exception.php @@ -15,7 +15,7 @@ use phpbb\exception\runtime_exception; -class exception extends runtime_exception +class storage_exception extends runtime_exception { /** * Constructor diff --git a/phpBB/phpbb/storage/file_info.php b/phpBB/phpbb/storage/file_info.php index 2e938468380..3bb6b281319 100644 --- a/phpBB/phpbb/storage/file_info.php +++ b/phpBB/phpbb/storage/file_info.php @@ -13,7 +13,7 @@ namespace phpbb\storage; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; use phpbb\storage\adapter\adapter_interface; class file_info @@ -66,7 +66,7 @@ public function get($name) { if (!method_exists($this->adapter, 'file_' . $name)) { - throw new exception('STORAGE_METHOD_NOT_IMPLEMENTED'); + throw new storage_exception('STORAGE_METHOD_NOT_IMPLEMENTED'); } $this->properties = array_merge($this->properties, call_user_func([$this->adapter, 'file_' . $name], $this->path)); diff --git a/phpBB/phpbb/storage/helper.php b/phpBB/phpbb/storage/helper.php new file mode 100644 index 00000000000..6a5e2cc28c1 --- /dev/null +++ b/phpBB/phpbb/storage/helper.php @@ -0,0 +1,192 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\storage; + +use phpbb\config\config; +use phpbb\di\service_collection; + +class helper +{ + /** @var config */ + protected $config; + + /** @var service_collection */ + protected $provider_collection; + + /** @var service_collection */ + protected $adapter_collection; + + /** @var adapter_factory */ + protected $adapter_factory; + + /** @var state_helper */ + protected $state_helper; + + public function __construct(config $config, service_collection $provider_collection, service_collection $adapter_collection, adapter_factory $adapter_factory, state_helper $state_helper) + { + $this->config = $config; + $this->provider_collection = $provider_collection; + $this->adapter_collection = $adapter_collection; + $this->adapter_factory = $adapter_factory; + $this->state_helper = $state_helper; + } + + /** + * Get adapter definitions from a provider + * + * @param string $provider Provider class + * @return array Adapter definitions + */ + public function get_provider_options(string $provider) : array + { + return $this->provider_collection->get_by_class($provider)->get_options(); + } + + /** + * Get the current provider from config + * + * @param string $storage_name Storage name + * @return string The current provider + */ + public function get_current_provider(string $storage_name) : string + { + return (string) $this->config['storage\\' . $storage_name . '\\provider']; + } + + /** + * Get the current value of the definition of a storage from config + * + * @param string $storage_name Storage name + * @param string $definition Definition + * @return string Definition value + */ + public function get_current_definition(string $storage_name, string $definition) : string + { + return (string) $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; + } + + /** + * Get current storage adapter + * + * @param string $storage_name Storage adapter name + * + * @return object Storage adapter instance + */ + public function get_current_adapter(string $storage_name): object + { + static $adapters = []; + + if (!isset($adapters[$storage_name])) + { + $adapters[$storage_name] = $this->adapter_factory->get($storage_name); + } + + return $adapters[$storage_name]; + } + + /** + * Get new storage adapter + * + * @param string $storage_name + * + * @return mixed Storage adapter instance + */ + public function get_new_adapter(string $storage_name) + { + static $adapters = []; + + if (!isset($adapters[$storage_name])) + { + $provider = $this->state_helper->new_provider($storage_name); + $provider_class = $this->provider_collection->get_by_class($provider); + + $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); + $definitions = $this->get_provider_options($provider); + + $options = []; + foreach (array_keys($definitions) as $definition) + { + $options[$definition] = $this->state_helper->new_definition_value($storage_name, $definition); + } + + $adapter->configure($options); + + $adapters[$storage_name] = $adapter; + } + + return $adapters[$storage_name]; + } + + public function delete_storage_options(string $storage_name): void + { + $provider = $this->get_current_provider($storage_name); + $options = $this->get_provider_options($provider); + + foreach (array_keys($options) as $definition) + { + $this->config->delete('storage\\' . $storage_name . '\\config\\' . $definition); + } + } + + public function set_storage_provider(string $storage_name, string $provider): void + { + $this->config->set('storage\\' . $storage_name . '\\provider', $provider); + } + + public function set_storage_definition(string $storage_name, string $definition, string $value): void + { + $this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $value); + } + + public function copy_file_to_new_adapter($storage_name, $file): void + { + $current_adapter = $this->get_current_adapter($storage_name); + $new_adapter = $this->get_new_adapter($storage_name); + + $stream = $current_adapter->read_stream($file); + $new_adapter->write_stream($file, $stream); + + if (is_resource($stream)) + { + fclose($stream); + } + } + + + /** + * Updates a storage with the info provided in the form (that is stored in the state at this point) + * + * @param string $storage_name Storage name + */ + public function update_storage_config(string $storage_name) : void + { + + // Remove old storage config + $this->delete_storage_options($storage_name); + + // Update provider + $new_provider = $this->state_helper->new_provider($storage_name); + $this->set_storage_provider($storage_name, $new_provider); + + // Set new storage config + $new_options = $this->get_provider_options($new_provider); + + foreach (array_keys($new_options) as $definition) + { + $new_definition_value = $this->state_helper->new_definition_value($storage_name, $definition); + $this->set_storage_definition($storage_name, $definition, $new_definition_value); + } + } + +} diff --git a/phpBB/phpbb/storage/state_helper.php b/phpBB/phpbb/storage/state_helper.php new file mode 100644 index 00000000000..cc9de6dff35 --- /dev/null +++ b/phpBB/phpbb/storage/state_helper.php @@ -0,0 +1,215 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\storage; + +use phpbb\config\config; +use phpbb\config\db_text; +use phpbb\di\service_collection; +use phpbb\request\request; +use phpbb\storage\exception\action_in_progress_exception; +use phpbb\storage\exception\no_action_in_progress_exception; + +class state_helper +{ + /** @var config */ + protected $config; + + /** @var db_text $config_text */ + protected $config_text; + + /** @var service_collection */ + protected $provider_collection; + + public function __construct(config $config, db_text $config_text, service_collection $provider_collection) + { + $this->config = $config; + $this->config_text = $config_text; + $this->provider_collection = $provider_collection; + } + + /** + * Returns if there is an action in progress + * + * @return bool + */ + public function is_action_in_progress(): bool + { + return !empty(json_decode($this->config_text->get('storage_update_state'), true)); + } + + public function new_provider(string $storage_name): string + { + $state = $this->load_state(); + + return $state['storages'][$storage_name]['provider']; + } + + public function new_definition_value(string $storage_name, string $definition): string + { + $state = $this->load_state(); + + return $state['storages'][$storage_name]['config'][$definition]; + } + + public function update_type(): update_type + { + $state = $this->load_state(); + + return update_type::from($state['update_type']); + } + + public function storage_index(): int + { + $state = $this->load_state(); + + return $state['storage_index']; + } + + public function set_storage_index(int $storage_index): void + { + $state = $this->load_state(); + + $state['storage_index'] = $storage_index; + + $this->save_state($state); + } + + public function remove_storage_index(): int + { + $state = $this->load_state(); + + return $state['remove_storage_index']; + } + + public function set_remove_storage_index(int $storage_index): void + { + $state = $this->load_state(); + + $state['remove_storage_index'] = $storage_index; + + $this->save_state($state); + } + + public function file_index(): int + { + $state = $this->load_state(); + + return $state['file_index']; + } + + public function set_file_index(int $file_index): void + { + $state = $this->load_state(); + + $state['file_index'] = $file_index; + + $this->save_state($state); + } + + public function storages(): array + { + $state = $this->load_state(); + + return array_keys($state['storages']); + } + + /** + * Start a indexing or delete process. + * + * @param update_type $update_type + * @param array $modified_storages + * @param request $request + * + * @throws action_in_progress_exception If there is an action in progress + * @throws \JsonException + */ + public function init(update_type $update_type, array $modified_storages, request $request): void + { + // Is not possible to start a new process when there is one already running + if ($this->is_action_in_progress()) + { + throw new action_in_progress_exception(); + } + + $state = [ + // Save the value of the checkbox, to remove all files from the + // old storage once they have been successfully moved + 'update_type' => $update_type->value, + 'storages' => [], + 'storage_index' => 0, + 'file_index' => 0, + 'remove_storage_index' => 0, + ]; + + // Save in the state the selected storages and their new configuration + foreach ($modified_storages as $storage_name) + { + $state['storages'][$storage_name] = []; + + $state['storages'][$storage_name]['provider'] = $request->variable([$storage_name, 'provider'], ''); + + $options = $this->provider_collection->get_by_class($request->variable([$storage_name, 'provider'], ''))->get_options(); + + foreach (array_keys($options) as $definition) + { + $state['storages'][$storage_name]['config'][$definition] = $request->variable([$storage_name, $definition], ''); + } + } + + $this->save_state($state); + } + + /** + * Clear the state + * + * @throws \JsonException + */ + public function clear_state(): void + { + $this->save_state([]); + } + + /** + * Load the state from the database + * + * @return array + * + * @throws no_action_in_progress_exception If there is no action in progress + */ + private function load_state(): array + { + // Is not possible to execute an action over state if is empty + if (!$this->is_action_in_progress()) + { + throw new no_action_in_progress_exception(); + } + + return json_decode($this->config_text->get('storage_update_state'), true) ?? []; + } + + /** + * Save the specified state in the database + * + * @param array $state + * + * @throws \JsonException + */ + private function save_state(array $state = []): void + { + $this->config_text->set('storage_update_state', json_encode($state, JSON_THROW_ON_ERROR)); + } + + + +} diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php index 8e4620ab236..af0c9f0c671 100644 --- a/phpBB/phpbb/storage/storage.php +++ b/phpBB/phpbb/storage/storage.php @@ -15,7 +15,7 @@ use phpbb\cache\driver\driver_interface as cache; use phpbb\db\driver\driver_interface as db; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; /** * Experimental @@ -102,14 +102,14 @@ protected function get_adapter() * @param string $path The file to be written to. * @param string $content The data to write into the file. * - * @throws exception When the file already exists + * @throws storage_exception When the file already exists * When the file cannot be written */ public function put_contents($path, $content) { if ($this->exists($path)) { - throw new exception('STORAGE_FILE_EXISTS', $path); + throw new storage_exception('STORAGE_FILE_EXISTS', $path); } $this->get_adapter()->put_contents($path, $content); @@ -121,17 +121,17 @@ public function put_contents($path, $content) * * @param string $path The file to read * - * @throws exception When the file doesn't exist - * When cannot read file contents + * @return string Returns file contents * - * @return string Returns file contents + *@throws storage_exception When the file doesn't exist + * When cannot read file contents * */ public function get_contents($path) { if (!$this->exists($path)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } return $this->get_adapter()->get_contents($path); @@ -155,14 +155,14 @@ public function exists($path, $full_check = false) * * @param string $path file/directory to remove * - * @throws exception When removal fails + * @throws storage_exception When removal fails * When the file doesn't exist */ public function delete($path) { if (!$this->exists($path)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } $this->get_adapter()->delete($path); @@ -175,7 +175,7 @@ public function delete($path) * @param string $path_orig The original file/direcotry * @param string $path_dest The target file/directory * - * @throws exception When the file doesn't exist + * @throws storage_exception When the file doesn't exist * When target exists * When file/directory cannot be renamed */ @@ -183,12 +183,12 @@ public function rename($path_orig, $path_dest) { if (!$this->exists($path_orig)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path_orig); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path_orig); } if ($this->exists($path_dest)) { - throw new exception('STORAGE_FILE_EXISTS', $path_dest); + throw new storage_exception('STORAGE_FILE_EXISTS', $path_dest); } $this->get_adapter()->rename($path_orig, $path_dest); @@ -201,7 +201,7 @@ public function rename($path_orig, $path_dest) * @param string $path_orig The original filename * @param string $path_dest The target filename * - * @throws exception When the file doesn't exist + * @throws storage_exception When the file doesn't exist * When target exists * When the file cannot be copied */ @@ -209,12 +209,12 @@ public function copy($path_orig, $path_dest) { if (!$this->exists($path_orig)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path_orig); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path_orig); } if ($this->exists($path_dest)) { - throw new exception('STORAGE_FILE_EXISTS', $path_dest); + throw new storage_exception('STORAGE_FILE_EXISTS', $path_dest); } $this->get_adapter()->copy($path_orig, $path_dest); @@ -226,16 +226,16 @@ public function copy($path_orig, $path_dest) * * @param string $path File to read * - * @throws exception When the file doesn't exist + * @return resource Returns a file pointer + *@throws storage_exception When the file doesn't exist * When unable to open file * - * @return resource Returns a file pointer */ public function read_stream($path) { if (!$this->exists($path)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } $stream = null; @@ -262,19 +262,19 @@ public function read_stream($path) * @param string $path The target file * @param resource $resource The resource * - * @throws exception When the file exist + * @throws storage_exception When the file exist * When target file cannot be created */ public function write_stream($path, $resource) { if ($this->exists($path)) { - throw new exception('STORAGE_FILE_EXISTS', $path); + throw new storage_exception('STORAGE_FILE_EXISTS', $path); } if (!is_resource($resource)) { - throw new exception('STORAGE_INVALID_RESOURCE'); + throw new storage_exception('STORAGE_INVALID_RESOURCE'); } $adapter = $this->get_adapter(); @@ -301,7 +301,7 @@ public function track_file($path, $update = false) { if (!$this->get_adapter()->exists($path)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } $sql_ary = array( @@ -403,16 +403,16 @@ protected function track_rename($path_orig, $path_dest) * * @param string $path The file * - * @throws exception When the adapter doesn't implement the method + * @return \phpbb\storage\file_info Returns file_info object + *@throws storage_exception When the adapter doesn't implement the method * When the file doesn't exist * - * @return \phpbb\storage\file_info Returns file_info object */ public function file_info($path) { if (!$this->exists($path)) { - throw new exception('STORAGE_FILE_NO_EXIST', $path); + throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } return new file_info($this->get_adapter(), $path); @@ -484,9 +484,9 @@ public function get_num_files() /** * Get space available in bytes * - * @throws exception When unable to retrieve available storage space + * @return float Returns available space + *@throws storage_exception When unable to retrieve available storage space * - * @return float Returns available space */ public function free_space() { diff --git a/phpBB/phpbb/storage/stream_interface.php b/phpBB/phpbb/storage/stream_interface.php index 9687a2d9109..424ffcb95c2 100644 --- a/phpBB/phpbb/storage/stream_interface.php +++ b/phpBB/phpbb/storage/stream_interface.php @@ -13,7 +13,7 @@ namespace phpbb\storage; -use phpbb\storage\exception\exception; +use phpbb\storage\exception\storage_exception; interface stream_interface { @@ -23,7 +23,7 @@ interface stream_interface * @param string $path File to read * * @return resource Returns a file pointer - * @throws exception When unable to open file + * @throws storage_exception When unable to open file */ public function read_stream(string $path); @@ -34,7 +34,7 @@ public function read_stream(string $path); * @param resource $resource The resource * * @return void - * @throws exception When target file exists + * @throws storage_exception When target file exists * When target file cannot be created */ public function write_stream(string $path, $resource): void; diff --git a/phpBB/phpbb/storage/update_type.php b/phpBB/phpbb/storage/update_type.php new file mode 100644 index 00000000000..32f25ad13d9 --- /dev/null +++ b/phpBB/phpbb/storage/update_type.php @@ -0,0 +1,21 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\storage; + +enum update_type: int +{ + case CONFIG = 0; + case COPY = 1; + case MOVE = 2; +} diff --git a/tests/attachment/delete_test.php b/tests/attachment/delete_test.php index faf2f960e63..7acac28f334 100644 --- a/tests/attachment/delete_test.php +++ b/tests/attachment/delete_test.php @@ -102,7 +102,7 @@ public function test_attachment_delete_success($remove_success, $exists_success, { $this->storage->expects($this->any()) ->method('delete') - ->willThrowException(new \phpbb\storage\exception\exception); + ->willThrowException(new \phpbb\storage\exception\storage_exception); } else { diff --git a/tests/functional/acp_storage_settings_test.php b/tests/functional/acp_storage_settings_test.php index b99e3e8fa96..f8c1728dcb2 100644 --- a/tests/functional/acp_storage_settings_test.php +++ b/tests/functional/acp_storage_settings_test.php @@ -68,9 +68,9 @@ public function test_storage_settings() // Visit ACP Storage settings again - warning should be displayed $crawler = self::request('GET', 'adm/index.php?i=acp_storage&mode=settings&sid=' . $this->sid); $this->assertContainsLang('WARNING', $crawler->filter('div[class="errorbox"] > h3')->text()); - $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_ATTACHMENT_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text()); - $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_AVATAR_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text()); - $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_BACKUP_TITLE')), $crawler->filter('div[class="errorbox"] > p')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_ATTACHMENT_TITLE')), $crawler->filter('div[class="errorbox"]')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_AVATAR_TITLE')), $crawler->filter('div[class="errorbox"]')->text()); + $this->assertStringContainsString($this->lang('STORAGE_PATH_NOT_EXISTS', $this->lang('STORAGE_BACKUP_TITLE')), $crawler->filter('div[class="errorbox"]')->text()); // Restore default state $filesystem->chmod($phpbb_root_path . $attachments_storage_path, 777); From 59a5163e2b02e0d82e281c5bd033637ed1594384 Mon Sep 17 00:00:00 2001 From: rubencm Date: Sat, 23 Sep 2023 11:58:52 +0000 Subject: [PATCH 0220/1214] [ticket/15699] Fix code style PHPBB3-15699 Co-authored-by: Marc Alexander --- phpBB/includes/acp/acp_storage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 996a0f641b4..2e28ef9a503 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -247,7 +247,7 @@ private function update_action(): void $this->db->sql_freeresult($result); // Remove all files of a storage, increase storage index and reset file index - $this->state_helper->set_remove_storage_index($this->state_helper->remove_storage_index()+1); + $this->state_helper->set_remove_storage_index($this->state_helper->remove_storage_index() + 1); $this->state_helper->set_file_index(0); } } From bb84af9a4860b51bec20f803af95fd2a7a74bf8e Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 17 Feb 2024 19:19:09 +0100 Subject: [PATCH 0221/1214] [ticket/15699] Add progress bar and use template macros PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 31 ++--- .../style/acp_storage_update_inprogress.html | 38 +++--- .../style/acp_storage_update_progress.html | 20 +++ phpBB/includes/acp/acp_storage.php | 124 ++++++++++-------- phpBB/language/en/acp/storage.php | 10 +- phpBB/phpbb/storage/adapter_factory.php | 38 +++--- phpBB/phpbb/storage/helper.php | 19 +-- phpBB/phpbb/storage/provider/local.php | 5 +- phpBB/phpbb/storage/state_helper.php | 1 + phpBB/phpbb/storage/storage.php | 9 +- 10 files changed, 152 insertions(+), 143 deletions(-) create mode 100644 phpBB/adm/style/acp_storage_update_progress.html diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index bb9940554bd..63f52a276e2 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -61,34 +61,23 @@

          {{ lang('WARNING') }}

          {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} {% for name, options in provider.get_options %} - {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} - {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} - {% set input_id = storage.get_name ~ '_' ~ provider.get_name ~ '_' ~ name %} - {% set input_type = options['type'] %} - {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} - {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %}
          - + {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} + {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} + {% if lang_defined(description) %}
          {{ lang(description) }} {% endif %}
          - {% if input_type in ['text', 'password', 'email'] %} - - {% elseif input_type == 'textarea' %} - - {% elseif input_type == 'radio' %} - {% for option_name, option_value in options['options'] %} - {{ lang(option_name) }} - {% endfor %} - {% elseif input_type == 'select' %} - + {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} + {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %} + + {% if options['type'] in ['text', 'password', 'email'] %} + {{ FormsBuildTemplate(options | merge({"name": input_name, "value": input_value})) }} + {% elseif options['type'] == 'textarea' %} + {{ FormsBuildTemplate(options | merge({"name": input_name, "content": input_value})) }} {% endif %}
          diff --git a/phpBB/adm/style/acp_storage_update_inprogress.html b/phpBB/adm/style/acp_storage_update_inprogress.html index 9c4b9fd8040..5f7614cb2c7 100644 --- a/phpBB/adm/style/acp_storage_update_inprogress.html +++ b/phpBB/adm/style/acp_storage_update_inprogress.html @@ -4,27 +4,27 @@

          {{ lang('STORAGE_TITLE') }}

          - +

          {{ lang('STORAGE_TITLE_EXPLAIN') }}

          -

          {{ lang('CONTINUE_EXPLAIN') }}

          - -
          -
          + +
          {{ lang('SUBMIT') }} -   - + + {% if CONTINUE_PROGRESS %} +
          +
          +
          + {{ CONTINUE_PROGRESS.PERCENTAGE|number_format(2) ~ ' %' }} +
          + {% endif %} + +

          +   + +

          {{ S_FORM_TOKEN }}
          diff --git a/phpBB/adm/style/acp_storage_update_progress.html b/phpBB/adm/style/acp_storage_update_progress.html new file mode 100644 index 00000000000..17ba67a037f --- /dev/null +++ b/phpBB/adm/style/acp_storage_update_progress.html @@ -0,0 +1,20 @@ +{% include 'overall_header.html' %} + + + +
          +

          {{ INDEXING_TITLE }}

          +

          + {{ INDEXING_EXPLAIN }} + {% if INDEXING_PROGRESS_BAR %} +
          +
          + {{ INDEXING_PROGRESS_BAR.PERCENTAGE|number_format(2) ~ ' %' }} + {% endif %} +

          +
          + +{% include 'overall_footer.html' %} diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 2e28ef9a503..e11a7782786 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -16,6 +16,7 @@ use phpbb\language\language; use phpbb\log\log_interface; use phpbb\request\request; +use phpbb\storage\exception\storage_exception; use phpbb\storage\helper; use phpbb\storage\state_helper; use phpbb\storage\update_type; @@ -77,6 +78,9 @@ class acp_storage /** @var helper */ private $storage_helper; + /** @var string */ + private $storage_table; + /** * @param string $id * @param string $mode @@ -97,6 +101,7 @@ public function main(string $id, string $mode): void $this->phpbb_root_path = $phpbb_root_path; $this->state_helper = $phpbb_container->get('storage.state_helper'); $this->storage_helper = $phpbb_container->get('storage.helper'); + $this->storage_table = $phpbb_container->getParameter('tables.storage'); // Add necessary language files $this->lang->add_lang(['acp/storage']); @@ -128,10 +133,6 @@ private function settings(string $id, string $mode): void { switch ($action) { - case 'progress_bar': - $this->display_progress_bar(); - break; - case 'update': $this->update_action(); break; @@ -151,7 +152,7 @@ private function settings(string $id, string $mode): void // There is an updating in progress, show the form to continue or cancel if ($this->state_helper->is_action_in_progress()) { - $this->update_inprogress($id, $mode); + $this->update_inprogress(); } else { @@ -162,8 +163,6 @@ private function settings(string $id, string $mode): void private function update_action(): void { - // Probably it has sense to disable the forum while this is in progress - if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) { trigger_error($this->lang->lang('FORM_INVALID') . adm_back_link($this->u_action), E_USER_WARNING); @@ -182,7 +181,7 @@ private function update_action(): void } $sql = 'SELECT file_id, file_path - FROM ' . STORAGE_TABLE . " + FROM ' . $this->storage_table . " WHERE storage = '" . $this->db->sql_escape($storage_name) . "' AND file_id > " . $this->state_helper->file_index(); $result = $this->db->sql_query($sql); @@ -192,9 +191,8 @@ private function update_action(): void if (!still_on_time()) { $this->db->sql_freeresult($result); - meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - // Here could be included the current file compared with the number of total files too - trigger_error($this->lang->lang('STORAGE_UPDATE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state_helper->storages()))); + $this->display_progress_page(); + return; } // Copy file from old adapter to the new one @@ -223,7 +221,7 @@ private function update_action(): void } $sql = 'SELECT file_id, file_path - FROM ' . STORAGE_TABLE . " + FROM ' . $this->storage_table . " WHERE storage = '" . $this->db->sql_escape($storage_name) . "' AND file_id > " . $this->state_helper->file_index(); $result = $this->db->sql_query($sql); @@ -233,8 +231,8 @@ private function update_action(): void if (!still_on_time()) { $this->db->sql_freeresult($result); - meta_refresh(1, append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'))); - trigger_error($this->lang->lang('STORAGE_UPDATE_REMOVE_REDIRECT', $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'), $i + 1, count($this->state_helper->storages()))); + $this->display_progress_page(); + return; } // remove file from old (current) adapter @@ -262,10 +260,10 @@ private function update_action(): void $storages = $this->state_helper->storages(); $this->state_helper->clear_state(); $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_STORAGE_UPDATE', false, [implode(', ', $storages)]); - trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action) . $this->close_popup_js()); + trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action)); } - private function update_inprogress(string $id, string $mode): void + private function update_inprogress(): void { // Template from adm/style $this->tpl_name = 'acp_storage_update_inprogress'; @@ -274,10 +272,8 @@ private function update_inprogress(string $id, string $mode): void $this->page_title = 'STORAGE_TITLE'; $this->template->assign_vars(array( - 'UA_PROGRESS_BAR' => addslashes(append_sid($this->u_action, "action=progress_bar")), - 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), - 'L_CONTINUE' => $this->lang->lang('CONTINUE_UPDATING'), - 'L_CONTINUE_EXPLAIN' => $this->lang->lang('CONTINUE_UPDATING_EXPLAIN'), + 'U_ACTION' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), + 'CONTINUE_PROGRESS' => $this->get_storage_update_progress(), )); } @@ -308,27 +304,14 @@ private function settings_form(string $id, string $mode): void trigger_error(implode('
          ', $messages) . adm_back_link($this->u_action), E_USER_WARNING); } - // Start process and show form + // Start process and show progress if (!empty($modified_storages)) { // Create state $this->state_helper->init(update_type::from((int) $this->request->variable('update_type', update_type::CONFIG->value)), $modified_storages, $this->request); - // Show the confirmation form to start the process - $this->template->assign_vars(array( - 'UA_PROGRESS_BAR' => addslashes(append_sid($this->u_action, "action=progress_bar")), - 'S_CONTINUE_UPDATING' => true, - 'U_CONTINUE_UPDATING' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), - 'L_CONTINUE' => $this->lang->lang('START_UPDATING'), - 'L_CONTINUE_EXPLAIN' => $this->lang->lang('START_UPDATING_EXPLAIN'), - )); - - // Template from adm/style - $this->tpl_name = 'acp_storage_update_inprogress'; - - // Set page title - $this->page_title = 'STORAGE_TITLE'; - + // Start displaying progress on first submit + $this->display_progress_page(); return; } @@ -413,7 +396,7 @@ protected function storage_stats() { $free_space = get_formatted_filesize($storage->free_space()); } - catch (\phpbb\storage\exception\storage_exception $e) + catch (storage_exception $e) { $free_space = $this->lang->lang('STORAGE_UNKNOWN'); } @@ -432,33 +415,60 @@ protected function storage_stats() } /** - * Display progress bar + * Display progress page */ - protected function display_progress_bar() : void + protected function display_progress_page() : void { + $u_action = append_sid($this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage')); + meta_refresh(1, $u_action); + adm_page_header($this->lang->lang('STORAGE_UPDATE_IN_PROGRESS')); - $this->template->set_filenames(array( - 'body' => 'progress_bar.html') - ); - $this->template->assign_vars(array( - 'L_PROGRESS' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'), - 'L_PROGRESS_EXPLAIN' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN')) - ); + $this->template->set_filenames([ + 'body' => 'acp_storage_update_progress.html' + ]); + + $this->template->assign_vars([ + 'INDEXING_TITLE' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS'), + 'INDEXING_EXPLAIN' => $this->lang->lang('STORAGE_UPDATE_IN_PROGRESS_EXPLAIN'), + 'INDEXING_PROGRESS_BAR' => $this->get_storage_update_progress(), + ]); adm_page_footer(); } - /** - * Get JS code for closing popup - * - * @return string Popup JS code - */ - function close_popup_js() : string + protected function get_storage_update_progress(): array { - return "\n"; + $file_index = $this->state_helper->file_index(); + $stage_is_copy = $this->state_helper->storage_index() < count($this->state_helper->storages()); + $storage_name = $this->state_helper->storages()[$stage_is_copy ? $this->state_helper->storage_index() : $this->state_helper->remove_storage_index()]; + + $sql = 'SELECT COUNT(file_id) as done_count + FROM ' . $this->storage_table . ' + WHERE file_id <= ' . $file_index . " + AND storage = '" . $this->db->sql_escape($storage_name) . "'"; + $result = $this->db->sql_query($sql); + $done_count = (int) $this->db->sql_fetchfield('done_count'); + $this->db->sql_freeresult($result); + + $sql = 'SELECT COUNT(file_id) as remain_count + FROM ' . $this->storage_table . " + WHERE file_id > ' . $file_index . ' + AND storage = '" . $this->db->sql_escape($storage_name) . "'"; + $result = $this->db->sql_query($sql); + $remain_count = (int) $this->db->sql_fetchfield('remain_count'); + $this->db->sql_freeresult($result); + + $total_count = $done_count + $remain_count; + $percent = $done_count / $total_count; + + $steps = $this->state_helper->storage_index() + $this->state_helper->remove_storage_index() + $percent; + $multiplier = $this->state_helper->update_type() === update_type::MOVE ? 2 : 1; + $steps_total = count($this->state_helper->storages()) * $multiplier; + + return [ + 'VALUE' => $steps, + 'TOTAL' => $steps_total, + 'PERCENTAGE' => $steps / $steps_total * 100, + ]; } /** diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 2ed3a1b2a51..9f928ee58ea 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -36,7 +36,7 @@ // equally where a string contains only two placeholders which are used to wrap text // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine -$lang = array_merge($lang, array( +$lang = array_merge($lang, [ // Template 'STORAGE_TITLE' => 'Storage Settings', @@ -52,12 +52,6 @@ 'STORAGE_UPDATE_TYPE_CONFIG' => 'Update configuration only', 'STORAGE_UPDATE_TYPE_COPY' => 'Update configuration and copy files', 'STORAGE_UPDATE_TYPE_MOVE' => 'Update configuration and move files', - 'START_UPDATING' => 'Start update process', - 'START_UPDATING_EXPLAIN' => 'Start the storage update process', - 'CONTINUE_UPDATING' => 'Continue previous update process', - 'CONTINUE_UPDATING_EXPLAIN' => 'An update process has been started. In order to access the storage settings page you will have to complete it or cancel it.', - 'STORAGE_UPDATE_REDIRECT' => 'Files of %1$s (%2$d/%3$d) are being moved.
          ', - 'STORAGE_UPDATE_REMOVE_REDIRECT' => 'Files of old %1$s (%2$d/%3$d) are being removed.
          ', // Template progress bar 'STORAGE_UPDATE_IN_PROGRESS' => 'Storage update in progress', @@ -83,4 +77,4 @@ 'STORAGE_PATH_NOT_EXISTS' => '“%1$s” path does not exist or is not writable.', 'STORAGE_PATH_NOT_SET' => '“%1$s” path is not set.', -)); +]); diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php index b358328525f..62e51f66aeb 100644 --- a/phpBB/phpbb/storage/adapter_factory.php +++ b/phpBB/phpbb/storage/adapter_factory.php @@ -15,6 +15,7 @@ use phpbb\config\config; use phpbb\di\service_collection; +use phpbb\storage\adapter\adapter_interface; use phpbb\storage\exception\storage_exception; class adapter_factory @@ -53,41 +54,36 @@ public function __construct(config $config, service_collection $adapters, servic * * @param string $storage_name * - * @return \phpbb\storage\adapter\adapter_interface + * @return adapter_interface */ - public function get($storage_name) + public function get(string $storage_name) { $provider_class = $this->config['storage\\' . $storage_name . '\\provider']; $provider = $this->providers->get_by_class($provider_class); - if (!$provider->is_available()) + $options = []; + foreach (array_keys($provider->get_options()) as $definition) { - throw new storage_exception('STORAGE_ADAPTER_NOT_AVAILABLE'); + /** @psalm-suppress InvalidArrayOffset */ + $options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; } - $adapter = $this->adapters->get_by_class($provider->get_adapter_class()); - $adapter->configure($this->build_options($storage_name, $provider->get_options())); - - return $adapter; + return $this->get_with_options($storage_name, $options); } - /** - * Obtains configuration for a given storage - * - * @param string $storage_name - * @param array $definitions - * - * @return array Returns storage configuration values - */ - public function build_options($storage_name, array $definitions) + public function get_with_options(string $storage_name, array $options) { - $options = []; + $provider_class = $this->config['storage\\' . $storage_name . '\\provider']; + $provider = $this->providers->get_by_class($provider_class); - foreach (array_keys($definitions) as $definition) + if (!$provider->is_available()) { - $options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; + throw new storage_exception('STORAGE_ADAPTER_NOT_AVAILABLE'); } - return $options; + $adapter = $this->adapters->get_by_class($provider->get_adapter_class()); + $adapter->configure($options); + + return $adapter; } } diff --git a/phpBB/phpbb/storage/helper.php b/phpBB/phpbb/storage/helper.php index 6a5e2cc28c1..de75ab337c5 100644 --- a/phpBB/phpbb/storage/helper.php +++ b/phpBB/phpbb/storage/helper.php @@ -45,12 +45,12 @@ public function __construct(config $config, service_collection $provider_collect /** * Get adapter definitions from a provider * - * @param string $provider Provider class + * @param string $provider_class Provider class * @return array Adapter definitions */ - public function get_provider_options(string $provider) : array + public function get_provider_options(string $provider_class) : array { - return $this->provider_collection->get_by_class($provider)->get_options(); + return $this->provider_collection->get_by_class($provider_class)->get_options(); } /** @@ -108,21 +108,16 @@ public function get_new_adapter(string $storage_name) if (!isset($adapters[$storage_name])) { - $provider = $this->state_helper->new_provider($storage_name); - $provider_class = $this->provider_collection->get_by_class($provider); - - $adapter = $this->adapter_collection->get_by_class($provider_class->get_adapter_class()); - $definitions = $this->get_provider_options($provider); + $provider_class = $this->state_helper->new_provider($storage_name); + $definitions = array_keys($this->get_provider_options($provider_class)); $options = []; - foreach (array_keys($definitions) as $definition) + foreach ($definitions as $definition) { $options[$definition] = $this->state_helper->new_definition_value($storage_name, $definition); } - $adapter->configure($options); - - $adapters[$storage_name] = $adapter; + $adapters[$storage_name] = $this->adapter_factory->get_with_options($storage_name, $options); } return $adapters[$storage_name]; diff --git a/phpBB/phpbb/storage/provider/local.php b/phpBB/phpbb/storage/provider/local.php index 3bec0c5ce5b..c6338e0c311 100644 --- a/phpBB/phpbb/storage/provider/local.php +++ b/phpBB/phpbb/storage/provider/local.php @@ -37,7 +37,10 @@ public function get_adapter_class(): string public function get_options() { return [ - 'path' => ['type' => 'text'], + 'path' => [ + 'tag' => 'input', + 'type' => 'text', + ], ]; } diff --git a/phpBB/phpbb/storage/state_helper.php b/phpBB/phpbb/storage/state_helper.php index cc9de6dff35..aa48c3377cc 100644 --- a/phpBB/phpbb/storage/state_helper.php +++ b/phpBB/phpbb/storage/state_helper.php @@ -163,6 +163,7 @@ public function init(update_type $update_type, array $modified_storages, request foreach (array_keys($options) as $definition) { + /** @psalm-suppress InvalidArrayOffset */ $state['storages'][$storage_name]['config'][$definition] = $request->variable([$storage_name, $definition], ''); } } diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php index af0c9f0c671..e99d046a540 100644 --- a/phpBB/phpbb/storage/storage.php +++ b/phpBB/phpbb/storage/storage.php @@ -15,6 +15,7 @@ use phpbb\cache\driver\driver_interface as cache; use phpbb\db\driver\driver_interface as db; +use phpbb\storage\adapter\adapter_interface; use phpbb\storage\exception\storage_exception; /** @@ -23,7 +24,7 @@ class storage { /** - * @var \phpbb\storage\adapter\adapter_interface + * @var adapter_interface */ protected $adapter; @@ -39,7 +40,7 @@ class storage protected $cache; /** - * @var \phpbb\storage\adapter_factory + * @var adapter_factory */ protected $factory; @@ -58,7 +59,7 @@ class storage * * @param db $db * @param cache $cache - * @param \phpbb\storage\adapter_factory $factory + * @param adapter_factory $factory * @param string $storage_name * @param string $storage_table */ @@ -84,7 +85,7 @@ public function get_name() /** * Returns an adapter instance * - * @return \phpbb\storage\adapter\adapter_interface + * @return adapter_interface */ protected function get_adapter() { From bf467f8ece9d58312b5674397f1863dc971908d5 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 17 Feb 2024 20:15:39 +0100 Subject: [PATCH 0222/1214] [ticket/15699] Remove .phpunit.result.cache PHPBB3-15699 --- .gitignore | 1 + .phpunit.result.cache | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 .phpunit.result.cache diff --git a/.gitignore b/.gitignore index 69f93652be4..6972ca1516e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ # Excludes test / dev files /phpunit.xml +/.phpunit.result.cache /phpBB/composer.phar /tests/phpbb_unit_tests.sqlite* /tests/test_config*.php diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index 2de2a6daf1c..00000000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"defects":[],"times":[]} \ No newline at end of file From 155b5168bee6e0f2ad23eddb247ce5671a1c61db Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 18 Feb 2024 10:44:41 +0100 Subject: [PATCH 0223/1214] [ticket/15699] Improve code style PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 32 +++++++++++++-------------- phpBB/includes/acp/acp_storage.php | 6 ++--- phpBB/phpbb/storage/adapter/local.php | 2 -- phpBB/phpbb/storage/state_helper.php | 2 -- phpBB/phpbb/storage/storage.php | 8 +++---- 5 files changed, 23 insertions(+), 27 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 63f52a276e2..39ca5bb012c 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -16,34 +16,34 @@

          {{ lang('STORAGE_TITLE') }}

          - {% for storage in STORAGE_STATS %} - - {{ storage.name }} - {{ storage.files }} - {{ storage.size }} - {{ storage.free_space }} - - {% endfor %} + {% for storage in STORAGE_STATS %} + + {{ storage.name }} + {{ storage.files }} + {{ storage.size }} + {{ storage.free_space }} + + {% endfor %} {% if ERROR_MESSAGES is not empty %} -
          -

          {{ lang('WARNING') }}

          - {% for ERROR_MESSAGE in ERROR_MESSAGES %} -

          {{ ERROR_MESSAGE }}

          - {% endfor %} -
          +
          +

          {{ lang('WARNING') }}

          + {% for ERROR_MESSAGE in ERROR_MESSAGES %} +

          {{ ERROR_MESSAGE }}

          + {% endfor %} +
          {% endif %}
          {% for storage in STORAGES %}
          - {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} + {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}

          {{ lang('STORAGE_SELECT_DESC') }}
          - {% for provider in PROVIDERS %} {% if provider.is_available %}
          diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index bd66516a3e0..150d7116725 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -458,7 +458,7 @@ protected function get_storage_update_progress(): array $this->db->sql_freeresult($result); $total_count = $done_count + $remain_count; - $percent = $done_count / $total_count; + $percent = $total_count > 0 ? $done_count / $total_count : 0; $steps = $this->state_helper->storage_index() + $this->state_helper->remove_storage_index() + $percent; $multiplier = $this->state_helper->update_type() === update_type::MOVE ? 2 : 1; @@ -509,18 +509,15 @@ protected function validate_data(string $storage_name, array &$messages) $value = $this->request->variable([$storage_name, $definition_key], ''); - switch ($definition_value['type']) + switch ($definition_value['tag']) { - case 'email': - if (!filter_var($value, FILTER_VALIDATE_EMAIL)) + case 'text': + if ($definition_value['type'] == 'email' && filter_var($value, FILTER_VALIDATE_EMAIL)) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); } - // no break - case 'text': - case 'password': - $maxlength = isset($definition_value['maxlength']) ? $definition_value['maxlength'] : 255; + $maxlength = isset($definition_value['max']) ? $definition_value['max'] : 255; if (strlen($value) > $maxlength) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); @@ -542,8 +539,34 @@ protected function validate_data(string $storage_name, array &$messages) break; case 'radio': + $found = false; + foreach ($definition_value['buttons'] as $button) + { + if ($button['value'] == $value) + { + $found = true; + break; + } + } + + if (!$found) + { + $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); + } + break; + case 'select': - if (!in_array($value, array_values($definition_value['options']))) + $found = false; + foreach ($definition_value['options'] as $option) + { + if ($option['value'] == $value) + { + $found = true; + break; + } + } + + if (!$found) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_SELECT_NOT_AVAILABLE', $definition_title, $storage_title); } From 195fb59b4e5d75b7204d22c18c11049b59c0ecbd Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 25 May 2024 16:35:44 +0200 Subject: [PATCH 0225/1214] [ticket/15699] Fixes code review PHPBB3-15699 --- phpBB/adm/style/acp_storage.html | 12 ++-- .../default/container/services_storage.yml | 4 +- phpBB/includes/acp/acp_storage.php | 52 +++++++++++--- phpBB/phpbb/storage/adapter_factory.php | 15 ++-- phpBB/phpbb/storage/helper.php | 65 +++++++++++++++--- phpBB/phpbb/storage/state_helper.php | 68 ++++++++++++++++++- 6 files changed, 181 insertions(+), 35 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 1aedc50ce18..86c9298828b 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -41,7 +41,7 @@

          {{ lang('WARNING') }}

          {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }}
          -

          {{ lang('STORAGE_SELECT_DESC') }}
          +

          {{ lang('STORAGE_SELECT_DESC') }}
          {{ lang('STORAGE_UPDATE_TYPE_CONFIG') }} diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml index 401357861d3..496c30de5d8 100644 --- a/phpBB/config/default/container/services_storage.yml +++ b/phpBB/config/default/container/services_storage.yml @@ -120,7 +120,7 @@ services: class: phpbb\storage\helper arguments: - '@config' - - '@storage.provider_collection' - - '@storage.adapter_collection' - '@storage.adapter.factory' - '@storage.state_helper' + - '@storage.provider_collection' + - '@storage.adapter_collection' diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 150d7116725..2adf833562e 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -123,6 +123,8 @@ public function main(string $id, string $mode): void } /** + * Method to route the request to the correct page + * * @param string $id * @param string $mode */ @@ -156,11 +158,16 @@ private function settings(string $id, string $mode): void } else { - $this->settings_form($id, $mode); + $this->settings_form(); } } } + /** + * Page to update storage settings and move files + * + * @return void + */ private function update_action(): void { if (!check_link_hash($this->request->variable('hash', ''), 'acp_storage')) @@ -263,6 +270,11 @@ private function update_action(): void trigger_error($this->lang->lang('STORAGE_UPDATE_SUCCESSFUL') . adm_back_link($this->u_action)); } + /** + * Page that show a form with the progress bar, and a button to continue or cancel + * + * @return void + */ private function update_inprogress(): void { // Template from adm/style @@ -271,13 +283,18 @@ private function update_inprogress(): void // Set page title $this->page_title = 'STORAGE_TITLE'; - $this->template->assign_vars(array( + $this->template->assign_vars([ 'U_ACTION' => $this->u_action . '&action=update&hash=' . generate_link_hash('acp_storage'), 'CONTINUE_PROGRESS' => $this->get_storage_update_progress(), - )); + ]); } - private function settings_form(string $id, string $mode): void + /** + * Main settings page, shows a form with all the storages and their configuration options + * + * @return void + */ + private function settings_form(): void { $form_key = 'acp_storage'; add_form_key($form_key); @@ -348,6 +365,12 @@ private function settings_form(string $id, string $mode): void ]); } + /** + * When submit the settings form, check which storages have been modified + * to update only those. + * + * @return array + */ private function get_modified_storages(): array { $modified_storages = []; @@ -386,7 +409,12 @@ private function get_modified_storages(): array return $modified_storages; } - protected function storage_stats() + /** + * Fill template variables to show storage stats in settings page + * + * @return void + */ + protected function storage_stats(): void { // Top table with stats of each storage $storage_stats = []; @@ -435,6 +463,11 @@ protected function display_progress_page() : void adm_page_footer(); } + /** + * Get storage update progress to show progress bar + * + * @return array + */ protected function get_storage_update_progress(): array { $file_index = $this->state_helper->file_index(); @@ -477,7 +510,7 @@ protected function get_storage_update_progress(): array * @param string $storage_name Storage name * @param array $messages Reference to messages array */ - protected function validate_data(string $storage_name, array &$messages) + protected function validate_data(string $storage_name, array &$messages): void { $storage_title = $this->lang->lang('STORAGE_' . strtoupper($storage_name) . '_TITLE'); @@ -499,6 +532,8 @@ protected function validate_data(string $storage_name, array &$messages) return; } + $this->validate_path($storage_name, $messages); + // Check options $new_options = $this->storage_helper->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); @@ -517,7 +552,7 @@ protected function validate_data(string $storage_name, array &$messages) $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); } - $maxlength = isset($definition_value['max']) ? $definition_value['max'] : 255; + $maxlength = $definition_value['max'] ?? 255; if (strlen($value) > $maxlength) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); @@ -589,7 +624,7 @@ protected function validate_path(string $storage_name, array &$messages) : void if ($this->provider_collection->get_by_class($current_provider)->get_name() == 'local' && isset($options['path'])) { - $path = $this->storage_helper->get_current_definition($storage_name, 'path'); + $path = $this->request->is_set_post('submit') ? $this->request->variable([$storage_name, 'path'], '') : $this->storage_helper->get_current_definition($storage_name, 'path'); if (empty($path)) { @@ -602,5 +637,4 @@ protected function validate_path(string $storage_name, array &$messages) : void } } - } diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php index 62e51f66aeb..61ea8794829 100644 --- a/phpBB/phpbb/storage/adapter_factory.php +++ b/phpBB/phpbb/storage/adapter_factory.php @@ -15,7 +15,6 @@ use phpbb\config\config; use phpbb\di\service_collection; -use phpbb\storage\adapter\adapter_interface; use phpbb\storage\exception\storage_exception; class adapter_factory @@ -54,9 +53,9 @@ public function __construct(config $config, service_collection $adapters, servic * * @param string $storage_name * - * @return adapter_interface + * @return mixed */ - public function get(string $storage_name) + public function get(string $storage_name): mixed { $provider_class = $this->config['storage\\' . $storage_name . '\\provider']; $provider = $this->providers->get_by_class($provider_class); @@ -71,7 +70,15 @@ public function get(string $storage_name) return $this->get_with_options($storage_name, $options); } - public function get_with_options(string $storage_name, array $options) + /** + * Obtains a configured adapters for a given storage with custom options + * + * @param string $storage_name + * @param array $options + * + * @return mixed + */ + public function get_with_options(string $storage_name, array $options): mixed { $provider_class = $this->config['storage\\' . $storage_name . '\\provider']; $provider = $this->providers->get_by_class($provider_class); diff --git a/phpBB/phpbb/storage/helper.php b/phpBB/phpbb/storage/helper.php index de75ab337c5..66921b60a78 100644 --- a/phpBB/phpbb/storage/helper.php +++ b/phpBB/phpbb/storage/helper.php @@ -21,31 +21,41 @@ class helper /** @var config */ protected $config; - /** @var service_collection */ - protected $provider_collection; - - /** @var service_collection */ - protected $adapter_collection; - /** @var adapter_factory */ protected $adapter_factory; /** @var state_helper */ protected $state_helper; - public function __construct(config $config, service_collection $provider_collection, service_collection $adapter_collection, adapter_factory $adapter_factory, state_helper $state_helper) + /** @var service_collection */ + protected $provider_collection; + + /** @var service_collection */ + protected $adapter_collection; + + /** + * Constructor + * + * @param config $config + * @param adapter_factory $adapter_factory + * @param state_helper $state_helper + * @param service_collection $provider_collection + * @param service_collection $adapter_collection + */ + public function __construct(config $config, adapter_factory $adapter_factory, state_helper $state_helper, service_collection $provider_collection, service_collection $adapter_collection) { $this->config = $config; - $this->provider_collection = $provider_collection; - $this->adapter_collection = $adapter_collection; $this->adapter_factory = $adapter_factory; $this->state_helper = $state_helper; + $this->provider_collection = $provider_collection; + $this->adapter_collection = $adapter_collection; } /** * Get adapter definitions from a provider * * @param string $provider_class Provider class + * * @return array Adapter definitions */ public function get_provider_options(string $provider_class) : array @@ -57,6 +67,7 @@ public function get_provider_options(string $provider_class) : array * Get the current provider from config * * @param string $storage_name Storage name + * * @return string The current provider */ public function get_current_provider(string $storage_name) : string @@ -69,6 +80,7 @@ public function get_current_provider(string $storage_name) : string * * @param string $storage_name Storage name * @param string $definition Definition + * * @return string Definition value */ public function get_current_definition(string $storage_name, string $definition) : string @@ -102,7 +114,7 @@ public function get_current_adapter(string $storage_name): object * * @return mixed Storage adapter instance */ - public function get_new_adapter(string $storage_name) + public function get_new_adapter(string $storage_name): mixed { static $adapters = []; @@ -123,6 +135,13 @@ public function get_new_adapter(string $storage_name) return $adapters[$storage_name]; } + /** + * Delete configuration options for a given storage + * + * @param string $storage_name + * + * @return void + */ public function delete_storage_options(string $storage_name): void { $provider = $this->get_current_provider($storage_name); @@ -134,16 +153,41 @@ public function delete_storage_options(string $storage_name): void } } + /** + * Set a provider in configuration for a given storage + * + * @param string $storage_name + * @param string $provider + * + * @return void + */ public function set_storage_provider(string $storage_name, string $provider): void { $this->config->set('storage\\' . $storage_name . '\\provider', $provider); } + /** + * Set storage options in configuration for a given storage + * + * @param string $storage_name + * @param string $definition + * @param string $value + * + * @return void + */ public function set_storage_definition(string $storage_name, string $definition, string $value): void { $this->config->set('storage\\' . $storage_name . '\\config\\' . $definition, $value); } + /** + * Copy a file from the current adapter to the new adapter + * + * @param $storage_name + * @param $file + * + * @return void + */ public function copy_file_to_new_adapter($storage_name, $file): void { $current_adapter = $this->get_current_adapter($storage_name); @@ -166,7 +210,6 @@ public function copy_file_to_new_adapter($storage_name, $file): void */ public function update_storage_config(string $storage_name) : void { - // Remove old storage config $this->delete_storage_options($storage_name); diff --git a/phpBB/phpbb/storage/state_helper.php b/phpBB/phpbb/storage/state_helper.php index 6105dc25da3..82523f0aa01 100644 --- a/phpBB/phpbb/storage/state_helper.php +++ b/phpBB/phpbb/storage/state_helper.php @@ -31,6 +31,11 @@ class state_helper /** @var service_collection */ protected $provider_collection; + /** + * @param config $config + * @param db_text $config_text + * @param service_collection $provider_collection + */ public function __construct(config $config, db_text $config_text, service_collection $provider_collection) { $this->config = $config; @@ -48,6 +53,13 @@ public function is_action_in_progress(): bool return !empty(json_decode($this->config_text->get('storage_update_state'), true)); } + /** + * Get new provider for the specified storage + * + * @param string $storage_name + * + * @return string + */ public function new_provider(string $storage_name): string { $state = $this->load_state(); @@ -55,6 +67,14 @@ public function new_provider(string $storage_name): string return $state['storages'][$storage_name]['provider']; } + /** + * Get new definition value for the specified storage + * + * @param string $storage_name + * @param string $definition + * + * @return string + */ public function new_definition_value(string $storage_name, string $definition): string { $state = $this->load_state(); @@ -62,6 +82,11 @@ public function new_definition_value(string $storage_name, string $definition): return $state['storages'][$storage_name]['config'][$definition]; } + /** + * Get the update type + * + * @return update_type + */ public function update_type(): update_type { $state = $this->load_state(); @@ -69,6 +94,11 @@ public function update_type(): update_type return update_type::from($state['update_type']); } + /** + * Get the current storage index + * + * @return int + */ public function storage_index(): int { $state = $this->load_state(); @@ -76,6 +106,13 @@ public function storage_index(): int return $state['storage_index']; } + /** + * Update the storage index + * + * @param int $storage_index + * + * @return void + */ public function set_storage_index(int $storage_index): void { $state = $this->load_state(); @@ -85,6 +122,11 @@ public function set_storage_index(int $storage_index): void $this->save_state($state); } + /** + * Get the current remove storage index + * + * @return int + */ public function remove_storage_index(): int { $state = $this->load_state(); @@ -92,6 +134,13 @@ public function remove_storage_index(): int return $state['remove_storage_index']; } + /** + * Update the remove storage index + * + * @param int $storage_index + * + * @return void + */ public function set_remove_storage_index(int $storage_index): void { $state = $this->load_state(); @@ -101,6 +150,11 @@ public function set_remove_storage_index(int $storage_index): void $this->save_state($state); } + /** + * Get the file index + * + * @return int + */ public function file_index(): int { $state = $this->load_state(); @@ -108,6 +162,12 @@ public function file_index(): int return $state['file_index']; } + /** + * Set the file index + * + * @param int $file_index + * @return void + */ public function set_file_index(int $file_index): void { $state = $this->load_state(); @@ -117,6 +177,11 @@ public function set_file_index(int $file_index): void $this->save_state($state); } + /** + * Get the storage names to be updated + * + * @return array + */ public function storages(): array { $state = $this->load_state(); @@ -178,7 +243,7 @@ public function init(update_type $update_type, array $modified_storages, request */ public function clear_state(): void { - $this->save_state([]); + $this->save_state(); } /** @@ -210,5 +275,4 @@ private function save_state(array $state = []): void { $this->config_text->set('storage_update_state', json_encode($state, JSON_THROW_ON_ERROR)); } - } From ca918f893e135b36f226a79e07db0dd36bb277d4 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 6 Jun 2024 19:37:36 -0700 Subject: [PATCH 0226/1214] [ticket/17333] Suggested code improvements PHPBB-17333 Signed-off-by: Matt Friedman --- phpBB/includes/acp/acp_board.php | 4 ++-- phpBB/includes/functions.php | 8 +++----- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/language/en/acp/board.php | 6 +++--- .../phpbb/db/migration/data/v400/add_webpush_options.php | 6 +++--- phpBB/phpbb/notification/method/webpush.php | 2 +- tests/functional/notification_webpush_test.php | 4 ++-- 7 files changed, 15 insertions(+), 17 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 53faa4bc7de..a7b31cfe202 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -494,8 +494,8 @@ function main($id, $mode) 'webpush_enable' => ['lang' => 'WEBPUSH_ENABLE', 'validate' => 'bool', 'type' => 'custom', 'method' => 'webpush_enable', 'explain' => true], 'webpush_vapid_public' => ['lang' => 'WEBPUSH_VAPID_PUBLIC', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true], 'webpush_vapid_private' => ['lang' => 'WEBPUSH_VAPID_PRIVATE', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true], - 'webpush_method_enables' => ['lang' => 'WEBPUSH_METHOD_ENABLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], - 'webpush_dropdown_subscribe'=> ['lang' => 'WEBPUSH_DROPDOWN_SUBSCRIBE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], + 'webpush_method_default_enable' => ['lang' => 'WEBPUSH_METHOD_DEFAULT_ENABLE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], + 'webpush_dropdown_subscribe' => ['lang' => 'WEBPUSH_DROPDOWN_SUBSCRIBE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true], 'legend3' => 'ACP_SUBMIT_CHANGES', ], diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index da22c4739d7..355a3342bd8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3874,8 +3874,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = } // Assign web push template vars globally (if not done already by ucp_notifications) for the dropdown subscribe button - if ($config['webpush_enable'] - && $config['webpush_dropdown_subscribe'] + if ($config['webpush_enable'] && $config['webpush_dropdown_subscribe'] && $template->retrieve_var('NOTIFICATIONS_WEBPUSH_ENABLE') === null) { $methods = $phpbb_notifications->get_subscription_methods(); @@ -3883,9 +3882,8 @@ function page_header($page_title = '', $display_online_list = false, $item_id = if ($webpush) { - $formHelper = $phpbb_container->get('form_helper'); - $template_ary = $webpush['method']->get_ucp_template_data($controller_helper, $formHelper); - $template->assign_vars($template_ary); + $form_helper = $phpbb_container->get('form_helper'); + $template->assign_vars($webpush['method']->get_ucp_template_data($controller_helper, $form_helper)); } } } diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7756586c706..ba8f654a908 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -329,7 +329,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('storage\backup\con INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_enable', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_public', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_vapid_private', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_enables', '1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_method_default_enable', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('webpush_dropdown_subscribe', '1'); INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('cache_last_gc', '0', 1); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 3353a360e8a..3228db126b5 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -590,10 +590,10 @@ 'WEBPUSH_VAPID_PUBLIC_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) public key is shared to authenticate push messages from your site.
          Caution: Modifying the VAPID public key will automatically render all Web Push subscriptions invalid.', 'WEBPUSH_VAPID_PRIVATE' => 'Server identification private key', 'WEBPUSH_VAPID_PRIVATE_EXPLAIN' => 'The Voluntary Application Server Identification (VAPID) private key is used to generate authenticated push messages dispatched from your site. The VAPID private key must form a valid public-private key pair alongside the VAPID public key.
          Caution: Modifying the VAPID private key will automatically render all Web Push subscriptions invalid.', - 'WEBPUSH_METHOD_ENABLES' => 'Enable all user-based web push notification options by default', - 'WEBPUSH_METHOD_ENABLES_EXPLAIN'=> 'When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. Users only need to visit the UCP Notification settings to disable any unwanted notifications.

          If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notification options they wish to receive.', + 'WEBPUSH_METHOD_DEFAULT_ENABLE' => 'Enable all user-based web push notification options by default', + 'WEBPUSH_METHOD_DEFAULT_ENABLE_EXPLAIN' => 'When this setting is enabled, users who subscribe and allow browser notifications will start receiving them automatically. Users only need to visit the UCP Notification settings to disable any unwanted notifications.

          If this setting is disabled, users will not receive any notifications, even if they have subscribed, until they visit the UCP Notification settings to enable the specific notification options they wish to receive.', 'WEBPUSH_DROPDOWN_SUBSCRIBE' => 'Show “Subscribe” button in notification dropdown', - 'WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN'=> 'Display a “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from anywhere in the forum.', + 'WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN' => 'Display a “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from anywhere in the forum.', ]); // Jabber settings diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php index 1a1727b2568..751ab9e5f41 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_options.php @@ -26,13 +26,13 @@ public static function depends_on(): array public function effectively_installed(): bool { - return $this->config->offsetExists('webpush_method_enables') || $this->config->offsetExists('webpush_dropdown_subscribe'); + return $this->config->offsetExists('webpush_method_default_enable') || $this->config->offsetExists('webpush_dropdown_subscribe'); } public function update_data(): array { return [ - ['config.add', ['webpush_method_enables', true]], + ['config.add', ['webpush_method_default_enable', true]], ['config.add', ['webpush_dropdown_subscribe', true]], ]; } @@ -40,7 +40,7 @@ public function update_data(): array public function revert_data(): array { return [ - ['config.remove', ['webpush_method_enables']], + ['config.remove', ['webpush_method_default_enable']], ['config.remove', ['webpush_dropdown_subscribe']], ]; } diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index a823aed6a07..902880104d7 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -96,7 +96,7 @@ public function is_available(type_interface $notification_type = null): bool */ public function is_enabled_by_default() { - return (bool) $this->config['webpush_method_enables']; + return (bool) $this->config['webpush_method_default_enable']; } /** diff --git a/tests/functional/notification_webpush_test.php b/tests/functional/notification_webpush_test.php index a07e0a89486..61478cec986 100644 --- a/tests/functional/notification_webpush_test.php +++ b/tests/functional/notification_webpush_test.php @@ -33,7 +33,7 @@ public function test_acp_module() 'config[webpush_enable]' => 1, 'config[webpush_vapid_public]' => 'BDnYSJHVZBxq834LqDGr893IfazEez7q-jYH2QBNlT0ji2C9UwGosiqz8Dp_ZN23lqAngBZyRjXVWF4ZLA8X2zI', 'config[webpush_vapid_private]' => 'IE5OYlmfWsMbBU1lzvr0bxrxVAXIteSkAnwGlZIhmRk', - 'config[webpush_method_enables]' => 1, + 'config[webpush_method_default_enable]' => 1, 'config[webpush_dropdown_subscribe]' => 1, ]; $form = $crawler->selectButton('submit')->form($form_data); @@ -74,7 +74,7 @@ public function test_ucp_module() $this->assert_checkbox_is_checked($wp_list, 'notification.type.report_pm_closed_notification.method.webpush'); $this->assert_checkbox_is_checked($wp_list, 'notification.type.report_post_closed_notification.method.webpush'); - $this->set_acp_option('webpush_method_enables', 0); + $this->set_acp_option('webpush_method_default_enable', 0); $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); From ec34f72a3b6293ba7f720b343cabd4e7e3380dab Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Jun 2024 22:16:25 -0700 Subject: [PATCH 0227/1214] [ticket/17336] Skip extension package aliases in dev stabilities PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 28aaa4171b9..1d3e6c84846 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -396,6 +396,11 @@ protected function do_get_available_packages($type) /** @var CompletePackage $version */ foreach ($versions as $version) { + if (strpos($version->getVersion(), '9999999') === 0) + { + continue; + } + if (!$highest_version || version_compare($version->getVersion(), $highest_version->getVersion(), '>')) { $highest_version = $version; From c2d91650bd5e8e7f9e2ba005e47934292faaafb0 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 11 Jun 2024 16:08:39 +0700 Subject: [PATCH 0228/1214] [ticket/17337] Fix mysqli driver is missing transaction begin statement PHPBB-17337 --- phpBB/phpbb/db/driver/mysqli.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index e474b2584e1..6182801da60 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -155,7 +155,9 @@ function _sql_transaction($status = 'begin') switch ($status) { case 'begin': - return @mysqli_autocommit($this->db_connect_id, false); + @mysqli_autocommit($this->db_connect_id, false); + $result = @mysqli_begin_transaction($this->db_connect_id); + return $result; break; case 'commit': From d8aa3f05e5c0754241fcdcc19da35fa1a6b2c852 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 11 Jun 2024 07:04:01 -0700 Subject: [PATCH 0229/1214] [ticket/17336] Correctly handle aliased packages PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 1d3e6c84846..68b7f2e5200 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -22,7 +22,9 @@ use Composer\Json\JsonFile; use Composer\Json\JsonValidationException; use Composer\Package\BasePackage; +use Composer\Package\CompleteAliasPackage; use Composer\Package\CompletePackage; +use Composer\Package\Version\VersionParser; use Composer\PartialComposer; use Composer\Repository\ComposerRepository; use Composer\Semver\Constraint\ConstraintInterface; @@ -390,23 +392,25 @@ protected function do_get_available_packages($type) foreach ($compatible_packages as $name => $versions) { // Determine the highest version of the package - /** @var CompletePackage $highest_version */ + /** @var CompletePackage|CompleteAliasPackage $highest_version */ $highest_version = null; - /** @var CompletePackage $version */ + /** @var CompletePackage|CompleteAliasPackage $version */ foreach ($versions as $version) { - if (strpos($version->getVersion(), '9999999') === 0) - { - continue; - } - if (!$highest_version || version_compare($version->getVersion(), $highest_version->getVersion(), '>')) { $highest_version = $version; } } + // If highest version is DEFAULT_BRANCH_ALIAS (9999999-dev), then it's a non-numeric dev branch handled by + // an Alias, so we need to get the actual package being aliased in order to show the true non-numeric version. + if ($highest_version->getVersion() === VersionParser::DEFAULT_BRANCH_ALIAS) + { + $highest_version = $highest_version->getAliasOf(); + } + // Generates the entry $available[$name] = []; $available[$name]['name'] = $highest_version->getPrettyName(); From f98f2c5896fb4594e20d4f0ee77988fddfd6319c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 11 Jun 2024 20:12:01 +0200 Subject: [PATCH 0230/1214] [ticket/17301] Ensure reading invalid cache files is aborted PHPBB-17301 --- phpBB/phpbb/cache/driver/file.php | 40 +++++++-- tests/cache/file_driver_test.php | 140 +++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 10 deletions(-) diff --git a/phpBB/phpbb/cache/driver/file.php b/phpBB/phpbb/cache/driver/file.php index a07b9a97010..768e314b182 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -330,6 +330,27 @@ function sql_save(\phpbb\db\driver\driver_interface $db, $query, $query_result, return $query_result; } + /** + * Cleanup when loading invalid data global file + * + * @param string $file Filename + * @param resource $handle + * + * @return void + */ + private function cleanup_invalid_data_global(string $file, $handle): void + { + if (is_resource($handle)) + { + fclose($handle); + } + + $this->vars = $this->var_expires = []; + $this->is_modified = false; + + $this->remove_file($file); + } + /** * Read cached data from a specified file * @@ -372,14 +393,7 @@ function _read($filename) if (!is_numeric($bytes) || ($bytes = (int) $bytes) === 0) { - // We cannot process the file without a valid number of bytes - // so we discard it - fclose($handle); - - $this->vars = $this->var_expires = array(); - $this->is_modified = false; - - $this->remove_file($file); + $this->cleanup_invalid_data_global($file, $handle); return false; } @@ -392,9 +406,17 @@ function _read($filename) } $var_name = substr(fgets($handle), 0, -1); + $data_length = $bytes - strlen($var_name); + + if ($data_length <= 0) + { + $this->cleanup_invalid_data_global($file, $handle); + + return false; + } // Read the length of bytes that consists of data. - $data = fread($handle, $bytes - strlen($var_name)); + $data = fread($handle, $data_length); $data = @unserialize($data); // Don't use the data if it was invalid diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index 10c9aec1824..cf36cda2bba 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -17,6 +17,9 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case { private $cache_dir; + /** @var \phpbb\cache\driver\file */ + private $cache_file; + public function getDataSet() { return $this->createXMLDataSet(__DIR__ . '/fixtures/config.xml'); @@ -36,7 +39,8 @@ protected function setUp(): void } $this->create_cache_dir(); - $this->driver = new \phpbb\cache\driver\file($this->cache_dir); + $this->cache_file = new \phpbb\cache\driver\file($this->cache_dir); + $this->driver = $this->cache_file; } protected function tearDown(): void @@ -49,6 +53,140 @@ protected function tearDown(): void parent::tearDown(); } + public function test_read_not_readable() + { + global $phpEx; + + // Create file that is not readable + $this->assertTrue($this->cache_file->_write('unreadable', 'foo', time() + 86400)); + + $filename = "{$this->cache_dir}unreadable.$phpEx"; + @chmod($filename, 0000); + $this->assertFalse($this->cache_file->_read('unreadable')); + @chmod($filename, 0600); + $this->assertNotFalse($this->cache_file->_read('unreadable')); + } + + public function test_read_data_global_invalid() + { + global $phpEx; + + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setAccessible(true); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setAccessible(true); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + $filename = "{$this->cache_dir}data_global.$phpEx"; + $cache_data = file_get_contents($filename); + // Force negative read when retrieving data_global + $cache_data = str_replace("\n13\n", "\n1\n", $cache_data); + file_put_contents($filename, $cache_data); + + $this->assertFalse($this->cache_file->_read('data_global')); + } + + public function test_read_data_global_zero_bytes() + { + global $phpEx; + + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setAccessible(true); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setAccessible(true); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + $filename = "{$this->cache_dir}data_global.$phpEx"; + $cache_data = file_get_contents($filename); + // Force negative read when retrieving data_global + $cache_data = str_replace("\n13\n", "\n0\n", $cache_data); + file_put_contents($filename, $cache_data); + + $this->assertFalse($this->cache_file->_read('data_global')); + } + + public function test_read_data_global_hex_bytes() + { + global $phpEx; + + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setAccessible(true); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setAccessible(true); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + $filename = "{$this->cache_dir}data_global.$phpEx"; + $cache_data = file_get_contents($filename); + // Force negative read when retrieving data_global + $cache_data = str_replace("\n13\n", "\nA\n", $cache_data); + file_put_contents($filename, $cache_data); + + $this->assertFalse($this->cache_file->_read('data_global')); + } + + public function test_read_data_global_expired() + { + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setAccessible(true); + $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setAccessible(true); + $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() - 86400]); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + + // Clear data + $reflectionCacheVars->setValue($this->cache_file, []); + $reflectionCacheVarExpires->setValue($this->cache_file, []); + + $this->assertTrue($this->cache_file->_read('data_global')); + + // Check data, should be empty + $this->assertEquals([], $reflectionCacheVars->getValue($this->cache_file)); + } + + public function test_read_data_global() + { + $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); + $reflectionCacheVars->setAccessible(true); + $expectedVars = ['foo' => 'bar']; + $reflectionCacheVars->setValue($this->cache_file, $expectedVars); + + $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); + $reflectionCacheVarExpires->setAccessible(true); + $expectedVarExpires = ['foo' => time() + 86400]; + $reflectionCacheVarExpires->setValue($this->cache_file, $expectedVarExpires); + + // Create file in invalid format + $this->assertTrue($this->cache_file->_write('data_global')); + + // Clear data + $reflectionCacheVars->setValue($this->cache_file, []); + $reflectionCacheVarExpires->setValue($this->cache_file, []); + $this->assertEquals([], $reflectionCacheVars->getValue($this->cache_file)); + $this->assertEquals([], $reflectionCacheVarExpires->getValue($this->cache_file)); + + $this->assertTrue($this->cache_file->_read('data_global')); + + // Check data, should be empty + $this->assertEquals($expectedVars, $reflectionCacheVars->getValue($this->cache_file)); + $this->assertEquals($expectedVarExpires, $reflectionCacheVarExpires->getValue($this->cache_file)); + } + private function create_cache_dir() { $this->get_test_case_helpers()->makedirs($this->cache_dir); From 9e15802805d356b02834348d74e7f65b121663b7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 11 Jun 2024 20:29:23 +0200 Subject: [PATCH 0231/1214] [ticket/17301] Do not test unreadable files on windows PHPBB-17301 --- tests/cache/file_driver_test.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index cf36cda2bba..56a1b28073e 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -55,6 +55,11 @@ protected function tearDown(): void public function test_read_not_readable() { + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') + { + $this->markTestSkipped('Unable to test unreadable files on Windows'); + } + global $phpEx; // Create file that is not readable From 5229813c4761830f1c7ff067f55d860c68655bbb Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 11 Jun 2024 10:57:05 -0700 Subject: [PATCH 0232/1214] [ticket/17336] Optimize version sorting PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 68b7f2e5200..3c59fc552dc 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -24,7 +24,6 @@ use Composer\Package\BasePackage; use Composer\Package\CompleteAliasPackage; use Composer\Package\CompletePackage; -use Composer\Package\Version\VersionParser; use Composer\PartialComposer; use Composer\Repository\ComposerRepository; use Composer\Semver\Constraint\ConstraintInterface; @@ -395,20 +394,23 @@ protected function do_get_available_packages($type) /** @var CompletePackage|CompleteAliasPackage $highest_version */ $highest_version = null; - /** @var CompletePackage|CompleteAliasPackage $version */ - foreach ($versions as $version) + // Sort the versions array in descending order + usort($versions, function ($a, $b) { - if (!$highest_version || version_compare($version->getVersion(), $highest_version->getVersion(), '>')) - { - $highest_version = $version; - } - } + return version_compare($b->getVersion(), $a->getVersion()); + }); - // If highest version is DEFAULT_BRANCH_ALIAS (9999999-dev), then it's a non-numeric dev branch handled by - // an Alias, so we need to get the actual package being aliased in order to show the true non-numeric version. - if ($highest_version->getVersion() === VersionParser::DEFAULT_BRANCH_ALIAS) + // The first element in the sorted array is the highest version + if (!empty($versions)) { - $highest_version = $highest_version->getAliasOf(); + $highest_version = $versions[0]; + + // If highest version is a non-numeric dev branch, it's an instance of CompleteAliasPackage, + // so we need to get the package being aliased in order to show the true non-numeric version. + if ($highest_version instanceof CompleteAliasPackage) + { + $highest_version = $highest_version->getAliasOf(); + } } // Generates the entry From 0a20edf6b450c1019a97ac8fd64ee7256f2b9e6f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 11 Jun 2024 10:59:29 -0700 Subject: [PATCH 0233/1214] [ticket/17336] Fix usage of a leaked loop-scoped variable PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 3c59fc552dc..bd6e6c3168e 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -420,7 +420,7 @@ protected function do_get_available_packages($type) $available[$name]['composer_name'] = $highest_version->getName(); $available[$name]['version'] = $highest_version->getPrettyVersion(); - if ($version instanceof CompletePackage) + if ($highest_version instanceof CompletePackage) { $available[$name]['description'] = $highest_version->getDescription(); $available[$name]['url'] = $highest_version->getHomepage(); From b08023f231ccd2ddb577f370b5cad53b74047d68 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 12 Jun 2024 06:10:23 -0700 Subject: [PATCH 0234/1214] [ticket/17336] Check extension compatibility correctly PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 36 +++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index bd6e6c3168e..a18e49d24d0 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -24,9 +24,11 @@ use Composer\Package\BasePackage; use Composer\Package\CompleteAliasPackage; use Composer\Package\CompletePackage; +use Composer\Package\PackageInterface; use Composer\PartialComposer; use Composer\Repository\ComposerRepository; use Composer\Semver\Constraint\ConstraintInterface; +use Composer\Semver\VersionParser; use Composer\Util\HttpDownloader; use phpbb\composer\io\null_io; use phpbb\config\config; @@ -353,7 +355,7 @@ protected function do_get_available_packages($type) $downloader = new HttpDownloader($io, $composer_config); $json = $downloader->get($url)->getBody(); - /** @var \Composer\Package\PackageInterface $package */ + /** @var PackageInterface $package */ foreach (JsonFile::parseJson($json, $url)['packageNames'] as $package) { $versions = $repository->findPackages($package); @@ -365,7 +367,7 @@ protected function do_get_available_packages($type) { // Pre-filter repo packages by their type $packages = []; - /** @var \Composer\Package\PackageInterface $package */ + /** @var PackageInterface $package */ foreach ($repository->getPackages() as $package) { if ($package->getType() === $type) @@ -464,11 +466,11 @@ public function check_requirements() /** * Updates $compatible_packages with the versions of $versions compatibles with the $core_constraint * - * @param array $compatible_packages List of compatibles versions - * @param ConstraintInterface $core_constraint Constraint against the phpBB version + * @param array $compatible_packages List of compatibles versions + * @param ConstraintInterface $core_constraint Constraint against the phpBB version * @param string $core_stability Core stability - * @param string $package_name Considered package - * @param array $versions List of available versions + * @param string $package_name Considered package + * @param array $versions List of available versions * * @return array */ @@ -476,21 +478,35 @@ private function get_compatible_versions(array $compatible_packages, ConstraintI { $core_stability_value = BasePackage::$stabilities[$core_stability]; - /** @var \Composer\Package\PackageInterface $version */ + /** @var PackageInterface $version */ foreach ($versions as $version) { try { + // Check stability first to avoid unnecessary operations if (BasePackage::$stabilities[$version->getStability()] > $core_stability_value) { continue; } - if (array_key_exists('phpbb/phpbb', $version->getRequires())) + $requires = $version->getRequires(); + $extra = $version->getExtra(); + + // Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'requires' + if (isset($requires['phpbb/phpbb'])) { - /** @var ConstraintInterface $package_constraint */ - $package_constraint = $version->getRequires()['phpbb/phpbb']->getConstraint(); + $package_constraint = $requires['phpbb/phpbb']->getConstraint(); + if (!$package_constraint->matches($core_constraint)) + { + continue; + } + } + // Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'soft-require' + if (isset($extra['soft-require']['phpbb/phpbb'])) + { + $version_parser = new VersionParser(); + $package_constraint = $version_parser->parseConstraints($extra['soft-require']['phpbb/phpbb']); if (!$package_constraint->matches($core_constraint)) { continue; From 9a53df6f73a237e35132e5b7a6bef3afe4fd681b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 12 Jun 2024 06:42:03 -0700 Subject: [PATCH 0235/1214] [ticket/17336] Move object instantiation outside of the loop PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index a18e49d24d0..a54e315ca0f 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -476,6 +476,8 @@ public function check_requirements() */ private function get_compatible_versions(array $compatible_packages, ConstraintInterface $core_constraint, $core_stability, $package_name, array $versions) { + $version_parser = new VersionParser(); + $core_stability_value = BasePackage::$stabilities[$core_stability]; /** @var PackageInterface $version */ @@ -505,7 +507,6 @@ private function get_compatible_versions(array $compatible_packages, ConstraintI // Check for compatibility with phpBB if 'phpbb/phpbb' exists in 'soft-require' if (isset($extra['soft-require']['phpbb/phpbb'])) { - $version_parser = new VersionParser(); $package_constraint = $version_parser->parseConstraints($extra['soft-require']['phpbb/phpbb']); if (!$package_constraint->matches($core_constraint)) { From 3690d307266b492a3bd4eb6c542ba5a1252ec21f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 12 Jun 2024 06:42:38 -0700 Subject: [PATCH 0236/1214] [ticket/17336] Also check for compatible extension by PHP version PHPBB-17336 Signed-off-by: Matt Friedman --- phpBB/phpbb/composer/installer.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index a54e315ca0f..cd7456baf64 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -514,6 +514,17 @@ private function get_compatible_versions(array $compatible_packages, ConstraintI } } + // Check for compatibility with php if 'php' exists in 'requires' + if (isset($requires['php'])) + { + $php_constraint = $version_parser->parseConstraints(PHP_VERSION); + $package_constraint = $requires['php']->getConstraint(); + if (!$package_constraint->matches($php_constraint)) + { + continue; + } + } + $compatible_packages[$package_name][] = $version; } catch (\Exception $e) From d66d4a0c6ab5d9ac4d4dd1a37a90d8b3ea2e9889 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 12 Jun 2024 22:16:41 +0200 Subject: [PATCH 0237/1214] [ticket/17339] Support receiving push notifications if not logged in PHPBB-17339 --- .../migration/data/v400/add_webpush_token.php | 53 ++++++++++++ phpBB/phpbb/notification/method/webpush.php | 8 ++ phpBB/phpbb/ucp/controller/webpush.php | 80 +++++++++++++++++-- phpBB/styles/all/js/push_worker.js.twig | 8 +- 4 files changed, 143 insertions(+), 6 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/add_webpush_token.php diff --git a/phpBB/phpbb/db/migration/data/v400/add_webpush_token.php b/phpBB/phpbb/db/migration/data/v400/add_webpush_token.php new file mode 100644 index 00000000000..f87dadf9e79 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/add_webpush_token.php @@ -0,0 +1,53 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class add_webpush_token extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\add_webpush', + ]; + } + + public function effectively_installed(): bool + { + return $this->db_tools->sql_column_exists($this->table_prefix . 'notification_push', 'push_token'); + } + + public function update_schema(): array + { + return [ + 'add_columns' => [ + $this->table_prefix . 'notification_push' => [ + 'push_token' => ['VCHAR', ''], + ], + ], + ]; + } + + public function revert_schema(): array + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'notification_push' => [ + 'push_token', + ], + ], + ]; + } +} diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 4d2d18bdc65..700503f97d5 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -51,6 +51,9 @@ class webpush extends messenger_base implements extended_method_interface /** @var int Fallback size for padding if endpoint is mozilla, see https://github.com/web-push-libs/web-push-php/issues/108#issuecomment-2133477054 */ const MOZILLA_FALLBACK_PADDING = 2820; + /** @var array Map for storing push token between db insertion and sending of notifications */ + private array $push_token_map = []; + /** * Notification Method Web Push constructor * @@ -145,9 +148,11 @@ public function notify() 'avatar' => $notification->get_avatar(), ]), 'notification_time' => time(), + 'push_token' => hash('sha256', random_bytes(32)) ]; $data = self::clean_data($data); $insert_buffer->insert($data); + $this->push_token_map[$notification->notification_type_id][$notification->item_id] = $data['push_token']; } $insert_buffer->flush(); @@ -221,7 +226,9 @@ protected function notify_using_webpush(): void $data = [ 'item_id' => $notification->item_id, 'type_id' => $notification->notification_type_id, + 'user_id' => $notification->user_id, 'version' => $this->config['assets_version'], + 'token' => hash('sha256', $user['user_form_salt'] . $this->push_token_map[$notification->notification_type_id][$notification->item_id]), ]; $json_data = json_encode($data); @@ -337,6 +344,7 @@ public static function clean_data(array $data): array 'item_parent_id' => null, 'user_id' => null, 'push_data' => null, + 'push_token' => null, 'notification_time' => null, ]; diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index b60fa437b3b..15e54956fb2 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -100,10 +100,37 @@ public function __construct(config $config, controller_helper $controller_helper * @return JsonResponse */ public function notification(): JsonResponse + { + if (!$this->request->is_ajax() || $this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE) + { + throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); + } + + if ($this->user->id() !== ANONYMOUS) + { + $notification_data = $this->get_user_notifications(); + } + else + { + $notification_data = $this->get_anonymous_notifications(); + } + + // Decode and return data if everything is fine + $data = json_decode($notification_data, true); + $data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : ''; + + return new JsonResponse($data); + } + + /** + * Get notification data for logged in user + * + * @return string Notification data + */ + private function get_user_notifications(): string { // Subscribe should only be available for logged-in "normal" users - if (!$this->request->is_ajax() || $this->user->id() == ANONYMOUS || $this->user->data['is_bot'] - || $this->user->data['user_type'] == USER_IGNORE || $this->user->data['user_type'] == USER_INACTIVE) + if ($this->user->data['user_type'] == USER_IGNORE) { throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); } @@ -119,10 +146,53 @@ public function notification(): JsonResponse $result = $this->db->sql_query($sql); $notification_data = $this->db->sql_fetchfield('push_data'); $this->db->sql_freeresult($result); - $data = json_decode($notification_data, true); - $data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : ''; - return new JsonResponse($data); + return $notification_data; + } + + /** + * Get notification data for not logged in user via token + * + * @return string + */ + private function get_anonymous_notifications(): string + { + $token = $this->request->variable('token', ''); + + if ($token) + { + $item_id = $this->request->variable('item_id', 0); + $type_id = $this->request->variable('type_id', 0); + $user_id = $this->request->variable('user_id', 0); + + $sql = 'SELECT push_data, push_token + FROM ' . $this->notification_webpush_table . ' + WHERE user_id = ' . (int) $user_id . ' + AND notification_type_id = ' . (int) $type_id . ' + AND item_id = ' . (int) $item_id; + $result = $this->db->sql_query($sql); + $notification_row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $notification_data = $notification_row['push_data']; + $push_token = $notification_row['push_token']; + + // Check if passed push token is valid + $sql = 'SELECT user_form_salt + FROM ' . USERS_TABLE . ' + WHERE user_id = ' . (int) $user_id; + $result = $this->db->sql_query($sql); + $user_form_token = $this->db->sql_fetchfield('user_form_salt'); + $this->db->sql_freeresult($result); + + $expected_push_token = hash('sha256', $user_form_token . $push_token); + if ($expected_push_token === $token) + { + return $notification_data; + } + } + + throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); } /** diff --git a/phpBB/styles/all/js/push_worker.js.twig b/phpBB/styles/all/js/push_worker.js.twig index f2807cb43ab..cf0ca568ac2 100644 --- a/phpBB/styles/all/js/push_worker.js.twig +++ b/phpBB/styles/all/js/push_worker.js.twig @@ -23,12 +23,16 @@ self.addEventListener('push', event => { let itemId = 0; let typeId = 0; - let notificationVersion = 5; + let userId = 0; + let notificationVersion = 0; + let pushToken = ''; try { const notificationData = event.data.json(); itemId = notificationData.item_id; typeId = notificationData.type_id; + userId = notificationData.user_id; notificationVersion = parseInt(notificationData.version, 10); + pushToken = notificationData.token; } catch { self.registration.showNotification(event.data.text()); return; @@ -45,6 +49,8 @@ self.addEventListener('push', event => { const formData = new FormData(); formData.append('item_id', itemId.toString(10)); formData.append('type_id', typeId.toString(10)); + formData.append('user_id', userId.toString(10)); + formData.append('token', pushToken); fetch(getNotificationUrl, { method: 'POST', From e125f1f7094a8cd9b14e380d43e713721b6684e5 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 13 Jun 2024 13:27:03 +0700 Subject: [PATCH 0238/1214] [ticket/17338] Prefer user_last_active to display user last activity info PHPBB-17338 --- phpBB/includes/acp/acp_users.php | 2 +- phpBB/includes/functions_display.php | 2 +- phpBB/memberlist.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 611e72a9b80..80089c2717d 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1088,7 +1088,7 @@ function main($id, $mode) $s_action_options .= ''; } - $last_active = (!empty($user_row['session_time'])) ? $user_row['session_time'] : $user_row['user_last_active']; + $last_active = $user_row['user_last_active'] ?: ($user_row['session_time'] ?? 0); $inactive_reason = ''; if ($user_row['user_type'] == USER_INACTIVE) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index d995676e8fb..26f2d43cb5c 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1603,7 +1603,7 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl if ($data['user_allow_viewonline'] || $auth->acl_get('u_viewonline')) { - $last_active = (!empty($data['session_time'])) ? $data['session_time'] : $data['user_last_active']; + $last_active = $data['user_last_active'] ?: ($data['session_time'] ?? 0); } else { diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index dbdfe80618e..c846bdde055 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1722,7 +1722,7 @@ { $row['session_time'] = $session_ary[$row['user_id']]['session_time'] ?? 0; $row['session_viewonline'] = $session_ary[$row['user_id']]['session_viewonline'] ?? 0; - $row['last_visit'] = (!empty($row['session_time'])) ? $row['session_time'] : $row['user_last_active']; + $row['last_visit'] = $row['user_last_active'] ?: $row['session_time']; $id_cache[$row['user_id']] = $row; } From db9874546b95f17254ca944b050f4ea595d688b2 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 14 Jun 2024 10:28:25 +0700 Subject: [PATCH 0239/1214] [ticket/17338] Add user_last_active to session_gc() PHPBB-17338 --- phpBB/phpbb/session.php | 10 ++++++---- tests/session/fixtures/sessions_garbage.xml | 3 +++ tests/session/garbage_collection_test.php | 4 ++++ tests/test_framework/phpbb_session_test_case.php | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index af39ecf2fa0..46e82d03baf 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -987,7 +987,7 @@ function session_gc() // For SQLite versions 3.8.3+ which support Common Table Expressions (CTE) $sql = "WITH s3 (session_page, session_user_id, session_time) AS ($sql_select) UPDATE " . USERS_TABLE . ' - SET (user_lastpage, user_lastvisit) = (SELECT session_page, session_time FROM s3 WHERE session_user_id = user_id) + SET (user_lastpage, user_lastvisit, user_last_active) = (SELECT session_page, session_time, session_time FROM s3 WHERE session_user_id = user_id) WHERE EXISTS (SELECT session_user_id FROM s3 WHERE session_user_id = user_id)'; $db->sql_query($sql); @@ -1000,7 +1000,9 @@ function session_gc() while ($row = $db->sql_fetchrow($result)) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "' + SET user_lastvisit = ' . (int) $row['recent_time'] . ', + user_last_active = ' . (int) $row['recent_time'] . ", + user_lastpage = '" . $db->sql_escape($row['session_page']) . "' WHERE user_id = " . (int) $row['session_user_id']; $db->sql_query($sql); } @@ -1010,14 +1012,14 @@ function session_gc() case 'mysqli': $sql = 'UPDATE ' . USERS_TABLE . " u, ($sql_select) s3 - SET u.user_lastvisit = s3.recent_time, u.user_lastpage = s3.session_page + SET u.user_lastvisit = s3.recent_time, u.user_last_active = s3.recent_time, u.user_lastpage = s3.session_page WHERE u.user_id = s3.session_user_id"; $db->sql_query($sql); break; default: $sql = 'UPDATE ' . USERS_TABLE . " - SET user_lastvisit = s3.recent_time, user_lastpage = s3.session_page + SET user_lastvisit = s3.recent_time, user_last_active = s3.recent_time, user_lastpage = s3.session_page FROM ($sql_select) s3 WHERE user_id = s3.session_user_id"; $db->sql_query($sql); diff --git a/tests/session/fixtures/sessions_garbage.xml b/tests/session/fixtures/sessions_garbage.xml index 59a2dc2ebe7..16971428a70 100644 --- a/tests/session/fixtures/sessions_garbage.xml +++ b/tests/session/fixtures/sessions_garbage.xml @@ -7,6 +7,7 @@ user_sig user_lastpage user_lastvisit + user_last_active 4 bar @@ -14,6 +15,7 @@ oldpage_user_bar.php 1400000000 + 1300000999 5 @@ -22,6 +24,7 @@ oldpage_user_foo.php 1400000000 + 1300000998 diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 9080478a285..32c4db3f85d 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -65,11 +65,13 @@ public function test_session_gc() [ 'username_clean' => 'bar', 'user_lastvisit' => 1400000000, + 'user_last_active' => 1300000999, 'user_lastpage' => 'oldpage_user_bar.php', ], [ 'username_clean' => 'foo', 'user_lastvisit' => 1400000000, + 'user_last_active' => 1300000998, 'user_lastpage' => 'oldpage_user_foo.php', ], ], @@ -89,11 +91,13 @@ public function test_session_gc() [ 'username_clean' => 'bar', 'user_lastvisit' => '1500000000', + 'user_last_active' => '1500000000', 'user_lastpage' => 'newpage_user_bar.php', ], [ 'username_clean' => 'foo', 'user_lastvisit' => '1500000000', + 'user_last_active' => '1500000000', 'user_lastpage' => 'newpage_user_foo.php', ], ], diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index deb76d4e5e5..15b5d44eb53 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -50,7 +50,7 @@ protected function setUp(): void protected function check_user_session_data($expected_session_data, $message) { - $sql= 'SELECT username_clean, user_lastvisit, user_lastpage + $sql= 'SELECT username_clean, user_lastvisit, user_last_active, user_lastpage FROM ' . USERS_TABLE . ' ORDER BY user_id'; From e21a8e02cdc21c5e6c70727114eab4006014dedd Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 14 Jun 2024 15:22:20 +0700 Subject: [PATCH 0240/1214] [ticket/17338] Update user_last_active on session removal and login keys reset PHPBB-17338 --- phpBB/phpbb/session.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 46e82d03baf..a1d7df511a5 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -903,7 +903,8 @@ function session_kill($new_session = true) } $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ' + SET user_lastvisit = ' . (int) $this->data['session_time'] . ', + user_last_active = ' . (int) $this->data['session_time'] . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); @@ -1652,7 +1653,9 @@ function reset_login_keys($user_id = false) if ($row) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $row['session_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "' + SET user_lastvisit = ' . (int) $row['session_time'] . ', + user_last_active = ' . (int) $row['session_time'] . ", + user_lastpage = '" . $db->sql_escape($row['session_page']) . "' WHERE user_id = " . (int) $user_id; $db->sql_query($sql); } From df7dae9600f40ec7d4ed08ef86752e296e598006 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Jun 2024 17:02:36 +0200 Subject: [PATCH 0241/1214] [ticket/17340] Update composer to 2.7.7 PHPBB-17340 --- composer.phar | Bin 2975214 -> 2994603 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/composer.phar b/composer.phar index bd5bab8c1f54ef0e61a61108a23af1b1cc87dd0f..15c4a2081c9ec2e651ab7a65ac68349d5f2625ce 100755 GIT binary patch delta 43023 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 From 8bdff227d9e0eac3ff2208beba89b143adb88adc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Jun 2024 17:04:22 +0200 Subject: [PATCH 0242/1214] [ticket/17340] Update composer dependencies PHPBB-17340 --- phpBB/composer.lock | 176 ++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index b52902590d1..17be00b9410 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -3027,16 +3027,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -3044,11 +3044,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -3074,7 +3075,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -3082,7 +3083,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "phar-io/manifest", @@ -3533,24 +3534,24 @@ }, { "name": "phpspec/prophecy", - "version": "v1.18.0", + "version": "v1.19.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c" + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/d4f454f7e1193933f04e6500de3e79191648ed0c", - "reference": "d4f454f7e1193933f04e6500de3e79191648ed0c", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" }, "require-dev": { "phpspec/phpspec": "^6.0 || ^7.0", @@ -3596,9 +3597,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.18.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" }, - "time": "2023-12-07T16:22:33+00:00" + "time": "2024-02-29T11:52:51+00:00" }, { "name": "phpunit/dbunit", @@ -3726,16 +3727,16 @@ }, { "name": "phpunit/php-file-iterator", - "version": "2.0.5", + "version": "2.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5" + "reference": "69deeb8664f611f156a924154985fbd4911eb36b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", - "reference": "42c5ba5220e6904cbfe8b1a1bda7c0cfdc8c12f5", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/69deeb8664f611f156a924154985fbd4911eb36b", + "reference": "69deeb8664f611f156a924154985fbd4911eb36b", "shasum": "" }, "require": { @@ -3774,7 +3775,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.5" + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.6" }, "funding": [ { @@ -3782,7 +3783,7 @@ "type": "github" } ], - "time": "2021-12-02T12:42:26+00:00" + "time": "2024-03-01T13:39:50+00:00" }, { "name": "phpunit/php-text-template", @@ -3831,16 +3832,16 @@ }, { "name": "phpunit/php-timer", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "reference": "a691211e94ff39a34811abd521c31bd5b305b0bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/a691211e94ff39a34811abd521c31bd5b305b0bb", + "reference": "a691211e94ff39a34811abd521c31bd5b305b0bb", "shasum": "" }, "require": { @@ -3878,7 +3879,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" + "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.4" }, "funding": [ { @@ -3886,7 +3887,7 @@ "type": "github" } ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2024-03-01T13:42:41+00:00" }, { "name": "phpunit/php-token-stream", @@ -4038,16 +4039,16 @@ }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", + "reference": "92a1a52e86d34cde6caa54f1b5ffa9fda18e5d54", "shasum": "" }, "require": { @@ -4081,7 +4082,7 @@ "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", "support": { "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.3" }, "funding": [ { @@ -4089,7 +4090,7 @@ "type": "github" } ], - "time": "2020-11-30T08:15:22+00:00" + "time": "2024-03-01T13:45:45+00:00" }, { "name": "sebastian/comparator", @@ -4167,16 +4168,16 @@ }, { "name": "sebastian/diff", - "version": "3.0.4", + "version": "3.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae" + "reference": "98ff311ca519c3aa73ccd3de053bdb377171d7b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/6296a0c086dd0117c1b78b059374d7fcbe7545ae", - "reference": "6296a0c086dd0117c1b78b059374d7fcbe7545ae", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/98ff311ca519c3aa73ccd3de053bdb377171d7b6", + "reference": "98ff311ca519c3aa73ccd3de053bdb377171d7b6", "shasum": "" }, "require": { @@ -4221,7 +4222,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/diff/tree/3.0.6" }, "funding": [ { @@ -4229,20 +4230,20 @@ "type": "github" } ], - "time": "2023-05-07T05:30:20+00:00" + "time": "2024-03-02T06:16:36+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "4.2.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "56932f6049a0482853056ffd617c91ffcc754205" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/56932f6049a0482853056ffd617c91ffcc754205", + "reference": "56932f6049a0482853056ffd617c91ffcc754205", "shasum": "" }, "require": { @@ -4284,7 +4285,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" + "source": "https://github.com/sebastianbergmann/environment/tree/4.2.5" }, "funding": [ { @@ -4292,24 +4293,24 @@ "type": "github" } ], - "time": "2020-11-30T07:53:42+00:00" + "time": "2024-03-01T13:49:59+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.5", + "version": "3.1.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6" + "reference": "1939bc8fd1d39adcfa88c5b35335910869214c56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/73a9676f2833b9a7c36968f9d882589cd75511e6", - "reference": "73a9676f2833b9a7c36968f9d882589cd75511e6", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1939bc8fd1d39adcfa88c5b35335910869214c56", + "reference": "1939bc8fd1d39adcfa88c5b35335910869214c56", "shasum": "" }, "require": { - "php": ">=7.0", + "php": ">=7.2", "sebastian/recursion-context": "^3.0" }, "require-dev": { @@ -4361,7 +4362,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.6" }, "funding": [ { @@ -4369,7 +4370,7 @@ "type": "github" } ], - "time": "2022-09-14T06:00:17+00:00" + "time": "2024-03-02T06:21:38+00:00" }, { "name": "sebastian/global-state", @@ -4428,16 +4429,16 @@ }, { "name": "sebastian/object-enumerator", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "reference": "ac5b293dba925751b808e02923399fb44ff0d541" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/ac5b293dba925751b808e02923399fb44ff0d541", + "reference": "ac5b293dba925751b808e02923399fb44ff0d541", "shasum": "" }, "require": { @@ -4473,7 +4474,7 @@ "homepage": "https://github.com/sebastianbergmann/object-enumerator/", "support": { "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.5" }, "funding": [ { @@ -4481,20 +4482,20 @@ "type": "github" } ], - "time": "2020-11-30T07:40:27+00:00" + "time": "2024-03-01T13:54:02+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "1d439c229e61f244ff1f211e5c99737f90c67def" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/1d439c229e61f244ff1f211e5c99737f90c67def", + "reference": "1d439c229e61f244ff1f211e5c99737f90c67def", "shasum": "" }, "require": { @@ -4528,7 +4529,7 @@ "homepage": "https://github.com/sebastianbergmann/object-reflector/", "support": { "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" + "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.3" }, "funding": [ { @@ -4536,20 +4537,20 @@ "type": "github" } ], - "time": "2020-11-30T07:37:18+00:00" + "time": "2024-03-01T13:56:04+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c", + "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c", "shasum": "" }, "require": { @@ -4591,7 +4592,7 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.2" }, "funding": [ { @@ -4599,20 +4600,20 @@ "type": "github" } ], - "time": "2020-11-30T07:34:24+00:00" + "time": "2024-03-01T14:07:30+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "72a7f7674d053d548003b16ff5a106e7e0e06eee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/72a7f7674d053d548003b16ff5a106e7e0e06eee", + "reference": "72a7f7674d053d548003b16ff5a106e7e0e06eee", "shasum": "" }, "require": { @@ -4642,8 +4643,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.3" }, "funding": [ { @@ -4651,7 +4651,7 @@ "type": "github" } ], - "time": "2020-11-30T07:30:19+00:00" + "time": "2024-03-01T13:59:09+00:00" }, { "name": "sebastian/version", @@ -4702,16 +4702,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.10.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877", + "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877", "shasum": "" }, "require": { @@ -4778,7 +4778,7 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-05-22T21:24:41+00:00" }, { "name": "symfony/browser-kit", @@ -4985,16 +4985,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -5023,7 +5023,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -5031,7 +5031,7 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "webmozart/assert", From df93ffc886cdc85cb20b31a6b7ec5e96cc0042c3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Jun 2024 17:09:55 +0200 Subject: [PATCH 0243/1214] [ticket/17340] Update composer dependencies on master PHPBB-17340 --- phpBB/composer.lock | 939 +++++++++++++++++++++++--------------------- 1 file changed, 485 insertions(+), 454 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 287f56b08ba..f8b8863dd03 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -213,28 +213,28 @@ }, { "name": "composer/ca-bundle", - "version": "1.4.1", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd" + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", - "reference": "3ce240142f6d59b808dd65c1f52f7a1c252e6cfd", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", "shasum": "" }, "require": { "ext-openssl": "*", "ext-pcre": "*", - "php": "^5.3.2 || ^7.0 || ^8.0" + "php": "^7.2 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^0.12.55", + "phpstan/phpstan": "^1.10", "psr/log": "^1.0", "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" + "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { @@ -269,7 +269,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.4.1" + "source": "https://github.com/composer/ca-bundle/tree/1.5.0" }, "funding": [ { @@ -285,20 +285,20 @@ "type": "tidelift" } ], - "time": "2024-02-23T10:16:52+00:00" + "time": "2024-03-15T14:00:32+00:00" }, { "name": "composer/class-map-generator", - "version": "1.1.0", + "version": "1.3.4", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9" + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/953cc4ea32e0c31f2185549c7d216d7921f03da9", - "reference": "953cc4ea32e0c31f2185549c7d216d7921f03da9", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", "shasum": "" }, "require": { @@ -342,7 +342,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.1.0" + "source": "https://github.com/composer/class-map-generator/tree/1.3.4" }, "funding": [ { @@ -358,28 +358,28 @@ "type": "tidelift" } ], - "time": "2023-06-30T13:58:57+00:00" + "time": "2024-06-12T14:13:04+00:00" }, { "name": "composer/composer", - "version": "2.7.1", + "version": "2.7.7", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc" + "reference": "291942978f39435cf904d33739f98d7d4eca7b23" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", - "reference": "aaf6ed5ccd27c23f79a545e351b4d7842a99d0bc", + "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23", + "reference": "291942978f39435cf904d33739f98d7d4eca7b23", "shasum": "" }, "require": { "composer/ca-bundle": "^1.0", - "composer/class-map-generator": "^1.0", + "composer/class-map-generator": "^1.3.3", "composer/metadata-minifier": "^1.0", "composer/pcre": "^2.1 || ^3.1", - "composer/semver": "^3.2.5", + "composer/semver": "^3.3", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", "justinrainbow/json-schema": "^5.2.11", @@ -398,11 +398,11 @@ "symfony/process": "^5.4 || ^6.0 || ^7" }, "require-dev": { - "phpstan/phpstan": "^1.9.3", - "phpstan/phpstan-deprecation-rules": "^1", - "phpstan/phpstan-phpunit": "^1.0", - "phpstan/phpstan-strict-rules": "^1", - "phpstan/phpstan-symfony": "^1.2.10", + "phpstan/phpstan": "^1.11.0", + "phpstan/phpstan-deprecation-rules": "^1.2.0", + "phpstan/phpstan-phpunit": "^1.4.0", + "phpstan/phpstan-strict-rules": "^1.6.0", + "phpstan/phpstan-symfony": "^1.4.0", "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" }, "suggest": { @@ -456,7 +456,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.1" + "source": "https://github.com/composer/composer/tree/2.7.7" }, "funding": [ { @@ -472,7 +472,7 @@ "type": "tidelift" } ], - "time": "2024-02-09T14:26:28+00:00" + "time": "2024-06-10T20:11:12+00:00" }, { "name": "composer/installers", @@ -769,16 +769,16 @@ }, { "name": "composer/pcre", - "version": "3.1.1", + "version": "3.1.4", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9" + "reference": "04229f163664973f68f38f6f73d917799168ef24" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9", - "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9", + "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", + "reference": "04229f163664973f68f38f6f73d917799168ef24", "shasum": "" }, "require": { @@ -820,7 +820,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.1" + "source": "https://github.com/composer/pcre/tree/3.1.4" }, "funding": [ { @@ -836,7 +836,7 @@ "type": "tidelift" } ], - "time": "2023-10-11T07:11:09+00:00" + "time": "2024-05-27T13:40:54+00:00" }, { "name": "composer/semver", @@ -1001,16 +1001,16 @@ }, { "name": "composer/xdebug-handler", - "version": "3.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/composer/xdebug-handler.git", - "reference": "ced299686f41dce890debac69273b47ffe98a40c" + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c", - "reference": "ced299686f41dce890debac69273b47ffe98a40c", + "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef", + "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef", "shasum": "" }, "require": { @@ -1021,7 +1021,7 @@ "require-dev": { "phpstan/phpstan": "^1.0", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^6.0" + "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5" }, "type": "library", "autoload": { @@ -1045,9 +1045,9 @@ "performance" ], "support": { - "irc": "irc://irc.freenode.org/composer", + "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/xdebug-handler/issues", - "source": "https://github.com/composer/xdebug-handler/tree/3.0.3" + "source": "https://github.com/composer/xdebug-handler/tree/3.0.5" }, "funding": [ { @@ -1063,7 +1063,7 @@ "type": "tidelift" } ], - "time": "2022-02-25T21:32:43+00:00" + "time": "2024-05-06T16:37:16+00:00" }, { "name": "doctrine/cache", @@ -1410,16 +1410,16 @@ }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.16", + "version": "v1.0.18", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "ecadbdc9052e4ad08c60c8a02268712e50427f7c" + "reference": "2c8a6cffc3220e99352ad958fe7cf06bf6f7690f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/ecadbdc9052e4ad08c60c8a02268712e50427f7c", - "reference": "ecadbdc9052e4ad08c60c8a02268712e50427f7c", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/2c8a6cffc3220e99352ad958fe7cf06bf6f7690f", + "reference": "2c8a6cffc3220e99352ad958fe7cf06bf6f7690f", "shasum": "" }, "require": { @@ -1476,7 +1476,7 @@ ], "support": { "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.16" + "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.18" }, "funding": [ { @@ -1488,7 +1488,7 @@ "type": "tidelift" } ], - "time": "2023-05-24T07:17:17+00:00" + "time": "2024-03-20T12:50:41+00:00" }, { "name": "google/recaptcha", @@ -1846,12 +1846,12 @@ "version": "v5.2.13", "source": { "type": "git", - "url": "https://github.com/justinrainbow/json-schema.git", + "url": "https://github.com/jsonrainbow/json-schema.git", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/justinrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", "shasum": "" }, @@ -1906,8 +1906,8 @@ "schema" ], "support": { - "issues": "https://github.com/justinrainbow/json-schema/issues", - "source": "https://github.com/justinrainbow/json-schema/tree/v5.2.13" + "issues": "https://github.com/jsonrainbow/json-schema/issues", + "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" }, "time": "2023-09-26T02:20:38+00:00" }, @@ -2103,16 +2103,16 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.6.3", + "version": "v2.7.0", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "58c3f47f650c94ec05a151692652a868995d2938" + "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938", - "reference": "58c3f47f650c94ec05a151692652a868995d2938", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105", + "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105", "shasum": "" }, "require": { @@ -2166,7 +2166,7 @@ "issues": "https://github.com/paragonie/constant_time_encoding/issues", "source": "https://github.com/paragonie/constant_time_encoding" }, - "time": "2022-06-14T06:56:20+00:00" + "time": "2024-05-08T12:18:48+00:00" }, { "name": "paragonie/random_compat", @@ -2220,16 +2220,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v1.20.0", + "version": "v1.21.1", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6" + "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/e592a3e06d1fa0d43988c7c7d9948ca836f644b6", - "reference": "e592a3e06d1fa0d43988c7c7d9948ca836f644b6", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37", + "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37", "shasum": "" }, "require": { @@ -2300,9 +2300,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/v1.20.0" + "source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1" }, - "time": "2023-04-30T00:54:53+00:00" + "time": "2024-04-22T22:05:04+00:00" }, { "name": "psr/cache", @@ -2558,20 +2558,20 @@ }, { "name": "psr/http-factory", - "version": "1.0.2", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/php-fig/http-factory.git", - "reference": "e616d01114759c4c489f93b099585439f795fe35" + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35", - "reference": "e616d01114759c4c489f93b099585439f795fe35", + "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a", + "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a", "shasum": "" }, "require": { - "php": ">=7.0.0", + "php": ">=7.1", "psr/http-message": "^1.0 || ^2.0" }, "type": "library", @@ -2595,7 +2595,7 @@ "homepage": "https://www.php-fig.org/" } ], - "description": "Common interfaces for PSR-7 HTTP message factories", + "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories", "keywords": [ "factory", "http", @@ -2607,9 +2607,9 @@ "response" ], "support": { - "source": "https://github.com/php-fig/http-factory/tree/1.0.2" + "source": "https://github.com/php-fig/http-factory" }, - "time": "2023-04-10T20:10:41+00:00" + "time": "2024-04-15T12:06:14+00:00" }, { "name": "psr/http-message", @@ -2760,16 +2760,16 @@ }, { "name": "react/promise", - "version": "v3.1.0", + "version": "v3.2.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c" + "reference": "8a164643313c71354582dc850b42b33fa12a4b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", - "reference": "e563d55d1641de1dea9f5e84f3cccc66d2bfe02c", + "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", + "reference": "8a164643313c71354582dc850b42b33fa12a4b63", "shasum": "" }, "require": { @@ -2821,7 +2821,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v3.1.0" + "source": "https://github.com/reactphp/promise/tree/v3.2.0" }, "funding": [ { @@ -2829,7 +2829,7 @@ "type": "open_collective" } ], - "time": "2023-11-16T16:21:57+00:00" + "time": "2024-05-24T10:39:05+00:00" }, { "name": "s9e/regexp-builder", @@ -2875,16 +2875,16 @@ }, { "name": "s9e/sweetdom", - "version": "3.4.0", + "version": "3.4.1", "source": { "type": "git", "url": "https://github.com/s9e/SweetDOM.git", - "reference": "b07ae8f5fe4ac40a0b734e0e23dbadcc26a161e3" + "reference": "ef3a7d2745b30b4ad0d1d3d60be391a3604c69dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/b07ae8f5fe4ac40a0b734e0e23dbadcc26a161e3", - "reference": "b07ae8f5fe4ac40a0b734e0e23dbadcc26a161e3", + "url": "https://api.github.com/repos/s9e/SweetDOM/zipball/ef3a7d2745b30b4ad0d1d3d60be391a3604c69dd", + "reference": "ef3a7d2745b30b4ad0d1d3d60be391a3604c69dd", "shasum": "" }, "require": { @@ -2892,6 +2892,7 @@ "php": "^8.1" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.52", "phpunit/phpunit": "^10.0", "s9e/repdoc": "dev-wip" }, @@ -2914,22 +2915,22 @@ ], "support": { "issues": "https://github.com/s9e/SweetDOM/issues", - "source": "https://github.com/s9e/SweetDOM/tree/3.4.0" + "source": "https://github.com/s9e/SweetDOM/tree/3.4.1" }, - "time": "2024-01-01T17:22:53+00:00" + "time": "2024-03-23T14:03:01+00:00" }, { "name": "s9e/text-formatter", - "version": "2.16.0", + "version": "2.17.3", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "a78b8f9bc169d0b6dd81ffff3c97479875bd673d" + "reference": "9adf2557f13e45c4524d0dc9886cab22822e337a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/a78b8f9bc169d0b6dd81ffff3c97479875bd673d", - "reference": "a78b8f9bc169d0b6dd81ffff3c97479875bd673d", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9adf2557f13e45c4524d0dc9886cab22822e337a", + "reference": "9adf2557f13e45c4524d0dc9886cab22822e337a", "shasum": "" }, "require": { @@ -2942,6 +2943,7 @@ }, "require-dev": { "code-lts/doctum": "*", + "friendsofphp/php-cs-fixer": "^3.52", "matthiasmullie/minify": "*", "phpunit/phpunit": "^9.5" }, @@ -2956,7 +2958,7 @@ }, "type": "library", "extra": { - "version": "2.16.0" + "version": "2.17.3" }, "autoload": { "psr-4": { @@ -2988,9 +2990,9 @@ ], "support": { "issues": "https://github.com/s9e/TextFormatter/issues", - "source": "https://github.com/s9e/TextFormatter/tree/2.16.0" + "source": "https://github.com/s9e/TextFormatter/tree/2.17.3" }, - "time": "2024-01-07T00:41:30+00:00" + "time": "2024-05-26T00:00:08+00:00" }, { "name": "seld/jsonlint", @@ -3232,16 +3234,16 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.1.1", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "86102bdd19379b2c6e5b0feb94fd490d40e7d133" + "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/86102bdd19379b2c6e5b0feb94fd490d40e7d133", - "reference": "86102bdd19379b2c6e5b0feb94fd490d40e7d133", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/0b10c8b53366729417d6226ae89a665f9e2d61b6", + "reference": "0b10c8b53366729417d6226ae89a665f9e2d61b6", "shasum": "" }, "require": { @@ -3253,7 +3255,7 @@ "ekino/phpstan-banned-code": "^1.0", "ext-gmp": "*", "ext-openssl": "*", - "infection/infection": "^0.27", + "infection/infection": "^0.28", "php-parallel-lint/php-parallel-lint": "^1.3", "phpstan/extension-installer": "^1.3", "phpstan/phpstan": "^1.8", @@ -3261,8 +3263,8 @@ "phpstan/phpstan-deprecation-rules": "^1.0", "phpstan/phpstan-phpunit": "^1.1", "phpstan/phpstan-strict-rules": "^1.3", - "phpunit/phpunit": "^10.1", - "rector/rector": "^0.19", + "phpunit/phpunit": "^10.1|^11.0", + "rector/rector": "^1.0", "roave/security-advisories": "dev-latest", "symfony/phpunit-bridge": "^6.4|^7.0", "symfony/string": "^6.4|^7.0", @@ -3327,7 +3329,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.1.1" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.2.1" }, "funding": [ { @@ -3339,20 +3341,20 @@ "type": "patreon" } ], - "time": "2024-02-05T20:37:46+00:00" + "time": "2024-03-30T18:03:49+00:00" }, { "name": "symfony/config", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f" + "reference": "12e7e52515ce37191b193cf3365903c4f3951e35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/206482ff3ed450495b1d5b7bad1bc3a852def96f", - "reference": "206482ff3ed450495b1d5b7bad1bc3a852def96f", + "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35", + "reference": "12e7e52515ce37191b193cf3365903c4f3951e35", "shasum": "" }, "require": { @@ -3398,7 +3400,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.3" + "source": "https://github.com/symfony/config/tree/v6.4.8" }, "funding": [ { @@ -3414,20 +3416,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T13:26:27+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/console", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e" + "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", - "reference": "2aaf83b4de5b9d43b93e4aec6f2f8b676f7c567e", + "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91", + "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91", "shasum": "" }, "require": { @@ -3492,7 +3494,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.3" + "source": "https://github.com/symfony/console/tree/v6.4.8" }, "funding": [ { @@ -3508,20 +3510,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "6871811c5a5c5e180244ddb689746446db02c05b" + "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/6871811c5a5c5e180244ddb689746446db02c05b", - "reference": "6871811c5a5c5e180244ddb689746446db02c05b", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3b618176e8c3a9e5772151c51eba0c52a0c771c", + "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c", "shasum": "" }, "require": { @@ -3573,7 +3575,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.3" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.8" }, "funding": [ { @@ -3589,20 +3591,20 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:32:12+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf" + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/7c3aff79d10325257a001fcf92d991f24fc967cf", - "reference": "7c3aff79d10325257a001fcf92d991f24fc967cf", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", "shasum": "" }, "require": { @@ -3611,7 +3613,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3640,7 +3642,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" }, "funding": [ { @@ -3656,20 +3658,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/error-handler", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6" + "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/6dc3c76a278b77f01d864a6005d640822c6f26a6", - "reference": "6dc3c76a278b77f01d864a6005d640822c6f26a6", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc", + "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc", "shasum": "" }, "require": { @@ -3715,7 +3717,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.3" + "source": "https://github.com/symfony/error-handler/tree/v6.4.8" }, "funding": [ { @@ -3731,20 +3733,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:40:36+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef" + "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae9d3a6f3003a6caf56acd7466d8d52378d44fef", - "reference": "ae9d3a6f3003a6caf56acd7466d8d52378d44fef", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b", + "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b", "shasum": "" }, "require": { @@ -3795,7 +3797,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.3" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8" }, "funding": [ { @@ -3811,20 +3813,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df" + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/a76aed96a42d2b521153fb382d418e30d18b59df", - "reference": "a76aed96a42d2b521153fb382d418e30d18b59df", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", + "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", "shasum": "" }, "require": { @@ -3834,7 +3836,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -3871,7 +3873,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" }, "funding": [ { @@ -3887,20 +3889,20 @@ "type": "tidelift" } ], - "time": "2023-05-23T14:45:45+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/filesystem", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb" + "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", - "reference": "7f3b1755eb49297a0827a7575d5d2b2fd11cc9fb", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3", + "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3", "shasum": "" }, "require": { @@ -3908,6 +3910,9 @@ "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.8" }, + "require-dev": { + "symfony/process": "^5.4|^6.4|^7.0" + }, "type": "library", "autoload": { "psr-4": { @@ -3934,7 +3939,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.3" + "source": "https://github.com/symfony/filesystem/tree/v6.4.8" }, "funding": [ { @@ -3950,20 +3955,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/finder", - "version": "v6.4.0", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "11d736e97f116ac375a81f96e662911a34cd50ce" + "reference": "3ef977a43883215d560a2cecb82ec8e62131471c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/11d736e97f116ac375a81f96e662911a34cd50ce", - "reference": "11d736e97f116ac375a81f96e662911a34cd50ce", + "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c", + "reference": "3ef977a43883215d560a2cecb82ec8e62131471c", "shasum": "" }, "require": { @@ -3998,7 +4003,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.0" + "source": "https://github.com/symfony/finder/tree/v6.4.8" }, "funding": [ { @@ -4014,27 +4019,27 @@ "type": "tidelift" } ], - "time": "2023-10-31T17:30:12+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86" + "reference": "61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/a9034bc119fab8238f76cf49c770f3135f3ead86", - "reference": "a9034bc119fab8238f76cf49c770f3135f3ead86", + "url": "https://api.github.com/repos/symfony/http-client/zipball/61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05", + "reference": "61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/http-client-contracts": "^3", + "symfony/http-client-contracts": "^3.4.1", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -4052,7 +4057,7 @@ "amphp/http-client": "^4.2.1", "amphp/http-tunnel": "^1.0", "amphp/socket": "^1.1", - "guzzlehttp/promises": "^1.4", + "guzzlehttp/promises": "^1.4|^2.0", "nyholm/psr7": "^1.0", "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", @@ -4091,7 +4096,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.3" + "source": "https://github.com/symfony/http-client/tree/v6.4.8" }, "funding": [ { @@ -4107,20 +4112,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:01:07+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "1ee70e699b41909c209a0c930f11034b93578654" + "reference": "20414d96f391677bf80078aa55baece78b82647d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/1ee70e699b41909c209a0c930f11034b93578654", - "reference": "1ee70e699b41909c209a0c930f11034b93578654", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d", + "reference": "20414d96f391677bf80078aa55baece78b82647d", "shasum": "" }, "require": { @@ -4129,7 +4134,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -4169,7 +4174,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0" }, "funding": [ { @@ -4185,20 +4190,20 @@ "type": "tidelift" } ], - "time": "2023-07-30T20:28:31+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9" + "reference": "27de8cc95e11db7a50b027e71caaab9024545947" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/5677bdf7cade4619cb17fc9e1e7b31ec392244a9", - "reference": "5677bdf7cade4619cb17fc9e1e7b31ec392244a9", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947", + "reference": "27de8cc95e11db7a50b027e71caaab9024545947", "shasum": "" }, "require": { @@ -4246,7 +4251,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.3" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.8" }, "funding": [ { @@ -4262,20 +4267,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2" + "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/9c6ec4e543044f7568a53a76ab1484ecd30637a2", - "reference": "9c6ec4e543044f7568a53a76ab1484ecd30637a2", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1", + "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1", "shasum": "" }, "require": { @@ -4324,12 +4329,13 @@ "symfony/process": "^5.4|^6.0|^7.0", "symfony/property-access": "^5.4.5|^6.0.5|^7.0", "symfony/routing": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.3|^7.0", + "symfony/serializer": "^6.4.4|^7.0.4", "symfony/stopwatch": "^5.4|^6.0|^7.0", "symfony/translation": "^5.4|^6.0|^7.0", "symfony/translation-contracts": "^2.5|^3", "symfony/uid": "^5.4|^6.0|^7.0", "symfony/validator": "^6.4|^7.0", + "symfony/var-dumper": "^5.4|^6.4|^7.0", "symfony/var-exporter": "^6.2|^7.0", "twig/twig": "^2.13|^3.0.4" }, @@ -4359,7 +4365,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.3" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.8" }, "funding": [ { @@ -4375,20 +4381,20 @@ "type": "tidelift" } ], - "time": "2024-01-31T07:21:29+00:00" + "time": "2024-06-02T16:06:25+00:00" }, { "name": "symfony/mime", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "5017e0a9398c77090b7694be46f20eb796262a34" + "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/5017e0a9398c77090b7694be46f20eb796262a34", - "reference": "5017e0a9398c77090b7694be46f20eb796262a34", + "url": "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33", + "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33", "shasum": "" }, "require": { @@ -4409,6 +4415,7 @@ "league/html-to-markdown": "^5.0", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "symfony/dependency-injection": "^5.4|^6.0|^7.0", + "symfony/process": "^5.4|^6.4|^7.0", "symfony/property-access": "^5.4|^6.0|^7.0", "symfony/property-info": "^5.4|^6.0|^7.0", "symfony/serializer": "^6.3.2|^7.0" @@ -4443,7 +4450,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.3" + "source": "https://github.com/symfony/mime/tree/v6.4.8" }, "funding": [ { @@ -4459,7 +4466,7 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:32:12+00:00" + "time": "2024-06-01T07:50:16+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5247,16 +5254,16 @@ }, { "name": "symfony/process", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3" + "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/31642b0818bfcff85930344ef93193f8c607e0a3", - "reference": "31642b0818bfcff85930344ef93193f8c607e0a3", + "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", "shasum": "" }, "require": { @@ -5288,7 +5295,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.3" + "source": "https://github.com/symfony/process/tree/v6.4.8" }, "funding": [ { @@ -5304,20 +5311,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "c3f1b7d8f0b567eb960c540567f24219cb759e0a" + "reference": "b8119e0b248ef0711c25cd09acc729102122621c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/c3f1b7d8f0b567eb960c540567f24219cb759e0a", - "reference": "c3f1b7d8f0b567eb960c540567f24219cb759e0a", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/b8119e0b248ef0711c25cd09acc729102122621c", + "reference": "b8119e0b248ef0711c25cd09acc729102122621c", "shasum": "" }, "require": { @@ -5355,7 +5362,7 @@ "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.3" + "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.8" }, "funding": [ { @@ -5371,20 +5378,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/routing", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842" + "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/3b2957ad54902f0f544df83e3d58b38d7e8e5842", - "reference": "3b2957ad54902f0f544df83e3d58b38d7e8e5842", + "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", + "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", "shasum": "" }, "require": { @@ -5438,7 +5445,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.3" + "source": "https://github.com/symfony/routing/tree/v6.4.8" }, "funding": [ { @@ -5454,25 +5461,26 @@ "type": "tidelift" } ], - "time": "2024-01-30T13:55:02+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.4.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0" + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/fe07cbc8d837f60caf7018068e350cc5163681a0", - "reference": "fe07cbc8d837f60caf7018068e350cc5163681a0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", "shasum": "" }, "require": { "php": ">=8.1", - "psr/container": "^1.1|^2.0" + "psr/container": "^1.1|^2.0", + "symfony/deprecation-contracts": "^2.5|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -5480,7 +5488,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -5520,7 +5528,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" }, "funding": [ { @@ -5536,20 +5544,20 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/string", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b" + "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/7a14736fb179876575464e4658fce0c304e8c15b", - "reference": "7a14736fb179876575464e4658fce0c304e8c15b", + "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d", + "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d", "shasum": "" }, "require": { @@ -5606,7 +5614,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.3" + "source": "https://github.com/symfony/string/tree/v6.4.8" }, "funding": [ { @@ -5622,20 +5630,20 @@ "type": "tidelift" } ], - "time": "2024-01-25T09:26:29+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.4.1", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "06450585bf65e978026bda220cdebca3f867fde7" + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/06450585bf65e978026bda220cdebca3f867fde7", - "reference": "06450585bf65e978026bda220cdebca3f867fde7", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", "shasum": "" }, "require": { @@ -5644,7 +5652,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -5684,7 +5692,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.4.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" }, "funding": [ { @@ -5700,20 +5708,20 @@ "type": "tidelift" } ], - "time": "2023-12-26T14:02:43+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/twig-bridge", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "bf6b411a5d9a0ce6ea43cca0fcf5f05f5196a957" + "reference": "57de1b7d7499053a2c5beb9344751e8bfd332649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/bf6b411a5d9a0ce6ea43cca0fcf5f05f5196a957", - "reference": "bf6b411a5d9a0ce6ea43cca0fcf5f05f5196a957", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/57de1b7d7499053a2c5beb9344751e8bfd332649", + "reference": "57de1b7d7499053a2c5beb9344751e8bfd332649", "shasum": "" }, "require": { @@ -5793,7 +5801,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.3" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.8" }, "funding": [ { @@ -5809,20 +5817,20 @@ "type": "tidelift" } ], - "time": "2024-01-30T08:32:12+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "0435a08f69125535336177c29d56af3abc1f69da" + "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/0435a08f69125535336177c29d56af3abc1f69da", - "reference": "0435a08f69125535336177c29d56af3abc1f69da", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25", + "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25", "shasum": "" }, "require": { @@ -5878,7 +5886,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.8" }, "funding": [ { @@ -5894,20 +5902,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:53:30+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8" + "reference": "792ca836f99b340f2e9ca9497c7953948c49a504" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", - "reference": "a8c12b5448a5ac685347f5eeb2abf6a571ec16b8", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/792ca836f99b340f2e9ca9497c7953948c49a504", + "reference": "792ca836f99b340f2e9ca9497c7953948c49a504", "shasum": "" }, "require": { @@ -5915,6 +5923,8 @@ "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { + "symfony/property-access": "^6.4|^7.0", + "symfony/serializer": "^6.4|^7.0", "symfony/var-dumper": "^5.4|^6.0|^7.0" }, "type": "library", @@ -5953,7 +5963,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.3" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.8" }, "funding": [ { @@ -5969,20 +5979,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "d75715985f0f94f978e3a8fa42533e10db921b90" + "reference": "52903de178d542850f6f341ba92995d3d63e60c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/d75715985f0f94f978e3a8fa42533e10db921b90", - "reference": "d75715985f0f94f978e3a8fa42533e10db921b90", + "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9", + "reference": "52903de178d542850f6f341ba92995d3d63e60c9", "shasum": "" }, "require": { @@ -6025,7 +6035,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.3" + "source": "https://github.com/symfony/yaml/tree/v6.4.8" }, "funding": [ { @@ -6041,34 +6051,41 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "twig/twig", - "version": "v3.8.0", + "version": "v3.10.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, "type": "library", "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], "psr-4": { "Twig\\": "src/" } @@ -6101,7 +6118,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + "source": "https://github.com/twigphp/Twig/tree/v3.10.3" }, "funding": [ { @@ -6113,11 +6130,11 @@ "type": "tidelift" } ], - "time": "2023-11-21T18:54:41+00:00" + "time": "2024-05-16T10:04:27+00:00" }, { "name": "web-token/jwt-key-mgmt", - "version": "3.3.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/web-token/jwt-key-mgmt.git", @@ -6172,7 +6189,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.3.0" + "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.4.3" }, "funding": [ { @@ -6185,16 +6202,16 @@ }, { "name": "web-token/jwt-library", - "version": "3.3.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", - "reference": "5edf0f193425bb9c695a433180ddf9d263f55063" + "reference": "4b09510eec25c328525048cbdf6042a39a7c28d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-library/zipball/5edf0f193425bb9c695a433180ddf9d263f55063", - "reference": "5edf0f193425bb9c695a433180ddf9d263f55063", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/4b09510eec25c328525048cbdf6042a39a7c28d8", + "reference": "4b09510eec25c328525048cbdf6042a39a7c28d8", "shasum": "" }, "require": { @@ -6204,10 +6221,11 @@ "paragonie/constant_time_encoding": "^2.6", "paragonie/sodium_compat": "^1.20", "php": ">=8.1", + "psr/cache": "^3.0", "psr/clock": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", - "spomky-labs/pki-framework": "^1.0", + "spomky-labs/pki-framework": "^1.2.1", "symfony/console": "^5.4|^6.0|^7.0", "symfony/http-client": "^5.4|^6.0|^7.0", "symfony/polyfill-mbstring": "^1.12" @@ -6266,7 +6284,7 @@ ], "support": { "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/3.3.0" + "source": "https://github.com/web-token/jwt-library/tree/3.4.3" }, "funding": [ { @@ -6278,11 +6296,11 @@ "type": "patreon" } ], - "time": "2024-02-22T08:15:45+00:00" + "time": "2024-04-17T17:41:33+00:00" }, { "name": "web-token/jwt-signature", - "version": "3.3.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/web-token/jwt-signature.git", @@ -6334,7 +6352,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-signature/tree/3.3.0" + "source": "https://github.com/web-token/jwt-signature/tree/3.4.3" }, "funding": [ { @@ -6347,7 +6365,7 @@ }, { "name": "web-token/jwt-signature-algorithm-ecdsa", - "version": "3.3.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git", @@ -6400,7 +6418,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.3.0" + "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.4.3" }, "funding": [ { @@ -6413,7 +6431,7 @@ }, { "name": "web-token/jwt-util-ecc", - "version": "3.3.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/web-token/jwt-util-ecc.git", @@ -6466,7 +6484,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-util-ecc/tree/3.3.0" + "source": "https://github.com/web-token/jwt-util-ecc/tree/3.4.3" }, "funding": [ { @@ -6481,16 +6499,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.2", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb" + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", - "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb", + "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", "shasum": "" }, "require": { @@ -6502,8 +6520,8 @@ "ext-json": "*", "jetbrains/phpstorm-stubs": "^2019.3", "phpunit/phpunit": "^7 | ^8 | ^9", - "psalm/phar": "^3.11@dev", - "react/promise": "^2" + "react/promise": "^2", + "vimeo/psalm": "^3.12" }, "type": "library", "extra": { @@ -6558,7 +6576,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.2" + "source": "https://github.com/amphp/amp/tree/v2.6.4" }, "funding": [ { @@ -6566,20 +6584,20 @@ "type": "github" } ], - "time": "2022-02-20T17:52:18+00:00" + "time": "2024-03-21T18:52:26+00:00" }, { "name": "amphp/byte-stream", - "version": "v1.8.1", + "version": "v1.8.2", "source": { "type": "git", "url": "https://github.com/amphp/byte-stream.git", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd" + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/byte-stream/zipball/acbd8002b3536485c997c4e019206b3f10ca15bd", - "reference": "acbd8002b3536485c997c4e019206b3f10ca15bd", + "url": "https://api.github.com/repos/amphp/byte-stream/zipball/4f0e968ba3798a423730f567b1b50d3441c16ddc", + "reference": "4f0e968ba3798a423730f567b1b50d3441c16ddc", "shasum": "" }, "require": { @@ -6595,11 +6613,6 @@ "psalm/phar": "^3.11.4" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php" @@ -6623,7 +6636,7 @@ } ], "description": "A stream abstraction to make working with non-blocking I/O simple.", - "homepage": "http://amphp.org/byte-stream", + "homepage": "https://amphp.org/byte-stream", "keywords": [ "amp", "amphp", @@ -6633,9 +6646,8 @@ "stream" ], "support": { - "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/byte-stream/issues", - "source": "https://github.com/amphp/byte-stream/tree/v1.8.1" + "source": "https://github.com/amphp/byte-stream/tree/v1.8.2" }, "funding": [ { @@ -6643,7 +6655,7 @@ "type": "github" } ], - "time": "2021-03-30T17:13:30+00:00" + "time": "2024-04-13T18:00:56+00:00" }, { "name": "dnoegel/php-xdg-base-dir", @@ -6970,16 +6982,16 @@ }, { "name": "masterminds/html5", - "version": "2.8.1", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf" + "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf", - "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", "shasum": "" }, "require": { @@ -6987,7 +6999,7 @@ "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8" + "phpunit/phpunit": "^4.8.35 || ^5.7.21 || ^6 || ^7 || ^8 || ^9" }, "type": "library", "extra": { @@ -7031,9 +7043,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.8.1" + "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" }, - "time": "2023-05-10T11:58:31+00:00" + "time": "2024-03-31T07:05:07+00:00" }, { "name": "misantron/dbunit", @@ -7092,16 +7104,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.11.1", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c" + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", - "reference": "7284c22080590fb39f2ffa3e9057f10a4ddd0e0c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", "shasum": "" }, "require": { @@ -7109,11 +7121,12 @@ }, "conflict": { "doctrine/collections": "<1.6.8", - "doctrine/common": "<2.13.3 || >=3,<3.2.2" + "doctrine/common": "<2.13.3 || >=3 <3.2.2" }, "require-dev": { "doctrine/collections": "^1.6.8", "doctrine/common": "^2.13.3 || ^3.2.2", + "phpspec/prophecy": "^1.10", "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13" }, "type": "library", @@ -7139,7 +7152,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.11.1" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" }, "funding": [ { @@ -7147,7 +7160,7 @@ "type": "tidelift" } ], - "time": "2023-03-08T13:26:56+00:00" + "time": "2024-06-12T14:39:25+00:00" }, { "name": "netresearch/jsonmapper", @@ -7202,21 +7215,21 @@ }, { "name": "nikic/php-parser", - "version": "v4.18.0", + "version": "v4.19.1", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999" + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999", - "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", + "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=7.0" + "php": ">=7.1" }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", @@ -7252,26 +7265,27 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" }, - "time": "2023-12-10T21:03:43+00:00" + "time": "2024-03-17T08:10:35+00:00" }, { "name": "phar-io/manifest", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53" + "reference": "54750ef60c58e43759730615a392c31c80e23176" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53", - "reference": "97803eca37d319dfa7826cc2437fc020857acb53", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176", + "reference": "54750ef60c58e43759730615a392c31c80e23176", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-phar": "*", "ext-xmlwriter": "*", "phar-io/version": "^3.0.1", @@ -7312,9 +7326,15 @@ "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", "support": { "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/2.0.3" + "source": "https://github.com/phar-io/manifest/tree/2.0.4" }, - "time": "2021-07-20T11:28:43+00:00" + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], + "time": "2024-03-03T12:33:53+00:00" }, { "name": "phar-io/version", @@ -7534,28 +7554,35 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.3.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170", - "reference": "622548b623e81ca6d78b721c5e029f4ce664f170", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { + "doctrine/deprecations": "^1.1", "ext-filter": "*", - "php": "^7.2 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.3", + "phpdocumentor/type-resolver": "^1.7", + "phpstan/phpdoc-parser": "^1.7", "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.2", - "psalm/phar": "^4.8" + "mockery/mockery": "~1.3.5", + "phpstan/extension-installer": "^1.1", + "phpstan/phpstan": "^1.8", + "phpstan/phpstan-mockery": "^1.1", + "phpstan/phpstan-webmozart-assert": "^1.2", + "phpunit/phpunit": "^9.5", + "vimeo/psalm": "^5.13" }, "type": "library", "extra": { @@ -7579,15 +7606,15 @@ }, { "name": "Jaap van Otterdijk", - "email": "account@ijaap.nl" + "email": "opensource@ijaap.nl" } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2021-10-19T17:43:47+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -7649,16 +7676,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.29.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", "shasum": "" }, "require": { @@ -7690,22 +7717,22 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-05-31T08:52:43+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.30", + "version": "9.2.31", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089" + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca2bd87d2f9215904682a9cb9bb37dda98e76089", - "reference": "ca2bd87d2f9215904682a9cb9bb37dda98e76089", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", + "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", "shasum": "" }, "require": { @@ -7762,7 +7789,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.30" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" }, "funding": [ { @@ -7770,7 +7797,7 @@ "type": "github" } ], - "time": "2023-12-22T06:47:57+00:00" + "time": "2024-03-02T06:37:42+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8015,16 +8042,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.17", + "version": "9.6.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd" + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd", - "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", + "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", "shasum": "" }, "require": { @@ -8098,7 +8125,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" }, "funding": [ { @@ -8114,27 +8141,27 @@ "type": "tidelift" } ], - "time": "2024-02-23T13:14:51+00:00" + "time": "2024-04-05T04:35:58+00:00" }, { "name": "psalm/plugin-symfony", - "version": "v5.1.0", + "version": "v5.2.2", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-symfony.git", - "reference": "f23ec3439743fb24f5c1101e52d032f23d5befa6" + "reference": "58e109257764e8e7eab10a43a4212bbd70435f67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/f23ec3439743fb24f5c1101e52d032f23d5befa6", - "reference": "f23ec3439743fb24f5c1101e52d032f23d5befa6", + "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/58e109257764e8e7eab10a43a4212bbd70435f67", + "reference": "58e109257764e8e7eab10a43a4212bbd70435f67", "shasum": "" }, "require": { "ext-simplexml": "*", - "php": "^7.4 || ^8.0", + "php": "^8.1", "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0", - "vimeo/psalm": "^5.1" + "vimeo/psalm": "^5.24" }, "require-dev": { "doctrine/annotations": "^1.8|^2", @@ -8144,7 +8171,7 @@ "symfony/console": "*", "symfony/form": "^5.0 || ^6.0 || ^7.0", "symfony/messenger": "^5.0 || ^6.0 || ^7.0", - "symfony/security-guard": "*", + "symfony/security-core": "*", "symfony/serializer": "^5.0 || ^6.0 || ^7.0", "symfony/validator": "*", "twig/twig": "^2.10 || ^3.0", @@ -8177,22 +8204,22 @@ "description": "Psalm Plugin for Symfony", "support": { "issues": "https://github.com/psalm/psalm-plugin-symfony/issues", - "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.1.0" + "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.2" }, - "time": "2023-11-12T10:04:27+00:00" + "time": "2024-06-06T15:34:33+00:00" }, { "name": "sebastian/cli-parser", - "version": "1.0.1", + "version": "1.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", - "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b", + "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b", "shasum": "" }, "require": { @@ -8227,7 +8254,7 @@ "homepage": "https://github.com/sebastianbergmann/cli-parser", "support": { "issues": "https://github.com/sebastianbergmann/cli-parser/issues", - "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2" }, "funding": [ { @@ -8235,7 +8262,7 @@ "type": "github" } ], - "time": "2020-09-28T06:08:49+00:00" + "time": "2024-03-02T06:27:43+00:00" }, { "name": "sebastian/code-unit", @@ -8481,16 +8508,16 @@ }, { "name": "sebastian/diff", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131" + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131", - "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc", + "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc", "shasum": "" }, "require": { @@ -8535,7 +8562,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6" }, "funding": [ { @@ -8543,7 +8570,7 @@ "type": "github" } ], - "time": "2023-05-07T05:35:17+00:00" + "time": "2024-03-02T06:30:58+00:00" }, { "name": "sebastian/environment", @@ -8610,16 +8637,16 @@ }, { "name": "sebastian/exporter", - "version": "4.0.5", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d" + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", - "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72", + "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72", "shasum": "" }, "require": { @@ -8675,7 +8702,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5" + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6" }, "funding": [ { @@ -8683,20 +8710,20 @@ "type": "github" } ], - "time": "2022-09-14T06:03:37+00:00" + "time": "2024-03-02T06:33:00+00:00" }, { "name": "sebastian/global-state", - "version": "5.0.6", + "version": "5.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bde739e7565280bda77be70044ac1047bc007e34" + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34", - "reference": "bde739e7565280bda77be70044ac1047bc007e34", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", + "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9", "shasum": "" }, "require": { @@ -8739,7 +8766,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6" + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7" }, "funding": [ { @@ -8747,7 +8774,7 @@ "type": "github" } ], - "time": "2023-08-02T09:26:13+00:00" + "time": "2024-03-02T06:35:11+00:00" }, { "name": "sebastian/lines-of-code", @@ -8983,16 +9010,16 @@ }, { "name": "sebastian/resource-operations", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", - "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e", + "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e", "shasum": "" }, "require": { @@ -9004,7 +9031,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-main": "3.0-dev" } }, "autoload": { @@ -9025,8 +9052,7 @@ "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4" }, "funding": [ { @@ -9034,7 +9060,7 @@ "type": "github" } ], - "time": "2020-09-28T06:45:17+00:00" + "time": "2024-03-14T16:00:52+00:00" }, { "name": "sebastian/type", @@ -9147,16 +9173,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.2.3", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab" + "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/c95fd4db94ec199f798d4b5b4a81757bd20d88ab", - "reference": "c95fd4db94ec199f798d4b5b4a81757bd20d88ab", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f56b220fe2db1ade4c88098d83413ebdfc3bf876", + "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876", "shasum": "" }, "require": { @@ -9169,6 +9195,11 @@ "spatie/pest-plugin-snapshots": "^1.1" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "3.x-dev" + } + }, "autoload": { "psr-4": { "Spatie\\ArrayToXml\\": "src" @@ -9194,7 +9225,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.2.3" + "source": "https://github.com/spatie/array-to-xml/tree/3.3.0" }, "funding": [ { @@ -9206,20 +9237,20 @@ "type": "github" } ], - "time": "2024-02-07T10:39:02+00:00" + "time": "2024-05-01T10:20:27+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.9.0", + "version": "3.10.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b" + "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b", - "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877", + "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877", "shasum": "" }, "require": { @@ -9286,20 +9317,20 @@ "type": "open_collective" } ], - "time": "2024-02-16T15:06:51+00:00" + "time": "2024-05-22T21:24:41+00:00" }, { "name": "symfony/browser-kit", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e" + "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/495ffa2e6d17e199213f93768efa01af32bbf70e", - "reference": "495ffa2e6d17e199213f93768efa01af32bbf70e", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/62ab90b92066ef6cce5e79365625b4b1432464c8", + "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8", "shasum": "" }, "require": { @@ -9338,7 +9369,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.4.3" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.8" }, "funding": [ { @@ -9354,20 +9385,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/cache", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "49f8cdee544a621a621cd21b6cda32a38926d310" + "reference": "287142df5579ce223c485b3872df3efae8390984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/49f8cdee544a621a621cd21b6cda32a38926d310", - "reference": "49f8cdee544a621a621cd21b6cda32a38926d310", + "url": "https://api.github.com/repos/symfony/cache/zipball/287142df5579ce223c485b3872df3efae8390984", + "reference": "287142df5579ce223c485b3872df3efae8390984", "shasum": "" }, "require": { @@ -9434,7 +9465,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.3" + "source": "https://github.com/symfony/cache/tree/v6.4.8" }, "funding": [ { @@ -9450,20 +9481,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.4.0", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778" + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/1d74b127da04ffa87aa940abe15446fa89653778", - "reference": "1d74b127da04ffa87aa940abe15446fa89653778", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", "shasum": "" }, "require": { @@ -9473,7 +9504,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.4-dev" + "dev-main": "3.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -9510,7 +9541,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.4.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" }, "funding": [ { @@ -9526,20 +9557,20 @@ "type": "tidelift" } ], - "time": "2023-09-25T12:52:38+00:00" + "time": "2024-04-18T09:32:20+00:00" }, { "name": "symfony/css-selector", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229" + "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ee0f7ed5cf298cc019431bb3b3977ebc52b86229", - "reference": "ee0f7ed5cf298cc019431bb3b3977ebc52b86229", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08", + "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08", "shasum": "" }, "require": { @@ -9575,7 +9606,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.3" + "source": "https://github.com/symfony/css-selector/tree/v6.4.8" }, "funding": [ { @@ -9591,20 +9622,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "6db31849011fefe091e94d0bb10cba26f7919894" + "reference": "105b56a0305d219349edeb60a800082eca864e4b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/6db31849011fefe091e94d0bb10cba26f7919894", - "reference": "6db31849011fefe091e94d0bb10cba26f7919894", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/105b56a0305d219349edeb60a800082eca864e4b", + "reference": "105b56a0305d219349edeb60a800082eca864e4b", "shasum": "" }, "require": { @@ -9642,7 +9673,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.3" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.8" }, "funding": [ { @@ -9658,20 +9689,20 @@ "type": "tidelift" } ], - "time": "2024-01-23T14:51:35+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "symfony/framework-bundle", - "version": "v6.4.3", + "version": "v6.4.8", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "fb413ac4483803954411966a39f3a9204835848e" + "reference": "7c7739f87f1a8be1c2f5e7d28addfe763a917acb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/fb413ac4483803954411966a39f3a9204835848e", - "reference": "fb413ac4483803954411966a39f3a9204835848e", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/7c7739f87f1a8be1c2f5e7d28addfe763a917acb", + "reference": "7c7739f87f1a8be1c2f5e7d28addfe763a917acb", "shasum": "" }, "require": { @@ -9710,7 +9741,7 @@ "symfony/mime": "<6.4", "symfony/property-access": "<5.4", "symfony/property-info": "<5.4", - "symfony/scheduler": "<6.4.3|>=7.0.0,<7.0.3", + "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", "symfony/security-core": "<5.4", "symfony/security-csrf": "<5.4", "symfony/serializer": "<6.4", @@ -9749,7 +9780,7 @@ "symfony/process": "^5.4|^6.0|^7.0", "symfony/property-info": "^5.4|^6.0|^7.0", "symfony/rate-limiter": "^5.4|^6.0|^7.0", - "symfony/scheduler": "^6.4.3|^7.0.3", + "symfony/scheduler": "^6.4.4|^7.0.4", "symfony/security-bundle": "^5.4|^6.0|^7.0", "symfony/semaphore": "^5.4|^6.0|^7.0", "symfony/serializer": "^6.4|^7.0", @@ -9762,7 +9793,7 @@ "symfony/web-link": "^5.4|^6.0|^7.0", "symfony/workflow": "^6.4|^7.0", "symfony/yaml": "^5.4|^6.0|^7.0", - "twig/twig": "^2.10|^3.0" + "twig/twig": "^2.10|^3.0.4" }, "type": "symfony-bundle", "autoload": { @@ -9790,7 +9821,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.3" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.8" }, "funding": [ { @@ -9806,20 +9837,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T15:02:55+00:00" + "time": "2024-05-31T14:49:08+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.2", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", - "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", "shasum": "" }, "require": { @@ -9848,7 +9879,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.2" + "source": "https://github.com/theseer/tokenizer/tree/1.2.3" }, "funding": [ { @@ -9856,20 +9887,20 @@ "type": "github" } ], - "time": "2023-11-20T00:12:19+00:00" + "time": "2024-03-03T12:36:25+00:00" }, { "name": "vimeo/psalm", - "version": "5.22.2", + "version": "5.24.0", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "d768d914152dbbf3486c36398802f74e80cfde48" + "reference": "462c80e31c34e58cc4f750c656be3927e80e550e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48", - "reference": "d768d914152dbbf3486c36398802f74e80cfde48", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/462c80e31c34e58cc4f750c656be3927e80e550e", + "reference": "462c80e31c34e58cc4f750c656be3927e80e550e", "shasum": "" }, "require": { @@ -9966,7 +9997,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-02-22T23:39:07+00:00" + "time": "2024-05-01T19:32:08+00:00" }, { "name": "webmozart/assert", From 6b69169e47a15d3a7add460ec5aa5fea5fc2f142 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Jun 2024 21:02:12 +0200 Subject: [PATCH 0244/1214] [ticket/17340] Fix twig to 3.8.0 until performance issues are resolved PHPBB-17340 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 23 ++++++++--------------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 6d59cefe266..9d4f28689ce 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -58,7 +58,7 @@ "symfony/routing": "^6.3", "symfony/twig-bridge": "^6.3", "symfony/yaml": "^6.3", - "twig/twig": "^3.0" + "twig/twig": "3.8.0" }, "require-dev": { "laravel/homestead": "~14.4", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index f8b8863dd03..a8651e11a98 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "26143c95732859f6f0849abd2fe74ae5", + "content-hash": "3c21881b6c8a81fbd83d57004763049d", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -6055,37 +6055,30 @@ }, { "name": "twig/twig", - "version": "v3.10.3", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", "shasum": "" }, "require": { "php": ">=7.2.5", - "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" }, "type": "library", "autoload": { - "files": [ - "src/Resources/core.php", - "src/Resources/debug.php", - "src/Resources/escaper.php", - "src/Resources/string_loader.php" - ], "psr-4": { "Twig\\": "src/" } @@ -6118,7 +6111,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.10.3" + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" }, "funding": [ { @@ -6130,7 +6123,7 @@ "type": "tidelift" } ], - "time": "2024-05-16T10:04:27+00:00" + "time": "2023-11-21T18:54:41+00:00" }, { "name": "web-token/jwt-key-mgmt", From b6c2961568b6e93e21a1740f23e63e8b0bf9912b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 9 Jun 2024 12:19:47 -0700 Subject: [PATCH 0245/1214] [ticket/17335] Fix language var issues in the extension manager PHPBB-17335 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_ext_list.html | 39 ++++++++++++++-------------- phpBB/language/en/acp/extensions.php | 37 ++++++++++++++------------ 2 files changed, 40 insertions(+), 36 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index bb22ac861c8..dd006bc2cc6 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -99,25 +99,26 @@

          {L_EXTENSIONS_ADMIN}

          - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
          {L_EXTENSION_INSTALL_HEADLINE}
          {L_EXTENSION_INSTALL_EXPLAIN}
          {L_EXTENSION_UPDATE_HEADLINE}
          {L_EXTENSION_UPDATE_EXPLAIN}
          {L_EXTENSION_REMOVE_HEADLINE}
          {L_EXTENSION_REMOVE_EXPLAIN}
          {L_EXTENSION_INSTALLING_HEADLINE}
          {L_EXTENSION_INSTALLING_EXPLAIN}
          {L_EXTENSION_UPDATING_HEADLINE}
          {L_EXTENSION_UPDATING_EXPLAIN}
          {L_EXTENSION_REMOVING_HEADLINE}
          {L_EXTENSION_REMOVING_EXPLAIN}
          diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index c6eb147b86e..3a8322ae0bb 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -36,14 +36,15 @@ $lang = array_merge($lang, array( - 'EXTENSION_ALREADY_INSTALLED' => 'The “%s” extension has already been installed.', - 'EXTENSION_ALREADY_INSTALLED_MANUALLY' => 'The “%s” extension has already been installed manually.', - 'EXTENSION_ALREADY_MANAGED' => 'The “%s” extension is already managed.', - 'EXTENSION_CANNOT_MANAGE_FILESYSTEM_ERROR' => 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.', - 'EXTENSION_CANNOT_MANAGE_INSTALL_ERROR' => 'The “%s” extension could not be installed. The prior installation of this extension has been restored.', - 'EXTENSION_MANAGED_WITH_CLEAN_ERROR' => 'The “%1$s” extension has been installed but an error occurred and the old files could not be removed. You might want to delete the “%2$s” files manually.', - 'EXTENSION_MANAGED_WITH_ENABLE_ERROR' => 'The “%s” extension has been installed but an error occurred while enabling it.', - 'EXTENSION_NOT_INSTALLED' => 'The “%s” extension is not installed.', + 'EXTENSIONS_ALREADY_INSTALLED' => 'The “%s” extension has already been installed.', + 'EXTENSIONS_ALREADY_INSTALLED_MANUALLY' => 'The “%s” extension has already been installed manually.', + 'EXTENSIONS_ALREADY_MANAGED' => 'The “%s” extension is already managed.', + 'EXTENSIONS_CANNOT_MANAGE_FILESYSTEM_ERROR' => 'The “%s” extension cannot be managed because the existing files could not be removed from the filesystem.', + 'EXTENSIONS_CANNOT_MANAGE_INSTALL_ERROR' => 'The “%s” extension could not be installed. The prior installation of this extension has been restored.', + 'EXTENSIONS_MANAGED_WITH_CLEAN_ERROR' => 'The “%1$s” extension has been installed but an error occurred and the old files could not be removed. You might want to delete the “%2$s” files manually.', + 'EXTENSIONS_MANAGED_WITH_ENABLE_ERROR' => 'The “%s” extension has been installed but an error occurred while enabling it.', + 'EXTENSIONS_NOT_INSTALLED' => 'The “%s” extension is not installed.', + 'EXTENSIONS_NOT_MANAGED' => 'The “%s” extension is not being managed.', 'ENABLING_EXTENSIONS' => 'Enabling extensions', 'DISABLING_EXTENSIONS' => 'Disabling extensions', @@ -74,6 +75,8 @@ 'EXTENSION_DELETE_DATA_EXPLAIN' => 'Deleting an extension’s data removes all of its data and settings. The extension files are retained so it can be enabled again.', 'EXTENSION_DISABLE_EXPLAIN' => 'Disabling an extension retains its files, data and settings but removes any functionality added by the extension.', 'EXTENSION_ENABLE_EXPLAIN' => 'Enabling an extension allows you to use it on your board.', + 'EXTENSION_REMOVE_EXPLAIN' => 'Removing an extension removes all of its files, data and settings.', + 'EXTENSION_UPDATE_EXPLAIN' => 'Updating an extension will install the latest version compatible with your board, removing old files and replacing them with new ones, and updating the database if necessary.', 'EXTENSION_DELETE_DATA_IN_PROGRESS' => 'The extension’s data is currently being deleted. Please do not leave or refresh this page until it is completed.', 'EXTENSION_DISABLE_IN_PROGRESS' => 'The extension is currently being disabled. Please do not leave or refresh this page until it is completed.', @@ -86,25 +89,25 @@ 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', - 'EXTENSION_INSTALL_HEADLINE'=> 'Installing an extension', - 'EXTENSION_INSTALL_EXPLAIN' => '
            + 'EXTENSION_INSTALLING_HEADLINE'=> 'Installing an extension', + 'EXTENSION_INSTALLING_EXPLAIN' => '
            1. Download an extension from phpBB’s extensions database
            2. Unzip the extension and upload it to the ext/ directory of your phpBB board
            3. Enable the extension, here in the Extensions manager
            ', - 'EXTENSION_UPDATE_HEADLINE' => 'Updating an extension', - 'EXTENSION_UPDATE_EXPLAIN' => '
              + 'EXTENSION_REMOVING_EXPLAIN' => '
              1. Disable the extension
                2. +
              2. Delete the extension’s data
              3. Delete the extension’s files from the filesystem
                4. -
              4. Upload the new files
                5. -
              5. Enable the extension
              ', - 'EXTENSION_REMOVE_HEADLINE' => 'Completely removing an extension from your board', - 'EXTENSION_REMOVE_EXPLAIN' => '
                + 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', + 'EXTENSION_UPDATING_EXPLAIN' => '
                1. Disable the extension
                  2. -
                2. Delete the extension’s data
                3. Delete the extension’s files from the filesystem
                  4. +
                4. Upload the new files
                  5. +
                5. Enable the extension
                ', + 'EXTENSION_REMOVING_HEADLINE' => 'Deleting an extension from your board', 'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete the data associated with “%s”?

                This removes all of its data and settings and cannot be undone!', 'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?', From 173e1ceeba784b8171102324a8625317225597f2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 10 Jun 2024 20:46:58 -0700 Subject: [PATCH 0246/1214] [ticket/17335] Move HTML from lang to template PHPBB-17335 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_ext_list.html | 25 ++++++++++++++++--- phpBB/language/en/acp/extensions.php | 36 ++++++++++++++-------------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index dd006bc2cc6..b8b3d2c68a7 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -104,19 +104,38 @@

                {L_EXTENSIONS_ADMIN}

                {L_EXTENSION_INSTALLING_HEADLINE} - {L_EXTENSION_INSTALLING_EXPLAIN} + +
                  +
                1. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_1']) }}
                  2. +
                2. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_2']) }}
                  3. +
                3. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_3']) }}
                  4. +
                + {L_EXTENSION_UPDATING_HEADLINE} - {L_EXTENSION_UPDATING_EXPLAIN} + +
                  +
                1. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_1']) }}
                  2. +
                2. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_2']) }}
                  3. +
                3. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_3']) }}
                  4. +
                4. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_4']) }}
                  5. +
                + {L_EXTENSION_REMOVING_HEADLINE} - {L_EXTENSION_REMOVING_EXPLAIN} + +
                  +
                1. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_1']) }}
                  2. +
                2. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_2']) }}
                  3. +
                3. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_3']) }}
                  4. +
                + diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 3a8322ae0bb..311cfa74f32 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -89,25 +89,25 @@ 'EXTENSION_NAME' => 'Extension Name', 'EXTENSION_ACTIONS' => 'Actions', 'EXTENSION_OPTIONS' => 'Options', - 'EXTENSION_INSTALLING_HEADLINE'=> 'Installing an extension', - 'EXTENSION_INSTALLING_EXPLAIN' => '
                  -
                1. Download an extension from phpBB’s extensions database
                  2. -
                2. Unzip the extension and upload it to the ext/ directory of your phpBB board
                  3. -
                3. Enable the extension, here in the Extensions manager
                  4. -
                ', - 'EXTENSION_REMOVING_EXPLAIN' => '
                  -
                1. Disable the extension
                  2. -
                2. Delete the extension’s data
                  3. -
                3. Delete the extension’s files from the filesystem
                  4. -
                ', - 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', - 'EXTENSION_UPDATING_EXPLAIN' => '
                  -
                1. Disable the extension
                  2. -
                2. Delete the extension’s files from the filesystem
                  3. -
                3. Upload the new files
                  4. -
                4. Enable the extension
                  5. -
                ', + 'EXTENSION_INSTALLING_HEADLINE' => 'Installing an extension', + 'EXTENSION_INSTALLING_EXPLAIN' => [ + 'step_1' => 'Download an extension from phpBB’s extensions database', + 'step_2' => 'Unzip the extension and upload it to the ext/ directory of your phpBB board', + 'step_3' => 'Enable the extension, here in the Extensions manager', + ], 'EXTENSION_REMOVING_HEADLINE' => 'Deleting an extension from your board', + 'EXTENSION_REMOVING_EXPLAIN' => [ + 'step_1' => 'Disable the extension', + 'step_2' => 'Delete the extension’s data', + 'step_3' => 'Delete the extension‘s files from the filesystem', + ], + 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', + 'EXTENSION_UPDATING_EXPLAIN' => [ + 'step_1' => 'Disable the extension', + 'step_2' => 'Delete the extension’s files from the filesystem', + 'step_3' => 'Upload the new files', + 'step_4' => 'Enable the extension', + ], 'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete the data associated with “%s”?

                This removes all of its data and settings and cannot be undone!', 'EXTENSION_DISABLE_CONFIRM' => 'Are you sure that you wish to disable the “%s” extension?', From 48cc96b489366641a818888ad45578c2a2948398 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 14 Jun 2024 23:10:09 +0200 Subject: [PATCH 0247/1214] [ticket/17335] Add lang_raw twig function for templates PHPBB-17335 --- phpBB/phpbb/template/twig/extension.php | 13 +++++++++++++ tests/template/template_test.php | 6 +++--- tests/template/templates/lang_twig.html | 4 ++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 2e920dbe4be..7fde9e2cac2 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -93,6 +93,7 @@ public function getFunctions() new \Twig\TwigFunction('lang', array($this, 'lang')), new \Twig\TwigFunction('lang_defined', array($this, 'lang_defined')), new \Twig\TwigFunction('lang_js', [$this, 'lang_js']), + new \Twig\TwigFunction('lang_raw', [$this, 'lang_raw']), new \Twig\TwigFunction('get_class', 'get_class'), ); } @@ -214,4 +215,16 @@ public function lang_js(): string return twig_escape_filter($this->environment, call_user_func_array([$this, 'lang'], $args), 'js'); } + + /** + * Get raw value associated with lang key + * + * @param string $key + * + * @return array|string Raw value associated with lang key + */ + public function lang_raw(string $key): array|string + { + return call_user_func_array(array($this->language, 'lang_raw'), [$key]); + } } diff --git a/tests/template/template_test.php b/tests/template/template_test.php index 8faa52d8acd..4fc98583669 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -365,15 +365,15 @@ public function template_data() array(), array(), array(), - "VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE", + "VARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE\nVARIABLE\n1_VARIABLE\nARY_VARIABLE", ), array( 'lang_twig.html', array(), array(), array(), - "Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock", - array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock"), + "Value'\n1 O'Clock\nValue\\u0027\n1\\u0020O\\u0027Clock\nValue'\n1 O'Clock\nfoo|bar", + array('VARIABLE' => "Value'", '1_VARIABLE' => "1 O'Clock", 'ARY_VARIABLE' => ['foo', 'bar']), ), array( 'loop_nested_multilevel_ref.html', diff --git a/tests/template/templates/lang_twig.html b/tests/template/templates/lang_twig.html index bf31012819c..a331c7f5063 100644 --- a/tests/template/templates/lang_twig.html +++ b/tests/template/templates/lang_twig.html @@ -3,3 +3,7 @@ {{ lang_js('VARIABLE') }} {{ lang_js('1_VARIABLE') }} + +{{ lang_raw('VARIABLE') }} +{{ lang_raw('1_VARIABLE') }} +{{ lang_raw('ARY_VARIABLE')|join('|') }} From 444137531ff0d6650170e4cd76e82049c8656f8c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 14 Jun 2024 14:43:40 -0700 Subject: [PATCH 0248/1214] [ticket/17335] Use lang_raw PHPBB-17335 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_ext_list.html | 19 +++++++++---------- phpBB/language/en/acp/extensions.php | 20 ++++++++++---------- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index b8b3d2c68a7..dc6dcf1797a 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -106,9 +106,9 @@

                {L_EXTENSIONS_ADMIN}

                  -
                1. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_1']) }}
                  2. -
                2. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_2']) }}
                  3. -
                3. {{ lang(['EXTENSION_INSTALLING_EXPLAIN', 'step_3']) }}
                  4. + {% for step in lang_raw('EXTENSION_INSTALLING_EXPLAIN') %} +
                4. {{ step }}
                  5. + {% endfor %}
                @@ -118,10 +118,9 @@

                {L_EXTENSIONS_ADMIN}

                  -
                1. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_1']) }}
                  2. -
                2. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_2']) }}
                  3. -
                3. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_3']) }}
                  4. -
                4. {{ lang(['EXTENSION_UPDATING_EXPLAIN', 'step_4']) }}
                  5. + {% for step in lang_raw('EXTENSION_UPDATING_EXPLAIN') %} +
                5. {{ step }}
                  6. + {% endfor %}
                @@ -131,9 +130,9 @@

                {L_EXTENSIONS_ADMIN}

                  -
                1. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_1']) }}
                  2. -
                2. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_2']) }}
                  3. -
                3. {{ lang(['EXTENSION_REMOVING_EXPLAIN', 'step_3']) }}
                  4. + {% for step in lang_raw('EXTENSION_REMOVING_EXPLAIN') %} +
                4. {{ step }}
                  5. + {% endfor %}
                diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 311cfa74f32..bf854cdb7b4 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -91,22 +91,22 @@ 'EXTENSION_OPTIONS' => 'Options', 'EXTENSION_INSTALLING_HEADLINE' => 'Installing an extension', 'EXTENSION_INSTALLING_EXPLAIN' => [ - 'step_1' => 'Download an extension from phpBB’s extensions database', - 'step_2' => 'Unzip the extension and upload it to the ext/ directory of your phpBB board', - 'step_3' => 'Enable the extension, here in the Extensions manager', + 0 => 'Download an extension from phpBB’s extensions database', + 1 => 'Unzip the extension and upload it to the ext/ directory of your phpBB board', + 2 => 'Enable the extension, here in the Extensions manager', ], 'EXTENSION_REMOVING_HEADLINE' => 'Deleting an extension from your board', 'EXTENSION_REMOVING_EXPLAIN' => [ - 'step_1' => 'Disable the extension', - 'step_2' => 'Delete the extension’s data', - 'step_3' => 'Delete the extension‘s files from the filesystem', + 0 => 'Disable the extension', + 1 => 'Delete the extension’s data', + 2 => 'Delete the extension‘s files from the filesystem', ], 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', 'EXTENSION_UPDATING_EXPLAIN' => [ - 'step_1' => 'Disable the extension', - 'step_2' => 'Delete the extension’s files from the filesystem', - 'step_3' => 'Upload the new files', - 'step_4' => 'Enable the extension', + 0 => 'Disable the extension', + 1 => 'Delete the extension’s files from the filesystem', + 2 => 'Upload the new files', + 3 => 'Enable the extension', ], 'EXTENSION_DELETE_DATA_CONFIRM' => 'Are you sure that you wish to delete the data associated with “%s”?

                This removes all of its data and settings and cannot be undone!', From d2cd8ecf6648e90fd0b4a87ff9dc4ddc48a466da Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Jun 2024 11:41:16 +0200 Subject: [PATCH 0249/1214] [ticket/17342] Add tests for PHP 8.4 to GitHub Actions PHPBB-17342 --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cbf31fc2884..9dd53fafa5b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -137,6 +137,10 @@ jobs: db: "mysql:5.7" - php: '8.3' db: "mariadb:10.2" + - php: '8.4' + db: "mysql:8.0" + - php: '8.4' + db: "mariadb:10.3" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -272,6 +276,8 @@ jobs: db: "postgres:9.5" - php: '8.3' db: "postgres:9.5" + - php: '8.4' + db: "postgres:9.5" name: PHP ${{ matrix.php }} - ${{ matrix.db }} From 0fc1a8c1f8c1d7a2781644857ebb58db489c4137 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 16 Jun 2024 08:49:36 -0700 Subject: [PATCH 0250/1214] [ticket/17344] Show an alert when webpush subscribing is denied PHPBB-17344 --- phpBB/assets/javascript/webpush.js | 1 + phpBB/language/en/common.php | 1 + phpBB/styles/prosilver/template/notification_dropdown.html | 2 +- phpBB/styles/prosilver/template/ucp_notifications_options.html | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js index c326fe1cff3..94e542d2aed 100644 --- a/phpBB/assets/javascript/webpush.js +++ b/phpBB/assets/javascript/webpush.js @@ -150,6 +150,7 @@ function PhpbbWebpush() { // Prevent the user from clicking the subscribe button multiple times. const result = await Notification.requestPermission(); if (result === 'denied') { + phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg')); return; } diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5933cc8f5cf..43269679bfd 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -515,6 +515,7 @@ 'NOTIFY_WEB_PUSH_ENABLE' => 'Enable Web Push notifications', 'NOTIFY_WEB_PUSH_SUBSCRIBE' => 'Subscribe', 'NOTIFY_WEB_PUSH_SUBSCRIBED'=> 'Subscribed', + 'NOTIFY_WEB_PUSH_DENIED' => 'You have denied notifications from this site. To subscribe, please allow notifications in your browser settings.', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', 'NO_ACTION' => 'No action specified.', 'NO_ADMINISTRATORS' => 'There are no administrators.', diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index ff52543d0a7..abd5c85bfd4 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -47,7 +47,7 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
                {{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} - +
                {% endif %} diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index b3be983f169..27981581ff2 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -10,7 +10,7 @@

                {{ TITLE }}


                {{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
                - +
                From f3ca92ffe78b832ac9f39633d5422520bb87fa6e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 16 Jun 2024 09:01:39 -0700 Subject: [PATCH 0251/1214] [ticket/17344] Responsive mobile friendly webpush sub button PHPBB-17344 --- phpBB/styles/prosilver/theme/common.css | 1 + phpBB/styles/prosilver/theme/responsive.css | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 2300f9c611a..f679df7c9f8 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1347,6 +1347,7 @@ ul.linklist:after, flex-wrap: nowrap; justify-content: space-between; padding: 5px 10px; + gap: 20px; } .notification-avatar, diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 5deb7224a68..481b1a23d38 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -20,6 +20,16 @@ } } +@media (max-width: 550px) { + .dropdown-extended .notification-dropdown-footer .notification-subscribe_toggle > span { + display: none; + } + + .dropdown-extended .notification-dropdown-footer .notification-subscribe_toggle > .icon { + font-size: 24px; + } +} + @media (max-width: 430px) { .action-bar .search-box .inputbox { width: 120px; From 16743e934523078b2020b1a975f157900fc1e7ae Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 16 Jun 2024 09:43:02 -0700 Subject: [PATCH 0252/1214] [ticket/17344] Improve webpush class names PHPBB-17344 --- .../prosilver/template/notification_dropdown.html | 6 +++--- phpBB/styles/prosilver/theme/buttons.css | 2 +- phpBB/styles/prosilver/theme/colours.css | 6 +++++- phpBB/styles/prosilver/theme/common.css | 3 +-- phpBB/styles/prosilver/theme/responsive.css | 8 +------- tests/functional/notification_webpush_test.php | 10 +++++----- 6 files changed, 16 insertions(+), 19 deletions(-) diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index abd5c85bfd4..de5a8c79e6b 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -45,10 +45,10 @@ {L_SEE_ALL}

{% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %} -
+
{{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} - - + +
{% endif %} {% EVENT notification_dropdown_footer_after %} diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index fda72c86138..cf15eb394f3 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -223,6 +223,6 @@ button::-moz-focus-inner { /* Notification buttons --------------------------------------------- */ -.notification-subscribe_toggle:disabled { +.notification-subscribe-toggle:disabled { opacity: 0.7; } diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index e803a3f6cf3..4980cd89f2d 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -1180,6 +1180,10 @@ input.disabled { color: #ffffff; } -.notification-subscribe_toggle { +.dropdown-extended .webpush-subscribe { + color: #536482; +} + +.notification-subscribe-toggle { color: #47536b; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index f679df7c9f8..cddbc364bc9 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1340,9 +1340,8 @@ ul.linklist:after, display: block; } -.dropdown-extended .notification-dropdown-footer { +.dropdown-extended .webpush-subscribe { white-space: nowrap; - border-top: solid 1px #b9b9b9; display: flex; flex-wrap: nowrap; justify-content: space-between; diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 481b1a23d38..9b1e1e379bd 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -18,16 +18,10 @@ .dropdown-extended .dropdown-contents { width: auto; } -} -@media (max-width: 550px) { - .dropdown-extended .notification-dropdown-footer .notification-subscribe_toggle > span { + .dropdown-extended .dropdown-contents .webpush-subscribe .notification-subscribe-toggle > span { display: none; } - - .dropdown-extended .notification-dropdown-footer .notification-subscribe_toggle > .icon { - font-size: 24px; - } } @media (max-width: 430px) { diff --git a/tests/functional/notification_webpush_test.php b/tests/functional/notification_webpush_test.php index 61478cec986..acd15a261d6 100644 --- a/tests/functional/notification_webpush_test.php +++ b/tests/functional/notification_webpush_test.php @@ -99,19 +99,19 @@ public function test_dropdown_subscribe_button() // Assert subscribe dropdown is present $crawler = self::request('GET', 'index.php'); - $this->assertCount(1, $crawler->filter('.notification-dropdown-footer')); - $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBE', $crawler->filter('.notification-dropdown-footer #subscribe_webpush')->text()); - $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBED', $crawler->filter('.notification-dropdown-footer #unsubscribe_webpush')->text()); + $this->assertCount(1, $crawler->filter('.webpush-subscribe')); + $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBE', $crawler->filter('.webpush-subscribe #subscribe_webpush')->text()); + $this->assertContainsLang('NOTIFY_WEB_PUSH_SUBSCRIBED', $crawler->filter('.webpush-subscribe #unsubscribe_webpush')->text()); // Assert subscribe button is not displayed in UCP when dropdown subscribe is present $crawler = self::request('GET', 'ucp.php?i=ucp_notifications&mode=notification_options'); - $this->assertCount(0, $crawler->filter('.notification-dropdown-footer')); + $this->assertCount(0, $crawler->filter('.webpush-subscribe')); $this->set_acp_option('webpush_dropdown_subscribe', 0); // Assert subscribe dropdown is not present by default $crawler = self::request('GET', 'index.php'); - $this->assertCount(0, $crawler->filter('.notification-dropdown-footer')); + $this->assertCount(0, $crawler->filter('.webpush-subscribe')); } protected function set_acp_option($option, $value) From abaef09a1403b6d6fe768fae1ae85143eae09e49 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 16 Jun 2024 20:31:57 +0200 Subject: [PATCH 0253/1214] [ticket/17342] Add tests for PHP 8.4 to GitHub Actions PHPBB-17342 --- .github/workflows/tests.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8f241abac7b..c7da3df4fab 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -128,6 +128,8 @@ jobs: db: "mysql:5.7" - php: '8.3' db: "mysql:5.7" + - php: '8.4' + db: "mysql:5.7" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -261,6 +263,8 @@ jobs: db: "postgres:14" - php: '8.3' db: "postgres:14" + - php: '8.4' + db: "postgres:14" name: PHP ${{ matrix.php }} - ${{ matrix.db }} @@ -469,6 +473,9 @@ jobs: - php: '8.3' db: "postgres" type: 'unit' + - php: '8.4' + db: "postgres" + type: 'unit' - php: '7.4' db: "postgres" type: 'functional' @@ -484,6 +491,9 @@ jobs: - php: '8.3' db: "postgres" type: 'functional' + - php: '8.4' + db: "postgres" + type: 'functional' name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} - ${{ matrix.type }} From 20c9656420348a7fe24e1dd93743dcd040801e44 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 16 Jun 2024 20:58:43 +0200 Subject: [PATCH 0254/1214] [ticket/17342] Disable PHP 8.4 builds on windows for now PHPBB-17342 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index edf41633b2b..4b5a58a30ff 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -486,7 +486,7 @@ jobs: strategy: matrix: type: ['unit', 'functional'] - php: ['8.1', '8.2', '8.3', '8.4'] + php: ['8.1', '8.2', '8.3'] db: ['postgres'] name: Windows - ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db }} From 4003f54d0bda589830efbae47a5173125a603a1b Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 17 Jun 2024 11:31:27 +0700 Subject: [PATCH 0255/1214] [ticket/17338] Do not update user_last_active to outdated session_time value PHPBB-17338 --- phpBB/phpbb/session.php | 25 ++++++++----------- tests/session/fixtures/sessions_garbage.xml | 3 --- tests/session/garbage_collection_test.php | 4 --- .../phpbb_session_test_case.php | 2 +- 4 files changed, 11 insertions(+), 23 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index a1d7df511a5..aa4841316fa 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -441,7 +441,7 @@ function session_begin($update_session_page = true) $this->check_ban_for_current_session($config); // Update user last active time accordingly, but in a minute or so - if ((int) $this->data['session_time'] - (int) $this->data['user_last_active'] > 60) + if ($this->time_now - (int) $this->data['user_last_active'] > 60) { $this->update_last_active_time(); } @@ -903,8 +903,7 @@ function session_kill($new_session = true) } $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $this->data['session_time'] . ', - user_last_active = ' . (int) $this->data['session_time'] . ' + SET user_lastvisit = ' . (int) $this->data['session_time'] . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); @@ -988,7 +987,7 @@ function session_gc() // For SQLite versions 3.8.3+ which support Common Table Expressions (CTE) $sql = "WITH s3 (session_page, session_user_id, session_time) AS ($sql_select) UPDATE " . USERS_TABLE . ' - SET (user_lastpage, user_lastvisit, user_last_active) = (SELECT session_page, session_time, session_time FROM s3 WHERE session_user_id = user_id) + SET (user_lastpage, user_lastvisit) = (SELECT session_page, session_time FROM s3 WHERE session_user_id = user_id) WHERE EXISTS (SELECT session_user_id FROM s3 WHERE session_user_id = user_id)'; $db->sql_query($sql); @@ -1001,9 +1000,7 @@ function session_gc() while ($row = $db->sql_fetchrow($result)) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $row['recent_time'] . ', - user_last_active = ' . (int) $row['recent_time'] . ", - user_lastpage = '" . $db->sql_escape($row['session_page']) . "' + SET user_lastvisit = ' . (int) $row['recent_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "' WHERE user_id = " . (int) $row['session_user_id']; $db->sql_query($sql); } @@ -1013,14 +1010,14 @@ function session_gc() case 'mysqli': $sql = 'UPDATE ' . USERS_TABLE . " u, ($sql_select) s3 - SET u.user_lastvisit = s3.recent_time, u.user_last_active = s3.recent_time, u.user_lastpage = s3.session_page + SET u.user_lastvisit = s3.recent_time, u.user_lastpage = s3.session_page WHERE u.user_id = s3.session_user_id"; $db->sql_query($sql); break; default: $sql = 'UPDATE ' . USERS_TABLE . " - SET user_lastvisit = s3.recent_time, user_last_active = s3.recent_time, user_lastpage = s3.session_page + SET user_lastvisit = s3.recent_time, user_lastpage = s3.session_page FROM ($sql_select) s3 WHERE user_id = s3.session_user_id"; $db->sql_query($sql); @@ -1653,9 +1650,7 @@ function reset_login_keys($user_id = false) if ($row) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_lastvisit = ' . (int) $row['session_time'] . ', - user_last_active = ' . (int) $row['session_time'] . ", - user_lastpage = '" . $db->sql_escape($row['session_page']) . "' + SET user_lastvisit = ' . (int) $row['session_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "' WHERE user_id = " . (int) $user_id; $db->sql_query($sql); } @@ -1817,7 +1812,7 @@ public function update_user_lastvisit() { $sql = 'UPDATE ' . USERS_TABLE . ' SET user_lastvisit = ' . (int) $this->data['session_time'] . ', - user_last_active = ' . (int) $this->data['session_time'] . ' + user_last_active = ' . $this->time_now . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } @@ -1832,10 +1827,10 @@ public function update_last_active_time() { global $db; - if (isset($this->data['session_time'], $this->data['user_id'])) + if (isset($this->time_now, $this->data['user_id'])) { $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_last_active = ' . (int) $this->data['session_time'] . ' + SET user_last_active = ' . $this->time_now . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } diff --git a/tests/session/fixtures/sessions_garbage.xml b/tests/session/fixtures/sessions_garbage.xml index 16971428a70..59a2dc2ebe7 100644 --- a/tests/session/fixtures/sessions_garbage.xml +++ b/tests/session/fixtures/sessions_garbage.xml @@ -7,7 +7,6 @@ user_sig user_lastpage user_lastvisit - user_last_active 4 bar @@ -15,7 +14,6 @@ oldpage_user_bar.php 1400000000 - 1300000999 5 @@ -24,7 +22,6 @@ oldpage_user_foo.php 1400000000 - 1300000998 diff --git a/tests/session/garbage_collection_test.php b/tests/session/garbage_collection_test.php index 32c4db3f85d..9080478a285 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -65,13 +65,11 @@ public function test_session_gc() [ 'username_clean' => 'bar', 'user_lastvisit' => 1400000000, - 'user_last_active' => 1300000999, 'user_lastpage' => 'oldpage_user_bar.php', ], [ 'username_clean' => 'foo', 'user_lastvisit' => 1400000000, - 'user_last_active' => 1300000998, 'user_lastpage' => 'oldpage_user_foo.php', ], ], @@ -91,13 +89,11 @@ public function test_session_gc() [ 'username_clean' => 'bar', 'user_lastvisit' => '1500000000', - 'user_last_active' => '1500000000', 'user_lastpage' => 'newpage_user_bar.php', ], [ 'username_clean' => 'foo', 'user_lastvisit' => '1500000000', - 'user_last_active' => '1500000000', 'user_lastpage' => 'newpage_user_foo.php', ], ], diff --git a/tests/test_framework/phpbb_session_test_case.php b/tests/test_framework/phpbb_session_test_case.php index 15b5d44eb53..deb76d4e5e5 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -50,7 +50,7 @@ protected function setUp(): void protected function check_user_session_data($expected_session_data, $message) { - $sql= 'SELECT username_clean, user_lastvisit, user_last_active, user_lastpage + $sql= 'SELECT username_clean, user_lastvisit, user_lastpage FROM ' . USERS_TABLE . ' ORDER BY user_id'; From 77d1010081012f8b9e4b43129ee017abbf869d17 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 20 Jun 2024 21:17:48 +0200 Subject: [PATCH 0256/1214] [ticket/17347] Add console command to delete users by user IDs PHPBB-17347 --- .../default/container/services_console.yml | 12 ++ phpBB/language/en/cli.php | 11 +- .../phpbb/console/command/user/delete_ids.php | 182 ++++++++++++++++++ 3 files changed, 201 insertions(+), 4 deletions(-) create mode 100644 phpBB/phpbb/console/command/user/delete_ids.php diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 2a62543c2f3..b7288e2ec7f 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -281,6 +281,18 @@ services: tags: - { name: console.command } + console.command.user.delete_ids: + class: phpbb\console\command\user\delete_ids + arguments: + - '@language' + - '@log' + - '@user' + - '@user_loader' + - '%core.root_path%' + - '%core.php_ext%' + tags: + - { name: console.command } + console.command.user.reclean: class: phpbb\console\command\user\reclean arguments: diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index ce81039809c..a0c2f3693a8 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -155,10 +155,13 @@ 'CLI_THUMBNAIL_NOTHING_TO_GENERATE' => 'No thumbnails to generate.', 'CLI_THUMBNAIL_NOTHING_TO_DELETE' => 'No thumbnails to delete.', - 'CLI_USER_ADD_SUCCESS' => 'Successfully added user %s.', - 'CLI_USER_DELETE_CONFIRM' => 'Are you sure you want to delete ‘%s’? [y/N]', - 'CLI_USER_RECLEAN_START' => 'Re-cleaning usernames', - 'CLI_USER_RECLEAN_DONE' => [ + 'CLI_USER_ADD_SUCCESS' => 'Successfully added user %s.', + 'CLI_USER_DELETE_CONFIRM' => 'Are you sure you want to delete ‘%s’? [y/N]', + 'CLI_USER_DELETE_IDS_CONFIRM' => 'Are you sure you want to delete the user IDs ‘%s’? [y/N]', + 'CLI_USER_DELETE_IDS_SUCCESS' => 'Successfully deleted user IDs.', + 'CLI_USER_DELETE_IDS_NOT_FOUND' => 'No users were deleted by user ID.', + 'CLI_USER_RECLEAN_START' => 'Re-cleaning usernames', + 'CLI_USER_RECLEAN_DONE' => [ 0 => 'Re-cleaning complete. No usernames needed to be cleaned.', 1 => 'Re-cleaning complete. %d username was cleaned.', 2 => 'Re-cleaning complete. %d usernames were cleaned.', diff --git a/phpBB/phpbb/console/command/user/delete_ids.php b/phpBB/phpbb/console/command/user/delete_ids.php new file mode 100644 index 00000000000..cdd7ef544e8 --- /dev/null +++ b/phpBB/phpbb/console/command/user/delete_ids.php @@ -0,0 +1,182 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\console\command\user; + +use phpbb\console\command\command; +use phpbb\db\driver\driver_interface; +use phpbb\language\language; +use phpbb\log\log_interface; +use phpbb\user; +use phpbb\user_loader; +use Symfony\Component\Console\Input\InputArgument; +use Symfony\Component\Console\Input\InputInterface; +use Symfony\Component\Console\Input\InputOption; +use Symfony\Component\Console\Output\OutputInterface; +use Symfony\Component\Console\Question\ConfirmationQuestion; +use Symfony\Component\Console\Style\SymfonyStyle; + +class delete_ids extends command +{ + /** @var driver_interface */ + protected $db; + + /** @var language */ + protected $language; + + /** @var log_interface */ + protected $log; + + /** @var user_loader */ + protected $user_loader; + + /** + * phpBB root path + * + * @var string + */ + protected $phpbb_root_path; + + /** + * PHP extension. + * + * @var string + */ + protected $php_ext; + + /** + * Construct method + * + * @param language $language + * @param log_interface $log + * @param user $user + * @param user_loader $user_loader + * @param string $phpbb_root_path + * @param string $php_ext + */ + public function __construct(language $language, log_interface $log, user $user, user_loader $user_loader, string $phpbb_root_path, string $php_ext) + { + $this->language = $language; + $this->log = $log; + $this->user_loader = $user_loader; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; + + $this->language->add_lang('acp/users'); + parent::__construct($user); + } + + /** + * Sets the command name and description + * + * @return void + */ + protected function configure(): void + { + $this + ->setName('user:delete_ids') + ->setDescription($this->language->lang('CLI_DESCRIPTION_USER_DELETE_IDS')) + ->addArgument( + 'user_ids', + InputArgument::REQUIRED | InputArgument::IS_ARRAY, + $this->language->lang('CLI_DESCRIPTION_USER_DELETE_IDS_LIST') + ) + ->addOption( + 'delete-posts', + null, + InputOption::VALUE_NONE, + $this->language->lang('CLI_DESCRIPTION_USER_DELETE_OPTION_POSTS') + ) + ; + } + + /** + * Executes the command user:delete_ids + * + * Deletes a list of user ids from the database. An option to delete the users' posts + * is available, by default posts will be retained. + * + * @param InputInterface $input The input stream used to get the options + * @param OutputInterface $output The output stream, used to print messages + * + * @return int 0 if all is well, 1 if any errors occurred + */ + protected function execute(InputInterface $input, OutputInterface $output): int + { + $user_ids = $input->getArgument('user_ids'); + $mode = ($input->getOption('delete-posts')) ? 'remove' : 'retain'; + $deleted_users = 0; + $io = new SymfonyStyle($input, $output); + + if (count($user_ids) > 0) + { + foreach ($user_ids as $user_id) + { + $user_row = $this->user_loader->get_user((int) $user_id); + + // Skip anonymous user + if ($user_row['user_id'] == ANONYMOUS) + { + continue; + } + + if (!function_exists('user_delete')) + { + require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); + } + + user_delete($mode, $user_row['user_id'], $user_row['username']); + + $this->log->add('admin', ANONYMOUS, '', 'LOG_USER_DELETED', false, array($user_row['username'])); + } + + if ($deleted_users > 0) + { + $io->success($this->language->lang('CLI_USER_DELETE_IDS_SUCCESS')); + } + } + + if (!$deleted_users) + { + $io->caution($this->language->lang('CLI_USER_DELETE_IDS_NOT_FOUND')); + } + + return 0; + } + + /** + * Interacts with the user. + * Confirm they really want to delete the account...last chance! + * + * @param InputInterface $input An InputInterface instance + * @param OutputInterface $output An OutputInterface instance + */ + protected function interact(InputInterface $input, OutputInterface $output): void + { + $helper = $this->getHelper('question'); + + $user_ids = $input->getArgument('user_ids'); + if (count($user_ids) > 0) + { + $question = new ConfirmationQuestion( + $this->language->lang('CLI_USER_DELETE_IDS_CONFIRM', implode(',', $user_ids)), + false + ); + + if (!$helper->ask($input, $output, $question)) + { + $input->setArgument('user_ids', []); + } + } + } +} From 8432e506c4b5b604785c682b057a27fa2132e1ea Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 20 Jun 2024 22:23:38 +0200 Subject: [PATCH 0257/1214] [ticket/17347] Add tests for delete ids PHPBB-17347 --- phpBB/language/en/cli.php | 2 +- .../phpbb/console/command/user/delete_ids.php | 20 +---- tests/console/user/delete_ids_test.php | 90 +++++++++++++++++++ 3 files changed, 95 insertions(+), 17 deletions(-) create mode 100644 tests/console/user/delete_ids_test.php diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index a0c2f3693a8..e271380a2f5 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -159,7 +159,7 @@ 'CLI_USER_DELETE_CONFIRM' => 'Are you sure you want to delete ‘%s’? [y/N]', 'CLI_USER_DELETE_IDS_CONFIRM' => 'Are you sure you want to delete the user IDs ‘%s’? [y/N]', 'CLI_USER_DELETE_IDS_SUCCESS' => 'Successfully deleted user IDs.', - 'CLI_USER_DELETE_IDS_NOT_FOUND' => 'No users were deleted by user ID.', + 'CLI_USER_DELETE_NONE' => 'No users were deleted by user ID.', 'CLI_USER_RECLEAN_START' => 'Re-cleaning usernames', 'CLI_USER_RECLEAN_DONE' => [ 0 => 'Re-cleaning complete. No usernames needed to be cleaned.', diff --git a/phpBB/phpbb/console/command/user/delete_ids.php b/phpBB/phpbb/console/command/user/delete_ids.php index cdd7ef544e8..3ecd43b3144 100644 --- a/phpBB/phpbb/console/command/user/delete_ids.php +++ b/phpBB/phpbb/console/command/user/delete_ids.php @@ -14,7 +14,6 @@ namespace phpbb\console\command\user; use phpbb\console\command\command; -use phpbb\db\driver\driver_interface; use phpbb\language\language; use phpbb\log\log_interface; use phpbb\user; @@ -28,9 +27,6 @@ class delete_ids extends command { - /** @var driver_interface */ - protected $db; - /** @var language */ protected $language; @@ -40,18 +36,10 @@ class delete_ids extends command /** @var user_loader */ protected $user_loader; - /** - * phpBB root path - * - * @var string - */ + /** @var string phpBB root path */ protected $phpbb_root_path; - /** - * PHP extension. - * - * @var string - */ + /** @var string PHP extension */ protected $php_ext; /** @@ -122,7 +110,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int { foreach ($user_ids as $user_id) { - $user_row = $this->user_loader->get_user((int) $user_id); + $user_row = $this->user_loader->get_user($user_id); // Skip anonymous user if ($user_row['user_id'] == ANONYMOUS) @@ -148,7 +136,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int if (!$deleted_users) { - $io->caution($this->language->lang('CLI_USER_DELETE_IDS_NOT_FOUND')); + $io->note($this->language->lang('CLI_USER_DELETE_NONE')); } return 0; diff --git a/tests/console/user/delete_ids_test.php b/tests/console/user/delete_ids_test.php new file mode 100644 index 00000000000..0595271b6b6 --- /dev/null +++ b/tests/console/user/delete_ids_test.php @@ -0,0 +1,90 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +use Symfony\Component\Console\Application; +use Symfony\Component\Console\Tester\CommandTester; +use phpbb\console\command\user\delete_ids; + +require_once __DIR__ . '/base.php'; + +class phpbb_console_user_delete_ids_test extends phpbb_console_user_base +{ + public function get_command_tester() + { + $application = new Application(); + $application->add(new delete_ids( + $this->language, + $this->log, + $this->user, + $this->user_loader, + $this->phpbb_root_path, + $this->php_ext + )); + + $command = $application->find('user:delete_ids'); + $this->command_name = $command->getName(); + $this->question = $command->getHelper('question'); + + return new CommandTester($command); + } + + public function test_delete() + { + $command_tester = $this->get_command_tester(); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3, 4], + '--delete-posts' => false, + )); + + $this->assertNull($this->get_user_id('Test')); + $this->assertNull($this->get_user_id('Test 2')); + $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); + } + + public function test_delete_non_user() + { + $command_tester = $this->get_command_tester(); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [999], + '--delete-posts' => false, + )); + + $this->assertStringContainsString('CLI_USER_DELETE_NONE', $command_tester->getDisplay()); + } + + public function test_delete_cancel() + { + $command_tester = $this->get_command_tester(); + + $this->assertEquals(3, $this->get_user_id('Test')); + + $command_tester->setInputs(['no', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3, 4], + '--delete-posts' => false, + )); + + $this->assertNotNull($this->get_user_id('Test')); + $this->assertNotNull($this->get_user_id('Test 2')); + } +} From 09f0b417be6dd7ee67ed2481b7f1d0c3d016e67d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 20 Jun 2024 22:38:24 +0200 Subject: [PATCH 0258/1214] [ticket/17347] Fix issues noticed in tests PHPBB-17347 --- phpBB/phpbb/console/command/user/delete_ids.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/phpBB/phpbb/console/command/user/delete_ids.php b/phpBB/phpbb/console/command/user/delete_ids.php index 3ecd43b3144..ee5bfe8c6ff 100644 --- a/phpBB/phpbb/console/command/user/delete_ids.php +++ b/phpBB/phpbb/console/command/user/delete_ids.php @@ -108,6 +108,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int if (count($user_ids) > 0) { + $this->user_loader->load_users($user_ids); + foreach ($user_ids as $user_id) { $user_row = $this->user_loader->get_user($user_id); @@ -126,6 +128,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int user_delete($mode, $user_row['user_id'], $user_row['username']); $this->log->add('admin', ANONYMOUS, '', 'LOG_USER_DELETED', false, array($user_row['username'])); + $deleted_users++; } if ($deleted_users > 0) From 8c77da9c308f2f9702a6a61998eec36be9928491 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 21 Jun 2024 20:48:41 +0200 Subject: [PATCH 0259/1214] [ticket/17347] Add special handling for deletion of bots PHPBB-17347 --- .../default/container/services_console.yml | 8 ++- phpBB/language/en/cli.php | 2 + .../user/{delete_ids.php => delete_id.php} | 56 +++++++++++++++++-- ...delete_ids_test.php => delete_id_test.php} | 44 ++++++++++++++- tests/console/user/fixtures/config.xml | 26 +++++++++ 5 files changed, 128 insertions(+), 8 deletions(-) rename phpBB/phpbb/console/command/user/{delete_ids.php => delete_id.php} (73%) rename tests/console/user/{delete_ids_test.php => delete_id_test.php} (65%) diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index b7288e2ec7f..8b9dcbc5f0d 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -281,13 +281,17 @@ services: tags: - { name: console.command } - console.command.user.delete_ids: - class: phpbb\console\command\user\delete_ids + console.command.user.delete_id: + class: phpbb\console\command\user\delete_id arguments: + - '@dbal.conn' - '@language' - '@log' - '@user' - '@user_loader' + - '%tables.bots%' + - '%tables.user_group%' + - '%tables.users%' - '%core.root_path%' - '%core.php_ext%' tags: diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index e271380a2f5..b2fdbebd3a0 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -108,6 +108,8 @@ 'CLI_DESCRIPTION_USER_ADD_OPTION_NOTIFY' => 'Send account activation email to the new user (not sent by default)', 'CLI_DESCRIPTION_USER_DELETE' => 'Delete a user account.', 'CLI_DESCRIPTION_USER_DELETE_USERNAME' => 'Username of the user to delete', + 'CLI_DESCRIPTION_USER_DELETE_ID' => 'Delete user accounts by ID.', + 'CLI_DESCRIPTION_USER_DELETE_ID_OPTION_ID' => 'User IDs of the users to delete', 'CLI_DESCRIPTION_USER_DELETE_OPTION_POSTS' => 'Delete all posts by the user. Without this option, the user’s posts will be retained.', 'CLI_DESCRIPTION_USER_RECLEAN' => 'Re-clean usernames.', diff --git a/phpBB/phpbb/console/command/user/delete_ids.php b/phpBB/phpbb/console/command/user/delete_id.php similarity index 73% rename from phpBB/phpbb/console/command/user/delete_ids.php rename to phpBB/phpbb/console/command/user/delete_id.php index ee5bfe8c6ff..2dda64e7d7e 100644 --- a/phpBB/phpbb/console/command/user/delete_ids.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -14,6 +14,7 @@ namespace phpbb\console\command\user; use phpbb\console\command\command; +use phpbb\db\driver\driver_interface; use phpbb\language\language; use phpbb\log\log_interface; use phpbb\user; @@ -25,8 +26,11 @@ use Symfony\Component\Console\Question\ConfirmationQuestion; use Symfony\Component\Console\Style\SymfonyStyle; -class delete_ids extends command +class delete_id extends command { + /** @var driver_interface */ + protected $db; + /** @var language */ protected $language; @@ -36,6 +40,15 @@ class delete_ids extends command /** @var user_loader */ protected $user_loader; + /** @var string Bots table */ + protected $bots_table; + + /** @var string User group table */ + protected $user_group_table; + + /** @var string Users table */ + protected $users_table; + /** @var string phpBB root path */ protected $phpbb_root_path; @@ -45,18 +58,27 @@ class delete_ids extends command /** * Construct method * + * @param driver_interface $db * @param language $language * @param log_interface $log * @param user $user * @param user_loader $user_loader + * @param string $bots_table + * @param string $user_group_table + * @param string $users_table * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(language $language, log_interface $log, user $user, user_loader $user_loader, string $phpbb_root_path, string $php_ext) + public function __construct(driver_interface $db, language $language, log_interface $log, user $user, user_loader $user_loader, + string $bots_table, string $user_group_table, string $users_table, string $phpbb_root_path, string $php_ext) { + $this->db = $db; $this->language = $language; $this->log = $log; $this->user_loader = $user_loader; + $this->bots_table = $bots_table; + $this->user_group_table = $user_group_table; + $this->users_table = $users_table; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -73,11 +95,11 @@ protected function configure(): void { $this ->setName('user:delete_ids') - ->setDescription($this->language->lang('CLI_DESCRIPTION_USER_DELETE_IDS')) + ->setDescription($this->language->lang('CLI_DESCRIPTION_USER_DELETE_ID')) ->addArgument( 'user_ids', InputArgument::REQUIRED | InputArgument::IS_ARRAY, - $this->language->lang('CLI_DESCRIPTION_USER_DELETE_IDS_LIST') + $this->language->lang('CLI_DESCRIPTION_USER_DELETE_ID_OPTION_ID') ) ->addOption( 'delete-posts', @@ -119,6 +141,11 @@ protected function execute(InputInterface $input, OutputInterface $output): int { continue; } + else if ($user_row['user_type'] == USER_IGNORE) + { + $this->delete_bot_user($user_row); + continue; + } if (!function_exists('user_delete')) { @@ -170,4 +197,25 @@ protected function interact(InputInterface $input, OutputInterface $output): voi } } } + + /** + * Deletes a bot user + * + * @param array $user_row + * @return void + */ + protected function delete_bot_user(array $user_row): void + { + $sql = 'DELETE FROM ' . $this->bots_table . ' + WHERE user_id = ' . (int) $user_row['user_id']; + $this->db->sql_query($sql); + + $delete_tables = [$this->user_group_table, $this->users_table]; + foreach ($delete_tables as $table) + { + $sql = "DELETE FROM $table + WHERE user_id = " . (int) $user_row['user_id']; + $this->db->sql_query($sql); + } + } } diff --git a/tests/console/user/delete_ids_test.php b/tests/console/user/delete_id_test.php similarity index 65% rename from tests/console/user/delete_ids_test.php rename to tests/console/user/delete_id_test.php index 0595271b6b6..a579312552c 100644 --- a/tests/console/user/delete_ids_test.php +++ b/tests/console/user/delete_id_test.php @@ -13,7 +13,7 @@ use Symfony\Component\Console\Application; use Symfony\Component\Console\Tester\CommandTester; -use phpbb\console\command\user\delete_ids; +use phpbb\console\command\user\delete_id; require_once __DIR__ . '/base.php'; @@ -22,11 +22,15 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base public function get_command_tester() { $application = new Application(); - $application->add(new delete_ids( + $application->add(new delete_id( + $this->db, $this->language, $this->log, $this->user, $this->user_loader, + BOTS_TABLE, + USER_GROUP_TABLE, + USERS_TABLE, $this->phpbb_root_path, $this->php_ext )); @@ -55,6 +59,42 @@ public function test_delete() $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); } + public function test_delete_one() + { + $command_tester = $this->get_command_tester(); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3], + '--delete-posts' => false, + )); + + $this->assertNull($this->get_user_id('Test')); + $this->assertNotNull($this->get_user_id('Test 2')); + $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); + } + + public function test_delete_bot() + { + $command_tester = $this->get_command_tester(); + + $this->assertNotNull($this->get_user_id('Test Bot')); + + $command_tester->setInputs(['yes', '']); + + $command_tester->execute(array( + 'command' => $this->command_name, + 'user_ids' => [3, 6], + '--delete-posts' => false, + )); + + $this->assertNull($this->get_user_id('Test')); + $this->assertNull($this->get_user_id('Test Bot')); + $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); + } + public function test_delete_non_user() { $command_tester = $this->get_command_tester(); diff --git a/tests/console/user/fixtures/config.xml b/tests/console/user/fixtures/config.xml index a988ba463f6..eba2eba6374 100644 --- a/tests/console/user/fixtures/config.xml +++ b/tests/console/user/fixtures/config.xml @@ -47,6 +47,14 @@ 0 + + 6 + + Test Bot + Test Bot + + 2 +
group_id @@ -59,5 +67,23 @@ 3foobar + + 6 + BOTS + 3 + + +
+ + group_id + user_id + group_leader + user_pending + + 6 + 6 + 0 + 0 +
From db40145fd56e43238d1de58b7fada829b533d6c6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 21 Jun 2024 20:59:04 +0200 Subject: [PATCH 0260/1214] [ticket/17347] Use progress bar and test bot deletion only PHPBB-17347 --- phpBB/language/en/cli.php | 5 ++-- .../phpbb/console/command/user/delete_id.php | 28 +++++++++++++------ tests/console/user/delete_id_test.php | 2 +- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index b2fdbebd3a0..b1cbe80f4dc 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -159,8 +159,9 @@ 'CLI_USER_ADD_SUCCESS' => 'Successfully added user %s.', 'CLI_USER_DELETE_CONFIRM' => 'Are you sure you want to delete ‘%s’? [y/N]', - 'CLI_USER_DELETE_IDS_CONFIRM' => 'Are you sure you want to delete the user IDs ‘%s’? [y/N]', - 'CLI_USER_DELETE_IDS_SUCCESS' => 'Successfully deleted user IDs.', + 'CLI_USER_DELETE_ID_CONFIRM' => 'Are you sure you want to delete the user IDs ‘%s’? [y/N]', + 'CLI_USER_DELETE_ID_SUCCESS' => 'Successfully deleted user IDs.', + 'CLI_USER_DELETE_ID_START' => 'Deleting users by ID', 'CLI_USER_DELETE_NONE' => 'No users were deleted by user ID.', 'CLI_USER_RECLEAN_START' => 'Re-cleaning usernames', 'CLI_USER_RECLEAN_DONE' => [ diff --git a/phpBB/phpbb/console/command/user/delete_id.php b/phpBB/phpbb/console/command/user/delete_id.php index 2dda64e7d7e..dfb389aca1a 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -132,6 +132,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int { $this->user_loader->load_users($user_ids); + $progress = $this->create_progress_bar(count($user_ids), $io, $output); + $progress->setMessage($this->language->lang('CLI_USER_DELETE_ID_START')); + $progress->start(); + foreach ($user_ids as $user_id) { $user_row = $this->user_loader->get_user($user_id); @@ -139,28 +143,34 @@ protected function execute(InputInterface $input, OutputInterface $output): int // Skip anonymous user if ($user_row['user_id'] == ANONYMOUS) { + $progress->advance(); continue; } else if ($user_row['user_type'] == USER_IGNORE) { $this->delete_bot_user($user_row); - continue; } - - if (!function_exists('user_delete')) + else { - require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); - } + if (!function_exists('user_delete')) + { + require($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); + } - user_delete($mode, $user_row['user_id'], $user_row['username']); + user_delete($mode, $user_row['user_id'], $user_row['username']); - $this->log->add('admin', ANONYMOUS, '', 'LOG_USER_DELETED', false, array($user_row['username'])); + $this->log->add('admin', ANONYMOUS, '', 'LOG_USER_DELETED', false, array($user_row['username'])); + } + + $progress->advance(); $deleted_users++; } + $progress->finish(); + if ($deleted_users > 0) { - $io->success($this->language->lang('CLI_USER_DELETE_IDS_SUCCESS')); + $io->success($this->language->lang('CLI_USER_DELETE_ID_SUCCESS')); } } @@ -187,7 +197,7 @@ protected function interact(InputInterface $input, OutputInterface $output): voi if (count($user_ids) > 0) { $question = new ConfirmationQuestion( - $this->language->lang('CLI_USER_DELETE_IDS_CONFIRM', implode(',', $user_ids)), + $this->language->lang('CLI_USER_DELETE_ID_CONFIRM', implode(',', $user_ids)), false ); diff --git a/tests/console/user/delete_id_test.php b/tests/console/user/delete_id_test.php index a579312552c..293bb56b9d8 100644 --- a/tests/console/user/delete_id_test.php +++ b/tests/console/user/delete_id_test.php @@ -86,7 +86,7 @@ public function test_delete_bot() $command_tester->execute(array( 'command' => $this->command_name, - 'user_ids' => [3, 6], + 'user_ids' => [6], '--delete-posts' => false, )); From d875eaa40596d334318e92cfd1524565657c1613 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 21 Jun 2024 21:12:09 +0200 Subject: [PATCH 0261/1214] [ticket/17347] Update tests for delete_id command PHPBB-17347 --- tests/console/user/delete_id_test.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/console/user/delete_id_test.php b/tests/console/user/delete_id_test.php index 293bb56b9d8..46db028eaf1 100644 --- a/tests/console/user/delete_id_test.php +++ b/tests/console/user/delete_id_test.php @@ -56,7 +56,7 @@ public function test_delete() $this->assertNull($this->get_user_id('Test')); $this->assertNull($this->get_user_id('Test 2')); - $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay()); } public function test_delete_one() @@ -73,7 +73,7 @@ public function test_delete_one() $this->assertNull($this->get_user_id('Test')); $this->assertNotNull($this->get_user_id('Test 2')); - $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay()); } public function test_delete_bot() @@ -90,9 +90,8 @@ public function test_delete_bot() '--delete-posts' => false, )); - $this->assertNull($this->get_user_id('Test')); $this->assertNull($this->get_user_id('Test Bot')); - $this->assertStringContainsString('CLI_USER_DELETE_IDS_SUCCESS', $command_tester->getDisplay()); + $this->assertStringContainsString('CLI_USER_DELETE_ID_SUCCESS', $command_tester->getDisplay()); } public function test_delete_non_user() From 7f9bcc2743e77aa02480b69a4f89fa4a3e31bfde Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 21 Jun 2024 21:12:38 +0200 Subject: [PATCH 0262/1214] [ticket/17347] Change command to be called user:delete_id PHPBB-17347 --- phpBB/phpbb/console/command/user/delete_id.php | 2 +- tests/console/user/delete_id_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/console/command/user/delete_id.php b/phpBB/phpbb/console/command/user/delete_id.php index dfb389aca1a..f189fe72cc9 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -94,7 +94,7 @@ public function __construct(driver_interface $db, language $language, log_interf protected function configure(): void { $this - ->setName('user:delete_ids') + ->setName('user:delete_id') ->setDescription($this->language->lang('CLI_DESCRIPTION_USER_DELETE_ID')) ->addArgument( 'user_ids', diff --git a/tests/console/user/delete_id_test.php b/tests/console/user/delete_id_test.php index 46db028eaf1..fb5b60ba0ed 100644 --- a/tests/console/user/delete_id_test.php +++ b/tests/console/user/delete_id_test.php @@ -35,7 +35,7 @@ public function get_command_tester() $this->php_ext )); - $command = $application->find('user:delete_ids'); + $command = $application->find('user:delete_id'); $this->command_name = $command->getName(); $this->question = $command->getHelper('question'); From fa893f092b1381ab85f3c70f7ed589a28b6d6b22 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 22 Jun 2024 07:33:06 +0200 Subject: [PATCH 0263/1214] [ticket/17347] Get rid of not needed code duplication PHPBB-17347 --- phpBB/phpbb/console/command/user/delete_id.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/phpBB/phpbb/console/command/user/delete_id.php b/phpBB/phpbb/console/command/user/delete_id.php index f189fe72cc9..ac00138a17f 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -216,11 +216,7 @@ protected function interact(InputInterface $input, OutputInterface $output): voi */ protected function delete_bot_user(array $user_row): void { - $sql = 'DELETE FROM ' . $this->bots_table . ' - WHERE user_id = ' . (int) $user_row['user_id']; - $this->db->sql_query($sql); - - $delete_tables = [$this->user_group_table, $this->users_table]; + $delete_tables = [$this->bots_table, $this->user_group_table, $this->users_table]; foreach ($delete_tables as $table) { $sql = "DELETE FROM $table From f3460fe9eb308e3cf5e9f8535e997ddfd93d5118 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 23 Jun 2024 23:26:13 +0200 Subject: [PATCH 0264/1214] [ticket/17337] Extend write tests with simple transaction test PHPBB-17337 --- tests/dbal/write_test.php | 41 +++++++++++++++++++ .../phpbb_database_test_case.php | 2 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index f0093ff869e..6e76e08802e 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -73,6 +73,47 @@ public function test_delete() $db->sql_freeresult($result); } + public function test_delete_rollback() + { + $db = $this->new_dbal(); + + $db->sql_transaction('begin'); + + $sql = "DELETE FROM phpbb_config + WHERE config_name = 'config1'"; + $db->sql_query($sql); + + // Rollback and check that nothing was changed + $db->sql_transaction('rollback'); + + $sql = 'SELECT * + FROM phpbb_config'; + $result = $db->sql_query($sql); + $rows = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + $this->assertEquals(2, count($rows)); + $this->assertEquals('config1', $rows[0]['config_name']); + + $db->sql_transaction('begin'); + + $sql = "DELETE FROM phpbb_config + WHERE config_name = 'config1'"; + $db->sql_query($sql); + + // Commit and check that data was actually changed + $db->sql_transaction('commit'); + + $sql = 'SELECT * + FROM phpbb_config'; + $result = $db->sql_query($sql); + $rows = $db->sql_fetchrowset($result); + $db->sql_freeresult($result); + + $this->assertEquals(1, count($rows)); + $this->assertEquals('config2', $rows[0]['config_name']); + } + public function test_multiple_insert() { $db = $this->new_dbal(); diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index c46bbe11c38..a7054d56356 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -285,7 +285,7 @@ public function getConnection() return $this->createDefaultDBConnection($manager->get_pdo(), 'testdb'); } - public function new_dbal() + public function new_dbal() : \phpbb\db\driver\driver_interface { $config = $this->get_database_config(); From dd3ebe2b71adca803dce4e89ee9c10e04c9f2e31 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 24 Jun 2024 21:07:43 +0700 Subject: [PATCH 0265/1214] [ticket/17337] Correctly handle transaction test on MyISAM (non-transactional) PHPBB-17337 --- tests/dbal/write_test.php | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/dbal/write_test.php b/tests/dbal/write_test.php index 6e76e08802e..f94aebd85b3 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -77,6 +77,13 @@ public function test_delete_rollback() { $db = $this->new_dbal(); + $is_myisam = false; + if ($db->get_sql_layer() === 'mysqli') + { + $table_status = $db->get_table_status('phpbb_config'); + $is_myisam = isset($table_status['Engine']) && $table_status['Engine'] === 'MyISAM'; + } + $db->sql_transaction('begin'); $sql = "DELETE FROM phpbb_config @@ -92,8 +99,21 @@ public function test_delete_rollback() $rows = $db->sql_fetchrowset($result); $db->sql_freeresult($result); - $this->assertEquals(2, count($rows)); - $this->assertEquals('config1', $rows[0]['config_name']); + if (!$is_myisam) + { + $this->assertEquals(2, count($rows)); + $this->assertEquals('config1', $rows[0]['config_name']); + } + else + { + // Rollback does not work on MyISAM + $this->assertEquals(1, count($rows)); + $this->assertEquals('config2', $rows[0]['config_name']); + + // Restore deleted config value on MyISAM + $sql = "INSERT INTO phpbb_config (config_name, config_value, is_dynamic) VALUES ('config1', 'foo', 0)"; + $db->sql_query($sql); + } $db->sql_transaction('begin'); From 5976dc2141b63505dc5b04172acd3f1b9f29bd25 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 25 Jun 2024 16:09:52 +0100 Subject: [PATCH 0266/1214] [ticket/17352] Fix overflow of long rank titles on profile page Users that had very long rank titles would cause the rest of their profile details to be pushed down below the avatar and rank details breaking the layout. This change limits the width of the avatar and rank details. PHPBB-17352 --- phpBB/styles/prosilver/template/memberlist_view.html | 2 +- phpBB/styles/prosilver/theme/common.css | 4 ++++ phpBB/styles/prosilver/theme/responsive.css | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index debf64cba2a..0ad1c80edbf 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -9,7 +9,7 @@

{PAGE_TITLE}

-
+
{AVATAR_IMG}
{RANK_TITLE}
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e184557a894..693a5147ba4 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -731,6 +731,10 @@ table.info tbody th { max-width: 100%; } +.avatar-rank-container { + max-width: 20%; +} + .left-box.profile-details { width: 80%; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 5a3041fe0ca..78897be19c5 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -412,6 +412,10 @@ clear: both; } + .avatar-rank-container { + max-width: 100%; + } + /* Polls ----------------------------------------*/ fieldset.polls dt { From 8eacbf830512e0e9a2b8b45e3ba50e0d218e48ae Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 25 Jun 2024 16:24:58 +0100 Subject: [PATCH 0267/1214] [ticket/17350] Add IP Address of user during install process Adds the IP address of the user completing the installation process while extensions are being installed or updated. Prior to this change the IP address field was being left blank however other logs created during the install process for other actions does record the users IP. PHPBB-17350 --- .../install/module/install_finish/task/install_extensions.php | 2 +- .../install/module/update_database/task/update_extensions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php index 9f970de6a5c..4287fa61877 100644 --- a/phpBB/phpbb/install/module/install_finish/task/install_extensions.php +++ b/phpBB/phpbb/install/module/install_finish/task/install_extensions.php @@ -144,7 +144,7 @@ public function run() if (isset($extensions[$ext_name]) && $extensions[$ext_name]['ext_active']) { // Create log - $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_ENABLE', time(), array($ext_name)); + $this->log->add('admin', ANONYMOUS, $this->user->ip, 'LOG_EXT_ENABLE', time(), array($ext_name)); $this->iohandler->add_success_message(array('CLI_EXTENSION_ENABLE_SUCCESS', $ext_name)); } else diff --git a/phpBB/phpbb/install/module/update_database/task/update_extensions.php b/phpBB/phpbb/install/module/update_database/task/update_extensions.php index 0195b9c6618..e9922068ed5 100644 --- a/phpBB/phpbb/install/module/update_database/task/update_extensions.php +++ b/phpBB/phpbb/install/module/update_database/task/update_extensions.php @@ -174,7 +174,7 @@ public function run() if (isset($extensions[$ext_name]) && $extensions[$ext_name]['ext_active']) { // Create log - $this->log->add('admin', ANONYMOUS, '', 'LOG_EXT_UPDATE', time(), array($ext_name)); + $this->log->add('admin', ANONYMOUS, $this->user->ip, 'LOG_EXT_UPDATE', time(), array($ext_name)); $this->iohandler->add_success_message(array('CLI_EXTENSION_UPDATE_SUCCESS', $ext_name)); } else From e5d2e82ef546b250dca16fecc344fa78af884aea Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 28 Jun 2024 11:08:46 +0700 Subject: [PATCH 0268/1214] [ticket/17351] Correctly handle md5 passwords rehashing PHPBB-17351 --- phpBB/phpbb/console/command/fixup/update_hashes.php | 10 +++++++++- phpBB/phpbb/cron/task/core/update_hashes.php | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/console/command/fixup/update_hashes.php b/phpBB/phpbb/console/command/fixup/update_hashes.php index 8a2ef607711..5a9c12f2a5c 100644 --- a/phpBB/phpbb/console/command/fixup/update_hashes.php +++ b/phpBB/phpbb/console/command/fixup/update_hashes.php @@ -100,7 +100,15 @@ protected function execute(InputInterface $input, OutputInterface $output) while ($row = $this->db->sql_fetchrow($result)) { $old_hash = preg_replace('/^\$CP\$/', '', $row['user_password']); - $new_hash = $this->passwords_manager->hash($old_hash, array($this->default_type)); + + // If stored hash type is unknown then it's md5 hash with no prefix + // First rehash it using $H$ as hash type identifier (salted_md5) + if (!$this->passwords_manager->detect_algorithm($old_hash)) + { + $old_hash = $this->passwords_manager->hash($old_hash, '$H$'); + } + + $new_hash = $this->passwords_manager->hash($old_hash, [$this->default_type]); $sql = 'UPDATE ' . USERS_TABLE . " SET user_password = '" . $this->db->sql_escape($new_hash) . "' diff --git a/phpBB/phpbb/cron/task/core/update_hashes.php b/phpBB/phpbb/cron/task/core/update_hashes.php index 3348a4576ec..78221bb35f3 100644 --- a/phpBB/phpbb/cron/task/core/update_hashes.php +++ b/phpBB/phpbb/cron/task/core/update_hashes.php @@ -107,7 +107,15 @@ public function run() while ($row = $this->db->sql_fetchrow($result)) { $old_hash = preg_replace('/^\$CP\$/', '', $row['user_password']); - $new_hash = $this->passwords_manager->hash($old_hash, array($this->default_type)); + + // If stored hash type is unknown then it's md5 hash with no prefix + // First rehash it using $H$ as hash type identifier (salted_md5) + if (!$this->passwords_manager->detect_algorithm($old_hash)) + { + $old_hash = $this->passwords_manager->hash($old_hash, '$H$'); + } + + $new_hash = $this->passwords_manager->hash($old_hash, [$this->default_type]); // Increase number so we know that users were selected from the database $affected_rows++; From 5b03cd422a0d77b8e420eab69aaabe6fa188f8a7 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Fri, 28 Jun 2024 21:15:51 +0200 Subject: [PATCH 0269/1214] [ticket/17356] Correctly handle errors hidden by at PHPBB-17356 --- phpBB/includes/functions.php | 10 +++++++++- phpBB/install/startup.php | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 1ca315275b5..3a034bc7ab1 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3028,8 +3028,16 @@ function msg_handler($errno, $msg_text, $errfile, $errline) global $phpbb_root_path, $msg_title, $msg_long_text, $phpbb_log; global $phpbb_container; + // https://www.php.net/manual/en/language.operators.errorcontrol.php + // error_reporting() return a different error code inside the error handler after php 8.0 + $suppresed = E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE; + if (PHP_VERSION_ID < 80000) + { + $suppresed = 0; + } + // Do not display notices if we suppress them via @ - if (error_reporting() == 0 && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE) + if (error_reporting() == $suppresed && $errno != E_USER_ERROR && $errno != E_USER_WARNING && $errno != E_USER_NOTICE) { return; } diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php index 0f2b1a60a05..c0405ac0972 100644 --- a/phpBB/install/startup.php +++ b/phpBB/install/startup.php @@ -51,7 +51,15 @@ function installer_msg_handler($errno, $msg_text, $errfile, $errline) { global $phpbb_installer_container, $msg_long_text; - if (error_reporting() == 0) + // Acording to https://www.php.net/manual/en/language.operators.errorcontrol.php + // error_reporting() return a different error code inside the error handler after php 8.0 + $suppresed = E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR | E_RECOVERABLE_ERROR | E_PARSE; + if (PHP_VERSION_ID < 80000) + { + $suppresed = 0; + } + + if (error_reporting() == $suppresed) { return true; } From 5a9c01716f066a7ff851d4ba285b479d0d1be110 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 30 Jun 2024 12:45:14 +0700 Subject: [PATCH 0270/1214] [ticket/17358] Properly handle Redis cache expiration time PHPBB-17358 --- phpBB/phpbb/cache/driver/redis.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/cache/driver/redis.php b/phpBB/phpbb/cache/driver/redis.php index eaeb529918a..f5c70c3a52e 100644 --- a/phpBB/phpbb/cache/driver/redis.php +++ b/phpBB/phpbb/cache/driver/redis.php @@ -129,6 +129,10 @@ function _read($var) /** * Store data in the cache * + * For the info, see https://phpredis.github.io/phpredis/Redis.html#method_set, + * https://redis.io/docs/latest/commands/set/ + * and https://redis.io/docs/latest/commands/expire/#appendix-redis-expires + * * @access protected * @param string $var Cache key * @param mixed $data Data to store @@ -137,11 +141,7 @@ function _read($var) */ function _write($var, $data, $ttl = 2592000) { - if ($ttl == 0) - { - return $this->redis->set($var, $data); - } - return $this->redis->setex($var, $ttl, $data); + return $this->redis->set($var, $data, ['EXAT' => time() + $ttl]); } /** From 877e364cbdac2e2dffa05d690335aef502c77fbe Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 30 Jun 2024 13:59:41 +0200 Subject: [PATCH 0271/1214] [ticket/17357] Remove file_info from storage PHPBB-17357 --- .../default/container/services_storage.yml | 4 +- phpBB/includes/acp/acp_attachments.php | 3 - phpBB/includes/functions_content.php | 14 +-- .../includes/questionnaire/questionnaire.php | 2 - .../install/convertors/functions_phpbb20.php | 2 - phpBB/install/schemas/schema_data.sql | 2 - phpBB/language/en/acp/attachments.php | 2 - .../migration/data/v400/remove_img_link.php | 41 +++++++ .../storage/adapter/adapter_interface.php | 10 +- phpBB/phpbb/storage/adapter/local.php | 99 +--------------- phpBB/phpbb/storage/controller/attachment.php | 6 +- phpBB/phpbb/storage/controller/avatar.php | 6 +- phpBB/phpbb/storage/controller/controller.php | 13 ++- phpBB/phpbb/storage/file_info.php | 85 -------------- phpBB/phpbb/storage/storage.php | 108 ++++++++---------- tests/storage/adapter/local_test_case.php | 2 - 16 files changed, 118 insertions(+), 281 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_img_link.php delete mode 100644 phpBB/phpbb/storage/file_info.php diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml index 496c30de5d8..4ff6f96ae36 100644 --- a/phpBB/config/default/container/services_storage.yml +++ b/phpBB/config/default/container/services_storage.yml @@ -70,8 +70,6 @@ services: shared: false arguments: - '@filesystem' - - '@upload_imagesize' - - '@mimetype.guesser' - '%core.root_path%' tags: - { name: storage.adapter } @@ -90,6 +88,7 @@ services: - '@cache' - '@config' - '@dbal.conn' + - '@mimetype.extension_guesser' - '@storage.avatar' - '@symfony_request' @@ -102,6 +101,7 @@ services: - '@content.visibility' - '@dbal.conn' - '@event_dispatcher' + - '@mimetype.extension_guesser' - '@language' - '@request' - '@storage.attachment' diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 0d66dfde4fa..b0e086e65c7 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -173,8 +173,6 @@ function main($id, $mode) 'img_max_width' => array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,), 'img_max_height' => array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,), - 'img_link_width' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,), - 'img_link_height' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int:0', 'type' => false, 'method' => false, 'explain' => false,), 'allow_attachments' => array('lang' => 'ALLOW_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'allow_pm_attach' => array('lang' => 'ALLOW_PM_ATTACHMENTS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), @@ -197,7 +195,6 @@ function main($id, $mode) 'img_max' => array('lang' => 'MAX_IMAGE_SIZE', 'validate' => 'int:0:9999', 'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'img_strip_metadata' => array('lang' => 'IMAGE_STRIP_METADATA', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'img_quality' => array('lang' => 'IMAGE_QUALITY', 'validate' => 'int:50:90', 'type' => 'number:50:90', 'explain' => true, 'append' => ' %'), - 'img_link' => array('lang' => 'IMAGE_LINK_SIZE', 'validate' => 'int:0:9999', 'type' => 'dimension:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), ) ); diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 941b2eb2462..ae992b4828d 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1260,19 +1260,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a { if ($config['img_display_inlined']) { - if ($config['img_link_width'] || $config['img_link_height']) - { - try - { - $file_info = $storage_attachment->file_info($filename); - - $display_cat = ($file_info->image_width <= $config['img_link_width'] && $file_info->image_height <= $config['img_link_height']) ? attachment_category::IMAGE : attachment_category::NONE; - } - catch (\Exception $e) - { - $display_cat = attachment_category::NONE; - } - } + $display_cat = attachment_category::IMAGE; } else { diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 8ab18ad8c8c..24a4ce53b4f 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -361,8 +361,6 @@ function get_data() 'hot_threshold' => true, 'img_create_thumbnail' => true, 'img_display_inlined' => true, - 'img_link_height' => true, - 'img_link_width' => true, 'img_max_height' => true, 'img_max_thumb_width' => true, 'img_max_width' => true, diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 75a0b8def45..4063c2d01f0 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1676,8 +1676,6 @@ function phpbb_import_attach_config() $config->set('img_display_inlined', $attach_config['img_display_inlined']); $config->set('img_max_width', $attach_config['img_max_width']); $config->set('img_max_height', $attach_config['img_max_height']); - $config->set('img_link_width', $attach_config['img_link_width']); - $config->set('img_link_height', $attach_config['img_link_height']); $config->set('img_create_thumbnail', $attach_config['img_create_thumbnail']); $config->set('img_max_thumb_width', 400); $config->set('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ba8f654a908..a9db639b9ea 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -155,8 +155,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('hot_threshold', '2 INSERT INTO phpbb_config (config_name, config_value) VALUES ('icons_path', 'images/icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_create_thumbnail', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_display_inlined', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_height', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_link_width', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_height', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_thumb_width', '400'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('img_max_width', '0'); diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 351f61dbef6..630977b5ce9 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -111,8 +111,6 @@ 'GO_TO_EXTENSIONS' => 'Go to extension management screen', 'GROUP_NAME' => 'Group name', - 'IMAGE_LINK_SIZE' => 'Image link dimensions', - 'IMAGE_LINK_SIZE_EXPLAIN' => 'Display image attachment as an inline text link if image is larger than this. To disable this behaviour, set the values to 0px by 0px.', 'IMAGE_QUALITY' => 'Quality of uploaded image attachments (JPEG only)', 'IMAGE_QUALITY_EXPLAIN' => 'Specify value between 50% (smaller file size) and 90% (higher quality). Quality higher than 90% increases filesize and is disabled. Setting only applies if maximum image dimensions are set to a value other than 0px by 0px.', 'IMAGE_STRIP_METADATA' => 'Strip image metadata (JPEG only)', diff --git a/phpBB/phpbb/db/migration/data/v400/remove_img_link.php b/phpBB/phpbb/db/migration/data/v400/remove_img_link.php new file mode 100644 index 00000000000..172bea5e1d0 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_img_link.php @@ -0,0 +1,41 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_img_link extends migration +{ + public function effectively_installed() + { + return !$this->config->offsetExists('img_link_width') + && !$this->config->offsetExists('img_link_height'); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v400\dev' + ]; + } + + public function update_data() + { + return [ + ['config.remove', ['img_link_width']], + ['config.remove', ['img_link_height']], + ]; + } +} diff --git a/phpBB/phpbb/storage/adapter/adapter_interface.php b/phpBB/phpbb/storage/adapter/adapter_interface.php index 725b954c2d3..d7fcd77bcb9 100644 --- a/phpBB/phpbb/storage/adapter/adapter_interface.php +++ b/phpBB/phpbb/storage/adapter/adapter_interface.php @@ -20,7 +20,7 @@ interface adapter_interface /** * Set adapter parameters * - * @param array options Storage-specific options. + * @param array $options options Storage-specific options. */ public function configure(array $options): void; @@ -82,13 +82,15 @@ public function rename(string $path_orig, string $path_dest): void; public function copy(string $path_orig, string $path_dest): void; /** - * Get direct link + * Get file size in bytes * * @param string $path The file * - * @return string Returns link. + * @return int Size in bytes. + * + * @throws storage_exception When unable to retrieve file size */ - public function get_link(string $path): string; + public function file_size(string $path): int; /** * Get space available in bytes diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php index 48722cf5b23..72d92096d51 100644 --- a/phpBB/phpbb/storage/adapter/local.php +++ b/phpBB/phpbb/storage/adapter/local.php @@ -18,8 +18,6 @@ use phpbb\filesystem\exception\filesystem_exception; use phpbb\filesystem\filesystem; use phpbb\filesystem\helper as filesystem_helper; -use phpbb\mimetype\guesser; -use FastImageSize\FastImageSize; /** * Experimental @@ -33,20 +31,6 @@ class local implements adapter_interface, stream_interface */ protected $filesystem; - /** - * FastImageSize - * - * @var FastImageSize - */ - protected $imagesize; - - /** - * Mimetype Guesser component - * - * @var guesser - */ - protected $mimetype_guesser; - /** * @var string path */ @@ -77,15 +61,11 @@ class local implements adapter_interface, stream_interface * Constructor * * @param filesystem $filesystem - * @param FastImageSize $imagesize - * @param guesser $mimetype_guesser * @param string $phpbb_root_path */ - public function __construct(filesystem $filesystem, FastImageSize $imagesize, guesser $mimetype_guesser, string $phpbb_root_path) + public function __construct(filesystem $filesystem, string $phpbb_root_path) { $this->filesystem = $filesystem; - $this->imagesize = $imagesize; - $this->mimetype_guesser = $mimetype_guesser; $this->phpbb_root_path = $phpbb_root_path; } @@ -294,15 +274,9 @@ public function write_stream(string $path, $resource): void } /** - * Get file size - * - * @param string $path The file - * - * @return array Properties - * - * @throws storage_exception When cannot get size + * {@inheritdoc} */ - public function file_size(string $path): array + public function file_size(string $path): int { $size = @filesize($this->root_path . $this->get_path($path) . $this->get_filename($path)); @@ -311,72 +285,7 @@ public function file_size(string $path): array throw new storage_exception('STORAGE_CANNOT_GET_FILESIZE'); } - return ['size' => $size]; - } - - /** - * Get file mimetype - * - * @param string $path The file - * - * @return array Properties - */ - public function file_mimetype(string $path): array - { - return ['mimetype' => $this->mimetype_guesser->guess($this->root_path . $this->get_path($path) . $this->get_filename($path))]; - } - - /** - * Get image dimensions - * - * @param string $path The file - * - * @return array Properties - */ - protected function image_dimensions(string $path): array - { - $size = $this->imagesize->getImageSize($this->root_path . $this->get_path($path) . $this->get_filename($path)); - - // For not supported types like swf - if ($size === false) - { - $imsize = getimagesize($this->root_path . $this->get_path($path) . $this->get_filename($path)); - $size = ['width' => $imsize[0], 'height' => $imsize[1]]; - } - - return ['image_width' => $size['width'], 'image_height' => $size['height']]; - } - - /** - * Get image width - * - * @param string $path The file - * - * @return array Properties - */ - public function file_image_width(string $path): array - { - return $this->image_dimensions($path); - } - - /** - * Get image height - * - * @param string $path The file - * - * @return array Properties - */ - public function file_image_height(string $path): array - { - return $this->image_dimensions($path); - } - - /** - * {@inheritdoc} - */ - public function get_link(string $path): string - { - return generate_board_url() . '/' . $this->path . $path; + return $size; } /** diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index d9e108e098a..9d84fceb457 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -22,6 +22,7 @@ use phpbb\event\dispatcher_interface; use phpbb\exception\http_exception; use phpbb\language\language; +use phpbb\mimetype\extension_guesser; use phpbb\request\request; use phpbb\storage\storage; use phpbb\user; @@ -66,15 +67,16 @@ class attachment extends controller * @param content_visibility $content_visibility * @param driver_interface $db * @param dispatcher_interface $dispatcher + * @param extension_guesser $extension_guesser * @param language $language * @param request $request * @param storage $storage * @param symfony_request $symfony_request * @param user $user */ - public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user) + public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, extension_guesser $extension_guesser, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user) { - parent::__construct($cache, $db, $storage, $symfony_request); + parent::__construct($cache, $db, $extension_guesser, $storage, $symfony_request); $this->auth = $auth; $this->config = $config; diff --git a/phpBB/phpbb/storage/controller/avatar.php b/phpBB/phpbb/storage/controller/avatar.php index 7055961230b..720745e2cce 100644 --- a/phpBB/phpbb/storage/controller/avatar.php +++ b/phpBB/phpbb/storage/controller/avatar.php @@ -16,6 +16,7 @@ use phpbb\cache\service; use phpbb\config\config; use phpbb\db\driver\driver_interface; +use phpbb\mimetype\extension_guesser; use phpbb\storage\storage; use Symfony\Component\HttpFoundation\Request as symfony_request; use Symfony\Component\HttpFoundation\Response; @@ -39,12 +40,13 @@ class avatar extends controller * @param service $cache * @param config $config * @param driver_interface $db + * @param extension_guesser $extension_guesser * @param storage $storage * @param symfony_request $symfony_request */ - public function __construct(service $cache, config $config, driver_interface $db, storage $storage, symfony_request $symfony_request) + public function __construct(service $cache, config $config, driver_interface $db, extension_guesser $extension_guesser, storage $storage, symfony_request $symfony_request) { - parent::__construct($cache, $db, $storage, $symfony_request); + parent::__construct($cache, $db , $extension_guesser, $storage, $symfony_request); $this->config = $config; } diff --git a/phpBB/phpbb/storage/controller/controller.php b/phpBB/phpbb/storage/controller/controller.php index d1ea9f29f77..94af901eed3 100644 --- a/phpBB/phpbb/storage/controller/controller.php +++ b/phpBB/phpbb/storage/controller/controller.php @@ -16,6 +16,7 @@ use phpbb\cache\service; use phpbb\db\driver\driver_interface; use phpbb\exception\http_exception; +use phpbb\mimetype\extension_guesser; use phpbb\storage\exception\storage_exception; use phpbb\storage\storage; use Symfony\Component\HttpFoundation\Request as symfony_request; @@ -33,6 +34,9 @@ class controller /** @var driver_interface */ protected $db; + /** @var extension_guesser */ + protected $extension_guesser; + /** @var storage */ protected $storage; @@ -47,10 +51,11 @@ class controller * @param storage $storage * @param symfony_request $symfony_request */ - public function __construct(service $cache, driver_interface $db, storage $storage, symfony_request $symfony_request) + public function __construct(service $cache, driver_interface $db, extension_guesser $extension_guesser, storage $storage, symfony_request $symfony_request) { $this->cache = $cache; $this->db = $db; + $this->extension_guesser = $extension_guesser; $this->storage = $storage; $this->symfony_request = $symfony_request; } @@ -124,14 +129,12 @@ protected function file_exists(string $file): bool */ protected function prepare(StreamedResponse $response, string $file): void { - $file_info = $this->storage->file_info($file); - // Add Content-Type header if (!$response->headers->has('Content-Type')) { try { - $content_type = $file_info->get('mimetype'); + $content_type = $this->extension_guesser->guess($file); } catch (storage_exception $e) { @@ -146,7 +149,7 @@ protected function prepare(StreamedResponse $response, string $file): void { try { - $response->headers->set('Content-Length', $file_info->get('size')); + $response->headers->set('Content-Length', $this->storage->file_size($file)); } catch (storage_exception $e) { diff --git a/phpBB/phpbb/storage/file_info.php b/phpBB/phpbb/storage/file_info.php deleted file mode 100644 index 3bb6b281319..00000000000 --- a/phpBB/phpbb/storage/file_info.php +++ /dev/null @@ -1,85 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\storage; - -use phpbb\storage\exception\storage_exception; -use phpbb\storage\adapter\adapter_interface; - -class file_info -{ - /** - * @var adapter_interface - */ - protected $adapter; - - /** - * Path of the file - * - * @var string - */ - protected $path; - - /** - * Stores the properties of $path file, so dont have to be consulted multiple times. - * For example, when you need the width of an image, using getimagesize() you get - * both dimensions, so you store both here, and when you get the height, you dont have - * to call getimagesize() again - * - * @var array - */ - protected $properties; - - /** - * Constructor - * - * @param adapter_interface $adapter - * @param string $path - */ - public function __construct(adapter_interface $adapter, $path) - { - $this->adapter = $adapter; - $this->path = $path; - $this->properties = []; - } - - /** - * Load propertys lazily - * - * @param string $name The property name. - * - * @return string Returns the property value - */ - public function get($name) - { - if (!isset($this->properties[$name])) - { - if (!method_exists($this->adapter, 'file_' . $name)) - { - throw new storage_exception('STORAGE_METHOD_NOT_IMPLEMENTED'); - } - - $this->properties = array_merge($this->properties, call_user_func([$this->adapter, 'file_' . $name], $this->path)); - } - - return $this->properties[$name]; - } - - /** - * Alias of \phpbb\storage\file_info->get() - */ - public function __get($name) - { - return $this->get($name); - } -} diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php index a4c652f40ab..fa1ca0d204d 100644 --- a/phpBB/phpbb/storage/storage.php +++ b/phpBB/phpbb/storage/storage.php @@ -59,11 +59,11 @@ class storage * * @param db $db * @param cache $cache - * @param adapter_factory $factory + * @param adapter_factory $factory * @param string $storage_name * @param string $storage_table */ - public function __construct(db $db, cache $cache, adapter_factory $factory, $storage_name, $storage_table) + public function __construct(db $db, cache $cache, adapter_factory $factory, string $storage_name, string $storage_table) { $this->db = $db; $this->cache = $cache; @@ -77,7 +77,7 @@ public function __construct(db $db, cache $cache, adapter_factory $factory, $sto * * @return string */ - public function get_name() + public function get_name(): string { return $this->storage_name; } @@ -87,7 +87,7 @@ public function get_name() * * @return adapter_interface */ - protected function get_adapter() + protected function get_adapter(): mixed { if ($this->adapter === null) { @@ -106,7 +106,7 @@ protected function get_adapter() * @throws storage_exception When the file already exists * When the file cannot be written */ - public function put_contents($path, $content) + public function put_contents(string $path, string $content): void { if ($this->exists($path)) { @@ -128,7 +128,7 @@ public function put_contents($path, $content) * When cannot read file contents * */ - public function get_contents($path) + public function get_contents(string $path): string { if (!$this->exists($path)) { @@ -146,7 +146,7 @@ public function get_contents($path) * * @return bool Returns true if the file/directory exist, false otherwise */ - public function exists($path, $full_check = false) + public function exists(string $path, bool $full_check = false): bool { return ($this->is_tracked($path) && (!$full_check || $this->get_adapter()->exists($path))); } @@ -154,12 +154,12 @@ public function exists($path, $full_check = false) /** * Removes files or directories * - * @param string $path file/directory to remove + * @param string $path file/directory to remove * * @throws storage_exception When removal fails * When the file doesn't exist */ - public function delete($path) + public function delete(string $path): void { if (!$this->exists($path)) { @@ -173,14 +173,14 @@ public function delete($path) /** * Rename a file or a directory * - * @param string $path_orig The original file/direcotry - * @param string $path_dest The target file/directory + * @param string $path_orig The original file/direcotry + * @param string $path_dest The target file/directory * * @throws storage_exception When the file doesn't exist * When target exists * When file/directory cannot be renamed */ - public function rename($path_orig, $path_dest) + public function rename(string $path_orig, string $path_dest): void { if (!$this->exists($path_orig)) { @@ -199,14 +199,14 @@ public function rename($path_orig, $path_dest) /** * Copies a file * - * @param string $path_orig The original filename - * @param string $path_dest The target filename + * @param string $path_orig The original filename + * @param string $path_dest The target filename * * @throws storage_exception When the file doesn't exist * When target exists * When the file cannot be copied */ - public function copy($path_orig, $path_dest) + public function copy(string $path_orig, string $path_dest): void { if (!$this->exists($path_orig)) { @@ -225,14 +225,14 @@ public function copy($path_orig, $path_dest) /** * Reads a file as a stream * - * @param string $path File to read + * @param string $path File to read * * @return resource Returns a file pointer * @throws storage_exception When the file doesn't exist * When unable to open file * */ - public function read_stream($path) + public function read_stream(string $path) { if (!$this->exists($path)) { @@ -260,13 +260,13 @@ public function read_stream($path) /** * Writes a new file using a stream * - * @param string $path The target file + * @param string $path The target file * @param resource $resource The resource * * @throws storage_exception When the file exist * When target file cannot be created */ - public function write_stream($path, $resource) + public function write_stream(string $path, $resource): void { if ($this->exists($path)) { @@ -295,10 +295,10 @@ public function write_stream($path, $resource) /** * Track file in database * - * @param string $path The target file - * @param bool $update Update file size when already tracked + * @param string $path The target file + * @param bool $update Update file size when already tracked */ - public function track_file($path, $update = false) + public function track_file(string $path, bool $update = false): void { if (!$this->get_adapter()->exists($path)) { @@ -319,20 +319,15 @@ public function track_file($path, $update = false) if (!$row) { - // Don't call the file_info method, because it check's if the file is tracked - // and is not (for now). This method check if the file exists using the adapter - // at the beginning. - $file = new file_info($this->get_adapter(), $path); - $sql_ary['filesize'] = $file->size; + $sql_ary['filesize'] = $this->get_adapter()->file_size($path); $sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary); $this->db->sql_query($sql); } else if ($update) { - $file = $this->file_info($path); $sql = 'UPDATE ' . $this->storage_table . ' - SET filesize = ' . $file->size . ' + SET filesize = ' . $this->get_adapter()->file_size($path) . ' WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); $this->db->sql_query($sql); } @@ -364,11 +359,11 @@ public function untrack_file($path) /** * Check if a file is tracked * - * @param string $path The file + * @param string $path The file * * @return bool True if file is tracked */ - public function is_tracked($path) + public function is_tracked(string $path): bool { $sql_ary = array( 'file_path' => $path, @@ -381,16 +376,16 @@ public function is_tracked($path) $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); - return ($row) ? true : false; + return $row !== false; } /** * Rename tracked file * - * @param string $path_orig The original file/direcotry - * @param string $path_dest The target file/directory + * @param string $path_orig The original file/direcotry + * @param string $path_dest The target file/directory */ - protected function track_rename($path_orig, $path_dest) + protected function track_rename(string $path_orig, string $path_dest): void { $sql = 'UPDATE ' . $this->storage_table . " SET file_path = '" . $this->db->sql_escape($path_dest) . "' @@ -400,36 +395,28 @@ protected function track_rename($path_orig, $path_dest) } /** - * Get file info + * Get file size in bytes * - * @param string $path The file + * @param string $path The file * - * @return \phpbb\storage\file_info Returns file_info object - * @throws storage_exception When the adapter doesn't implement the method - * When the file doesn't exist + * @return int Size in bytes. * + * @throws storage_exception When unable to retrieve file size */ - public function file_info($path) + public function file_size(string $path): int { - if (!$this->exists($path)) - { - throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); - } + $sql_ary = array( + 'file_path' => $path, + 'storage' => $this->get_name(), + ); - return new file_info($this->get_adapter(), $path); - } + $sql = 'SELECT filesize FROM ' . $this->storage_table . ' + WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); - /** - * Get direct link - * - * @param string $path The file - * - * @return string Returns link. - * - */ - public function get_link($path) - { - return $this->get_adapter()->get_link($path); + return $row !== false && !empty($row['filesize']) ? $row['filesize'] : $this->get_adapter()->file_size($path); } /** @@ -437,7 +424,7 @@ public function get_link($path) * * @return int Size in bytes */ - public function get_size() + public function get_size(): int { $total_size = $this->cache->get('_storage_' . $this->get_name() . '_totalsize'); @@ -462,7 +449,7 @@ public function get_size() * * @return int Number of files */ - public function get_num_files() + public function get_num_files(): int { $number_files = $this->cache->get('_storage_' . $this->get_name() . '_numfiles'); @@ -493,4 +480,5 @@ public function free_space() { return $this->get_adapter()->free_space(); } + } diff --git a/tests/storage/adapter/local_test_case.php b/tests/storage/adapter/local_test_case.php index 2c008120e70..dff331c694b 100644 --- a/tests/storage/adapter/local_test_case.php +++ b/tests/storage/adapter/local_test_case.php @@ -33,8 +33,6 @@ protected function setUp(): void $this->adapter = new local( $this->filesystem, - new FastImageSize(), - new guesser(array(new extension_guesser)), $phpbb_root_path ); From e6bdecbfee4b38dfdaafe723c672c86970bdae4a Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 30 Jun 2024 19:07:41 +0700 Subject: [PATCH 0272/1214] [ticket/17359] Distinct disabled and available extensions list PHPBB-17359 --- phpBB/adm/style/acp_ext_list.html | 28 +++++++++++++++++++++++++++ phpBB/includes/acp/acp_extensions.php | 6 +++--- phpBB/language/en/acp/extensions.php | 1 + 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 9e019fa1c27..0cfd21dc7e4 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -95,6 +95,34 @@

{L_EXTENSIONS_ADMIN}

+ + + + {L_EXTENSIONS_AVAILABLE} + + + + {available.META_DISPLAY_NAME} + + + {available.META_VERSION} + + + {available.META_VERSION} + + + + {L_DETAILS} + + + + title="{available.actions.L_ACTION_EXPLAIN}">{available.actions.L_ACTION} +  |  + + + + + diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 17281a111ac..f481f764d1c 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -575,7 +575,7 @@ public function list_available_exts() catch (exception_interface $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); - $this->template->assign_block_vars('disabled', array( + $this->template->assign_block_vars('available', array( 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message), 'S_VERSIONCHECK' => false, )); @@ -589,9 +589,9 @@ public function list_available_exts() $block_vars['NAME'] = $name; $block_vars['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); - $this->template->assign_block_vars('disabled', $block_vars); + $this->template->assign_block_vars('available', $block_vars); - $this->output_actions('disabled', array( + $this->output_actions('available', array( 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name), )); } diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index a96a7a2a2bb..16668b5161b 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -47,6 +47,7 @@ 'DETAILS' => 'Details', + 'EXTENSIONS_AVAILABLE' => 'Available Extensions', 'EXTENSIONS_DISABLED' => 'Disabled Extensions', 'EXTENSIONS_ENABLED' => 'Enabled Extensions', From ecebaef5b6eb86bbc14a9aea593c96f11a7a1826 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 30 Jun 2024 14:14:13 +0200 Subject: [PATCH 0273/1214] [ticket/17357] Fix test PHPBB-17357 --- tests/attachment/delete_test.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tests/attachment/delete_test.php b/tests/attachment/delete_test.php index 7acac28f334..e92319c078b 100644 --- a/tests/attachment/delete_test.php +++ b/tests/attachment/delete_test.php @@ -86,16 +86,16 @@ public function test_attachment_delete($mode, $ids, $resync, $expected) public function data_attachment_unlink() { return array( - array(true, true, true), - array(true, false, false), - array(true, true, false, true), + array(true, true), + array(false, false), + array(true, false, true), ); } /** * @dataProvider data_attachment_unlink */ - public function test_attachment_delete_success($remove_success, $exists_success, $expected, $throw_exception = false) + public function test_attachment_delete_success($exists_success, $expected, $throw_exception = false) { $this->storage = $this->createMock('\phpbb\storage\storage'); if ($throw_exception) @@ -107,8 +107,7 @@ public function test_attachment_delete_success($remove_success, $exists_success, else { $this->storage->expects($this->any()) - ->method('delete') - ->willReturn($remove_success); + ->method('delete'); } $this->storage->expects($this->any()) ->method('exists') From 9e1162469334044130feac244d64169a8bfd7a64 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 30 Jun 2024 19:59:45 +0700 Subject: [PATCH 0274/1214] [ticket/17359] Fix tests PHPBB-17359 --- tests/functional/extension_acp_test.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 2f26c53ce5e..3ecdd6e05c4 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -84,7 +84,8 @@ public function test_list() $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); $this->assertCount(1, $crawler->filter('.ext_enabled')); - $this->assertCount(7, $crawler->filter('.ext_disabled')); + $this->assertCount(3, $crawler->filter('.ext_disabled')); + $this->assertCount(4, $crawler->filter('.ext_available')); $this->assertStringContainsString('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text()); $this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text()); @@ -98,9 +99,9 @@ public function test_list() $this->assertStringContainsString('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text()); - $this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_disabled')->eq(3)->text()); - $this->assertContainsLang('DETAILS', $crawler->filter('.ext_disabled')->eq(3)->text()); - $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_disabled')->eq(3)->text()); + $this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_available')->eq(0)->text()); + $this->assertContainsLang('DETAILS', $crawler->filter('.ext_available')->eq(0)->text()); + $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_available')->eq(0)->text()); // Check that invalid extensions are not listed. $this->assertStringNotContainsString('phpBB BarFoo Extension', $crawler->filter('.table1')->text()); From 8aef7b5659c6e04a620bb43139a40db232869047 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 30 Jun 2024 20:35:58 +0700 Subject: [PATCH 0275/1214] [ticket/17359] Fix template events PHPBB-17359 --- phpBB/adm/style/acp_ext_list.html | 4 ++-- phpBB/docs/events.md | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 0cfd21dc7e4..526c1eb3c41 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -98,11 +98,11 @@

{L_EXTENSIONS_ADMIN}

- {L_EXTENSIONS_AVAILABLE} + {L_EXTENSIONS_AVAILABLE} - {available.META_DISPLAY_NAME} + {available.META_DISPLAY_NAME} {available.META_VERSION} diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 07e3b83beb9..c0f313f540b 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -70,6 +70,18 @@ acp_ext_details_notice * Since: 3.1.11-RC1 * Purpose: Add extension detail notices after version check information. +acp_ext_list_available_name_after +=== +* Location: adm/style/acp_ext_list.html +* Since: 3.1.13-RC1 +* Purpose: Add content after the name of available extensions in the list + +acp_ext_list_available_title_after +=== +* Location: adm/style/acp_ext_list.html +* Since: 3.1.13-RC1 +* Purpose: Add text after available extensions section title. + acp_ext_list_disabled_name_after === * Location: adm/style/acp_ext_list.html From e53db0775a73d1f8a639f7151fe1dda791089e47 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 1 Jul 2024 00:54:20 +0700 Subject: [PATCH 0276/1214] [ticket/17359] Get rid of template code duplication PHPBB-17359 --- phpBB/adm/style/acp_ext_list.html | 127 +++++++++++------------------- 1 file changed, 46 insertions(+), 81 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 526c1eb3c41..0984214c6f7 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -42,87 +42,52 @@

{L_EXTENSIONS_ADMIN}

- - - {L_EXTENSIONS_ENABLED} - - - - {enabled.META_DISPLAY_NAME} - - - {enabled.META_VERSION} - - - {enabled.META_VERSION} - - - {L_DETAILS} - - - title="{enabled.actions.L_ACTION_EXPLAIN}">{enabled.actions.L_ACTION} -  |  - - - - - - - - - {L_EXTENSIONS_DISABLED} - - - - {disabled.META_DISPLAY_NAME} - - - {disabled.META_VERSION} - - - {disabled.META_VERSION} - - - - {L_DETAILS} - - - - title="{disabled.actions.L_ACTION_EXPLAIN}">{disabled.actions.L_ACTION} -  |  - - - - - - - - - {L_EXTENSIONS_AVAILABLE} - - - - {available.META_DISPLAY_NAME} - - - {available.META_VERSION} - - - {available.META_VERSION} - - - - {L_DETAILS} - - - - title="{available.actions.L_ACTION_EXPLAIN}">{available.actions.L_ACTION} -  |  - - - - - + {% for list in ['enabled', 'disabled', 'available'] %} + {% set blockname = attribute(loops, list) %} + {% if blockname|length %} + + {{ lang('EXTENSIONS_' ~ list|upper) }} + {% if list == 'enabled' %} + {% EVENT acp_ext_list_enabled_title_after %} + {% elseif list == 'disabled' %} + {% EVENT acp_ext_list_disabled_title_after %} + {% elseif list == 'available' %} + {% EVENT acp_ext_list_available_title_after %} + {% endif %} + + + {% for data in blockname %} + + {{ data.META_DISPLAY_NAME }} + {% if list == 'enabled' %} + {% EVENT acp_ext_list_enabled_name_after %} + {% elseif list == 'disabled' %} + {% EVENT acp_ext_list_disabled_name_after %} + {% elseif list == 'available' %} + {% EVENT acp_ext_list_available_name_after %} + {% endif %} + + + {% if data.S_VERSIONCHECK %} + {{ data.META_VERSION }} + {% if not data.S_UP_TO_DATE %}{% endif %} + {% else %} + {{ data.META_VERSION }} + {% endif %} + + + {% if data.U_DETAILS %}{{ lang ('DETAILS') }}{% endif %} + + + {% for actions in data.actions %} + {{ actions.L_ACTION }} + {% if not actions.S_LAST_ROW %} | {% endif %} + {% endfor %} + + + {% endfor %} + {% endif %} + {% endfor %} From d7477760d6fb9862b2b19b3c719a832e99f21e53 Mon Sep 17 00:00:00 2001 From: Micha Ober Date: Mon, 1 Jul 2024 13:45:15 +0200 Subject: [PATCH 0277/1214] [ticket/17362] Declare property to avoid PHP 8.2 deprecation notice PHPBB-17362 --- phpBB/phpbb/extension/manager.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index 0a9f00c77c9..2fb9ba881a1 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -31,6 +31,7 @@ class manager protected $php_ext; protected $extensions; protected $extension_table; + protected $filesystem; protected $phpbb_root_path; protected $cache_name; From c82dd8bf54e56e60e9e3eaaa9b49fedf44556780 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 1 Jul 2024 21:33:54 +0200 Subject: [PATCH 0278/1214] [ticket/17347] Fix psalm error for user delete by ID command PHPBB-17347 --- phpBB/phpbb/console/command/user/delete_id.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpBB/phpbb/console/command/user/delete_id.php b/phpBB/phpbb/console/command/user/delete_id.php index ac00138a17f..07d98e76166 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -19,6 +19,7 @@ use phpbb\log\log_interface; use phpbb\user; use phpbb\user_loader; +use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; @@ -192,6 +193,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int protected function interact(InputInterface $input, OutputInterface $output): void { $helper = $this->getHelper('question'); + if (!$helper instanceof QuestionHelper) + { + return; + } $user_ids = $input->getArgument('user_ids'); if (count($user_ids) > 0) From d651cccc76244d16463ddd90dbc6c04822000401 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 2 Jul 2024 20:22:09 -0700 Subject: [PATCH 0279/1214] [ticket/17363] Add web app manifest PHPBB-17363 Signed-off-by: Matt Friedman --- phpBB/config/default/container/services.yml | 9 ++ phpBB/config/default/routing/routing.yml | 4 + phpBB/includes/acp/acp_board.php | 2 + phpBB/includes/functions.php | 1 + phpBB/install/schemas/schema_data.sql | 1 + phpBB/language/en/acp/board.php | 2 + phpBB/phpbb/manifest.php | 95 +++++++++++++++++++ .../prosilver/template/overall_header.html | 5 + 8 files changed, 119 insertions(+) create mode 100644 phpBB/phpbb/manifest.php diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 14c0d40263a..253a70342a9 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -157,6 +157,15 @@ services: - '%core.php_ext%' - '%tables.log%' + manifest.controller: + class: phpbb\manifest + arguments: + - '@config' + - '@language' + - '@path_helper' + - '@event_dispatcher' + - '@user' + path_helper: class: phpbb\path_helper arguments: diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 7fff9204f0f..46d20e45270 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -24,6 +24,10 @@ phpbb_help_routing: resource: help.yml prefix: /help +phpbb_manifest_controller: + path: /manifest + defaults: { _controller: manifest.controller:handle } + phpbb_mention_controller: path: /mention methods: [GET, POST] diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index d2076ce086f..a632253c525 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -78,6 +78,7 @@ function main($id, $mode) 'site_home_url' => array('lang' => 'SITE_HOME_URL', 'validate' => 'url', 'type' => 'url:40:255', 'explain' => true), 'site_home_text' => array('lang' => 'SITE_HOME_TEXT', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), 'board_index_text' => array('lang' => 'BOARD_INDEX_TEXT', 'validate' => 'string', 'type' => 'text:40:255', 'explain' => true), + 'sitename_short' => array('lang' => 'SITE_NAME_SHORT', 'validate' => 'string', 'type' => 'text:40:12', 'explain' => true), 'board_disable' => array('lang' => 'DISABLE_BOARD', 'validate' => 'bool', 'type' => 'custom', 'method' => 'board_disable', 'explain' => true), 'board_disable_msg' => false, 'board_disable_access' => array('lang' => 'DISABLE_BOARD_ACCESS', 'validate' => 'int', 'type' => 'select', 'method' => 'board_disable_access', 'explain' => true), @@ -593,6 +594,7 @@ function main($id, $mode) // Array of emoji-enabled configurations $config_name_ary = [ 'sitename', + 'sitename_short', 'site_desc', 'site_home_text', 'board_index_text', diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0e52fb37d6e..8cee5a6ba0a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3855,6 +3855,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')), 'U_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '', 'U_FEED' => $controller_helper->route('phpbb_feed_index'), + 'U_MANIFEST' => $controller_helper->route('phpbb_manifest_controller'), 'S_ALLOW_MENTIONS' => ($config['allow_mentions'] && $auth->acl_get('u_mention') && (empty($forum_id) || $auth->acl_get('f_mention', $forum_id))) ? true : false, 'S_MENTION_NAMES_LIMIT' => $config['mention_names_limit'], diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ba8f654a908..40240213d3b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -284,6 +284,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_desc', '{L_CO INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_text', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('site_home_url', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename', '{L_CONFIG_SITENAME}'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename_short', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_per_page', '50'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_allow_self_signed', '0'); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 3228db126b5..def1b01c608 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -69,6 +69,8 @@ 'SITE_HOME_URL' => 'Main website URL', 'SITE_HOME_URL_EXPLAIN' => 'If specified, a link to this URL will be prepended to your board’s breadcrumbs and the board logo will link to this URL instead of the forum index. An absolute URL is required, e.g. http://www.phpbb.com.', 'SITE_NAME' => 'Site name', + 'SITE_NAME_SHORT' => 'Short site name', + 'SITE_NAME_SHORT_EXPLAIN' => 'Short name will be used if your site is added to a mobile device’s home screen. It can not exceed 12 characters (Emoji is supported).', 'SYSTEM_TIMEZONE' => 'Guest timezone', 'SYSTEM_TIMEZONE_EXPLAIN' => 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in their user control panel.', 'WARNINGS_EXPIRE' => 'Warning duration', diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php new file mode 100644 index 00000000000..e5808c4c9ac --- /dev/null +++ b/phpBB/phpbb/manifest.php @@ -0,0 +1,95 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb; + +use phpbb\config\config; +use phpbb\event\dispatcher_interface; +use phpbb\exception\http_exception; +use phpbb\language\language; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Response; + +class manifest +{ + /** @var config */ + protected $config; + + /** @var language */ + protected $language; + + /** @var path_helper */ + protected $path_helper; + + /** @var dispatcher_interface */ + protected $phpbb_dispatcher; + + /** @var user */ + protected $user; + + /** + * Constructor for manifest controller + * + * @param config $config + * @param language $language + * @param path_helper $path_helper + * @param dispatcher_interface $phpbb_dispatcher + * @param user $user + */ + public function __construct(config $config, language $language, path_helper $path_helper, dispatcher_interface $phpbb_dispatcher, user $user) + { + $this->config = $config; + $this->path_helper = $path_helper; + $this->phpbb_dispatcher = $phpbb_dispatcher; + $this->language = $language; + $this->user = $user; + } + + /** + * Handle creation of a manifest json file for progressive web-app support + * + * @return JsonResponse + */ + public function handle(): JsonResponse + { + if ($this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE) + { + throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); + } + + $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : $this->path_helper->get_web_root_path(); + + $manifest = [ + 'name' => $this->config['sitename'], + 'short_name' => $this->config['sitename_short'] ?: substr($this->config['sitename'], 0, 12), + 'display' => 'standalone', + 'orientation' => 'portrait', + 'dir' => $this->language->lang('DIRECTION'), + 'start_url' => $board_path, + 'scope' => $board_path, + ]; + + /** + * Event to modify manifest data before it is outputted + * + * @event core.modify_manifest + * @var array manifest Array of config values to display and process + * @var string board_path Mode of the config page we are displaying + * @since 4.0.0-a1 + */ + $vars = array('manifest', 'board_path'); + extract($this->phpbb_dispatcher->trigger_event('core.modify_manifest', compact($vars))); + + return new JsonResponse($manifest); + } +} diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 790f793d8fb..49f2d3bff6b 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -4,6 +4,9 @@ + + + {META} <!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> @@ -57,6 +60,8 @@ + + {$STYLESHEETS} From fe40b0d3a389c82a08af8095c351317f53fdd57d Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 2 Jul 2024 21:53:45 -0700 Subject: [PATCH 0280/1214] [ticket/17363] Add functional test PHPBB-17363 Signed-off-by: Matt Friedman --- tests/functional/manifest_test.php | 47 ++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 tests/functional/manifest_test.php diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php new file mode 100644 index 00000000000..f100d9bdff7 --- /dev/null +++ b/tests/functional/manifest_test.php @@ -0,0 +1,47 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_manifest_test extends phpbb_functional_test_case +{ + public function test_manifest() + { + $expected = [ + 'name' => 'yourdomain.com', + 'short_name' => 'yourdomain', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'dir' => 'ltr', + 'start_url' => '/', + 'scope' => '/', + ]; + + $this->login(); + $this->admin_login(); + + $crawler = self::request('GET', 'adm/index.php?i=acp_board&mode=settings&sid=' . $this->sid); + + $form_data = [ + 'config[sitename]' => $expected['name'], + 'config[sitename_short]' => $expected['short_name'], + ]; + $form = $crawler->selectButton('submit')->form($form_data); + $crawler = self::submit($form); + $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); + + self::request('GET', 'app.php/manifest', [], false); + $this->assertEquals(json_encode($expected), self::get_content()); + } +} From e0cf35c5888334a85dd765916b246263e44fc136 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 3 Jul 2024 07:30:07 -0700 Subject: [PATCH 0281/1214] [ticket/17363] Remove and fix leftover code PHPBB-17363 Signed-off-by: Matt Friedman --- phpBB/phpbb/manifest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index e5808c4c9ac..1a7d0148e59 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -62,7 +62,7 @@ public function __construct(config $config, language $language, path_helper $pat */ public function handle(): JsonResponse { - if ($this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE) + if ($this->user->data['is_bot']) { throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } @@ -83,8 +83,8 @@ public function handle(): JsonResponse * Event to modify manifest data before it is outputted * * @event core.modify_manifest - * @var array manifest Array of config values to display and process - * @var string board_path Mode of the config page we are displaying + * @var array manifest Array of manifest members + * @var string board_path Path to the board root * @since 4.0.0-a1 */ $vars = array('manifest', 'board_path'); From efece4136b131b0db3c2490d095bf3a85ec3fe7b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 27 Jun 2024 22:13:54 +0200 Subject: [PATCH 0282/1214] [ticket/17353] Add test for gravatar driver and fix request var issue PHPBB-17353 --- phpBB/phpbb/avatar/driver/gravatar.php | 2 +- tests/avatar/driver_gravatar_test.php | 200 +++++++++++++++++++++++++ 2 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 tests/avatar/driver_gravatar_test.php diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index 3e4e7ff98ba..3a9b80a16d9 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -53,7 +53,7 @@ public function prepare_form($request, $template, $user, $row, &$error) { $template->assign_vars(array( 'AVATAR_GRAVATAR_WIDTH' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_width']) ? $row['avatar_width'] : $request->variable('avatar_gravatar_width', ''), - 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_width', ''), + 'AVATAR_GRAVATAR_HEIGHT' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar_height']) ? $row['avatar_height'] : $request->variable('avatar_gravatar_height', ''), 'AVATAR_GRAVATAR_EMAIL' => (($row['avatar_type'] == $this->get_name() || $row['avatar_type'] == 'gravatar') && $row['avatar']) ? $row['avatar'] : '', )); diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php new file mode 100644 index 00000000000..29417a508ac --- /dev/null +++ b/tests/avatar/driver_gravatar_test.php @@ -0,0 +1,200 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case +{ + + /** @var \phpbb\config\config */ + private $config; + + /** @var gravatar */ + private $gravatar; + + /** @var request_interface */ + private $request; + + /** @var \phpbb\template\template */ + private $template; + + /** @var \phpbb\user */ + private $user; + + private $template_data = []; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/users.xml'); + } + + protected function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $this->config = new \phpbb\config\config(array()); + $this->request = $this->getMockBuilder(request::class) + ->disableOriginalConstructor() + ->onlyMethods(['get_super_global']) + ->getMock(); + $this->request->method('get_super_global') + ->willReturn([]); + $this->template = $this->getMockBuilder(\phpbb\template\twig\twig::class) + ->disableOriginalConstructor() + ->onlyMethods(['assign_vars']) + ->getMock(); + $this->template->method('assign_vars') + ->will($this->returnCallback([$this, 'template_assign_vars'])); + $this->user = $this->getMockBuilder(\phpbb\user::class) + ->disableOriginalConstructor() + ->getMock(); + $imagesize = new \FastImageSize\FastImageSize(); + $cache = $this->createMock('\phpbb\cache\driver\driver_interface'); + $path_helper = new \phpbb\path_helper( + new \phpbb\symfony_request( + $this->request + ), + $this->request, + $phpbb_root_path, + $phpEx + ); + + $this->gravatar = new gravatar($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache); + $this->gravatar->set_name('avatar.driver.gravatar'); + } + + public function template_assign_vars($data) + { + $this->template_data = array_merge($this->template_data, $data); + } + + public function data_prepare_form(): array + { + return [ + [ + // Only default empty values, no request data + [ + 'AVATAR_GRAVATAR_WIDTH' => '', + 'AVATAR_GRAVATAR_HEIGHT' => '', + 'AVATAR_GRAVATAR_EMAIL' => '', + ], + [], + [ + 'avatar_type' => '', + 'avatar_width' => '', + 'avatar_height' => '', + ] + ], + [ + // Only default empty values, request data set + [ + 'AVATAR_GRAVATAR_WIDTH' => '80', + 'AVATAR_GRAVATAR_HEIGHT' => '90', + 'AVATAR_GRAVATAR_EMAIL' => '', + ], + [ + request_interface::POST => [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_gravatar_width' => '80', + 'avatar_gravatar_height' => '90', + ], + ], + [ + 'avatar_type' => '', + 'avatar_width' => '80', + 'avatar_height' => '90', + ] + ], + [ + // Only default empty values, request data set + [ + 'AVATAR_GRAVATAR_WIDTH' => '70', + 'AVATAR_GRAVATAR_HEIGHT' => '60', + 'AVATAR_GRAVATAR_EMAIL' => 'bar@foo.com', + ], + [ + request_interface::POST => [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_gravatar_width' => '80', + 'avatar_gravatar_height' => '90', + ], + ], + [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar' => 'bar@foo.com', + 'avatar_width' => '70', + 'avatar_height' => '60', + ] + ], + ]; + } + + /** + * @dataProvider data_prepare_form + */ + public function test_prepare_form($expected_vars, $request_data, $row) + { + $error = []; + $this->template_data = []; + + $request = $this->getMockBuilder(request::class) + ->disableOriginalConstructor() + ->onlyMethods(['get_super_global']) + ->getMock(); + $request->method('get_super_global') + ->willReturn([]); + + $requestInputReflection = new \ReflectionProperty($request, 'input'); + $requestInputReflection->setAccessible(true); + $request_data[request_interface::GET] = $request_data[request_interface::GET] ?? []; + $request_data[request_interface::POST] = $request_data[request_interface::POST] ?? []; + $request_data[request_interface::REQUEST] = $request_data[request_interface::GET] + $request_data[request_interface::POST]; + $requestInputReflection->setValue($request, $request_data); + $requestTypeCastHelperReflection = new \ReflectionProperty($request, 'type_cast_helper'); + $requestTypeCastHelperReflection->setAccessible(true); + $requestTypeCastHelperReflection->setValue($request, new \phpbb\request\type_cast_helper()); + + $this->gravatar->prepare_form($request, $this->template, $this->user, $row, $error); + + // Error not touched by gravatar + $this->assertEquals([], $error); + + $this->assertEquals($expected_vars, $this->template_data); + } + + public function test_gravatar_misc(): void + { + $this->assertEquals('ucp_avatar_options_gravatar.html', $this->gravatar->get_template_name()); + $this->assertEquals('acp_avatar_options_gravatar.html', $this->gravatar->get_acp_template_name()); + + + global $phpbb_dispatcher; + $phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class) + ->disableOriginalConstructor() + ->onlyMethods(['trigger_event']) + ->getMock(); + $phpbb_dispatcher->method('trigger_event') + ->willReturn($this->returnArgument(1)); + + $row = [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar' => 'bar@foo.com', + 'avatar_width' => '70', + 'avatar_height' => '60', + ]; + $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); + } +} From 40881b537e3aeffa5ca4f6b60daa6d1520b8b2fd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Jun 2024 14:58:17 +0200 Subject: [PATCH 0283/1214] [ticket/17353] Return image src for gravatar image PHPBB-17353 --- phpBB/phpbb/avatar/driver/gravatar.php | 2 +- tests/avatar/driver_gravatar_test.php | 33 +++++++++++++++++++------- 2 files changed, 25 insertions(+), 10 deletions(-) diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index 3a9b80a16d9..25e5bfb6e5b 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -29,7 +29,7 @@ class gravatar extends \phpbb\avatar\driver\driver public function get_data($row) { return array( - 'src' => $row['avatar'], + 'src' => $this->get_gravatar_url($row), 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], ); diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php index 29417a508ac..383664fe9c0 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -72,6 +72,14 @@ protected function setUp(): void $phpEx ); + global $phpbb_dispatcher; + $phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class) + ->disableOriginalConstructor() + ->onlyMethods(['trigger_event']) + ->getMock(); + $phpbb_dispatcher->method('trigger_event') + ->willReturn($this->returnArgument(1)); + $this->gravatar = new gravatar($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache); $this->gravatar->set_name('avatar.driver.gravatar'); } @@ -180,15 +188,6 @@ public function test_gravatar_misc(): void $this->assertEquals('ucp_avatar_options_gravatar.html', $this->gravatar->get_template_name()); $this->assertEquals('acp_avatar_options_gravatar.html', $this->gravatar->get_acp_template_name()); - - global $phpbb_dispatcher; - $phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class) - ->disableOriginalConstructor() - ->onlyMethods(['trigger_event']) - ->getMock(); - $phpbb_dispatcher->method('trigger_event') - ->willReturn($this->returnArgument(1)); - $row = [ 'avatar_type' => 'avatar.driver.gravatar', 'avatar' => 'bar@foo.com', @@ -197,4 +196,20 @@ public function test_gravatar_misc(): void ]; $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); } + + public function test_get_data(): void + { + $row = [ + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar' => 'bar@foo.com', + 'avatar_width' => '70', + 'avatar_height' => '60', + ]; + + $this->assertEquals([ + 'src' => '//secure.gravatar.com/avatar/dc8a42aba3651b0b1f088ef928ff3b1d?s=70', + 'width' => '70', + 'height' => '60', + ], $this->gravatar->get_data($row)); + } } From 5013075af7c74fd060d5626c08bdd11003bf51a3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Jun 2024 11:57:35 +0200 Subject: [PATCH 0284/1214] [ticket/17355] Change gravatar URL to new format PHPBB-17355 --- phpBB/phpbb/avatar/driver/gravatar.php | 4 ++-- tests/avatar/driver_gravatar_test.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/avatar/driver/gravatar.php b/phpBB/phpbb/avatar/driver/gravatar.php index 25e5bfb6e5b..c49e29c20c8 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -21,7 +21,7 @@ class gravatar extends \phpbb\avatar\driver\driver /** * The URL for the gravatar service */ - const GRAVATAR_URL = '//secure.gravatar.com/avatar/'; + const GRAVATAR_URL = '//gravatar.com/avatar/'; /** * {@inheritdoc} @@ -175,7 +175,7 @@ protected function get_gravatar_url($row) global $phpbb_dispatcher; $url = self::GRAVATAR_URL; - $url .= md5(strtolower(trim($row['avatar']))); + $url .= hash('sha256', strtolower(trim($row['avatar']))); if ($row['avatar_width'] || $row['avatar_height']) { diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php index 383664fe9c0..a79e0d51151 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -207,7 +207,7 @@ public function test_get_data(): void ]; $this->assertEquals([ - 'src' => '//secure.gravatar.com/avatar/dc8a42aba3651b0b1f088ef928ff3b1d?s=70', + 'src' => '//gravatar.com/avatar/e0ee9d02824d4320a999507150c5b8a371c635c41f645ba3a7205f36384dc199?s=70', 'width' => '70', 'height' => '60', ], $this->gravatar->get_data($row)); From bde7b119b2983b55fc6084a046fba556875a9871 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Jun 2024 12:34:54 +0200 Subject: [PATCH 0285/1214] [ticket/17355] Update tests after changing gravatar URL PHPBB-17355 --- tests/avatar/driver_gravatar_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php index a79e0d51151..fbc50d5623c 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -194,7 +194,7 @@ public function test_gravatar_misc(): void 'avatar_width' => '70', 'avatar_height' => '60', ]; - $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); + $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); } public function test_get_data(): void From 99b745982e9aee1dc379c738bc2e16bfdc5967de Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 3 Jul 2024 21:44:40 +0200 Subject: [PATCH 0286/1214] [ticket/17353] Clean up test code for compatibility with 3.3.x PHPBB-17353 --- tests/avatar/driver_gravatar_test.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php index fbc50d5623c..d0a83c2f22e 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -48,25 +48,27 @@ protected function setUp(): void $this->config = new \phpbb\config\config(array()); $this->request = $this->getMockBuilder(request::class) ->disableOriginalConstructor() - ->onlyMethods(['get_super_global']) + ->setMethods(['get_super_global']) ->getMock(); $this->request->method('get_super_global') ->willReturn([]); $this->template = $this->getMockBuilder(\phpbb\template\twig\twig::class) ->disableOriginalConstructor() - ->onlyMethods(['assign_vars']) + ->setMethods(['assign_vars']) ->getMock(); $this->template->method('assign_vars') ->will($this->returnCallback([$this, 'template_assign_vars'])); $this->user = $this->getMockBuilder(\phpbb\user::class) ->disableOriginalConstructor() ->getMock(); + $filesystem = new \phpbb\filesystem\filesystem(); $imagesize = new \FastImageSize\FastImageSize(); $cache = $this->createMock('\phpbb\cache\driver\driver_interface'); $path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( $this->request ), + $filesystem, $this->request, $phpbb_root_path, $phpEx @@ -75,10 +77,10 @@ protected function setUp(): void global $phpbb_dispatcher; $phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class) ->disableOriginalConstructor() - ->onlyMethods(['trigger_event']) + ->setMethods(['trigger_event']) ->getMock(); $phpbb_dispatcher->method('trigger_event') - ->willReturn($this->returnArgument(1)); + ->willReturnArgument(1); $this->gravatar = new gravatar($this->config, $imagesize, $phpbb_root_path, $phpEx, $path_helper, $cache); $this->gravatar->set_name('avatar.driver.gravatar'); @@ -160,7 +162,7 @@ public function test_prepare_form($expected_vars, $request_data, $row) $request = $this->getMockBuilder(request::class) ->disableOriginalConstructor() - ->onlyMethods(['get_super_global']) + ->setMethods(['get_super_global']) ->getMock(); $request->method('get_super_global') ->willReturn([]); @@ -194,7 +196,7 @@ public function test_gravatar_misc(): void 'avatar_width' => '70', 'avatar_height' => '60', ]; - $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); + $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); } public function test_get_data(): void From 3488910fcf94eb7dc8ab500b520d4ecc401b48af Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 3 Jul 2024 21:48:43 +0200 Subject: [PATCH 0287/1214] [ticket/17353] Update tests for master PHPBB-17353 --- tests/avatar/driver_gravatar_test.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php index d0a83c2f22e..27ab847ff73 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -48,27 +48,25 @@ protected function setUp(): void $this->config = new \phpbb\config\config(array()); $this->request = $this->getMockBuilder(request::class) ->disableOriginalConstructor() - ->setMethods(['get_super_global']) + ->onlyMethods(['get_super_global']) ->getMock(); $this->request->method('get_super_global') ->willReturn([]); $this->template = $this->getMockBuilder(\phpbb\template\twig\twig::class) ->disableOriginalConstructor() - ->setMethods(['assign_vars']) + ->onlyMethods(['assign_vars']) ->getMock(); $this->template->method('assign_vars') ->will($this->returnCallback([$this, 'template_assign_vars'])); $this->user = $this->getMockBuilder(\phpbb\user::class) ->disableOriginalConstructor() ->getMock(); - $filesystem = new \phpbb\filesystem\filesystem(); $imagesize = new \FastImageSize\FastImageSize(); $cache = $this->createMock('\phpbb\cache\driver\driver_interface'); $path_helper = new \phpbb\path_helper( new \phpbb\symfony_request( $this->request ), - $filesystem, $this->request, $phpbb_root_path, $phpEx @@ -77,7 +75,7 @@ protected function setUp(): void global $phpbb_dispatcher; $phpbb_dispatcher = $this->getMockBuilder(\phpbb\event\dispatcher::class) ->disableOriginalConstructor() - ->setMethods(['trigger_event']) + ->onlyMethods(['trigger_event']) ->getMock(); $phpbb_dispatcher->method('trigger_event') ->willReturnArgument(1); @@ -162,7 +160,7 @@ public function test_prepare_form($expected_vars, $request_data, $row) $request = $this->getMockBuilder(request::class) ->disableOriginalConstructor() - ->setMethods(['get_super_global']) + ->onlyMethods(['get_super_global']) ->getMock(); $request->method('get_super_global') ->willReturn([]); @@ -196,7 +194,7 @@ public function test_gravatar_misc(): void 'avatar_width' => '70', 'avatar_height' => '60', ]; - $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); + $this->assertEquals('', $this->gravatar->get_custom_html($this->user, $row)); } public function test_get_data(): void From e69a86c49e378ca12a8e0b0912021858c34c37db Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 5 Jul 2024 13:52:13 -0700 Subject: [PATCH 0288/1214] [ticket/17364] Correctly handle styles list in ACP Forums PHPBB-17364 Signed-off-by: Matt Friedman --- phpBB/adm/style/acp_forums.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 613a054b32a..d030d2e587e 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -181,7 +181,14 @@

{L_WARNING}

-
+
+ +
From 51c424b93d549359db65f09f9f5d66176f1368ca Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 5 Jul 2024 19:22:29 -0700 Subject: [PATCH 0289/1214] [ticket/17364] Fix random spelling error in code PHPBB-17364 Signed-off-by: Matt Friedman --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index a632253c525..d457b13cb49 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -393,7 +393,7 @@ function main($id, $mode) 'title' => 'ACP_AUTH_SETTINGS', 'vars' => array( 'legend1' => 'ACP_AUTH_SETTINGS', - 'auth_method' => array('lang' => 'AUTH_METHOD', 'validate' => 'string', 'type' => 'select:1:toggable', 'method' => 'select_auth_method', 'explain' => false), + 'auth_method' => array('lang' => 'AUTH_METHOD', 'validate' => 'string', 'type' => 'select:1:toggleable', 'method' => 'select_auth_method', 'explain' => false), ) ); break; From 00d1351e55c3c54cd563df682588f8ac87cced98 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 6 Jul 2024 10:47:49 +0200 Subject: [PATCH 0290/1214] [ticket/16890] Deny access to config file and folder in nginx sample PHPBB-16890 --- phpBB/docs/nginx.sample.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf index 25363ad34d9..a4a08ae805c 100644 --- a/phpBB/docs/nginx.sample.conf +++ b/phpBB/docs/nginx.sample.conf @@ -63,7 +63,7 @@ server { } # Deny access to internal phpbb files. - location ~ /(config\.php|common\.php|cache|files|images/avatars/upload|includes|(? Date: Sat, 6 Jul 2024 11:52:28 +0200 Subject: [PATCH 0291/1214] [ticket/16890] Add rewrite for installer in lighttpd PHPBB-16890 --- phpBB/docs/lighttpd.sample.conf | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/phpBB/docs/lighttpd.sample.conf b/phpBB/docs/lighttpd.sample.conf index f5b509e0027..5411719feea 100644 --- a/phpBB/docs/lighttpd.sample.conf +++ b/phpBB/docs/lighttpd.sample.conf @@ -1,7 +1,7 @@ # Sample lighttpd configuration file for phpBB. # Global settings have been removed, copy them # from your system's lighttpd.conf. -# Tested with lighttpd 1.4.35 +# Tested with lighttpd 1.4.36 # If you want to use the X-Sendfile feature, # uncomment the 'allow-x-send-file' for the fastcgi @@ -13,7 +13,7 @@ # for the details on X-Sendfile. # Load moules -server.modules += ( +server.modules += ( "mod_access", "mod_fastcgi", "mod_rewrite", @@ -32,12 +32,12 @@ $HTTP["host"] == "www.myforums.com" { server.name = "www.myforums.com" server.document-root = "/path/to/phpbb" server.dir-listing = "disable" - + index-file.names = ( "index.php", "index.htm", "index.html" ) accesslog.filename = "/var/log/lighttpd/access-www.myforums.com.log" - - # Deny access to internal phpbb files. - $HTTP["url"] =~ "^/(config\.php|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor)" { + + # Deny access to internal phpbb files. + $HTTP["url"] =~ "^/(config|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor)" { url.access-deny = ( "" ) } @@ -45,27 +45,28 @@ $HTTP["host"] == "www.myforums.com" { $HTTP["url"] =~ "/\.svn|/\.git" { url.access-deny = ( "" ) } - + # Deny access to apache configuration files. $HTTP["url"] =~ "/\.htaccess|/\.htpasswd|/\.htgroups" { url.access-deny = ( "" ) } - + # The following 3 lines will rewrite URLs passed through the front controller # to not require app.php in the actual URL. In other words, a controller is # by default accessed at /app.php/my/controller, but can also be accessed at # /my/controller url.rewrite-if-not-file = ( - "^/(.*)$" => "/app.php/$1" + "^/install/(.*)$" => "/install/app.php/$1", + "^/(.*)$" => "/app.php/$1" ) - - fastcgi.server = ( ".php" => + + fastcgi.server = ( ".php" => (( "bin-path" => "/usr/bin/php-cgi", "socket" => "/tmp/php.socket", "max-procs" => 4, "idle-timeout" => 30, - "bin-environment" => ( + "bin-environment" => ( "PHP_FCGI_CHILDREN" => "10", "PHP_FCGI_MAX_REQUESTS" => "10000" ), From 922e7699ed5fa4b3bf0e17e70e0409ea1afce0db Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 6 Jul 2024 15:36:02 +0200 Subject: [PATCH 0292/1214] [ticket/16907] Adjust request filtering for phpbb paths PHPBB-16907 --- phpBB/web.config | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/phpBB/web.config b/phpBB/web.config index d0a3cb33fe3..86ea774d8ec 100644 --- a/phpBB/web.config +++ b/phpBB/web.config @@ -28,6 +28,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + From ffc655a1ba74f4120b6f1cf03ede55cdef239647 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 6 Jul 2024 21:44:06 +0200 Subject: [PATCH 0293/1214] [ticket/13916] Add notify to fields to store during save draft PHPBB-13916 --- phpBB/posting.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/posting.php b/phpBB/posting.php index b3562b48f03..c11284975cc 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -848,6 +848,7 @@ 'disable_smilies' => false, 'disable_magic_url' => false, 'attach_sig' => true, + 'notify' => false, 'lock_topic' => false, 'topic_type' => POST_NORMAL, From 53e7e3d801b56d0ee05581e808dceab2ec13b359 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 08:44:32 +0200 Subject: [PATCH 0294/1214] [ticket/17341] Remove no longer used files and references PHPBB-17341 --- phpBB/adm/style/acp_forums_copy_perm.html | 22 ---------------------- phpBB/includes/acp/acp_forums.php | 8 +------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 phpBB/adm/style/acp_forums_copy_perm.html diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html deleted file mode 100644 index 1fcf2f62a44..00000000000 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ /dev/null @@ -1,22 +0,0 @@ - - -

{L_COPY_PERMISSIONS}

- -

{L_COPY_PERMISSIONS_EXPLAIN}

-

{L_ACL_LINK}

- - - -
-
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
-
{S_FORM_TOKEN}{S_HIDDEN_FIELDS} -   -
-
- - - - diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 6aafce12bcb..920214448d2 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -213,13 +213,7 @@ function main($id, $mode) phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth); $copied_permissions = true; } -/* Commented out because of questionable UI workflow - re-visit for 3.0.7 - else if (!$this->parent_id && $action != 'edit' && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')) - { - $this->copy_permission_page($forum_data); - return; - } -*/ + $auth->acl_clear_prefetch(); $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; From 8639be4bd49bafe30fd35bfd1582289988877ce9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 11:31:18 +0200 Subject: [PATCH 0295/1214] [ticket/17366] Remember confirm code if recaptcha v3 is solved PHPBB-17366 --- phpBB/phpbb/captcha/plugins/recaptcha_v3.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php index 6afa18691f7..814b962e31b 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php @@ -359,6 +359,7 @@ protected function recaptcha_verify_token() if ($result->isSuccess()) { $this->solved = true; + $this->confirm_code = $this->code; return false; } From 55dbe070e38674ce36478fdf32ffe9210ee82872 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 14:52:00 +0200 Subject: [PATCH 0296/1214] [ticket/17366] Remove javascript sanity check as this can break with recaptcha PHPBB-17366 --- phpBB/styles/prosilver/template/ajax.js | 24 ------------------- .../prosilver/template/posting_editor.html | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index e01e7eb4d49..dc3f08e4502 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -337,30 +337,6 @@ $('[data-ajax]').each(function() { } }); -// Prevent accidental double submission of form -$('[data-prevent-flood] input[type=submit]').click(function(event) { - const $submitButton = $(this); // Store the button element - const $form = $submitButton.closest('form'); - - // Always add the disabled class for visual feedback - $submitButton.addClass('disabled'); - - // Submit form if it hasn't been submitted yet - if (!$form.prop('data-form-submitted')) { - $form.prop('data-form-submitted', true); - - return; - } - - // Prevent default submission for subsequent clicks within 5 seconds - event.preventDefault(); - - setTimeout(() => { - $form.prop('removeProp', 'data-form-submitted'); - $submitButton.removeClass('disabled'); // Re-enable after 5 seconds - }, 5000); -}); - /** * This simply appends #preview to the action of the * QR action when you click the Full Editor & Preview button diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index d3b2ecd68ed..12790360d64 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -100,7 +100,7 @@
-
+
{S_HIDDEN_ADDRESS_FIELD} {S_HIDDEN_FIELDS} From 82980954213e7bdfb03504f6f8597293ca280f20 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 15:22:23 +0200 Subject: [PATCH 0297/1214] [ticket/16213] Add .htaccess for phpbb and vendor folders PHPBB-16213 --- build/build.xml | 1 + phpBB/phpbb/.htaccess | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 phpBB/phpbb/.htaccess diff --git a/build/build.xml b/build/build.xml index f1d51350b4c..c1a7b274b9d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -181,6 +181,7 @@ + diff --git a/phpBB/phpbb/.htaccess b/phpBB/phpbb/.htaccess new file mode 100644 index 00000000000..92e78ba1a7f --- /dev/null +++ b/phpBB/phpbb/.htaccess @@ -0,0 +1,25 @@ +# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from +# module mod_authz_host to a new module called mod_access_compat (which may be +# disabled) and a new "Require" syntax has been introduced to mod_authz_core. +# We could just conditionally provide both versions, but unfortunately Apache +# does not explicitly tell us its version if the module mod_version is not +# available. In this case, we check for the availability of module +# mod_authz_core (which should be on 2.4 or higher only) as a best guess. + + + Order Allow,Deny + Deny from All + + = 2.4> + Require all denied + + + + + Order Allow,Deny + Deny from All + + + Require all denied + + From 84eb635d2c5b6c7578c366bc6ec9d19645d2fce3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 15:24:34 +0200 Subject: [PATCH 0298/1214] [ticket/16213] Add .htaccess to vendor-ext as well PHPBB-16213 --- build/build.xml | 2 +- phpBB/vendor-ext/.htaccess | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 phpBB/vendor-ext/.htaccess diff --git a/build/build.xml b/build/build.xml index d1eae7bd98d..cf294e547e6 100644 --- a/build/build.xml +++ b/build/build.xml @@ -181,7 +181,7 @@ - + diff --git a/phpBB/vendor-ext/.htaccess b/phpBB/vendor-ext/.htaccess new file mode 100644 index 00000000000..92e78ba1a7f --- /dev/null +++ b/phpBB/vendor-ext/.htaccess @@ -0,0 +1,25 @@ +# With Apache 2.4 the "Order, Deny" syntax has been deprecated and moved from +# module mod_authz_host to a new module called mod_access_compat (which may be +# disabled) and a new "Require" syntax has been introduced to mod_authz_core. +# We could just conditionally provide both versions, but unfortunately Apache +# does not explicitly tell us its version if the module mod_version is not +# available. In this case, we check for the availability of module +# mod_authz_core (which should be on 2.4 or higher only) as a best guess. + + + Order Allow,Deny + Deny from All + + = 2.4> + Require all denied + + + + + Order Allow,Deny + Deny from All + + + Require all denied + + From 837939f28c81ee373cbdb419c312fec922fdfc0a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 15:26:33 +0200 Subject: [PATCH 0299/1214] [ticket/16213] Update nginx & lighttpd sample files as well PHPBB-16213 --- phpBB/docs/lighttpd.sample.conf | 2 +- phpBB/docs/nginx.sample.conf | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/lighttpd.sample.conf b/phpBB/docs/lighttpd.sample.conf index 1b57dd370c1..fef922c2da7 100644 --- a/phpBB/docs/lighttpd.sample.conf +++ b/phpBB/docs/lighttpd.sample.conf @@ -28,7 +28,7 @@ $HTTP["host"] == "www.myforums.com" { accesslog.filename = "/var/log/lighttpd/access-www.myforums.com.log" # Deny access to internal phpbb files. - $HTTP["url"] =~ "^/(config|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor)" { + $HTTP["url"] =~ "^/(config|common\.php|cache|files|images/avatars/upload|includes|phpbb|store|vendor|vendor-ext)" { url.access-deny = ( "" ) } diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf index 8ee31b6d5e7..ed1f25e023a 100644 --- a/phpBB/docs/nginx.sample.conf +++ b/phpBB/docs/nginx.sample.conf @@ -55,7 +55,7 @@ server { } # Deny access to internal phpbb files. - location ~ /(config|common\.php|cache|files|images/avatars/upload|includes|(? Date: Sun, 7 Jul 2024 19:35:18 +0100 Subject: [PATCH 0300/1214] [ticket/17365] Prevent keyword limit being bypassed with the use of +, - and | Provided `$countable_keywords` wherein the existing `$keywords` value is modified so that any `-`, `+` and `|` characters without preceding spaces is replaced with the same but with a space in front of each. These spaces allow the string to be more accurately split when used instead of $keywords inside the $num_keywords calculation. This prevents the word limit being bypassed in search by the use of operators without whitespace. PHPBB-17365 --- phpBB/phpbb/search/fulltext_native.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/search/fulltext_native.php b/phpBB/phpbb/search/fulltext_native.php index 7fc5e002ba7..a2d4dab98e3 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -299,7 +299,11 @@ public function split_keywords($keywords, $terms) ); $keywords = preg_replace($match, $replace, $keywords); - $num_keywords = count(explode(' ', $keywords)); + + // Ensure a space exists before +, - and | to make the split and count work correctly + $countable_keywords = preg_replace('/(?config['max_num_search_keywords'] && $num_keywords > $this->config['max_num_search_keywords']) From 926a0a4e3310319d62490398ce88b2233591ee90 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 8 Jul 2024 16:35:41 +0100 Subject: [PATCH 0301/1214] [ticket/17369] Add forum id to approve action url for redirection Added the forum_id to the approve action link which ensures that when a topic is permanently deleted, the forum_id is present so that it can be used in the redirection link to go to the previous forum. This addresses a bug in which the forum_id is not provided and after deleting a topic, the user will be taken to a 404 page as the forum id fallbacks to 0. PHPBB-17369 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index bdc28731d7f..47172cfc605 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2071,7 +2071,7 @@ 'U_EMAIL' => $user_cache[$poster_id]['email'], 'U_JABBER' => $user_cache[$poster_id]['jabber'], - 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p={$row['post_id']}&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $row['post_id'] . '#p' . $row['post_id']))), + 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p={$row['post_id']}&f={$row['forum_id']}&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $row['post_id'] . '#p' . $row['post_id']))), 'U_REPORT' => ($auth->acl_get('f_report', $forum_id)) ? $phpbb_container->get('controller.helper')->route('phpbb_report_post_controller', array('id' => $row['post_id'])) : '', 'U_MCP_REPORT' => ($auth->acl_get('m_report', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&mode=report_details&p=' . $row['post_id'], true, $user->session_id) : '', 'U_MCP_APPROVE' => ($auth->acl_get('m_approve', $forum_id)) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=approve_details&p=' . $row['post_id'], true, $user->session_id) : '', From 2088ee5e84ba2aeb2c9e598c102013b09c5754ef Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 8 Jul 2024 21:37:05 +0200 Subject: [PATCH 0302/1214] [ticket/15576] Handle subject max length same as in form input PHPBB-15576 --- phpBB/includes/functions_privmsgs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_privmsgs.php b/phpBB/includes/functions_privmsgs.php index 0aceeb90e1c..4e3fd5a85e4 100644 --- a/phpBB/includes/functions_privmsgs.php +++ b/phpBB/includes/functions_privmsgs.php @@ -1689,7 +1689,7 @@ function submit_pm($mode, $subject, &$data_ary, $put_in_outbox = true) } // First of all make sure the subject are having the correct length. - $subject = truncate_string($subject); + $subject = truncate_string($subject, $mode === 'post' ? 120 : 124); $db->sql_transaction('begin'); From dd4c98279212e8f0a818387851c63c841ac8b7d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 26 Sep 2018 13:02:36 +0200 Subject: [PATCH 0303/1214] [ticket/15043] Rewrite get_context() PHPBB3-15043 --- phpBB/includes/functions_content.php | 143 ++++++++++----------------- phpBB/includes/utf/utf_tools.php | 16 +++ 2 files changed, 69 insertions(+), 90 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 40e1b642395..33bc8daa1f3 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -327,117 +327,80 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po */ function get_context($text, $words, $length = 400) { - // first replace all whitespaces with single spaces - $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' ')); + $output = ''; + $text_length = utf8_strlen($text); + + // Replace all spaces/invisible characters with single spaces + $text = preg_replace("/[[:^print:] ]+/", ' ', $text); // we need to turn the entities back into their original form, to not cut the message in between them - $entities = array('<', '>', '[', ']', '.', ':', ':'); - $characters = array('<', '>', '[', ']', '.', ':', ':'); - $text = str_replace($entities, $characters, $text); + $text = html_entity_decode($text); - $word_indizes = array(); - if (count($words)) + // Get first ocurrence of each word + $word_indizes = []; + foreach ($words as $word) { - $match = ''; - // find the starting indizes of all words - foreach ($words as $word) - { - if ($word) - { - if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match)) - { - if (empty($match[1])) - { - continue; - } + $pos = utf8_stripos($text, $word); - $pos = utf8_strpos($text, $match[1]); - if ($pos !== false) - { - $word_indizes[] = $pos; - } - } - } + if ($pos !== false) + { + $word_indizes[$pos] = $word; } - unset($match); + } - if (count($word_indizes)) - { - $word_indizes = array_unique($word_indizes); - sort($word_indizes); + // If there are coincidences + if (!empty($word_indizes)) + { + ksort($word_indizes); $wordnum = count($word_indizes); - // number of characters on the right and left side of each word - $sequence_length = (int) ($length / (2 * $wordnum)) - 2; - $final_text = ''; - $word = $j = 0; - $final_text_index = -1; - - // cycle through every character in the original text - for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++) + // Size of the fragment of text per word + $characters_per_word = (int) ($length / $wordnum); + + // Get text fragments + $fragments = []; + $start = $end = 0; + foreach ($word_indizes as $indize => $word) { - // if the current position is the start of one of the words then append $sequence_length characters to the final text - if (isset($word_indizes[$word]) && ($i == $word_indizes[$word])) + if ($end+$characters_per_word+utf8_strlen($word) < $indize) { - if ($final_text_index < $i - $sequence_length - 1) + $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) { - $final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length)); + $fragment = '... ' . $fragment; } - else - { - // if the final text is already nearer to the current word than $sequence_length we only append the text - // from its current index on and distribute the unused length to all other sequenes - $sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum)); - $final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1); - } - $final_text_index = $i - 1; - // add the following characters to the final text (see below) - $word++; - $j = 1; + $fragments[] = $fragment; + + $start = $indize-($characters_per_word/2); + // Start fragment at the begining of a word + $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start-1)+1) : 0; } - if ($j > 0) - { - // add the character to the final text and increment the sequence counter - $final_text .= utf8_substr($text, $i, 1); - $final_text_index++; - $j++; + $end += $characters_per_word; - // if this is a whitespace then check whether we are done with this sequence - if (utf8_substr($text, $i, 1) == ' ') - { - // only check whether we have to exit the context generation completely if we haven't already reached the end anyway - if ($i + 4 < $n) - { - if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length) - { - $final_text .= ' ...'; - break; - } - } - else - { - // make sure the text really reaches the end - $j -= 4; - } + // End fragment at the end of a word + $substring = utf8_substr($text, $start, $end-$start); + $end = $start+utf8_strrpos($substring, ' '); + } - // stop context generation and wait for the next word - if ($j > $sequence_length) - { - $j = 0; - } - } - } + $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) + { + $fragment = '... ' . $fragment; + } + if ($end < $text_length) + { + $fragment .= ' ...'; } - return str_replace($characters, $entities, $final_text); - } - } - if (!count($words) || !count($word_indizes)) - { - return str_replace($characters, $entities, ((utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text)); + // Get the last fragment + $fragments[] = $fragment; + + $output = htmlentities(implode($fragments, '')); } + + return $output; } /** diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 5a1ca5b6fef..4ed9c72bb18 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -72,6 +72,22 @@ function utf8_strpos($str, $needle, $offset = null) } } +/** +* UTF-8 aware alternative to stripos +* @ignore +*/ +function utf8_stripos($str, $needle, $offset = null) +{ + if (is_null($offset)) + { + return mb_stripos($str, $needle); + } + else + { + return mb_stripos($str, $needle, $offset); + } +} + /** * UTF-8 aware alternative to strtolower * @ignore From 7365764476a130e7af0300249d21ca5f46aa94ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 26 Sep 2018 14:17:53 +0200 Subject: [PATCH 0304/1214] [ticket/15043] New get_context displays more text PHPBB3-15043 --- tests/functional/search/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 033c31c3961..0e3aa80fa32 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -146,7 +146,7 @@ public function test_search_backend() foreach (['', 'a', 't', 'f', 'i', 's'] as $sort_key) { - $this->assert_search_found('phpbb3+installation', 1, 3, $sort_key); + $this->assert_search_found('phpbb3+installation', 1, 4, $sort_key); $this->assert_search_found('foosubject+barsearch', 1, 2, $sort_key); $this->assert_search_found('barsearch-testing', 1, 2, $sort_key); // test hyphen ignored $this->assert_search_found('barsearch+-+testing', 1, 2, $sort_key); // test hyphen wrapped with space ignored From 350c9213ee09d79269cd3f80e023faa206f238ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 26 Sep 2018 15:15:07 +0200 Subject: [PATCH 0305/1214] [ticket/15043] Update regexp PHPBB3-15043 --- phpBB/includes/functions_content.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 33bc8daa1f3..7731d63a481 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -331,7 +331,7 @@ function get_context($text, $words, $length = 400) $text_length = utf8_strlen($text); // Replace all spaces/invisible characters with single spaces - $text = preg_replace("/[[:^print:] ]+/", ' ', $text); + $text = preg_replace("/\s+/", ' ', $text); // we need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); @@ -362,9 +362,11 @@ function get_context($text, $words, $length = 400) $start = $end = 0; foreach ($word_indizes as $indize => $word) { - if ($end+$characters_per_word+utf8_strlen($word) < $indize) + // Check if the next word can be inside the current fragment of text + if ($end + $characters_per_word + utf8_strlen($word) < $indize) { $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) { $fragment = '... ' . $fragment; @@ -372,16 +374,16 @@ function get_context($text, $words, $length = 400) $fragments[] = $fragment; - $start = $indize-($characters_per_word/2); + $start = $indize - ($characters_per_word / 2); // Start fragment at the begining of a word - $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start-1)+1) : 0; + $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start - 1) + 1) : 0; } $end += $characters_per_word; // End fragment at the end of a word $substring = utf8_substr($text, $start, $end-$start); - $end = $start+utf8_strrpos($substring, ' '); + $end = $start + utf8_strrpos($substring, ' '); } $fragment = utf8_substr($text, $start, $end-$start); From a2e720515444c07f37e259f4aca39cd74919455e Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Tue, 9 Jul 2024 00:24:47 +0200 Subject: [PATCH 0306/1214] [ticket/15403] Fix order of parameters in implode PHPBB-15403 --- phpBB/includes/functions_content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 7731d63a481..5b1d6244b38 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -399,7 +399,7 @@ function get_context($text, $words, $length = 400) // Get the last fragment $fragments[] = $fragment; - $output = htmlentities(implode($fragments, '')); + $output = htmlentities(implode('', $fragments)); } return $output; From 776396962514770a3740ea847182ed0bd614d85c Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Tue, 9 Jul 2024 17:09:06 +0200 Subject: [PATCH 0307/1214] [ticket/15403] Return first fragment of text if there is no coincidences PHPBB-15403 --- phpBB/includes/functions_content.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 5b1d6244b38..e536c5ad247 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -399,10 +399,10 @@ function get_context($text, $words, $length = 400) // Get the last fragment $fragments[] = $fragment; - $output = htmlentities(implode('', $fragments)); + return htmlentities(implode('', $fragments)); } - return $output; + return htmlentities($text_length >= $length + 3 ? utf8_substr($text, 0, $length) . ' ...' : $text); } /** From a62a303318773c66b9880a9e1467630a245bb24e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Jul 2024 21:20:09 +0200 Subject: [PATCH 0308/1214] [ticket/15043] Add unit test for get_context PHPBB-15043 --- tests/functions_content/get_context_test.php | 102 +++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 tests/functions_content/get_context_test.php diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php new file mode 100644 index 00000000000..b5d5b2ef73e --- /dev/null +++ b/tests/functions_content/get_context_test.php @@ -0,0 +1,102 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use PHPUnit\Framework\TestCase; + +class phpbb_functions_content_get_context_test extends TestCase +{ + /** + * Data provider for get_context test cases. + * + * @return array + */ + public function data_get_context(): array + { + return [ + 'text contains words and length greater than text' => [ + 'text' => 'This is a sample text containing several words, including sample, text, and words.', + 'words' => ['sample', 'words'], + 'length' => 100, + 'expected' => 'This is a sample text containing several words, including sample, text, and words.', + ], + 'text contains words and length less than text' => [ + 'text' => 'This is a sample text containing several words, including sample, text, and words.', + 'words' => ['sample', 'words'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words ...', + ], + 'text does not contain words' => [ + 'text' => 'This is a sample text containing several words, but none of them match the given words.', + 'words' => ['nonexistent'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words, bu ...', + ], + 'desired length equal to text length' => [ + 'text' => 'Exact length text.', + 'words' => ['Exact', 'text'], + 'length' => 18, + 'expected' => 'Exact length text.', + ], + 'text with html entities' => [ + 'text' => 'This is a sample text containing & and < and > entities.', + 'words' => ['sample', 'containing'], + 'length' => 50, + 'expected' => 'This is a sample text containing & and < and ...', + ], + 'text with html entities and contains last word' => [ + 'text' => 'This is a sample text containing & and < and > entities.', + 'words' => ['sample', 'entities'], + 'length' => 50, + 'expected' => 'This is a sample text containing & and < and ...', + ], + 'text with multiple spaces and special characters' => [ + 'text' => 'This is a sample text containing several words.', + 'words' => ['sample', 'several'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words ...', + ], + 'empty text' => [ + 'text' => '', + 'words' => ['sample', 'words'], + 'length' => 50, + 'expected' => '', + ], + 'empty words array' => [ + 'text' => 'This is a sample text containing several words.', + 'words' => [], + 'length' => 50, + 'expected' => 'This is a sample text containing several words.', + ], + 'zero length' => [ + 'text' => 'This is a sample text.', + 'words' => ['sample'], + 'length' => 0, + 'expected' => '...', + ], + 'negative length' => [ + 'text' => 'This is a sample text.', + 'words' => ['sample'], + 'length' => -10, + 'expected' => '...', + ], + ]; + } + + /** + * @dataProvider data_get_context + */ + public function test_get_context($text, $words, $length, $expected) + { + $this->assertEquals($expected, get_context($text, $words, $length)); + } +} From 89afa0cb5eaf2684ffa79c9d6e1415eab41063f9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Jul 2024 21:46:37 +0200 Subject: [PATCH 0309/1214] [ticket/15043] Small code cleanup PHPBB-15043 --- phpBB/includes/functions_content.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index e536c5ad247..94de0b78495 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -327,7 +327,6 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po */ function get_context($text, $words, $length = 400) { - $output = ''; $text_length = utf8_strlen($text); // Replace all spaces/invisible characters with single spaces @@ -336,7 +335,7 @@ function get_context($text, $words, $length = 400) // we need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); - // Get first ocurrence of each word + // Get first occurrence of each word $word_indizes = []; foreach ($words as $word) { @@ -375,14 +374,14 @@ function get_context($text, $words, $length = 400) $fragments[] = $fragment; $start = $indize - ($characters_per_word / 2); - // Start fragment at the begining of a word + // Start fragment at the beginning of a word $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start - 1) + 1) : 0; } $end += $characters_per_word; // End fragment at the end of a word - $substring = utf8_substr($text, $start, $end-$start); + $substring = utf8_substr($text, $start, $end - $start); $end = $start + utf8_strrpos($substring, ' '); } From c0b81a1a48f7b4806ba05efab2e967e72a42fffd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 10 Jul 2024 21:32:15 +0200 Subject: [PATCH 0310/1214] [ticket/17365] Add a test for max search keywords PHPBB-17365 --- tests/search/native_test.php | 81 +++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/tests/search/native_test.php b/tests/search/native_test.php index 943334d959c..f3393225f41 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -25,19 +25,24 @@ public function getDataSet() protected function setUp(): void { - global $phpbb_root_path, $phpEx, $config, $user, $cache; + global $phpbb_root_path, $phpEx, $config, $cache; parent::setUp(); // dbal uses cache $cache = new phpbb_mock_cache(); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime');; + $this->db = $this->new_dbal(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); $error = null; $class = self::get_search_wrapper('\phpbb\search\fulltext_native'); $config['fulltext_native_min_chars'] = 2; $config['fulltext_native_max_chars'] = 14; + $config['max_num_search_keywords'] = 10; $this->search = new $class($error, $phpbb_root_path, $phpEx, null, $config, $this->db, $user, $phpbb_dispatcher); } @@ -259,4 +264,78 @@ public function test_split_keywords($keywords, $terms, $ok, $must_contain, $must } $this->assert_array_content_equals($common, $this->search->get_common_words()); } + + public function data_split_keywords_max(): array + { + return [ + 'character count within limits separated by more spaces' => [ + 'foo bar baz boo far faz roo rar raz zoo', + 'all', + false, + ], + 'character count within limits separated by spaces' => [ + 'foo bar baz boo far faz roo rar raz zoo', + 'all', + false, + ], + 'character count within limits separated by +, spaces after +' => [ + 'foo+ bar+ baz+ boo+ far+ faz+ roo+ rar+ raz+ zoo', + 'all', + false, + ], + 'character count within limits separated by +, no spaces' => [ + 'foo+bar+baz+boo+far+faz+roo+rar+raz+zoo', + 'all', + false, + ], + 'character count outside limits separated by +, no spaces' => [ + 'foo+bar+baz+boo+far+faz+roo+rar+raz+zoo+zar', + 'all', + true, + ], + 'character count outside limits separated by + and spaces' => [ + 'foo +bar +baz +boo +far +faz +roo +rar +raz +zoo +zar', + 'all', + true, + ], + 'character count outside limits separated by spaces' => [ + 'foo bar baz boo far faz roo rar raz zoo zar', + 'all', + true, + ], + 'character count outside limits separated by -, no spaces' => [ + 'foo-bar-baz-boo-far-faz-roo-rar-raz-zoo-zar', + 'all', + true, + ], + 'character count outside limits separated by - and spaces' => [ + 'foo -bar -baz -boo -far -faz -roo -rar -raz -zoo -zar', + 'all', + true, + ], + 'character count outside limits separated by |, no spaces' => [ + 'foo|bar|baz|boo|far|faz|roo|rar|raz|zoo|zar', + 'all', + true, + ], + 'character count outside limits separated by | and spaces' => [ + 'foo |bar |baz |boo |far |faz |roo |rar |raz |zoo |zar', + 'all', + true, + ], + ]; + } + + /** + * @dataProvider data_split_keywords_max + */ + public function test_split_max_keywords($keywords, $terms, $expect_error) + { + if ($expect_error) + { + $this->setExpectedTriggerError(E_USER_NOTICE, 'MAX_NUM_SEARCH_KEYWORDS_REFINE'); + } + + $this->assertTrue($this->search->split_keywords($keywords, $terms)); + } } From 6395639345b9111ed0aab4af880a152389117212 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 11 Jul 2024 20:35:26 +0200 Subject: [PATCH 0311/1214] [ticket/12479] Remove deprecated functions PHPBB-12479 --- phpBB/includes/functions_compatibility.php | 488 ------------------- phpBB/phpbb/files/filespec.php | 2 +- phpBB/phpbb/plupload/plupload.php | 3 +- tests/functions/get_remote_file_test.php | 80 --- tests/log/function_add_log_test.php | 52 +- tests/version/version_helper_remote_test.php | 61 +++ 6 files changed, 112 insertions(+), 574 deletions(-) delete mode 100644 tests/functions/get_remote_file_test.php diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 85ec1bd449a..a6b5d26d3f6 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,196 +19,6 @@ exit; } -/** -* Hash the password -* -* @deprecated 3.1.0-a2 (To be removed: 4.0.0) -* -* @param string $password Password to be hashed -* -* @return string|bool Password hash or false if something went wrong during hashing -*/ -function phpbb_hash($password) -{ - global $phpbb_container; - - /* @var $passwords_manager \phpbb\passwords\manager */ - $passwords_manager = $phpbb_container->get('passwords.manager'); - return $passwords_manager->hash($password); -} - -/** -* Check for correct password -* -* @deprecated 3.1.0-a2 (To be removed: 4.0.0) -* -* @param string $password The password in plain text -* @param string $hash The stored password hash -* -* @return bool Returns true if the password is correct, false if not. -*/ -function phpbb_check_hash($password, $hash) -{ - global $phpbb_container; - - /* @var $passwords_manager \phpbb\passwords\manager */ - $passwords_manager = $phpbb_container->get('passwords.manager'); - return $passwords_manager->check($password, $hash); -} - -/** -* Eliminates useless . and .. components from specified path. -* -* Deprecated, use storage helper class instead -* -* @param string $path Path to clean -* @return string Cleaned path -* -* @deprecated 3.1.0 (To be removed: 4.0.0) -*/ -function phpbb_clean_path($path) -{ - return \phpbb\filesystem\helper::clean_path($path); -} - -/** -* Pick a timezone -* -* @param string $default A timezone to select -* @param boolean $truncate Shall we truncate the options text -* -* @return string Returns the options for timezone selector only -* -* @deprecated 3.1.0 (To be removed: 4.0.0) -*/ -function tz_select($default = '', $truncate = false) -{ - global $user; - - return phpbb_timezone_select($user, $default, $truncate); -} - -/** -* Cache moderators. Called whenever permissions are changed -* via admin_permissions. Changes of usernames and group names -* must be carried through for the moderators table. -* -* @deprecated 3.1.0 (To be removed: 4.0.0) -* @return void -*/ -function cache_moderators() -{ - global $db, $cache, $auth, $phpbb_container; - phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth); -} - -/** -* Removes moderators and administrators from foe lists. -* -* @deprecated 3.1.0 (To be removed: 4.0.0) -* @param array|bool $group_id If an array, remove all members of this group from foe lists, or false to ignore -* @param array|bool $user_id If an array, remove this user from foe lists, or false to ignore -* @return void -*/ -function update_foes($group_id = false, $user_id = false) -{ - global $db, $auth; - return phpbb_update_foes($db, $auth, $group_id, $user_id); -} - -/** -* Get user rank title and image -* -* @param int $user_rank the current stored users rank id -* @param int $user_posts the users number of posts -* @param string &$rank_title the rank title will be stored here after execution -* @param string &$rank_img the rank image as full img tag is stored here after execution -* @param string &$rank_img_src the rank image source is stored here after execution -* -* @deprecated 3.1.0-RC5 (To be removed: 4.0.0) -* -* Note: since we do not want to break backwards-compatibility, this function will only properly assign ranks to guests if you call it for them with user_posts == false -*/ -function get_user_rank($user_rank, $user_posts, &$rank_title, &$rank_img, &$rank_img_src) -{ - global $phpbb_root_path, $phpEx; - if (!function_exists('phpbb_get_user_rank')) - { - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); - } - - $rank_data = phpbb_get_user_rank(array('user_rank' => $user_rank), $user_posts); - $rank_title = $rank_data['title']; - $rank_img = $rank_data['img']; - $rank_img_src = $rank_data['img_src']; -} - -/** - * Retrieve contents from remotely stored file - * - * @deprecated 3.1.2 Use file_downloader instead - */ -function get_remote_file($host, $directory, $filename, &$errstr, &$errno, $port = 80, $timeout = 6) -{ - global $phpbb_container; - - // Get file downloader and assign $errstr and $errno - /* @var $file_downloader \phpbb\file_downloader */ - $file_downloader = $phpbb_container->get('file_downloader'); - - $file_data = $file_downloader->get($host, $directory, $filename, $port, $timeout); - $errstr = $file_downloader->get_error_string(); - $errno = $file_downloader->get_error_number(); - - return $file_data; -} - -/** - * Add log entry - * - * string $mode The mode defines which log_type is used and from which log the entry is retrieved - * int $forum_id Mode 'mod' ONLY: forum id of the related item, NOT INCLUDED otherwise - * int $topic_id Mode 'mod' ONLY: topic id of the related item, NOT INCLUDED otherwise - * int $reportee_id Mode 'user' ONLY: user id of the reportee, NOT INCLUDED otherwise - * string $log_operation Name of the operation - * array $additional_data More arguments can be added, depending on the log_type - * - * @return int|bool Returns the log_id, if the entry was added to the database, false otherwise. - * - * @deprecated 3.1.0 (To be removed: 4.0.0) - */ -function add_log() -{ - global $phpbb_log, $user; - - $args = func_get_args(); - $mode = array_shift($args); - - // This looks kind of dirty, but add_log has some additional data before the log_operation - $additional_data = array(); - switch ($mode) - { - case 'admin': - case 'critical': - break; - case 'mod': - $additional_data['forum_id'] = array_shift($args); - $additional_data['topic_id'] = array_shift($args); - break; - case 'user': - $additional_data['reportee_id'] = array_shift($args); - break; - } - - $log_operation = array_shift($args); - $additional_data = array_merge($additional_data, $args); - - $user_id = (empty($user->data)) ? ANONYMOUS : $user->data['user_id']; - $user_ip = (empty($user->ip)) ? '' : $user->ip; - - return $phpbb_log->add($mode, $user_id, $user_ip, $log_operation, time(), $additional_data); -} - /** * Sets a configuration option's value. * @@ -330,125 +140,6 @@ function request_var($var_name, $default, $multibyte = false, $cookie = false, $ return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? \phpbb\request\request_interface::COOKIE : \phpbb\request\request_interface::REQUEST); } -/** - * Get tables of a database - * - * @deprecated 3.1.0 (To be removed: 4.0.0) - */ -function get_tables($db) -{ - throw new BadFunctionCallException('function removed from phpBB core, use db_tools service instead.'); -} - -/** - * Global function for chmodding directories and files for internal use - * - * This function determines owner and group whom the file belongs to and user and group of PHP and then set safest possible file permissions. - * The function determines owner and group from common.php file and sets the same to the provided file. - * The function uses bit fields to build the permissions. - * The function sets the appropiate execute bit on directories. - * - * Supported constants representing bit fields are: - * - * CHMOD_ALL - all permissions (7) - * CHMOD_READ - read permission (4) - * CHMOD_WRITE - write permission (2) - * CHMOD_EXECUTE - execute permission (1) - * - * NOTE: The function uses POSIX extension and fileowner()/filegroup() functions. If any of them is disabled, this function tries to build proper permissions, by calling is_readable() and is_writable() functions. - * - * @param string $filename The file/directory to be chmodded - * @param int $perms Permissions to set - * - * @return bool true on success, otherwise false - * - * @deprecated 3.2.0-dev use \phpbb\filesystem\filesystem::phpbb_chmod() instead - */ -function phpbb_chmod($filename, $perms = CHMOD_READ) -{ - global $phpbb_filesystem; - - try - { - $phpbb_filesystem->phpbb_chmod($filename, $perms); - } - catch (\phpbb\filesystem\exception\filesystem_exception $e) - { - return false; - } - - return true; -} - -/** - * Test if a file/directory is writable - * - * This function calls the native is_writable() when not running under - * Windows and it is not disabled. - * - * @param string $file Path to perform write test on - * @return bool True when the path is writable, otherwise false. - * - * @deprecated 3.2.0-dev use \phpbb\filesystem\filesystem::is_writable() instead - */ -function phpbb_is_writable($file) -{ - global $phpbb_filesystem; - - return $phpbb_filesystem->is_writable($file); -} - -/** - * Checks if a path ($path) is absolute or relative - * - * @param string $path Path to check absoluteness of - * @return boolean - * - * @deprecated 3.2.0-dev use \phpbb\filesystem\helper::is_absolute_path() instead - */ -function phpbb_is_absolute($path) -{ - return \phpbb\filesystem\helper::is_absolute_path($path); -} - -/** - * A wrapper for realpath - * - * @deprecated 3.2.0-dev use \phpbb\filesystem\helper::realpath() instead - */ -function phpbb_realpath($path) -{ - return \phpbb\filesystem\helper::realpath($path); -} - -/** - * Determine which plural form we should use. - * For some languages this is not as simple as for English. - * - * @param int $rule ID of the plural rule we want to use, see https://area51.phpbb.com/docs/dev/3.3.x/language/plurals.html - * @param int|float $number The number we want to get the plural case for. Float numbers are floored. - * @return int The plural-case we need to use for the number plural-rule combination - * - * @deprecated 3.2.0-dev (To be removed: 4.0.0) - */ -function phpbb_get_plural_form($rule, $number) -{ - global $phpbb_container; - - /** @var \phpbb\language\language $language */ - $language = $phpbb_container->get('language'); - return $language->get_plural_form($number, $rule); -} - -/** -* @return bool Always true -* @deprecated 3.2.0-dev -*/ -function phpbb_pcre_utf8_support() -{ - return true; -} - /** * Casts a variable to the given type. * @@ -461,142 +152,6 @@ function set_var(&$result, $var, $type, $multibyte = false) $type_cast_helper->set_var($result, $var, $type, $multibyte); } -/** - * Delete Attachments - * - * @deprecated 3.2.0-a1 (To be removed: 4.0.0) - * - * @param string $mode can be: post|message|topic|attach|user - * @param mixed $ids can be: post_ids, message_ids, topic_ids, attach_ids, user_ids - * @param bool $resync set this to false if you are deleting posts or topics - */ -function delete_attachments($mode, $ids, $resync = true) -{ - global $phpbb_container; - - /** @var \phpbb\attachment\manager $attachment_manager */ - $attachment_manager = $phpbb_container->get('attachment.manager'); - $num_deleted = $attachment_manager->delete($mode, $ids, $resync); - - unset($attachment_manager); - - return $num_deleted; -} - -/** - * Delete attached file - * - * @deprecated 3.2.0-a1 (To be removed: 4.0.0) - */ -function phpbb_unlink($filename, $mode = 'file', $entry_removed = false) -{ - global $phpbb_container; - - /** @var \phpbb\attachment\manager $attachment_manager */ - $attachment_manager = $phpbb_container->get('attachment.manager'); - $unlink = $attachment_manager->unlink($filename, $mode, $entry_removed); - unset($attachment_manager); - - return $unlink; -} - -/** - * Display reasons - * - * @deprecated 3.2.0-dev (To be removed: 4.0.0) - */ -function display_reasons($reason_id = 0) -{ - global $phpbb_container; - - $phpbb_container->get('phpbb.report.report_reason_list_provider')->display_reasons($reason_id); -} - -/** - * Upload Attachment - filedata is generated here - * Uses upload class - * - * @deprecated 3.2.0-a1 (To be removed: 4.0.0) - * - * @param string $form_name The form name of the file upload input - * @param int $forum_id The id of the forum - * @param bool $local Whether the file is local or not - * @param string $local_storage The path to the local file - * @param bool $is_message Whether it is a PM or not - * @param array $local_filedata A filespec object created for the local file - * - * @return array File data array - */ -function upload_attachment($form_name, $forum_id, $local = false, $local_storage = '', $is_message = false, $local_filedata = false) -{ - global $phpbb_container; - - /** @var \phpbb\attachment\manager $attachment_manager */ - $attachment_manager = $phpbb_container->get('attachment.manager'); - $file = $attachment_manager->upload($form_name, $forum_id, $local, $local_storage, $is_message, $local_filedata); - unset($attachment_manager); - - return $file; -} - -/** -* Wrapper for php's checkdnsrr function. -* -* @param string $host Fully-Qualified Domain Name -* @param string $type Resource record type to lookup -* Supported types are: MX (default), A, AAAA, NS, TXT, CNAME -* Other types may work or may not work -* -* @return bool|null true if entry found, -* false if entry not found, -* null if this function is not supported by this environment -* -* Since null can also be returned, you probably want to compare the result -* with === true or === false, -* -* @deprecated 3.3.0-b2 (To be removed: 4.0.0) -*/ -function phpbb_checkdnsrr($host, $type = 'MX') -{ - return checkdnsrr($host, $type); -} - -/* - * Wrapper for inet_ntop() - * - * Converts a packed internet address to a human readable representation - * inet_ntop() is supported by PHP since 5.1.0, since 5.3.0 also on Windows. - * - * @param string $in_addr A 32bit IPv4, or 128bit IPv6 address. - * - * @return mixed false on failure, - * string otherwise - * - * @deprecated 3.3.0-b2 (To be removed: 4.0.0) - */ -function phpbb_inet_ntop($in_addr) -{ - return inet_ntop($in_addr); -} - -/** - * Wrapper for inet_pton() - * - * Converts a human readable IP address to its packed in_addr representation - * inet_pton() is supported by PHP since 5.1.0, since 5.3.0 also on Windows. - * - * @param string $address A human readable IPv4 or IPv6 address. - * - * @return false|string false if address is invalid, - * in_addr representation of the given address otherwise (string) - * - * @deprecated 3.3.0-b2 (To be removed: 4.0.0) - */ -function phpbb_inet_pton($address) -{ - return inet_pton($address); -} - /** * Hashes an email address to a big integer * @@ -829,25 +384,6 @@ function phpbb_to_numeric($input) return ($input > PHP_INT_MAX) ? (float) $input : (int) $input; } -/** -* Check and display the SQL report if requested. -* -* @param \phpbb\request\request_interface $request Request object -* @param \phpbb\auth\auth $auth Auth object -* @param \phpbb\db\driver\driver_interface $db Database connection -* -* @deprecated 3.3.1 (To be removed: 4.0.0-a1); use controller helper's display_sql_report() -*/ -function phpbb_check_and_display_sql_report(\phpbb\request\request_interface $request, \phpbb\auth\auth $auth, \phpbb\db\driver\driver_interface $db) -{ - global $phpbb_container; - - /** @var \phpbb\controller\helper $controller_helper */ - $controller_helper = $phpbb_container->get('controller.helper'); - - $controller_helper->display_sql_report(); -} - /** * Parse cfg file * @param string $filename @@ -909,27 +445,3 @@ function parse_cfg_file($filename, $lines = false) return $parsed_items; } - -/** -* Wraps an url into a simple html page. Used to display attachments in IE. -* this is a workaround for now; might be moved to template system later -* direct any complaints to 1 Microsoft Way, Redmond -* -* @deprecated: 3.3.0-dev (To be removed: 4.0.0) -*/ -function wrap_img_in_html($src, $title) -{ - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo '' . $title . ''; - echo ''; - echo ''; - echo '
'; - echo '' . $title . ''; - echo '
'; - echo ''; - echo ''; -} diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php index 6e4c224e392..48e9284f693 100644 --- a/phpBB/phpbb/files/filespec.php +++ b/phpBB/phpbb/files/filespec.php @@ -398,7 +398,7 @@ public function check_content($disallowed_content) * @param bool $overwrite If set to true, an already existing file will be overwritten * @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped * @param string|bool $chmod Permission mask for chmodding the file after a successful move. - * The mode entered here reflects the mode defined by {@link phpbb_chmod()} + * The mode entered here reflects the mode defined by {@link \phpbb\filesystem\filesystem::phpbb_chmod()} * * @return bool True if file was moved, false if not * @access public diff --git a/phpBB/phpbb/plupload/plupload.php b/phpBB/phpbb/plupload/plupload.php index db5a1d6dd91..18fdfe588de 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -344,8 +344,9 @@ protected function integrate_uploaded_file($form_name, $chunk, $file_path) } $tmp_file = $this->temporary_filepath($upload['tmp_name']); + $filesystem = new \phpbb\filesystem\filesystem(); - if (!phpbb_is_writable($this->temporary_directory) || !move_uploaded_file($upload['tmp_name'], $tmp_file)) + if (!$filesystem->is_writable($this->temporary_directory) || !move_uploaded_file($upload['tmp_name'], $tmp_file)) { $this->emit_error(103, 'PLUPLOAD_ERR_MOVE_UPLOADED'); } diff --git a/tests/functions/get_remote_file_test.php b/tests/functions/get_remote_file_test.php deleted file mode 100644 index c0330d01f8a..00000000000 --- a/tests/functions/get_remote_file_test.php +++ /dev/null @@ -1,80 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @group slow -*/ -class phpbb_functions_get_remote_file extends phpbb_test_case -{ - public function test_version_phpbb_com() - { - global $phpbb_container; - $phpbb_container = new phpbb_mock_container_builder(); - $phpbb_container->set('file_downloader', new \phpbb\file_downloader()); - - $hostname = 'version.phpbb.com'; - - if (!checkdnsrr($hostname, 'A')) - { - $this->markTestSkipped(sprintf( - 'Could not find a DNS record for hostname %s. ' . - 'Assuming network is down.', - $hostname - )); - } - - $errstr = $errno = null; - $file = get_remote_file($hostname, '/phpbb', '30x.txt', $errstr, $errno); - - $this->assertNotEquals( - 0, - strlen($file), - 'Failed asserting that the response is not empty.' - ); - - $this->assertSame( - '', - $errstr, - 'Failed asserting that the error string is empty.' - ); - - $this->assertSame( - 0, - $errno, - 'Failed asserting that the error number is 0 (i.e. no error occurred).' - ); - - $lines = explode("\n", $file); - - $this->assertGreaterThanOrEqual( - 2, - count($lines), - 'Failed asserting that the version file has at least two lines.' - ); - - $this->assertStringStartsWith( - '3.', - $lines[0], - "Failed asserting that the first line of the version file starts with '3.'" - ); - - $this->assertNotSame( - false, - filter_var($lines[1], FILTER_VALIDATE_URL), - 'Failed asserting that the second line of the version file is a valid URL.' - ); - - $this->assertStringContainsString('http', $lines[1]); - $this->assertStringContainsString('phpbb.com', $lines[1], '', true); - } -} diff --git a/tests/log/function_add_log_test.php b/tests/log/function_add_log_test.php index bcb4db0705b..8d89c15ab89 100644 --- a/tests/log/function_add_log_test.php +++ b/tests/log/function_add_log_test.php @@ -172,19 +172,63 @@ public function test_add_log_function($expected, $user_id, $mode, $required1, $a if ($additional3 != null) { - add_log($mode, $required1, $additional1, $additional2, $additional3); + $additional_data = [ + 'forum_id' => $required1, + 'topic_id' => $additional1, + $additional3, + ]; + $phpbb_log->add($mode, $user_id, '', $additional2, false, $additional_data); } else if ($additional2 != null) { - add_log($mode, $required1, $additional1, $additional2); + if ($mode == 'user') + { + $additional_data = [ + 'reportee_id' => $required1, + $additional2, + ]; + $log_operation = $additional1; + } + else if ($mode == 'mod') + { + $additional_data = [ + 'forum_id' => $required1, + 'topic_id' => $additional1, + ]; + $log_operation = $additional2; + } + else + { + $log_operation = $required1; + $additional_data = [ + $additional1, + $additional2, + ]; + } + $phpbb_log->add($mode, $user_id, '', $log_operation, false, $additional_data); } else if ($additional1 != null) { - add_log($mode, $required1, $additional1); + if ($mode == 'user') + { + $additional_data = [ + 'reportee_id' => $required1, + ]; + $log_operation = $additional1; + } + else + { + $log_operation = $required1; + $additional_data = [ + $additional1, + ]; + } + + $phpbb_log->add($mode, $user_id, '', $log_operation, false, $additional_data); } else { - add_log($mode, $required1); + $phpbb_log->add($mode, $user_id, '', $required1); } $result = $db->sql_query('SELECT user_id, log_type, log_operation, log_data, reportee_id, forum_id, topic_id diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index de88c281ffb..02a811b5399 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -224,4 +224,65 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e $this->assertEquals($expected_return, $return); } + + public function test_version_phpbb_com() + { + $file_downloader = new \phpbb\file_downloader(); + + $hostname = 'version.phpbb.com'; + + if (!checkdnsrr($hostname, 'A')) + { + $this->markTestSkipped(sprintf( + 'Could not find a DNS record for hostname %s. ' . + 'Assuming network is down.', + $hostname + )); + } + + $file = $file_downloader->get($hostname, '/phpbb', '30x.txt'); + $errstr = $file_downloader->get_error_string(); + $errno = $file_downloader->get_error_number(); + + $this->assertNotEquals( + 0, + strlen($file), + 'Failed asserting that the response is not empty.' + ); + + $this->assertSame( + '', + $errstr, + 'Failed asserting that the error string is empty.' + ); + + $this->assertSame( + 0, + $errno, + 'Failed asserting that the error number is 0 (i.e. no error occurred).' + ); + + $lines = explode("\n", $file); + + $this->assertGreaterThanOrEqual( + 2, + count($lines), + 'Failed asserting that the version file has at least two lines.' + ); + + $this->assertStringStartsWith( + '3.', + $lines[0], + "Failed asserting that the first line of the version file starts with '3.'" + ); + + $this->assertNotSame( + false, + filter_var($lines[1], FILTER_VALIDATE_URL), + 'Failed asserting that the second line of the version file is a valid URL.' + ); + + $this->assertStringContainsString('http', $lines[1]); + $this->assertStringContainsString('phpbb.com', $lines[1], '', true); + } } From e6e445395f2c84166bfe28233188c8b335d0133a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 11 Jul 2024 21:12:34 +0200 Subject: [PATCH 0312/1214] [ticket/12479] Update hash test PHPBB-12479 --- tests/security/hash_test.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php index 49eefa34116..3c99a70200b 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -40,16 +40,26 @@ protected function setUp(): void public function test_check_hash_with_phpass() { - $this->assertTrue(phpbb_check_hash('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); - $this->assertTrue(phpbb_check_hash('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); - $this->assertFalse(phpbb_check_hash('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + global $phpbb_container;; + + /** @var \phpbb\passwords\manager $passwords_manager */ + $passwords_manager = $phpbb_container->get('passwords.manager'); + + $this->assertTrue($passwords_manager->check('test', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertTrue($passwords_manager->check('test', '$P$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertFalse($passwords_manager->check('foo', '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); } public function test_check_hash_with_large_input() { + global $phpbb_container;; + + /** @var \phpbb\passwords\manager $passwords_manager */ + $passwords_manager = $phpbb_container->get('passwords.manager'); + // 16 MB password, should be rejected quite fast $start_time = time(); - $this->assertFalse(phpbb_check_hash(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); + $this->assertFalse($passwords_manager->check(str_repeat('a', 1024 * 1024 * 16), '$H$9isfrtKXWqrz8PvztXlL3.daw4U0zI1')); $this->assertLessThanOrEqual(5, time() - $start_time); } } From 54ba185d8217d74e508855621b74a63fce07ab80 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 11 Jul 2024 21:30:44 +0200 Subject: [PATCH 0313/1214] [ticket/12479] Remove deprecated phpbb\filesystem class PHPBB-12479 --- phpBB/phpbb/filesystem.php | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 phpBB/phpbb/filesystem.php diff --git a/phpBB/phpbb/filesystem.php b/phpBB/phpbb/filesystem.php deleted file mode 100644 index 6ac94593313..00000000000 --- a/phpBB/phpbb/filesystem.php +++ /dev/null @@ -1,21 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb; - -/** - * @deprecated 3.2.0-dev (To be removed 4.0.0) use \phpbb\filesystem\filesystem instead - */ -class filesystem extends \phpbb\filesystem\filesystem -{ -} From 06d226f292ecad19a646b302dfe28c00d425b1bf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 11 Jul 2024 21:43:46 +0200 Subject: [PATCH 0314/1214] [ticket/12479] Remove set_config and set_config_count PHPBB-12479 --- phpBB/includes/compatibility_globals.php | 2 - phpBB/includes/functions_compatibility.php | 60 ------------------- .../generate_text_for_display_test.php | 1 - .../generate_text_for_storage_test.php | 1 - 4 files changed, 64 deletions(-) diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php index df152c81ab7..f1f5dd8321a 100644 --- a/phpBB/includes/compatibility_globals.php +++ b/phpBB/includes/compatibility_globals.php @@ -67,8 +67,6 @@ function register_compatibility_globals() // Grab global variables, re-cache if necessary /* @var $config phpbb\config\db */ $config = $phpbb_container->get('config'); - set_config('', '', false, $config); - set_config_count('', 0, false, $config); /* @var $phpbb_log \phpbb\log\log_interface */ $phpbb_log = $phpbb_container->get('log'); diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index a6b5d26d3f6..13563d79ef0 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,66 +19,6 @@ exit; } -/** - * Sets a configuration option's value. - * - * Please note that this function does not update the is_dynamic value for - * an already existing config option. - * - * @param string $config_name The configuration option's name - * @param string $config_value New configuration value - * @param bool $is_dynamic Whether this variable should be cached (false) or - * if it changes too frequently (true) to be - * efficiently cached. - * - * @return void - * - * @deprecated 3.1.0 (To be removed: 4.0.0) - */ -function set_config($config_name, $config_value, $is_dynamic = false, \phpbb\config\config $set_config = null) -{ - static $config = null; - - if ($set_config !== null) - { - $config = $set_config; - - if (empty($config_name)) - { - return; - } - } - - $config->set($config_name, $config_value, !$is_dynamic); -} - -/** - * Increments an integer config value directly in the database. - * - * @param string $config_name The configuration option's name - * @param int $increment Amount to increment by - * @param bool $is_dynamic Whether this variable should be cached (false) or - * if it changes too frequently (true) to be - * efficiently cached. - * - * @return void - * - * @deprecated 3.1.0 (To be removed: 4.0.0) - */ -function set_config_count($config_name, $increment, $is_dynamic = false, \phpbb\config\config $set_config = null) -{ - static $config = null; - if ($set_config !== null) - { - $config = $set_config; - if (empty($config_name)) - { - return; - } - } - $config->increment($config_name, $increment, !$is_dynamic); -} - /** * Wrapper function of \phpbb\request\request::variable which exists for backwards compatability. * See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for diff --git a/tests/text_processing/generate_text_for_display_test.php b/tests/text_processing/generate_text_for_display_test.php index 9a909a007cb..7d96152c210 100644 --- a/tests/text_processing/generate_text_for_display_test.php +++ b/tests/text_processing/generate_text_for_display_test.php @@ -21,7 +21,6 @@ protected function setUp(): void $phpbb_dispatcher = new phpbb_mock_event_dispatcher; $config = new \phpbb\config\config(array()); - set_config(null, null, null, $config); } /** diff --git a/tests/text_processing/generate_text_for_storage_test.php b/tests/text_processing/generate_text_for_storage_test.php index c47c9b9f5ef..86c257a9f61 100644 --- a/tests/text_processing/generate_text_for_storage_test.php +++ b/tests/text_processing/generate_text_for_storage_test.php @@ -20,7 +20,6 @@ protected function setUp(): void parent::setUp(); $config = new \phpbb\config\config(array()); - set_config(null, null, null, $config); $phpbb_container = new phpbb_mock_container_builder; $phpbb_container->set('config', $config); From f4cad55581cd9898bf841bcc0185603fc0c3803d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 11 Jul 2024 21:54:09 +0200 Subject: [PATCH 0315/1214] [ticket/12479] Remove request_var function PHPBB-12479 --- phpBB/includes/compatibility_globals.php | 2 - phpBB/includes/functions_compatibility.php | 61 ---------------------- tests/request/request_var_test.php | 21 +++----- 3 files changed, 8 insertions(+), 76 deletions(-) diff --git a/phpBB/includes/compatibility_globals.php b/phpBB/includes/compatibility_globals.php index f1f5dd8321a..ca0394e88f6 100644 --- a/phpBB/includes/compatibility_globals.php +++ b/phpBB/includes/compatibility_globals.php @@ -49,8 +49,6 @@ function register_compatibility_globals() /* @var $request \phpbb\request\request_interface */ $request = $phpbb_container->get('request'); - // Inject request instance, so only this instance is used with request_var - request_var('', 0, false, false, $request); /* @var $user \phpbb\user */ $user = $phpbb_container->get('user'); diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 13563d79ef0..df74abe308f 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,67 +19,6 @@ exit; } -/** - * Wrapper function of \phpbb\request\request::variable which exists for backwards compatability. - * See {@link \phpbb\request\request_interface::variable \phpbb\request\request_interface::variable} for - * documentation of this function's use. - * - * @deprecated 3.1.0 (To be removed: 4.0.0) - * @param mixed $var_name The form variable's name from which data shall be retrieved. - * If the value is an array this may be an array of indizes which will give - * direct access to a value at any depth. E.g. if the value of "var" is array(1 => "a") - * then specifying array("var", 1) as the name will return "a". - * If you pass an instance of {@link \phpbb\request\request_interface phpbb_request_interface} - * as this parameter it will overwrite the current request class instance. If you do - * not do so, it will create its own instance (but leave superglobals enabled). - * @param mixed $default A default value that is returned if the variable was not set. - * This function will always return a value of the same type as the default. - * @param bool $multibyte If $default is a string this paramater has to be true if the variable may contain any UTF-8 characters - * Default is false, causing all bytes outside the ASCII range (0-127) to be replaced with question marks - * @param bool $cookie This param is mapped to \phpbb\request\request_interface::COOKIE as the last param for - * \phpbb\request\request_interface::variable for backwards compatability reasons. - * @param \phpbb\request\request_interface|null|false $request - * If an instance of \phpbb\request\request_interface is given the instance is stored in - * a static variable and used for all further calls where this parameters is null. Until - * the function is called with an instance it automatically creates a new \phpbb\request\request - * instance on every call. By passing false this per-call instantiation can be restored - * after having passed in a \phpbb\request\request_interface instance. - * - * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the - * the same as that of $default. If the variable is not set $default is returned. - */ -function request_var($var_name, $default, $multibyte = false, $cookie = false, $request = null) -{ - // This is all just an ugly hack to add "Dependency Injection" to a function - // the only real code is the function call which maps this function to a method. - static $static_request = null; - if ($request instanceof \phpbb\request\request_interface) - { - $static_request = $request; - if (empty($var_name)) - { - return null; - } - } - else if ($request === false) - { - $static_request = null; - if (empty($var_name)) - { - return null; - } - } - $tmp_request = $static_request; - // no request class set, create a temporary one ourselves to keep backwards compatibility - if ($tmp_request === null) - { - // false param: enable super globals, so the created request class does not - // make super globals inaccessible everywhere outside this function. - $tmp_request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); - } - return $tmp_request->variable($var_name, $default, $multibyte, ($cookie) ? \phpbb\request\request_interface::COOKIE : \phpbb\request\request_interface::REQUEST); -} - /** * Casts a variable to the given type. * diff --git a/tests/request/request_var_test.php b/tests/request/request_var_test.php index c95dce46d06..ea1a1ac89e9 100644 --- a/tests/request/request_var_test.php +++ b/tests/request/request_var_test.php @@ -13,15 +13,6 @@ class phpbb_request_var_test extends phpbb_test_case { - /** - * Makes sure request_var has its standard behaviour. - */ - protected function setUp(): void - { - parent::setUp(); - request_var(false, false, false, false, false); - } - /** * @dataProvider request_variables */ @@ -33,7 +24,8 @@ public function test_post($variable_value, $default, $multibyte, $expected) $_POST[$variable_name] = $variable_value; $_REQUEST[$variable_name] = $variable_value; - $result = request_var($variable_name, $default, $multibyte); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($variable_name, $default, $multibyte); $label = 'Requesting POST variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); $this->assertEquals($expected, $result, $label); @@ -50,7 +42,8 @@ public function test_get($variable_value, $default, $multibyte, $expected) $_GET[$variable_name] = $variable_value; $_REQUEST[$variable_name] = $variable_value; - $result = request_var($variable_name, $default, $multibyte); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($variable_name, $default, $multibyte); $label = 'Requesting GET variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); $this->assertEquals($expected, $result, $label); @@ -69,7 +62,8 @@ public function test_cookie($variable_value, $default, $multibyte, $expected) $_REQUEST[$variable_name] = false; $_COOKIE[$variable_name] = $variable_value; - $result = request_var($variable_name, $default, $multibyte, true); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($variable_name, $default, $multibyte, \phpbb\request\request_interface::COOKIE); $label = 'Requesting COOKIE variable, converting from ' . gettype($variable_value) . ' to ' . gettype($default) . (($multibyte) ? ' multibyte' : ''); $this->assertEquals($expected, $result, $label); @@ -109,7 +103,8 @@ public function test_deep_multi_dim_array_access($path, $default, $expected) ), ); - $result = request_var($path, $default); + $request = new \phpbb\request\request(new \phpbb\request\type_cast_helper(), false); + $result = $request->variable($path, $default); $this->assertEquals($expected, $result); } From 3e0637ad2ec687754afeaf5b5f18dead4ac9ae0a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 12 Jul 2024 21:09:26 +0200 Subject: [PATCH 0316/1214] [ticket/12479] Remove set_var, phpbb_email_hash, and phpbb_http_login PHPBB-12479 --- phpBB/includes/functions_compatibility.php | 131 --------------------- phpBB/phpbb/request/request.php | 6 +- phpBB/phpbb/request/request_interface.php | 4 +- 3 files changed, 5 insertions(+), 136 deletions(-) diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index df74abe308f..d2e39792161 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,32 +19,6 @@ exit; } -/** - * Casts a variable to the given type. - * - * @deprecated 3.1 (To be removed 4.0.0) - */ -function set_var(&$result, $var, $type, $multibyte = false) -{ - // no need for dependency injection here, if you have the object, call the method yourself! - $type_cast_helper = new \phpbb\request\type_cast_helper(); - $type_cast_helper->set_var($result, $var, $type, $multibyte); -} - -/** - * Hashes an email address to a big integer - * - * @param string $email Email address - * - * @return string Unsigned Big Integer - * - * @deprecated 3.3.0-b2 (To be removed: 4.0.0) - */ -function phpbb_email_hash($email) -{ - return sprintf('%u', crc32(strtolower($email))) . strlen($email); -} - /** * Load the autoloaders added by the extensions. * @@ -72,111 +46,6 @@ function phpbb_load_extensions_autoloaders($phpbb_root_path) } } -/** -* Login using http authenticate. -* -* @param array $param Parameter array, see $param_defaults array. -* -* @return void -* -* @deprecated 3.2.10 (To be removed 4.0.0) -*/ -function phpbb_http_login($param) -{ - global $auth, $user, $request; - global $config; - - $param_defaults = array( - 'auth_message' => '', - - 'autologin' => false, - 'viewonline' => true, - 'admin' => false, - ); - - // Overwrite default values with passed values - $param = array_merge($param_defaults, $param); - - // User is already logged in - // We will not overwrite his session - if (!empty($user->data['is_registered'])) - { - return; - } - - // $_SERVER keys to check - $username_keys = array( - 'PHP_AUTH_USER', - 'Authorization', - 'REMOTE_USER', 'REDIRECT_REMOTE_USER', - 'HTTP_AUTHORIZATION', 'REDIRECT_HTTP_AUTHORIZATION', - 'REMOTE_AUTHORIZATION', 'REDIRECT_REMOTE_AUTHORIZATION', - 'AUTH_USER', - ); - - $password_keys = array( - 'PHP_AUTH_PW', - 'REMOTE_PASSWORD', - 'AUTH_PASSWORD', - ); - - $username = null; - foreach ($username_keys as $k) - { - if ($request->is_set($k, \phpbb\request\request_interface::SERVER)) - { - $username = html_entity_decode($request->server($k), ENT_COMPAT); - break; - } - } - - $password = null; - foreach ($password_keys as $k) - { - if ($request->is_set($k, \phpbb\request\request_interface::SERVER)) - { - $password = html_entity_decode($request->server($k), ENT_COMPAT); - break; - } - } - - // Decode encoded information (IIS, CGI, FastCGI etc.) - if (!is_null($username) && is_null($password) && strpos($username, 'Basic ') === 0) - { - list($username, $password) = explode(':', base64_decode(substr($username, 6)), 2); - } - - if (!is_null($username) && !is_null($password)) - { - set_var($username, $username, 'string', true); - set_var($password, $password, 'string', true); - - $auth_result = $auth->login($username, $password, $param['autologin'], $param['viewonline'], $param['admin']); - - if ($auth_result['status'] == LOGIN_SUCCESS) - { - return; - } - else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS) - { - send_status_line(401, 'Unauthorized'); - - trigger_error('NOT_AUTHORISED'); - } - } - - // Prepend sitename to auth_message - $param['auth_message'] = ($param['auth_message'] === '') ? $config['sitename'] : $config['sitename'] . ' - ' . $param['auth_message']; - - // We should probably filter out non-ASCII characters - RFC2616 - $param['auth_message'] = preg_replace('/[\x80-\xFF]/', '?', $param['auth_message']); - - header('WWW-Authenticate: Basic realm="' . $param['auth_message'] . '"'); - send_status_line(401, 'Unauthorized'); - - trigger_error('NOT_AUTHORISED'); -} - /** * Converts query string (GET) parameters in request into hidden fields. * diff --git a/phpBB/phpbb/request/request.php b/phpBB/phpbb/request/request.php index cf81dc42c6e..a28b9df541f 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -184,7 +184,7 @@ public function overwrite($var_name, $value, $super_global = request_interface:: * @param int $super_global (\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE) * Specifies which super global should be used * - * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the + * @return mixed The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ public function variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST) @@ -208,7 +208,7 @@ public function variable($var_name, $default, $multibyte = false, $super_global * @param int $super_global (\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE) * Specifies which super global should be used * - * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the + * @return mixed The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ public function untrimmed_variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST) @@ -401,7 +401,7 @@ public function variable_names($super_global = request_interface::REQUEST) * Specifies which super global should be used * @param bool $trim Indicates whether trim() should be applied to string values. * - * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the + * @return mixed The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ protected function _variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST, $trim = true) diff --git a/phpBB/phpbb/request/request_interface.php b/phpBB/phpbb/request/request_interface.php index 9ebd4c25e39..add58736eab 100644 --- a/phpBB/phpbb/request/request_interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -59,7 +59,7 @@ public function overwrite($var_name, $value, $super_global = request_interface:: * @param int $super_global (\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE) * Specifies which super global shall be changed * - * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the + * @return mixed The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ public function variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST); @@ -81,7 +81,7 @@ public function variable($var_name, $default, $multibyte = false, $super_global * @param int $super_global (\phpbb\request\request_interface::POST|GET|REQUEST|COOKIE) * Specifies which super global shall be changed * - * @return mixed The value of $_REQUEST[$var_name] run through {@link set_var set_var} to ensure that the type is the + * @return mixed The value of $_REQUEST[$var_name] run through {@link type_cast_helper_interface::set_var} to ensure that the type is the * the same as that of $default. If the variable is not set $default is returned. */ public function raw_variable($var_name, $default, $super_global = request_interface::REQUEST); From 986b92f3b31430accfeda43ff5329a87476e6401 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 12 Jul 2024 21:17:47 +0200 Subject: [PATCH 0317/1214] [ticket/12479] Remove unused functions and function aliases PHPBB-12479 --- phpBB/includes/functions_compatibility.php | 98 ------------------- ...ld_hidden_fields_for_query_params_test.php | 73 -------------- tests/privmsgs/delete_user_pms_test.php | 2 +- 3 files changed, 1 insertion(+), 172 deletions(-) delete mode 100644 tests/functions/build_hidden_fields_for_query_params_test.php diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index d2e39792161..38b9cb40dc6 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,104 +19,6 @@ exit; } -/** - * Load the autoloaders added by the extensions. - * - * @param string $phpbb_root_path Path to the phpbb root directory. - */ -function phpbb_load_extensions_autoloaders($phpbb_root_path) -{ - $iterator = new \phpbb\finder\recursive_path_iterator( - $phpbb_root_path . 'ext/', - \RecursiveIteratorIterator::SELF_FIRST, - \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS - ); - $iterator->setMaxDepth(2); - - foreach ($iterator as $file_info) - { - if ($file_info->getFilename() === 'vendor' && $iterator->getDepth() === 2) - { - $filename = $file_info->getRealPath() . '/autoload.php'; - if (file_exists($filename)) - { - require $filename; - } - } - } -} - -/** -* Converts query string (GET) parameters in request into hidden fields. -* -* Useful for forwarding GET parameters when submitting forms with GET method. -* -* It is possible to omit some of the GET parameters, which is useful if -* they are specified in the form being submitted. -* -* sid is always omitted. -* -* @param \phpbb\request\request $request Request object -* @param array $exclude A list of variable names that should not be forwarded -* @return string HTML with hidden fields -* -* @deprecated 3.2.10 (To be removed 4.0.0) -*/ -function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) -{ - $names = $request->variable_names(\phpbb\request\request_interface::GET); - $hidden = ''; - foreach ($names as $name) - { - // Sessions are dealt with elsewhere, omit sid always - if ($name == 'sid') - { - continue; - } - - // Omit any additional parameters requested - if (!empty($exclude) && in_array($name, $exclude)) - { - continue; - } - - $escaped_name = phpbb_quoteattr($name); - - // Note: we might retrieve the variable from POST or cookies - // here. To avoid exposing cookies, skip variables that are - // overwritten somewhere other than GET entirely. - $value = $request->variable($name, '', true); - $get_value = $request->variable($name, '', true, \phpbb\request\request_interface::GET); - if ($value === $get_value) - { - $escaped_value = phpbb_quoteattr($value); - $hidden .= ""; - } - } - return $hidden; -} - -/** -* Delete all PM(s) for a given user and delete the ones without references -* -* @param int $user_id ID of the user whose private messages we want to delete -* -* @return boolean False if there were no pms found, true otherwise. -* -* @deprecated 3.2.10 (To be removed 4.0.0) -*/ -function phpbb_delete_user_pms($user_id) -{ - $user_id = (int) $user_id; - - if (!$user_id) - { - return false; - } - - return phpbb_delete_users_pms(array($user_id)); -} - /** * Casts a numeric string $input to an appropriate numeric type (i.e. integer or float) * diff --git a/tests/functions/build_hidden_fields_for_query_params_test.php b/tests/functions/build_hidden_fields_for_query_params_test.php deleted file mode 100644 index aee7a569d4e..00000000000 --- a/tests/functions/build_hidden_fields_for_query_params_test.php +++ /dev/null @@ -1,73 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -class phpbb_build_hidden_fields_for_query_params_test extends phpbb_test_case -{ - public function build_hidden_fields_for_query_params_test_data() - { - return array( - // get - // post - // exclude - // expected - array( - array('foo' => 'bar'), - array(), - array(), - "", - ), - array( - array('foo' => 'bar', 'a' => 'b'), - array(), - array(), - "", - ), - array( - array('a' => 'quote"', 'b' => ''), - array(), - array(), - "", - ), - array( - array('a' => "quotes'\""), - array(), - array(), - "", - ), - array( - array('foo' => 'bar', 'a' => 'b'), - array('a' => 'c'), - array(), - "", - ), - // strict equality check - array( - array('foo' => 'bar', 'a' => '0'), - array('a' => ''), - array(), - "", - ), - ); - } - - /** - * @dataProvider build_hidden_fields_for_query_params_test_data - */ - public function test_build_hidden_fields_for_query_params($get, $post, $exclude, $expected) - { - $request = new phpbb_mock_request($get, $post); - $result = phpbb_build_hidden_fields_for_query_params($request, $exclude); - - $this->assertEquals($expected, $result); - } -} diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php index a50240aae3b..e618d7c2e6a 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -97,7 +97,7 @@ public function test_delete_user_pms($delete_user, $remaining_privmsgs, $remaini // Works as a workaround for tests $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete(new \phpbb\config\config(array()), $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage)); - phpbb_delete_user_pms($delete_user); + phpbb_delete_users_pms([$delete_user]); $sql = 'SELECT msg_id FROM ' . PRIVMSGS_TABLE; From f835fba49eb40095f1cd4808f84bc44990641833 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 12 Jul 2024 21:24:37 +0200 Subject: [PATCH 0318/1214] [ticket/12479] Remove unused ini class and related function PHPBB-12479 --- phpBB/includes/functions_compatibility.php | 15 -- phpBB/phpbb/php/ini.php | 175 --------------------- 2 files changed, 190 deletions(-) delete mode 100644 phpBB/phpbb/php/ini.php diff --git a/phpBB/includes/functions_compatibility.php b/phpBB/includes/functions_compatibility.php index 38b9cb40dc6..1efc8c9c2ec 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,21 +19,6 @@ exit; } -/** -* Casts a numeric string $input to an appropriate numeric type (i.e. integer or float) -* -* @param string $input A numeric string. -* -* @return int|float Integer $input if $input fits integer, -* float $input otherwise. -* -* @deprecated 3.2.10 (To be removed 4.0.0) -*/ -function phpbb_to_numeric($input) -{ - return ($input > PHP_INT_MAX) ? (float) $input : (int) $input; -} - /** * Parse cfg file * @param string $filename diff --git a/phpBB/phpbb/php/ini.php b/phpBB/phpbb/php/ini.php deleted file mode 100644 index 441e3ff7f6b..00000000000 --- a/phpBB/phpbb/php/ini.php +++ /dev/null @@ -1,175 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\php; - -/** -* Wrapper class for ini_get function. -* -* Provides easier handling of the different interpretations of ini values. -* @deprecated 3.2.10 (To be removed 4.0.0) -*/ -class ini -{ - /** - * Simple wrapper for ini_get() - * See http://php.net/manual/en/function.ini-get.php - * - * @param string $varname The configuration option name. - * @return bool|string False if configuration option does not exist, - * the configuration option value (string) otherwise. - */ - public function get($varname) - { - return ini_get($varname); - } - - /** - * Gets the configuration option value as a trimmed string. - * - * @param string $varname The configuration option name. - * @return bool|string False if configuration option does not exist, - * the configuration option value (string) otherwise. - */ - public function get_string($varname) - { - $value = $this->get($varname); - - if ($value === false) - { - return false; - } - - return trim($value); - } - - /** - * Gets configuration option value as a boolean. - * Interprets the string value 'off' as false. - * - * @param string $varname The configuration option name. - * @return bool False if configuration option does not exist. - * False if configuration option is disabled. - * True otherwise. - */ - public function get_bool($varname) - { - $value = $this->get_string($varname); - - if (empty($value) || strtolower($value) == 'off') - { - return false; - } - - return true; - } - - /** - * Gets configuration option value as an integer. - * - * @param string $varname The configuration option name. - * @return bool|int False if configuration option does not exist, - * false if configuration option value is not numeric, - * the configuration option value (integer) otherwise. - */ - public function get_int($varname) - { - $value = $this->get_string($varname); - - if (!is_numeric($value)) - { - return false; - } - - return (int) $value; - } - - /** - * Gets configuration option value as a float. - * - * @param string $varname The configuration option name. - * @return bool|float False if configuration option does not exist, - * false if configuration option value is not numeric, - * the configuration option value (float) otherwise. - */ - public function get_float($varname) - { - $value = $this->get_string($varname); - - if (!is_numeric($value)) - { - return false; - } - - return (float) $value; - } - - /** - * Gets configuration option value in bytes. - * Converts strings like '128M' to bytes (integer or float). - * - * @param string $varname The configuration option name. - * @return bool|int|float False if configuration option does not exist, - * false if configuration option value is not well-formed, - * the configuration option value otherwise. - */ - public function get_bytes($varname) - { - $value = $this->get_string($varname); - - if ($value === false) - { - return false; - } - - if (is_numeric($value)) - { - // Already in bytes. - return phpbb_to_numeric($value); - } - else if (is_string($value)) - { - if (strlen($value) < 2) - { - // Single character. - return false; - } - else if (strlen($value) < 3 && $value[0] === '-') - { - // Two characters but the first one is a minus. - return false; - } - } - - $value_lower = strtolower($value); - $value_numeric = phpbb_to_numeric($value); - - switch ($value_lower[strlen($value_lower) - 1]) - { - case 'g': - $value_numeric *= 1024; - case 'm': - $value_numeric *= 1024; - case 'k': - $value_numeric *= 1024; - break; - - default: - // It's not already in bytes (and thus numeric) - // and does not carry a unit. - return false; - } - - return $value_numeric; - } -} From 78f96c3e5c64703ddffe681ab830ec5903e54d86 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 12 Jul 2024 21:39:27 +0200 Subject: [PATCH 0319/1214] [ticket/12479] Remove function bbcode_second_pass_by_extension PHPBB-12479 --- phpBB/includes/bbcode.php | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/phpBB/includes/bbcode.php b/phpBB/includes/bbcode.php index d0ced558232..b98fe1e6b3c 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -651,38 +651,4 @@ function bbcode_second_pass_code($type, $code) return $code; } - - /** - * Function to perform custom bbcode second pass by extensions - * can be used to assign bbcode pattern replacement - * Example: '#\[list=([^\[]+):$uid\]#e' => "\$this->bbcode_second_pass_by_extension('\$1')" - * - * Accepts variable number of parameters - * - * @return bool Second pass result - * - * @deprecated 3.2.10 (To be removed 4.0.0) - */ - function bbcode_second_pass_by_extension() - { - global $phpbb_dispatcher; - - $return = false; - $params_array = func_get_args(); - - /** - * Event to perform bbcode second pass with - * the custom validating methods provided by extensions - * - * @event core.bbcode_second_pass_by_extension - * @var array params_array Array with the function parameters - * @var mixed return Second pass result to return - * - * @since 3.1.5-RC1 - */ - $vars = array('params_array', 'return'); - extract($phpbb_dispatcher->trigger_event('core.bbcode_second_pass_by_extension', compact($vars))); - - return $return; - } } From f41c8eef473d6d970d9f02ccfec32c72d0c82186 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 13 Jul 2024 15:34:37 +0200 Subject: [PATCH 0320/1214] [ticket/15403] Refactor get_context PHPBB-15403 --- phpBB/includes/functions_content.php | 116 +++++++++++-------- tests/functions_content/get_context_test.php | 6 +- 2 files changed, 70 insertions(+), 52 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 94de0b78495..148421880f9 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -325,83 +325,101 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po * * @return string Context of the specified words separated by "..." */ -function get_context($text, $words, $length = 400) +function get_context(string $text, array $words, int $length = 400): string { - $text_length = utf8_strlen($text); - - // Replace all spaces/invisible characters with single spaces - $text = preg_replace("/\s+/", ' ', $text); + if ($length <= 0) + { + return '...'; + } // we need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); + // Replace all spaces/invisible characters with single spaces + $text = preg_replace("/\s+/u", ' ', $text); + + $text_length = utf8_strlen($text); + // Get first occurrence of each word - $word_indizes = []; + $word_indexes = []; foreach ($words as $word) { $pos = utf8_stripos($text, $word); if ($pos !== false) { - $word_indizes[$pos] = $word; + $word_indexes[$pos] = $word; } } - // If there are coincidences - if (!empty($word_indizes)) + if (!empty($word_indexes)) { - ksort($word_indizes); + ksort($word_indexes); - $wordnum = count($word_indizes); - // Size of the fragment of text per word - $characters_per_word = (int) ($length / $wordnum); + // Size of the fragment of text per word + $num_indexes = count($word_indexes); + $characters_per_word = (int) ($length / $num_indexes) + 2; // 2 to leave one character of margin at the sides to don't cut words - // Get text fragments - $fragments = []; - $start = $end = 0; - foreach ($word_indizes as $indize => $word) - { - // Check if the next word can be inside the current fragment of text - if ($end + $characters_per_word + utf8_strlen($word) < $indize) - { - $fragment = utf8_substr($text, $start, $end-$start); - - if ($start != 0) - { - $fragment = '... ' . $fragment; - } + // Get text fragment indexes + $fragments = []; + foreach ($word_indexes as $index => $word) + { + $word_length = utf8_strlen($word); + $start = max(0, min($text_length - 1 - $characters_per_word, (int) ($index + ($word_length / 2) - ($characters_per_word / 2)))); + $end = $start + $characters_per_word; - $fragments[] = $fragment; + // Check if we can merge this fragment into the previous fragment + $last_element = array_pop($fragments); + if ($last_element !== null) + { + [$prev_start, $prev_end] = $last_element; - $start = $indize - ($characters_per_word / 2); - // Start fragment at the beginning of a word - $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start - 1) + 1) : 0; + if ($prev_end + $characters_per_word >= $index + $word_length) + { + $start = $prev_start; + $end = $prev_end + $characters_per_word; } + else + { + $fragments[] = $last_element; + } + } - $end += $characters_per_word; + $fragments[] = [$start, $end]; + } + } + else + { + // There is no coincidences, so we just create a fragment with the first $length characters + $fragments[] = [0, $length]; + $end = $length; + } - // End fragment at the end of a word - $substring = utf8_substr($text, $start, $end - $start); - $end = $start + utf8_strrpos($substring, ' '); - } + $output = []; + foreach ($fragments as [$start, $end]) + { + $fragment = utf8_substr($text, $start, $end - $start + 1); - $fragment = utf8_substr($text, $start, $end-$start); - if ($start != 0) - { - $fragment = '... ' . $fragment; - } - if ($end < $text_length) - { - $fragment .= ' ...'; - } + $offset = $start; - // Get the last fragment - $fragments[] = $fragment; + // Find the first valid alphanumeric character in the fragment to don't cut words + if ($start > 0) + { + preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); + $start = $offset + (int) $matches[0][1] + 1; // first valid alphanumeric character + } + + // Find the last valid alphanumeric character in the fragment to don't cut words + if ($end < $text_length - 1) + { + preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); + $end = $offset + end($matches[0])[1]; // last valid alphanumeric character + } - return htmlentities(implode('', $fragments)); + $output[] = utf8_substr($text, $start, $end - $start + 1); } - return htmlentities($text_length >= $length + 3 ? utf8_substr($text, 0, $length) . ' ...' : $text); + return htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index b5d5b2ef73e..4da1be8ed10 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -39,7 +39,7 @@ public function data_get_context(): array 'text' => 'This is a sample text containing several words, but none of them match the given words.', 'words' => ['nonexistent'], 'length' => 50, - 'expected' => 'This is a sample text containing several words, bu ...', + 'expected' => 'This is a sample text containing several words ...', ], 'desired length equal to text length' => [ 'text' => 'Exact length text.', @@ -57,13 +57,13 @@ public function data_get_context(): array 'text' => 'This is a sample text containing & and < and > entities.', 'words' => ['sample', 'entities'], 'length' => 50, - 'expected' => 'This is a sample text containing & and < and ...', + 'expected' => 'This is a sample text ... and < and > entities.', ], 'text with multiple spaces and special characters' => [ 'text' => 'This is a sample text containing several words.', 'words' => ['sample', 'several'], 'length' => 50, - 'expected' => 'This is a sample text containing several words ...', + 'expected' => 'This is a sample text containing several words.', ], 'empty text' => [ 'text' => '', From f646fcdefa932c8c3829a6e945782390142d09b5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 13 Jul 2024 23:46:28 +0200 Subject: [PATCH 0321/1214] [ticket/14454] Handle special case of testing user permissions in ACP modules PHPBB-14454 --- phpBB/includes/functions_module.php | 10 ++- tests/functional/switch_permissions_test.php | 70 ++++++++++++++++++++ 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 tests/functional/switch_permissions_test.php diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 5b7c5583657..53ea967fac0 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -480,7 +480,7 @@ static function module_auth($module_auth, $forum_id) */ function set_active($id = false, $mode = false) { - global $request; + global $auth, $request, $user; $icat = false; $this->active_module = false; @@ -502,6 +502,14 @@ function set_active($id = false, $mode = false) $id = $this->p_class . '_' . $id; } + // Fallback to acp main page for special restore permission mode + if ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) + { + $id = ''; + $mode = ''; + $icat = false; + } + $category = false; foreach ($this->module_ary as $row_id => $item_ary) { diff --git a/tests/functional/switch_permissions_test.php b/tests/functional/switch_permissions_test.php new file mode 100644 index 00000000000..d83d303f5d3 --- /dev/null +++ b/tests/functional/switch_permissions_test.php @@ -0,0 +1,70 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +/** + * @group functional + */ +class phpbb_functional_switch_permissions_test extends phpbb_functional_test_case +{ + private const TEST_USER = 'switch-permissions-test'; + + protected function setUp(): void + { + parent::setUp(); + + $this->login(); + $this->admin_login(); + + $this->add_lang(['common', 'ucp']); + } + + public function test_switch_permissions() + { + $user_id = $this->create_user(self::TEST_USER); + + // Open user administration page for new user + $crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}"); + + // Use permissions + $link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link(); + $crawler = self::$client->click($link); + + // Check that we switched permissions to test user + $this->assertStringContainsString( + str_replace('
', '
', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)), + $crawler->html(), + ); + + // Check that ACP pages get forced to acp main with restore permission info + $this->add_lang('acp/common'); + $crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}"); + $this->assertStringContainsString( + $this->lang('PERMISSIONS_TRANSFERRED'), + $crawler->text(), + ); + + // Check that restore permissions link exists + $crawler = self::$client->request('GET', '../index.php?sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('RESTORE_PERMISSIONS'), + $crawler->text(), + ); + + // Check that restore permissions works + $crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('PERMISSIONS_RESTORED'), + $crawler->text(), + ); + } +} From dd9267b6785424d3a42e16e74164c15270014cc8 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 01:10:25 +0200 Subject: [PATCH 0322/1214] [ticket/15403] Use substr over the fragment and not the whole text PHPBB-15403 --- phpBB/includes/functions_content.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 148421880f9..0ef52b1b817 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -400,23 +400,24 @@ function get_context(string $text, array $words, int $length = 400): string { $fragment = utf8_substr($text, $start, $end - $start + 1); - $offset = $start; + $fragment_start = 0; + $fragment_end = $end - $start + 1; // Find the first valid alphanumeric character in the fragment to don't cut words if ($start > 0) { preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); - $start = $offset + (int) $matches[0][1] + 1; // first valid alphanumeric character + $fragment_start = (int) $matches[0][1] + 1; // first valid alphanumeric character } // Find the last valid alphanumeric character in the fragment to don't cut words if ($end < $text_length - 1) { preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); - $end = $offset + end($matches[0])[1]; // last valid alphanumeric character + $fragment_end = end($matches[0])[1]; // last valid alphanumeric character } - $output[] = utf8_substr($text, $start, $end - $start + 1); + $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } return htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); From 13e6cd5992125624a343b4fcfb2df9dd95e49b3a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Jul 2024 08:17:03 +0200 Subject: [PATCH 0323/1214] [ticket/14454] Remove extra commas PHPBB-14454 --- tests/functional/switch_permissions_test.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/functional/switch_permissions_test.php b/tests/functional/switch_permissions_test.php index d83d303f5d3..a8c64422f36 100644 --- a/tests/functional/switch_permissions_test.php +++ b/tests/functional/switch_permissions_test.php @@ -42,7 +42,7 @@ public function test_switch_permissions() // Check that we switched permissions to test user $this->assertStringContainsString( str_replace('
', '
', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)), - $crawler->html(), + $crawler->html() ); // Check that ACP pages get forced to acp main with restore permission info @@ -50,21 +50,21 @@ public function test_switch_permissions() $crawler = self::request('GET', "adm/index.php?i=users&mode=overview&u={$user_id}&sid={$this->sid}"); $this->assertStringContainsString( $this->lang('PERMISSIONS_TRANSFERRED'), - $crawler->text(), + $crawler->text() ); // Check that restore permissions link exists $crawler = self::$client->request('GET', '../index.php?sid=' . $this->sid); $this->assertStringContainsString( $this->lang('RESTORE_PERMISSIONS'), - $crawler->text(), + $crawler->text() ); // Check that restore permissions works $crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid); $this->assertStringContainsString( $this->lang('PERMISSIONS_RESTORED'), - $crawler->text(), + $crawler->text() ); } } From f4b144424837b035d2c8a360c6d119bf740432c8 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 12:37:34 +0200 Subject: [PATCH 0324/1214] [ticket/15403] Handle ellipsis at the beginning of context and add tests PHPBB-15403 --- phpBB/includes/functions_content.php | 2 +- tests/functions_content/get_context_test.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 0ef52b1b817..6a360fc4a22 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -420,7 +420,7 @@ function get_context(string $text, array $words, int $length = 400): string $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } - return htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); + return ($fragments[0][0] != 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index 4da1be8ed10..cce72c66524 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -89,6 +89,24 @@ public function data_get_context(): array 'length' => -10, 'expected' => '...', ], + 'ellipses_beginning' => [ + 'text' => 'foo foo foo foo foo foo foo foo bar', + 'words' => ['bar'], + 'length' => 10, + 'expected' => '... foo foo bar', + ], + 'ellipsis_end' => [ + 'text' => 'bar foo foo foo foo foo foo foo foo', + 'words' => ['bar'], + 'length' => 10, + 'expected' => 'bar foo foo ...', + ], + 'ellipsis_middle' => [ + 'text' => 'foo word1 foo foo foo foo foo foo foo foo foo word2 foo', + 'words' => ['word1', 'word2'], + 'length' => 10, + 'expected' => '... word1 ... word2 ...', + ], ]; } @@ -99,4 +117,5 @@ public function test_get_context($text, $words, $length, $expected) { $this->assertEquals($expected, get_context($text, $words, $length)); } + } From e60288921309884291b4cec93c2d060faf8f444f Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 12:47:06 +0200 Subject: [PATCH 0325/1214] [ticket/15403] Add another test PHPBB-15403 --- tests/functions_content/get_context_test.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index cce72c66524..59f6cdf8469 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -107,6 +107,12 @@ public function data_get_context(): array 'length' => 10, 'expected' => '... word1 ... word2 ...', ], + 'ellipsis_middle2' => [ + 'text' => 'word1 foo foo foo foo foo foo foo foo foo word2', + 'words' => ['word1', 'word2'], + 'length' => 10, + 'expected' => 'word1 ... word2', + ] ]; } From 294c5172565a6a69b8a0e24cad7906540ff30137 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Jul 2024 20:42:03 +0200 Subject: [PATCH 0326/1214] [ticket/17370] Add controller for deleting cookies PHPBB-17370 --- .../config/default/container/services_ucp.yml | 11 ++ phpBB/config/default/routing/ucp.yml | 4 + phpBB/includes/functions.php | 2 +- phpBB/phpbb/ucp/controller/delete_cookies.php | 134 ++++++++++++++++++ 4 files changed, 150 insertions(+), 1 deletion(-) create mode 100644 phpBB/phpbb/ucp/controller/delete_cookies.php diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index 861fa4ac750..f6ca5fa5e74 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -1,4 +1,15 @@ services: + phpbb.ucp.controller.delete_cookies: + class: phpbb\ucp\controller\delete_cookies + arguments: + - '@config' + - '@dispatcher' + - '@language' + - '@request' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' + phpbb.ucp.controller.reset_password: class: phpbb\ucp\controller\reset_password arguments: diff --git a/phpBB/config/default/routing/ucp.yml b/phpBB/config/default/routing/ucp.yml index 06bd7c3a58f..51bdcb94971 100644 --- a/phpBB/config/default/routing/ucp.yml +++ b/phpBB/config/default/routing/ucp.yml @@ -1,3 +1,7 @@ +phpbb_ucp_delete_cookies_controller: + path: /delete_cookies + defaults: { _controller: phpbb.ucp.controller.delete_cookies:handle } + phpbb_ucp_reset_password_controller: path: /reset_password defaults: { _controller: phpbb.ucp.controller.reset_password:reset } diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3a034bc7ab1..389b31bb8c7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4061,7 +4061,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_SEARCH_UNANSWERED' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'), 'U_SEARCH_UNREAD' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'), 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), - 'U_DELETE_COOKIES' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'), + 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller'), 'U_CONTACT_US' => ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '', 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), diff --git a/phpBB/phpbb/ucp/controller/delete_cookies.php b/phpBB/phpbb/ucp/controller/delete_cookies.php new file mode 100644 index 00000000000..869227abea0 --- /dev/null +++ b/phpBB/phpbb/ucp/controller/delete_cookies.php @@ -0,0 +1,134 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\ucp\controller; + +use phpbb\config\config; +use phpbb\event\dispatcher_interface; +use phpbb\language\language; +use phpbb\request\request_interface; +use phpbb\user; + +class delete_cookies +{ + /** @var config */ + private $config; + + /** @var dispatcher_interface */ + private $dispatcher; + + /** @var language */ + private $language; + + /** @var request_interface */ + private $request; + + /** @var user */ + private $user; + + /** @var string phpBB root path */ + private $phpbb_root_path; + + /** @var string PHP extension */ + private $php_ext; + + /** + * Constructor for delete_cookies controller + * + * @param config $config + * @param dispatcher_interface $dispatcher + * @param language $language + * @param request_interface $request + * @param user $user + */ + public function __construct(config $config, dispatcher_interface $dispatcher, language $language, request_interface $request, user $user, string $phpbb_root_path, string $php_ext) + { + $this->config = $config; + $this->dispatcher = $dispatcher; + $this->language = $language; + $this->request = $request; + $this->user = $user; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; + } + + /** + * Handle delete cookies requests + * + * @return void + */ + public function handle() + { + $this->language->add_lang(['ucp']); + + // Delete Cookies with dynamic names (do NOT delete poll cookies) + if (confirm_box(true)) + { + $set_time = time() - 31536000; + + foreach ($this->request->variable_names(request_interface::COOKIE) as $cookie_name) + { + // Only delete board cookies + if (strpos($cookie_name, $this->config['cookie_name'] . '_') !== 0) + { + continue; + } + + $cookie_name = str_replace($this->config['cookie_name'] . '_', '', $cookie_name); + + /** + * Event to save custom cookies from deletion + * + * @event core.ucp_delete_cookies + * @var string cookie_name Cookie name to checking + * @var bool retain_cookie Do we retain our cookie or not, true if retain + * @since 3.1.3-RC1 + * @changed 3.3.13-RC1 Moved to new delete_cookies controller + */ + $retain_cookie = false; + $vars = ['cookie_name', 'retain_cookie']; + extract($this->dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars))); + if ($retain_cookie) + { + continue; + } + + // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ + if (strpos($cookie_name, 'poll_') !== 0) + { + $this->user->set_cookie($cookie_name, '', $set_time); + } + } + + $this->user->set_cookie('track', '', $set_time); + $this->user->set_cookie('u', '', $set_time); + $this->user->set_cookie('k', '', $set_time); + $this->user->set_cookie('sid', '', $set_time); + + // We destroy the session here, the user will be logged out nevertheless + $this->user->session_kill(); + $this->user->session_begin(); + + meta_refresh(3, append_sid("{$this->phpbb_root_path}index.$this->php_ext")); + + $message = $this->language->lang('COOKIES_DELETED') . '

' . $this->language->lang('RETURN_INDEX', 'phpbb_root_path}index.$this->php_ext") . '">', ''); + trigger_error($message); + } + else + { + confirm_box(false, 'DELETE_COOKIES', ''); + } + + redirect(append_sid("{$this->phpbb_root_path}index.$this->php_ext")); + } +} From 661140c50bad8aadeda3112cdaac97a08fcbd30a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Jul 2024 20:44:01 +0200 Subject: [PATCH 0327/1214] [ticket/17370] Redirect from UCP to delete cookies controller PHPBB-17370 --- phpBB/ucp.php | 65 ++++----------------------------------------------- 1 file changed, 4 insertions(+), 61 deletions(-) diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 817ea721115..998cfb57ab0 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -154,68 +154,11 @@ break; case 'delete_cookies': + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); - // Delete Cookies with dynamic names (do NOT delete poll cookies) - if (confirm_box(true)) - { - $set_time = time() - 31536000; - - foreach ($request->variable_names(\phpbb\request\request_interface::COOKIE) as $cookie_name) - { - $cookie_data = $request->variable($cookie_name, '', true, \phpbb\request\request_interface::COOKIE); - - // Only delete board cookies, no other ones... - if (strpos($cookie_name, $config['cookie_name'] . '_') !== 0) - { - continue; - } - - $cookie_name = str_replace($config['cookie_name'] . '_', '', $cookie_name); - - /** - * Event to save custom cookies from deletion - * - * @event core.ucp_delete_cookies - * @var string cookie_name Cookie name to checking - * @var bool retain_cookie Do we retain our cookie or not, true if retain - * @since 3.1.3-RC1 - */ - $retain_cookie = false; - $vars = array('cookie_name', 'retain_cookie'); - extract($phpbb_dispatcher->trigger_event('core.ucp_delete_cookies', compact($vars))); - if ($retain_cookie) - { - continue; - } - - // Polls are stored as {cookie_name}_poll_{topic_id}, cookie_name_ got removed, therefore checking for poll_ - if (strpos($cookie_name, 'poll_') !== 0) - { - $user->set_cookie($cookie_name, '', $set_time); - } - } - - $user->set_cookie('track', '', $set_time); - $user->set_cookie('u', '', $set_time); - $user->set_cookie('k', '', $set_time); - $user->set_cookie('sid', '', $set_time); - - // We destroy the session here, the user will be logged out nevertheless - $user->session_kill(); - $user->session_begin(); - - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - - $message = $user->lang['COOKIES_DELETED'] . '

' . sprintf($user->lang['RETURN_INDEX'], '', ''); - trigger_error($message); - } - else - { - confirm_box(false, 'DELETE_COOKIES', ''); - } - - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); - + // Redirect to controller + redirect($controller_helper->route('phpbb_ucp_delete_cookies_controller')); break; case 'switch_perm': From 2f3183796c14c0afc214cc0fae6034f8a5d12c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 26 Sep 2018 13:02:36 +0200 Subject: [PATCH 0328/1214] [ticket/15043] Rewrite get_context() PHPBB3-15043 --- phpBB/includes/functions_content.php | 143 ++++++++++----------------- phpBB/includes/utf/utf_tools.php | 16 +++ 2 files changed, 68 insertions(+), 91 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 941b2eb2462..c400c52891a 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -326,119 +326,80 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po */ function get_context(string $text, array $words, int $length = 400) { - // first replace all whitespaces with single spaces - $text = preg_replace('/ +/', ' ', strtr($text, "\t\n\r\x0C ", ' ')); + $output = ''; + $text_length = utf8_strlen($text); + + // Replace all spaces/invisible characters with single spaces + $text = preg_replace("/[[:^print:] ]+/", ' ', $text); // we need to turn the entities back into their original form, to not cut the message in between them - $entities = array('<', '>', '[', ']', '.', ':', ':'); - $characters = array('<', '>', '[', ']', '.', ':', ':'); - $text = str_replace($entities, $characters, $text); + $text = html_entity_decode($text); - $word_indizes = array(); - if (count($words)) + // Get first ocurrence of each word + $word_indizes = []; + foreach ($words as $word) { - $match = ''; - // find the starting indizes of all words - foreach ($words as $word) - { - if ($word) - { - if (preg_match('#(?:[^\w]|^)(' . $word . ')(?:[^\w]|$)#i', $text, $match)) - { - if (empty($match[1])) - { - continue; - } + $pos = utf8_stripos($text, $word); - $pos = utf8_strpos($text, $match[1]); - if ($pos !== false) - { - $word_indizes[] = $pos; - } - } - } + if ($pos !== false) + { + $word_indizes[$pos] = $word; } - unset($match); + } - if (count($word_indizes)) - { - $word_indizes = array_unique($word_indizes); - sort($word_indizes); + // If there are coincidences + if (!empty($word_indizes)) + { + ksort($word_indizes); $wordnum = count($word_indizes); - // number of characters on the right and left side of each word - $sequence_length = (int) ($length / (2 * $wordnum)) - 2; - $final_text = ''; - $word = $j = 0; - $final_text_index = -1; - - // cycle through every character in the original text - for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++) + // Size of the fragment of text per word + $characters_per_word = (int) ($length / $wordnum); + + // Get text fragments + $fragments = []; + $start = $end = 0; + foreach ($word_indizes as $indize => $word) { - // if the current position is the start of one of the words then append $sequence_length characters to the final text - if (isset($word_indizes[$word]) && ($i == $word_indizes[$word])) + if ($end+$characters_per_word+utf8_strlen($word) < $indize) { - if ($final_text_index < $i - $sequence_length - 1) + $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) { - $final_text .= '... ' . preg_replace('#^([^ ]*)#', '', utf8_substr($text, $i - $sequence_length, $sequence_length)); + $fragment = '... ' . $fragment; } - else - { - // if the final text is already nearer to the current word than $sequence_length we only append the text - // from its current index on and distribute the unused length to all other sequenes - $sequence_length += (int) (($final_text_index - $i + $sequence_length + 1) / (2 * $wordnum)); - $final_text .= utf8_substr($text, $final_text_index + 1, $i - $final_text_index - 1); - } - $final_text_index = $i - 1; - // add the following characters to the final text (see below) - $word++; - $j = 1; + $fragments[] = $fragment; + + $start = $indize-($characters_per_word/2); + // Start fragment at the begining of a word + $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start-1)+1) : 0; } - if ($j > 0) - { - // add the character to the final text and increment the sequence counter - $final_text .= utf8_substr($text, $i, 1); - $final_text_index++; - $j++; + $end += $characters_per_word; - // if this is a whitespace then check whether we are done with this sequence - if (utf8_substr($text, $i, 1) == ' ') - { - // only check whether we have to exit the context generation completely if we haven't already reached the end anyway - if ($i + 4 < $n) - { - if (($j > $sequence_length && $word >= $wordnum) || utf8_strlen($final_text) > $length) - { - $final_text .= ' ...'; - break; - } - } - else - { - // make sure the text really reaches the end - $j -= 4; - } + // End fragment at the end of a word + $substring = utf8_substr($text, $start, $end-$start); + $end = $start+utf8_strrpos($substring, ' '); + } - // stop context generation and wait for the next word - if ($j > $sequence_length) - { - $j = 0; - } - } - } + $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) + { + $fragment = '... ' . $fragment; + } + if ($end < $text_length) + { + $fragment .= ' ...'; } - return str_replace($characters, $entities, $final_text); - } - } - if (!count($words) || !count($word_indizes)) - { - return str_replace($characters, $entities, ((utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text)); + // Get the last fragment + $fragments[] = $fragment; + + $output = htmlentities(implode($fragments, '')); } - return ''; + return $output; } /** diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index b8c35a50481..ed86829b97d 100644 --- a/phpBB/includes/utf/utf_tools.php +++ b/phpBB/includes/utf/utf_tools.php @@ -72,6 +72,22 @@ function utf8_strpos($str, $needle, $offset = null) } } +/** +* UTF-8 aware alternative to stripos +* @ignore +*/ +function utf8_stripos($str, $needle, $offset = null) +{ + if (is_null($offset)) + { + return mb_stripos($str, $needle); + } + else + { + return mb_stripos($str, $needle, $offset); + } +} + /** * UTF-8 aware alternative to strtolower * @ignore From 13f7a8f82fbdf349ab50f21c537efb632949871e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 26 Sep 2018 14:17:53 +0200 Subject: [PATCH 0329/1214] [ticket/15043] New get_context displays more text PHPBB3-15043 --- tests/functional/search/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index c3f3f6f7dd3..1b2087adc04 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -165,7 +165,7 @@ public function test_search_backend() foreach (['', 'a', 't', 'f', 'i', 's'] as $sort_key) { - $this->assert_search_found('phpbb3+installation', 1, 3, $sort_key); + $this->assert_search_found('phpbb3+installation', 1, 4, $sort_key); $this->assert_search_found('foosubject+barsearch', 1, 2, $sort_key); $this->assert_search_found('barsearch-testing', 1, 2, $sort_key); // test hyphen ignored $this->assert_search_found('barsearch+-+testing', 1, 2, $sort_key); // test hyphen wrapped with space ignored From 02321c412ce40e42d37ab5d61cf46a7ecbb3164c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 26 Sep 2018 15:15:07 +0200 Subject: [PATCH 0330/1214] [ticket/15043] Update regexp PHPBB3-15043 --- phpBB/includes/functions_content.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c400c52891a..e99d0a48005 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -330,7 +330,7 @@ function get_context(string $text, array $words, int $length = 400) $text_length = utf8_strlen($text); // Replace all spaces/invisible characters with single spaces - $text = preg_replace("/[[:^print:] ]+/", ' ', $text); + $text = preg_replace("/\s+/", ' ', $text); // we need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); @@ -361,9 +361,11 @@ function get_context(string $text, array $words, int $length = 400) $start = $end = 0; foreach ($word_indizes as $indize => $word) { - if ($end+$characters_per_word+utf8_strlen($word) < $indize) + // Check if the next word can be inside the current fragment of text + if ($end + $characters_per_word + utf8_strlen($word) < $indize) { $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) { $fragment = '... ' . $fragment; @@ -371,16 +373,16 @@ function get_context(string $text, array $words, int $length = 400) $fragments[] = $fragment; - $start = $indize-($characters_per_word/2); + $start = $indize - ($characters_per_word / 2); // Start fragment at the begining of a word - $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start-1)+1) : 0; + $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start - 1) + 1) : 0; } $end += $characters_per_word; // End fragment at the end of a word $substring = utf8_substr($text, $start, $end-$start); - $end = $start+utf8_strrpos($substring, ' '); + $end = $start + utf8_strrpos($substring, ' '); } $fragment = utf8_substr($text, $start, $end-$start); From 68436c4a963904a706fd44e5c89a7b9f72910b4c Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Tue, 9 Jul 2024 00:24:47 +0200 Subject: [PATCH 0331/1214] [ticket/15403] Fix order of parameters in implode PHPBB-15403 --- phpBB/includes/functions_content.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index e99d0a48005..a207fc28e98 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -398,7 +398,7 @@ function get_context(string $text, array $words, int $length = 400) // Get the last fragment $fragments[] = $fragment; - $output = htmlentities(implode($fragments, '')); + $output = htmlentities(implode('', $fragments)); } return $output; From 95b8b50599bd8df01cc3f97f72d6b2ae6eac61e1 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Tue, 9 Jul 2024 17:09:06 +0200 Subject: [PATCH 0332/1214] [ticket/15403] Return first fragment of text if there is no coincidences PHPBB-15403 --- phpBB/includes/functions_content.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index a207fc28e98..25144f5af39 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -398,10 +398,10 @@ function get_context(string $text, array $words, int $length = 400) // Get the last fragment $fragments[] = $fragment; - $output = htmlentities(implode('', $fragments)); + return htmlentities(implode('', $fragments)); } - return $output; + return htmlentities($text_length >= $length + 3 ? utf8_substr($text, 0, $length) . ' ...' : $text); } /** From 67ad543135127c5f6f34094e034676198ffe20dd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Jul 2024 21:20:09 +0200 Subject: [PATCH 0333/1214] [ticket/15043] Add unit test for get_context PHPBB-15043 --- tests/functions_content/get_context_test.php | 102 +++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 tests/functions_content/get_context_test.php diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php new file mode 100644 index 00000000000..b5d5b2ef73e --- /dev/null +++ b/tests/functions_content/get_context_test.php @@ -0,0 +1,102 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use PHPUnit\Framework\TestCase; + +class phpbb_functions_content_get_context_test extends TestCase +{ + /** + * Data provider for get_context test cases. + * + * @return array + */ + public function data_get_context(): array + { + return [ + 'text contains words and length greater than text' => [ + 'text' => 'This is a sample text containing several words, including sample, text, and words.', + 'words' => ['sample', 'words'], + 'length' => 100, + 'expected' => 'This is a sample text containing several words, including sample, text, and words.', + ], + 'text contains words and length less than text' => [ + 'text' => 'This is a sample text containing several words, including sample, text, and words.', + 'words' => ['sample', 'words'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words ...', + ], + 'text does not contain words' => [ + 'text' => 'This is a sample text containing several words, but none of them match the given words.', + 'words' => ['nonexistent'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words, bu ...', + ], + 'desired length equal to text length' => [ + 'text' => 'Exact length text.', + 'words' => ['Exact', 'text'], + 'length' => 18, + 'expected' => 'Exact length text.', + ], + 'text with html entities' => [ + 'text' => 'This is a sample text containing & and < and > entities.', + 'words' => ['sample', 'containing'], + 'length' => 50, + 'expected' => 'This is a sample text containing & and < and ...', + ], + 'text with html entities and contains last word' => [ + 'text' => 'This is a sample text containing & and < and > entities.', + 'words' => ['sample', 'entities'], + 'length' => 50, + 'expected' => 'This is a sample text containing & and < and ...', + ], + 'text with multiple spaces and special characters' => [ + 'text' => 'This is a sample text containing several words.', + 'words' => ['sample', 'several'], + 'length' => 50, + 'expected' => 'This is a sample text containing several words ...', + ], + 'empty text' => [ + 'text' => '', + 'words' => ['sample', 'words'], + 'length' => 50, + 'expected' => '', + ], + 'empty words array' => [ + 'text' => 'This is a sample text containing several words.', + 'words' => [], + 'length' => 50, + 'expected' => 'This is a sample text containing several words.', + ], + 'zero length' => [ + 'text' => 'This is a sample text.', + 'words' => ['sample'], + 'length' => 0, + 'expected' => '...', + ], + 'negative length' => [ + 'text' => 'This is a sample text.', + 'words' => ['sample'], + 'length' => -10, + 'expected' => '...', + ], + ]; + } + + /** + * @dataProvider data_get_context + */ + public function test_get_context($text, $words, $length, $expected) + { + $this->assertEquals($expected, get_context($text, $words, $length)); + } +} From 7181b05e38252f81b3bb0635e75209a5aa6c0ffe Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 9 Jul 2024 21:46:37 +0200 Subject: [PATCH 0334/1214] [ticket/15043] Small code cleanup PHPBB-15043 --- phpBB/includes/functions_content.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 25144f5af39..530b26ae755 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -326,7 +326,6 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po */ function get_context(string $text, array $words, int $length = 400) { - $output = ''; $text_length = utf8_strlen($text); // Replace all spaces/invisible characters with single spaces @@ -335,7 +334,7 @@ function get_context(string $text, array $words, int $length = 400) // we need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); - // Get first ocurrence of each word + // Get first occurrence of each word $word_indizes = []; foreach ($words as $word) { @@ -374,14 +373,14 @@ function get_context(string $text, array $words, int $length = 400) $fragments[] = $fragment; $start = $indize - ($characters_per_word / 2); - // Start fragment at the begining of a word + // Start fragment at the beginning of a word $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start - 1) + 1) : 0; } $end += $characters_per_word; // End fragment at the end of a word - $substring = utf8_substr($text, $start, $end-$start); + $substring = utf8_substr($text, $start, $end - $start); $end = $start + utf8_strrpos($substring, ' '); } From 5f0e639b8340b78f3ca62f85792100460e9dc450 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 13 Jul 2024 15:34:37 +0200 Subject: [PATCH 0335/1214] [ticket/15403] Refactor get_context PHPBB-15403 --- phpBB/includes/functions_content.php | 116 +++++++++++-------- tests/functions_content/get_context_test.php | 6 +- 2 files changed, 70 insertions(+), 52 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 530b26ae755..2687a31bceb 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -324,83 +324,101 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po * * @return string Context of the specified words separated by "..." */ -function get_context(string $text, array $words, int $length = 400) +function get_context(string $text, array $words, int $length = 400): string { - $text_length = utf8_strlen($text); - - // Replace all spaces/invisible characters with single spaces - $text = preg_replace("/\s+/", ' ', $text); + if ($length <= 0) + { + return '...'; + } // we need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); + // Replace all spaces/invisible characters with single spaces + $text = preg_replace("/\s+/u", ' ', $text); + + $text_length = utf8_strlen($text); + // Get first occurrence of each word - $word_indizes = []; + $word_indexes = []; foreach ($words as $word) { $pos = utf8_stripos($text, $word); if ($pos !== false) { - $word_indizes[$pos] = $word; + $word_indexes[$pos] = $word; } } - // If there are coincidences - if (!empty($word_indizes)) + if (!empty($word_indexes)) { - ksort($word_indizes); + ksort($word_indexes); - $wordnum = count($word_indizes); - // Size of the fragment of text per word - $characters_per_word = (int) ($length / $wordnum); + // Size of the fragment of text per word + $num_indexes = count($word_indexes); + $characters_per_word = (int) ($length / $num_indexes) + 2; // 2 to leave one character of margin at the sides to don't cut words - // Get text fragments - $fragments = []; - $start = $end = 0; - foreach ($word_indizes as $indize => $word) - { - // Check if the next word can be inside the current fragment of text - if ($end + $characters_per_word + utf8_strlen($word) < $indize) - { - $fragment = utf8_substr($text, $start, $end-$start); - - if ($start != 0) - { - $fragment = '... ' . $fragment; - } + // Get text fragment indexes + $fragments = []; + foreach ($word_indexes as $index => $word) + { + $word_length = utf8_strlen($word); + $start = max(0, min($text_length - 1 - $characters_per_word, (int) ($index + ($word_length / 2) - ($characters_per_word / 2)))); + $end = $start + $characters_per_word; - $fragments[] = $fragment; + // Check if we can merge this fragment into the previous fragment + $last_element = array_pop($fragments); + if ($last_element !== null) + { + [$prev_start, $prev_end] = $last_element; - $start = $indize - ($characters_per_word / 2); - // Start fragment at the beginning of a word - $end = $start = ($start > 0) ? (utf8_strpos($text, ' ', $start - 1) + 1) : 0; + if ($prev_end + $characters_per_word >= $index + $word_length) + { + $start = $prev_start; + $end = $prev_end + $characters_per_word; } + else + { + $fragments[] = $last_element; + } + } - $end += $characters_per_word; + $fragments[] = [$start, $end]; + } + } + else + { + // There is no coincidences, so we just create a fragment with the first $length characters + $fragments[] = [0, $length]; + $end = $length; + } - // End fragment at the end of a word - $substring = utf8_substr($text, $start, $end - $start); - $end = $start + utf8_strrpos($substring, ' '); - } + $output = []; + foreach ($fragments as [$start, $end]) + { + $fragment = utf8_substr($text, $start, $end - $start + 1); - $fragment = utf8_substr($text, $start, $end-$start); - if ($start != 0) - { - $fragment = '... ' . $fragment; - } - if ($end < $text_length) - { - $fragment .= ' ...'; - } + $offset = $start; - // Get the last fragment - $fragments[] = $fragment; + // Find the first valid alphanumeric character in the fragment to don't cut words + if ($start > 0) + { + preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); + $start = $offset + (int) $matches[0][1] + 1; // first valid alphanumeric character + } + + // Find the last valid alphanumeric character in the fragment to don't cut words + if ($end < $text_length - 1) + { + preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); + $end = $offset + end($matches[0])[1]; // last valid alphanumeric character + } - return htmlentities(implode('', $fragments)); + $output[] = utf8_substr($text, $start, $end - $start + 1); } - return htmlentities($text_length >= $length + 3 ? utf8_substr($text, 0, $length) . ' ...' : $text); + return htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index b5d5b2ef73e..4da1be8ed10 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -39,7 +39,7 @@ public function data_get_context(): array 'text' => 'This is a sample text containing several words, but none of them match the given words.', 'words' => ['nonexistent'], 'length' => 50, - 'expected' => 'This is a sample text containing several words, bu ...', + 'expected' => 'This is a sample text containing several words ...', ], 'desired length equal to text length' => [ 'text' => 'Exact length text.', @@ -57,13 +57,13 @@ public function data_get_context(): array 'text' => 'This is a sample text containing & and < and > entities.', 'words' => ['sample', 'entities'], 'length' => 50, - 'expected' => 'This is a sample text containing & and < and ...', + 'expected' => 'This is a sample text ... and < and > entities.', ], 'text with multiple spaces and special characters' => [ 'text' => 'This is a sample text containing several words.', 'words' => ['sample', 'several'], 'length' => 50, - 'expected' => 'This is a sample text containing several words ...', + 'expected' => 'This is a sample text containing several words.', ], 'empty text' => [ 'text' => '', From ec8bbf3da37a1d9fc1133f5eace92ed6b5d399ff Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 01:10:25 +0200 Subject: [PATCH 0336/1214] [ticket/15403] Use substr over the fragment and not the whole text PHPBB-15403 --- phpBB/includes/functions_content.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 2687a31bceb..4a8420d0a39 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -399,23 +399,24 @@ function get_context(string $text, array $words, int $length = 400): string { $fragment = utf8_substr($text, $start, $end - $start + 1); - $offset = $start; + $fragment_start = 0; + $fragment_end = $end - $start + 1; // Find the first valid alphanumeric character in the fragment to don't cut words if ($start > 0) { preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); - $start = $offset + (int) $matches[0][1] + 1; // first valid alphanumeric character + $fragment_start = (int) $matches[0][1] + 1; // first valid alphanumeric character } // Find the last valid alphanumeric character in the fragment to don't cut words if ($end < $text_length - 1) { preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); - $end = $offset + end($matches[0])[1]; // last valid alphanumeric character + $fragment_end = end($matches[0])[1]; // last valid alphanumeric character } - $output[] = utf8_substr($text, $start, $end - $start + 1); + $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } return htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); From 6b5a632c12d5b919589cf291b2aaf93fba30b12d Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 12:37:34 +0200 Subject: [PATCH 0337/1214] [ticket/15403] Handle ellipsis at the beginning of context and add tests PHPBB-15403 --- phpBB/includes/functions_content.php | 2 +- tests/functions_content/get_context_test.php | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 4a8420d0a39..bb2ac3e8a79 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -419,7 +419,7 @@ function get_context(string $text, array $words, int $length = 400): string $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } - return htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); + return ($fragments[0][0] != 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index 4da1be8ed10..cce72c66524 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -89,6 +89,24 @@ public function data_get_context(): array 'length' => -10, 'expected' => '...', ], + 'ellipses_beginning' => [ + 'text' => 'foo foo foo foo foo foo foo foo bar', + 'words' => ['bar'], + 'length' => 10, + 'expected' => '... foo foo bar', + ], + 'ellipsis_end' => [ + 'text' => 'bar foo foo foo foo foo foo foo foo', + 'words' => ['bar'], + 'length' => 10, + 'expected' => 'bar foo foo ...', + ], + 'ellipsis_middle' => [ + 'text' => 'foo word1 foo foo foo foo foo foo foo foo foo word2 foo', + 'words' => ['word1', 'word2'], + 'length' => 10, + 'expected' => '... word1 ... word2 ...', + ], ]; } @@ -99,4 +117,5 @@ public function test_get_context($text, $words, $length, $expected) { $this->assertEquals($expected, get_context($text, $words, $length)); } + } From 2818ca130993f5d61d1c9374db924445fb4198e3 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 12:47:06 +0200 Subject: [PATCH 0338/1214] [ticket/15403] Add another test PHPBB-15403 --- tests/functions_content/get_context_test.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index cce72c66524..59f6cdf8469 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -107,6 +107,12 @@ public function data_get_context(): array 'length' => 10, 'expected' => '... word1 ... word2 ...', ], + 'ellipsis_middle2' => [ + 'text' => 'word1 foo foo foo foo foo foo foo foo foo word2', + 'words' => ['word1', 'word2'], + 'length' => 10, + 'expected' => 'word1 ... word2', + ] ]; } From d679ac4df8736af9960281d1a10d2452688721c5 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 14 Jul 2024 23:54:01 +0200 Subject: [PATCH 0339/1214] [ticket/15403] Remove suggestion from composer.json PHPBB-15403 --- phpBB/composer.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 9d4f28689ce..0a04cde1816 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -73,9 +73,6 @@ "vimeo/psalm": "^5.18.0", "psalm/plugin-symfony": "^v5.1.0" }, - "suggest": { - "ext-mbstring": "Better performance in search" - }, "extra": { "branch-alias": { "dev-master": "4.0.x-dev" From 06ff814f047836a929effa217af5a60f89e8da40 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 15 Jul 2024 12:30:10 +0200 Subject: [PATCH 0340/1214] [ticket/15403] Remove last element of array only if needed PHPBB-15403 --- phpBB/includes/functions_content.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index bb2ac3e8a79..2950fe762ae 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -368,20 +368,16 @@ function get_context(string $text, array $words, int $length = 400): string $end = $start + $characters_per_word; // Check if we can merge this fragment into the previous fragment - $last_element = array_pop($fragments); - if ($last_element !== null) + if (!empty($fragments)) { - [$prev_start, $prev_end] = $last_element; + [$prev_start, $prev_end] = end($fragments); if ($prev_end + $characters_per_word >= $index + $word_length) { + array_pop($fragments); $start = $prev_start; $end = $prev_end + $characters_per_word; } - else - { - $fragments[] = $last_element; - } } $fragments[] = [$start, $end]; @@ -419,7 +415,7 @@ function get_context(string $text, array $words, int $length = 400): string $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } - return ($fragments[0][0] != 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); + return ($fragments[0][0] !== 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** From 5c40766dc4d9f5ca7bca3f87c94a15867e0a1069 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 15 Jul 2024 12:30:10 +0200 Subject: [PATCH 0341/1214] [ticket/15403] Remove last element of array only if needed PHPBB-15403 --- phpBB/includes/functions_content.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 6a360fc4a22..2e52863ef0a 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -369,20 +369,16 @@ function get_context(string $text, array $words, int $length = 400): string $end = $start + $characters_per_word; // Check if we can merge this fragment into the previous fragment - $last_element = array_pop($fragments); - if ($last_element !== null) + if (!empty($fragments)) { - [$prev_start, $prev_end] = $last_element; + [$prev_start, $prev_end] = end($fragments); if ($prev_end + $characters_per_word >= $index + $word_length) { + array_pop($fragments); $start = $prev_start; $end = $prev_end + $characters_per_word; } - else - { - $fragments[] = $last_element; - } } $fragments[] = [$start, $end]; @@ -420,7 +416,7 @@ function get_context(string $text, array $words, int $length = 400): string $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } - return ($fragments[0][0] != 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); + return ($fragments[0][0] !== 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** From 10f92dbb6888c15b23fcb11fd8aa7b80e23171ca Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 16 Jul 2024 21:01:57 +0200 Subject: [PATCH 0342/1214] [ticket/13933] Extend tokens' definitions in ACP bbcodes PHPBB-13933 --- phpBB/includes/acp/acp_bbcodes.php | 1 + phpBB/language/en/acp/posting.php | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 2220d5cbaac..7bfbe5163fe 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -110,6 +110,7 @@ function main($id, $mode) ); $bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR'); + $bbcode_tokens = array_merge($bbcode_tokens, ['ALNUM', 'CHOICE', 'FLOAT', 'HASHMAP', 'INT', 'IP', 'IPPORT', 'IPV4', 'IPV6', 'MAP', 'RANGE', 'REGEXP', 'TIMESTAMP', 'UINT']); /** * Modify custom bbcode template data before we display the add/edit form diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 3bff6b9185a..f252864eb66 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -88,6 +88,20 @@ 'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol, as links are prefixed with “%s”', 'RELATIVE_URL' => 'A relative URL. You can use this to match parts of a URL, but be careful: a full URL is a valid relative URL. When you want to use relative URLs of your board, use the LOCAL_URL token.', 'COLOR' => 'A HTML colour, can be either in the numeric form #FF1234 or a CSS colour keyword such as fuchsia or InactiveBorder', + 'ALNUM' => 'Characters from the latin alphabet (A-Z) and numbers.', + 'CHOICE' => 'A choice of specified values, e.g. {CHOICE=spades,hearts,diamonds,clubs}. The values are treated as case-insensitive by default and can be treated case-sensitive by specifying the caseSensitive option: {CHOICE=Spades,Hearts,Diamonds,Clubs;caseSensitive}', + 'FLOAT' => 'A decimal value, e.g. 0.5.', + 'HASHMAP' => 'Maps strings to their replacement in the form {HASHMAP=string1:replacement1,string2:replacement2}. Case-sensitive. Preserves unknown values by default.', + 'INT' => 'An integer value, e.g. 2.', + 'IP' => 'A valid IPv4 or IPv6 address.', + 'IPPORT' => 'A valid IPv4 or IPv6 address with port number.', + 'IPV4' => 'A valid IPv4 address.', + 'IPV6' => 'A valid IPv6 address.', + 'MAP' => 'Maps strings to their replacement in the form {MAP=string1:replacement1,string2:replacement2}. Case-insensitive. Preserves unknown values by default.', + 'RANGE' => 'Accepts an integer in the given range, e.g. {RANGE=-10,42}.', + 'REGEXP' => 'Validates its value against a given regexp, e.g. {REGEXP=/^foo\w+bar$/}.', + 'TIMESTAMP' => 'A timestamp such as 1h30m10s which will be converted to a number of seconds. Also accepts a number.', + 'UINT' => 'An unsigned integer value. Same as {INT}, but rejects values less than 0.', ), )); From 8b3bc0b5f522ec5f4bc1910e4dae4e783a9a0e02 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Jul 2024 18:06:22 +0200 Subject: [PATCH 0343/1214] [ticket/12479] Remove duplicate semi-colons PHPBB-12479 --- tests/auth/provider_apache_test.php | 2 +- tests/config/db_test.php | 2 +- tests/controller/common_helper_route.php | 2 +- tests/search/native_test.php | 2 +- tests/security/hash_test.php | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index cdccd2a3588..bc211b4ed54 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -33,7 +33,7 @@ protected function setUp(): void $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); $this->request = $this->createMock('\phpbb\request\request'); - $this->user = new \phpbb\user($lang, '\phpbb\datetime');; + $this->user = new \phpbb\user($lang, '\phpbb\datetime'); $this->provider = new \phpbb\auth\provider\apache($config, $db, $lang, $this->request, $this->user, $phpbb_root_path, $phpEx); } diff --git a/tests/config/db_test.php b/tests/config/db_test.php index 11c99435f83..5bed8d405d3 100644 --- a/tests/config/db_test.php +++ b/tests/config/db_test.php @@ -136,7 +136,7 @@ public function test_increment() public function test_increment_new() { $this->config->increment('foobar', 3); - $this->assertEquals(3, $this->config['foobar']);; + $this->assertEquals(3, $this->config['foobar']); } public function test_delete() diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 45e03861956..0cd52b7d8be 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -111,7 +111,7 @@ protected function generate_route_objects() $this->config = new \phpbb\config\config(array('enable_mod_rewrite' => '0')); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); - $this->user = new \phpbb\user($lang, '\phpbb\datetime');; + $this->user = new \phpbb\user($lang, '\phpbb\datetime'); $container = new phpbb_mock_container_builder(); $container->setParameter('core.environment', PHPBB_ENVIRONMENT); diff --git a/tests/search/native_test.php b/tests/search/native_test.php index 50f2119e7f7..0d8d8e68105 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -36,7 +36,7 @@ protected function setUp(): void $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $lang = new \phpbb\language\language($lang_loader); - $user = new \phpbb\user($lang, '\phpbb\datetime');; + $user = new \phpbb\user($lang, '\phpbb\datetime'); $this->db = $this->new_dbal(); $tools_factory = new \phpbb\db\tools\factory(); diff --git a/tests/security/hash_test.php b/tests/security/hash_test.php index 3c99a70200b..203d142cb78 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -40,7 +40,7 @@ protected function setUp(): void public function test_check_hash_with_phpass() { - global $phpbb_container;; + global $phpbb_container; /** @var \phpbb\passwords\manager $passwords_manager */ $passwords_manager = $phpbb_container->get('passwords.manager'); @@ -52,7 +52,7 @@ public function test_check_hash_with_phpass() public function test_check_hash_with_large_input() { - global $phpbb_container;; + global $phpbb_container; /** @var \phpbb\passwords\manager $passwords_manager */ $passwords_manager = $phpbb_container->get('passwords.manager'); From 4da0a75efa473b5d6530b10bfc04c4a9c7c1b40b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 17 Jul 2024 09:28:33 -0700 Subject: [PATCH 0344/1214] [ticket/17371] Improve dropdown toggle UX PHPBB-17371 Signed-off-by: Matt Friedman --- phpBB/styles/prosilver/imgs/svg/toggle-off.svg | 1 + phpBB/styles/prosilver/imgs/svg/toggle-on.svg | 1 + .../styles/prosilver/template/notification_dropdown.html | 4 ++-- phpBB/styles/prosilver/theme/colours.css | 8 ++++++++ phpBB/styles/prosilver/theme/icons.css | 6 ++++++ 5 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 phpBB/styles/prosilver/imgs/svg/toggle-off.svg create mode 100644 phpBB/styles/prosilver/imgs/svg/toggle-on.svg diff --git a/phpBB/styles/prosilver/imgs/svg/toggle-off.svg b/phpBB/styles/prosilver/imgs/svg/toggle-off.svg new file mode 100644 index 00000000000..9bd31a7bf5e --- /dev/null +++ b/phpBB/styles/prosilver/imgs/svg/toggle-off.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/styles/prosilver/imgs/svg/toggle-on.svg b/phpBB/styles/prosilver/imgs/svg/toggle-on.svg new file mode 100644 index 00000000000..83d2e59c0ce --- /dev/null +++ b/phpBB/styles/prosilver/imgs/svg/toggle-on.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index de5a8c79e6b..715f04e1a2c 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -47,8 +47,8 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
{{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} - - + +
{% endif %} {% EVENT notification_dropdown_footer_after %} diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 4980cd89f2d..eb16158cc33 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -298,6 +298,14 @@ a:hover .icon.icon-black, /* DEPRECATED 4.0 */ color: inherit; } +.push-subscribe-toggle-icon.toggle-on { + color: #0059b3; +} + +.push-subscribe-toggle-icon.toggle-off { + color: #9e9e9e; +} + /* jumpbox */ .jumpbox .dropdown li { border-top-color: #dedede; diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index a6ad36d22a4..d4b7dabefef 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -123,6 +123,12 @@ blockquote cite:before, height: 18px; } +.push-subscribe-toggle-icon { + width: 20px; + height: 20px; + cursor: pointer; +} + /* Contact icons ---------------------------------------- */ .contact-icon { From 7252345911bb2480e8f493a3a18d6452232da0c4 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 17 Jul 2024 09:29:30 -0700 Subject: [PATCH 0345/1214] [ticket/17371] Improve UX for disabled state PHPBB-17371 Signed-off-by: Matt Friedman --- phpBB/assets/javascript/webpush.js | 26 ++++++++++++++++--- phpBB/language/en/common.php | 5 ++-- .../template/ucp_notifications_options.html | 2 +- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js index 94e542d2aed..4adb9ecf101 100644 --- a/phpBB/assets/javascript/webpush.js +++ b/phpBB/assets/javascript/webpush.js @@ -51,7 +51,7 @@ function PhpbbWebpush() { // Service workers are only supported in secure context if (window.isSecureContext !== true) { - subscribeButton.disabled = true; + setDisabledState(); return; } @@ -66,13 +66,33 @@ function PhpbbWebpush() { .catch(error => { console.info(error); // Service worker could not be registered - subscribeButton.disabled = true; + setDisabledState(); }); } else { - subscribeButton.disabled = true; + setDisabledState(); } }; + /** + * Disable subscribing buttons, update subscribe button text and hide dropdown toggle + * + * @return void + */ + function setDisabledState() { + subscribeButton.disabled = true; + + const notificationList = document.getElementById('notification-menu'); + const subscribeToggle = notificationList.querySelector('.webpush-subscribe'); + + if (subscribeToggle) { + subscribeToggle.style.display = 'none'; + } + + if (subscribeButton.type === 'submit' || subscribeButton.classList.contains('button')) { + subscribeButton.value = subscribeButton.getAttribute('data-disabled-msg'); + } + } + /** * Update button state depending on notifications state * diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 43269679bfd..d528ef9b2b8 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -512,10 +512,11 @@ ), 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', - 'NOTIFY_WEB_PUSH_ENABLE' => 'Enable Web Push notifications', + 'NOTIFY_WEB_PUSH_DENIED' => 'You have denied notifications from this site. To subscribe, please allow notifications in your browser settings.', + 'NOTIFY_WEB_PUSH_DISABLED' => 'Web Push not supported', + 'NOTIFY_WEB_PUSH_ENABLE' => 'Enable web push notifications', 'NOTIFY_WEB_PUSH_SUBSCRIBE' => 'Subscribe', 'NOTIFY_WEB_PUSH_SUBSCRIBED'=> 'Subscribed', - 'NOTIFY_WEB_PUSH_DENIED' => 'You have denied notifications from this site. To subscribe, please allow notifications in your browser settings.', 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', 'NO_ACTION' => 'No action specified.', 'NO_ADMINISTRATORS' => 'There are no administrators.', diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index 27981581ff2..5b953362feb 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -10,7 +10,7 @@

{{ TITLE }}


{{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
- +
From 5e80be96e43ae5d5c11d436aee270a719b0a496c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 17 Jul 2024 09:30:08 -0700 Subject: [PATCH 0346/1214] [ticket/17371] Code fixes and hard-coded lang vars PHPBB-17371 Signed-off-by: Matt Friedman --- phpBB/phpbb/ucp/controller/webpush.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 15e54956fb2..cac2f10291c 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -103,7 +103,7 @@ public function notification(): JsonResponse { if (!$this->request->is_ajax() || $this->user->data['is_bot'] || $this->user->data['user_type'] == USER_INACTIVE) { - throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); + throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } if ($this->user->id() !== ANONYMOUS) @@ -132,7 +132,7 @@ private function get_user_notifications(): string // Subscribe should only be available for logged-in "normal" users if ($this->user->data['user_type'] == USER_IGNORE) { - throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); + throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } $item_id = $this->request->variable('item_id', 0); @@ -192,7 +192,7 @@ private function get_anonymous_notifications(): string } } - throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); + throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } /** @@ -251,7 +251,7 @@ protected function check_subscribe_requests(): void } // Subscribe should only be available for logged-in "normal" users - if (!$this->request->is_ajax() || $this->user->id() == ANONYMOUS || $this->user->data['is_bot'] + if (!$this->request->is_ajax() || $this->user->id() === ANONYMOUS || $this->user->data['is_bot'] || $this->user->data['user_type'] == USER_IGNORE || $this->user->data['user_type'] == USER_INACTIVE) { throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); From 9cdc71f348daf688a3b08e92f45cf37d7c8fed22 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 18 Jul 2024 21:01:06 +0100 Subject: [PATCH 0347/1214] [ticket/17373] Remove extra separator and change all separators to solid lines The quick links menu in the header navbar had an additional horizontal line at the bottom which did not need to be there. Additionally the separators for links that always display in the quick links menu had dotted underlines rather than the solid underlines that were under the links that only show up for mobile users when there's less screen space. PHPBB-17373 --- phpBB/styles/prosilver/template/navbar_header.html | 1 - phpBB/styles/prosilver/theme/common.css | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index ef6da4ab917..8269f27fa60 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -69,7 +69,6 @@ {% endif %} {% endif %} -
  • {% EVENT navbar_header_quick_links_after %} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index b67011e806d..66fff05404b 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -560,7 +560,7 @@ a.header-avatar img { line-height: normal !important; text-align: left; white-space: nowrap; - border-top: 1px dotted transparent; + border-top: 1px solid transparent; display: list-item; float: none !important; margin: 0; From 8104facb3007c5ebc1bdf16749ce29bd5214404c Mon Sep 17 00:00:00 2001 From: battye Date: Mon, 22 Jul 2024 02:41:20 +0000 Subject: [PATCH 0348/1214] [ticket/17181] Remove unused PM report code PHPBB-17181 --- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 503f6a0f48a..bf121f64be4 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -22,7 +22,7 @@ -
    +
    From 58cc1f4ef301fa50398d4289a6b4ae49b69082c0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 20:18:28 +0200 Subject: [PATCH 0349/1214] [ticket/17374] Only delete marked logs if entries have been marked PHPBB-17374 --- phpBB/includes/acp/acp_logs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_logs.php b/phpBB/includes/acp/acp_logs.php index f85c24af09b..0244dce66ce 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -51,7 +51,7 @@ function main($id, $mode) $pagination = $phpbb_container->get('pagination'); // Delete entries if requested and able - if (($deletemark || $deleteall) && $auth->acl_get('a_clearlogs')) + if (($deleteall || ($deletemark && count($marked))) && $auth->acl_get('a_clearlogs')) { if (confirm_box(true)) { From 02c59fdf43df76492abb834cf0c5428a65a67405 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:04:34 +0200 Subject: [PATCH 0350/1214] [ticket/12479] Convert file_downloader to use guzzle instead of fsockopen PHPBB-12479 --- phpBB/phpbb/file_downloader.php | 140 ++++++++------ tests/version/version_helper_remote_test.php | 188 ++++++++++++++++++- 2 files changed, 267 insertions(+), 61 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index 873bccc9e89..bf466c94bc6 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -13,91 +13,117 @@ namespace phpbb; +use GuzzleHttp\Client; +use GuzzleHttp\Exception\RequestException ; +use phpbb\exception\runtime_exception; +use function Amp\Promise\rethrow; + class file_downloader { + const OK = 200; + const NOT_FOUND = 404; + const REQUEST_TIMEOUT = 408; + /** @var string Error string */ - protected $error_string = ''; + protected string $error_string = ''; /** @var int Error number */ - protected $error_number = 0; + protected int $error_number = 0; + + /** + * Create new guzzle client + * + * @param string $host + * @param int $port + * @param int $timeout + * + * @return Client + */ + protected function create_client(string $host, int $port = 443, int $timeout = 6): Client + { + // Only set URL scheme if not specified in URL + $url_parts = parse_url($host); + if (!isset($url_parts['scheme'])) + { + $host = (($port === 443) ? 'https://' : 'http://') . $host; + } + + // Initialize Guzzle client + return new Client([ + 'base_uri' => $host, + 'timeout' => $timeout, + ]); + } /** * Retrieve contents from remotely stored file * - * @param string $host File host - * @param string $directory Directory file is in - * @param string $filename Filename of file to retrieve - * @param int $port Port to connect to; default: 80 - * @param int $timeout Connection timeout in seconds; default: 6 + * @param string $host File host + * @param string $directory Directory file is in + * @param string $filename Filename of file to retrieve + * @param int $port Port to connect to; default: 80 + * @param int $timeout Connection timeout in seconds; default: 6 * * @return false|string File data as string if file can be read and there is no - * timeout, false if there were errors or the connection timed out + * timeout, false if there were errors or the connection timed out * - * @throws \phpbb\exception\runtime_exception If data can't be retrieved and no error - * message is returned + * @throws runtime_exception If data can't be retrieved and no error + * message is returned */ - public function get($host, $directory, $filename, $port = 80, $timeout = 6) + public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6): bool|string { + // Initialize Guzzle client + $client = $this->create_client($host, $port, $timeout); + // Set default values for error variables $this->error_number = 0; $this->error_string = ''; - if (function_exists('fsockopen') && - $socket = @fsockopen(($port == 443 ? 'ssl://' : '') . $host, $port, $this->error_number, $this->error_string, $timeout) - ) + try { - @fputs($socket, "GET $directory/$filename HTTP/1.0\r\n"); - @fputs($socket, "HOST: $host\r\n"); - @fputs($socket, "Connection: close\r\n\r\n"); - - $timer_stop = time() + $timeout; - stream_set_timeout($socket, $timeout); + $response = $client->request('GET', "$directory/$filename"); - $file_info = ''; - $get_info = false; - - while (!@feof($socket)) + // Check if the response status code is 200 (OK) + if ($response->getStatusCode() == self::OK) { - if ($get_info) - { - $file_info .= @fread($socket, 1024); - } - else - { - $line = @fgets($socket, 1024); - if ($line == "\r\n") - { - $get_info = true; - } - else if (stripos($line, '404 not found') !== false) - { - throw new \phpbb\exception\runtime_exception('FILE_NOT_FOUND', array($filename)); - } - } - - $stream_meta_data = stream_get_meta_data($socket); - - if ($stream_meta_data['timed_out'] || time() >= $timer_stop) - { - throw new \phpbb\exception\runtime_exception('FSOCK_TIMEOUT'); - } + return $response->getBody()->getContents(); + } + else + { + $this->error_number = $response->getStatusCode(); + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); } - @fclose($socket); } - else + catch (RequestException $exception) { - if ($this->error_string) + if ($exception->hasResponse()) { - $this->error_string = utf8_convert_message($this->error_string); - return false; + $this->error_number = $exception->getResponse()->getStatusCode(); + + if ($this->error_number == self::NOT_FOUND) + { + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); + } } else { - throw new \phpbb\exception\runtime_exception('FSOCK_DISABLED'); + $this->error_number = self::REQUEST_TIMEOUT; + throw new runtime_exception('FSOCK_TIMEOUT'); } - } - return $file_info; + $this->error_string = utf8_convert_message($exception->getMessage()); + return false; + } + catch (runtime_exception $exception) + { + // Rethrow runtime_exceptions, only handle unknown cases below + throw $exception; + } + catch (\Throwable $exception) + { + $this->error_string = utf8_convert_message($exception->getMessage()); + throw new runtime_exception('FSOCK_DISABLED'); + } } /** @@ -105,7 +131,7 @@ public function get($host, $directory, $filename, $port = 80, $timeout = 6) * * @return string Error string */ - public function get_error_string() + public function get_error_string(): string { return $this->error_string; } @@ -115,7 +141,7 @@ public function get_error_string() * * @return int Error number */ - public function get_error_number() + public function get_error_number(): int { return $this->error_number; } diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index 02a811b5399..be92a3f977c 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -1,4 +1,7 @@ method('get') ->with($this->anything()) ->will($this->returnValue(false)); - $this->file_downloader = new phpbb_mock_file_downloader(); + + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->addMethods(['set_data']) + ->onlyMethods(['request']) + ->getMock(); + $this->guzzle_mock->method('set_data') + ->will($this->returnCallback(function($data) + { + $this->guzzle_data = $data; + } + )); + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response($this->guzzle_status, [], $this->guzzle_data); + } + )); + + $this->file_downloader = $this->getMockBuilder('\phpbb\file_downloader') + ->onlyMethods(['create_client']) + ->getMock(); + $this->file_downloader->method('create_client') + ->will($this->returnValue($this->guzzle_mock)); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); @@ -203,7 +233,7 @@ public function provider_get_versions() */ public function test_get_versions($input, $valid_data, $expected_return = '', $expected_exception = '') { - $this->file_downloader->set($input); + $this->guzzle_mock->set_data($input); // version_helper->get_versions() doesn't return a value on VERSIONCHECK_FAIL but only throws exception // so the $return is undefined. Define it here @@ -214,7 +244,7 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e try { $return = $this->version_helper->get_versions(); } catch (\phpbb\exception\runtime_exception $e) { - $this->assertEquals((string)$e->getMessage(), $expected_exception); + $this->assertEquals($expected_exception, $e->getMessage()); } } else @@ -227,7 +257,23 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e public function test_version_phpbb_com() { - $file_downloader = new \phpbb\file_downloader(); + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response(200, [], file_get_contents(__DIR__ . '/fixture/30x.txt')); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); $hostname = 'version.phpbb.com'; @@ -285,4 +331,138 @@ public function test_version_phpbb_com() $this->assertStringContainsString('http', $lines[1]); $this->assertStringContainsString('phpbb.com', $lines[1], '', true); } + + public function test_file_downloader_file_not_found() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response(404, [], ''); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FILE_NOT_FOUND'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_not_found() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + $response = new \GuzzleHttp\Psr7\Response(404, [], ''); + throw new RequestException('FILE_NOT_FOUND', $request, $response); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FILE_NOT_FOUND'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_moved() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + $response = new \GuzzleHttp\Psr7\Response(302, [], ''); + throw new RequestException('FILE_MOVED', $request, $response); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->assertFalse($file_downloader->get('foo.com', 'bar', 'foo.txt')); + $this->assertEquals(302, $file_downloader->get_error_number()); + $this->assertEquals('FILE_MOVED', $file_downloader->get_error_string()); + } + + public function test_file_downloader_exception_timeout() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + throw new RequestException('FILE_NOT_FOUND', $request); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FSOCK_TIMEOUT'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_other() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + throw new \RuntimeException('FSOCK_NOT_SUPPORTED'); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FSOCK_DISABLED'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } } From 445a16be938cb9370ac3fcb98a840b066b6fb4c5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:05:54 +0200 Subject: [PATCH 0351/1214] [ticket/12479] Remove dns check from test as we don't test against host anymore PHPBB-12479 --- tests/version/version_helper_remote_test.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index be92a3f977c..e38f4d7b2c3 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -277,15 +277,6 @@ public function test_version_phpbb_com() $hostname = 'version.phpbb.com'; - if (!checkdnsrr($hostname, 'A')) - { - $this->markTestSkipped(sprintf( - 'Could not find a DNS record for hostname %s. ' . - 'Assuming network is down.', - $hostname - )); - } - $file = $file_downloader->get($hostname, '/phpbb', '30x.txt'); $errstr = $file_downloader->get_error_string(); $errno = $file_downloader->get_error_number(); From efff5ac49e04a73cc1c9c92620e0f534ec1ee109 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:06:48 +0200 Subject: [PATCH 0352/1214] [ticket/12479] Fix use statements in file_downloader PHPBB-12479 --- phpBB/phpbb/file_downloader.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index bf466c94bc6..b01f4c70436 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -14,9 +14,8 @@ namespace phpbb; use GuzzleHttp\Client; -use GuzzleHttp\Exception\RequestException ; +use GuzzleHttp\Exception\RequestException; use phpbb\exception\runtime_exception; -use function Amp\Promise\rethrow; class file_downloader { From ca561810081c7de02ea381c0dcc2199590caeb90 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:25:22 +0200 Subject: [PATCH 0353/1214] [ticket/12479] Use separate mock in "remote" file test PHPBB-12479 --- tests/version/version_helper_remote_test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index e38f4d7b2c3..85acfb8fe4c 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -257,11 +257,11 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e public function test_version_phpbb_com() { - $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + $guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') ->onlyMethods(['request']) ->getMock(); - $this->guzzle_mock->method('request') + $guzzle_mock->method('request') ->will($this->returnCallback(function() { return new \GuzzleHttp\Psr7\Response(200, [], file_get_contents(__DIR__ . '/fixture/30x.txt')); @@ -273,7 +273,7 @@ public function test_version_phpbb_com() ->getMock(); $file_downloader->method('create_client') - ->willReturn($this->guzzle_mock); + ->willReturn($guzzle_mock); $hostname = 'version.phpbb.com'; From c6b40259f73f19cce432d8249b4b13ca13b53678 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 24 Jul 2024 19:13:06 +0200 Subject: [PATCH 0354/1214] [ticket/12479] Add missing file fixture PHPBB-12479 --- tests/version/fixture/30x.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tests/version/fixture/30x.txt diff --git a/tests/version/fixture/30x.txt b/tests/version/fixture/30x.txt new file mode 100644 index 00000000000..f138ad0c83b --- /dev/null +++ b/tests/version/fixture/30x.txt @@ -0,0 +1,4 @@ +3.0.14 +https://www.phpbb.com/community/viewtopic.php?f=14&t=2313941 +3.3.12 +https://www.phpbb.com/community/viewtopic.php?t=2653732 From c36c6a2308d811ccf31746793ed4d804ba7d9ee7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 24 Jul 2024 21:29:35 +0200 Subject: [PATCH 0355/1214] [ticket/12479] Use fixed mssql docker version until Microsoft learns testing PHPBB-12479 --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4b5a58a30ff..249595cee4f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -383,14 +383,14 @@ jobs: db: "mcr.microsoft.com/mssql/server:2019-latest" db_alias: 'MSSQL 2019' - php: '8.1' - db: "mcr.microsoft.com/mssql/server:2022-latest" + db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" db_alias: 'MSSQL 2022' name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -422,7 +422,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-latest' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] then db='mssql' else From a7720522a26d8b3cac53617f999f533bf29ea8de Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 26 Jul 2024 18:56:36 +0200 Subject: [PATCH 0356/1214] [ticket/17022] Fix SQL report link PHPBB-17022 --- phpBB/includes/functions.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 67a6d0ca6d2..2451c10164f 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4032,7 +4032,9 @@ function phpbb_generate_debug_output(\phpbb\db\driver\driver_interface $db, \php if ($auth->acl_get('a_')) { - $debug_info[] = 'SQL Explain'; + $page_url = build_url(); + $page_url .= ((!str_contains($page_url, '?')) ? '?' : '&') . 'explain=1'; + $debug_info[] = 'SQL Explain'; } } From 8497104bdb6611c38f15eec8ff12d1c486ae864d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Jul 2024 21:24:45 +0200 Subject: [PATCH 0357/1214] [ticket/17375] Ensure session garbage collection only happens for expired ones PHPBB-17375 --- phpBB/phpbb/session.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index aa4841316fa..bb544531c11 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -964,8 +964,8 @@ function session_gc() } /** - * Get most recent session for each registered user to sync user last visit with it - * Inner SELECT gets most recent sessions for each unique session_user_id + * Get expired sessions for registered users, only most recent for each user + * Inner SELECT gets most recent expired sessions for unique session_user_id * Outer SELECT gets data for them */ $sql_select = 'SELECT s1.session_page, s1.session_user_id, s1.session_time AS recent_time @@ -973,7 +973,8 @@ function session_gc() INNER JOIN ( SELECT session_user_id, MAX(session_time) AS recent_time FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id <> ' . ANONYMOUS . ' + WHERE session_time < ' . ($this->time_now - (int) $config['session_length']) . ' + AND session_user_id <> ' . ANONYMOUS . ' GROUP BY session_user_id ) AS s2 ON s1.session_user_id = s2.session_user_id From 18c00a902fc9cf76c90b35d315d0f6d298099c6b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Jul 2024 21:25:33 +0200 Subject: [PATCH 0358/1214] [ticket/17375] User last active should be updated to current time PHPBB-17375 --- phpBB/phpbb/session.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index bb544531c11..de68cb6b669 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -819,7 +819,7 @@ function session_create($user_id = false, $set_admin = false, $persist_login = f // Update the form key $sql = 'UPDATE ' . USERS_TABLE . ' SET user_form_salt = \'' . $db->sql_escape($this->data['user_form_salt']) . '\', - user_last_active = ' . (int) $this->data['session_time'] . ' + user_last_active = ' . (int) $this->time_now . ' WHERE user_id = ' . (int) $this->data['user_id']; $db->sql_query($sql); } From 599073cab238d589a4a35e15de32e3d29d3dc739 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Aug 2024 19:20:32 +0200 Subject: [PATCH 0359/1214] [prep-release-3.3.13] Update version numbers to 3.3.13-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index c1a7b274b9d..8dbe2f5f210 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index e7059af80d5..5576aeb0b02 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.13-dev'); +@define('PHPBB_VERSION', '3.3.13-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 07b13ddda03..95802ddf17b 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.12'); +define('PHPBB_VERSION', '3.3.13-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 674b35a17ec..714ce05d062 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 1d256fef6129fd337aff284e47c1e50680187dae Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Aug 2024 19:20:32 +0200 Subject: [PATCH 0360/1214] [prep-release-3.3.13] Update version numbers to 3.3.13 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7f9449609ef..7a02946f775 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.12', + 'phpbb_version' => '3.3.13', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 3f6f8a35d6f..0b16bfde556 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.12 -phpbb_version = 3.3.12 +style_version = 3.3.13 +phpbb_version = 3.3.13 # Defining a different template bitfield # template_bitfield = //g= From e9e305ee9fc7ca927da8d21276c2e0c75b723280 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Aug 2024 19:20:35 +0200 Subject: [PATCH 0361/1214] [prep-release-3.3.13] Add migration for 3.3.13-RC1 --- .../phpbb/db/migration/data/v33x/v3313rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3313rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php new file mode 100644 index 00000000000..4481a538212 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3313rc1.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3313rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.13-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3312', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.13-RC1']], + ]; + } +} From 57ef18ecc02f070a102cb9265404241b9d8d90a4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Aug 2024 19:20:35 +0200 Subject: [PATCH 0362/1214] [prep-release-3.3.13] Update stylesheet hashes for 3.3.13-RC1 --- phpBB/styles/prosilver/theme/stylesheet.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index e866175bf71..0171d646dae 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -10,7 +10,7 @@ @import url("normalize.css?hash=48eb3f89"); @import url("base.css?hash=7c5543be"); @import url("utilities.css?hash=d8f72c42"); -@import url("common.css?hash=a9741ba1"); +@import url("common.css?hash=843d5d5f"); @import url("links.css?hash=18286e16"); @import url("content.css?hash=d0e24377"); @import url("buttons.css?hash=56f0d25f"); @@ -18,4 +18,4 @@ @import url("forms.css?hash=9016b55c"); @import url("icons.css?hash=64da33ce"); @import url("colours.css?hash=fcb2f289"); -@import url("responsive.css?hash=91525545"); +@import url("responsive.css?hash=c9d32cba"); From 2973c2f6db337ed233e1963a05e1aff199c13b24 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Aug 2024 19:22:23 +0200 Subject: [PATCH 0363/1214] [prep-release-3.3.13] Update changelog for 3.3.13-RC1 --- phpBB/docs/CHANGELOG.html | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8b20e374b16..67aad9177ee 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

    Changelog

    1. Changelog
        +
      • Changes since 3.3.12
      • Changes since 3.3.12-RC1
      • Changes since 3.3.11
      • Changes since 3.3.10
        • @@ -169,6 +170,55 @@

        Changelog

        +

        Changes since 3.3.12

        +

        Bug

        +
          +
        • [PHPBB-13916] - Cancelling save draft removes previous notify setting on posting page
          • +
        • [PHPBB-14454] - Accessing ACP modules while testing user permissions returns a General Error
          • +
        • [PHPBB-15043] - Searching no longer working in 3.2.0
          • +
        • [PHPBB-15576] - PM subject truncated to shorter length than maxlength
          • +
        • [PHPBB-16213] - vendor and phpbb folders should have .htaccess files
          • +
        • [PHPBB-16907] - "phpbb" value in "hiddenSegments" blocks client requests for extensions in IIS
          • +
        • [PHPBB-17109] - Users without the "Can use signature" permission should not see checkboxes for signature
          • +
        • [PHPBB-17175] - Breadcrumbs show wrong forum and topic when using 'email topic'
          • +
        • [PHPBB-17301] - Wrong length parameter for fread in phpbb/cache/driver/file.php can lead to unusable forum
          • +
        • [PHPBB-17327] - Fix linting issue in console user add command
          • +
        • [PHPBB-17332] - New permission copied from existing permission ignores permission set options
          • +
        • [PHPBB-17337] - Transaction begin is missing from mysqli driver
          • +
        • [PHPBB-17338] - Incorrect members list sorting by user_last_visit
          • +
        • [PHPBB-17351] - phpBB2 password hashes incorrectly handled during rehash cron
          • +
        • [PHPBB-17352] - Long rank titles push other profile details below
          • +
        • [PHPBB-17353] - Gravatar avatar src is not image src
          • +
        • [PHPBB-17356] - Errors hidden by at are being displayed in PHP 8 or newer
          • +
        • [PHPBB-17358] - Redis cache never expires with the TTL of 0
          • +
        • [PHPBB-17362] - Missing declaration of property in extension manager
          • +
        • [PHPBB-17365] - Enforce the search word limit on queries containing operators without white space
          • +
        • [PHPBB-17366] - Captcha disappears on error message from registration & posting
          • +
        • [PHPBB-17369] - Permanently deleting soft-deleted topics returns incorrect forum in redirect link
          • +
        • [PHPBB-17370] - Deleting Cookies on FAQ/other pages
          • +
        • [PHPBB-17374] - ACP - Maintenance - Logs: Deleting Error / Bug
          • +
        • [PHPBB-17375] - User lastvisit gets updated too often in session garbage collection
          • +
        +

        Improvement

        +
          +
        • [PHPBB-16553] - Disapproving a reported post causes a "Module not accessible" error
          • +
        • [PHPBB-17308] - Rename tracker project key to PHPBB-
          • +
        • [PHPBB-17315] - Add new template events to group
          • +
        • [PHPBB-17316] - Add template events to ucp_groups_manage
          • +
        • [PHPBB-17317] - Update button text and make it more readable
          • +
        • [PHPBB-17325] - Show explicit message for "Re-Check version" if installed version is still up to date
          • +
        • [PHPBB-17340] - Update composer to 2.7.7
          • +
        • [PHPBB-17342] - Add PHP 8.4-dev tests to GitHub Actions
          • +
        • [PHPBB-17347] - Support deleting users by ID via console
          • +
        • [PHPBB-17350] - Add user IP address to log when installing extensions on fresh installs
          • +
        • [PHPBB-17355] - Update gravatar hash to sha256
          • +
        +

        Task

        +
          +
        • [PHPBB-13933] - Update tokens' definitions in acp_bbcodes
          • +
        • [PHPBB-16890] - Edit the config sample files and web.config to deny access to the "config" directory
          • +
        +

        Changes since 3.3.12-RC1

        Bug

          From 99861a8c10b61c78ebf874260056030a1da221eb Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 4 Aug 2024 15:09:34 +0100 Subject: [PATCH 0364/1214] [ticket/17376] Add aria label to quote reference link Adds an aria label attribute to the quoted post reference link so that screen readers can inform the user of what the link is used for. Before this change the link was too vague and would not have been well described to users of its purpose if they couldn't see it. PHPBB-17376 --- phpBB/language/en/viewtopic.php | 1 + phpBB/styles/prosilver/template/bbcode.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index e5c9be05174..9334a633d45 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -112,6 +112,7 @@ 'VIEW_INFO' => 'Post details', 'VIEW_NEXT_TOPIC' => 'Next topic', 'VIEW_PREVIOUS_TOPIC' => 'Previous topic', + 'VIEW_QUOTED_POST' => 'View quoted post', 'VIEW_RESULTS' => 'View results', 'VIEW_TOPIC_POSTS' => array( 1 => '%d post', diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index 2780d869d25..bc681ec46b8 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -38,7 +38,7 @@ - ↑ + ↑ From 31f0e7b88299127d58255a4e7a2f0073c2ca1839 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 5 Aug 2024 20:30:55 +0200 Subject: [PATCH 0365/1214] [3.3.x] Update versions to 3.3.14-dev --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 8dbe2f5f210..aa23d9b021d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 5576aeb0b02..9e2924d96cf 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.13-RC1'); +@define('PHPBB_VERSION', '3.3.14-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 714ce05d062..9da79e77be8 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 8b7f215309cf3f420368a0aeaaf2ffc7713b8a7e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 6 Aug 2024 20:14:02 +0200 Subject: [PATCH 0366/1214] [ticket/17377] Use specific mssql docker images to have uniform builds PHPBB-17377 --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c7da3df4fab..893c4c4a285 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -361,14 +361,14 @@ jobs: db: "mcr.microsoft.com/mssql/server:2017-latest" db_alias: 'MSSQL 2017' - php: '7.2' - db: "mcr.microsoft.com/mssql/server:2019-latest" + db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" db_alias: 'MSSQL 2019' name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-latest' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -400,7 +400,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-latest' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] then db='mssql' else From 6623e7fe1d6cb64282cfe7f3543836d0e3d4785f Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 7 Aug 2024 11:36:25 +0100 Subject: [PATCH 0367/1214] [ticket/17376] Update quote template and change icon to FA arrow PHPBB-17376 --- phpBB/styles/prosilver/template/bbcode.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index bc681ec46b8..087acce075b 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -38,11 +38,11 @@ - ↑ + - ↑ + From 28e217aa845fbae4afee3c89f11160430a29254b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 9 Aug 2024 21:14:53 +0200 Subject: [PATCH 0368/1214] [ticket/16777] Remove remainders of max image size PHPBB-16777 --- phpBB/includes/acp/acp_board.php | 2 -- phpBB/includes/message_parser.php | 2 -- .../includes/questionnaire/questionnaire.php | 2 -- phpBB/install/schemas/schema_data.sql | 2 -- phpBB/language/en/acp/board.php | 4 --- .../data/v400/remove_max_img_size.php | 34 +++++++++++++++++++ .../phpbb/textformatter/parser_interface.php | 2 -- phpBB/phpbb/textformatter/s9e/factory.php | 2 -- tests/text_processing/message_parser_test.php | 2 -- 9 files changed, 34 insertions(+), 18 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index d457b13cb49..959388e075c 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -260,8 +260,6 @@ function main($id, $mode) 'max_sig_urls' => array('lang' => 'MAX_SIG_URLS', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true), 'max_sig_font_size' => array('lang' => 'MAX_SIG_FONT_SIZE', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true, 'append' => ' %'), 'max_sig_smilies' => array('lang' => 'MAX_SIG_SMILIES', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true), - 'max_sig_img_width' => array('lang' => 'MAX_SIG_IMG_WIDTH', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), - 'max_sig_img_height' => array('lang' => 'MAX_SIG_IMG_HEIGHT', 'validate' => 'int:0:9999', 'type' => 'number:0:9999', 'explain' => true, 'append' => ' ' . $user->lang['PIXEL']), 'legend3' => 'ACP_SUBMIT_CHANGES', ) diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 337b6ccab81..9b381d22f8f 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1179,8 +1179,6 @@ function parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcod // Set some config values $parser->set_vars(array( 'max_font_size' => $config['max_' . $this->mode . '_font_size'], - 'max_img_height' => $config['max_' . $this->mode . '_img_height'], - 'max_img_width' => $config['max_' . $this->mode . '_img_width'], 'max_smilies' => $config['max_' . $this->mode . '_smilies'], 'max_urls' => $config['max_' . $this->mode . '_urls'] )); diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 8ab18ad8c8c..4ada12f15bf 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -406,8 +406,6 @@ function get_data() 'max_reg_attempts' => true, 'max_sig_chars' => true, 'max_sig_font_size' => true, - 'max_sig_img_height' => true, - 'max_sig_img_width' => true, 'max_sig_smilies' => true, 'max_sig_urls' => true, 'min_name_chars' => true, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 40240213d3b..8760acd6847 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -227,8 +227,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_quote_depth', INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_reg_attempts', '5'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_chars', '255'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_font_size', '200'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_height', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_img_width', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_smilies', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('max_sig_urls', '5'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('mention_batch_size', '50'); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index def1b01c608..8401f24e0a9 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -208,10 +208,6 @@ 'MAX_SIG_FONT_SIZE' => 'Maximum signature font size', 'MAX_SIG_FONT_SIZE_EXPLAIN' => 'Maximum font size allowed in user signatures. Set to 0 for unlimited size.', - 'MAX_SIG_IMG_HEIGHT' => 'Maximum signature image height', - 'MAX_SIG_IMG_HEIGHT_EXPLAIN' => 'Maximum height of an image file in user signatures. Set to 0 for unlimited height.', - 'MAX_SIG_IMG_WIDTH' => 'Maximum signature image width', - 'MAX_SIG_IMG_WIDTH_EXPLAIN' => 'Maximum width of an image file in user signatures. Set to 0 for unlimited width.', 'MAX_SIG_LENGTH' => 'Maximum signature length', 'MAX_SIG_LENGTH_EXPLAIN' => 'Maximum number of characters in user signatures.', 'MAX_SIG_SMILIES' => 'Maximum smilies per signature', diff --git a/phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php b/phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php new file mode 100644 index 00000000000..8a5338a454b --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_max_img_size.php @@ -0,0 +1,34 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_max_img_size extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function update_data(): array + { + return [ + ['config.remove', ['max_sig_img_width']], + ['config.remove', ['max_sig_img_height']], + ]; + } +} diff --git a/phpBB/phpbb/textformatter/parser_interface.php b/phpBB/phpbb/textformatter/parser_interface.php index ad611fb5b46..1430bfd5d38 100644 --- a/phpBB/phpbb/textformatter/parser_interface.php +++ b/phpBB/phpbb/textformatter/parser_interface.php @@ -91,8 +91,6 @@ public function get_errors(); * Set a variable to be used by the parser * * - max_font_size - * - max_img_height - * - max_img_width * - max_smilies * - max_urls * diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 7195f959152..79521b753ba 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -355,8 +355,6 @@ function ($m) // Register some vars with a default value. Those should be set at runtime by whatever calls // the parser $configurator->registeredVars['max_font_size'] = 0; - $configurator->registeredVars['max_img_height'] = 0; - $configurator->registeredVars['max_img_width'] = 0; // Load the Emoji plugin and modify its tag's template to obey viewsmilies $tag = $configurator->Emoji->getTag(); diff --git a/tests/text_processing/message_parser_test.php b/tests/text_processing/message_parser_test.php index 0f74eacbe6a..93c0bd6652b 100644 --- a/tests/text_processing/message_parser_test.php +++ b/tests/text_processing/message_parser_test.php @@ -40,8 +40,6 @@ protected function prepare_s9e_services($setup = null) $map = array( array('MAX_FONT_SIZE_EXCEEDED', 120, 'You may only use fonts up to size 120.'), array('MAX_FONT_SIZE_EXCEEDED', 200, 'You may only use fonts up to size 200.'), - array('MAX_IMG_HEIGHT_EXCEEDED', 12, 'Your images may only be up to 12 pixels high.'), - array('MAX_IMG_WIDTH_EXCEEDED', 34, 'Your images may only be up to 34 pixels wide.'), array('TOO_MANY_SMILIES', 3, 'Your message contains too many smilies. The maximum number of smilies allowed is 3.'), array('TOO_MANY_URLS', 2, 'Your message contains too many URLs. The maximum number of URLs allowed is 2.'), array('UNAUTHORISED_BBCODE', '[img]', 'You cannot use certain BBCodes: [img].'), From 4f4d4044e2132311d81aefae56f0e1bb58933c93 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 9 Aug 2024 22:32:23 +0200 Subject: [PATCH 0369/1214] [ticket/16777] Fix manifest test PHPBB-16777 --- tests/functional/manifest_test.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php index f100d9bdff7..2099dd76618 100644 --- a/tests/functional/manifest_test.php +++ b/tests/functional/manifest_test.php @@ -18,14 +18,16 @@ class phpbb_functional_manifest_test extends phpbb_functional_test_case { public function test_manifest() { + $url_path = preg_replace('#^(/.+)/$#', '$1', parse_url(self::$root_url, PHP_URL_PATH)); + $expected = [ 'name' => 'yourdomain.com', 'short_name' => 'yourdomain', 'display' => 'standalone', 'orientation' => 'portrait', 'dir' => 'ltr', - 'start_url' => '/', - 'scope' => '/', + 'start_url' => $url_path, + 'scope' => $url_path, ]; $this->login(); From e3a6f3d3fc4558e2b31fbadf5bd3e229555d5620 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 10 Aug 2024 21:09:32 +0200 Subject: [PATCH 0370/1214] [ticket/17379] Use correct number of predefined BBCodes in posting editor PHPBB-17379 --- phpBB/adm/style/acp_posting_buttons.html | 2 +- phpBB/includes/constants.php | 2 +- phpBB/styles/prosilver/template/posting_buttons.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/adm/style/acp_posting_buttons.html b/phpBB/adm/style/acp_posting_buttons.html index e5f96b0c223..c0c5aacd747 100644 --- a/phpBB/adm/style/acp_posting_buttons.html +++ b/phpBB/adm/style/acp_posting_buttons.html @@ -28,7 +28,7 @@ - diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index f560dbfbcb8..3304194cf42 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -174,7 +174,7 @@ // Number of core BBCodes define('NUM_CORE_BBCODES', 12); -define('NUM_PREDEFINED_BBCODES', 22); +define('NUM_PREDEFINED_BBCODES', 20); // BBCode IDs define('BBCODE_ID_QUOTE', 0); diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 096dbbe8fac..ee98cb57ce8 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -81,7 +81,7 @@ - From 9b4743c028e5037cc831ac24f5568fb0a470d652 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 21:17:52 +0100 Subject: [PATCH 0371/1214] [ticket/17382] Update the find a member FAQ text to fix grammar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updated the text of an answer on the FAQ page that explained how to search for members on the forum. Originally the text read as `Visit to the “Members” page` which is grammatically incorrect, specifically `visit to the`. PHPBB-17382 --- phpBB/{install => $install}/app.php | 0 phpBB/{install => $install}/convert/controller/convertor.php | 0 phpBB/{install => $install}/convert/convert.php | 0 phpBB/{install => $install}/convert/convertor.php | 0 phpBB/{install => $install}/convertors/convert_phpbb20.php | 0 phpBB/{install => $install}/convertors/functions_phpbb20.php | 0 phpBB/{install => $install}/data/confusables.php | 0 phpBB/{install => $install}/index.html | 0 phpBB/{install => $install}/phpbbcli.php | 0 phpBB/{install => $install}/phpinfo.php | 0 phpBB/{install => $install}/schemas/index.htm | 0 phpBB/{install => $install}/schemas/oracle_schema.sql | 0 phpBB/{install => $install}/schemas/postgres_schema.sql | 0 phpBB/{install => $install}/schemas/schema_data.sql | 0 phpBB/{install => $install}/startup.php | 0 phpBB/language/en/help/faq.php | 2 +- 16 files changed, 1 insertion(+), 1 deletion(-) rename phpBB/{install => $install}/app.php (100%) rename phpBB/{install => $install}/convert/controller/convertor.php (100%) rename phpBB/{install => $install}/convert/convert.php (100%) rename phpBB/{install => $install}/convert/convertor.php (100%) rename phpBB/{install => $install}/convertors/convert_phpbb20.php (100%) rename phpBB/{install => $install}/convertors/functions_phpbb20.php (100%) rename phpBB/{install => $install}/data/confusables.php (100%) rename phpBB/{install => $install}/index.html (100%) rename phpBB/{install => $install}/phpbbcli.php (100%) rename phpBB/{install => $install}/phpinfo.php (100%) rename phpBB/{install => $install}/schemas/index.htm (100%) rename phpBB/{install => $install}/schemas/oracle_schema.sql (100%) rename phpBB/{install => $install}/schemas/postgres_schema.sql (100%) rename phpBB/{install => $install}/schemas/schema_data.sql (100%) rename phpBB/{install => $install}/startup.php (100%) diff --git a/phpBB/install/app.php b/phpBB/$install/app.php similarity index 100% rename from phpBB/install/app.php rename to phpBB/$install/app.php diff --git a/phpBB/install/convert/controller/convertor.php b/phpBB/$install/convert/controller/convertor.php similarity index 100% rename from phpBB/install/convert/controller/convertor.php rename to phpBB/$install/convert/controller/convertor.php diff --git a/phpBB/install/convert/convert.php b/phpBB/$install/convert/convert.php similarity index 100% rename from phpBB/install/convert/convert.php rename to phpBB/$install/convert/convert.php diff --git a/phpBB/install/convert/convertor.php b/phpBB/$install/convert/convertor.php similarity index 100% rename from phpBB/install/convert/convertor.php rename to phpBB/$install/convert/convertor.php diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/$install/convertors/convert_phpbb20.php similarity index 100% rename from phpBB/install/convertors/convert_phpbb20.php rename to phpBB/$install/convertors/convert_phpbb20.php diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/$install/convertors/functions_phpbb20.php similarity index 100% rename from phpBB/install/convertors/functions_phpbb20.php rename to phpBB/$install/convertors/functions_phpbb20.php diff --git a/phpBB/install/data/confusables.php b/phpBB/$install/data/confusables.php similarity index 100% rename from phpBB/install/data/confusables.php rename to phpBB/$install/data/confusables.php diff --git a/phpBB/install/index.html b/phpBB/$install/index.html similarity index 100% rename from phpBB/install/index.html rename to phpBB/$install/index.html diff --git a/phpBB/install/phpbbcli.php b/phpBB/$install/phpbbcli.php similarity index 100% rename from phpBB/install/phpbbcli.php rename to phpBB/$install/phpbbcli.php diff --git a/phpBB/install/phpinfo.php b/phpBB/$install/phpinfo.php similarity index 100% rename from phpBB/install/phpinfo.php rename to phpBB/$install/phpinfo.php diff --git a/phpBB/install/schemas/index.htm b/phpBB/$install/schemas/index.htm similarity index 100% rename from phpBB/install/schemas/index.htm rename to phpBB/$install/schemas/index.htm diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/$install/schemas/oracle_schema.sql similarity index 100% rename from phpBB/install/schemas/oracle_schema.sql rename to phpBB/$install/schemas/oracle_schema.sql diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/$install/schemas/postgres_schema.sql similarity index 100% rename from phpBB/install/schemas/postgres_schema.sql rename to phpBB/$install/schemas/postgres_schema.sql diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/$install/schemas/schema_data.sql similarity index 100% rename from phpBB/install/schemas/schema_data.sql rename to phpBB/$install/schemas/schema_data.sql diff --git a/phpBB/install/startup.php b/phpBB/$install/startup.php similarity index 100% rename from phpBB/install/startup.php rename to phpBB/$install/startup.php diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index 6b165da0f82..aebd0938655 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -158,7 +158,7 @@ 'HELP_FAQ_SEARCH_BLANK_QUESTION' => 'Why does my search return a blank page!?', 'HELP_FAQ_SEARCH_FORUM_ANSWER' => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.', 'HELP_FAQ_SEARCH_FORUM_QUESTION' => 'How can I search a forum or forums?', - 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit to the “Members” page and click the “Find a member” link.', + 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit the members page and select the \'Find a member\' link.', 'HELP_FAQ_SEARCH_MEMBERS_QUESTION' => 'How do I search for members?', 'HELP_FAQ_SEARCH_NO_RESULT_ANSWER' => 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.', 'HELP_FAQ_SEARCH_NO_RESULT_QUESTION' => 'Why does my search return no results?', From 331bea8b22a4d1f76a87a0af662c555166fec158 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 21:21:14 +0100 Subject: [PATCH 0372/1214] [ticket/17382] Undo rename of install folder to check front-end changes! PHPBB-17382 --- phpBB/{$install => install}/app.php | 0 phpBB/{$install => install}/convert/controller/convertor.php | 0 phpBB/{$install => install}/convert/convert.php | 0 phpBB/{$install => install}/convert/convertor.php | 0 phpBB/{$install => install}/convertors/convert_phpbb20.php | 0 phpBB/{$install => install}/convertors/functions_phpbb20.php | 0 phpBB/{$install => install}/data/confusables.php | 0 phpBB/{$install => install}/index.html | 0 phpBB/{$install => install}/phpbbcli.php | 0 phpBB/{$install => install}/phpinfo.php | 0 phpBB/{$install => install}/schemas/index.htm | 0 phpBB/{$install => install}/schemas/oracle_schema.sql | 0 phpBB/{$install => install}/schemas/postgres_schema.sql | 0 phpBB/{$install => install}/schemas/schema_data.sql | 0 phpBB/{$install => install}/startup.php | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename phpBB/{$install => install}/app.php (100%) rename phpBB/{$install => install}/convert/controller/convertor.php (100%) rename phpBB/{$install => install}/convert/convert.php (100%) rename phpBB/{$install => install}/convert/convertor.php (100%) rename phpBB/{$install => install}/convertors/convert_phpbb20.php (100%) rename phpBB/{$install => install}/convertors/functions_phpbb20.php (100%) rename phpBB/{$install => install}/data/confusables.php (100%) rename phpBB/{$install => install}/index.html (100%) rename phpBB/{$install => install}/phpbbcli.php (100%) rename phpBB/{$install => install}/phpinfo.php (100%) rename phpBB/{$install => install}/schemas/index.htm (100%) rename phpBB/{$install => install}/schemas/oracle_schema.sql (100%) rename phpBB/{$install => install}/schemas/postgres_schema.sql (100%) rename phpBB/{$install => install}/schemas/schema_data.sql (100%) rename phpBB/{$install => install}/startup.php (100%) diff --git a/phpBB/$install/app.php b/phpBB/install/app.php similarity index 100% rename from phpBB/$install/app.php rename to phpBB/install/app.php diff --git a/phpBB/$install/convert/controller/convertor.php b/phpBB/install/convert/controller/convertor.php similarity index 100% rename from phpBB/$install/convert/controller/convertor.php rename to phpBB/install/convert/controller/convertor.php diff --git a/phpBB/$install/convert/convert.php b/phpBB/install/convert/convert.php similarity index 100% rename from phpBB/$install/convert/convert.php rename to phpBB/install/convert/convert.php diff --git a/phpBB/$install/convert/convertor.php b/phpBB/install/convert/convertor.php similarity index 100% rename from phpBB/$install/convert/convertor.php rename to phpBB/install/convert/convertor.php diff --git a/phpBB/$install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php similarity index 100% rename from phpBB/$install/convertors/convert_phpbb20.php rename to phpBB/install/convertors/convert_phpbb20.php diff --git a/phpBB/$install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php similarity index 100% rename from phpBB/$install/convertors/functions_phpbb20.php rename to phpBB/install/convertors/functions_phpbb20.php diff --git a/phpBB/$install/data/confusables.php b/phpBB/install/data/confusables.php similarity index 100% rename from phpBB/$install/data/confusables.php rename to phpBB/install/data/confusables.php diff --git a/phpBB/$install/index.html b/phpBB/install/index.html similarity index 100% rename from phpBB/$install/index.html rename to phpBB/install/index.html diff --git a/phpBB/$install/phpbbcli.php b/phpBB/install/phpbbcli.php similarity index 100% rename from phpBB/$install/phpbbcli.php rename to phpBB/install/phpbbcli.php diff --git a/phpBB/$install/phpinfo.php b/phpBB/install/phpinfo.php similarity index 100% rename from phpBB/$install/phpinfo.php rename to phpBB/install/phpinfo.php diff --git a/phpBB/$install/schemas/index.htm b/phpBB/install/schemas/index.htm similarity index 100% rename from phpBB/$install/schemas/index.htm rename to phpBB/install/schemas/index.htm diff --git a/phpBB/$install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql similarity index 100% rename from phpBB/$install/schemas/oracle_schema.sql rename to phpBB/install/schemas/oracle_schema.sql diff --git a/phpBB/$install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql similarity index 100% rename from phpBB/$install/schemas/postgres_schema.sql rename to phpBB/install/schemas/postgres_schema.sql diff --git a/phpBB/$install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql similarity index 100% rename from phpBB/$install/schemas/schema_data.sql rename to phpBB/install/schemas/schema_data.sql diff --git a/phpBB/$install/startup.php b/phpBB/install/startup.php similarity index 100% rename from phpBB/$install/startup.php rename to phpBB/install/startup.php From 629a909b6559bad4da63ebc4b98252e1cf13442f Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 13 Aug 2024 15:33:18 +0700 Subject: [PATCH 0373/1214] [ticket/17359] Adjust template event target phpBB version PHPBB-17359 --- phpBB/docs/events.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index c0f313f540b..2578c967abe 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -73,13 +73,13 @@ acp_ext_details_notice acp_ext_list_available_name_after === * Location: adm/style/acp_ext_list.html -* Since: 3.1.13-RC1 +* Since: 3.3.14-RC1 * Purpose: Add content after the name of available extensions in the list acp_ext_list_available_title_after === * Location: adm/style/acp_ext_list.html -* Since: 3.1.13-RC1 +* Since: 3.3.14-RC1 * Purpose: Add text after available extensions section title. acp_ext_list_disabled_name_after From 6d0a965db25b6c479967f6879827702586cab6c2 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 15 Aug 2024 23:47:37 +0700 Subject: [PATCH 0374/1214] [ticket/17383] Fix HELO/EHLO error in email messenger on PHP8 PHPBB-17383 --- phpBB/includes/functions_messenger.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index f25ce82b8fa..52ac89957c0 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1428,7 +1428,7 @@ function log_into_server($hostname, $username, $password, $default_auth_method) if (($addr = @gethostbyname($local_host)) !== $local_host) { // Able to resolve IP back to name - if (($name = @gethostbyaddr($addr)) !== $addr) + if (!empty($name = @gethostbyaddr($addr)) && $name !== $addr) { $local_host = $name; } From cc4579ee043e6b71b878ad1d5ce0448757abfca2 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 16 Aug 2024 00:30:40 +0700 Subject: [PATCH 0375/1214] [ticket/17383] Validate php_uname() output too PHPBB-17383 --- phpBB/includes/functions_messenger.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 52ac89957c0..6781ec4e0fb 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1418,12 +1418,8 @@ function log_into_server($hostname, $username, $password, $default_auth_method) global $user; // Here we try to determine the *real* hostname (reverse DNS entry preferrably) - $local_host = $user->host; - - if (function_exists('php_uname')) + if (function_exists('php_uname') && !empty($local_host = php_uname('n'))) { - $local_host = php_uname('n'); - // Able to resolve name to IP if (($addr = @gethostbyname($local_host)) !== $local_host) { @@ -1434,6 +1430,10 @@ function log_into_server($hostname, $username, $password, $default_auth_method) } } } + else + { + $local_host = $user->host; + } // If we are authenticating through pop-before-smtp, we // have to login ones before we get authenticated From 45515b707240e672bc1fb64082c7114506529daf Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 18 Aug 2024 18:08:42 +0700 Subject: [PATCH 0376/1214] [ticket/17384] Handle E_USER_ERROR for PHP 8.4 tests PHPBB-17384 --- tests/test_framework/phpbb_test_case.php | 29 ++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php index 726f6671ae9..cd71fcaf289 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -35,6 +35,8 @@ public function __construct($name = NULL, array $data = array(), $dataName = '') 'phpbb_database_test_case' => ['already_connected', 'last_post_timestamp'], ]; $this->excludeBackupStaticAttributes($backupStaticAttributesBlacklist); + + set_error_handler([$this, 'trigger_error_callback']); } public function get_test_case_helpers() @@ -135,4 +137,31 @@ public static function assertFileNotExists(string $filename, string $message = ' parent::assertFileNotExists($filename, $message); } } + + /** + * Passing E_USER_ERROR to trigger_error() is deprecated as of PHP 8.4, so it causes E_DEPRECATED + * Use trigger_error() callback function to workaround this by handling E_USER_ERROR and suppressing E_DEPRECATED + * "Passing E_USER_ERROR to trigger_error() is deprecated since 8.4, throw an exception or call exit with a string message instead" + * + */ + public function trigger_error_callback($errno, $errstr, $errfile, $errline) + { + // $errstr may need to be escaped + $errstr = htmlspecialchars($errstr); + + switch ($errno) { + case E_USER_ERROR: + echo $errstr; + exit(); + break; + + case E_DEPRECATED: + return true; + break; + + default: + return false; + break; + } + } } From 53c60419b44adff896150e2822737e5e01a3edac Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Aug 2024 20:09:41 +0200 Subject: [PATCH 0377/1214] [prep-release-3.3.13] Update version numbers to 3.3.13 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 8dbe2f5f210..0f8630d2aa7 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 5576aeb0b02..dfe4d2a43c4 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.13-RC1'); +@define('PHPBB_VERSION', '3.3.13'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 95802ddf17b..f22a878adde 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.13-RC1'); +define('PHPBB_VERSION', '3.3.13'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 714ce05d062..cb757e48112 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.13'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 88243d296cb6cfef6315fb0f3995d4588ea39b40 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Aug 2024 20:12:25 +0200 Subject: [PATCH 0378/1214] [prep-release-3.3.13] Add migration for 3.3.13 --- phpBB/phpbb/db/migration/data/v33x/v3313.php | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3313.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3313.php b/phpBB/phpbb/db/migration/data/v33x/v3313.php new file mode 100644 index 00000000000..a133213c814 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3313.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3313 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.13', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3313rc1', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.13']], + ]; + } +} From b083e223e29f7f7b728294cb0598d087fbab1252 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 28 Aug 2024 20:18:39 +0200 Subject: [PATCH 0379/1214] [prep-release-3.3.13] Update changelog for 3.3.13 --- phpBB/docs/CHANGELOG.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 67aad9177ee..39d7897d5e6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

          Changelog

          1. Changelog
              +
            • Changes since 3.3.13-RC1
            • Changes since 3.3.12
            • Changes since 3.3.12-RC1
            • Changes since 3.3.11
              • @@ -170,6 +171,12 @@

              Changelog

              +

              Changes since 3.3.13-RC1

              +

              Bug

              +
                +
              • [PHPBB-17377] - MSSQL builds on GitHub actions broken
                • +
              +

              Changes since 3.3.12

              Bug

                From 92730af7a434dc0476c96da51ff308dcc4fb241a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 31 Aug 2024 08:59:57 +0200 Subject: [PATCH 0380/1214] [ticket/17384] Stop overriding error handler in test case PHPBB-17384 --- tests/test_framework/phpbb_test_case.php | 29 ------------------------ 1 file changed, 29 deletions(-) diff --git a/tests/test_framework/phpbb_test_case.php b/tests/test_framework/phpbb_test_case.php index cd71fcaf289..726f6671ae9 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -35,8 +35,6 @@ public function __construct($name = NULL, array $data = array(), $dataName = '') 'phpbb_database_test_case' => ['already_connected', 'last_post_timestamp'], ]; $this->excludeBackupStaticAttributes($backupStaticAttributesBlacklist); - - set_error_handler([$this, 'trigger_error_callback']); } public function get_test_case_helpers() @@ -137,31 +135,4 @@ public static function assertFileNotExists(string $filename, string $message = ' parent::assertFileNotExists($filename, $message); } } - - /** - * Passing E_USER_ERROR to trigger_error() is deprecated as of PHP 8.4, so it causes E_DEPRECATED - * Use trigger_error() callback function to workaround this by handling E_USER_ERROR and suppressing E_DEPRECATED - * "Passing E_USER_ERROR to trigger_error() is deprecated since 8.4, throw an exception or call exit with a string message instead" - * - */ - public function trigger_error_callback($errno, $errstr, $errfile, $errline) - { - // $errstr may need to be escaped - $errstr = htmlspecialchars($errstr); - - switch ($errno) { - case E_USER_ERROR: - echo $errstr; - exit(); - break; - - case E_DEPRECATED: - return true; - break; - - default: - return false; - break; - } - } } From 85f7ffb58557a3c7d8cc4c0199d35d3c6e815574 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 31 Aug 2024 09:02:53 +0200 Subject: [PATCH 0381/1214] [ticket/17384] Ignore deprecated notices in test case error handler PHPBB-17384 --- tests/test_framework/phpbb_test_case_helpers.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index 466be97d4c0..3bb279c25fe 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -104,7 +104,7 @@ public function restore_original_ext_dir() } } - public function setExpectedTriggerError($errno, $message = '') + public function setExpectedTriggerError($errno, $message = ''): void { set_error_handler( static function ($errno, $errstr) @@ -112,7 +112,7 @@ static function ($errno, $errstr) restore_error_handler(); throw new Exception($errstr, $errno); }, - E_ALL + E_ALL ^ E_DEPRECATED ); $this->expectedTriggerError = true; From 76752800c28a0ceb0d0fdf1dd61e28d9a0868302 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 30 Aug 2024 22:07:54 +0700 Subject: [PATCH 0382/1214] [ticket/17386] Fix resulting permission for user-based tracing PHPBB-17386 --- phpBB/phpbb/auth/auth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/auth/auth.php b/phpBB/phpbb/auth/auth.php index 208b2aff751..4a8ccb4a660 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -776,7 +776,7 @@ function acl_group_raw_data($group_id = false, $opts = false, $forum_id = false) $sql_group = ($group_id !== false) ? ((!is_array($group_id)) ? 'group_id = ' . (int) $group_id : $db->sql_in_set('group_id', array_map('intval', $group_id))) : ''; $sql_forum = ($forum_id !== false) ? ((!is_array($forum_id)) ? 'AND a.forum_id = ' . (int) $forum_id : 'AND ' . $db->sql_in_set('a.forum_id', array_map('intval', $forum_id))) : ''; - $sql_is_local = $forum_id !== false ? 'AND ao.is_local <> 0' : ''; + $sql_is_local = !empty($forum_id) ? 'AND ao.is_local <> 0' : ''; $sql_opts = ''; $hold_ary = $sql_ary = array(); From 03f315f7b7ccb7908992d207f86fe10975517acf Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 30 Aug 2024 23:06:02 +0700 Subject: [PATCH 0383/1214] [ticket/17386] Add test PHPBB-17386 --- tests/functional/acp_permissions_test.php | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php index 92980dbfd7f..fbcfa1ab241 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -149,4 +149,26 @@ public function test_forum_permissions_misc() $this->assertContainsLang('ACL_M_EDIT', $page_text); $this->assertContainsLang('ACL_M_MOVE', $page_text); } + + public function test_tracing_user_based_permissions() + { + $this->create_user('newlyregistereduser'); + + // Open user-based permissions masks page + $crawler = self::request('GET', "adm/index.php?i=acp_permissions&icat=16&mode=view_user_global&sid=" . $this->sid); + + // Select newlyregistereduser + $form = $crawler->filter('#add_user')->form(['username' => ['newlyregistereduser']]); + $crawler = self::submit($form); + + // Test 1st "Yes" permission tracing result match + $trace_link_yes = $crawler->filter('td.yes')->eq(0)->parents()->eq(0)->filter('a.trace')->link(); + $crawler_trace_yes = self::$client->click($trace_link_yes); + $this->assertEquals(1, $crawler_trace_yes->filter('tr.row2 > td.yes')->count()); + + // Test 1st "Never" permission tracing result match + $trace_link_never = $crawler->filter('td.never')->eq(0)->parents()->eq(0)->filter('a.trace')->link(); + $crawler_trace_never = self::$client->click($trace_link_never); + $this->assertEquals(1, $crawler_trace_never->filter('tr.row2 > td.never')->count()); + } } From a7b673a1b60ad477d19ae0607f4d46e804ea831c Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 31 Aug 2024 23:21:33 +0700 Subject: [PATCH 0384/1214] [ticket/17387] Fix PHP warnings in search results PHPBB-17387 --- phpBB/includes/functions_content.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 2e52863ef0a..3dded3c6e93 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -400,16 +400,14 @@ function get_context(string $text, array $words, int $length = 400): string $fragment_end = $end - $start + 1; // Find the first valid alphanumeric character in the fragment to don't cut words - if ($start > 0) + if ($start > 0 && preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) { - preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); $fragment_start = (int) $matches[0][1] + 1; // first valid alphanumeric character } // Find the last valid alphanumeric character in the fragment to don't cut words - if ($end < $text_length - 1) + if ($end < $text_length - 1 && preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) { - preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE); $fragment_end = end($matches[0])[1]; // last valid alphanumeric character } From 7c4b6cde8bba3f8495436bb8c55218ebc6232879 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 1 Sep 2024 23:04:33 +0700 Subject: [PATCH 0385/1214] [ticket/17386] Fix user based permissions test PHPBB-17386 --- tests/functional/acp_permissions_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/acp_permissions_test.php b/tests/functional/acp_permissions_test.php index fbcfa1ab241..39ecbf99e28 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -162,12 +162,12 @@ public function test_tracing_user_based_permissions() $crawler = self::submit($form); // Test 1st "Yes" permission tracing result match - $trace_link_yes = $crawler->filter('td.yes')->eq(0)->parents()->eq(0)->filter('a.trace')->link(); + $trace_link_yes = $crawler->filter('td.yes')->eq(0)->siblings()->filter('th > a.trace')->link(); $crawler_trace_yes = self::$client->click($trace_link_yes); $this->assertEquals(1, $crawler_trace_yes->filter('tr.row2 > td.yes')->count()); // Test 1st "Never" permission tracing result match - $trace_link_never = $crawler->filter('td.never')->eq(0)->parents()->eq(0)->filter('a.trace')->link(); + $trace_link_never = $crawler->filter('td.never')->eq(0)->siblings()->filter('th > a.trace')->link(); $crawler_trace_never = self::$client->click($trace_link_never); $this->assertEquals(1, $crawler_trace_never->filter('tr.row2 > td.never')->count()); } From 8acba2db024aa2a2c96037db65fbaab8f82aa1c8 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 1 Sep 2024 22:31:22 +0700 Subject: [PATCH 0386/1214] [ticket/17387] Return entire post text for zero or negative length value In according to 'Default number of returned characters' setting ACP explanation `A value of 0 will return the entire post`. Do the same for negative values too PHPBB-17387 --- phpBB/includes/functions_content.php | 4 ++-- tests/functions_content/get_context_test.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 3dded3c6e93..a2038d12a69 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -329,10 +329,10 @@ function get_context(string $text, array $words, int $length = 400): string { if ($length <= 0) { - return '...'; + return $text; } - // we need to turn the entities back into their original form, to not cut the message in between them + // We need to turn the entities back into their original form, to not cut the message in between them $text = html_entity_decode($text); // Replace all spaces/invisible characters with single spaces diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index 59f6cdf8469..be8618dd8a8 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -81,13 +81,13 @@ public function data_get_context(): array 'text' => 'This is a sample text.', 'words' => ['sample'], 'length' => 0, - 'expected' => '...', + 'expected' => 'This is a sample text.', ], 'negative length' => [ 'text' => 'This is a sample text.', 'words' => ['sample'], 'length' => -10, - 'expected' => '...', + 'expected' => 'This is a sample text.', ], 'ellipses_beginning' => [ 'text' => 'foo foo foo foo foo foo foo foo bar', From 66b6a5e1f396c5f6150fe8301ae8afaeb0255720 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 2 Sep 2024 17:46:16 +0700 Subject: [PATCH 0387/1214] [ticket/17387] Make regex match unicode characters PHPBB-17387 --- phpBB/includes/functions_content.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index a2038d12a69..d24f9382384 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -400,13 +400,13 @@ function get_context(string $text, array $words, int $length = 400): string $fragment_end = $end - $start + 1; // Find the first valid alphanumeric character in the fragment to don't cut words - if ($start > 0 && preg_match('/[^a-zA-Z0-9][a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) + if ($start > 0 && preg_match('/[^\p{L}\p{N}][\p{L}\p{N}]/ui', $fragment, $matches, PREG_OFFSET_CAPTURE)) { $fragment_start = (int) $matches[0][1] + 1; // first valid alphanumeric character } // Find the last valid alphanumeric character in the fragment to don't cut words - if ($end < $text_length - 1 && preg_match_all('/[a-zA-Z0-9][^a-zA-Z0-9]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) + if ($end < $text_length - 1 && preg_match_all('/[\p{L}\p{N}][^\p{L}\p{N}]/ui', $fragment, $matches, PREG_OFFSET_CAPTURE)) { $fragment_end = end($matches[0])[1]; // last valid alphanumeric character } From 472b36877c5c95bfdbf603ee3dd35f6c1be7085c Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 2 Sep 2024 13:52:46 +0200 Subject: [PATCH 0388/1214] [ticket/17387] Add test for when words are separated by a non-space character PHPBB-17387 --- phpBB/includes/functions_content.php | 4 ++-- tests/functions_content/get_context_test.php | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index d24f9382384..cdbc4aee094 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -333,7 +333,7 @@ function get_context(string $text, array $words, int $length = 400): string } // We need to turn the entities back into their original form, to not cut the message in between them - $text = html_entity_decode($text); + $text = htmlspecialchars_decode($text); // Replace all spaces/invisible characters with single spaces $text = preg_replace("/\s+/u", ' ', $text); @@ -414,7 +414,7 @@ function get_context(string $text, array $words, int $length = 400): string $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } - return ($fragments[0][0] !== 0 ? '... ' : '') . htmlentities(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); + return ($fragments[0][0] !== 0 ? '... ' : '') . htmlspecialchars(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index be8618dd8a8..d4d087d675d 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -112,6 +112,12 @@ public function data_get_context(): array 'words' => ['word1', 'word2'], 'length' => 10, 'expected' => 'word1 ... word2', + ], + 'fruits_spanish' => [ + 'text' => 'Manzana,plátano,naranja,fresa,mango,uva,piña,pera,kiwi,cereza,sandía,melón,papaya,arándano,durazno', + 'words' => ['piña'], + 'length' => 20, + 'expected' => '... uva,piña,pera, ...', ] ]; } From 1c73b7ab19307b6b74143c20255eda8704b95104 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 2 Sep 2024 17:13:49 +0100 Subject: [PATCH 0389/1214] [ticket/17390] Fix unset template variable for topic approval in mcp Fixes a bug that was introduced in 558b8ae whereby a template variable was added to wrap around the approve / disapprove UI however that variable was not set in mcp_queue so the check failed every time meaning you couldn't approve from the MCP. PHPBB-17390 --- phpBB/includes/mcp/mcp_queue.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index b184fb901a4..d16e8c74154 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -284,6 +284,7 @@ public function main($id, $mode) $post_data = array( 'S_MCP_QUEUE' => true, 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p=$post_id"), + 'S_CAN_APPROVE' => $auth->acl_get('m_approve', $post_info['forum_id']), 'S_CAN_DELETE_POST' => $auth->acl_get('m_delete', $post_info['forum_id']), 'S_CAN_VIEWIP' => $auth->acl_get('m_info', $post_info['forum_id']), 'S_POST_REPORTED' => $post_info['post_reported'], From c26ded6025643f78cf39f2a530f186fe1b4923b8 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 2 Sep 2024 22:26:58 +0700 Subject: [PATCH 0390/1214] [ticket/17387] Fix handling unicode strings PHPBB-17387 --- phpBB/includes/functions_content.php | 13 ++++++------- tests/functions_content/get_context_test.php | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index cdbc4aee094..9034f785ff3 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -336,7 +336,7 @@ function get_context(string $text, array $words, int $length = 400): string $text = htmlspecialchars_decode($text); // Replace all spaces/invisible characters with single spaces - $text = preg_replace("/\s+/u", ' ', $text); + $text = preg_replace("/[\p{Z}\h\v]+/u", ' ', $text); $text_length = utf8_strlen($text); @@ -351,7 +351,6 @@ function get_context(string $text, array $words, int $length = 400): string $word_indexes[$pos] = $word; } } - if (!empty($word_indexes)) { ksort($word_indexes); @@ -400,21 +399,21 @@ function get_context(string $text, array $words, int $length = 400): string $fragment_end = $end - $start + 1; // Find the first valid alphanumeric character in the fragment to don't cut words - if ($start > 0 && preg_match('/[^\p{L}\p{N}][\p{L}\p{N}]/ui', $fragment, $matches, PREG_OFFSET_CAPTURE)) + if ($start > 0 && preg_match('/[^\p{L}\p{N}][\p{L}\p{N}]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) { - $fragment_start = (int) $matches[0][1] + 1; // first valid alphanumeric character + $fragment_start = mb_strlen(substr($fragment, 0, (int) $matches[0][1])) + 1; } // Find the last valid alphanumeric character in the fragment to don't cut words - if ($end < $text_length - 1 && preg_match_all('/[\p{L}\p{N}][^\p{L}\p{N}]/ui', $fragment, $matches, PREG_OFFSET_CAPTURE)) + if ($end < $text_length - 1 && preg_match_all('/[\p{L}\p{N}][^\p{L}\p{N}]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) { - $fragment_end = end($matches[0])[1]; // last valid alphanumeric character + $fragment_end = mb_strlen(substr($fragment, 0, end($matches[0])[1])); } $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); } - return ($fragments[0][0] !== 0 ? '... ' : '') . htmlspecialchars(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); + return ($fragments[0][0] !== 0 ? '... ' : '') . utf8_htmlspecialchars(implode(' ... ', $output)) . ($end < $text_length - 1 ? ' ...' : ''); } /** diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index d4d087d675d..93136d69fb4 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -117,7 +117,7 @@ public function data_get_context(): array 'text' => 'Manzana,plátano,naranja,fresa,mango,uva,piña,pera,kiwi,cereza,sandía,melón,papaya,arándano,durazno', 'words' => ['piña'], 'length' => 20, - 'expected' => '... uva,piña,pera, ...', + 'expected' => '... uva,piña,pera ...', ] ]; } From 544e0900e6d8aa24a302f5d80a9325af589bdcf8 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 3 Sep 2024 00:04:25 +0700 Subject: [PATCH 0391/1214] [ticket/17387] Add more unicode tests PHPBB-17387 --- phpBB/includes/functions_content.php | 4 +- tests/functions_content/get_context_test.php | 102 +++++++++++++++++++ 2 files changed, 104 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 9034f785ff3..d50a515c870 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -401,13 +401,13 @@ function get_context(string $text, array $words, int $length = 400): string // Find the first valid alphanumeric character in the fragment to don't cut words if ($start > 0 && preg_match('/[^\p{L}\p{N}][\p{L}\p{N}]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) { - $fragment_start = mb_strlen(substr($fragment, 0, (int) $matches[0][1])) + 1; + $fragment_start = utf8_strlen(substr($fragment, 0, (int) $matches[0][1])) + 1; } // Find the last valid alphanumeric character in the fragment to don't cut words if ($end < $text_length - 1 && preg_match_all('/[\p{L}\p{N}][^\p{L}\p{N}]/u', $fragment, $matches, PREG_OFFSET_CAPTURE)) { - $fragment_end = mb_strlen(substr($fragment, 0, end($matches[0])[1])); + $fragment_end = utf8_strlen(substr($fragment, 0, end($matches[0])[1])); } $output[] = utf8_substr($fragment, $fragment_start, $fragment_end - $fragment_start + 1); diff --git a/tests/functions_content/get_context_test.php b/tests/functions_content/get_context_test.php index 93136d69fb4..f2865f31ee6 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -113,6 +113,107 @@ public function data_get_context(): array 'length' => 10, 'expected' => 'word1 ... word2', ], + ]; + } + + /** + * Data provider for unicode get_context test cases. + * + * @return array + */ + public function data_get_context_unicode(): array + { + return [ + 'text contains words and length greater than text' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова, включая пример, текст и слова.', + 'words' => ['пример', 'слова'], + 'length' => 100, + 'expected' => 'Это пример текста, содержащего разнообразные слова, включая пример, текст и слова.', + ], + 'text contains words and length less than text' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова, включая шаблон, текст и слова.', + 'words' => ['пример', 'слова'], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова ...', + ], + 'text does not contain words' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова, но ни одно из них не совпадает с искомыми.', + 'words' => ['nonexistent'], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова ...', + ], + 'desired length equal to text length' => [ + 'text' => 'Текст точной длины.', + 'words' => ['Текст', 'точной'], + 'length' => 19, + 'expected' => 'Текст точной длины.', + ], + 'text with html entities' => [ + 'text' => 'Это пример текста, содержащего & и < и > лексемы.', + 'words' => ['пример', 'содержащего'], + 'length' => 40, + 'expected' => 'Это пример текста, содержащего & и < и ...', + ], + 'text with html entities and contains last word' => [ + 'text' => 'Это пример текста, содержащего & и < и > лексемы.', + 'words' => ['пример', 'лексемы'], + 'length' => 40, + 'expected' => 'Это пример текста ... и < и > лексемы.', + ], + 'text with multiple spaces and special characters' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова.', + 'words' => ['пример', 'разнообразные'], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова.', + ], + 'empty text' => [ + 'text' => '', + 'words' => ['пример', 'слова'], + 'length' => 50, + 'expected' => '', + ], + 'empty words array' => [ + 'text' => 'Это пример текста, содержащего разнообразные слова.', + 'words' => [], + 'length' => 50, + 'expected' => 'Это пример текста, содержащего разнообразные слова.', + ], + 'zero length' => [ + 'text' => 'Это пример текста.', + 'words' => ['пример'], + 'length' => 0, + 'expected' => 'Это пример текста.', + ], + 'negative length' => [ + 'text' => 'Это пример текста.', + 'words' => ['sample'], + 'length' => -10, + 'expected' => 'Это пример текста.', + ], + 'ellipses_beginning' => [ + 'text' => 'раз раз раз раз раз раз раз раз два', + 'words' => ['два'], + 'length' => 10, + 'expected' => '... раз раз два', + ], + 'ellipsis_end' => [ + 'text' => 'два раз раз раз раз раз раз раз раз', + 'words' => ['два'], + 'length' => 10, + 'expected' => 'два раз раз ...', + ], + 'ellipsis_middle' => [ + 'text' => 'раз слово1 раз раз раз раз раз раз раз раз раз слово2 раз', + 'words' => ['слово1', 'слово2'], + 'length' => 15, + 'expected' => '... слово1 ... слово2 ...', + ], + 'ellipsis_middle2' => [ + 'text' => 'слово1 foo foo foo foo foo foo foo foo foo слово2', + 'words' => ['слово1', 'слово2'], + 'length' => 10, + 'expected' => 'слово1 ... слово2', + ], 'fruits_spanish' => [ 'text' => 'Manzana,plátano,naranja,fresa,mango,uva,piña,pera,kiwi,cereza,sandía,melón,papaya,arándano,durazno', 'words' => ['piña'], @@ -124,6 +225,7 @@ public function data_get_context(): array /** * @dataProvider data_get_context + * @dataProvider data_get_context_unicode */ public function test_get_context($text, $words, $length, $expected) { From f7d16fc6266597d8960072ad6b7f2b090f52b89d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:04:34 +0200 Subject: [PATCH 0392/1214] [ticket/12479] Convert file_downloader to use guzzle instead of fsockopen PHPBB-12479 --- phpBB/phpbb/file_downloader.php | 138 ++++++----- tests/version/version_helper_remote_test.php | 247 ++++++++++++++++++- 2 files changed, 326 insertions(+), 59 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index f55b825d2d3..b165198399b 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -13,91 +13,117 @@ namespace phpbb; +use GuzzleHttp\Client; +use GuzzleHttp\Exception\RequestException ; +use phpbb\exception\runtime_exception; +use function Amp\Promise\rethrow; + class file_downloader { + const OK = 200; + const NOT_FOUND = 404; + const REQUEST_TIMEOUT = 408; + /** @var string Error string */ protected $error_string = ''; /** @var int Error number */ protected $error_number = 0; + /** + * Create new guzzle client + * + * @param string $host + * @param int $port + * @param int $timeout + * + * @return Client + */ + protected function create_client(string $host, int $port = 443, int $timeout = 6): Client + { + // Only set URL scheme if not specified in URL + $url_parts = parse_url($host); + if (!isset($url_parts['scheme'])) + { + $host = (($port === 443) ? 'https://' : 'http://') . $host; + } + + // Initialize Guzzle client + return new Client([ + 'base_uri' => $host, + 'timeout' => $timeout, + ]); + } + /** * Retrieve contents from remotely stored file * - * @param string $host File host - * @param string $directory Directory file is in - * @param string $filename Filename of file to retrieve - * @param int $port Port to connect to; default: 80 - * @param int $timeout Connection timeout in seconds; default: 6 + * @param string $host File host + * @param string $directory Directory file is in + * @param string $filename Filename of file to retrieve + * @param int $port Port to connect to; default: 80 + * @param int $timeout Connection timeout in seconds; default: 6 * - * @return mixed File data as string if file can be read and there is no - * timeout, false if there were errors or the connection timed out + * @return false|string File data as string if file can be read and there is no + * timeout, false if there were errors or the connection timed out * - * @throws \phpbb\exception\runtime_exception If data can't be retrieved and no error - * message is returned + * @throws runtime_exception If data can't be retrieved and no error + * message is returned */ - public function get($host, $directory, $filename, $port = 80, $timeout = 6) + public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6) { + // Initialize Guzzle client + $client = $this->create_client($host, $port, $timeout); + // Set default values for error variables $this->error_number = 0; $this->error_string = ''; - if (function_exists('fsockopen') && - $socket = @fsockopen(($port == 443 ? 'ssl://' : '') . $host, $port, $this->error_number, $this->error_string, $timeout) - ) + try { - @fputs($socket, "GET $directory/$filename HTTP/1.0\r\n"); - @fputs($socket, "HOST: $host\r\n"); - @fputs($socket, "Connection: close\r\n\r\n"); - - $timer_stop = time() + $timeout; - stream_set_timeout($socket, $timeout); + $response = $client->request('GET', "$directory/$filename"); - $file_info = ''; - $get_info = false; - - while (!@feof($socket)) + // Check if the response status code is 200 (OK) + if ($response->getStatusCode() == self::OK) { - if ($get_info) - { - $file_info .= @fread($socket, 1024); - } - else - { - $line = @fgets($socket, 1024); - if ($line == "\r\n") - { - $get_info = true; - } - else if (stripos($line, '404 not found') !== false) - { - throw new \phpbb\exception\runtime_exception('FILE_NOT_FOUND', array($filename)); - } - } - - $stream_meta_data = stream_get_meta_data($socket); - - if (!empty($stream_meta_data['timed_out']) || time() >= $timer_stop) - { - throw new \phpbb\exception\runtime_exception('FSOCK_TIMEOUT'); - } + return $response->getBody()->getContents(); + } + else + { + $this->error_number = $response->getStatusCode(); + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); } - @fclose($socket); } - else + catch (RequestException $exception) { - if ($this->error_string) + if ($exception->hasResponse()) { - $this->error_string = utf8_convert_message($this->error_string); - return false; + $this->error_number = $exception->getResponse()->getStatusCode(); + + if ($this->error_number == self::NOT_FOUND) + { + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); + } } else { - throw new \phpbb\exception\runtime_exception('FSOCK_DISABLED'); + $this->error_number = self::REQUEST_TIMEOUT; + throw new runtime_exception('FSOCK_TIMEOUT'); } - } - return $file_info; + $this->error_string = utf8_convert_message($exception->getMessage()); + return false; + } + catch (runtime_exception $exception) + { + // Rethrow runtime_exceptions, only handle unknown cases below + throw $exception; + } + catch (\Throwable $exception) + { + $this->error_string = utf8_convert_message($exception->getMessage()); + throw new runtime_exception('FSOCK_DISABLED'); + } } /** @@ -105,7 +131,7 @@ public function get($host, $directory, $filename, $port = 80, $timeout = 6) * * @return string Error string */ - public function get_error_string() + public function get_error_string(): string { return $this->error_string; } @@ -115,7 +141,7 @@ public function get_error_string() * * @return int Error number */ - public function get_error_number() + public function get_error_number(): int { return $this->error_number; } diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index 762493986a6..ce2d110fdc3 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -1,4 +1,7 @@ method('get') ->with($this->anything()) ->will($this->returnValue(false)); - $this->file_downloader = new phpbb_mock_file_downloader(); + + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->addMethods(['set_data']) + ->onlyMethods(['request']) + ->getMock(); + $this->guzzle_mock->method('set_data') + ->will($this->returnCallback(function($data) + { + $this->guzzle_data = $data; + } + )); + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response($this->guzzle_status, [], $this->guzzle_data); + } + )); + + $this->file_downloader = $this->getMockBuilder('\phpbb\file_downloader') + ->onlyMethods(['create_client']) + ->getMock(); + $this->file_downloader->method('create_client') + ->will($this->returnValue($this->guzzle_mock)); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); @@ -202,7 +232,7 @@ public function provider_get_versions() */ public function test_get_versions($input, $valid_data, $expected_return = '', $expected_exception = '') { - $this->file_downloader->set($input); + $this->guzzle_mock->set_data($input); // version_helper->get_versions() doesn't return a value on VERSIONCHECK_FAIL but only throws exception // so the $return is undefined. Define it here @@ -213,7 +243,7 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e try { $return = $this->version_helper->get_versions(); } catch (\phpbb\exception\runtime_exception $e) { - $this->assertEquals((string)$e->getMessage(), $expected_exception); + $this->assertEquals($expected_exception, $e->getMessage()); } } else @@ -223,4 +253,215 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e $this->assertEquals($expected_return, $return); } + + public function test_version_phpbb_com() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response(200, [], file_get_contents(__DIR__ . '/fixture/30x.txt')); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $hostname = 'version.phpbb.com'; + + if (!checkdnsrr($hostname, 'A')) + { + $this->markTestSkipped(sprintf( + 'Could not find a DNS record for hostname %s. ' . + 'Assuming network is down.', + $hostname + )); + } + + $file = $file_downloader->get($hostname, '/phpbb', '30x.txt'); + $errstr = $file_downloader->get_error_string(); + $errno = $file_downloader->get_error_number(); + + $this->assertNotEquals( + 0, + strlen($file), + 'Failed asserting that the response is not empty.' + ); + + $this->assertSame( + '', + $errstr, + 'Failed asserting that the error string is empty.' + ); + + $this->assertSame( + 0, + $errno, + 'Failed asserting that the error number is 0 (i.e. no error occurred).' + ); + + $lines = explode("\n", $file); + + $this->assertGreaterThanOrEqual( + 2, + count($lines), + 'Failed asserting that the version file has at least two lines.' + ); + + $this->assertStringStartsWith( + '3.', + $lines[0], + "Failed asserting that the first line of the version file starts with '3.'" + ); + + $this->assertNotSame( + false, + filter_var($lines[1], FILTER_VALIDATE_URL), + 'Failed asserting that the second line of the version file is a valid URL.' + ); + + $this->assertStringContainsString('http', $lines[1]); + $this->assertStringContainsString('phpbb.com', $lines[1], '', true); + } + + public function test_file_downloader_file_not_found() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function() + { + return new \GuzzleHttp\Psr7\Response(404, [], ''); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FILE_NOT_FOUND'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_not_found() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + $response = new \GuzzleHttp\Psr7\Response(404, [], ''); + throw new RequestException('FILE_NOT_FOUND', $request, $response); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FILE_NOT_FOUND'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_moved() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + $response = new \GuzzleHttp\Psr7\Response(302, [], ''); + throw new RequestException('FILE_MOVED', $request, $response); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->assertFalse($file_downloader->get('foo.com', 'bar', 'foo.txt')); + $this->assertEquals(302, $file_downloader->get_error_number()); + $this->assertEquals('FILE_MOVED', $file_downloader->get_error_string()); + } + + public function test_file_downloader_exception_timeout() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + $request = new \GuzzleHttp\Psr7\Request('GET', $uri); + throw new RequestException('FILE_NOT_FOUND', $request); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FSOCK_TIMEOUT'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } + + public function test_file_downloader_exception_other() + { + $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + ->onlyMethods(['request']) + ->getMock(); + + $this->guzzle_mock->method('request') + ->will($this->returnCallback(function($method, $uri) + { + throw new \RuntimeException('FSOCK_NOT_SUPPORTED'); + } + )); + + $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) + ->onlyMethods(['create_client']) + ->getMock(); + + $file_downloader->method('create_client') + ->willReturn($this->guzzle_mock); + + $this->expectException(\phpbb\exception\runtime_exception::class); + $this->expectExceptionMessage('FSOCK_DISABLED'); + + $file_downloader->get('foo.com', 'bar', 'foo.txt'); + } } From d844f82f5669ebb1251275dcb0d1f3702c812db6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:05:54 +0200 Subject: [PATCH 0393/1214] [ticket/12479] Remove dns check from test as we don't test against host anymore PHPBB-12479 --- tests/version/version_helper_remote_test.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index ce2d110fdc3..1687abed7f5 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -276,15 +276,6 @@ public function test_version_phpbb_com() $hostname = 'version.phpbb.com'; - if (!checkdnsrr($hostname, 'A')) - { - $this->markTestSkipped(sprintf( - 'Could not find a DNS record for hostname %s. ' . - 'Assuming network is down.', - $hostname - )); - } - $file = $file_downloader->get($hostname, '/phpbb', '30x.txt'); $errstr = $file_downloader->get_error_string(); $errno = $file_downloader->get_error_number(); From 929013388f408cd3b1df15382c65c64a9ee50bea Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:06:48 +0200 Subject: [PATCH 0394/1214] [ticket/12479] Fix use statements in file_downloader PHPBB-12479 --- phpBB/phpbb/file_downloader.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index b165198399b..e10bef1e03a 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -14,9 +14,8 @@ namespace phpbb; use GuzzleHttp\Client; -use GuzzleHttp\Exception\RequestException ; +use GuzzleHttp\Exception\RequestException; use phpbb\exception\runtime_exception; -use function Amp\Promise\rethrow; class file_downloader { From d6ed21f3f28712c0061a3e592d22d53758f8f64d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Jul 2024 21:25:22 +0200 Subject: [PATCH 0395/1214] [ticket/12479] Use separate mock in "remote" file test PHPBB-12479 --- tests/version/version_helper_remote_test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index 1687abed7f5..be9f003744c 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -256,11 +256,11 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e public function test_version_phpbb_com() { - $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') + $guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') ->onlyMethods(['request']) ->getMock(); - $this->guzzle_mock->method('request') + $guzzle_mock->method('request') ->will($this->returnCallback(function() { return new \GuzzleHttp\Psr7\Response(200, [], file_get_contents(__DIR__ . '/fixture/30x.txt')); @@ -272,7 +272,7 @@ public function test_version_phpbb_com() ->getMock(); $file_downloader->method('create_client') - ->willReturn($this->guzzle_mock); + ->willReturn($guzzle_mock); $hostname = 'version.phpbb.com'; From 48c2ca9dfe1a00221da342b1398a9b1bbc98e6ca Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 24 Jul 2024 19:13:06 +0200 Subject: [PATCH 0396/1214] [ticket/12479] Add missing file fixture PHPBB-12479 --- tests/version/fixture/30x.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 tests/version/fixture/30x.txt diff --git a/tests/version/fixture/30x.txt b/tests/version/fixture/30x.txt new file mode 100644 index 00000000000..f138ad0c83b --- /dev/null +++ b/tests/version/fixture/30x.txt @@ -0,0 +1,4 @@ +3.0.14 +https://www.phpbb.com/community/viewtopic.php?f=14&t=2313941 +3.3.12 +https://www.phpbb.com/community/viewtopic.php?t=2653732 From 5a09105c3c38b092084cc1f721853c83721b692f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Sep 2024 22:04:55 +0200 Subject: [PATCH 0397/1214] [ticket/17385] Backport tests for updated file downloader to 3.3.x PHPBB-17385 --- tests/version/version_helper_remote_test.php | 31 ++++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/tests/version/version_helper_remote_test.php b/tests/version/version_helper_remote_test.php index be9f003744c..52909438f4c 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -46,12 +46,11 @@ protected function setUp(): void $this->cache->expects($this->any()) ->method('get') - ->with($this->anything()) + ->withAnyParameters() ->will($this->returnValue(false)); $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->addMethods(['set_data']) - ->onlyMethods(['request']) + ->setMethods(['set_data', 'request']) ->getMock(); $this->guzzle_mock->method('set_data') ->will($this->returnCallback(function($data) @@ -67,7 +66,7 @@ protected function setUp(): void )); $this->file_downloader = $this->getMockBuilder('\phpbb\file_downloader') - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $this->file_downloader->method('create_client') ->will($this->returnValue($this->guzzle_mock)); @@ -257,7 +256,7 @@ public function test_get_versions($input, $valid_data, $expected_return = '', $e public function test_version_phpbb_com() { $guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->onlyMethods(['request']) + ->setMethods(['request']) ->getMock(); $guzzle_mock->method('request') @@ -268,7 +267,7 @@ public function test_version_phpbb_com() )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -325,7 +324,7 @@ public function test_version_phpbb_com() public function test_file_downloader_file_not_found() { $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->onlyMethods(['request']) + ->setMethods(['request']) ->getMock(); $this->guzzle_mock->method('request') @@ -336,7 +335,7 @@ public function test_file_downloader_file_not_found() )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -351,7 +350,7 @@ public function test_file_downloader_file_not_found() public function test_file_downloader_exception_not_found() { $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->onlyMethods(['request']) + ->setMethods(['request']) ->getMock(); $this->guzzle_mock->method('request') @@ -364,7 +363,7 @@ public function test_file_downloader_exception_not_found() )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -379,7 +378,7 @@ public function test_file_downloader_exception_not_found() public function test_file_downloader_exception_moved() { $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->onlyMethods(['request']) + ->setMethods(['request']) ->getMock(); $this->guzzle_mock->method('request') @@ -392,7 +391,7 @@ public function test_file_downloader_exception_moved() )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -406,7 +405,7 @@ public function test_file_downloader_exception_moved() public function test_file_downloader_exception_timeout() { $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->onlyMethods(['request']) + ->setMethods(['request']) ->getMock(); $this->guzzle_mock->method('request') @@ -418,7 +417,7 @@ public function test_file_downloader_exception_timeout() )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -433,7 +432,7 @@ public function test_file_downloader_exception_timeout() public function test_file_downloader_exception_other() { $this->guzzle_mock = $this->getMockBuilder('\GuzzleHttp\Client') - ->onlyMethods(['request']) + ->setMethods(['request']) ->getMock(); $this->guzzle_mock->method('request') @@ -444,7 +443,7 @@ public function test_file_downloader_exception_other() )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') From 7a21119d1779d8082c47b221eb79bcdcf9a91e19 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 15 Sep 2024 20:33:06 +0200 Subject: [PATCH 0398/1214] [ticket/17394] Check mergeability of 3.3.x PRs PHPBB-17394 --- .github/workflows/tests.yml | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 893c4c4a285..9b55e69771e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -596,3 +596,54 @@ jobs: if: ${{ matrix.type == 'functional' }} run: | phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional + + merge-check: + if: github.event.pull_request.base.ref == '3.3.x' + runs-on: ubuntu-latest + steps: + - name: Checkout the repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 # Ensure full history is fetched + + - name: Set up Git user + run: | + git config --global user.name "github-actions" + git config --global user.email "github-actions@github.com" + + - name: Fetch all branches + run: git fetch origin + + - name: Simulate merging PR into 3.3.x + id: simulate_merge + run: | + git checkout 3.3.x + git merge --no-ff ${{ github.event.pull_request.head.sha }} --no-commit --no-ff || exit 1 + + - name: Attempt to merge updated 3.3.x into master + id: merge_master + run: | + git checkout master + if git merge --no-ff origin/3.3.x --no-commit --no-ff; then + echo "::set-output name=mergeable::true" + else + echo "::set-output name=mergeable::false" + git merge --abort + fi + + - name: Post comment on PR + if: always() # Ensure this step always runs, regardless of merge result + uses: peter-evans/create-or-update-comment@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + issue-number: ${{ github.event.pull_request.number }} + body: | + The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. + + - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success' || 'Conflict' }} + + If there is a conflict, a separate PR will be needed to merge `3.3.x` into `master`. + + - name: Mark job as succeeded + if: always() + run: echo "Merge check completed. Ignoring the result to avoid failed status." From 15556319d951903725cd574d3da7e71b808ab246 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 16 Sep 2024 20:13:16 +0200 Subject: [PATCH 0399/1214] [ticket/17394] Try using pull_request_target event PHPBB-17394 --- .github/workflows/tests.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9b55e69771e..6e9b83993ae 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,10 +13,15 @@ on: - 3.3.x - master - 'prep-release-*' + pull_request_target: + branches: + - 3.3.x + - master jobs: # Basic checks, e.g. parse errors, commit messages, etc. basic-checks: + if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -88,6 +93,7 @@ jobs: # Tests for MySQL and MariaDB mysql-tests: + if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -231,6 +237,7 @@ jobs: # Tests for PostgreSQL postgres-tests: + if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -351,6 +358,7 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: + if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -454,6 +462,7 @@ jobs: # Test with IIS & PostgreSQL on Windows windows-tests: + if: github.event_name != 'pull_request_target' runs-on: windows-latest strategy: matrix: @@ -598,7 +607,7 @@ jobs: phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional merge-check: - if: github.event.pull_request.base.ref == '3.3.x' + if: github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == '3.3.x' runs-on: ubuntu-latest steps: - name: Checkout the repository @@ -618,13 +627,13 @@ jobs: id: simulate_merge run: | git checkout 3.3.x - git merge --no-ff ${{ github.event.pull_request.head.sha }} --no-commit --no-ff || exit 1 + git merge --no-ff ${{ github.event.pull_request.head.sha }} || exit 1 - name: Attempt to merge updated 3.3.x into master id: merge_master run: | git checkout master - if git merge --no-ff origin/3.3.x --no-commit --no-ff; then + if git merge --no-ff origin/3.3.x --no-commit; then echo "::set-output name=mergeable::true" else echo "::set-output name=mergeable::false" From e406308244fa7c29633b956bd7b95ec3d8903375 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 16 Sep 2024 20:17:29 +0200 Subject: [PATCH 0400/1214] [ticket/17394] Specify pull_request_target types PHPBB-17394 --- .github/workflows/tests.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6e9b83993ae..36cc997d8b1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,6 +14,7 @@ on: - master - 'prep-release-*' pull_request_target: + types: [ opened, synchronize, reopened ] branches: - 3.3.x - master @@ -634,9 +635,9 @@ jobs: run: | git checkout master if git merge --no-ff origin/3.3.x --no-commit; then - echo "::set-output name=mergeable::true" + echo "mergeable=true" >> $GITHUB_OUTPUT else - echo "::set-output name=mergeable::false" + echo "mergeable=false" >> $GITHUB_OUTPUT git merge --abort fi @@ -649,9 +650,9 @@ jobs: body: | The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. - - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success' || 'Conflict' }} + - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} - If there is a conflict, a separate PR will be needed to merge `3.3.x` into `master`. + ${{ steps.merge_master.outputs.mergeable == 'false' && 'A separate PR will be needed to merge `3.3.x` into `master`.' || 'This PR is ready to be merged.' }} - name: Mark job as succeeded if: always() From f55d747bb42e274e46809946500b89e8dc94e20f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 17 Sep 2024 20:38:14 +0200 Subject: [PATCH 0401/1214] [ticket/17396] Add workflow for merging 3.3.x into master PHPBB-17396 --- .github/workflows/merge_3.3.x_to_master.yml | 45 +++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/merge_3.3.x_to_master.yml diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml new file mode 100644 index 00000000000..aa05026235d --- /dev/null +++ b/.github/workflows/merge_3.3.x_to_master.yml @@ -0,0 +1,45 @@ +name: Merge 3.3.x into master + +on: + push: + branches: + - 3.3.x + +jobs: + merge-branch: + runs-on: ubuntu-latest + + steps: + - name: Checkout the repository + uses: actions/checkout@v4 + + - name: Fetch the latest commit information + id: get-commit-info + run: | + # Get the latest commit SHA and its author details + COMMIT_SHA=$(git rev-parse HEAD) + COMMIT_AUTHOR_NAME=$(git log -1 --pretty=format:'%an' $COMMIT_SHA) + COMMIT_AUTHOR_EMAIL=$(git log -1 --pretty=format:'%ae' $COMMIT_SHA) + + # Save them as output for later steps + echo "commit_sha=$COMMIT_SHA" >> $GITHUB_ENV + echo "commit_author_name=$COMMIT_AUTHOR_NAME" >> $GITHUB_ENV + echo "commit_author_email=$COMMIT_AUTHOR_EMAIL" >> $GITHUB_ENV + + - name: Set up Git with the pull request author's info + run: | + git config --global user.name "${{ env.commit_author_name }}" + git config --global user.email "${{ env.commit_author_email }}" + + - name: Fetch all branches + run: git fetch --all + + - name: Merge 3.3.x into master + run: | + git checkout master + git merge --no-ff 3.3.x + + - name: Push changes to master + run: git push origin master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 3d70d87b57d88439f8a71c522cb8ba66d62aab82 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 17 Sep 2024 21:46:03 +0200 Subject: [PATCH 0402/1214] [ticket/17396] Split merge check to master to separate yml file PHPBB-17396 --- .github/workflows/check_merge_to_master.yml | 59 ++++++++++++++++++++ .github/workflows/tests.yml | 61 --------------------- 2 files changed, 59 insertions(+), 61 deletions(-) create mode 100644 .github/workflows/check_merge_to_master.yml diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml new file mode 100644 index 00000000000..045436ef946 --- /dev/null +++ b/.github/workflows/check_merge_to_master.yml @@ -0,0 +1,59 @@ +name: Check merge to master + +on: + pull_request_target: + types: [ opened, synchronize, reopened ] + branches: + - 3.3.x + +jobs: + merge-check: + if: github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == '3.3.x' + runs-on: ubuntu-latest + steps: + - name: Checkout the repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 # Ensure full history is fetched + + - name: Set up Git user + run: | + git config --global user.name "github-actions" + git config --global user.email "github-actions@github.com" + + - name: Fetch all branches + run: git fetch origin + + - name: Simulate merging PR into 3.3.x + id: simulate_merge + run: | + git checkout 3.3.x + git merge --no-ff ${{ github.event.pull_request.head.sha }} || exit 1 + + - name: Attempt to merge updated 3.3.x into master + id: merge_master + run: | + git checkout master + if git merge --no-ff origin/3.3.x --no-commit; then + echo "mergeable=true" >> $GITHUB_OUTPUT + else + echo "mergeable=false" >> $GITHUB_OUTPUT + git merge --abort + fi + + - name: Post comment on PR + if: always() # Ensure this step always runs, regardless of merge result + uses: peter-evans/create-or-update-comment@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + issue-number: ${{ github.event.pull_request.number }} + body: | + The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. + + - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} + + ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }} + + - name: Mark job as succeeded + if: always() + run: echo "Merge check completed. Ignoring the result to avoid failed status." diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 36cc997d8b1..893c4c4a285 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -13,16 +13,10 @@ on: - 3.3.x - master - 'prep-release-*' - pull_request_target: - types: [ opened, synchronize, reopened ] - branches: - - 3.3.x - - master jobs: # Basic checks, e.g. parse errors, commit messages, etc. basic-checks: - if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -94,7 +88,6 @@ jobs: # Tests for MySQL and MariaDB mysql-tests: - if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -238,7 +231,6 @@ jobs: # Tests for PostgreSQL postgres-tests: - if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -359,7 +351,6 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: - if: github.event_name != 'pull_request_target' runs-on: ubuntu-22.04 strategy: matrix: @@ -463,7 +454,6 @@ jobs: # Test with IIS & PostgreSQL on Windows windows-tests: - if: github.event_name != 'pull_request_target' runs-on: windows-latest strategy: matrix: @@ -606,54 +596,3 @@ jobs: if: ${{ matrix.type == 'functional' }} run: | phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional - - merge-check: - if: github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == '3.3.x' - runs-on: ubuntu-latest - steps: - - name: Checkout the repository - uses: actions/checkout@v3 - with: - fetch-depth: 0 # Ensure full history is fetched - - - name: Set up Git user - run: | - git config --global user.name "github-actions" - git config --global user.email "github-actions@github.com" - - - name: Fetch all branches - run: git fetch origin - - - name: Simulate merging PR into 3.3.x - id: simulate_merge - run: | - git checkout 3.3.x - git merge --no-ff ${{ github.event.pull_request.head.sha }} || exit 1 - - - name: Attempt to merge updated 3.3.x into master - id: merge_master - run: | - git checkout master - if git merge --no-ff origin/3.3.x --no-commit; then - echo "mergeable=true" >> $GITHUB_OUTPUT - else - echo "mergeable=false" >> $GITHUB_OUTPUT - git merge --abort - fi - - - name: Post comment on PR - if: always() # Ensure this step always runs, regardless of merge result - uses: peter-evans/create-or-update-comment@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - issue-number: ${{ github.event.pull_request.number }} - body: | - The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. - - - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} - - ${{ steps.merge_master.outputs.mergeable == 'false' && 'A separate PR will be needed to merge `3.3.x` into `master`.' || 'This PR is ready to be merged.' }} - - - name: Mark job as succeeded - if: always() - run: echo "Merge check completed. Ignoring the result to avoid failed status." From 4fb06b00b75cf765df78b948873d54dc2177a04d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 17 Sep 2024 22:10:28 +0200 Subject: [PATCH 0403/1214] [ticket/17396] Adjust merge code PHPBB-17396 --- .github/workflows/check_merge_to_master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml index 045436ef946..810cb8021f3 100644 --- a/.github/workflows/check_merge_to_master.yml +++ b/.github/workflows/check_merge_to_master.yml @@ -28,7 +28,8 @@ jobs: id: simulate_merge run: | git checkout 3.3.x - git merge --no-ff ${{ github.event.pull_request.head.sha }} || exit 1 + git fetch origin pull/${{ github.event.pull_request.number }}/head + git merge --no-ff FETCH_HEAD || exit 1 - name: Attempt to merge updated 3.3.x into master id: merge_master From 17d066a98046d561e1e0248439a68919a59416c9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 18 Sep 2024 20:41:03 +0200 Subject: [PATCH 0404/1214] [ticket/17396] Only try pushing if merge was successful PHPBB-17396 --- .github/workflows/merge_3.3.x_to_master.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml index aa05026235d..2863fa8c1e8 100644 --- a/.github/workflows/merge_3.3.x_to_master.yml +++ b/.github/workflows/merge_3.3.x_to_master.yml @@ -35,11 +35,18 @@ jobs: run: git fetch --all - name: Merge 3.3.x into master + # First checkout 3.3.x and master to track from origin, then try merging to master run: | + git checkout 3.3.x git checkout master - git merge --no-ff 3.3.x - - - name: Push changes to master + if git merge --no-ff 3.3.x; then + echo "merge_failed=false" >> $GITHUB_ENV + else + echo "merge_failed=true" >> $GITHUB_ENV + fi + + - name: Push changes to master if merge was successful + if: env.merge_failed == 'false' run: git push origin master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From d6a17c1fe7f9dd9f4522fb9a922604076348267a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 19 Sep 2024 20:48:21 +0200 Subject: [PATCH 0405/1214] [ticket/17396] Fetch full history and branch 3.3.x if merging to master PHPBB-17396 --- .github/workflows/merge_3.3.x_to_master.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml index 2863fa8c1e8..4aec43cded2 100644 --- a/.github/workflows/merge_3.3.x_to_master.yml +++ b/.github/workflows/merge_3.3.x_to_master.yml @@ -12,6 +12,9 @@ jobs: steps: - name: Checkout the repository uses: actions/checkout@v4 + with: + fetch-depth: 0 # Fetch full history for proper merging + ref: 3.3.x # Checkout the 3.3.x branch - name: Fetch the latest commit information id: get-commit-info @@ -35,9 +38,7 @@ jobs: run: git fetch --all - name: Merge 3.3.x into master - # First checkout 3.3.x and master to track from origin, then try merging to master run: | - git checkout 3.3.x git checkout master if git merge --no-ff 3.3.x; then echo "merge_failed=false" >> $GITHUB_ENV From 08d184b0fa0ebc97c28e5107d348abb1ccb03365 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 25 Sep 2024 14:21:38 +0100 Subject: [PATCH 0406/1214] [ticket/17396] Try running other-tests on ubuntu-20.04 PHPBB-17396 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 893c4c4a285..32d84776717 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -351,7 +351,7 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 strategy: matrix: include: From 5229152604c3ad8a2261e418bf11a11bd199cf59 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Sep 2024 15:23:35 +0100 Subject: [PATCH 0407/1214] [ticket/17400] Use ubuntu 20.04 until microsoft fixes their container PHPBB-17400 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0b010c8e069..3795b00a7e0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -370,7 +370,7 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: include: From 2ac9c0ae7cc69ab8347d9c088050dacd3fdf2a62 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 28 Sep 2024 18:28:49 +0700 Subject: [PATCH 0408/1214] [ticket/17402] Add CLI reparser option to force reparsing BBCode PHPBB-17402 --- phpBB/language/en/cli.php | 1 + .../console/command/reparser/reparse.php | 10 +++++++- phpBB/phpbb/textreparser/base.php | 25 ++++++++++--------- .../phpbb/textreparser/reparser_interface.php | 3 ++- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index b1cbe80f4dc..84fb92a30ee 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,6 +75,7 @@ 'CLI_DESCRIPTION_REPARSER_REPARSE' => 'Reparses stored text with the current text_formatter services.', 'CLI_DESCRIPTION_REPARSER_REPARSE_ARG_1' => 'Type of text to reparse. Leave blank to reparse everything.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN' => 'Do not save any changes; just print what would happen', + 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Enforce reparsing BBCode in posts unconditionally', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MIN' => 'Lowest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MAX' => 'Highest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_SIZE' => 'Approximate number of records to process at a time', diff --git a/phpBB/phpbb/console/command/reparser/reparse.php b/phpBB/phpbb/console/command/reparser/reparse.php index f285977ea2d..06511f63b94 100644 --- a/phpBB/phpbb/console/command/reparser/reparse.php +++ b/phpBB/phpbb/console/command/reparser/reparse.php @@ -92,6 +92,12 @@ protected function configure() InputOption::VALUE_NONE, $this->user->lang('CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN') ) + ->addOption( + 'force-bbcode-reparsing', + null, + InputOption::VALUE_NONE, + $this->user->lang('CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE') + ) ->addOption( 'resume', null, @@ -222,13 +228,15 @@ protected function reparse($name) // Start from $max and decrement $current by $size until we reach $min $current = $max; + + $force_bbcode_reparsing = (bool) $this->get_option('force-bbcode-reparsing'); while ($current >= $min) { $start = max($min, $current + 1 - $size); $end = max($min, $current); $progress->setMessage($this->user->lang('CLI_REPARSER_REPARSE_REPARSING', $reparser->get_name(), $start, $end)); - $reparser->reparse_range($start, $end); + $reparser->reparse_range($start, $end, $force_bbcode_reparsing); $current = $start - 1; $progress->setProgress($max + 1 - $start); diff --git a/phpBB/phpbb/textreparser/base.php b/phpBB/phpbb/textreparser/base.php index 82a59a075d6..ebff0bba74e 100644 --- a/phpBB/phpbb/textreparser/base.php +++ b/phpBB/phpbb/textreparser/base.php @@ -216,11 +216,11 @@ protected function guess_smilies(array $record) /** * {@inheritdoc} */ - public function reparse_range($min_id, $max_id) + public function reparse_range($min_id, $max_id, bool $force_bbcode_reparsing = false) { foreach ($this->get_records_by_range($min_id, $max_id) as $record) { - $this->reparse_record($record); + $this->reparse_record($record, $force_bbcode_reparsing); } } @@ -228,16 +228,17 @@ public function reparse_range($min_id, $max_id) * Reparse given record * * @param array $record Associative array containing the record's data + * @param bool $force_bbcode_reparsing Flag indicating if BBCode should be reparsed unconditionally */ - protected function reparse_record(array $record) + protected function reparse_record(array $record, bool $force_bbcode_reparsing = false) { // Guess magic URL state based on actual record content before adding fields $record['enable_magic_url'] = $this->guess_magic_url($record); $record = $this->add_missing_fields($record); - $flags = ($record['enable_bbcode']) ? OPTION_FLAG_BBCODE : 0; - $flags |= ($record['enable_smilies']) ? OPTION_FLAG_SMILIES : 0; - $flags |= ($record['enable_magic_url']) ? OPTION_FLAG_LINKS : 0; + $flags = ($record['enable_bbcode'] || $force_bbcode_reparsing) ? OPTION_FLAG_BBCODE : 0; + $flags |= ($record['enable_smilies'] || $force_bbcode_reparsing) ? OPTION_FLAG_SMILIES : 0; + $flags |= ($record['enable_magic_url'] || $force_bbcode_reparsing) ? OPTION_FLAG_LINKS : 0; $unparsed = array_merge( $record, generate_text_for_edit($record['text'], $record['bbcode_uid'], $flags) @@ -252,13 +253,13 @@ protected function reparse_record(array $record) $unparsed['bbcode_uid'], $bitfield, $flags, - $unparsed['enable_bbcode'], - $unparsed['enable_magic_url'], - $unparsed['enable_smilies'], - $unparsed['enable_img_bbcode'], + $unparsed['enable_bbcode'] || $force_bbcode_reparsing, + $unparsed['enable_magic_url'] || $force_bbcode_reparsing, + $unparsed['enable_smilies'] || $force_bbcode_reparsing, + $unparsed['enable_img_bbcode'] || $force_bbcode_reparsing, $unparsed['enable_flash_bbcode'], - $unparsed['enable_quote_bbcode'], - $unparsed['enable_url_bbcode'], + $unparsed['enable_quote_bbcode'] || $force_bbcode_reparsing, + $unparsed['enable_url_bbcode'] || $force_bbcode_reparsing, 'text_reparser.' . $this->get_name() ); diff --git a/phpBB/phpbb/textreparser/reparser_interface.php b/phpBB/phpbb/textreparser/reparser_interface.php index 912de100580..99e1c267785 100644 --- a/phpBB/phpbb/textreparser/reparser_interface.php +++ b/phpBB/phpbb/textreparser/reparser_interface.php @@ -41,6 +41,7 @@ public function set_name($name); * * @param integer $min_id Lower bound * @param integer $max_id Upper bound + * @param bool $force_bbcode_reparsing Flag indicating if BBCode should be reparsed unconditionally */ - public function reparse_range($min_id, $max_id); + public function reparse_range($min_id, $max_id, bool $force_bbcode_reparsing = false); } From 9ace4dc5853681a808affb95d8dc31a34375d33b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Sep 2024 16:01:02 +0100 Subject: [PATCH 0409/1214] [ticket/17385] Change default value in docblock PHPBB-17385 --- phpBB/phpbb/file_downloader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index e10bef1e03a..14607ece0c8 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -60,7 +60,7 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6 * @param string $host File host * @param string $directory Directory file is in * @param string $filename Filename of file to retrieve - * @param int $port Port to connect to; default: 80 + * @param int $port Port to connect to; default: 443 * @param int $timeout Connection timeout in seconds; default: 6 * * @return false|string File data as string if file can be read and there is no From d5e94f1d97927d5f258c6b72408c972d29826881 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Sep 2024 16:14:22 +0100 Subject: [PATCH 0410/1214] [ticket/17394] Merge local 3.3.x and not remote into master PHPBB-17394 --- .github/workflows/check_merge_to_master.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml index 810cb8021f3..cdae703bd5d 100644 --- a/.github/workflows/check_merge_to_master.yml +++ b/.github/workflows/check_merge_to_master.yml @@ -35,7 +35,7 @@ jobs: id: merge_master run: | git checkout master - if git merge --no-ff origin/3.3.x --no-commit; then + if git merge --no-ff 3.3.x --no-commit; then echo "mergeable=true" >> $GITHUB_OUTPUT else echo "mergeable=false" >> $GITHUB_OUTPUT From 56f8b08ec2db2596bc2ffb2f8c08abb524fbfd37 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Sep 2024 16:29:55 +0100 Subject: [PATCH 0411/1214] [ticket/17403] Update composer depdencies and twig PHPBB-17403 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 939 ++++++++++++++++++++------------------------ 2 files changed, 417 insertions(+), 524 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 0a04cde1816..2d75027ff00 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -58,7 +58,7 @@ "symfony/routing": "^6.3", "symfony/twig-bridge": "^6.3", "symfony/yaml": "^6.3", - "twig/twig": "3.8.0" + "twig/twig": "^3.14" }, "require-dev": { "laravel/homestead": "~14.4", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index a8651e11a98..a3c2669f69e 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "3c21881b6c8a81fbd83d57004763049d", + "content-hash": "504e019821be33ba6ad322b37d698744", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -102,21 +102,24 @@ }, { "name": "carlos-mg89/oauth", - "version": "0.8.15", + "version": "0.8.16", "source": { "type": "git", "url": "https://github.com/carlos-mg89/PHPoAuthLib.git", - "reference": "c14c44e4f8993009a10d56a41e61c19291824a29" + "reference": "7c8aaace2004f0736c4598ad5d78307b43ccd858" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/c14c44e4f8993009a10d56a41e61c19291824a29", - "reference": "c14c44e4f8993009a10d56a41e61c19291824a29", + "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/7c8aaace2004f0736c4598ad5d78307b43ccd858", + "reference": "7c8aaace2004f0736c4598ad5d78307b43ccd858", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, + "replace": { + "lusitanian/oauth": "~0.3" + }, "require-dev": { "ext-curl": "*", "ext-dom": "*", @@ -164,9 +167,9 @@ ], "support": { "issues": "https://github.com/carlos-mg89/PHPoAuthLib/issues", - "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.15" + "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.16" }, - "time": "2022-07-15T08:38:14+00:00" + "time": "2024-08-09T10:00:52+00:00" }, { "name": "chita/topological_sort", @@ -213,16 +216,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.0", + "version": "1.5.2", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99" + "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", - "reference": "0c5ccfcfea312b5c5a190a21ac5cef93f74baf99", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/48a792895a2b7a6ee65dd5442c299d7b835b6137", + "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137", "shasum": "" }, "require": { @@ -232,8 +235,8 @@ }, "require-dev": { "phpstan/phpstan": "^1.10", - "psr/log": "^1.0", - "symfony/phpunit-bridge": "^4.2 || ^5", + "phpunit/phpunit": "^8 || ^9", + "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/process": "^4.0 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", @@ -269,7 +272,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.0" + "source": "https://github.com/composer/ca-bundle/tree/1.5.2" }, "funding": [ { @@ -285,7 +288,7 @@ "type": "tidelift" } ], - "time": "2024-03-15T14:00:32+00:00" + "time": "2024-09-25T07:49:53+00:00" }, { "name": "composer/class-map-generator", @@ -362,48 +365,48 @@ }, { "name": "composer/composer", - "version": "2.7.7", + "version": "2.7.9", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "291942978f39435cf904d33739f98d7d4eca7b23" + "reference": "e30ccdd665828ae66eb1be78f056e39e1d5f55ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/291942978f39435cf904d33739f98d7d4eca7b23", - "reference": "291942978f39435cf904d33739f98d7d4eca7b23", + "url": "https://api.github.com/repos/composer/composer/zipball/e30ccdd665828ae66eb1be78f056e39e1d5f55ab", + "reference": "e30ccdd665828ae66eb1be78f056e39e1d5f55ab", "shasum": "" }, "require": { - "composer/ca-bundle": "^1.0", + "composer/ca-bundle": "^1.5", "composer/class-map-generator": "^1.3.3", "composer/metadata-minifier": "^1.0", - "composer/pcre": "^2.1 || ^3.1", + "composer/pcre": "^2.2 || ^3.2", "composer/semver": "^3.3", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", - "justinrainbow/json-schema": "^5.2.11", + "justinrainbow/json-schema": "^5.3", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^2.8 || ^3", + "react/promise": "^3.2", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.11 || ^6.0.11 || ^7", - "symfony/filesystem": "^5.4 || ^6.0 || ^7", - "symfony/finder": "^5.4 || ^6.0 || ^7", + "symfony/console": "^5.4.35 || ^6.3.12 || ^7.0.3", + "symfony/filesystem": "^5.4.35 || ^6.3.12 || ^7.0.3", + "symfony/finder": "^5.4.35 || ^6.3.12 || ^7.0.3", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", "symfony/polyfill-php81": "^1.24", - "symfony/process": "^5.4 || ^6.0 || ^7" + "symfony/process": "^5.4.35 || ^6.3.12 || ^7.0.3" }, "require-dev": { - "phpstan/phpstan": "^1.11.0", + "phpstan/phpstan": "^1.11.8", "phpstan/phpstan-deprecation-rules": "^1.2.0", "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.0", "phpstan/phpstan-symfony": "^1.4.0", - "symfony/phpunit-bridge": "^6.4.1 || ^7.0.1" + "symfony/phpunit-bridge": "^6.4.3 || ^7.0.1" }, "suggest": { "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", @@ -456,7 +459,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.7" + "source": "https://github.com/composer/composer/tree/2.7.9" }, "funding": [ { @@ -472,7 +475,7 @@ "type": "tidelift" } ], - "time": "2024-06-10T20:11:12+00:00" + "time": "2024-09-04T12:43:28+00:00" }, { "name": "composer/installers", @@ -769,30 +772,38 @@ }, { "name": "composer/pcre", - "version": "3.1.4", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "04229f163664973f68f38f6f73d917799168ef24" + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/04229f163664973f68f38f6f73d917799168ef24", - "reference": "04229f163664973f68f38f6f73d917799168ef24", + "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", "shasum": "" }, "require": { "php": "^7.4 || ^8.0" }, + "conflict": { + "phpstan/phpstan": "<1.11.10" + }, "require-dev": { - "phpstan/phpstan": "^1.3", + "phpstan/phpstan": "^1.11.10", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8 || ^9" }, "type": "library", "extra": { "branch-alias": { "dev-main": "3.x-dev" + }, + "phpstan": { + "includes": [ + "extension.neon" + ] } }, "autoload": { @@ -820,7 +831,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.1.4" + "source": "https://github.com/composer/pcre/tree/3.3.1" }, "funding": [ { @@ -836,28 +847,28 @@ "type": "tidelift" } ], - "time": "2024-05-27T13:40:54+00:00" + "time": "2024-08-27T18:44:43+00:00" }, { "name": "composer/semver", - "version": "3.4.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/composer/semver.git", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32" + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/semver/zipball/35e8d0af4486141bc745f23a29cc2091eb624a32", - "reference": "35e8d0af4486141bc745f23a29cc2091eb624a32", + "url": "https://api.github.com/repos/composer/semver/zipball/4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", + "reference": "4313d26ada5e0c4edfbd1dc481a92ff7bff91f12", "shasum": "" }, "require": { "php": "^5.3.2 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.4", - "symfony/phpunit-bridge": "^4.2 || ^5" + "phpstan/phpstan": "^1.11", + "symfony/phpunit-bridge": "^3 || ^7" }, "type": "library", "extra": { @@ -901,7 +912,7 @@ "support": { "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/semver/issues", - "source": "https://github.com/composer/semver/tree/3.4.0" + "source": "https://github.com/composer/semver/tree/3.4.3" }, "funding": [ { @@ -917,7 +928,7 @@ "type": "tidelift" } ], - "time": "2023-08-31T09:50:34+00:00" + "time": "2024-09-19T14:15:21+00:00" }, { "name": "composer/spdx-licenses", @@ -1843,20 +1854,20 @@ }, { "name": "justinrainbow/json-schema", - "version": "v5.2.13", + "version": "5.3.0", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793" + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/fbbe7e5d79f618997bc3332a6f49246036c45793", - "reference": "fbbe7e5d79f618997bc3332a6f49246036c45793", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", + "reference": "feb2ca6dd1cebdaf1ed60a4c8de2e53ce11c4fd8", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2.2.20||~2.15.1", @@ -1867,11 +1878,6 @@ "bin/validate-json" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "5.0.x-dev" - } - }, "autoload": { "psr-4": { "JsonSchema\\": "src/JsonSchema/" @@ -1907,22 +1913,22 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/v5.2.13" + "source": "https://github.com/jsonrainbow/json-schema/tree/5.3.0" }, - "time": "2023-09-26T02:20:38+00:00" + "time": "2024-07-06T21:00:26+00:00" }, { "name": "laminas/laminas-code", - "version": "4.13.0", + "version": "4.14.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "7353d4099ad5388e84737dd16994316a04f48dbf" + "reference": "562e02b7d85cb9142b5116cc76c4c7c162a11a1c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/7353d4099ad5388e84737dd16994316a04f48dbf", - "reference": "7353d4099ad5388e84737dd16994316a04f48dbf", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/562e02b7d85cb9142b5116cc76c4c7c162a11a1c", + "reference": "562e02b7d85cb9142b5116cc76c4c7c162a11a1c", "shasum": "" }, "require": { @@ -1934,7 +1940,7 @@ "laminas/laminas-coding-standard": "^2.5.0", "laminas/laminas-stdlib": "^3.17.0", "phpunit/phpunit": "^10.3.3", - "psalm/plugin-phpunit": "^0.18.4", + "psalm/plugin-phpunit": "^0.19.0", "vimeo/psalm": "^5.15.0" }, "suggest": { @@ -1972,7 +1978,7 @@ "type": "community_bridge" } ], - "time": "2023-10-18T10:00:55+00:00" + "time": "2024-06-17T08:50:25+00:00" }, { "name": "marc1706/fast-image-size", @@ -2103,24 +2109,24 @@ }, { "name": "paragonie/constant_time_encoding", - "version": "v2.7.0", + "version": "v3.0.0", "source": { "type": "git", "url": "https://github.com/paragonie/constant_time_encoding.git", - "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105" + "reference": "df1e7fde177501eee2037dd159cf04f5f301a512" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/52a0d99e69f56b9ec27ace92ba56897fe6993105", - "reference": "52a0d99e69f56b9ec27ace92ba56897fe6993105", + "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/df1e7fde177501eee2037dd159cf04f5f301a512", + "reference": "df1e7fde177501eee2037dd159cf04f5f301a512", "shasum": "" }, "require": { - "php": "^7|^8" + "php": "^8" }, "require-dev": { - "phpunit/phpunit": "^6|^7|^8|^9", - "vimeo/psalm": "^1|^2|^3|^4" + "phpunit/phpunit": "^9", + "vimeo/psalm": "^4|^5" }, "type": "library", "autoload": { @@ -2166,84 +2172,39 @@ "issues": "https://github.com/paragonie/constant_time_encoding/issues", "source": "https://github.com/paragonie/constant_time_encoding" }, - "time": "2024-05-08T12:18:48+00:00" - }, - { - "name": "paragonie/random_compat", - "version": "v9.99.100", - "source": { - "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/996434e5492cb4c3edcb9168db6fbb1359ef965a", - "reference": "996434e5492cb4c3edcb9168db6fbb1359ef965a", - "shasum": "" - }, - "require": { - "php": ">= 7" - }, - "require-dev": { - "phpunit/phpunit": "4.*|5.*", - "vimeo/psalm": "^1" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." - }, - "type": "library", - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" - } - ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", - "keywords": [ - "csprng", - "polyfill", - "pseudorandom", - "random" - ], - "support": { - "email": "info@paragonie.com", - "issues": "https://github.com/paragonie/random_compat/issues", - "source": "https://github.com/paragonie/random_compat" - }, - "time": "2020-10-15T08:29:30+00:00" + "time": "2024-05-08T12:36:18+00:00" }, { "name": "paragonie/sodium_compat", - "version": "v1.21.1", + "version": "v2.1.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37" + "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/bb312875dcdd20680419564fe42ba1d9564b9e37", - "reference": "bb312875dcdd20680419564fe42ba1d9564b9e37", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/a673d5f310477027cead2e2f2b6db5d8368157cb", + "reference": "a673d5f310477027cead2e2f2b6db5d8368157cb", "shasum": "" }, "require": { - "paragonie/random_compat": ">=1", - "php": "^5.2.4|^5.3|^5.4|^5.5|^5.6|^7|^8" + "php": "^8.1", + "php-64bit": "*" }, "require-dev": { - "phpunit/phpunit": "^3|^4|^5|^6|^7|^8|^9" + "phpunit/phpunit": "^7|^8|^9", + "vimeo/psalm": "^4|^5" }, "suggest": { - "ext-libsodium": "PHP < 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security.", - "ext-sodium": "PHP >= 7.0: Better performance, password hashing (Argon2i), secure memory management (memzero), and better security." + "ext-sodium": "Better performance, password hashing (Argon2i), secure memory management (memzero), and better security." }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, "autoload": { "files": [ "autoload.php" @@ -2300,9 +2261,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/v1.21.1" + "source": "https://github.com/paragonie/sodium_compat/tree/v2.1.0" }, - "time": "2024-04-22T22:05:04+00:00" + "time": "2024-09-04T12:51:01+00:00" }, { "name": "psr/cache", @@ -2666,16 +2627,16 @@ }, { "name": "psr/log", - "version": "3.0.0", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001" + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/fe5ea303b0887d5caefd3d431c3e61ad47037001", - "reference": "fe5ea303b0887d5caefd3d431c3e61ad47037001", + "url": "https://api.github.com/repos/php-fig/log/zipball/f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", + "reference": "f16e1d5863e37f8d8c2a01719f5b34baa2b714d3", "shasum": "" }, "require": { @@ -2710,9 +2671,9 @@ "psr-3" ], "support": { - "source": "https://github.com/php-fig/log/tree/3.0.0" + "source": "https://github.com/php-fig/log/tree/3.0.2" }, - "time": "2021-07-14T16:46:02+00:00" + "time": "2024-09-11T13:17:53+00:00" }, { "name": "ralouphie/getallheaders", @@ -2921,16 +2882,16 @@ }, { "name": "s9e/text-formatter", - "version": "2.17.3", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "9adf2557f13e45c4524d0dc9886cab22822e337a" + "reference": "4970711f25d94306b4835b723b9cc5010170ea37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/9adf2557f13e45c4524d0dc9886cab22822e337a", - "reference": "9adf2557f13e45c4524d0dc9886cab22822e337a", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/4970711f25d94306b4835b723b9cc5010170ea37", + "reference": "4970711f25d94306b4835b723b9cc5010170ea37", "shasum": "" }, "require": { @@ -2958,7 +2919,7 @@ }, "type": "library", "extra": { - "version": "2.17.3" + "version": "2.18.0" }, "autoload": { "psr-4": { @@ -2990,29 +2951,29 @@ ], "support": { "issues": "https://github.com/s9e/TextFormatter/issues", - "source": "https://github.com/s9e/TextFormatter/tree/2.17.3" + "source": "https://github.com/s9e/TextFormatter/tree/2.18.0" }, - "time": "2024-05-26T00:00:08+00:00" + "time": "2024-07-24T14:50:52+00:00" }, { "name": "seld/jsonlint", - "version": "1.10.2", + "version": "1.11.0", "source": { "type": "git", "url": "https://github.com/Seldaek/jsonlint.git", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259" + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/9bb7db07b5d66d90f6ebf542f09fc67d800e5259", - "reference": "9bb7db07b5d66d90f6ebf542f09fc67d800e5259", + "url": "https://api.github.com/repos/Seldaek/jsonlint/zipball/1748aaf847fc731cfad7725aec413ee46f0cc3a2", + "reference": "1748aaf847fc731cfad7725aec413ee46f0cc3a2", "shasum": "" }, "require": { "php": "^5.3 || ^7.0 || ^8.0" }, "require-dev": { - "phpstan/phpstan": "^1.5", + "phpstan/phpstan": "^1.11", "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0 || ^8.5.13" }, "bin": [ @@ -3044,7 +3005,7 @@ ], "support": { "issues": "https://github.com/Seldaek/jsonlint/issues", - "source": "https://github.com/Seldaek/jsonlint/tree/1.10.2" + "source": "https://github.com/Seldaek/jsonlint/tree/1.11.0" }, "funding": [ { @@ -3056,7 +3017,7 @@ "type": "tidelift" } ], - "time": "2024-02-07T12:57:50+00:00" + "time": "2024-07-11T14:55:45+00:00" }, { "name": "seld/phar-utils", @@ -3420,16 +3381,16 @@ }, { "name": "symfony/console", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91" + "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/be5854cee0e8c7b110f00d695d11debdfa1a2a91", - "reference": "be5854cee0e8c7b110f00d695d11debdfa1a2a91", + "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765", + "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765", "shasum": "" }, "require": { @@ -3494,7 +3455,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.8" + "source": "https://github.com/symfony/console/tree/v6.4.12" }, "funding": [ { @@ -3510,20 +3471,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T08:15:52+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c" + "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/d3b618176e8c3a9e5772151c51eba0c52a0c771c", - "reference": "d3b618176e8c3a9e5772151c51eba0c52a0c771c", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", + "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", "shasum": "" }, "require": { @@ -3575,7 +3536,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.8" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.12" }, "funding": [ { @@ -3591,7 +3552,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T08:18:25+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3662,16 +3623,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.8", + "version": "v6.4.10", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc" + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc", - "reference": "ef836152bf13472dc5fb5b08b0c0c4cfeddc0fcc", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0", + "reference": "231f1b2ee80f72daa1972f7340297d67439224f0", "shasum": "" }, "require": { @@ -3717,7 +3678,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.8" + "source": "https://github.com/symfony/error-handler/tree/v6.4.10" }, "funding": [ { @@ -3733,7 +3694,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-07-26T12:30:32+00:00" }, { "name": "symfony/event-dispatcher", @@ -3893,16 +3854,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3" + "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4d37529150e7081c51b3c5d5718c55a04a9503f3", - "reference": "4d37529150e7081c51b3c5d5718c55a04a9503f3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/f810e3cbdf7fdc35983968523d09f349fa9ada12", + "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12", "shasum": "" }, "require": { @@ -3939,7 +3900,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.8" + "source": "https://github.com/symfony/filesystem/tree/v6.4.12" }, "funding": [ { @@ -3955,20 +3916,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-16T16:01:33+00:00" }, { "name": "symfony/finder", - "version": "v6.4.8", + "version": "v6.4.11", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c" + "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3ef977a43883215d560a2cecb82ec8e62131471c", - "reference": "3ef977a43883215d560a2cecb82ec8e62131471c", + "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", "shasum": "" }, "require": { @@ -4003,7 +3964,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.8" + "source": "https://github.com/symfony/finder/tree/v6.4.11" }, "funding": [ { @@ -4019,20 +3980,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-08-13T14:27:37+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05" + "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05", - "reference": "61faba993e620fc22d4f0ab3b6bcf8fbb0d44b05", + "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", "shasum": "" }, "require": { @@ -4096,7 +4057,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.8" + "source": "https://github.com/symfony/http-client/tree/v6.4.12" }, "funding": [ { @@ -4112,7 +4073,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T08:21:33+00:00" }, { "name": "symfony/http-client-contracts", @@ -4194,16 +4155,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947" + "reference": "133ac043875f59c26c55e79cf074562127cce4d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/27de8cc95e11db7a50b027e71caaab9024545947", - "reference": "27de8cc95e11db7a50b027e71caaab9024545947", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2", + "reference": "133ac043875f59c26c55e79cf074562127cce4d2", "shasum": "" }, "require": { @@ -4251,7 +4212,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.8" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.12" }, "funding": [ { @@ -4267,20 +4228,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T08:18:25+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1" + "reference": "96df83d51b5f78804f70c093b97310794fd6257b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1", - "reference": "6c519aa3f32adcfd1d1f18d923f6b227d9acf3c1", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b", + "reference": "96df83d51b5f78804f70c093b97310794fd6257b", "shasum": "" }, "require": { @@ -4365,7 +4326,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.8" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.12" }, "funding": [ { @@ -4381,20 +4342,20 @@ "type": "tidelift" } ], - "time": "2024-06-02T16:06:25+00:00" + "time": "2024-09-21T06:02:57+00:00" }, { "name": "symfony/mime", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33" + "reference": "abe16ee7790b16aa525877419deb0f113953f0e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/618597ab8b78ac86d1c75a9d0b35540cda074f33", - "reference": "618597ab8b78ac86d1c75a9d0b35540cda074f33", + "url": "https://api.github.com/repos/symfony/mime/zipball/abe16ee7790b16aa525877419deb0f113953f0e1", + "reference": "abe16ee7790b16aa525877419deb0f113953f0e1", "shasum": "" }, "require": { @@ -4408,7 +4369,7 @@ "phpdocumentor/reflection-docblock": "<3.2.2", "phpdocumentor/type-resolver": "<1.4.0", "symfony/mailer": "<5.4", - "symfony/serializer": "<6.3.2" + "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", @@ -4418,7 +4379,7 @@ "symfony/process": "^5.4|^6.4|^7.0", "symfony/property-access": "^5.4|^6.0|^7.0", "symfony/property-info": "^5.4|^6.0|^7.0", - "symfony/serializer": "^6.3.2|^7.0" + "symfony/serializer": "^6.4.3|^7.0.3" }, "type": "library", "autoload": { @@ -4450,7 +4411,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.8" + "source": "https://github.com/symfony/mime/tree/v6.4.12" }, "funding": [ { @@ -4466,24 +4427,24 @@ "type": "tidelift" } ], - "time": "2024-06-01T07:50:16+00:00" + "time": "2024-09-20T08:18:25+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -4529,7 +4490,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" }, "funding": [ { @@ -4545,24 +4506,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f" + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f", - "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -4607,7 +4568,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" }, "funding": [ { @@ -4623,26 +4584,25 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a287ed7475f85bf6f61890146edbc932c0fff919" + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919", - "reference": "a287ed7475f85bf6f61890146edbc932c0fff919", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", + "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -4691,7 +4651,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" }, "funding": [ { @@ -4707,24 +4667,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -4772,7 +4732,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" }, "funding": [ { @@ -4788,24 +4748,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", + "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -4852,7 +4812,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" }, "funding": [ { @@ -4868,97 +4828,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.29.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2" + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2", - "reference": "21bd091060673a1177ae842c0ef8fe30893114d2", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f68c03565dcaaf25a890667542e8bd75fe7e5bb", + "reference": "0f68c03565dcaaf25a890667542e8bd75fe7e5bb", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -5001,7 +4888,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" }, "funding": [ { @@ -5017,24 +4904,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -5081,7 +4968,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" }, "funding": [ { @@ -5097,24 +4984,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d" + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d", - "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", + "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "type": "library", "extra": { @@ -5157,7 +5044,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" }, "funding": [ { @@ -5173,25 +5060,24 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-php83", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff" + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/86fcae159633351e5fd145d1c47de6c528f8caff", - "reference": "86fcae159633351e5fd145d1c47de6c528f8caff", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", + "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-php80": "^1.14" + "php": ">=7.2" }, "type": "library", "extra": { @@ -5234,7 +5120,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" }, "funding": [ { @@ -5250,20 +5136,20 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5" + "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/8d92dd79149f29e89ee0f480254db595f6a6a2c5", - "reference": "8d92dd79149f29e89ee0f480254db595f6a6a2c5", + "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3", + "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3", "shasum": "" }, "require": { @@ -5295,7 +5181,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.8" + "source": "https://github.com/symfony/process/tree/v6.4.12" }, "funding": [ { @@ -5311,7 +5197,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-17T12:47:12+00:00" }, { "name": "symfony/proxy-manager-bridge", @@ -5382,16 +5268,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58" + "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", - "reference": "8a40d0f9b01f0fbb80885d3ce0ad6714fb603a58", + "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f", "shasum": "" }, "require": { @@ -5445,7 +5331,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.8" + "source": "https://github.com/symfony/routing/tree/v6.4.12" }, "funding": [ { @@ -5461,7 +5347,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T08:32:26+00:00" }, { "name": "symfony/service-contracts", @@ -5548,16 +5434,16 @@ }, { "name": "symfony/string", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d" + "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/a147c0f826c4a1f3afb763ab8e009e37c877a44d", - "reference": "a147c0f826c4a1f3afb763ab8e009e37c877a44d", + "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", "shasum": "" }, "require": { @@ -5614,7 +5500,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.8" + "source": "https://github.com/symfony/string/tree/v6.4.12" }, "funding": [ { @@ -5630,7 +5516,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T08:15:52+00:00" }, { "name": "symfony/translation-contracts", @@ -5712,16 +5598,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "57de1b7d7499053a2c5beb9344751e8bfd332649" + "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/57de1b7d7499053a2c5beb9344751e8bfd332649", - "reference": "57de1b7d7499053a2c5beb9344751e8bfd332649", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/09c0df13f822a1b80c5972ca1aa9eeb1288e1194", + "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194", "shasum": "" }, "require": { @@ -5801,7 +5687,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.8" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.12" }, "funding": [ { @@ -5817,20 +5703,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-15T06:35:36+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.8", + "version": "v6.4.11", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25" + "reference": "ee14c8254a480913268b1e3b1cba8045ed122694" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ad23ca4312395f0a8a8633c831ef4c4ee542ed25", - "reference": "ad23ca4312395f0a8a8633c831ef4c4ee542ed25", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694", + "reference": "ee14c8254a480913268b1e3b1cba8045ed122694", "shasum": "" }, "require": { @@ -5886,7 +5772,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.8" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.11" }, "funding": [ { @@ -5902,20 +5788,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-08-30T16:03:21+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.8", + "version": "v6.4.9", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "792ca836f99b340f2e9ca9497c7953948c49a504" + "reference": "f9a060622e0d93777b7f8687ec4860191e16802e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/792ca836f99b340f2e9ca9497c7953948c49a504", - "reference": "792ca836f99b340f2e9ca9497c7953948c49a504", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/f9a060622e0d93777b7f8687ec4860191e16802e", + "reference": "f9a060622e0d93777b7f8687ec4860191e16802e", "shasum": "" }, "require": { @@ -5963,7 +5849,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.8" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.9" }, "funding": [ { @@ -5979,20 +5865,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-06-24T15:53:56+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "52903de178d542850f6f341ba92995d3d63e60c9" + "reference": "762ee56b2649659380e0ef4d592d807bc17b7971" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/52903de178d542850f6f341ba92995d3d63e60c9", - "reference": "52903de178d542850f6f341ba92995d3d63e60c9", + "url": "https://api.github.com/repos/symfony/yaml/zipball/762ee56b2649659380e0ef4d592d807bc17b7971", + "reference": "762ee56b2649659380e0ef4d592d807bc17b7971", "shasum": "" }, "require": { @@ -6035,7 +5921,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.8" + "source": "https://github.com/symfony/yaml/tree/v6.4.12" }, "funding": [ { @@ -6051,34 +5937,41 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-17T12:47:12+00:00" }, { "name": "twig/twig", - "version": "v3.8.0", + "version": "v3.14.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", "shasum": "" }, "require": { - "php": ">=7.2.5", + "php": ">=8.0.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" + "symfony/polyfill-php81": "^1.29" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, "type": "library", "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], "psr-4": { "Twig\\": "src/" } @@ -6111,7 +6004,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + "source": "https://github.com/twigphp/Twig/tree/v3.14.0" }, "funding": [ { @@ -6123,11 +6016,11 @@ "type": "tidelift" } ], - "time": "2023-11-21T18:54:41+00:00" + "time": "2024-09-09T17:55:12+00:00" }, { "name": "web-token/jwt-key-mgmt", - "version": "3.4.3", + "version": "3.4.6", "source": { "type": "git", "url": "https://github.com/web-token/jwt-key-mgmt.git", @@ -6182,7 +6075,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.4.3" + "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.4.6" }, "funding": [ { @@ -6195,24 +6088,24 @@ }, { "name": "web-token/jwt-library", - "version": "3.4.3", + "version": "3.4.6", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", - "reference": "4b09510eec25c328525048cbdf6042a39a7c28d8" + "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-library/zipball/4b09510eec25c328525048cbdf6042a39a7c28d8", - "reference": "4b09510eec25c328525048cbdf6042a39a7c28d8", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28", + "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28", "shasum": "" }, "require": { "brick/math": "^0.9|^0.10|^0.11|^0.12", "ext-json": "*", "ext-mbstring": "*", - "paragonie/constant_time_encoding": "^2.6", - "paragonie/sodium_compat": "^1.20", + "paragonie/constant_time_encoding": "^2.6|^3.0", + "paragonie/sodium_compat": "^1.20|^2.0", "php": ">=8.1", "psr/cache": "^3.0", "psr/clock": "^1.0", @@ -6277,7 +6170,7 @@ ], "support": { "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/3.4.3" + "source": "https://github.com/web-token/jwt-library/tree/3.4.6" }, "funding": [ { @@ -6289,11 +6182,11 @@ "type": "patreon" } ], - "time": "2024-04-17T17:41:33+00:00" + "time": "2024-07-02T16:35:11+00:00" }, { "name": "web-token/jwt-signature", - "version": "3.4.3", + "version": "3.4.6", "source": { "type": "git", "url": "https://github.com/web-token/jwt-signature.git", @@ -6345,7 +6238,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-signature/tree/3.4.3" + "source": "https://github.com/web-token/jwt-signature/tree/3.4.6" }, "funding": [ { @@ -6358,7 +6251,7 @@ }, { "name": "web-token/jwt-signature-algorithm-ecdsa", - "version": "3.4.3", + "version": "3.4.6", "source": { "type": "git", "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git", @@ -6411,7 +6304,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.4.3" + "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.4.6" }, "funding": [ { @@ -6424,7 +6317,7 @@ }, { "name": "web-token/jwt-util-ecc", - "version": "3.4.3", + "version": "3.4.6", "source": { "type": "git", "url": "https://github.com/web-token/jwt-util-ecc.git", @@ -6477,7 +6370,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-util-ecc/tree/3.4.3" + "source": "https://github.com/web-token/jwt-util-ecc/tree/3.4.6" }, "funding": [ { @@ -6804,16 +6697,16 @@ }, { "name": "felixfbecker/language-server-protocol", - "version": "v1.5.2", + "version": "v1.5.3", "source": { "type": "git", "url": "https://github.com/felixfbecker/php-language-server-protocol.git", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842" + "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/6e82196ffd7c62f7794d778ca52b69feec9f2842", - "reference": "6e82196ffd7c62f7794d778ca52b69feec9f2842", + "url": "https://api.github.com/repos/felixfbecker/php-language-server-protocol/zipball/a9e113dbc7d849e35b8776da39edaf4313b7b6c9", + "reference": "a9e113dbc7d849e35b8776da39edaf4313b7b6c9", "shasum": "" }, "require": { @@ -6854,22 +6747,22 @@ ], "support": { "issues": "https://github.com/felixfbecker/php-language-server-protocol/issues", - "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.2" + "source": "https://github.com/felixfbecker/php-language-server-protocol/tree/v1.5.3" }, - "time": "2022-03-02T22:36:06+00:00" + "time": "2024-04-30T00:40:11+00:00" }, { "name": "fidry/cpu-core-counter", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42" + "reference": "8520451a140d3f46ac33042715115e290cf5785f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/f92996c4d5c1a696a6a970e20f7c4216200fcc42", - "reference": "f92996c4d5c1a696a6a970e20f7c4216200fcc42", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", + "reference": "8520451a140d3f46ac33042715115e290cf5785f", "shasum": "" }, "require": { @@ -6909,7 +6802,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.1.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" }, "funding": [ { @@ -6917,7 +6810,7 @@ "type": "github" } ], - "time": "2024-02-07T09:43:46+00:00" + "time": "2024-08-06T10:04:20+00:00" }, { "name": "laravel/homestead", @@ -7157,16 +7050,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v4.4.1", + "version": "v4.5.0", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0" + "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/132c75c7dd83e45353ebb9c6c9f591952995bbf0", - "reference": "132c75c7dd83e45353ebb9c6c9f591952995bbf0", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8e76efb98ee8b6afc54687045e1b8dba55ac76e5", + "reference": "8e76efb98ee8b6afc54687045e1b8dba55ac76e5", "shasum": "" }, "require": { @@ -7202,22 +7095,22 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v4.4.1" + "source": "https://github.com/cweiske/jsonmapper/tree/v4.5.0" }, - "time": "2024-01-31T06:18:54+00:00" + "time": "2024-09-08T10:13:13+00:00" }, { "name": "nikic/php-parser", - "version": "v4.19.1", + "version": "v4.19.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b" + "reference": "0ed4c8949a32986043e977dbe14776c14d644c45" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b", - "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ed4c8949a32986043e977dbe14776c14d644c45", + "reference": "0ed4c8949a32986043e977dbe14776c14d644c45", "shasum": "" }, "require": { @@ -7258,9 +7151,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.2" }, - "time": "2024-03-17T08:10:35+00:00" + "time": "2024-09-17T19:36:00+00:00" }, { "name": "phar-io/manifest", @@ -7669,16 +7562,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.29.1", + "version": "1.32.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4" + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/fcaefacf2d5c417e928405b71b400d4ce10daaf4", - "reference": "fcaefacf2d5c417e928405b71b400d4ce10daaf4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", "shasum": "" }, "require": { @@ -7710,41 +7603,41 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.29.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" }, - "time": "2024-05-31T08:52:43+00:00" + "time": "2024-09-26T07:23:32+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "9.2.31", + "version": "9.2.32", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965" + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965", - "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5", + "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "ext-xmlwriter": "*", - "nikic/php-parser": "^4.18 || ^5.0", + "nikic/php-parser": "^4.19.1 || ^5.1.0", "php": ">=7.3", - "phpunit/php-file-iterator": "^3.0.3", - "phpunit/php-text-template": "^2.0.2", - "sebastian/code-unit-reverse-lookup": "^2.0.2", - "sebastian/complexity": "^2.0", - "sebastian/environment": "^5.1.2", - "sebastian/lines-of-code": "^1.0.3", - "sebastian/version": "^3.0.1", - "theseer/tokenizer": "^1.2.0" + "phpunit/php-file-iterator": "^3.0.6", + "phpunit/php-text-template": "^2.0.4", + "sebastian/code-unit-reverse-lookup": "^2.0.3", + "sebastian/complexity": "^2.0.3", + "sebastian/environment": "^5.1.5", + "sebastian/lines-of-code": "^1.0.4", + "sebastian/version": "^3.0.2", + "theseer/tokenizer": "^1.2.3" }, "require-dev": { - "phpunit/phpunit": "^9.3" + "phpunit/phpunit": "^9.6" }, "suggest": { "ext-pcov": "PHP extension that provides line coverage", @@ -7753,7 +7646,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "9.2-dev" + "dev-main": "9.2.x-dev" } }, "autoload": { @@ -7782,7 +7675,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32" }, "funding": [ { @@ -7790,7 +7683,7 @@ "type": "github" } ], - "time": "2024-03-02T06:37:42+00:00" + "time": "2024-08-22T04:23:01+00:00" }, { "name": "phpunit/php-file-iterator", @@ -8035,45 +7928,45 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.19", + "version": "9.6.21", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8" + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8", - "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.3.1 || ^2", + "doctrine/instantiator": "^1.5.0 || ^2", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.10.1", - "phar-io/manifest": "^2.0.3", - "phar-io/version": "^3.0.2", + "myclabs/deep-copy": "^1.12.0", + "phar-io/manifest": "^2.0.4", + "phar-io/version": "^3.2.1", "php": ">=7.3", - "phpunit/php-code-coverage": "^9.2.28", - "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-code-coverage": "^9.2.32", + "phpunit/php-file-iterator": "^3.0.6", "phpunit/php-invoker": "^3.1.1", - "phpunit/php-text-template": "^2.0.3", - "phpunit/php-timer": "^5.0.2", - "sebastian/cli-parser": "^1.0.1", - "sebastian/code-unit": "^1.0.6", + "phpunit/php-text-template": "^2.0.4", + "phpunit/php-timer": "^5.0.3", + "sebastian/cli-parser": "^1.0.2", + "sebastian/code-unit": "^1.0.8", "sebastian/comparator": "^4.0.8", - "sebastian/diff": "^4.0.3", - "sebastian/environment": "^5.1.3", - "sebastian/exporter": "^4.0.5", - "sebastian/global-state": "^5.0.1", - "sebastian/object-enumerator": "^4.0.3", - "sebastian/resource-operations": "^3.0.3", - "sebastian/type": "^3.2", + "sebastian/diff": "^4.0.6", + "sebastian/environment": "^5.1.5", + "sebastian/exporter": "^4.0.6", + "sebastian/global-state": "^5.0.7", + "sebastian/object-enumerator": "^4.0.4", + "sebastian/resource-operations": "^3.0.4", + "sebastian/type": "^3.2.1", "sebastian/version": "^3.0.2" }, "suggest": { @@ -8118,7 +8011,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" }, "funding": [ { @@ -8134,27 +8027,27 @@ "type": "tidelift" } ], - "time": "2024-04-05T04:35:58+00:00" + "time": "2024-09-19T10:50:18+00:00" }, { "name": "psalm/plugin-symfony", - "version": "v5.2.2", + "version": "v5.2.5", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-symfony.git", - "reference": "58e109257764e8e7eab10a43a4212bbd70435f67" + "reference": "fb801a9b3d12ace9fb619febfaa3ae0bc1dbb196" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/58e109257764e8e7eab10a43a4212bbd70435f67", - "reference": "58e109257764e8e7eab10a43a4212bbd70435f67", + "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/fb801a9b3d12ace9fb619febfaa3ae0bc1dbb196", + "reference": "fb801a9b3d12ace9fb619febfaa3ae0bc1dbb196", "shasum": "" }, "require": { "ext-simplexml": "*", "php": "^8.1", "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0", - "vimeo/psalm": "^5.24" + "vimeo/psalm": "^5.16" }, "require-dev": { "doctrine/annotations": "^1.8|^2", @@ -8197,9 +8090,9 @@ "description": "Psalm Plugin for Symfony", "support": { "issues": "https://github.com/psalm/psalm-plugin-symfony/issues", - "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.2" + "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.5" }, - "time": "2024-06-06T15:34:33+00:00" + "time": "2024-07-03T11:57:02+00:00" }, { "name": "sebastian/cli-parser", @@ -9234,16 +9127,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.1", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877" + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/8f90f7a53ce271935282967f53d0894f8f1ff877", - "reference": "8f90f7a53ce271935282967f53d0894f8f1ff877", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", + "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", "shasum": "" }, "require": { @@ -9310,7 +9203,7 @@ "type": "open_collective" } ], - "time": "2024-05-22T21:24:41+00:00" + "time": "2024-09-18T10:38:58+00:00" }, { "name": "symfony/browser-kit", @@ -9382,16 +9275,16 @@ }, { "name": "symfony/cache", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "287142df5579ce223c485b3872df3efae8390984" + "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/287142df5579ce223c485b3872df3efae8390984", - "reference": "287142df5579ce223c485b3872df3efae8390984", + "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", + "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", "shasum": "" }, "require": { @@ -9458,7 +9351,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.8" + "source": "https://github.com/symfony/cache/tree/v6.4.12" }, "funding": [ { @@ -9474,7 +9367,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-16T16:01:33+00:00" }, { "name": "symfony/cache-contracts", @@ -9619,16 +9512,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "105b56a0305d219349edeb60a800082eca864e4b" + "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/105b56a0305d219349edeb60a800082eca864e4b", - "reference": "105b56a0305d219349edeb60a800082eca864e4b", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0", + "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0", "shasum": "" }, "require": { @@ -9666,7 +9559,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.8" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12" }, "funding": [ { @@ -9682,20 +9575,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-15T06:35:36+00:00" }, { "name": "symfony/framework-bundle", - "version": "v6.4.8", + "version": "v6.4.12", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "7c7739f87f1a8be1c2f5e7d28addfe763a917acb" + "reference": "6a9665bd1fae37b198429775c6132f193339434f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/7c7739f87f1a8be1c2f5e7d28addfe763a917acb", - "reference": "7c7739f87f1a8be1c2f5e7d28addfe763a917acb", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6a9665bd1fae37b198429775c6132f193339434f", + "reference": "6a9665bd1fae37b198429775c6132f193339434f", "shasum": "" }, "require": { @@ -9704,7 +9597,7 @@ "php": ">=8.1", "symfony/cache": "^5.4|^6.0|^7.0", "symfony/config": "^6.1|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", + "symfony/dependency-injection": "^6.4.12|^7.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/error-handler": "^6.1|^7.0", "symfony/event-dispatcher": "^5.4|^6.0|^7.0", @@ -9814,7 +9707,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.8" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.12" }, "funding": [ { @@ -9830,7 +9723,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-20T13:34:56+00:00" }, { "name": "theseer/tokenizer", @@ -9884,16 +9777,16 @@ }, { "name": "vimeo/psalm", - "version": "5.24.0", + "version": "5.26.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "462c80e31c34e58cc4f750c656be3927e80e550e" + "reference": "d747f6500b38ac4f7dfc5edbcae6e4b637d7add0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/462c80e31c34e58cc4f750c656be3927e80e550e", - "reference": "462c80e31c34e58cc4f750c656be3927e80e550e", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d747f6500b38ac4f7dfc5edbcae6e4b637d7add0", + "reference": "d747f6500b38ac4f7dfc5edbcae6e4b637d7add0", "shasum": "" }, "require": { @@ -9914,7 +9807,7 @@ "felixfbecker/language-server-protocol": "^1.5.2", "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "netresearch/jsonmapper": "^1.0 || ^2.0 || ^3.0 || ^4.0", - "nikic/php-parser": "^4.16", + "nikic/php-parser": "^4.17", "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0", "sebastian/diff": "^4.0 || ^5.0 || ^6.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", @@ -9990,7 +9883,7 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2024-05-01T19:32:08+00:00" + "time": "2024-09-08T18:53:08+00:00" }, { "name": "webmozart/assert", From 724ecdcdba86dc1917c18608488ba6b4b61056aa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Sep 2024 16:32:34 +0100 Subject: [PATCH 0412/1214] [ticket/17403] Update node packages PHPBB-17403 --- package-lock.json | 311 +++++++++++++++++++++++++++++----------------- 1 file changed, 194 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index d21a035c1fb..97fb758d555 100644 --- a/package-lock.json +++ b/package-lock.json @@ -595,10 +595,11 @@ } }, "node_modules/body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "content-type": "~1.0.5", @@ -608,7 +609,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -623,6 +624,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -631,7 +633,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/boolbase": { "version": "1.0.0", @@ -650,12 +653,13 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, + "license": "MIT", "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -725,6 +729,7 @@ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -734,6 +739,7 @@ "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -1027,6 +1033,7 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1316,6 +1323,7 @@ "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -1333,6 +1341,7 @@ "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -1342,6 +1351,7 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" @@ -1461,7 +1471,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/electron-to-chromium": { "version": "1.4.111", @@ -1476,10 +1487,11 @@ "dev": true }, "node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -1516,6 +1528,7 @@ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", "dev": true, + "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -1528,6 +1541,7 @@ "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1545,7 +1559,8 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/escape-string-regexp": { "version": "4.0.0", @@ -1739,6 +1754,7 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1768,37 +1784,38 @@ } }, "node_modules/express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -1958,10 +1975,11 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -1970,13 +1988,14 @@ } }, "node_modules/finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -1992,6 +2011,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2000,7 +2020,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/find-up": { "version": "4.1.0", @@ -2122,6 +2143,7 @@ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -2188,6 +2210,7 @@ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -2338,6 +2361,7 @@ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -2509,6 +2533,7 @@ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, + "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -2521,6 +2546,7 @@ "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2533,6 +2559,7 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2545,6 +2572,7 @@ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -2605,6 +2633,7 @@ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "dev": true, + "license": "MIT", "dependencies": { "depd": "2.0.0", "inherits": "2.0.4", @@ -2621,6 +2650,7 @@ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -2851,6 +2881,7 @@ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } @@ -3226,6 +3257,7 @@ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3269,10 +3301,14 @@ } }, "node_modules/merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", - "dev": true + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/merge2": { "version": "1.4.1", @@ -3293,12 +3329,13 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, + "license": "MIT", "dependencies": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" }, "engines": { @@ -3310,6 +3347,7 @@ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "dev": true, + "license": "MIT", "bin": { "mime": "cli.js" }, @@ -3587,10 +3625,14 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3627,6 +3669,7 @@ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "dev": true, + "license": "MIT", "dependencies": { "ee-first": "1.1.1" }, @@ -3763,6 +3806,7 @@ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -3822,10 +3866,11 @@ } }, "node_modules/path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", - "dev": true + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", + "dev": true, + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", @@ -4443,12 +4488,13 @@ } }, "node_modules/qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -4497,6 +4543,7 @@ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -4506,6 +4553,7 @@ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", "dev": true, + "license": "MIT", "dependencies": { "bytes": "3.1.2", "http-errors": "2.0.0", @@ -4854,10 +4902,11 @@ } }, "node_modules/send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", @@ -4882,6 +4931,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -4890,24 +4940,37 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/send/node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.8" + } }, "node_modules/send/node_modules/ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, + "license": "MIT", "dependencies": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" }, "engines": { "node": ">= 0.8.0" @@ -4918,6 +4981,7 @@ "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, + "license": "MIT", "dependencies": { "define-data-property": "^1.1.4", "es-errors": "^1.3.0", @@ -4934,7 +4998,8 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/shebang-command": { "version": "2.0.0", @@ -4962,6 +5027,7 @@ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "es-errors": "^1.3.0", @@ -5086,6 +5152,7 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -5519,6 +5586,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -5543,6 +5611,7 @@ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6" } @@ -5585,6 +5654,7 @@ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, + "license": "MIT", "dependencies": { "media-typer": "0.3.0", "mime-types": "~2.1.24" @@ -5640,6 +5710,7 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } @@ -6389,9 +6460,9 @@ } }, "body-parser": { - "version": "1.20.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.2.tgz", - "integrity": "sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==", + "version": "1.20.3", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", + "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", "dev": true, "requires": { "bytes": "3.1.2", @@ -6402,7 +6473,7 @@ "http-errors": "2.0.0", "iconv-lite": "0.4.24", "on-finished": "2.4.1", - "qs": "6.11.0", + "qs": "6.13.0", "raw-body": "2.5.2", "type-is": "~1.6.18", "unpipe": "1.0.0" @@ -6442,12 +6513,12 @@ } }, "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "requires": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" } }, "browserslist": { @@ -7033,9 +7104,9 @@ "dev": true }, "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", + "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "dev": true }, "end-of-stream": { @@ -7246,37 +7317,37 @@ } }, "express": { - "version": "4.19.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz", - "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==", + "version": "4.21.0", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", + "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", "dev": true, "requires": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.2", + "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", "cookie": "0.6.0", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.2.0", + "finalhandler": "1.3.1", "fresh": "0.5.2", "http-errors": "2.0.0", - "merge-descriptors": "1.0.1", + "merge-descriptors": "1.0.3", "methods": "~1.1.2", "on-finished": "2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", + "path-to-regexp": "0.1.10", "proxy-addr": "~2.0.7", - "qs": "6.11.0", + "qs": "6.13.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.18.0", - "serve-static": "1.15.0", + "send": "0.19.0", + "serve-static": "1.16.2", "setprototypeof": "1.2.0", "statuses": "2.0.1", "type-is": "~1.6.18", @@ -7408,22 +7479,22 @@ } }, "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "requires": { "to-regex-range": "^5.0.1" } }, "finalhandler": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", - "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", + "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "dev": true, "requires": { "debug": "2.6.9", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "on-finished": "2.4.1", "parseurl": "~1.3.3", @@ -8402,9 +8473,9 @@ } }, "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", + "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "dev": true }, "merge2": { @@ -8420,12 +8491,12 @@ "dev": true }, "micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", + "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "dev": true, "requires": { - "braces": "^3.0.2", + "braces": "^3.0.3", "picomatch": "^2.3.1" } }, @@ -8637,9 +8708,9 @@ } }, "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz", + "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==", "dev": true }, "object.defaults": { @@ -8809,9 +8880,9 @@ "dev": true }, "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.10.tgz", + "integrity": "sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==", "dev": true }, "path-type": { @@ -9201,12 +9272,12 @@ "dev": true }, "qs": { - "version": "6.11.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", - "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", + "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", "dev": true, "requires": { - "side-channel": "^1.0.4" + "side-channel": "^1.0.6" } }, "queue-microtask": { @@ -9493,9 +9564,9 @@ } }, "send": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", - "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", + "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "dev": true, "requires": { "debug": "2.6.9", @@ -9530,6 +9601,12 @@ } } }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "dev": true + }, "ms": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", @@ -9539,15 +9616,15 @@ } }, "serve-static": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", - "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", + "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "dev": true, "requires": { - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.18.0" + "send": "0.19.0" } }, "set-function-length": { From 80957d12eb96b58bfe3305d05d99928daa13b325 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 28 Sep 2024 09:26:04 -0700 Subject: [PATCH 0413/1214] [ticket/17404] Update workflow test badges PHPBB-17404 Signed-off-by: Matt Friedman --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index af3fb91de74..228d62047f6 100644 --- a/README.md +++ b/README.md @@ -42,8 +42,8 @@ We have unit and functional tests in order to prevent regressions. You can view Branch | Description | GitHub Actions | ------- | ----------- | -------------- | -**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=master) | -**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/workflows/Tests/badge.svg?branch=3.3.x) | +**master** | Latest development version | ![Tests](https://github.com/phpbb/phpbb/actions/workflows/tests.yml/badge.svg?branch=master) | +**3.3.x** | Development of version 3.3.x | ![Tests](https://github.com/phpbb/phpbb/actions/workflows/tests.yml/badge.svg?branch=3.3.x) | ## 📜 License From 990cbe093b65e12effaa430cd7aa7735258b11fe Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 29 Sep 2024 01:57:53 +0700 Subject: [PATCH 0414/1214] [ticket/17405] Fix getting UTC date/time information logic PHPBB-17405 --- phpBB/includes/functions.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 389b31bb8c7..0627fdc8b35 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -107,9 +107,17 @@ function phpbb_gmgetdate($time = false) } // getdate() interprets timestamps in local time. - // What follows uses the fact that getdate() and - // date('Z') balance each other out. - return getdate($time - date('Z')); + // So use UTC timezone temporarily to get UTC date info array. + $current_timezone = date_default_timezone_get(); + + // Set UTC timezone and get respective date info + date_default_timezone_set('UTC'); + $date_info = getdate($time); + + // Restore timezone back + date_default_timezone_set($current_timezone); + + return $date_info; } /** From fe4d8bfa7e89f0ec0c6c72fdffa392db3cb7b9f2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 29 Sep 2024 11:09:01 +0200 Subject: [PATCH 0415/1214] [ticket/17396] Use GitHub App to merge to master [skip actions] Due to no code changes that run in PRs. PHPBB-17396 --- .github/workflows/merge_3.3.x_to_master.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/merge_3.3.x_to_master.yml b/.github/workflows/merge_3.3.x_to_master.yml index 4aec43cded2..9aea009c3a3 100644 --- a/.github/workflows/merge_3.3.x_to_master.yml +++ b/.github/workflows/merge_3.3.x_to_master.yml @@ -10,11 +10,18 @@ jobs: runs-on: ubuntu-latest steps: + - uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.MERGE_MASTER_APP_ID }} + private-key: ${{ secrets.MERGE_MASTER_SECRET }} + - name: Checkout the repository uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch full history for proper merging ref: 3.3.x # Checkout the 3.3.x branch + token: ${{ steps.app-token.outputs.token }} - name: Fetch the latest commit information id: get-commit-info From 4ba4b94fe0cc2c70ed086d386a36377fe91fa9d6 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 29 Sep 2024 16:42:28 +0700 Subject: [PATCH 0416/1214] [ticket/17402] Add precaution PHPBB-17402 --- phpBB/language/en/cli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 84fb92a30ee..80766efe323 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,7 +75,7 @@ 'CLI_DESCRIPTION_REPARSER_REPARSE' => 'Reparses stored text with the current text_formatter services.', 'CLI_DESCRIPTION_REPARSER_REPARSE_ARG_1' => 'Type of text to reparse. Leave blank to reparse everything.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN' => 'Do not save any changes; just print what would happen', - 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Enforce reparsing BBCode in posts unconditionally', + 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Enforce reparsing BBCode in posts unconditionally. Please note that it will parse all BBCode in all posts, even if those were disabled or disallowed during posting.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MIN' => 'Lowest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MAX' => 'Highest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_SIZE' => 'Approximate number of records to process at a time', From 501ecf5dec56f0558d404f81ea8547870c5025ff Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 29 Sep 2024 23:38:09 +0100 Subject: [PATCH 0417/1214] [ticket/17382] Update FAQ string with new suggestion PHPBB-17382 --- phpBB/language/en/help/faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index aebd0938655..c8a0e7e1868 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -158,7 +158,7 @@ 'HELP_FAQ_SEARCH_BLANK_QUESTION' => 'Why does my search return a blank page!?', 'HELP_FAQ_SEARCH_FORUM_ANSWER' => 'Enter a search term in the search box located on the index, forum or topic pages. Advanced search can be accessed by clicking the “Advance Search” link which is available on all pages on the forum. How to access the search may depend on the style used.', 'HELP_FAQ_SEARCH_FORUM_QUESTION' => 'How can I search a forum or forums?', - 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit the members page and select the \'Find a member\' link.', + 'HELP_FAQ_SEARCH_MEMBERS_ANSWER' => 'Visit the memberlist and click the “Find a member” link.', 'HELP_FAQ_SEARCH_MEMBERS_QUESTION' => 'How do I search for members?', 'HELP_FAQ_SEARCH_NO_RESULT_ANSWER' => 'Your search was probably too vague and included many common terms which are not indexed by phpBB. Be more specific and use the options available within Advanced search.', 'HELP_FAQ_SEARCH_NO_RESULT_QUESTION' => 'Why does my search return no results?', From 767d9e1198f5725a234c894cb27ba1d116af148c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 17 Jul 2024 21:52:14 +0200 Subject: [PATCH 0418/1214] [ticket/17343] Display push notifications in user language PHPBB-17343 --- .../config/default/container/services_ucp.yml | 2 + phpBB/phpbb/notification/method/webpush.php | 8 +-- phpBB/phpbb/ucp/controller/webpush.php | 55 +++++++++++++++++-- 3 files changed, 52 insertions(+), 13 deletions(-) diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index 4930250ba27..046c342f25d 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -34,6 +34,8 @@ services: - '@controller.helper' - '@dbal.conn' - '@form_helper' + - '@language' + - '@notification_manager' - '@path_helper' - '@request' - '@user' diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 700503f97d5..e3b39bfe706 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -140,13 +140,7 @@ public function notify() { $data = $notification->get_insert_array(); $data += [ - 'push_data' => json_encode([ - 'heading' => $this->config['sitename'], - 'title' => strip_tags($notification->get_title()), - 'text' => strip_tags($notification->get_reference()), - 'url' => htmlspecialchars_decode($notification->get_url()), - 'avatar' => $notification->get_avatar(), - ]), + 'push_data' => json_encode(array_merge($notification->get_insert_array(), ['notification_type_name' => $notification->get_type()])), 'notification_time' => time(), 'push_token' => hash('sha256', random_bytes(32)) ]; diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index cac2f10291c..56a6cc61f6d 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -19,6 +19,8 @@ use phpbb\exception\http_exception; use phpbb\form\form_helper; use phpbb\json\sanitizer as json_sanitizer; +use phpbb\language\language; +use phpbb\notification\manager; use phpbb\path_helper; use phpbb\request\request_interface; use phpbb\symfony_request; @@ -47,6 +49,12 @@ class webpush /** @var form_helper */ protected $form_helper; + /** @var language */ + protected $language; + + /** @var manager */ + protected $notification_manager; + /** @var path_helper */ protected $path_helper; @@ -72,6 +80,8 @@ class webpush * @param controller_helper $controller_helper * @param driver_interface $db * @param form_helper $form_helper + * @param language $language + * @param manager $notification_manager * @param path_helper $path_helper * @param request_interface $request * @param user $user @@ -79,13 +89,15 @@ class webpush * @param string $notification_webpush_table * @param string $push_subscriptions_table */ - public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, form_helper $form_helper, path_helper $path_helper, - request_interface $request, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table) + public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, form_helper $form_helper, language $language, manager $notification_manager, + path_helper $path_helper, request_interface $request, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table) { $this->config = $config; $this->controller_helper = $controller_helper; $this->db = $db; $this->form_helper = $form_helper; + $this->language = $language; + $this->notification_manager = $notification_manager; $this->path_helper = $path_helper; $this->request = $request; $this->user = $user; @@ -147,7 +159,7 @@ private function get_user_notifications(): string $notification_data = $this->db->sql_fetchfield('push_data'); $this->db->sql_freeresult($result); - return $notification_data; + return $this->get_notification_data($notification_data); } /** @@ -178,23 +190,54 @@ private function get_anonymous_notifications(): string $push_token = $notification_row['push_token']; // Check if passed push token is valid - $sql = 'SELECT user_form_salt + $sql = 'SELECT user_form_salt, user_lang FROM ' . USERS_TABLE . ' WHERE user_id = ' . (int) $user_id; $result = $this->db->sql_query($sql); - $user_form_token = $this->db->sql_fetchfield('user_form_salt'); + $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); + $user_form_token = $row['user_form_salt']; + $user_lang = $row['user_lang']; + $expected_push_token = hash('sha256', $user_form_token . $push_token); if ($expected_push_token === $token) { - return $notification_data; + if ($user_lang !== $this->language->get_used_language()) + { + $this->language->set_user_language($user_lang, true); + } + return $this->get_notification_data($notification_data); } } throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } + private function get_notification_data(string $notification_data): string + { + $row_data = json_decode($notification_data, true); + + // Old notification data is pre-parsed and just needs to be returned + if (isset($row_data['heading'])) + { + return $notification_data; + } + + // Get notification from row_data + $notification = $this->notification_manager->get_item_type_class($row_data['notification_type_name'], $row_data); + + $notification_data = [ + 'heading' => $this->config['sitename'], + 'title' => strip_tags($notification->get_title()), + 'text' => strip_tags($notification->get_reference()), + 'url' => htmlspecialchars_decode($notification->get_url()), + 'avatar' => $notification->get_avatar(), + ]; + + return json_encode($notification_data); + } + /** * Handle request to push worker javascript * From 73a06ef4df3d941eecaae42764e252939988d14b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 1 Oct 2024 21:33:57 +0200 Subject: [PATCH 0419/1214] [ticket/17343] Fix emoji display and load users for notification text PHPBB-17343 --- .../config/default/container/services_ucp.yml | 1 + phpBB/phpbb/ucp/controller/webpush.php | 21 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index 046c342f25d..acd78f8440f 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -38,6 +38,7 @@ services: - '@notification_manager' - '@path_helper' - '@request' + - '@user_loader' - '@user' - '@template.twig.environment' - '%tables.notification_push%' diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 56a6cc61f6d..27bd1dc0490 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -25,6 +25,7 @@ use phpbb\request\request_interface; use phpbb\symfony_request; use phpbb\user; +use phpbb\user_loader; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; use Twig\Environment; @@ -61,6 +62,9 @@ class webpush /** @var request_interface */ protected $request; + /** @var user_loader */ + protected $user_loader; + /** @var user */ protected $user; @@ -84,13 +88,14 @@ class webpush * @param manager $notification_manager * @param path_helper $path_helper * @param request_interface $request + * @param user_loader $user_loader * @param user $user * @param Environment $template * @param string $notification_webpush_table * @param string $push_subscriptions_table */ public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, form_helper $form_helper, language $language, manager $notification_manager, - path_helper $path_helper, request_interface $request, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table) + path_helper $path_helper, request_interface $request, user_loader $user_loader, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table) { $this->config = $config; $this->controller_helper = $controller_helper; @@ -100,6 +105,7 @@ public function __construct(config $config, controller_helper $controller_helper $this->notification_manager = $notification_manager; $this->path_helper = $path_helper; $this->request = $request; + $this->user_loader = $user_loader; $this->user = $user; $this->template = $template; $this->notification_webpush_table = $notification_webpush_table; @@ -227,15 +233,16 @@ private function get_notification_data(string $notification_data): string // Get notification from row_data $notification = $this->notification_manager->get_item_type_class($row_data['notification_type_name'], $row_data); - $notification_data = [ + // Load users for notification + $this->user_loader->load_users($notification->users_to_query()); + + return json_encode([ 'heading' => $this->config['sitename'], - 'title' => strip_tags($notification->get_title()), - 'text' => strip_tags($notification->get_reference()), + 'title' => strip_tags(html_entity_decode($notification->get_title(), ENT_NOQUOTES, 'UTF-8')), + 'text' => strip_tags(html_entity_decode($notification->get_reference(), ENT_NOQUOTES, 'UTF-8')), 'url' => htmlspecialchars_decode($notification->get_url()), 'avatar' => $notification->get_avatar(), - ]; - - return json_encode($notification_data); + ]); } /** From 1ed5670afe263b0ee677fe3507923051816936f5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 2 Oct 2024 22:06:43 +0200 Subject: [PATCH 0420/1214] [ticket/17343] Clean up code for webpush output PHPBB-17343 --- phpBB/phpbb/notification/method/webpush.php | 13 +++++++++++- phpBB/phpbb/ucp/controller/webpush.php | 22 +++++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index e3b39bfe706..9d19cb22002 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -140,7 +140,10 @@ public function notify() { $data = $notification->get_insert_array(); $data += [ - 'push_data' => json_encode(array_merge($notification->get_insert_array(), ['notification_type_name' => $notification->get_type()])), + 'push_data' => json_encode(array_merge( + $data, + ['notification_type_name' => $notification->get_type()], + )), 'notification_time' => time(), 'push_token' => hash('sha256', random_bytes(32)) ]; @@ -345,6 +348,14 @@ public static function clean_data(array $data): array return array_intersect_key($data, $row); } + /** + * Get template data for the UCP + * + * @param helper $controller_helper + * @param form_helper $form_helper + * + * @return array + */ public function get_ucp_template_data(helper $controller_helper, form_helper $form_helper): array { $subscription_map = $this->get_user_subscription_map([$this->user->id()]); diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 27bd1dc0490..313965db63f 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -220,6 +220,13 @@ private function get_anonymous_notifications(): string throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } + /** + * Get notification data for output from json encoded data stored in database + * + * @param string $notification_data Encoded data stored in database + * + * @return string Data for notification output with javascript + */ private function get_notification_data(string $notification_data): string { $row_data = json_decode($notification_data, true); @@ -255,7 +262,6 @@ private function get_notification_data(string $notification_data): string */ public function worker(): Response { - // @todo: only work for logged in users, no anonymous & bot $content = $this->template->render('push_worker.js.twig', [ 'U_WEBPUSH_GET_NOTIFICATION' => $this->controller_helper->route('phpbb_ucp_push_get_notification_controller'), 'ASSETS_VERSION' => $this->config['assets_version'], @@ -273,20 +279,6 @@ public function worker(): Response return $response; } - /** - * Get template variables for subscribe type pages - * - * @return array - */ - protected function get_subscribe_vars(): array - { - return [ - 'U_WEBPUSH_SUBSCRIBE' => $this->controller_helper->route('phpbb_ucp_push_subscribe_controller'), - 'U_WEBPUSH_UNSUBSCRIBE' => $this->controller_helper->route('phpbb_ucp_push_unsubscribe_controller'), - 'FORM_TOKENS' => $this->form_helper->get_form_tokens(self::FORM_TOKEN_UCP), - ]; - } - /** * Check (un)subscribe form for valid link hash * From 46ea7a8ffd099449045cb7b427757efac8b2166f Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Oct 2024 12:37:30 +0700 Subject: [PATCH 0421/1214] [ticket/17391] Fix PHP warning on creating group with the name already in use PHPBB-17391 --- phpBB/includes/acp/acp_groups.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 7b1dc706db8..c2f524095f0 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -396,7 +396,7 @@ function main($id, $mode) $allow_desc_urls = $request->variable('desc_parse_urls', false); $allow_desc_smilies = $request->variable('desc_parse_smilies', false); - $submit_ary = array( + $submit_ary = [ 'colour' => $request->variable('group_colour', ''), 'rank' => $request->variable('group_rank', 0), 'receive_pm' => isset($_REQUEST['group_receive_pm']) ? 1 : 0, @@ -406,7 +406,13 @@ function main($id, $mode) 'max_recipients' => $request->variable('group_max_recipients', 0), 'founder_manage' => 0, 'skip_auth' => $request->variable('group_skip_auth', 0), - ); + + // Initialize avatar data + 'avatar' => $avatar_data['avatar'] ?? '', + 'avatar_type' => $avatar_data['avatar_type'] ?? '', + 'avatar_height' => $avatar_data['avatar_height'] ?? 0, + 'avatar_width' => $avatar_data['avatar_width'] ?? 0, + ]; if ($user->data['user_type'] == USER_FOUNDER) { From 4217dc46ca3ebfc903e817c9ed8141bfb58417ae Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Oct 2024 13:19:54 +0700 Subject: [PATCH 0422/1214] [ticket/17391] Add simple functional test PHPBB-17391 --- tests/functional/acp_groups_test.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/functional/acp_groups_test.php b/tests/functional/acp_groups_test.php index 20f12710112..34cb16b99a6 100644 --- a/tests/functional/acp_groups_test.php +++ b/tests/functional/acp_groups_test.php @@ -123,4 +123,20 @@ public function test_acp_groups_teampage($group_id, $tick_legend, $tick_teampage $this->assertEquals((bool) $tick_teampage, (bool) ($this->form_data['group_teampage'] ?? false)); } } + + public function test_acp_groups_create_existing_name() + { + $this->group_manage_login(); + + $crawler = self::request('GET', 'adm/index.php?i=groups&mode=manage&sid=' . $this->sid); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form([ + 'group_name' => 'Guests', // 'Guests' is the group name already in use for predefined Guests group + ]); + + $crawler = self::submit($form); + $form = $crawler->selectButton($this->lang('SUBMIT'))->form(); + $crawler = self::submit($form); // Just submit the form with selected group name + + $this->assertStringContainsString($this->lang('GROUP_NAME_TAKEN'), $crawler->text()); + } } From 1b0c9b22e0b037acb6fc3488a6be0f7181f94551 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 3 Oct 2024 09:32:43 +0200 Subject: [PATCH 0423/1214] [ticket/17407] Update comment in merge check if possible PHPBB-17407 --- .github/workflows/check_merge_to_master.yml | 23 ++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml index cdae703bd5d..96e0172b8fa 100644 --- a/.github/workflows/check_merge_to_master.yml +++ b/.github/workflows/check_merge_to_master.yml @@ -42,8 +42,16 @@ jobs: git merge --abort fi + - name: Find Comment + uses: peter-evans/find-comment@v3 + id: fc + with: + issue-number: ${{ github.event.pull_request.number }} + comment-author: 'github-actions[bot]' + body-includes: The attempt to merge branch `3.3.x` into `master` has completed + - name: Post comment on PR - if: always() # Ensure this step always runs, regardless of merge result + if: steps.fc.outputs.comment-id == '' uses: peter-evans/create-or-update-comment@v4 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -55,6 +63,19 @@ jobs: ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }} + - name: Update comment on PR + if: steps.fc.outputs.comment-id != '' + uses: peter-evans/create-or-update-comment@v4 + with: + token: ${{ secrets.GITHUB_TOKEN }} + comment-id: ${{ steps.fc.outputs.comment-id }} + body: | + The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. + + - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} + + ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }} + - name: Mark job as succeeded if: always() run: echo "Merge check completed. Ignoring the result to avoid failed status." From 44f04a91f36cbd9efa8e061c70767d3ebd308748 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 3 Oct 2024 11:29:30 +0200 Subject: [PATCH 0424/1214] [ticket/17407] Combine create and update step and use replace edit-mode [skip ci] Since this change won't run until merged. PHPBB-17407 --- .github/workflows/check_merge_to_master.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check_merge_to_master.yml b/.github/workflows/check_merge_to_master.yml index 96e0172b8fa..45288a072a9 100644 --- a/.github/workflows/check_merge_to_master.yml +++ b/.github/workflows/check_merge_to_master.yml @@ -51,24 +51,13 @@ jobs: body-includes: The attempt to merge branch `3.3.x` into `master` has completed - name: Post comment on PR - if: steps.fc.outputs.comment-id == '' + if: always() # Ensure this step always runs, regardless of merge result uses: peter-evans/create-or-update-comment@v4 with: token: ${{ secrets.GITHUB_TOKEN }} issue-number: ${{ github.event.pull_request.number }} - body: | - The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. - - - Merge result: ${{ steps.merge_master.outputs.mergeable == 'true' && 'Success ✅' || 'Conflict ❌' }} - - ${{ steps.merge_master.outputs.mergeable == 'true' && 'This PR is ready to be merged.' || 'A separate PR will be needed to merge `3.3.x` into `master`.' }} - - - name: Update comment on PR - if: steps.fc.outputs.comment-id != '' - uses: peter-evans/create-or-update-comment@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} comment-id: ${{ steps.fc.outputs.comment-id }} + edit-mode: replace body: | The attempt to merge branch `3.3.x` into `master` has completed after considering the changes in this PR. From 660f3d2b86697fae40b3dd6d16d3998d94c0649e Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 4 Oct 2024 22:53:32 +0700 Subject: [PATCH 0425/1214] [ticket/17402] Adjust precaution text PHPBB-17402 --- phpBB/language/en/cli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 80766efe323..8b3826da68b 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,7 +75,7 @@ 'CLI_DESCRIPTION_REPARSER_REPARSE' => 'Reparses stored text with the current text_formatter services.', 'CLI_DESCRIPTION_REPARSER_REPARSE_ARG_1' => 'Type of text to reparse. Leave blank to reparse everything.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN' => 'Do not save any changes; just print what would happen', - 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Enforce reparsing BBCode in posts unconditionally. Please note that it will parse all BBCode in all posts, even if those were disabled or disallowed during posting.', + 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Force reparsing BBCodes without exception. Be aware that this will apply to all BBCodes, including any that were disabled or restricted at the time of original text creation.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MIN' => 'Lowest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MAX' => 'Highest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_SIZE' => 'Approximate number of records to process at a time', From ecceeab70956be238dee20c5b4a8b1b43e62a9ad Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Oct 2024 14:57:17 +0200 Subject: [PATCH 0426/1214] [ticket/17398] Add referer to delete cookies route to ensure proper URLs PHPBB-17398 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0627fdc8b35..40cf689a9fe 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4069,7 +4069,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_SEARCH_UNANSWERED' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'), 'U_SEARCH_UNREAD' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'), 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), - 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller'), + 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller', ['_referer' => $controller_helper->get_current_url()]), 'U_CONTACT_US' => ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '', 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), From 36de1a49b18a247bd82e5205acd39535917d6290 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Oct 2024 17:41:17 +0200 Subject: [PATCH 0427/1214] [ticket/14404] Set board & admin timezone based on browser timezone PHPBB-14404 --- phpBB/assets/javascript/installer.js | 18 ++++++++++++++++++ .../task/add_config_settings.php | 1 + .../task/update_user_and_post_data.php | 4 +++- .../obtain_data/task/obtain_admin_data.php | 2 ++ 4 files changed, 24 insertions(+), 1 deletion(-) diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js index a11b76b8634..cfe685f88ba 100644 --- a/phpBB/assets/javascript/installer.js +++ b/phpBB/assets/javascript/installer.js @@ -605,6 +605,8 @@ function interceptFormSubmit($form) { if (!$form.length) { return; + } else if ($form.find('input[name="admin_name"]').length > 0) { + setAdminTimezone($form); } $form.find(':submit').bind('click', function (event) { @@ -612,4 +614,20 @@ submitForm($form, $(this)); }); } + + /** + * Set admin timezone in form + * + * @param $form + */ + function setAdminTimezone($form) { + // Set admin timezone if it does not exist yet + if ($form.find('input[name="admin_timezone"]').length === 0) { + const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone; + + // Add timezone as form entry + const timezoneEntry = $(''); + $form.append(timezoneEntry); + } + } })(jQuery); // Avoid conflicts with other libraries diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php index bd3f0852e60..5b9a9da5360 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php +++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php @@ -132,6 +132,7 @@ public function run() $updates = [ 'board_startdate' => (string) $current_time, + 'board_timezone' => $this->install_config->get('admin_timezone'), 'default_lang' => $this->install_config->get('default_lang'), 'server_name' => $this->install_config->get('server_name'), diff --git a/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php b/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php index ba178135b94..7cc5fd4f49f 100644 --- a/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php +++ b/phpBB/phpbb/install/module/install_database/task/update_user_and_post_data.php @@ -114,7 +114,8 @@ public function run() . ' user_lang = :lang,' . ' user_email = :email,' . ' user_dateformat = :dateformat,' - . ' username_clean = :clean_username' + . ' username_clean = :clean_username,' + . ' user_timezone = :timezone' . ' WHERE username = \'Admin\''; $this->create_and_execute_prepared_stmt($sql, [ @@ -125,6 +126,7 @@ public function run() 'email' => $this->install_config->get('board_email'), 'dateformat' => $this->language->lang('default_dateformat'), 'clean_username' => utf8_clean_string($this->install_config->get('admin_name')), + 'timezone' => $this->install_config->get('admin_timezone'), ]); $this->exec_sql('UPDATE ' . $this->user_table . ' SET user_regdate = ' . $current_time); diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php index 0560f2d46d8..1175ab86260 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_admin_data.php @@ -71,6 +71,7 @@ protected function process_form() $admin_pass1 = $this->io_handler->get_input('admin_pass1', '', true); $admin_pass2 = $this->io_handler->get_input('admin_pass2', '', true); $board_email = $this->io_handler->get_input('board_email', '', true); + $admin_timezone = $this->io_handler->get_input('admin_timezone', 'UTC', true); $admin_data_valid = $this->check_admin_data($admin_name, $admin_pass1, $admin_pass2, $board_email); @@ -79,6 +80,7 @@ protected function process_form() $this->install_config->set('admin_name', $admin_name); $this->install_config->set('admin_passwd', $admin_pass1); $this->install_config->set('board_email', $board_email); + $this->install_config->set('admin_timezone', $admin_timezone); } else { From 8129208e566737d36702338a058e04e868e58c6d Mon Sep 17 00:00:00 2001 From: Jeff Verkoeyen Date: Wed, 18 Sep 2024 20:49:14 -0700 Subject: [PATCH 0428/1214] [ticket/17397] Add core.viewforum_modify_sql event PHPBB-17397 --- phpBB/viewforum.php | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 7f5cdd34da1..300d57d0c72 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -47,27 +47,45 @@ trigger_error('NO_FORUM'); } -$sql_from = FORUMS_TABLE . ' f'; +$sql_ary = [ + 'SELECT' => 'f.*', + 'FROM' => [ + FORUMS_TABLE => 'f', + ], + 'WHERE' => 'f.forum_id = ' . $forum_id, +]; + $lastread_select = ''; // Grab appropriate forum data if ($config['load_db_lastread'] && $user->data['is_registered']) { - $sql_from .= ' LEFT JOIN ' . FORUMS_TRACK_TABLE . ' ft ON (ft.user_id = ' . $user->data['user_id'] . ' - AND ft.forum_id = f.forum_id)'; - $lastread_select .= ', ft.mark_time'; + $sql_ary['LEFT_JOIN'][] = [ + 'FROM' => [FORUMS_TRACK_TABLE => 'ft'], + 'ON' => 'ft.user_id = ' . $user->data['user_id'] . ' AND ft.forum_id = f.forum_id', + ]; + $sql_ary['SELECT'] .= ', ft.mark_time'; } if ($user->data['is_registered']) { - $sql_from .= ' LEFT JOIN ' . FORUMS_WATCH_TABLE . ' fw ON (fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'] . ')'; - $lastread_select .= ', fw.notify_status'; + $sql_ary['LEFT_JOIN'][] = [ + 'FROM' => [FORUMS_WATCH_TABLE => 'fw'], + 'ON' => 'fw.forum_id = f.forum_id AND fw.user_id = ' . $user->data['user_id'], + ]; + $sql_ary['SELECT'] .= ', fw.notify_status'; } -$sql = "SELECT f.* $lastread_select - FROM $sql_from - WHERE f.forum_id = $forum_id"; -$result = $db->sql_query($sql); +/** + * You can use this event to modify the sql that selects the forum on the viewforum page. + * + * @event core.viewforum_modify_sql + * @var array sql_ary The SQL array to get the data for a forum + * @since 3.3.14-RC1 + */ +$vars = ['sql_ary']; +extract($phpbb_dispatcher->trigger_event('core.viewforum_modify_sql', compact($vars))); +$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); $forum_data = $db->sql_fetchrow($result); $db->sql_freeresult($result); From fd58e4f338fa9fcbf99199d17d3385f29d361572 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 9 Oct 2024 20:16:30 +0200 Subject: [PATCH 0429/1214] [ticket/17398] Use referer for web paths in ajax requests PHPBB-17398 --- phpBB/includes/functions.php | 2 +- phpBB/phpbb/path_helper.php | 4 ++-- tests/path_helper/path_helper_test.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 40cf689a9fe..0627fdc8b35 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4069,7 +4069,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_SEARCH_UNANSWERED' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unanswered'), 'U_SEARCH_UNREAD' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'), 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), - 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller', ['_referer' => $controller_helper->get_current_url()]), + 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller'), 'U_CONTACT_US' => ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '', 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index bcfb7381447..5954ec163a0 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -223,13 +223,13 @@ public function get_web_root_path() * * The referer must be specified as a parameter in the query. */ - if ($this->request->is_ajax() && $this->symfony_request->get('_referer')) + if ($this->request->is_ajax() && $this->request->header('Referer')) { // We need to escape $absolute_board_url because it can be partially concatenated to the result. $absolute_board_url = $this->request->escape($this->symfony_request->getSchemeAndHttpHost() . $this->symfony_request->getBasePath(), true); $referer_web_root_path = $this->get_web_root_path_from_ajax_referer( - $this->symfony_request->get('_referer'), + $this->request->header('Referer'), $absolute_board_url ); return $this->web_root_path = $referer_web_root_path; diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index 8d010c2f06f..16c67192886 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -470,9 +470,6 @@ public function test_get_web_root_path_ajax() ->setConstructorArgs([new phpbb_mock_request()]) ->setMethods(['get', 'getSchemeAndHttpHost', 'getBasePath', 'getPathInfo']) ->getMock(); - $symfony_request->method('get') - ->with('_referer') - ->willReturn('http://www.phpbb.com/community/route1/route2/'); $symfony_request->method('getSchemeAndHttpHost') ->willReturn('http://www.phpbb.com'); $symfony_request->method('getBasePath') @@ -486,6 +483,9 @@ public function test_get_web_root_path_ajax() ->willReturn(true); $request->method('escape') ->willReturnArgument(0); + $request->method('header') + ->with('Referer') + ->willReturn('http://www.phpbb.com/community/route1/route2/'); $path_helper = new \phpbb\path_helper( $symfony_request, From b1282fcbc7a06c8f108d631341aa3e15284cb057 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 10 Oct 2024 21:38:19 +0200 Subject: [PATCH 0430/1214] [ticket/17410] Only fall back acp main page when in ACP with test permission PHPBB-17410 --- phpBB/includes/functions_module.php | 4 +- tests/functional/switch_permissions_test.php | 51 +++++++++++++++++++- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 53ea967fac0..573c4146d18 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -502,8 +502,8 @@ function set_active($id = false, $mode = false) $id = $this->p_class . '_' . $id; } - // Fallback to acp main page for special restore permission mode - if ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) + // Fallback to acp main page for special test permission mode + if ($this->p_class === 'acp' && $user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) { $id = ''; $mode = ''; diff --git a/tests/functional/switch_permissions_test.php b/tests/functional/switch_permissions_test.php index a8c64422f36..b7e8819a6e3 100644 --- a/tests/functional/switch_permissions_test.php +++ b/tests/functional/switch_permissions_test.php @@ -28,7 +28,7 @@ protected function setUp(): void $this->add_lang(['common', 'ucp']); } - public function test_switch_permissions() + public function test_switch_permissions_acp() { $user_id = $this->create_user(self::TEST_USER); @@ -67,4 +67,53 @@ public function test_switch_permissions() $crawler->text() ); } + + /** + * @depends test_switch_permissions_acp + */ + public function test_switch_permissions_ucp() + { + $db = $this->get_db(); + $sql = 'SELECT user_id + FROM ' . USERS_TABLE . " + WHERE username = '" . self::TEST_USER . "'"; + $result = $db->sql_query($sql); + $user_id = $db->sql_fetchfield('user_id'); + $db->sql_freeresult($result); + + // Open memberlist profile page for user + $crawler = self::request('GET', "memberlist.php?mode=viewprofile&u={$user_id}&sid={$this->sid}"); + + // Use permissions + $link = $crawler->selectLink($this->lang('USE_PERMISSIONS'))->link(); + $crawler = self::$client->click($link); + + // Check that we switched permissions to test user + $this->assertStringContainsString( + str_replace('
                ', '
                ', $this->lang('PERMISSIONS_TRANSFERRED', self::TEST_USER)), + $crawler->html() + ); + + // Check that UCP pages don't get forced to UCP main with restore permission info + $this->add_lang(['memberlist', 'ucp']); + $crawler = self::request('GET', "ucp.php?i=ucp_profile&mode=profile_info&sid={$this->sid}"); + $this->assertStringContainsString( + $this->lang('EDIT_PROFILE'), + $crawler->text() + ); + + // Check that restore permissions link exists + $crawler = self::$client->request('GET', 'index.php?sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('RESTORE_PERMISSIONS'), + $crawler->text() + ); + + // Check that restore permissions works + $crawler = self::$client->request('GET', 'ucp.php?mode=restore_perm&sid=' . $this->sid); + $this->assertStringContainsString( + $this->lang('PERMISSIONS_RESTORED'), + $crawler->text() + ); + } } From 4a039d853fd8d7ce9dbce1e4882203349dfffc60 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 11 Oct 2024 20:13:22 +0200 Subject: [PATCH 0431/1214] [ticket/17376] Update default formatting test PHPBB-17376 --- tests/text_formatter/s9e/default_formatting_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index 20127204b38..97b04c2fb7d 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -283,7 +283,7 @@ public function get_default_formatting_tests() ), array( '[quote=Username post_id=123]...[/quote]', - '
                Username wrote: ↑...
                ' + '
                Username wrote: ...
                ' ), array( // Users are not allowed to submit their own URL for the post From 6c35cea146b6dfcfbffbd0129f459f00a54aa8ce Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 17 Oct 2024 00:31:42 +0700 Subject: [PATCH 0432/1214] [ticket/17402] Adjust description PHPBB-17402 --- phpBB/language/en/cli.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/cli.php b/phpBB/language/en/cli.php index 8b3826da68b..e872df60b2c 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,7 +75,7 @@ 'CLI_DESCRIPTION_REPARSER_REPARSE' => 'Reparses stored text with the current text_formatter services.', 'CLI_DESCRIPTION_REPARSER_REPARSE_ARG_1' => 'Type of text to reparse. Leave blank to reparse everything.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_DRY_RUN' => 'Do not save any changes; just print what would happen', - 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Force reparsing BBCodes without exception. Be aware that this will apply to all BBCodes, including any that were disabled or restricted at the time of original text creation.', + 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_FORCE_BBCODE' => 'Re-parse all BBCodes without exception. Note that any previously disabled BBCodes will be reprocessed, enabled, and fully rendered.', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MIN' => 'Lowest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_MAX' => 'Highest record ID to process', 'CLI_DESCRIPTION_REPARSER_REPARSE_OPT_RANGE_SIZE' => 'Approximate number of records to process at a time', From 43ff56a7a7e0dfe925e5162728d9c0c892687afb Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 17 Oct 2024 11:01:43 +0700 Subject: [PATCH 0433/1214] [ticket/17411] Add core event to search.php PHPBB-17411 --- phpBB/search.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index a81c42e6f00..642bee9c39e 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -90,8 +90,21 @@ break; } +$search_auth_check_override = false; +/** +* This event allows you to override serach auth checks +* +* @event core.search_auth_check_override +* @var bool search_auth_check_override Whether or not the search auth check overridden +* @since 3.3.14-RC1 +*/ +$vars = [ + 'search_auth_check_override', +]; +extract($phpbb_dispatcher->trigger_event('core.search_auth_check_override', compact($vars))); + // Is user able to search? Has search been disabled? -if (!$auth->acl_get('u_search') || !$auth->acl_getf_global('f_search') || !$config['load_search']) +if (!$search_auth_check_override && (!$auth->acl_get('u_search') || !$auth->acl_getf_global('f_search') || !$config['load_search'])) { $template->assign_var('S_NO_SEARCH', true); trigger_error('NO_SEARCH'); From b828c56dc926dc47029834235c08e6b876f53e7f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 31 Aug 2024 22:05:42 +0200 Subject: [PATCH 0434/1214] [ticket/17414] Start work on new captcha classes PHPBB-17414 --- .../captcha/plugins/plugin_interface.php | 42 +++++++++ phpBB/phpbb/captcha/plugins/turnstile.php | 93 +++++++++++++++++++ .../foo/test_captcha/captcha/test_captcha.php | 33 +++++++ .../ext/foo/test_captcha/composer.json | 23 +++++ .../ext/foo/test_captcha/config/services.yml | 5 + 5 files changed, 196 insertions(+) create mode 100644 phpBB/phpbb/captcha/plugins/plugin_interface.php create mode 100644 phpBB/phpbb/captcha/plugins/turnstile.php create mode 100644 tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php create mode 100644 tests/functional/fixtures/ext/foo/test_captcha/composer.json create mode 100644 tests/functional/fixtures/ext/foo/test_captcha/config/services.yml diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php new file mode 100644 index 00000000000..f40745db21d --- /dev/null +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -0,0 +1,42 @@ +config = $config; + } + + public function is_available() + { + return ($this->config->offsetGet('captcha_turnstile_key') ?? false); + } + + public function get_template() + { + return 'custom_captcha.html'; // Template file for displaying the CAPTCHA + } + + public function execute() + { + // Perform any necessary initialization or setup + } + + public function validate() + { + // Implement server-side validation logic here + // Example: Validate the submitted CAPTCHA value using Cloudflare API + + // Your Cloudflare API credentials + $api_email = 'your_email@example.com'; + $api_key = 'your_api_key'; + + // Cloudflare API endpoint for CAPTCHA verification + $endpoint = 'https://api.cloudflare.com/client/v4/captcha/validate'; + + // CAPTCHA data to be sent in the request + $data = [ + 'email' => $api_email, + 'key' => $api_key, + 'response' => $this->confirm_code + ]; + + // Initialize cURL session + $ch = curl_init(); + + // Set cURL options + curl_setopt_array($ch, [ + CURLOPT_URL => $endpoint, + CURLOPT_POST => true, + CURLOPT_POSTFIELDS => json_encode($data), + CURLOPT_HTTPHEADER => [ + 'Content-Type: application/json', + 'Accept: application/json' + ], + CURLOPT_RETURNTRANSFER => true + ]); + + // Execute the cURL request + $response = curl_exec($ch); + + // Check for errors + if ($response === false) { + // Handle cURL error + curl_close($ch); + return false; + } + + // Decode the JSON response + $result = json_decode($response, true); + + // Check if the response indicates success + if (isset($result['success']) && $result['success'] === true) { + // CAPTCHA validation passed + curl_close($ch); + return true; + } else { + // CAPTCHA validation failed + curl_close($ch); + return false; + } + } + + public function get_generator_class() + { + throw new \Exception('No generator class given.'); + } +} \ No newline at end of file diff --git a/tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php b/tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php new file mode 100644 index 00000000000..fb8c6ed0901 --- /dev/null +++ b/tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php @@ -0,0 +1,33 @@ +=8.1" + }, + "extra": { + "display-name": "phpBB 4.0 Test Captcha", + "soft-require": { + "phpbb/phpbb": "4.0.*@dev" + } + } +} diff --git a/tests/functional/fixtures/ext/foo/test_captcha/config/services.yml b/tests/functional/fixtures/ext/foo/test_captcha/config/services.yml new file mode 100644 index 00000000000..75cdf52270c --- /dev/null +++ b/tests/functional/fixtures/ext/foo/test_captcha/config/services.yml @@ -0,0 +1,5 @@ +services: + foo_test_captcha.captcha.test_captcha: + class: foo\test_captcha\captcha\test_captcha + tags: + - { name: captcha.plugins } From 1b8918448975b923fac78445ecfa5fe6e9dfe554 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 3 Oct 2024 21:18:14 +0200 Subject: [PATCH 0435/1214] [ticket/17415] Start adding legacy wrapper for old captchas PHPBB-17415 --- .../phpbb/captcha/plugins/legacy_wrapper.php | 82 +++++++++++++++++++ .../captcha/plugins/plugin_interface.php | 13 ++- phpBB/phpbb/captcha/plugins/turnstile.php | 11 +++ 3 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 phpBB/phpbb/captcha/plugins/legacy_wrapper.php diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php new file mode 100644 index 00000000000..90ff01995b3 --- /dev/null +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -0,0 +1,82 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\captcha\plugins; + +class legacy_wrapper implements plugin_interface +{ + private $legacy_captcha; + + public function __construct($legacy_captcha) + { + $this->legacy_captcha = $legacy_captcha; + } + + /** + * Check if the plugin is available + * @return bool True if the plugin is available, false if not + */ + public function is_available(): bool + { + if (method_exists($this->legacy_captcha, 'is_available')) + { + return $this->legacy_captcha->is_available(); + } + + return false; + } + + /** + * Check if the plugin has a configuration + * + * @return bool True if the plugin has a configuration, false if not + */ + public function has_config(): bool + { + if (method_exists($this->legacy_captcha, 'has_config')) + { + return $this->legacy_captcha->has_config(); + } + + return false; + } + + /** + * Get the name of the plugin, should be language variable + * + * @return string + */ + public function get_name(): string + { + if (method_exists($this->legacy_captcha, 'get_name')) + { + return $this->legacy_captcha->has_config(); + } + + return false; + } + + /** + * Display the captcha for the specified type + * + * @param int $type Type of captcha, should be one of the CONFIRMATION_* constants + * @return void + */ + public function show(int $type): void + { + if (method_exists($this->legacy_captcha, 'init')) + { + $this->legacy_captcha->init($type); + } + } +} \ No newline at end of file diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index f40745db21d..51c8d3d23d8 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -1,4 +1,15 @@ + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ namespace phpbb\captcha\plugins; @@ -30,7 +41,7 @@ public function has_config(): bool; * * @return string */ - public static function get_name(): string; + public function get_name(): string; /** * Display the captcha for the specified type diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 1388f33012f..130949e708e 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -1,4 +1,15 @@ + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ namespace phpbb\captcha\plugins; From 15b51e3b8f8f9aeeeecf6522d83377233e909060 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 4 Oct 2024 13:42:18 +0200 Subject: [PATCH 0436/1214] [ticket/17414] Deprecate captcha constants PHPBB-17414 --- phpBB/includes/constants.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 3304194cf42..0ef409767d7 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -152,9 +152,13 @@ define('FULL_FOLDER_HOLD', -1); // Confirm types +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_REGISTRATION, to be removed in 5.0.0-a1 */ define('CONFIRM_REG', 1); +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_LOGIN, to be removed in 5.0.0-a1 */ define('CONFIRM_LOGIN', 2); +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_POST, to be removed in 5.0.0-a1 */ define('CONFIRM_POST', 3); +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_REPORT, to be removed in 5.0.0-a1 */ define('CONFIRM_REPORT', 4); // Categories - Attachments From e84e9cace4e10b2a6d5a759d9ab82ffc3e313521 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 4 Oct 2024 13:42:45 +0200 Subject: [PATCH 0437/1214] [ticket/17414] Extend plugin interface and wrapper PHPBB-17414 --- phpBB/includes/ucp/ucp_register.php | 8 ++- phpBB/phpbb/captcha/factory.php | 15 ++++- .../phpbb/captcha/plugins/legacy_wrapper.php | 64 ++++++++++++++++++- .../captcha/plugins/plugin_interface.php | 40 ++++++++++-- phpBB/posting.php | 8 ++- 5 files changed, 119 insertions(+), 16 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 40b14a9b54f..8ad37047cb8 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -235,8 +235,10 @@ function main($id, $mode) // The CAPTCHA kicks in here. We can't help that the information gets lost on language change. if ($config['enable_confirm']) { - $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']); - $captcha->init(CONFIRM_REG); + /** @var \phpbb\captcha\factory $captcha_factory */ + $captcha_factory = $phpbb_container->get('captcha.factory'); + $captcha = $captcha_factory->get_instance($config['captcha_plugin']); + $captcha->init(\phpbb\captcha\plugins\plugin_interface::CONFIRM_REGISTRATION); } $timezone = $config['board_timezone']; @@ -426,7 +428,7 @@ function main($id, $mode) } // Okay, captcha, your job is done. - if ($config['enable_confirm'] && isset($captcha)) + if ($config['enable_confirm']) { $captcha->reset(); } diff --git a/phpBB/phpbb/captcha/factory.php b/phpBB/phpbb/captcha/factory.php index 2e75ce8667f..971a7b21181 100644 --- a/phpBB/phpbb/captcha/factory.php +++ b/phpBB/phpbb/captcha/factory.php @@ -13,6 +13,9 @@ namespace phpbb\captcha; +use phpbb\captcha\plugins\legacy_wrapper; +use phpbb\captcha\plugins\plugin_interface; + class factory { /** @@ -41,11 +44,17 @@ public function __construct(\Symfony\Component\DependencyInjection\ContainerInte * Return a new instance of a given plugin * * @param $name - * @return object|null + * @return plugin_interface */ - public function get_instance($name) + public function get_instance($name): plugin_interface { - return $this->container->get($name); + $captcha = $this->container->get($name); + if ($captcha instanceof plugin_interface) + { + return $captcha; + } + + return new legacy_wrapper($name); } /** diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 90ff01995b3..bceb7718003 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -17,6 +17,8 @@ class legacy_wrapper implements plugin_interface { private $legacy_captcha; + private string $last_error; + public function __construct($legacy_captcha) { $this->legacy_captcha = $legacy_captcha; @@ -72,11 +74,69 @@ public function get_name(): string * @param int $type Type of captcha, should be one of the CONFIRMATION_* constants * @return void */ - public function show(int $type): void + public function init(int $type): void { if (method_exists($this->legacy_captcha, 'init')) { $this->legacy_captcha->init($type); } } -} \ No newline at end of file + + /** + * {@inheritDoc} + */ + public function validate(array $request_data): bool + { + if (method_exists($this->legacy_captcha, 'validate')) + { + $error = $this->legacy_captcha->validate($request_data); + if ($error) + { + $this->last_error = $error; + return false; + } + + return true; + } + + return false; + } + + /** + * {@inheritDoc} + */ + public function is_solved(): bool + { + if (method_exists($this->legacy_captcha, 'is_solved')) + { + return $this->legacy_captcha->is_solved(); + } + + return false; + } + + /** + * {@inheritDoc} + */ + public function reset(): void + { + if (method_exists($this->legacy_captcha, 'reset')) + { + $this->legacy_captcha->reset(); + } + } + + /** + * {@inheritDoc} + */ + public function get_attempt_count(): int + { + if (method_exists($this->legacy_captcha, 'get_attempt_count')) + { + return $this->legacy_captcha->get_attempt_count(); + } + + // Ensure this is deemed as too many attempts + return PHP_INT_MAX; + } +} diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index 51c8d3d23d8..9d0b0cb4de3 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -15,16 +15,17 @@ interface plugin_interface { - const CONFIRMATION_REGISTRATION = 1; - const CONFIRMATION_LOGIN = 2; + const CONFIRM_REGISTRATION = 1; + const CONFIRM_LOGIN = 2; - const CONFIRMATION_POST = 3; + const CONFIRM_POST = 3; - const CONFIRMATION_REPORT = 4; + const CONFIRM_REPORT = 4; /** * Check if the plugin is available + * * @return bool True if the plugin is available, false if not */ public function is_available(): bool; @@ -49,5 +50,34 @@ public function get_name(): string; * @param int $type Type of captcha, should be one of the CONFIRMATION_* constants * @return void */ - public function show(int $type): void; + public function init(int $type): void; + + /** + * Validate the captcha with the given request data + * + * @param array $request_data Request data for the captcha + * @return bool True if request data was valid captcha reply, false if not + */ + public function validate(array $request_data): bool; + + /** + * Return whether captcha was solved + * + * @return bool True if captcha was solved, false if not + */ + public function is_solved(): bool; + + /** + * Reset captcha state, e.g. after checking if it's valid + * + * @return void + */ + public function reset(): void; + + /** + * Get attempt count for this captcha and user + * + * @return int Number of attempts + */ + public function get_attempt_count(): int; } diff --git a/phpBB/posting.php b/phpBB/posting.php index 63ca4fef97b..988b7f03e2a 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -455,8 +455,10 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered']) { - $captcha = $phpbb_container->get('captcha.factory')->get_instance($config['captcha_plugin']); - $captcha->init(CONFIRM_POST); + /** @var \phpbb\captcha\factory $captcha_factory */ + $captcha_factory = $phpbb_container->get('captcha.factory'); + $captcha = $captcha_factory->get_instance($config['captcha_plugin']); + $captcha->init(\phpbb\captcha\plugins\plugin_interface::CONFIRM_POST); } // Is the user able to post within this forum? @@ -1600,7 +1602,7 @@ ); extract($phpbb_dispatcher->trigger_event('core.posting_modify_submit_post_after', compact($vars))); - if ($config['enable_post_confirm'] && !$user->data['is_registered'] && (isset($captcha) && $captcha->is_solved() === true) && ($mode == 'post' || $mode == 'reply' || $mode == 'quote')) + if ($config['enable_post_confirm'] && !$user->data['is_registered'] && $captcha->is_solved() === true && ($mode == 'post' || $mode == 'reply' || $mode == 'quote')) { $captcha->reset(); } From ae9f97b7e2dd8b75b23d62c8ee26ab99d96355f6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 14:17:40 +0200 Subject: [PATCH 0438/1214] [ticket/17415] Move install step of Q&A to migration PHPBB-17415 --- phpBB/phpbb/captcha/plugins/qa.php | 50 ----------- .../db/migration/data/v400/qa_captcha.php | 89 +++++++++++++++++++ 2 files changed, 89 insertions(+), 50 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/qa_captcha.php diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index b9bfac33f14..106cedb7c2a 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -336,56 +336,6 @@ function uninstall() */ function install() { - global $phpbb_container; - - $db_tool = $phpbb_container->get('dbal.tools'); - $schemas = array( - $this->table_captcha_questions => array ( - 'COLUMNS' => array( - 'question_id' => array('UINT', null, 'auto_increment'), - 'strict' => array('BOOL', 0), - 'lang_id' => array('UINT', 0), - 'lang_iso' => array('VCHAR:30', ''), - 'question_text' => array('TEXT_UNI', ''), - ), - 'PRIMARY_KEY' => 'question_id', - 'KEYS' => array( - 'lang' => array('INDEX', 'lang_iso'), - ), - ), - $this->table_captcha_answers => array ( - 'COLUMNS' => array( - 'question_id' => array('UINT', 0), - 'answer_text' => array('STEXT_UNI', ''), - ), - 'KEYS' => array( - 'qid' => array('INDEX', 'question_id'), - ), - ), - $this->table_qa_confirm => array ( - 'COLUMNS' => array( - 'session_id' => array('CHAR:32', ''), - 'confirm_id' => array('CHAR:32', ''), - 'lang_iso' => array('VCHAR:30', ''), - 'question_id' => array('UINT', 0), - 'attempts' => array('UINT', 0), - 'confirm_type' => array('USINT', 0), - ), - 'KEYS' => array( - 'session_id' => array('INDEX', 'session_id'), - 'lookup' => array('INDEX', array('confirm_id', 'session_id', 'lang_iso')), - ), - 'PRIMARY_KEY' => 'confirm_id', - ), - ); - - foreach ($schemas as $table => $schema) - { - if (!$db_tool->sql_table_exists($table)) - { - $db_tool->sql_create_table($table, $schema); - } - } } /** diff --git a/phpBB/phpbb/db/migration/data/v400/qa_captcha.php b/phpBB/phpbb/db/migration/data/v400/qa_captcha.php new file mode 100644 index 00000000000..69cca2dc15d --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/qa_captcha.php @@ -0,0 +1,89 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class qa_captcha extends migration +{ + public function effectively_installed(): bool + { + return $this->db_tools->sql_table_exists($this->tables['captcha_qa_questions']) + && $this->db_tools->sql_table_exists($this->tables['captcha_qa_answers']) + && $this->db_tools->sql_table_exists($this->tables['captcha_qa_confirm']); + } + + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function update_schema(): array + { + return [ + 'add_tables' => [ + $this->tables['captcha_qa_questions'] => [ + 'COLUMNS' => [ + 'question_id' => ['UINT', null, 'auto_increment'], + 'strict' => ['BOOL', 0], + 'lang_id' => ['UINT', 0], + 'lang_iso' => ['VCHAR:30', ''], + 'question_text' => ['TEXT_UNI', ''], + ], + 'PRIMARY_KEY' => 'question_id', + 'KEYS' => [ + 'lang' => ['INDEX', 'lang_iso'], + ], + ], + $this->tables['captcha_qa_answers'] => [ + 'COLUMNS' => [ + 'question_id' => ['UINT', 0], + 'answer_text' => ['STEXT_UNI', ''], + ], + 'KEYS' => [ + 'qid' => ['INDEX', 'question_id'], + ], + ], + $this->tables['captcha_qa_confirm'] => [ + 'COLUMNS' => [ + 'session_id' => ['CHAR:32', ''], + 'confirm_id' => ['CHAR:32', ''], + 'lang_iso' => ['VCHAR:30', ''], + 'question_id' => ['UINT', 0], + 'attempts' => ['UINT', 0], + 'confirm_type' => ['USINT', 0], + ], + 'KEYS' => [ + 'session_id' => ['INDEX', 'session_id'], + 'lookup' => ['INDEX', ['confirm_id', 'session_id', 'lang_iso']], + ], + 'PRIMARY_KEY' => 'confirm_id', + ], + ], + ]; + } + + public function revert_schema(): array + { + return [ + 'drop_tables' => [ + $this->tables['captcha_qa_questions'], + $this->tables['captcha_qa_answers'], + $this->tables['captcha_qa_confirm'] + ], + ]; + } +} From 89bb72c277cf2c10a1f58182fdd0da962752c874 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 17:05:38 +0200 Subject: [PATCH 0439/1214] [ticket/17415] Correctly wrap legacy captchas PHPBB-17415 --- phpBB/phpbb/captcha/factory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/captcha/factory.php b/phpBB/phpbb/captcha/factory.php index 971a7b21181..d9259d8da96 100644 --- a/phpBB/phpbb/captcha/factory.php +++ b/phpBB/phpbb/captcha/factory.php @@ -54,7 +54,7 @@ public function get_instance($name): plugin_interface return $captcha; } - return new legacy_wrapper($name); + return new legacy_wrapper($captcha); } /** From 8429145241759a0966caf7f28085ddd59e63f4b0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 17:06:10 +0200 Subject: [PATCH 0440/1214] [ticket/17414] Remove install steps for captcha plugins This should be handled by migrations instead. PHPBB-17414 --- phpBB/includes/acp/acp_captcha.php | 4 +- .../captcha/plugins/captcha_abstract.php | 5 -- .../phpbb/captcha/plugins/legacy_wrapper.php | 48 ++++++++++++++----- .../captcha/plugins/plugin_interface.php | 17 +++++++ phpBB/phpbb/captcha/plugins/qa.php | 12 ----- phpBB/phpbb/captcha/plugins/recaptcha.php | 5 -- 6 files changed, 54 insertions(+), 37 deletions(-) diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index ff9f515d322..69e13463aba 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -128,11 +128,9 @@ function main($id, $mode) if (isset($captchas['available'][$selected])) { $old_captcha = $factory->get_instance($config['captcha_plugin']); - $old_captcha->uninstall(); + $old_captcha->garbage_collect(); $config->set('captcha_plugin', $selected); - $new_captcha = $factory->get_instance($config['captcha_plugin']); - $new_captcha->install(); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_CONFIG_VISUAL'); } diff --git a/phpBB/phpbb/captcha/plugins/captcha_abstract.php b/phpBB/phpbb/captcha/plugins/captcha_abstract.php index 012e28c9872..fb8ccc5a702 100644 --- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php +++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php @@ -184,11 +184,6 @@ function uninstall() $this->garbage_collect(0); } - function install() - { - return; - } - function validate() { global $user; diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index bceb7718003..e57abbb9670 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -25,8 +25,7 @@ public function __construct($legacy_captcha) } /** - * Check if the plugin is available - * @return bool True if the plugin is available, false if not + * {@inheritDoc} */ public function is_available(): bool { @@ -39,9 +38,7 @@ public function is_available(): bool } /** - * Check if the plugin has a configuration - * - * @return bool True if the plugin has a configuration, false if not + * {@inheritDoc} */ public function has_config(): bool { @@ -54,9 +51,7 @@ public function has_config(): bool } /** - * Get the name of the plugin, should be language variable - * - * @return string + * {@inheritDoc} */ public function get_name(): string { @@ -69,10 +64,7 @@ public function get_name(): string } /** - * Display the captcha for the specified type - * - * @param int $type Type of captcha, should be one of the CONFIRMATION_* constants - * @return void + * {@inheritDoc} */ public function init(int $type): void { @@ -139,4 +131,36 @@ public function get_attempt_count(): int // Ensure this is deemed as too many attempts return PHP_INT_MAX; } + + /** + * {@inheritDoc} + */ + public function get_demo_template(): string + { + if (method_exists($this->legacy_captcha, 'get_demo_template')) + { + return $this->legacy_captcha->get_demo_template(0); + } + + return ''; + } + + /** + * {@inheritDoc} + */ + public function garbage_collect(int $confirm_type = 0): void + { + if (method_exists($this->legacy_captcha, 'garbage_collect')) + { + $this->legacy_captcha->garbage_collect($confirm_type); + } + } + + public function acp_page($id, $module): void + { + if (method_exists($this->legacy_captcha, 'acp_page')) + { + $this->legacy_captcha->acp_page($id, $module); + } + } } diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index 9d0b0cb4de3..41e825fad38 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -80,4 +80,21 @@ public function reset(): void; * @return int Number of attempts */ public function get_attempt_count(): int; + + /** + * Get template data for demo + * + * @return string Demo template file name + */ + public function get_demo_template(): string; + + /** + * Garbage collect captcha plugin + * + * @param int $confirm_type Confirm type to garbage collect, defaults to all (0) + * @return void + */ + public function garbage_collect(int $confirm_type = 0): void; + + public function acp_page($id, $module): void; } diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 106cedb7c2a..ffc67a7706d 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -331,13 +331,6 @@ function uninstall() $this->garbage_collect(0); } - /** - * API function - set up shop - */ - function install() - { - } - /** * API function - see what has to be done to validate */ @@ -597,11 +590,6 @@ function acp_page($id, $module) $user->add_lang('acp/board'); $user->add_lang('captcha_qa'); - if (!self::is_installed()) - { - $this->install(); - } - $module->tpl_name = 'captcha_qa_acp'; $module->page_title = 'ACP_VC_SETTINGS'; $form_key = 'acp_captcha'; diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php index ef30baaa9bb..a5dcf4efc60 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha.php @@ -184,11 +184,6 @@ function uninstall() $this->garbage_collect(0); } - function install() - { - return; - } - function validate() { if (!parent::validate()) From 3676e895f3bbe9b96bd08a7ab7dfdf0126a8373f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 17:09:16 +0200 Subject: [PATCH 0441/1214] [ticket/17414] Remove uninstall method from captcha plugins PHPBB-17414 --- phpBB/phpbb/captcha/plugins/captcha_abstract.php | 5 ----- phpBB/phpbb/captcha/plugins/qa.php | 8 -------- phpBB/phpbb/captcha/plugins/recaptcha.php | 5 ----- 3 files changed, 18 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/captcha_abstract.php b/phpBB/phpbb/captcha/plugins/captcha_abstract.php index fb8ccc5a702..c6978a1bf17 100644 --- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php +++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php @@ -179,11 +179,6 @@ function garbage_collect($type) $db->sql_freeresult($result); } - function uninstall() - { - $this->garbage_collect(0); - } - function validate() { global $user; diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index ffc67a7706d..3e48df00b28 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -323,14 +323,6 @@ function garbage_collect($type = 0) $db->sql_freeresult($result); } - /** - * API function - we don't drop the tables here, as that would cause the loss of all entered questions. - */ - function uninstall() - { - $this->garbage_collect(0); - } - /** * API function - see what has to be done to validate */ diff --git a/phpBB/phpbb/captcha/plugins/recaptcha.php b/phpBB/phpbb/captcha/plugins/recaptcha.php index a5dcf4efc60..1c080ba67b1 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha.php @@ -179,11 +179,6 @@ function get_hidden_fields() return $hidden_fields; } - function uninstall() - { - $this->garbage_collect(0); - } - function validate() { if (!parent::validate()) From edce13c7779cead54d94b0fac26e96f5dc6eaca0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 17:11:30 +0200 Subject: [PATCH 0442/1214] [ticket/17414] Add get_hidden_fields to interface PHPBB-17414 --- phpBB/phpbb/captcha/plugins/legacy_wrapper.php | 13 +++++++++++++ phpBB/phpbb/captcha/plugins/plugin_interface.php | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index e57abbb9670..5f2c701e07c 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -74,6 +74,19 @@ public function init(int $type): void } } + /** + * {@inheritDoc} + */ + public function get_hidden_fields(): array + { + if (method_exists($this->legacy_captcha, 'get_hidden_fields')) + { + return $this->legacy_captcha->get_hidden_fields(); + } + + return []; + } + /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index 41e825fad38..9286c4867ed 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -52,6 +52,13 @@ public function get_name(): string; */ public function init(int $type): void; + /** + * Get hidden form fields for this captcha plugin + * + * @return array Hidden form fields + */ + public function get_hidden_fields(): array; + /** * Validate the captcha with the given request data * From c27c1fa7a3ddf35c4c79da43239804b83f6ca9e4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 20:56:35 +0200 Subject: [PATCH 0443/1214] [ticket/17414] Support adding onchange to select PHPBB-17414 --- phpBB/phpbb/template/twig/extension/forms.php | 1 + phpBB/styles/all/template/macros/forms/select.twig | 1 + 2 files changed, 2 insertions(+) diff --git a/phpBB/phpbb/template/twig/extension/forms.php b/phpBB/phpbb/template/twig/extension/forms.php index 5a3d9420db5..b146aacfb97 100644 --- a/phpBB/phpbb/template/twig/extension/forms.php +++ b/phpBB/phpbb/template/twig/extension/forms.php @@ -183,6 +183,7 @@ public function select(environment $environment, array $form_data): string 'GROUP_ONLY' => (bool) ($form_data['group_only'] ?? false), 'SIZE' => (int) ($form_data['size'] ?? 0), 'MULTIPLE' => (bool) ($form_data['multiple'] ?? false), + 'ONCHANGE' => (string) ($form_data['onchange'] ?? ''), ]); } catch (\Twig\Error\Error $e) diff --git a/phpBB/styles/all/template/macros/forms/select.twig b/phpBB/styles/all/template/macros/forms/select.twig index 827ccb11211..1ada063e575 100644 --- a/phpBB/styles/all/template/macros/forms/select.twig +++ b/phpBB/styles/all/template/macros/forms/select.twig @@ -8,6 +8,7 @@ name="{{ NAME }}" {% if TOGGLEABLE %}data-togglable-settings="true"{% endif %} {% if MULTIPLE %}multiple="multiple"{% endif %} + {% if ONCHANGE %}onchange="{{ ONCHANGE }}"{% endif %} {% if SIZE %}size="{{ SIZE }}"{% endif %}> {% for element in OPTIONS %} {% if not GROUP_ONLY and element.options %} From 8de8878d5e48b1c9febb311859bf3a10f9559ff3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 20:56:58 +0200 Subject: [PATCH 0444/1214] [ticket/17414] Move captcha acp html to html files PHPBB-17414 --- phpBB/adm/style/acp_captcha.html | 16 +++++++-------- phpBB/includes/acp/acp_captcha.php | 33 ++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 4353becd2f4..880adcbe974 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -8,12 +8,12 @@

                {L_ACP_VC_SETTINGS}

                {L_ACP_VC_EXT_GET_MORE}

                - +{% if ERRORS %}
                -

                {L_WARNING}

                -

                {ERROR_MSG}

                +

                {{ lang('WARNING') }}

                +

                {{ ERRORS|join('
                ') }}

                - +{% endif %}
                @@ -47,10 +47,10 @@

                {L_WARNING}

                {L_AVAILABLE_CAPTCHAS} -
                -

                {L_CAPTCHA_SELECT_EXPLAIN}
                -
                -
                +
                +

                {{ lang('CAPTCHA_SELECT_EXPLAIN') }}
                +
                {{ FormsSelect(CAPTCHA_SELECT | merge({id: 'captcha_select', onchange: "(document.getElementById('acp_captcha')).submit()"})) }}
                +

                {L_CAPTCHA_CONFIGURE_EXPLAIN}
                diff --git a/phpBB/includes/acp/acp_captcha.php b/phpBB/includes/acp/acp_captcha.php index 69e13463aba..e03d2a39011 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -95,7 +95,7 @@ function main($id, $mode) add_form_key($form_key); $submit = $request->variable('main_submit', false); - $error = $cfg_array = array(); + $errors = $cfg_array = array(); if ($submit) { @@ -103,13 +103,13 @@ function main($id, $mode) { $cfg_array[$config_var] = $request->variable($config_var, $options['default']); } - validate_config_vars($config_vars, $cfg_array, $error); + validate_config_vars($config_vars, $cfg_array, $errors); if (!check_form_key($form_key)) { - $error[] = $user->lang['FORM_INVALID']; + $errors[] = $user->lang['FORM_INVALID']; } - if ($error) + if ($errors) { $submit = false; } @@ -143,17 +143,24 @@ function main($id, $mode) } else { - $captcha_select = ''; + $captcha_options = []; foreach ($captchas['available'] as $value => $title) { - $current = ($selected !== false && $value == $selected) ? ' selected="selected"' : ''; - $captcha_select .= ''; + $captcha_options[] = [ + 'value' => $value, + 'label' => $user->lang($title), + 'selected' => $selected !== false && $value == $selected, + ]; } foreach ($captchas['unavailable'] as $value => $title) { - $current = ($selected !== false && $value == $selected) ? ' selected="selected"' : ''; - $captcha_select .= ''; + $captcha_options[] = [ + 'value' => $value, + 'label' => $user->lang($title), + 'selected' => $selected !== false && $value == $selected, + 'class' => 'disabled-option', + ]; } $demo_captcha = $factory->get_instance($selected); @@ -166,8 +173,12 @@ function main($id, $mode) $template->assign_vars(array( 'CAPTCHA_PREVIEW_TPL' => $demo_captcha->get_demo_template($id), 'S_CAPTCHA_HAS_CONFIG' => $demo_captcha->has_config(), - 'CAPTCHA_SELECT' => $captcha_select, - 'ERROR_MSG' => implode('
                ', $error), + 'CAPTCHA_SELECT' => [ + 'tag' => 'select', + 'name' => 'select_captcha', + 'options' => $captcha_options, + ], + 'ERRORS' => $errors, 'U_ACTION' => $this->u_action, )); From c02f8688c4964749b85bc5dcb9cfebc16faf5c35 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 21:20:39 +0200 Subject: [PATCH 0445/1214] [ticket/17414] Convert acp captcha html to twig syntax PHPBB-17414 --- phpBB/adm/style/acp_captcha.html | 76 +++++++++++++++++--------------- 1 file changed, 41 insertions(+), 35 deletions(-) diff --git a/phpBB/adm/style/acp_captcha.html b/phpBB/adm/style/acp_captcha.html index 880adcbe974..0c9d3bf0afb 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -1,12 +1,12 @@ - +{% include 'overall_header.html' %} -

                {L_ACP_VC_SETTINGS}

                +

                {{ lang('ACP_VC_SETTINGS') }}

                -

                {L_ACP_VC_SETTINGS_EXPLAIN}

                +

                {{ lang('ACP_VC_SETTINGS_EXPLAIN') }}

                -

                {L_ACP_VC_EXT_GET_MORE}

                +

                {{ lang('ACP_VC_EXT_GET_MORE') }}

                {% if ERRORS %}
                @@ -15,65 +15,71 @@

                {{ lang('WARNING') }}

                {% endif %} - +
                -{L_GENERAL_OPTIONS} +{{ lang('GENERAL_OPTIONS') }}
                -

                {L_VISUAL_CONFIRM_REG_EXPLAIN}
                -
                -
                +

                {{ lang('VISUAL_CONFIRM_REG_EXPLAIN') }}
                +
                + + +
                -

                {L_REG_LIMIT_EXPLAIN}
                -
                +

                {{ lang('REG_LIMIT_EXPLAIN') }}
                +
                -

                {L_MAX_LOGIN_ATTEMPTS_EXPLAIN}
                -
                +

                {{ lang('MAX_LOGIN_ATTEMPTS_EXPLAIN') }}
                +
                -

                {L_VISUAL_CONFIRM_POST_EXPLAIN}
                -
                -
                +

                {{ lang('VISUAL_CONFIRM_POST_EXPLAIN') }}
                +
                + + +
                -

                {L_VISUAL_CONFIRM_REFRESH_EXPLAIN}
                -
                -
                +

                {{ lang('VISUAL_CONFIRM_REFRESH_EXPLAIN') }}
                +
                + + +
                -{L_AVAILABLE_CAPTCHAS} +{{ lang('AVAILABLE_CAPTCHAS') }}

                {{ lang('CAPTCHA_SELECT_EXPLAIN') }}
                {{ FormsSelect(CAPTCHA_SELECT | merge({id: 'captcha_select', onchange: "(document.getElementById('acp_captcha')).submit()"})) }}
                - -
                -

                {L_CAPTCHA_CONFIGURE_EXPLAIN}
                -
                -
                - + {% if S_CAPTCHA_HAS_CONFIG %} +
                +

                {{ lang('CAPTCHA_CONFIGURE_EXPLAIN') }}
                +
                +
                + {% endif %}
                - +{% if CAPTCHA_PREVIEW_TPL %}
                - {L_PREVIEW} - + {{ lang('PREVIEW') }} + {% include CAPTCHA_PREVIEW_TPL %}
                - +{% endif %}
                - {L_ACP_SUBMIT_CHANGES} + {{ lang('ACP_SUBMIT_CHANGES') }}

                -   -   +   +  

                - {S_FORM_TOKEN} + {{ S_FORM_TOKEN }}
                - +{% include 'overall_footer.html' %} From d85267707c01d69338014fb4cae5b12a66fc991d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 5 Oct 2024 21:40:08 +0200 Subject: [PATCH 0446/1214] [ticket/17414] Add placeholder when there are no questions yet PHPBB-17414 --- phpBB/adm/style/captcha_qa_acp.html | 6 ++++++ phpBB/language/en/captcha_qa.php | 1 + 2 files changed, 7 insertions(+) diff --git a/phpBB/adm/style/captcha_qa_acp.html b/phpBB/adm/style/captcha_qa_acp.html index 26598c7c2bd..1118a1f32e3 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -18,11 +18,13 @@

                {L_QUESTIONS}

                {L_QUESTIONS} + {% if questions %} {L_QUESTION_TEXT} {L_QUESTION_LANG} {L_ACTION} + {% endif %} @@ -33,6 +35,10 @@

                {L_QUESTIONS}

                {{ question.QUESTION_LANG }} {{ ICON_EDIT }} {{ ICON_DELETE }} + {% else %} + + {{ lang('QA_NO_QUESTIONS') }} + {% endfor %} diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php index 637c4e035e4..b8831661593 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -61,4 +61,5 @@ 'QA_ERROR_MSG' => 'Please fill in all fields and enter at least one answer.', 'QA_LAST_QUESTION' => 'You cannot delete all questions while the plugin is active.', + 'QA_NO_QUESTIONS' => 'There are no questions yet.', )); From 6a34de543b02eba8dde831bf96dfd3d780d72e9a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 11 Oct 2024 21:16:07 +0200 Subject: [PATCH 0447/1214] [ticket/17414] Add get_template function to plugin interface PHPBB-17414 --- phpBB/phpbb/captcha/plugins/legacy_wrapper.php | 13 +++++++++++++ phpBB/phpbb/captcha/plugins/plugin_interface.php | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 5f2c701e07c..9ce49738277 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -145,6 +145,19 @@ public function get_attempt_count(): int return PHP_INT_MAX; } + /** + * {@inheritDoc} + */ + public function get_template(): string + { + if (method_exists($this->legacy_captcha, 'get_template')) + { + return $this->legacy_captcha->get_template(); + } + + return ''; + } + /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index 9286c4867ed..0f668f207ea 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -89,7 +89,14 @@ public function reset(): void; public function get_attempt_count(): int; /** - * Get template data for demo + * Get template filename for captcha + * + * @return string Template file name + */ + public function get_template(): string; + + /** + * Get template filename for demo * * @return string Demo template file name */ From 2a6609013da1841ac37cae3e6ccf56f642bb307a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 11 Oct 2024 21:28:30 +0200 Subject: [PATCH 0448/1214] [ticket/17414] Remove request data from validate call PHPBB-17414 --- phpBB/includes/ucp/ucp_register.php | 2 +- phpBB/phpbb/auth/provider/db.php | 2 +- phpBB/phpbb/captcha/plugins/legacy_wrapper.php | 4 ++-- phpBB/phpbb/captcha/plugins/plugin_interface.php | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 8ad37047cb8..3a53148b937 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -293,7 +293,7 @@ function main($id, $mode) if ($config['enable_confirm']) { - $vc_response = $captcha->validate($data); + $vc_response = $captcha->validate(); if ($vc_response !== false) { $error[] = $vc_response; diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index ae9d9680769..395a48a9a58 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -177,7 +177,7 @@ public function login($username, $password) if ($show_captcha) { $captcha->init(CONFIRM_LOGIN); - $vc_response = $captcha->validate($row); + $vc_response = $captcha->validate(); if ($vc_response) { return array( diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 9ce49738277..cc35920c705 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -90,11 +90,11 @@ public function get_hidden_fields(): array /** * {@inheritDoc} */ - public function validate(array $request_data): bool + public function validate(): bool { if (method_exists($this->legacy_captcha, 'validate')) { - $error = $this->legacy_captcha->validate($request_data); + $error = $this->legacy_captcha->validate(); if ($error) { $this->last_error = $error; diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index 0f668f207ea..dc522ecd7ed 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -62,10 +62,9 @@ public function get_hidden_fields(): array; /** * Validate the captcha with the given request data * - * @param array $request_data Request data for the captcha * @return bool True if request data was valid captcha reply, false if not */ - public function validate(array $request_data): bool; + public function validate(): bool; /** * Return whether captcha was solved From 52acd2709ba4c8fffaf29a7f42b4f182ce971faa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 12 Oct 2024 10:48:37 +0200 Subject: [PATCH 0449/1214] [ticket/17413] Continue implementation of turnstile captcha PHPBB-17413 --- .../default/container/services_captcha.yml | 11 +++ phpBB/phpbb/captcha/plugins/turnstile.php | 82 ++++++++++++++++--- 2 files changed, 81 insertions(+), 12 deletions(-) diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index 8e9d829b47e..98441f99f89 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -54,3 +54,14 @@ services: - ['set_name', ['core.captcha.plugins.recaptcha_v3']] tags: - { name: captcha.plugins } + + core.captcha.plugins.turnstile: + class: phpbb\captcha\plugins\turnstile + shared: false + arguments: + - '@config' + - '@language' + calls: + - ['set_name', ['core.captcha.plugins.turnstile']] + tags: + - { name: catpcha.plugins } diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 130949e708e..3a5e9231ebd 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -13,32 +13,59 @@ namespace phpbb\captcha\plugins; -class turnstile extends captcha_abstract +use phpbb\config\config; +use phpbb\language\language; + +class turnstile implements plugin_interface { - /** @var \phpbb\config\config */ + private const API_ENDPOINT = 'https://api.cloudflare.com/client/v4/captcha/validate'; + + /** @var config */ protected $config; - public function __construct(\phpbb\config\config $config) + /** @var language */ + protected $language; + + public function __construct(config $config, language $language) { $this->config = $config; + $this->language = $language; } - public function is_available() + public function is_available(): bool { return ($this->config->offsetGet('captcha_turnstile_key') ?? false); } - public function get_template() + public function has_config(): bool { - return 'custom_captcha.html'; // Template file for displaying the CAPTCHA + return true; + } + + public function get_name(): string + { + return 'CAPTCHA_TURNSTILE'; + } + + public function init(int $type): void + { + $this->language->add_lang('captcha_turnstile'); } - public function execute() + public function get_hidden_fields(): array { - // Perform any necessary initialization or setup + $hidden_fields = []; + + // Required for posting page to store solved state + if ($this->solved) + { + $hidden_fields['confirm_code'] = $this->code; + } + $hidden_fields['confirm_id'] = $this->confirm_id; + return $hidden_fields; } - public function validate() + public function validate(): bool { // Implement server-side validation logic here // Example: Validate the submitted CAPTCHA value using Cloudflare API @@ -97,8 +124,39 @@ public function validate() } } - public function get_generator_class() + public function is_solved(): bool + { + return false; + } + + public function reset(): void + { + // TODO: Implement reset() method. + } + + public function get_attempt_count(): int + { + // TODO: Implement get_attempt_count() method. + return 0; + } + + public function get_template(): string + { + return 'custom_captcha.html'; // Template file for displaying the CAPTCHA + } + + public function get_demo_template(): string + { + return ''; + } + + public function garbage_collect(int $confirm_type = 0): void + { + // TODO: Implement garbage_collect() method. + } + + public function acp_page($id, $module): void { - throw new \Exception('No generator class given.'); + // TODO: Implement acp_page() method. } -} \ No newline at end of file +} From b55b42d09f3913078c793d78efb9b15eed9aeb67 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 12 Oct 2024 20:36:12 +0200 Subject: [PATCH 0450/1214] [ticket/17413] Add migration for turnstile and acp demo PHPBB-17413 --- .../adm/style/captcha_turnstile_acp_demo.html | 23 +++++++++ .../default/container/services_captcha.yml | 2 +- phpBB/language/en/captcha_turnstile.php | 41 ++++++++++++++++ .../phpbb/captcha/plugins/legacy_wrapper.php | 11 +++++ .../captcha/plugins/plugin_interface.php | 7 +++ phpBB/phpbb/captcha/plugins/turnstile.php | 17 ++++++- .../migration/data/v400/turnstile_captcha.php | 48 +++++++++++++++++++ 7 files changed, 146 insertions(+), 3 deletions(-) create mode 100644 phpBB/adm/style/captcha_turnstile_acp_demo.html create mode 100644 phpBB/language/en/captcha_turnstile.php create mode 100644 phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php diff --git a/phpBB/adm/style/captcha_turnstile_acp_demo.html b/phpBB/adm/style/captcha_turnstile_acp_demo.html new file mode 100644 index 00000000000..5d215327838 --- /dev/null +++ b/phpBB/adm/style/captcha_turnstile_acp_demo.html @@ -0,0 +1,23 @@ +
                +
                +
                +{% INCLUDEJS 'https://challenges.cloudflare.com/turnstile/v0/api.js' %} + diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index 98441f99f89..b07f842ca8a 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -64,4 +64,4 @@ services: calls: - ['set_name', ['core.captcha.plugins.turnstile']] tags: - - { name: catpcha.plugins } + - { name: captcha.plugins } diff --git a/phpBB/language/en/captcha_turnstile.php b/phpBB/language/en/captcha_turnstile.php new file mode 100644 index 00000000000..c091b440c11 --- /dev/null +++ b/phpBB/language/en/captcha_turnstile.php @@ -0,0 +1,41 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* DO NOT CHANGE +*/ +if (!defined('IN_PHPBB')) +{ + exit; +} + +if (empty($lang) || !is_array($lang)) +{ + $lang = []; +} + +// DEVELOPERS PLEASE NOTE +// +// All language files should use UTF-8 as their encoding and the files must not contain a BOM. +// +// Placeholders can now contain order information, e.g. instead of +// 'Page %s of %s' you can (and should) write 'Page %1$s of %2$s', this allows +// translators to re-order the output of data while ensuring it remains correct +// +// You do not need this where single placeholders are used, e.g. 'Message %d' is fine +// equally where a string contains only two placeholders which are used to wrap text +// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine + +$lang = array_merge($lang, [ + 'CAPTCHA_TURNSTILE' => 'Turnstile', +]); diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index cc35920c705..bc317e711af 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -63,6 +63,17 @@ public function get_name(): string return false; } + /** + * {@inheritDoc} + */ + public function set_name(string $name): void + { + if (method_exists($this->legacy_captcha, 'set_name')) + { + $this->legacy_captcha->set_name($name); + } + } + /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index dc522ecd7ed..f52643544ea 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -44,6 +44,13 @@ public function has_config(): bool; */ public function get_name(): string; + /** + * Set the service name of the plugin + * + * @param string $name + */ + public function set_name(string $name): void; + /** * Display the captcha for the specified type * diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 3a5e9231ebd..2aa4ca3d0c5 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -26,6 +26,8 @@ class turnstile implements plugin_interface /** @var language */ protected $language; + protected string $service_name = ''; + public function __construct(config $config, language $language) { $this->config = $config; @@ -34,7 +36,10 @@ public function __construct(config $config, language $language) public function is_available(): bool { - return ($this->config->offsetGet('captcha_turnstile_key') ?? false); + $this->language->add_lang('captcha_turnstile'); + + return !empty($this->config->offsetGet('captcha_turnstile_sitekey')) + && !empty($this->config->offsetGet('captcha_turnstile_secret')); } public function has_config(): bool @@ -47,6 +52,14 @@ public function get_name(): string return 'CAPTCHA_TURNSTILE'; } + /** + * {@inheritDoc} + */ + public function set_name(string $name): void + { + $this->service_name = $name; + } + public function init(int $type): void { $this->language->add_lang('captcha_turnstile'); @@ -147,7 +160,7 @@ public function get_template(): string public function get_demo_template(): string { - return ''; + return 'captcha_turnstile_acp_demo.html'; } public function garbage_collect(int $confirm_type = 0): void diff --git a/phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php b/phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php new file mode 100644 index 00000000000..06111c93063 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/turnstile_captcha.php @@ -0,0 +1,48 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class turnstile_captcha extends migration +{ + public function effectively_installed(): bool + { + return $this->config->offsetExists('captcha_turnstile_sitekey') + && $this->config->offsetExists('captcha_turnstile_secret'); + } + + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function update_data(): array + { + return [ + ['config.add', ['captcha_turnstile_sitekey', '']], + ['config.add', ['captcha_turnstile_secret', '']], + ]; + } + + public function revert_data(): array + { + return [ + ['config.remove', ['captcha_turnstile_sitekey']], + ['config.remove', ['captcha_turnstile_secret']], + ]; + } +} From 2500f722abe074a1905ee1346b26a971f4d10b6f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 12 Oct 2024 21:08:50 +0200 Subject: [PATCH 0451/1214] [ticket/17413] Add acp settings for turnstile captcha PHPBB-17413 --- phpBB/adm/style/captcha_turnstile_acp.html | 50 +++++++++++ .../default/container/services_captcha.yml | 4 + phpBB/language/en/captcha_turnstile.php | 6 +- .../captcha/plugins/plugin_interface.php | 7 ++ phpBB/phpbb/captcha/plugins/turnstile.php | 86 ++++++++++++++++++- 5 files changed, 148 insertions(+), 5 deletions(-) create mode 100644 phpBB/adm/style/captcha_turnstile_acp.html diff --git a/phpBB/adm/style/captcha_turnstile_acp.html b/phpBB/adm/style/captcha_turnstile_acp.html new file mode 100644 index 00000000000..446a0f436bc --- /dev/null +++ b/phpBB/adm/style/captcha_turnstile_acp.html @@ -0,0 +1,50 @@ +{% include('overall_header.html') %} + + + +

                {{ lang('ACP_VC_SETTINGS') }}

                + +

                {{ lang('ACP_VC_SETTINGS_EXPLAIN') }}

                + +
                +
                + {{ lang('GENERAL_OPTIONS') }} +
                +
                +
                + {{ lang('CAPTCHA_TURNSTILE_SITEKEY_EXPLAIN') }} +
                +
                +
                +
                +
                +
                + {{ lang('CAPTCHA_TURNSTILE_SECRET_EXPLAIN') }} +
                +
                +
                +
                +
                + {{ lang('PREVIEW') }} + {% if PREVIEW %} +
                +

                {{ lang('WARNING') }}

                +

                {{ lang('CAPTCHA_PREVIEW_MSG') }}

                +
                + {% endif %} + {% include(CAPTCHA_PREVIEW) %} +
                + +
                + {{ lang('ACP_SUBMIT_CHANGES') }} +

                +   +   +

                + + + {{ S_FORM_TOKEN }} +
                +
                + +{% include('overall_footer.html') %} diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index b07f842ca8a..09742f2eb86 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -61,6 +61,10 @@ services: arguments: - '@config' - '@language' + - '@log' + - '@request' + - '@template' + - '@user' calls: - ['set_name', ['core.captcha.plugins.turnstile']] tags: diff --git a/phpBB/language/en/captcha_turnstile.php b/phpBB/language/en/captcha_turnstile.php index c091b440c11..0b60867dd1e 100644 --- a/phpBB/language/en/captcha_turnstile.php +++ b/phpBB/language/en/captcha_turnstile.php @@ -37,5 +37,9 @@ // in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine $lang = array_merge($lang, [ - 'CAPTCHA_TURNSTILE' => 'Turnstile', + 'CAPTCHA_TURNSTILE' => 'Turnstile', + 'CAPTCHA_TURNSTILE_SITEKEY' => 'Sitekey', + 'CAPTCHA_TURNSTILE_SITEKEY_EXPLAIN' => 'Your Turnstile sitekey. The sitekey can be retrieved from your Cloudflare dashboard.', + 'CAPTCHA_TURNSTILE_SECRET' => 'Secret key', + 'CAPTCHA_TURNSTILE_SECRET_EXPLAIN' => 'Your Turnstile secret key. The secret key can be retrieved from your Cloudflare dashboard.', ]); diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index f52643544ea..ee2ba8461dd 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -116,5 +116,12 @@ public function get_demo_template(): string; */ public function garbage_collect(int $confirm_type = 0): void; + /** + * Display acp page + * + * @param mixed $id ACP module id + * @param mixed $module ACP module name + * @return void + */ public function acp_page($id, $module): void; } diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 2aa4ca3d0c5..0bb731d1474 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -15,23 +15,54 @@ use phpbb\config\config; use phpbb\language\language; +use phpbb\log\log_interface; +use phpbb\request\request_interface; +use phpbb\template\template; +use phpbb\user; class turnstile implements plugin_interface { private const API_ENDPOINT = 'https://api.cloudflare.com/client/v4/captcha/validate'; /** @var config */ - protected $config; + protected config $config; /** @var language */ - protected $language; + protected language $language; + /** @var log_interface */ + protected log_interface $log; + + /** @var request_interface */ + protected request_interface $request; + + /** @var template */ + protected template $template; + + /** @var user */ + protected user $user; + + /** @var string Service name */ protected string $service_name = ''; - public function __construct(config $config, language $language) + /** + * Constructor for turnstile captcha plugin + * + * @param config $config + * @param language $language + * @param log_interface $log + * @param request_interface $request + * @param template $template + * @param user $user + */ + public function __construct(config $config, language $language, log_interface $log, request_interface $request, template $template, user $user) { $this->config = $config; $this->language = $language; + $this->log = $log; + $this->request = $request; + $this->template = $template; + $this->user = $user; } public function is_available(): bool @@ -168,8 +199,55 @@ public function garbage_collect(int $confirm_type = 0): void // TODO: Implement garbage_collect() method. } + /** + * {@inheritDoc} + */ public function acp_page($id, $module): void { - // TODO: Implement acp_page() method. + $captcha_vars = [ + 'captcha_turnstile_sitekey' => 'CAPTCHA_TURNSTILE_SITEKEY', + 'captcha_turnstile_secret' => 'CAPTCHA_TURNSTILE_SECRET', + ]; + + $module->tpl_name = 'captcha_turnstile_acp'; + $module->page_title = 'ACP_VC_SETTINGS'; + $form_key = 'acp_captcha'; + add_form_key($form_key); + + $submit = $this->request->is_set_post('submit'); + + if ($submit && check_form_key($form_key)) + { + $captcha_vars = array_keys($captcha_vars); + foreach ($captcha_vars as $captcha_var) + { + $value = $this->request->variable($captcha_var, ''); + if ($value) + { + $this->config->set($captcha_var, $value); + } + } + + $this->log->add('admin', $this->user->data['user_id'], $this->user->ip, 'LOG_CONFIG_VISUAL'); + trigger_error($this->language->lang('CONFIG_UPDATED') . adm_back_link($module->u_action)); + } + else if ($submit) + { + trigger_error($this->language->lang('FORM_INVALID') . adm_back_link($module->u_action)); + } + else + { + foreach ($captcha_vars as $captcha_var => $template_var) + { + $var = $this->request->is_set($captcha_var) ? $this->request->variable($captcha_var, '') : $this->config->offsetGet($captcha_var);; + $this->template->assign_var($template_var, $var); + } + + $this->template->assign_vars(array( + 'CAPTCHA_PREVIEW' => $this->get_demo_template(), + 'CAPTCHA_NAME' => $this->service_name, + 'U_ACTION' => $module->u_action, + )); + } } } From 01dd0b168a5829fe4f5c3cfff31828ca7fcceaf1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Oct 2024 08:53:11 +0200 Subject: [PATCH 0452/1214] [ticket/17414] Create abstract base class for captchas PHPBB-17414 --- .../default/container/services_captcha.yml | 1 + phpBB/phpbb/captcha/plugins/base.php | 62 +++++++++++++++++++ phpBB/phpbb/captcha/plugins/turnstile.php | 11 +++- 3 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 phpBB/phpbb/captcha/plugins/base.php diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index 09742f2eb86..d4f1ad863a7 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -60,6 +60,7 @@ services: shared: false arguments: - '@config' + - '@dbal.conn' - '@language' - '@log' - '@request' diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php new file mode 100644 index 00000000000..2b07ccaa642 --- /dev/null +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -0,0 +1,62 @@ +db = $db; + } + + /** + * @inheritDoc + */ + public function garbage_collect(int $confirm_type = 0): void + { + $sql = 'SELECT DISTINCT c.session_id + FROM ' . CONFIRM_TABLE . ' c + LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id) + WHERE s.session_id IS NULL' . + ((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type); + $result = $this->db->sql_query($sql); + + if ($row = $this->db->sql_fetchrow($result)) + { + $sql_in = []; + do + { + $sql_in[] = (string) $row['session_id']; + } + while ($row = $this->db->sql_fetchrow($result)); + + if (count($sql_in)) + { + $sql = 'DELETE FROM ' . CONFIRM_TABLE . ' + WHERE ' . $this->db->sql_in_set('session_id', $sql_in); + $this->db->sql_query($sql); + } + } + $this->db->sql_freeresult($result); + } +} diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 0bb731d1474..210ae036108 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -14,13 +14,15 @@ namespace phpbb\captcha\plugins; use phpbb\config\config; +use phpbb\db\driver\driver; +use phpbb\db\driver\driver_interface; use phpbb\language\language; use phpbb\log\log_interface; use phpbb\request\request_interface; use phpbb\template\template; use phpbb\user; -class turnstile implements plugin_interface +class turnstile extends base { private const API_ENDPOINT = 'https://api.cloudflare.com/client/v4/captcha/validate'; @@ -49,14 +51,17 @@ class turnstile implements plugin_interface * Constructor for turnstile captcha plugin * * @param config $config + * @param driver_interface $db * @param language $language * @param log_interface $log * @param request_interface $request * @param template $template * @param user $user */ - public function __construct(config $config, language $language, log_interface $log, request_interface $request, template $template, user $user) + public function __construct(config $config, driver_interface $db, language $language, log_interface $log, request_interface $request, template $template, user $user) { + parent::__construct($db); + $this->config = $config; $this->language = $language; $this->log = $log; @@ -103,7 +108,7 @@ public function get_hidden_fields(): array // Required for posting page to store solved state if ($this->solved) { - $hidden_fields['confirm_code'] = $this->code; + $hidden_fields['confirm_code'] = $this->confirm_code; } $hidden_fields['confirm_id'] = $this->confirm_id; return $hidden_fields; From 8290cdb7e734679f093f100a23d161e65eba0bfb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Oct 2024 11:04:59 +0200 Subject: [PATCH 0453/1214] [ticket/17413] Make turnstile captcha work on registration page PHPBB-17413 --- .../adm/style/captcha_turnstile_acp_demo.html | 2 +- phpBB/language/en/captcha_turnstile.php | 13 +- phpBB/phpbb/captcha/plugins/base.php | 19 +++ .../phpbb/captcha/plugins/legacy_wrapper.php | 8 ++ .../captcha/plugins/plugin_interface.php | 7 + phpBB/phpbb/captcha/plugins/turnstile.php | 123 ++++++++++-------- .../prosilver/template/captcha_turnstile.html | 12 ++ 7 files changed, 127 insertions(+), 57 deletions(-) create mode 100644 phpBB/styles/prosilver/template/captcha_turnstile.html diff --git a/phpBB/adm/style/captcha_turnstile_acp_demo.html b/phpBB/adm/style/captcha_turnstile_acp_demo.html index 5d215327838..348e96967a7 100644 --- a/phpBB/adm/style/captcha_turnstile_acp_demo.html +++ b/phpBB/adm/style/captcha_turnstile_acp_demo.html @@ -1,7 +1,7 @@
                -{% INCLUDEJS 'https://challenges.cloudflare.com/turnstile/v0/api.js' %} +{% INCLUDEJS U_TURNSTILE_SCRIPT %} + + {# The cf-turnstile class is used in JavaScript #} +
                +{% else %} + {{ lang('CAPTCHA_TURNSTILE_NOT_AVAILABLE') }} +{% endif %} From c382f81222b856030561ca76879580c9c8c8dac8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Oct 2024 14:50:12 +0200 Subject: [PATCH 0454/1214] [ticket/17413] Add language and theme settings for turnstile PHPBB-17413 --- phpBB/adm/style/captcha_turnstile_acp.html | 16 ++++++++++++- .../adm/style/captcha_turnstile_acp_demo.html | 2 +- phpBB/install/schemas/schema_data.sql | 3 +++ phpBB/language/en/captcha_turnstile.php | 7 +++++- phpBB/language/en/composer.json | 3 ++- phpBB/phpbb/captcha/plugins/turnstile.php | 23 ++++++++++++++++--- .../migration/data/v400/turnstile_captcha.php | 5 +++- phpBB/phpbb/language/language.php | 1 + phpBB/phpbb/language/language_file_helper.php | 21 +++++++++-------- .../prosilver/template/captcha_turnstile.html | 2 +- 10 files changed, 64 insertions(+), 19 deletions(-) diff --git a/phpBB/adm/style/captcha_turnstile_acp.html b/phpBB/adm/style/captcha_turnstile_acp.html index 446a0f436bc..a187e1e41b1 100644 --- a/phpBB/adm/style/captcha_turnstile_acp.html +++ b/phpBB/adm/style/captcha_turnstile_acp.html @@ -23,10 +23,24 @@

                {{ lang('ACP_VC_SETTINGS') }}

                +
                +
                + +
                {{ lang('CAPTCHA_TURNSTILE_THEME_EXPLAIN') }} +
                +
                + {% for theme in CAPTCHA_TURNSTILE_THEMES %} + + {% endfor %} +
                +
                {{ lang('PREVIEW') }} - {% if PREVIEW %} + {% if PREVIEW %}

                {{ lang('WARNING') }}

                {{ lang('CAPTCHA_PREVIEW_MSG') }}

                diff --git a/phpBB/adm/style/captcha_turnstile_acp_demo.html b/phpBB/adm/style/captcha_turnstile_acp_demo.html index 348e96967a7..757d0a4bcb9 100644 --- a/phpBB/adm/style/captcha_turnstile_acp_demo.html +++ b/phpBB/adm/style/captcha_turnstile_acp_demo.html @@ -1,5 +1,5 @@
                -
                +
                {% INCLUDEJS U_TURNSTILE_SCRIPT %} {# The cf-turnstile class is used in JavaScript #} -
                +
                {% else %} {{ lang('CAPTCHA_TURNSTILE_NOT_AVAILABLE') }} {% endif %} From 589fe70be6298b719241570860a27dd802dfdcbf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Oct 2024 14:57:45 +0200 Subject: [PATCH 0455/1214] [ticket/17414] Change handling of validate to new logic PHPBB-17414 --- phpBB/includes/ucp/ucp_register.php | 5 ++--- phpBB/phpbb/auth/provider/db.php | 5 ++--- phpBB/phpbb/report/controller/report.php | 14 +++++++------- phpBB/posting.php | 10 ++-------- 4 files changed, 13 insertions(+), 21 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 3a53148b937..ad2ad79dbe1 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -293,10 +293,9 @@ function main($id, $mode) if ($config['enable_confirm']) { - $vc_response = $captcha->validate(); - if ($vc_response !== false) + if ($captcha->validate() !== true) { - $error[] = $vc_response; + $error[] = $captcha->get_error(); } if ($config['max_reg_attempts'] && $captcha->get_attempt_count() > $config['max_reg_attempts']) diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 395a48a9a58..6911adfaffb 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -176,9 +176,8 @@ public function login($username, $password) // Every auth module is able to define what to do by itself... if ($show_captcha) { - $captcha->init(CONFIRM_LOGIN); - $vc_response = $captcha->validate(); - if ($vc_response) + $captcha->init(\phpbb\captcha\plugins\plugin_interface::CONFIRM_LOGIN); + if ($captcha->validate() !== true) { return array( 'status' => LOGIN_ERROR_ATTEMPTS, diff --git a/phpBB/phpbb/report/controller/report.php b/phpBB/phpbb/report/controller/report.php index b8e2b04583b..7d41c1c47f0 100644 --- a/phpBB/phpbb/report/controller/report.php +++ b/phpBB/phpbb/report/controller/report.php @@ -13,6 +13,7 @@ namespace phpbb\report\controller; +use phpbb\captcha\plugins\plugin_interface; use phpbb\exception\http_exception; use phpbb\report\report_handler_interface; use Symfony\Component\HttpFoundation\RedirectResponse; @@ -131,7 +132,7 @@ public function handle($id, $mode) if ($this->config['enable_post_confirm'] && !$this->user->data['is_registered']) { $captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']); - $captcha->init(CONFIRM_REPORT); + $captcha->init(plugin_interface::CONFIRM_REPORT); } //Has the report been cancelled? @@ -140,7 +141,7 @@ public function handle($id, $mode) return new RedirectResponse($redirect_url, 302); } - // Check CAPTCHA, if the form was submited + // Check CAPTCHA, if the form was submitted if (!empty($submit) && isset($captcha)) { $captcha_template_array = $this->check_captcha($captcha); @@ -298,18 +299,17 @@ protected function assign_template_data($mode, $id, $reason_id, $report_text, $u /** * Check CAPTCHA * - * @param object $captcha A phpBB CAPTCHA object + * @param plugin_interface $captcha A phpBB CAPTCHA object * @return array template variables which ensures that CAPTCHA's work correctly */ - protected function check_captcha($captcha) + protected function check_captcha(plugin_interface $captcha) { $error = array(); $captcha_hidden_fields = ''; - $visual_confirmation_response = $captcha->validate(); - if ($visual_confirmation_response) + if ($captcha->validate() !== true) { - $error[] = $visual_confirmation_response; + $error[] = $captcha->get_error(); } if (count($error) === 0) diff --git a/phpBB/posting.php b/phpBB/posting.php index 988b7f03e2a..fb54f05ff68 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1210,15 +1210,9 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered'] && in_array($mode, array('quote', 'post', 'reply'))) { - $captcha_data = array( - 'message' => $request->variable('message', '', true), - 'subject' => $request->variable('subject', '', true), - 'username' => $request->variable('username', '', true), - ); - $vc_response = $captcha->validate($captcha_data); - if ($vc_response) + if ($captcha->validate() !== true) { - $error[] = $vc_response; + $error[] = $captcha->get_error(); } } From 48454308aeee4bfd664eab2d4ecf8faad57a8f21 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Oct 2024 17:13:01 +0200 Subject: [PATCH 0456/1214] [ticket/17414] Replace confirm types with enum PHPBB-17414 --- phpBB/includes/constants.php | 8 +++---- phpBB/includes/ucp/ucp_register.php | 2 +- phpBB/phpbb/auth/provider/db.php | 2 +- phpBB/phpbb/captcha/plugins/confirm_type.php | 24 +++++++++++++++++++ .../captcha/plugins/plugin_interface.php | 12 ++-------- phpBB/phpbb/captcha/plugins/turnstile.php | 2 +- phpBB/phpbb/report/controller/report.php | 3 ++- phpBB/posting.php | 2 +- 8 files changed, 36 insertions(+), 19 deletions(-) create mode 100644 phpBB/phpbb/captcha/plugins/confirm_type.php diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 0ef409767d7..825a328d391 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -152,13 +152,13 @@ define('FULL_FOLDER_HOLD', -1); // Confirm types -/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_REGISTRATION, to be removed in 5.0.0-a1 */ +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::REGISTRATION, to be removed in 5.0.0-a1 */ define('CONFIRM_REG', 1); -/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_LOGIN, to be removed in 5.0.0-a1 */ +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::LOGIN, to be removed in 5.0.0-a1 */ define('CONFIRM_LOGIN', 2); -/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_POST, to be removed in 5.0.0-a1 */ +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::POST, to be removed in 5.0.0-a1 */ define('CONFIRM_POST', 3); -/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\plugin_interface::CONFIRM_REPORT, to be removed in 5.0.0-a1 */ +/** @deprecated 4.0.0-a1 Replaced by \phpbb\captcha\plugins\confirm_type::REPORT, to be removed in 5.0.0-a1 */ define('CONFIRM_REPORT', 4); // Categories - Attachments diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index ad2ad79dbe1..b8d0d78b404 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -238,7 +238,7 @@ function main($id, $mode) /** @var \phpbb\captcha\factory $captcha_factory */ $captcha_factory = $phpbb_container->get('captcha.factory'); $captcha = $captcha_factory->get_instance($config['captcha_plugin']); - $captcha->init(\phpbb\captcha\plugins\plugin_interface::CONFIRM_REGISTRATION); + $captcha->init(\phpbb\captcha\plugins\confirm_type::REGISTRATION); } $timezone = $config['board_timezone']; diff --git a/phpBB/phpbb/auth/provider/db.php b/phpBB/phpbb/auth/provider/db.php index 6911adfaffb..5f8ebd6ac30 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -176,7 +176,7 @@ public function login($username, $password) // Every auth module is able to define what to do by itself... if ($show_captcha) { - $captcha->init(\phpbb\captcha\plugins\plugin_interface::CONFIRM_LOGIN); + $captcha->init(\phpbb\captcha\plugins\confirm_type::LOGIN); if ($captcha->validate() !== true) { return array( diff --git a/phpBB/phpbb/captcha/plugins/confirm_type.php b/phpBB/phpbb/captcha/plugins/confirm_type.php new file mode 100644 index 00000000000..db8bb54bd29 --- /dev/null +++ b/phpBB/phpbb/captcha/plugins/confirm_type.php @@ -0,0 +1,24 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\captcha\plugins; + +/** + * Confirmation types for CAPTCHA plugins + */ +enum confirm_type: int { + case REGISTRATION = 1; + case LOGIN = 2; + case POST = 3; + case REPORT = 4; +} diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index bc20b2e7034..c6e4e6c6de4 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -15,14 +15,6 @@ interface plugin_interface { - const CONFIRM_REGISTRATION = 1; - const CONFIRM_LOGIN = 2; - - const CONFIRM_POST = 3; - - const CONFIRM_REPORT = 4; - - /** * Check if the plugin is available * @@ -54,10 +46,10 @@ public function set_name(string $name): void; /** * Display the captcha for the specified type * - * @param int $type Type of captcha, should be one of the CONFIRMATION_* constants + * @param confirm_type $type Type of captcha, should be one of the CONFIRMATION_* constants * @return void */ - public function init(int $type): void; + public function init(confirm_type $type): void; /** * Get hidden form fields for this captcha plugin diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index b3152b2a231..f5bd22602bd 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -121,7 +121,7 @@ public function set_name(string $name): void /** * {@inheritDoc} */ - public function init(int $type): void + public function init(confirm_type $type): void { $this->language->add_lang('captcha_turnstile'); } diff --git a/phpBB/phpbb/report/controller/report.php b/phpBB/phpbb/report/controller/report.php index 7d41c1c47f0..97dbdbd9bb4 100644 --- a/phpBB/phpbb/report/controller/report.php +++ b/phpBB/phpbb/report/controller/report.php @@ -13,6 +13,7 @@ namespace phpbb\report\controller; +use phpbb\captcha\plugins\confirm_type; use phpbb\captcha\plugins\plugin_interface; use phpbb\exception\http_exception; use phpbb\report\report_handler_interface; @@ -132,7 +133,7 @@ public function handle($id, $mode) if ($this->config['enable_post_confirm'] && !$this->user->data['is_registered']) { $captcha = $this->captcha_factory->get_instance($this->config['captcha_plugin']); - $captcha->init(plugin_interface::CONFIRM_REPORT); + $captcha->init(confirm_type::REPORT); } //Has the report been cancelled? diff --git a/phpBB/posting.php b/phpBB/posting.php index fb54f05ff68..9f8cce0ead1 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -458,7 +458,7 @@ /** @var \phpbb\captcha\factory $captcha_factory */ $captcha_factory = $phpbb_container->get('captcha.factory'); $captcha = $captcha_factory->get_instance($config['captcha_plugin']); - $captcha->init(\phpbb\captcha\plugins\plugin_interface::CONFIRM_POST); + $captcha->init(\phpbb\captcha\plugins\confirm_type::POST); } // Is the user able to post within this forum? From cf16a76f0c710057cf2c30bcdccdc4f8fa00adea Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Oct 2024 21:41:11 +0200 Subject: [PATCH 0457/1214] [ticket/17414] Move more functionality to base and fix turnstile language PHPBB-17414 --- phpBB/phpbb/captcha/plugins/base.php | 94 ++++++++++++++++++- phpBB/phpbb/captcha/plugins/confirm_type.php | 1 + .../phpbb/captcha/plugins/legacy_wrapper.php | 9 +- phpBB/phpbb/captcha/plugins/turnstile.php | 36 +------ .../prosilver/template/captcha_turnstile.html | 2 +- 5 files changed, 103 insertions(+), 39 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php index be3b77ade1e..a22336b1e55 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -2,34 +2,118 @@ namespace phpbb\captcha\plugins; -use phpbb\captcha\plugins\plugin_interface; +use phpbb\config\config; use phpbb\db\driver\driver_interface; +use phpbb\request\request_interface; +use phpbb\user; abstract class base implements plugin_interface { + /** @var config */ + protected config $config; + /** @var driver_interface */ protected driver_interface $db; + /** @var request_interface */ + protected request_interface $request; + + /** @var user */ + protected user $user; + + /** @var int Attempts at solving the CAPTCHA */ + protected int $attempts = 0; + /** @var bool Resolved state of captcha */ protected bool $solved = false; - /** @var string Confirm code */ - protected string $confirm_code = ''; - /** @var string Confirm id hash */ protected string $confirm_id = ''; + /** @var confirm_type Confirmation type */ + protected confirm_type $type = confirm_type::UNDEFINED; + /** @var string Last error message */ protected string $last_error = ''; /** * Constructor for abstract captcha base class * + * @param config $config * @param driver_interface $db + * @param request_interface $request + * @param user $user */ - public function __construct(driver_interface $db) + public function __construct(config $config, driver_interface $db, request_interface $request, user $user) { + $this->config = $config; $this->db = $db; + $this->request = $request; + $this->user = $user; + } + + /** + * {@inheritDoc} + */ + public function init(confirm_type $type): void + { + $this->confirm_id = $this->request->variable('confirm_id', ''); + $this->type = $type; + + if (empty($this->confirm_id) || !$this->load_confirm_data()) + { + // we have no confirm ID, better get ready to display something + $this->generate_confirm_data(); + } + } + + /** + * Look up attempts from confirm table + */ + protected function load_confirm_data(): bool + { + $sql = 'SELECT attempts + FROM ' . CONFIRM_TABLE . " + WHERE confirm_id = '" . $this->db->sql_escape($this->confirm_id) . "' + AND session_id = '" . $this->db->sql_escape($this->user->session_id) . "' + AND confirm_type = " . (int) $this->type; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + if ($row) + { + $this->attempts = $row['attempts']; + + return true; + } + + return false; + } + + /** + * Generate confirm data for tracking attempts + * + * @return void + */ + protected function generate_confirm_data(): void + { + $this->confirm_id = md5(unique_id()); + + $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( + 'confirm_id' => $this->confirm_id, + 'session_id' => (string) $this->user->session_id, + 'confirm_type' => $this->type + )); + $this->db->sql_query($sql); + } + + /** + * {@inheritDoc} + */ + public function get_hidden_fields(): array + { + return ['confirm_id' => $this->confirm_id]; } /** diff --git a/phpBB/phpbb/captcha/plugins/confirm_type.php b/phpBB/phpbb/captcha/plugins/confirm_type.php index db8bb54bd29..e3e11edf77a 100644 --- a/phpBB/phpbb/captcha/plugins/confirm_type.php +++ b/phpBB/phpbb/captcha/plugins/confirm_type.php @@ -17,6 +17,7 @@ * Confirmation types for CAPTCHA plugins */ enum confirm_type: int { + case UNDEFINED = 0; case REGISTRATION = 1; case LOGIN = 2; case POST = 3; diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 48b91ef3d25..48575733cca 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -19,7 +19,12 @@ class legacy_wrapper implements plugin_interface private string $last_error; - public function __construct($legacy_captcha) + /** + * Constructor for legacy CAPTCHA wrapper + * + * @param object $legacy_captcha + */ + public function __construct(object $legacy_captcha) { $this->legacy_captcha = $legacy_captcha; } @@ -77,7 +82,7 @@ public function set_name(string $name): void /** * {@inheritDoc} */ - public function init(int $type): void + public function init(confirm_type $type): void { if (method_exists($this->legacy_captcha, 'init')) { diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index f5bd22602bd..1a42c7adbf6 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -16,7 +16,6 @@ use GuzzleHttp\Client; use GuzzleHttp\Exception\GuzzleException; use phpbb\config\config; -use phpbb\db\driver\driver; use phpbb\db\driver\driver_interface; use phpbb\language\language; use phpbb\log\log_interface; @@ -32,24 +31,15 @@ class turnstile extends base /** @var string API endpoint for turnstile verification */ private const VERIFY_ENDPOINT = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'; - /** @var config */ - protected config $config; - /** @var language */ protected language $language; /** @var log_interface */ protected log_interface $log; - /** @var request_interface */ - protected request_interface $request; - /** @var template */ protected template $template; - /** @var user */ - protected user $user; - /** @var string Service name */ protected string $service_name = ''; @@ -73,14 +63,11 @@ class turnstile extends base */ public function __construct(config $config, driver_interface $db, language $language, log_interface $log, request_interface $request, template $template, user $user) { - parent::__construct($db); + parent::__construct($config, $db, $request, $user); - $this->config = $config; $this->language = $language; $this->log = $log; - $this->request = $request; $this->template = $template; - $this->user = $user; } /** @@ -88,7 +75,7 @@ public function __construct(config $config, driver_interface $db, language $lang */ public function is_available(): bool { - $this->init(0); + $this->init(confirm_type::UNDEFINED); return !empty($this->config->offsetGet('captcha_turnstile_sitekey')) && !empty($this->config->offsetGet('captcha_turnstile_secret')); @@ -126,22 +113,6 @@ public function init(confirm_type $type): void $this->language->add_lang('captcha_turnstile'); } - /** - * {@inheritDoc} - */ - public function get_hidden_fields(): array - { - $hidden_fields = []; - - // Required for posting page to store solved state - if ($this->solved) - { - $hidden_fields['confirm_code'] = $this->confirm_code; - } - $hidden_fields['confirm_id'] = $this->confirm_id; - return $hidden_fields; - } - /** * {@inheritDoc} */ @@ -196,6 +167,9 @@ public function reset(): void // TODO: Implement reset() method. } + /** + * {@inheritDoc} + */ public function get_attempt_count(): int { // TODO: Implement get_attempt_count() method. diff --git a/phpBB/styles/prosilver/template/captcha_turnstile.html b/phpBB/styles/prosilver/template/captcha_turnstile.html index f20d53e5395..b8c88555022 100644 --- a/phpBB/styles/prosilver/template/captcha_turnstile.html +++ b/phpBB/styles/prosilver/template/captcha_turnstile.html @@ -6,7 +6,7 @@ {# The cf-turnstile class is used in JavaScript #} -
                +
                {% else %} {{ lang('CAPTCHA_TURNSTILE_NOT_AVAILABLE') }} {% endif %} From db25443bc56f20669e80911f7def4906b0683d76 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 15 Oct 2024 19:43:08 +0200 Subject: [PATCH 0458/1214] [ticket/17413] Clean up turnstile code and add attempt counting PHPBB-17413 --- phpBB/phpbb/captcha/plugins/base.php | 81 +++++++++++++++++-- phpBB/phpbb/captcha/plugins/turnstile.php | 52 ++++++------ .../prosilver/template/captcha_turnstile.html | 24 ++++-- 3 files changed, 120 insertions(+), 37 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php index a22336b1e55..d43fcec31e4 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -4,6 +4,7 @@ use phpbb\config\config; use phpbb\db\driver\driver_interface; +use phpbb\language\language; use phpbb\request\request_interface; use phpbb\user; @@ -15,6 +16,9 @@ abstract class base implements plugin_interface /** @var driver_interface */ protected driver_interface $db; + /** @var language */ + protected language $language; + /** @var request_interface */ protected request_interface $request; @@ -24,9 +28,15 @@ abstract class base implements plugin_interface /** @var int Attempts at solving the CAPTCHA */ protected int $attempts = 0; + /** @var string Stored random CAPTCHA code */ + protected string $code = ''; + /** @var bool Resolved state of captcha */ protected bool $solved = false; + /** @var string User supplied confirm code */ + protected string $confirm_code = ''; + /** @var string Confirm id hash */ protected string $confirm_id = ''; @@ -41,13 +51,15 @@ abstract class base implements plugin_interface * * @param config $config * @param driver_interface $db + * @param language $language * @param request_interface $request * @param user $user */ - public function __construct(config $config, driver_interface $db, request_interface $request, user $user) + public function __construct(config $config, driver_interface $db, language $language, request_interface $request, user $user) { $this->config = $config; $this->db = $db; + $this->language = $language; $this->request = $request; $this->user = $user; } @@ -58,6 +70,7 @@ public function __construct(config $config, driver_interface $db, request_interf public function init(confirm_type $type): void { $this->confirm_id = $this->request->variable('confirm_id', ''); + $this->confirm_code = $this->request->variable('confirm_code', ''); $this->type = $type; if (empty($this->confirm_id) || !$this->load_confirm_data()) @@ -67,16 +80,52 @@ public function init(confirm_type $type): void } } + /** + * {@inheritDoc} + */ + public function validate(): bool + { + if ($this->confirm_id && hash_equals($this->code, $this->confirm_code)) + { + return true; + } + + $this->increment_attempts(); + $this->last_error = $this->language->lang('CONFIRM_CODE_WRONG'); + return false; + } + + /** + * {@inheritDoc} + */ + public function reset(): void + { + $sql = 'DELETE FROM ' . CONFIRM_TABLE . " + WHERE session_id = '" . $this->db->sql_escape($this->user->session_id) . "' + AND confirm_type = " . $this->type->value; + $this->db->sql_query($sql); + + $this->generate_confirm_data(); + } + + /** + * {@inheritDoc} + */ + public function get_attempt_count(): int + { + return $this->attempts; + } + /** * Look up attempts from confirm table */ protected function load_confirm_data(): bool { - $sql = 'SELECT attempts + $sql = 'SELECT code, attempts FROM ' . CONFIRM_TABLE . " WHERE confirm_id = '" . $this->db->sql_escape($this->confirm_id) . "' AND session_id = '" . $this->db->sql_escape($this->user->session_id) . "' - AND confirm_type = " . (int) $this->type; + AND confirm_type = " . $this->type->value; $result = $this->db->sql_query($sql); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); @@ -84,6 +133,7 @@ protected function load_confirm_data(): bool if ($row) { $this->attempts = $row['attempts']; + $this->code = $row['code']; return true; } @@ -98,22 +148,43 @@ protected function load_confirm_data(): bool */ protected function generate_confirm_data(): void { + $this->code = gen_rand_string_friendly(CAPTCHA_MAX_CHARS); $this->confirm_id = md5(unique_id()); $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( 'confirm_id' => $this->confirm_id, 'session_id' => (string) $this->user->session_id, - 'confirm_type' => $this->type + 'confirm_type' => $this->type->value, + 'code' => $this->code, )); $this->db->sql_query($sql); } + /** + * Increment number of attempts for confirm ID and session + * + * @return void + */ + protected function increment_attempts(): void + { + $sql = 'UPDATE ' . CONFIRM_TABLE . " + SET attempts = attempts + 1 + WHERE confirm_id = '{$this->db->sql_escape($this->confirm_id)}' + AND session_id = '{$this->db->sql_escape($this->user->session_id)}'"; + $this->db->sql_query($sql); + + $this->attempts++; + } + /** * {@inheritDoc} */ public function get_hidden_fields(): array { - return ['confirm_id' => $this->confirm_id]; + return [ + 'confirm_id' => $this->confirm_id, + 'confirm_code' => $this->solved === true ? $this->confirm_code : '', + ]; } /** diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 1a42c7adbf6..17e4154e8af 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -63,7 +63,7 @@ class turnstile extends base */ public function __construct(config $config, driver_interface $db, language $language, log_interface $log, request_interface $request, template $template, user $user) { - parent::__construct($config, $db, $request, $user); + parent::__construct($config, $db, $language, $request, $user); $this->language = $language; $this->log = $log; @@ -75,7 +75,7 @@ public function __construct(config $config, driver_interface $db, language $lang */ public function is_available(): bool { - $this->init(confirm_type::UNDEFINED); + $this->init($this->type); return !empty($this->config->offsetGet('captcha_turnstile_sitekey')) && !empty($this->config->offsetGet('captcha_turnstile_secret')); @@ -110,6 +110,8 @@ public function set_name(string $name): void */ public function init(confirm_type $type): void { + parent::init($type); + $this->language->add_lang('captcha_turnstile'); } @@ -118,10 +120,22 @@ public function init(confirm_type $type): void */ public function validate(): bool { + if (parent::validate()) + { + return true; + } + + $turnstile_response = $this->request->variable('cf-turnstile-response', ''); + if (!$turnstile_response) + { + // Return without checking against server without a turnstile response + return false; + } + // Retrieve form data for verification $form_data = [ 'secret' => $this->config['captcha_turnstile_secret'], - 'response' => $this->request->variable('cf-turnstile-response', ''), + 'response' => $turnstile_response, 'remoteip' => $this->request->header('CF-Connecting-IP'), //'idempotency_key' => $this->confirm_id, // check if we need this ]; @@ -150,6 +164,7 @@ public function validate(): bool if (isset($result['success']) && $result['success'] === true) { $this->solved = true; + $this->confirm_code = $this->code; return true; } else @@ -162,20 +177,6 @@ public function validate(): bool /** * {@inheritDoc} */ - public function reset(): void - { - // TODO: Implement reset() method. - } - - /** - * {@inheritDoc} - */ - public function get_attempt_count(): int - { - // TODO: Implement get_attempt_count() method. - return 0; - } - public function get_template(): string { if ($this->is_solved()) @@ -184,15 +185,19 @@ public function get_template(): string } $this->template->assign_vars([ - 'S_TURNSTILE_AVAILABLE' => $this->is_available(), - 'TURNSTILE_SITEKEY' => $this->config->offsetGet('captcha_turnstile_sitekey'), - 'TURNSTILE_THEME' => $this->config->offsetGet('captcha_turnstile_theme'), - 'U_TURNSTILE_SCRIPT' => self::SCRIPT_URL, + 'S_TURNSTILE_AVAILABLE' => $this->is_available(), + 'TURNSTILE_SITEKEY' => $this->config->offsetGet('captcha_turnstile_sitekey'), + 'TURNSTILE_THEME' => $this->config->offsetGet('captcha_turnstile_theme'), + 'U_TURNSTILE_SCRIPT' => self::SCRIPT_URL, + 'CONFIRM_TYPE_REGISTRATION' => (int) $this->type->value, ]); return 'captcha_turnstile.html'; } + /** + * {@inheritDoc} + */ public function get_demo_template(): string { $this->template->assign_vars([ @@ -203,11 +208,6 @@ public function get_demo_template(): string return 'captcha_turnstile_acp_demo.html'; } - public function garbage_collect(int $confirm_type = 0): void - { - // TODO: Implement garbage_collect() method. - } - /** * {@inheritDoc} */ diff --git a/phpBB/styles/prosilver/template/captcha_turnstile.html b/phpBB/styles/prosilver/template/captcha_turnstile.html index b8c88555022..aed3f9299c3 100644 --- a/phpBB/styles/prosilver/template/captcha_turnstile.html +++ b/phpBB/styles/prosilver/template/captcha_turnstile.html @@ -1,12 +1,24 @@ +{% if CONFIRM_TYPE_REGISTRATION %} +
                +
                + +

                {L_CONFIRMATION}

                +
                +{% endif %} {% if S_TURNSTILE_AVAILABLE %} - + - + - {# The cf-turnstile class is used in JavaScript #} -
                + {# The cf-turnstile class is used in JavaScript #} +
                {% else %} {{ lang('CAPTCHA_TURNSTILE_NOT_AVAILABLE') }} {% endif %} +{% if CONFIRM_TYPE_REGISTRATION %} +
                +
                +
                +{% endif %} From 9eb18f351bd41e3917f43ca09569043905fc2c6a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 15 Oct 2024 20:09:21 +0200 Subject: [PATCH 0459/1214] [ticket/17413] Fix setting solved state on valid confirm code PHPBB-17413 --- phpBB/phpbb/captcha/plugins/base.php | 1 + phpBB/phpbb/captcha/plugins/turnstile.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php index d43fcec31e4..25355bcb538 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -87,6 +87,7 @@ public function validate(): bool { if ($this->confirm_id && hash_equals($this->code, $this->confirm_code)) { + $this->solved = true; return true; } diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 17e4154e8af..70c33e6e213 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -189,7 +189,7 @@ public function get_template(): string 'TURNSTILE_SITEKEY' => $this->config->offsetGet('captcha_turnstile_sitekey'), 'TURNSTILE_THEME' => $this->config->offsetGet('captcha_turnstile_theme'), 'U_TURNSTILE_SCRIPT' => self::SCRIPT_URL, - 'CONFIRM_TYPE_REGISTRATION' => (int) $this->type->value, + 'CONFIRM_TYPE_REGISTRATION' => $this->type->value, ]); return 'captcha_turnstile.html'; From 61e265e4b4a35d749ac2677855ec51d68c4bc0a3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 15 Oct 2024 21:05:01 +0200 Subject: [PATCH 0460/1214] [ticket/17413] Start implementation of unit tests PHPBB-17413 --- phpBB/phpbb/captcha/plugins/turnstile.php | 20 +- tests/captcha/turnstile_test.php | 254 ++++++++++++++++++++++ 2 files changed, 273 insertions(+), 1 deletion(-) create mode 100644 tests/captcha/turnstile_test.php diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index 70c33e6e213..bf9ada48313 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -31,6 +31,9 @@ class turnstile extends base /** @var string API endpoint for turnstile verification */ private const VERIFY_ENDPOINT = 'https://challenges.cloudflare.com/turnstile/v0/siteverify'; + /** @var Client */ + protected Client $client; + /** @var language */ protected language $language; @@ -141,7 +144,7 @@ public function validate(): bool ]; // Create guzzle client - $client = new Client(); + $client = $this->get_client(); // Check captcha with turnstile API try @@ -174,6 +177,21 @@ public function validate(): bool } } + /** + * Get Guzzle client + * + * @return Client + */ + protected function get_client(): Client + { + if (!isset($this->client)) + { + $this->client = new Client(); + } + + return $this->client; + } + /** * {@inheritDoc} */ diff --git a/tests/captcha/turnstile_test.php b/tests/captcha/turnstile_test.php new file mode 100644 index 00000000000..79e64e1ea08 --- /dev/null +++ b/tests/captcha/turnstile_test.php @@ -0,0 +1,254 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\captcha\plugins\confirm_type; +use phpbb\captcha\plugins\turnstile; +use phpbb\config\config; +use phpbb\db\driver\driver_interface; +use phpbb\language\language; +use phpbb\log\log_interface; +use phpbb\request\request; +use phpbb\request\request_interface; +use phpbb\template\template; +use phpbb\user; +use PHPUnit\Framework\TestCase; +use GuzzleHttp\Client; +use GuzzleHttp\Psr7\Response; + +class phpbb_captcha_turnstile_test extends \phpbb_database_test_case +{ + /** @var turnstile */ + protected $turnstile; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $config; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $db; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $language; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $log; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $request; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $template; + + /** @var PHPUnit\Framework\MockObject\MockObject */ + protected $user; + + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); + } + + protected function setUp(): void + { + // Mock the dependencies + $this->config = $this->createMock(config::class); + $this->db = $this->createMock(driver_interface::class); + $this->language = $this->createMock(language::class); + $this->log = $this->createMock(log_interface::class); + $this->request = $this->createMock(request::class); + $this->template = $this->createMock(template::class); + $this->user = $this->createMock(user::class); + + $this->language->method('lang')->willReturnArgument(0); + + // Instantiate the turnstile class with the mocked dependencies + $this->turnstile = new turnstile( + $this->config, + $this->db, + $this->language, + $this->log, + $this->request, + $this->template, + $this->user + ); + } + + public function testIsAvailable(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->assertTrue($this->turnstile->is_available()); + } + + public function test_not_vailable(): void + { + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + // Test when sitekey or secret is missing + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', ''], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->assertFalse($this->turnstile->is_available()); + } + + public function test_get_name(): void + { + $this->assertEquals('CAPTCHA_TURNSTILE', $this->turnstile->get_name()); + } + + public function test_set_Name(): void + { + $this->turnstile->set_name('custom_service'); + $service_name_property = new \ReflectionProperty($this->turnstile, 'service_name'); + $service_name_property->setAccessible(true); + $this->assertEquals('custom_service', $service_name_property->getValue($this->turnstile)); + } + + public function test_validate_without_response(): void + { + // Test when there is no Turnstile response + $this->request->method('variable')->with('cf-turnstile-response')->willReturn(''); + + $this->assertFalse($this->turnstile->validate()); + } + + public function test_validate_with_response_success(): void + { + // Mock the request and response from the Turnstile API + $this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response'); + $this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1'); + + // Mock the GuzzleHttp client and response + $client_mock = $this->createMock(Client::class); + $response_mock = $this->createMock(Response::class); + + $client_mock->method('request')->willReturn($response_mock); + $response_mock->method('getBody')->willReturn(json_encode(['success' => true])); + + // Mock config values for secret + $this->config->method('offsetGet')->willReturn('secret_value'); + + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $client_property = $reflection->getProperty('client'); + $client_property->setAccessible(true); + $client_property->setValue($this->turnstile, $client_mock); + + // Validate that the CAPTCHA was solved successfully + $this->assertTrue($this->turnstile->validate()); + } + + public function test_has_config(): void + { + $this->assertTrue($this->turnstile->has_config()); + } + + public function test_get_client(): void + { + $turnstile_reflection = new \ReflectionClass($this->turnstile); + $get_client_method = $turnstile_reflection->getMethod('get_client'); + $get_client_method->setAccessible(true); + $client_property = $turnstile_reflection->getProperty('client'); + $client_property->setAccessible(true); + + $this->assertFalse($client_property->isInitialized($this->turnstile)); + $client = $get_client_method->invoke($this->turnstile); + $this->assertNotNull($client); + $this->assertInstanceOf(\GuzzleHttp\Client::class, $client); + $this->assertTrue($client === $get_client_method->invoke($this->turnstile)); + } + + public function test_validate_with_response_failure(): void + { + // Mock the request and response from the Turnstile API + $this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response'); + $this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1'); + + // Mock the GuzzleHttp client and response + $client_mock = $this->createMock(Client::class); + $response_mock = $this->createMock(Response::class); + + $client_mock->method('request')->willReturn($response_mock); + $response_mock->method('getBody')->willReturn(json_encode(['success' => false])); + + // Mock config values for secret + $this->config->method('offsetGet')->willReturn('secret_value'); + + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $client_property = $reflection->getProperty('client'); + $client_property->setAccessible(true); + $client_property->setValue($this->turnstile, $client_mock); + + // Validate that the CAPTCHA was not solved + $this->assertFalse($this->turnstile->validate()); + } + + public function test_get_template(): void + { + // Mock is_solved to return false + $is_solved_property = new \ReflectionProperty($this->turnstile, 'solved'); + $is_solved_property->setAccessible(true); + $is_solved_property->setValue($this->turnstile, false); + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->template->expects($this->once())->method('assign_vars')->with([ + 'S_TURNSTILE_AVAILABLE' => $this->turnstile->is_available(), + 'TURNSTILE_SITEKEY' => 'sitekey_value', + 'TURNSTILE_THEME' => 'light', + 'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js', + 'CONFIRM_TYPE_REGISTRATION' => confirm_type::UNDEFINED->value, + ]); + + $this->assertEquals('captcha_turnstile.html', $this->turnstile->get_template()); + + $is_solved_property->setValue($this->turnstile, true); + $this->assertEquals('', $this->turnstile->get_template()); + } + + public function test_get_demo_template(): void + { + // Mock the config assignments + $this->config->method('offsetGet')->willReturn('light'); + + $this->template->expects($this->once())->method('assign_vars')->with([ + 'TURNSTILE_THEME' => 'light', + 'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js', + ]); + + $this->assertEquals('captcha_turnstile_acp_demo.html', $this->turnstile->get_demo_template()); + } +} + From 3e938ea7653d82d87207e10e764c6e08a41bc161 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 17 Oct 2024 17:42:13 +0200 Subject: [PATCH 0461/1214] [ticket/17413] Add full test coverage for turnstile class PHPBB-17413 --- tests/captcha/turnstile_test.php | 176 ++++++++++++++++++++++++++++++- 1 file changed, 175 insertions(+), 1 deletion(-) diff --git a/tests/captcha/turnstile_test.php b/tests/captcha/turnstile_test.php index 79e64e1ea08..dd9b1347ed6 100644 --- a/tests/captcha/turnstile_test.php +++ b/tests/captcha/turnstile_test.php @@ -15,16 +15,18 @@ use phpbb\captcha\plugins\turnstile; use phpbb\config\config; use phpbb\db\driver\driver_interface; +use phpbb\form\form_helper; use phpbb\language\language; use phpbb\log\log_interface; use phpbb\request\request; use phpbb\request\request_interface; use phpbb\template\template; use phpbb\user; -use PHPUnit\Framework\TestCase; use GuzzleHttp\Client; use GuzzleHttp\Psr7\Response; +require_once __DIR__ . '/../../phpBB/includes/functions_acp.php'; + class phpbb_captcha_turnstile_test extends \phpbb_database_test_case { /** @var turnstile */ @@ -160,6 +162,48 @@ public function test_validate_with_response_success(): void $this->assertTrue($this->turnstile->validate()); } + public function test_validate_with_guzzle_exception(): void + { + // Mock the request and response from the Turnstile API + $this->request->method('variable')->with('cf-turnstile-response')->willReturn('valid_response'); + $this->request->method('header')->with('CF-Connecting-IP')->willReturn('127.0.0.1'); + + // Mock the GuzzleHttp client and response + $client_mock = $this->createMock(Client::class); + + $request_mock = $this->createMock(\GuzzleHttp\Psr7\Request::class); + $exception = new \GuzzleHttp\Exception\ConnectException('Failed at connecting', $request_mock); + $client_mock->method('request')->willThrowException($exception); + + // Mock config values for secret + $this->config->method('offsetGet')->willReturn('secret_value'); + + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $client_property = $reflection->getProperty('client'); + $client_property->setAccessible(true); + $client_property->setValue($this->turnstile, $client_mock); + + // Validatation fails due to guzzle exception + $this->assertFalse($this->turnstile->validate()); + } + + public function test_validate_previous_solve(): void + { + // Use reflection to inject the mocked client into the turnstile class + $reflection = new \ReflectionClass($this->turnstile); + $confirm_id = $reflection->getProperty('confirm_id'); + $confirm_id->setValue($this->turnstile, 'confirm_id'); + $code_property = $reflection->getProperty('code'); + $code_property->setValue($this->turnstile, 'test_code'); + $confirm_code_property = $reflection->getProperty('confirm_code'); + $confirm_code_property->setValue($this->turnstile, 'test_code'); + + // Validate that the CAPTCHA was solved successfully + $this->assertTrue($this->turnstile->validate()); + $this->assertTrue($this->turnstile->is_solved()); + } + public function test_has_config(): void { $this->assertTrue($this->turnstile->has_config()); @@ -250,5 +294,135 @@ public function test_get_demo_template(): void $this->assertEquals('captcha_turnstile_acp_demo.html', $this->turnstile->get_demo_template()); } + + public function test_acp_page_display(): void + { + global $phpbb_container, $phpbb_dispatcher, $template; + + $phpbb_container = new phpbb_mock_container_builder(); + $form_helper = new form_helper($this->config, $this->request, $this->user); + $phpbb_container->set('form_helper', $form_helper); + $this->user->data['user_id'] = ANONYMOUS; + $this->user->data['user_form_salt'] = 'foobar'; + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $template = $this->template; + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + + $this->request->method('variable')->willReturn(''); + + $expected = [ + 1 => [ + 'TURNSTILE_THEME' => 'light', + 'U_TURNSTILE_SCRIPT' => 'https://challenges.cloudflare.com/turnstile/v0/api.js', + ], + 2 => [ + 'CAPTCHA_PREVIEW' => 'captcha_turnstile_acp_demo.html', + 'CAPTCHA_NAME' => '', + 'CAPTCHA_TURNSTILE_THEME' => 'light', + 'CAPTCHA_TURNSTILE_THEMES' => ['light', 'dark', 'auto'], + 'U_ACTION' => 'test_u_action', + ], + ]; + $matcher = $this->exactly(count($expected)); + $this->template + ->expects($matcher) + ->method('assign_vars') + ->willReturnCallback(function ($template_data) use ($matcher, $expected) { + $callNr = $matcher->getInvocationCount(); + $this->assertEquals($expected[$callNr], $template_data); + }); + + $module_mock = new ModuleMock(); + + $this->turnstile->acp_page('', $module_mock); + } + + public function test_acp_page_submit_without_form(): void + { + global $language, $phpbb_container, $phpbb_dispatcher, $template; + + $language = $this->language; + $phpbb_container = new phpbb_mock_container_builder(); + $form_helper = new form_helper($this->config, $this->request, $this->user); + $phpbb_container->set('form_helper', $form_helper); + $this->user->data['user_id'] = ANONYMOUS; + $this->user->data['user_form_salt'] = 'foobar'; + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $template = $this->template; + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + + $this->request->method('is_set_post')->willReturnMap([ + ['creation_time', ''], + ['submit', true] + ]); + + $this->setExpectedTriggerError(E_USER_NOTICE, 'FORM_INVALID'); + + $module_mock = new ModuleMock(); + + $this->turnstile->acp_page('', $module_mock); + } + + public function test_acp_page_submit_valid(): void + { + global $language, $phpbb_container, $phpbb_dispatcher, $template; + + $language = $this->language; + $phpbb_container = new phpbb_mock_container_builder(); + $form_helper = new form_helper($this->config, $this->request, $this->user); + $phpbb_container->set('form_helper', $form_helper); + $this->user->data['user_id'] = ANONYMOUS; + $this->user->data['user_form_salt'] = 'foobar'; + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $template = $this->template; + + $form_tokens = $form_helper->get_form_tokens('acp_captcha'); + + // Mock the template assignments + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_theme', 'light'], + ]); + $this->config['form_token_lifetime'] = 3600; + + $this->request->method('is_set_post')->willReturnMap([ + ['creation_time', true], + ['form_token', true], + ['submit', true] + ]); + + $this->request->method('variable')->willReturnMap([ + ['creation_time', 0, false, request_interface::REQUEST, $form_tokens['creation_time']], + ['form_token', '', false, request_interface::REQUEST, $form_tokens['form_token']], + ['captcha_turnstile_sitekey', '', false, request_interface::REQUEST, 'newsitekey'], + ['captcha_turnstile_theme', 'light', false, request_interface::REQUEST, 'auto'], + ]); + + $this->setExpectedTriggerError(E_USER_NOTICE, 'CONFIG_UPDATED'); + + $module_mock = new ModuleMock(); + sleep(1); // sleep for a second to ensure form token validation succeeds + + $this->turnstile->acp_page('', $module_mock); + } } +class ModuleMock +{ + public string $tpl_name = ''; + public string $page_title = ''; + public string $u_action = 'test_u_action'; +} From 38ce4985f47c6caf5d59a30da3b4594b2eb1846d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 17 Oct 2024 17:43:57 +0200 Subject: [PATCH 0462/1214] [ticket/17414] Use language class in adm_back_link() PHPBB-17414 --- phpBB/includes/functions_acp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 646d2f34d5a..a3bae23ab57 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -203,8 +203,8 @@ function adm_page_footer($copyright_html = true) */ function adm_back_link($u_action) { - global $user; - return '

                « ' . $user->lang['BACK_TO_PREV'] . ''; + global $language; + return '

                « ' . $language->lang('BACK_TO_PREV') . ''; } /** From 1e80400d09d6042df4f7aeb8f1a9439905a6f418 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 17 Oct 2024 18:40:53 +0200 Subject: [PATCH 0463/1214] [ticket/17414] Extend unit test coverage for base class PHPBB-17414 --- phpBB/phpbb/captcha/factory.php | 2 +- phpBB/phpbb/captcha/plugins/base.php | 5 +- .../phpbb/captcha/plugins/legacy_wrapper.php | 4 +- .../captcha/plugins/plugin_interface.php | 4 +- tests/captcha/qa_test.php | 4 - tests/captcha/turnstile_test.php | 125 +++++++++++++++++- 6 files changed, 130 insertions(+), 14 deletions(-) diff --git a/phpBB/phpbb/captcha/factory.php b/phpBB/phpbb/captcha/factory.php index d9259d8da96..fc974569bb5 100644 --- a/phpBB/phpbb/captcha/factory.php +++ b/phpBB/phpbb/captcha/factory.php @@ -65,7 +65,7 @@ public function get_instance($name): plugin_interface function garbage_collect($name) { $captcha = $this->get_instance($name); - $captcha->garbage_collect(0); + $captcha->garbage_collect(); } /** diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php index 25355bcb538..43d24f7c8d7 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -151,6 +151,7 @@ protected function generate_confirm_data(): void { $this->code = gen_rand_string_friendly(CAPTCHA_MAX_CHARS); $this->confirm_id = md5(unique_id()); + $this->attempts = 0; $sql = 'INSERT INTO ' . CONFIRM_TABLE . ' ' . $this->db->sql_build_array('INSERT', array( 'confirm_id' => $this->confirm_id, @@ -207,13 +208,13 @@ public function get_error(): string /** * @inheritDoc */ - public function garbage_collect(int $confirm_type = 0): void + public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEFINED): void { $sql = 'SELECT DISTINCT c.session_id FROM ' . CONFIRM_TABLE . ' c LEFT JOIN ' . SESSIONS_TABLE . ' s ON (c.session_id = s.session_id) WHERE s.session_id IS NULL' . - ((empty($type)) ? '' : ' AND c.confirm_type = ' . (int) $type); + ((empty($confirm_type)) ? '' : ' AND c.confirm_type = ' . $confirm_type->value); $result = $this->db->sql_query($sql); if ($row = $this->db->sql_fetchrow($result)) diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 48575733cca..d728a05abac 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -198,11 +198,11 @@ public function get_demo_template(): string /** * {@inheritDoc} */ - public function garbage_collect(int $confirm_type = 0): void + public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEFINED): void { if (method_exists($this->legacy_captcha, 'garbage_collect')) { - $this->legacy_captcha->garbage_collect($confirm_type); + $this->legacy_captcha->garbage_collect($confirm_type->value); } } diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index c6e4e6c6de4..f9dd9c64028 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -110,10 +110,10 @@ public function get_demo_template(): string; /** * Garbage collect captcha plugin * - * @param int $confirm_type Confirm type to garbage collect, defaults to all (0) + * @param confirm_type $confirm_type Confirm type to garbage collect, defaults to all (0) * @return void */ - public function garbage_collect(int $confirm_type = 0): void; + public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEFINED): void; /** * Display acp page diff --git a/tests/captcha/qa_test.php b/tests/captcha/qa_test.php index d4293361045..1c61a7d10cc 100644 --- a/tests/captcha/qa_test.php +++ b/tests/captcha/qa_test.php @@ -41,10 +41,6 @@ protected function setUp(): void public function test_is_installed() { - $this->assertFalse($this->qa->is_installed()); - - $this->qa->install(); - $this->assertTrue($this->qa->is_installed()); } diff --git a/tests/captcha/turnstile_test.php b/tests/captcha/turnstile_test.php index dd9b1347ed6..f78c4d3177c 100644 --- a/tests/captcha/turnstile_test.php +++ b/tests/captcha/turnstile_test.php @@ -62,7 +62,7 @@ protected function setUp(): void { // Mock the dependencies $this->config = $this->createMock(config::class); - $this->db = $this->createMock(driver_interface::class); + $this->db = $this->new_dbal(); $this->language = $this->createMock(language::class); $this->log = $this->createMock(log_interface::class); $this->request = $this->createMock(request::class); @@ -83,7 +83,7 @@ protected function setUp(): void ); } - public function testIsAvailable(): void + public function test_is_available(): void { // Test when both sitekey and secret are present $this->config->method('offsetGet')->willReturnMap([ @@ -97,9 +97,128 @@ public function testIsAvailable(): void ]); $this->assertTrue($this->turnstile->is_available()); + + $this->assertEquals(0, $this->turnstile->get_attempt_count()); + } + + public function test_attempt_count_increase(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertFalse($this->turnstile->validate()); + + $confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id'); + $confirm_id = $confirm_id_reflection->getValue($this->turnstile); + + $this->request = $this->createMock(request::class); + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, $confirm_id], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile = new turnstile( + $this->config, + $this->db, + $this->language, + $this->log, + $this->request, + $this->template, + $this->user + ); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertEquals(1, $this->turnstile->get_attempt_count()); + + // Run some garbage collection + $this->turnstile->garbage_collect(confirm_type::REGISTRATION); + + // Start again at 0 after garbage collection + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertEquals(0, $this->turnstile->get_attempt_count()); + } + + public function test_reset(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertFalse($this->turnstile->validate()); + $this->turnstile->reset(); + + $confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id'); + $confirm_id = $confirm_id_reflection->getValue($this->turnstile); + + $this->request = $this->createMock(request::class); + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, $confirm_id], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile = new turnstile( + $this->config, + $this->db, + $this->language, + $this->log, + $this->request, + $this->template, + $this->user + ); + + $this->turnstile->init(confirm_type::REGISTRATION); + // Should be zero attempts since we reset the captcha + $this->assertEquals(0, $this->turnstile->get_attempt_count()); + } + + public function test_get_hidden_fields(): void + { + // Test when both sitekey and secret are present + $this->config->method('offsetGet')->willReturnMap([ + ['captcha_turnstile_sitekey', 'sitekey_value'], + ['captcha_turnstile_secret', 'secret_value'], + ]); + + $this->request->method('variable')->willReturnMap([ + ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], + ['confirm_code', '', false, request_interface::REQUEST, 'confirm_code'] + ]); + + $this->turnstile->init(confirm_type::REGISTRATION); + $this->assertFalse($this->turnstile->validate()); + $this->turnstile->reset(); + + $confirm_id_reflection = new \ReflectionProperty($this->turnstile, 'confirm_id'); + $confirm_id = $confirm_id_reflection->getValue($this->turnstile); + + $this->assertEquals( + [ + 'confirm_id' => $confirm_id, + 'confirm_code' => '', + ], + $this->turnstile->get_hidden_fields(), + ); + $this->assertEquals('CONFIRM_CODE_WRONG', $this->turnstile->get_error()); } - public function test_not_vailable(): void + public function test_not_available(): void { $this->request->method('variable')->willReturnMap([ ['confirm_id', '', false, request_interface::REQUEST, 'confirm_id'], From dd1c6d647f326ab90871ed03ef8a35d3ea249adf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 17 Oct 2024 19:23:04 +0200 Subject: [PATCH 0464/1214] [ticket/17414] Remove not needed test captchas PHPBB-17414 --- .../foo/test_captcha/captcha/test_captcha.php | 33 ------------------- .../ext/foo/test_captcha/composer.json | 23 ------------- .../ext/foo/test_captcha/config/services.yml | 5 --- 3 files changed, 61 deletions(-) delete mode 100644 tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php delete mode 100644 tests/functional/fixtures/ext/foo/test_captcha/composer.json delete mode 100644 tests/functional/fixtures/ext/foo/test_captcha/config/services.yml diff --git a/tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php b/tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php deleted file mode 100644 index fb8c6ed0901..00000000000 --- a/tests/functional/fixtures/ext/foo/test_captcha/captcha/test_captcha.php +++ /dev/null @@ -1,33 +0,0 @@ -=8.1" - }, - "extra": { - "display-name": "phpBB 4.0 Test Captcha", - "soft-require": { - "phpbb/phpbb": "4.0.*@dev" - } - } -} diff --git a/tests/functional/fixtures/ext/foo/test_captcha/config/services.yml b/tests/functional/fixtures/ext/foo/test_captcha/config/services.yml deleted file mode 100644 index 75cdf52270c..00000000000 --- a/tests/functional/fixtures/ext/foo/test_captcha/config/services.yml +++ /dev/null @@ -1,5 +0,0 @@ -services: - foo_test_captcha.captcha.test_captcha: - class: foo\test_captcha\captcha\test_captcha - tags: - - { name: captcha.plugins } From 687448be49a6d3a7d0ede2aeb42ab2d4b639999e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 17 Oct 2024 19:57:31 +0200 Subject: [PATCH 0465/1214] [ticket/17414] Clean up small code issues noticed by sniffer PHPBB-17414 --- phpBB/phpbb/captcha/plugins/base.php | 11 +++++++++++ phpBB/phpbb/captcha/plugins/legacy_wrapper.php | 2 +- phpBB/phpbb/captcha/plugins/turnstile.php | 2 +- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php index 43d24f7c8d7..1b02d631668 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -1,4 +1,15 @@ + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ namespace phpbb\captcha\plugins; diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index d728a05abac..abb26b34ba5 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -65,7 +65,7 @@ public function get_name(): string return $this->legacy_captcha->has_config(); } - return false; + return ''; } /** diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index bf9ada48313..edd6832159a 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -272,7 +272,7 @@ public function acp_page($id, $module): void { foreach ($captcha_vars as $captcha_var => $template_var) { - $var = $this->request->is_set($captcha_var) ? $this->request->variable($captcha_var, '') : $this->config->offsetGet($captcha_var);; + $var = $this->request->is_set($captcha_var) ? $this->request->variable($captcha_var, '') : $this->config->offsetGet($captcha_var); $this->template->assign_var($template_var, $var); } From ed145b831704d6b2f64053c936cb9bffa283613a Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 18 Oct 2024 23:28:56 +0700 Subject: [PATCH 0466/1214] [ticket/17411] Fix docblock typo PHPBB-17411 --- phpBB/search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/search.php b/phpBB/search.php index 642bee9c39e..6c908a3451f 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -92,7 +92,7 @@ $search_auth_check_override = false; /** -* This event allows you to override serach auth checks +* This event allows you to override search auth checks * * @event core.search_auth_check_override * @var bool search_auth_check_override Whether or not the search auth check overridden From 28f597e1826bec448a93b59a53ca3e219e176a4a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 19 Oct 2024 15:48:46 +0200 Subject: [PATCH 0467/1214] [ticket/17413] Use lang function in turnstile captcha PHPBB-17413 --- phpBB/styles/prosilver/template/captcha_turnstile.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/captcha_turnstile.html b/phpBB/styles/prosilver/template/captcha_turnstile.html index aed3f9299c3..1cf4f4c7923 100644 --- a/phpBB/styles/prosilver/template/captcha_turnstile.html +++ b/phpBB/styles/prosilver/template/captcha_turnstile.html @@ -1,8 +1,7 @@ {% if CONFIRM_TYPE_REGISTRATION %}
                - -

                {L_CONFIRMATION}

                +

                {{ lang('CONFIRMATION') }}

                {% endif %} {% if S_TURNSTILE_AVAILABLE %} From fa66bc5150cdaa29d6556d7d81a78e7d8ce90a3a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 19 Oct 2024 16:55:53 +0200 Subject: [PATCH 0468/1214] [ticket/17414] Fix small issues with compatibility to legacy captchas PHPBB-17414 --- phpBB/phpbb/captcha/plugins/legacy_wrapper.php | 2 +- phpBB/phpbb/captcha/plugins/qa.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index abb26b34ba5..8f8642b2b2f 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -86,7 +86,7 @@ public function init(confirm_type $type): void { if (method_exists($this->legacy_captcha, 'init')) { - $this->legacy_captcha->init($type); + $this->legacy_captcha->init($type->value); } } diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 3e48df00b28..6e09aaaf13d 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -40,7 +40,7 @@ class qa protected $service_name; /** @var int Question ID */ - protected $question = -1; + private $question = -1; /** * Constructor From 08ab64a3b20e6f9cd211d03ce9d87f4d3b2eda5d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Oct 2024 09:04:36 +0200 Subject: [PATCH 0469/1214] [ticket/17414] Improve docblocks in legacy wrapper PHPBB-17414 --- phpBB/phpbb/captcha/plugins/legacy_wrapper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 8f8642b2b2f..cc0609f4b02 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -15,8 +15,10 @@ class legacy_wrapper implements plugin_interface { + /** @var object Legacy CAPTCHA instance, should implement functionality as required in phpBB 3.3 */ private $legacy_captcha; + /** @var string Last error */ private string $last_error; /** @@ -206,6 +208,9 @@ public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEF } } + /** + * {@inheritDoc} + */ public function acp_page($id, $module): void { if (method_exists($this->legacy_captcha, 'acp_page')) From fd994f4742f095020657cc9bba15640fc7bde63f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Oct 2024 09:43:45 +0200 Subject: [PATCH 0470/1214] [ticket/17414] Add unit test for legacy wrapper PHPBB-17414 --- .../phpbb/captcha/plugins/legacy_wrapper.php | 2 +- tests/captcha/legacy_wrapper_test.php | 261 ++++++++++++++++++ 2 files changed, 262 insertions(+), 1 deletion(-) create mode 100644 tests/captcha/legacy_wrapper_test.php diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index cc0609f4b02..600683194d2 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -64,7 +64,7 @@ public function get_name(): string { if (method_exists($this->legacy_captcha, 'get_name')) { - return $this->legacy_captcha->has_config(); + return $this->legacy_captcha->get_name(); } return ''; diff --git a/tests/captcha/legacy_wrapper_test.php b/tests/captcha/legacy_wrapper_test.php new file mode 100644 index 00000000000..873012bd6a1 --- /dev/null +++ b/tests/captcha/legacy_wrapper_test.php @@ -0,0 +1,261 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\captcha\plugins\confirm_type; +use phpbb\captcha\plugins\legacy_wrapper; + +class phpbb_captcha_legacy_wrapper_test extends phpbb_test_case +{ + private $legacy_captcha; + private $legacy_wrapper; + + public function setUp(): void + { + $this->legacy_captcha = $this->createMock(stdClass::class); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + } + + public function test_is_available_with_method_exists(): void + { + // Simulate is_available method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['is_available']) + ->getMock(); + $this->legacy_captcha->method('is_available')->willReturn(true); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + + $this->assertTrue($this->legacy_wrapper->is_available()); + } + + public function test_is_available_without_method_exists(): void + { + // Simulate is_available method does not exist in the legacy captcha + $this->assertFalse($this->legacy_wrapper->is_available()); + } + + public function test_has_config_with_method_exists(): void + { + // Simulate has_config method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['has_config']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('has_config')->willReturn(true); + + $this->assertTrue($this->legacy_wrapper->has_config()); + } + + public function test_has_config_without_method_exists(): void + { + // Simulate has_config method does not exist in the legacy captcha + $this->assertFalse($this->legacy_wrapper->has_config()); + } + + public function test_get_name_with_method_exists(): void + { + // Simulate get_name method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_name']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_name')->willReturn('LegacyCaptchaName'); + + $this->assertSame('LegacyCaptchaName', $this->legacy_wrapper->get_name()); + } + + public function test_get_name_without_method_exists(): void + { + // Simulate get_name method does not exist in the legacy captcha + $this->assertSame('', $this->legacy_wrapper->get_name()); + } + + public function test_set_name_with_method_exists(): void + { + // Simulate set_name method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['set_name']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('set_name')->with('NewName'); + + $this->legacy_wrapper->set_name('NewName'); + } + + public function test_init_with_method_exists(): void + { + // Simulate init method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['init']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('init')->with(confirm_type::REGISTRATION->value); + + $this->legacy_wrapper->init(confirm_type::REGISTRATION); + } + + public function test_get_hidden_fields_with_method_exists(): void + { + // Simulate get_hidden_fields method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_hidden_fields']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_hidden_fields')->willReturn(['field1' => 'value1']); + + $this->assertSame(['field1' => 'value1'], $this->legacy_wrapper->get_hidden_fields()); + } + + public function test_get_hidden_fields_without_method_exists(): void + { + // Simulate get_hidden_fields method does not exist in the legacy captcha + $this->assertSame([], $this->legacy_wrapper->get_hidden_fields()); + } + + public function test_validate_with_error(): void + { + // Simulate validate method returns an error + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['validate']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('validate')->willReturn('Captcha Error'); + + $this->assertFalse($this->legacy_wrapper->validate()); + $this->assertSame('Captcha Error', $this->legacy_wrapper->get_error()); + } + + public function test_validate_without_method_exists(): void + { + $this->assertFalse($this->legacy_wrapper->validate()); + } + + public function test_validate_without_error(): void + { + // Simulate validate method does not return an error + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['validate']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('validate')->willReturn(null); + + $this->assertTrue($this->legacy_wrapper->validate()); + } + + public function test_is_solved_with_method_exists(): void + { + // Simulate is_solved method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['is_solved']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('is_solved')->willReturn(true); + + $this->assertTrue($this->legacy_wrapper->is_solved()); + } + + public function test_is_solved_without_method_exists(): void + { + // Simulate is_solved method does not exist in the legacy captcha + $this->assertFalse($this->legacy_wrapper->is_solved()); + } + + public function test_reset_with_method_exists(): void + { + // Simulate reset method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['reset']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('reset'); + + $this->legacy_wrapper->reset(); + } + + public function test_get_attempt_count_with_method_exists(): void + { + // Simulate get_attempt_count method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_attempt_count']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_attempt_count')->willReturn(5); + + $this->assertSame(5, $this->legacy_wrapper->get_attempt_count()); + } + + public function test_get_attempt_count_without_method_exists(): void + { + // Simulate get_attempt_count method does not exist in the legacy captcha + $this->assertSame(PHP_INT_MAX, $this->legacy_wrapper->get_attempt_count()); + } + + public function test_get_template_with_method_exists(): void + { + // Simulate get_template method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_template']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_template')->willReturn('template_content'); + + $this->assertSame('template_content', $this->legacy_wrapper->get_template()); + } + + public function test_get_template_without_method_exists(): void + { + // Simulate get_template method does not exist in the legacy captcha + $this->assertSame('', $this->legacy_wrapper->get_template()); + } + + public function test_get_demo_template_with_method_exists(): void + { + // Simulate get_demo_template method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['get_demo_template']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->method('get_demo_template')->willReturn('demo_template_content'); + + $this->assertSame('demo_template_content', $this->legacy_wrapper->get_demo_template()); + } + + public function test_get_demo_template_without_method_exists(): void + { + // Simulate get_demo_template method does not exist in the legacy captcha + $this->assertSame('', $this->legacy_wrapper->get_demo_template()); + } + + public function test_garbage_collect_with_method_exists(): void + { + // Simulate garbage_collect method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['garbage_collect']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('garbage_collect')->with(confirm_type::REGISTRATION->value); + + $this->legacy_wrapper->garbage_collect(confirm_type::REGISTRATION); + } + + public function test_acp_page_with_method_exists(): void + { + // Simulate acp_page method exists in the legacy captcha + $this->legacy_captcha = $this->getMockBuilder(stdClass::class) + ->addMethods(['acp_page']) + ->getMock(); + $this->legacy_wrapper = new legacy_wrapper($this->legacy_captcha); + $this->legacy_captcha->expects($this->once())->method('acp_page')->with(1, 'module'); + + $this->legacy_wrapper->acp_page(1, 'module'); + } +} From 3b27b65c760c4a16ea542c943a9211693ac1b222 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Oct 2024 10:55:15 +0200 Subject: [PATCH 0471/1214] [ticket/17414] Change incomplete CAPTCHA to extend new base class PHPBB-17414 --- .../default/container/services_captcha.yml | 4 + phpBB/phpbb/captcha/plugins/base.php | 7 ++ phpBB/phpbb/captcha/plugins/incomplete.php | 94 +++++++++---------- .../phpbb/captcha/plugins/legacy_wrapper.php | 2 +- .../captcha/plugins/plugin_interface.php | 2 +- phpBB/phpbb/captcha/plugins/turnstile.php | 2 +- tests/captcha/incomplete_test.php | 41 +++++--- 7 files changed, 86 insertions(+), 66 deletions(-) diff --git a/phpBB/config/default/container/services_captcha.yml b/phpBB/config/default/container/services_captcha.yml index d4f1ad863a7..ea41fefe805 100644 --- a/phpBB/config/default/container/services_captcha.yml +++ b/phpBB/config/default/container/services_captcha.yml @@ -19,7 +19,11 @@ services: shared: false arguments: - '@config' + - '@dbal.conn' + - '@language' + - '@request' - '@template' + - '@user' - '%core.root_path%' - '%core.php_ext%' calls: diff --git a/phpBB/phpbb/captcha/plugins/base.php b/phpBB/phpbb/captcha/plugins/base.php index 1b02d631668..a30e6797313 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -246,4 +246,11 @@ public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEF } $this->db->sql_freeresult($result); } + + /** + * {@inheritDoc} + */ + public function acp_page(mixed $id, mixed $module): void + { + } } diff --git a/phpBB/phpbb/captcha/plugins/incomplete.php b/phpBB/phpbb/captcha/plugins/incomplete.php index ec3376c0a55..07998a71252 100644 --- a/phpBB/phpbb/captcha/plugins/incomplete.php +++ b/phpBB/phpbb/captcha/plugins/incomplete.php @@ -14,25 +14,34 @@ namespace phpbb\captcha\plugins; use phpbb\config\config; -use phpbb\exception\runtime_exception; +use phpbb\db\driver\driver_interface; +use phpbb\language\language; +use phpbb\request\request_interface; use phpbb\template\template; +use phpbb\user; -class incomplete extends captcha_abstract +class incomplete extends base { /** * Constructor for incomplete captcha * * @param config $config + * @param driver_interface $db + * @param language $language + * @param request_interface $request * @param template $template + * @param user $user * @param string $phpbb_root_path * @param string $phpEx */ - public function __construct(protected config $config, protected template $template, - protected string $phpbb_root_path, protected string $phpEx) - {} + public function __construct(config $config, driver_interface $db, language $language, request_interface $request, + protected template $template, user $user, protected string $phpbb_root_path, protected string $phpEx) + { + parent::__construct($config, $db, $language, $request, $user); + } /** - * @return bool True if captcha is available, false if not + * {@inheritDoc} */ public function is_available(): bool { @@ -40,70 +49,45 @@ public function is_available(): bool } /** - * Dummy implementation, not supported by this captcha - * - * @throws runtime_exception - * @return void + * {@inheritDoc} */ - public function get_generator_class(): void + public function has_config(): bool { - throw new runtime_exception('NO_GENERATOR_CLASS'); + return false; } /** - * Get CAPTCHA name language variable - * - * @return string Language variable + * {@inheritDoc} */ - public static function get_name(): string + public function get_name(): string { return 'CAPTCHA_INCOMPLETE'; } /** - * Init CAPTCHA - * - * @param int $type CAPTCHA type - * @return void + * {@inheritDoc} */ - public function init($type) + public function set_name(string $name): void { } /** - * Execute demo - * - * @return void + * {@inheritDoc} */ - public function execute_demo() + public function init(confirm_type $type): void { } /** - * Execute CAPTCHA - * - * @return void - */ - public function execute() - { - } - - /** - * Get template data for demo - * - * @param int|string $id ACP module ID - * - * @return string Demo template file name + * {@inheritDoc} */ - public function get_demo_template($id): string + public function get_demo_template(): string { return ''; } /** - * Get template data for CAPTCHA - * - * @return string CAPTCHA template file name + * {@inheritDoc} */ public function get_template(): string { @@ -118,9 +102,7 @@ public function get_template(): string } /** - * Validate CAPTCHA - * - * @return false Incomplete CAPTCHA will never validate + * {@inheritDoc} */ public function validate(): bool { @@ -128,12 +110,26 @@ public function validate(): bool } /** - * Check whether CAPTCHA is solved - * - * @return false Incomplete CAPTCHA will never be solved + * {@inheritDoc} + */ + public function get_error(): string + { + return ''; + } + + /** + * {@inheritDoc} */ public function is_solved(): bool { return false; } + + /** + * {@inheritDoc} + */ + public function get_attempt_count(): int + { + return 0; + } } diff --git a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php index 600683194d2..aaabddb48bd 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -211,7 +211,7 @@ public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEF /** * {@inheritDoc} */ - public function acp_page($id, $module): void + public function acp_page(mixed $id, mixed $module): void { if (method_exists($this->legacy_captcha, 'acp_page')) { diff --git a/phpBB/phpbb/captcha/plugins/plugin_interface.php b/phpBB/phpbb/captcha/plugins/plugin_interface.php index f9dd9c64028..41483e45a5b 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -122,5 +122,5 @@ public function garbage_collect(confirm_type $confirm_type = confirm_type::UNDEF * @param mixed $module ACP module name * @return void */ - public function acp_page($id, $module): void; + public function acp_page(mixed $id, mixed $module): void; } diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index edd6832159a..afd7a363b21 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -229,7 +229,7 @@ public function get_demo_template(): string /** * {@inheritDoc} */ - public function acp_page($id, $module): void + public function acp_page(mixed $id, mixed $module): void { $captcha_vars = [ 'captcha_turnstile_sitekey' => 'CAPTCHA_TURNSTILE_SITEKEY', diff --git a/tests/captcha/incomplete_test.php b/tests/captcha/incomplete_test.php index c1da2b6c486..4c5e7c6b279 100644 --- a/tests/captcha/incomplete_test.php +++ b/tests/captcha/incomplete_test.php @@ -11,11 +11,15 @@ * */ +use phpbb\captcha\plugins\confirm_type; use phpbb\captcha\plugins\incomplete; use phpbb\config\config; +use phpbb\language\language; +use phpbb\request\request; use phpbb\template\template; +use phpbb\user; -class phpbb_captcha_incomplete_test extends phpbb_test_case +class phpbb_captcha_incomplete_test extends phpbb_database_test_case { protected config $config; @@ -32,21 +36,34 @@ public function assign_vars(array $vars): void $this->assigned_vars = array_merge($this->assigned_vars, $vars); } + public function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/../fixtures/empty.xml'); + } + protected function setUp(): void { global $phpbb_root_path, $phpEx; $this->config = new config([]); $this->template = $this->getMockBuilder('\phpbb\template\twig\twig') - ->setMethods(['assign_vars']) + ->onlyMethods(['assign_vars']) ->disableOriginalConstructor() ->getMock(); $this->template->method('assign_vars') ->willReturnCallback([$this, 'assign_vars']); + $db = $this->new_dbal(); + $language = $this->createMock(language::class); + $request = $this->createMock(request::class); + $user = $this->createMock(user::class); $this->incomplete_captcha = new incomplete( $this->config, + $db, + $language, + $request, $this->template, + $user, $phpbb_root_path, $phpEx ); @@ -57,29 +74,25 @@ public function test_miscellaneous_incomplete(): void $this->assertTrue($this->incomplete_captcha->is_available()); $this->assertFalse($this->incomplete_captcha->is_solved()); $this->assertFalse($this->incomplete_captcha->validate()); - $this->assertSame('CAPTCHA_INCOMPLETE', incomplete::get_name()); - $this->incomplete_captcha->init(0); - $this->incomplete_captcha->execute(); - $this->incomplete_captcha->execute_demo(); + $this->assertFalse($this->incomplete_captcha->has_config()); + $this->incomplete_captcha->set_name('foo'); + $this->assertSame('CAPTCHA_INCOMPLETE', $this->incomplete_captcha->get_name()); + $this->incomplete_captcha->init(confirm_type::UNDEFINED); $this->assertEmpty($this->assigned_vars); $this->assertEmpty($this->incomplete_captcha->get_demo_template(0)); - } - - public function test_get_generator_class(): void - { - $this->expectException(\phpbb\exception\runtime_exception::class); - $this->incomplete_captcha->get_generator_class(); + $this->assertEmpty($this->incomplete_captcha->get_error()); + $this->assertSame(0, $this->incomplete_captcha->get_attempt_count()); } public function test_get_tempate(): void { - $this->incomplete_captcha->init(CONFIRM_REG); + $this->incomplete_captcha->init(confirm_type::REGISTRATION); $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); $this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); $this->assigned_vars = []; - $this->incomplete_captcha->init(CONFIRM_POST); + $this->incomplete_captcha->init(confirm_type::POST); $this->assertSame('captcha_incomplete.html', $this->incomplete_captcha->get_template()); $this->assertEquals('CONFIRM_INCOMPLETE', $this->assigned_vars['CONFIRM_LANG']); } From 443d82d0825a1b77324333f694b880063c036f42 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 20 Oct 2024 20:05:55 +0700 Subject: [PATCH 0472/1214] [ticket/17388] Add core events to bump_topic_allowed() PHPBB-16852 PHPBB-17388 --- phpBB/includes/functions_content.php | 44 +++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index d50a515c870..463ee08259c 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -289,7 +289,27 @@ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list */ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_poster, $last_topic_poster) { - global $config, $auth, $user; + global $config, $auth, $user, $phpbb_dispatcher; + + /** + * Event to run code before the topic bump checks + * + * @event core.bump_topic_allowed_before + * @var int forum_id ID of the forum + * @var int topic_bumped Flag indicating if the topic was already bumped (0/1) + * @var int last_post_time The time of the topic last post + * @var int topic_poster User ID of the topic author + * @var int last_topic_poster User ID of the topic last post author + * @since 3.3.14-RC1 + */ + $vars = [ + 'forum_id', + 'topic_bumped', + 'last_post_time', + 'topic_poster', + 'last_topic_poster', + ]; + extract($phpbb_dispatcher->trigger_event('core.bump_topic_allowed_before', compact($vars))); // Check permission and make sure the last post was not already bumped if (!$auth->acl_get('f_bump', $forum_id) || $topic_bumped) @@ -312,6 +332,28 @@ function bump_topic_allowed($forum_id, $topic_bumped, $last_post_time, $topic_po return false; } + /** + * Event to run code after the topic bump checks + * + * @event core.bump_topic_allowed_after + * @var int forum_id ID of the forum + * @var int topic_bumped Flag indicating if the topic was already bumped (0/1) + * @var int last_post_time The time of the topic last post + * @var int topic_poster User ID of the topic author + * @var int last_topic_poster User ID of the topic last post author + * @var int bump_time Bump time range + * @since 3.3.14-RC1 + */ + $vars = [ + 'forum_id', + 'topic_bumped', + 'last_post_time', + 'topic_poster', + 'last_topic_poster', + 'bump_time', + ]; + extract($phpbb_dispatcher->trigger_event('core.bump_topic_allowed_after', compact($vars))); + // A bump time of 0 will completely disable the bump feature... not intended but might be useful. return $bump_time; } From a58ea519b8a1ab5be6dc804983e1a7ddf0df429a Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 20 Oct 2024 09:35:00 -0700 Subject: [PATCH 0473/1214] [ticket/17416] Web Push Notifications FAQ PHPBB-17416 Signed-off-by: Matt Friedman --- phpBB/language/en/help/faq.php | 14 ++++++++++++++ phpBB/phpbb/help/controller/faq.php | 12 ++++++++++++ 2 files changed, 26 insertions(+) diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index a9ef139e326..96cb8717e8e 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -41,6 +41,7 @@ 'HELP_FAQ_BLOCK_POSTING' => 'Posting Issues', 'HELP_FAQ_BLOCK_SEARCH' => 'Searching the Forums', 'HELP_FAQ_BLOCK_USERSETTINGS' => 'User Preferences and settings', + 'HELP_FAQ_BLOCK_WEBPUSH' => 'Web Push Notifications for Browsers', 'HELP_FAQ_BOOKMARKS_DIFFERENCE_ANSWER' => 'In phpBB 3.0, bookmarking topics worked much like bookmarking in a web browser. You were not alerted when there was an update. As of phpBB 3.1, bookmarking is more like subscribing to a topic. You can be notified when a bookmarked topic is updated. Subscribing, however, will notify you when there is an update to a topic or forum on the board. Notification options for bookmarks and subscriptions can be configured in the User Control Panel, under “Board preferences”.', 'HELP_FAQ_BOOKMARKS_DIFFERENCE_QUESTION' => 'What is the difference between bookmarking and subscribing?', @@ -183,4 +184,17 @@ 'HELP_FAQ_USERSETTINGS_SERVERTIME_QUESTION' => 'I changed the timezone and the time is still wrong!', 'HELP_FAQ_USERSETTINGS_TIMEZONE_ANSWER' => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.', 'HELP_FAQ_USERSETTINGS_TIMEZONE_QUESTION' => 'The times are not correct!', + + 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER' => 'Make sure this forum is allowed to send notifications in your browser settings. Also, verify that your device’s system settings permit notifications from your web browser or app. Some browsers deliver notifications even when closed, whilst others only do so when the browser is open. View this table for browser support information.', + 'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'What if I’m still having trouble receiving notifications?', + 'HELP_FAQ_WEBPUSH_HOW_ANSWER' => 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe”. After subscribing, your browser may prompt you to allow the forum to send notifications to your device—make sure to grant permission. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser.', + 'HELP_FAQ_WEBPUSH_HOW_QUESTION' => 'How can I receive forum notification alerts on my computer or mobile device?', + 'HELP_FAQ_WEBPUSH_IOS_ANSWER' => 'For certain devices, such as those running iOS or iPadOS, you may need to add the forum site to your Home Screen for push notifications to work. This essentially makes the forum function like a standalone web app. Refer to your device’s operating system instructions to enable push notifications for iOS/iPadOS or Android.', + 'HELP_FAQ_WEBPUSH_IOS_QUESTION' => 'How does it work on mobile devices (iOS/Android)?', + 'HELP_FAQ_WEBPUSH_SESSION_ANSWER' => 'Yes, you will continue to receive notifications even if you’re logged out.', + 'HELP_FAQ_WEBPUSH_SESSION_QUESTION' => 'Will I receive notifications if I am logged out?', + 'HELP_FAQ_WEBPUSH_SUBBING_ANSWER' => 'If the “Subscribe” button is visible but cannot be clicked, your browser or device likely doesn’t support push notifications. Try using a different browser or device that supports this feature.', + 'HELP_FAQ_WEBPUSH_SUBBING_QUESTION' => 'Why is the “Subscribe” button disabled?', + 'HELP_FAQ_WEBPUSH_WHAT_ANSWER' => 'Web push notifications enhance phpBB’s notification system by allowing real-time notifications to be sent directly to your desktop or mobile device, even if you’re not actively browsing the forum. These notifications function like app alerts, providing instant updates for private messages, post interactions, moderation actions, and more.', + 'HELP_FAQ_WEBPUSH_WHAT_QUESTION' => 'What are web push notifications?', )); diff --git a/phpBB/phpbb/help/controller/faq.php b/phpBB/phpbb/help/controller/faq.php index 0f63be5b564..771eb5ef5bc 100644 --- a/phpBB/phpbb/help/controller/faq.php +++ b/phpBB/phpbb/help/controller/faq.php @@ -146,6 +146,18 @@ public function display() 'HELP_FAQ_BOOKMARKS_REMOVE_QUESTION' => 'HELP_FAQ_BOOKMARKS_REMOVE_ANSWER', ) ); + $this->manager->add_block( + 'HELP_FAQ_BLOCK_WEBPUSH', + false, + array( + 'HELP_FAQ_WEBPUSH_WHAT_QUESTION' => 'HELP_FAQ_WEBPUSH_WHAT_ANSWER', + 'HELP_FAQ_WEBPUSH_HOW_QUESTION' => 'HELP_FAQ_WEBPUSH_HOW_ANSWER', + 'HELP_FAQ_WEBPUSH_IOS_QUESTION' => 'HELP_FAQ_WEBPUSH_IOS_ANSWER', + 'HELP_FAQ_WEBPUSH_SESSION_QUESTION' => 'HELP_FAQ_WEBPUSH_SESSION_ANSWER', + 'HELP_FAQ_WEBPUSH_SUBBING_QUESTION' => 'HELP_FAQ_WEBPUSH_SUBBING_ANSWER', + 'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER', + ) + ); $this->manager->add_block( 'HELP_FAQ_BLOCK_ATTACHMENTS', false, From 05b1d4fb70cefe4cae622a66af6e33e8d9077360 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 20 Oct 2024 16:41:33 -0700 Subject: [PATCH 0474/1214] [ticket/17416] Combine two related questions into one PHPBB-17416 Signed-off-by: Matt Friedman --- phpBB/language/en/help/faq.php | 4 +--- phpBB/phpbb/help/controller/faq.php | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index 96cb8717e8e..d5fa8382be8 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -187,10 +187,8 @@ 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER' => 'Make sure this forum is allowed to send notifications in your browser settings. Also, verify that your device’s system settings permit notifications from your web browser or app. Some browsers deliver notifications even when closed, whilst others only do so when the browser is open. View this table for browser support information.', 'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'What if I’m still having trouble receiving notifications?', - 'HELP_FAQ_WEBPUSH_HOW_ANSWER' => 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe”. After subscribing, your browser may prompt you to allow the forum to send notifications to your device—make sure to grant permission. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser.', + 'HELP_FAQ_WEBPUSH_HOW_ANSWER' => 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe.” Your browser may ask for permission to send notifications—be sure to allow it. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser. For mobile devices such as iPhone or iPad, you may need to add the forum site to your Home Screen for push notifications to work, effectively turning it into a standalone web app. Follow your mobile device’s instructions to enable push notifications for iPhone/iPad or Android.', 'HELP_FAQ_WEBPUSH_HOW_QUESTION' => 'How can I receive forum notification alerts on my computer or mobile device?', - 'HELP_FAQ_WEBPUSH_IOS_ANSWER' => 'For certain devices, such as those running iOS or iPadOS, you may need to add the forum site to your Home Screen for push notifications to work. This essentially makes the forum function like a standalone web app. Refer to your device’s operating system instructions to enable push notifications for iOS/iPadOS or Android.', - 'HELP_FAQ_WEBPUSH_IOS_QUESTION' => 'How does it work on mobile devices (iOS/Android)?', 'HELP_FAQ_WEBPUSH_SESSION_ANSWER' => 'Yes, you will continue to receive notifications even if you’re logged out.', 'HELP_FAQ_WEBPUSH_SESSION_QUESTION' => 'Will I receive notifications if I am logged out?', 'HELP_FAQ_WEBPUSH_SUBBING_ANSWER' => 'If the “Subscribe” button is visible but cannot be clicked, your browser or device likely doesn’t support push notifications. Try using a different browser or device that supports this feature.', diff --git a/phpBB/phpbb/help/controller/faq.php b/phpBB/phpbb/help/controller/faq.php index 771eb5ef5bc..62a82a3efe5 100644 --- a/phpBB/phpbb/help/controller/faq.php +++ b/phpBB/phpbb/help/controller/faq.php @@ -152,7 +152,6 @@ public function display() array( 'HELP_FAQ_WEBPUSH_WHAT_QUESTION' => 'HELP_FAQ_WEBPUSH_WHAT_ANSWER', 'HELP_FAQ_WEBPUSH_HOW_QUESTION' => 'HELP_FAQ_WEBPUSH_HOW_ANSWER', - 'HELP_FAQ_WEBPUSH_IOS_QUESTION' => 'HELP_FAQ_WEBPUSH_IOS_ANSWER', 'HELP_FAQ_WEBPUSH_SESSION_QUESTION' => 'HELP_FAQ_WEBPUSH_SESSION_ANSWER', 'HELP_FAQ_WEBPUSH_SUBBING_QUESTION' => 'HELP_FAQ_WEBPUSH_SUBBING_ANSWER', 'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER', From 4de13418d08550649254115367417d3230d9c7aa Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 20 Oct 2024 17:12:31 -0700 Subject: [PATCH 0475/1214] [ticket/17416] Update FAQ with info about ad blockers PHPBB-17416 Signed-off-by: Matt Friedman --- phpBB/language/en/help/faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index d5fa8382be8..adfb6e674f9 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -185,7 +185,7 @@ 'HELP_FAQ_USERSETTINGS_TIMEZONE_ANSWER' => 'It is possible the time displayed is from a timezone different from the one you are in. If this is the case, visit your User Control Panel and change your timezone to match your particular area, e.g. London, Paris, New York, Sydney, etc. Please note that changing the timezone, like most settings, can only be done by registered users. If you are not registered, this is a good time to do so.', 'HELP_FAQ_USERSETTINGS_TIMEZONE_QUESTION' => 'The times are not correct!', - 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER' => 'Make sure this forum is allowed to send notifications in your browser settings. Also, verify that your device’s system settings permit notifications from your web browser or app. Some browsers deliver notifications even when closed, whilst others only do so when the browser is open. View this table for browser support information.', + 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER' => 'Make sure this forum is allowed to send notifications in your browser settings. Also, verify that your device’s system settings permit notifications from your web browser or app. Some browsers deliver notifications even when closed, whilst others only do so when the browser is open. View this table for browser support information. Finally, if you’re using an ad blocker, review its settings to make sure it’s not configured to block push notifications.', 'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'What if I’m still having trouble receiving notifications?', 'HELP_FAQ_WEBPUSH_HOW_ANSWER' => 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe.” Your browser may ask for permission to send notifications—be sure to allow it. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser. For mobile devices such as iPhone or iPad, you may need to add the forum site to your Home Screen for push notifications to work, effectively turning it into a standalone web app. Follow your mobile device’s instructions to enable push notifications for iPhone/iPad or Android.', 'HELP_FAQ_WEBPUSH_HOW_QUESTION' => 'How can I receive forum notification alerts on my computer or mobile device?', From eaa0c779a6e3d56bfc34723a0fd8f9eb8c9b4ef0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 19:36:42 +0200 Subject: [PATCH 0476/1214] [prep-release-3.3.14] Update version numbers to 3.3.14-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index c85bc1db0a1..773b31897de 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 9e2924d96cf..a0cc5876635 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.14-dev'); +@define('PHPBB_VERSION', '3.3.14-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index f22a878adde..56bee134ba4 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.13'); +define('PHPBB_VERSION', '3.3.14-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 9da79e77be8..7192d630c74 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 4c419c5acd0abbdd959baf49b1126528edeb01f8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 19:36:43 +0200 Subject: [PATCH 0477/1214] [prep-release-3.3.14] Update version numbers to 3.3.14 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7a02946f775..014dc0e3702 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.13', + 'phpbb_version' => '3.3.14', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 0b16bfde556..1dfc8230b78 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.13 -phpbb_version = 3.3.13 +style_version = 3.3.14 +phpbb_version = 3.3.14 # Defining a different template bitfield # template_bitfield = //g= From 7c090c6e2a9b9503c726e99ed71f5e1e0dcb0dc0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 19:39:11 +0200 Subject: [PATCH 0478/1214] [prep-release-3.3.14] Add migration for 3.3.14-RC1 --- .../phpbb/db/migration/data/v33x/v3314rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3314rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php new file mode 100644 index 00000000000..1632a65ddad --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3314rc1.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3314rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.14-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3313', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.14-RC1']], + ]; + } +} From c9922720368dad8710799d6b746b39e633a5c06c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Oct 2024 20:15:47 +0200 Subject: [PATCH 0479/1214] [prep-release-3.3.14] Update changelog for 3.3.14-RC1 --- phpBB/docs/CHANGELOG.html | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 39d7897d5e6..638bdbdf1c6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

                Changelog

                1. Changelog
                    +
                  • Changes since 3.3.13
                  • Changes since 3.3.13-RC1
                  • Changes since 3.3.12
                  • Changes since 3.3.12-RC1
                    • @@ -171,6 +172,36 @@

                    Changelog

                    +

                    Changes since 3.3.13

                    +

                    Bug

                    +
                      +
                    • [PHPBB-17181] - If statement to highlight Reported PMS on the view message page doesn't work.
                      • +
                    • [PHPBB-17383] - HELO/EHLO error while using gethostbyaddr()
                      • +
                    • [PHPBB-17384] - Passing E_USER_ERROR to trigger_error() is deprecated in PHP 8.4
                      • +
                    • [PHPBB-17385] - Version check without SSL flag for CDB extensions fails
                      • +
                    • [PHPBB-17386] - Incorrect trace result while tracing user-based permissions
                      • +
                    • [PHPBB-17387] - PHP warnings in search results
                      • +
                    • [PHPBB-17390] - Missing buttons for approval of new messages
                      • +
                    • [PHPBB-17391] - PHP warnings on attempt to create user group having name already in use
                      • +
                    • [PHPBB-17398] - Ajax error on deleting cookies
                      • +
                    • [PHPBB-17405] - Function phpbb_gmgetdate() returns incorrect result for edge cases
                      • +
                    • [PHPBB-17410] - UCP tabs do not work when testing out another user's permissions
                      • +
                    +

                    Improvement

                    +
                      +
                    • [PHPBB-16852] - Addition of a new PHP event concerning bump topics
                      • +
                    • [PHPBB-17359] - Distinct disabled and not installed extensions in the list
                      • +
                    • [PHPBB-17376] - Link reference to quote post is a poor accessibility experience
                      • +
                    • [PHPBB-17382] - Incorrect grammar on FAQ page regarding searching for members
                      • +
                    • [PHPBB-17388] - Add php event to bump_topic_allowed function
                      • +
                    • [PHPBB-17394] - Check mergeability of PR on GitHub Actions
                      • +
                    • [PHPBB-17396] - Automatically handle merges of 3.3.x into master
                      • +
                    • [PHPBB-17397] - Add event for forum_data query in viewforum
                      • +
                    • [PHPBB-17402] - Add possibility to force reparsing BBCode via CLI
                      • +
                    • [PHPBB-17407] - Limit mergeability check to single comment
                      • +
                    • [PHPBB-17411] - Add core event to search.php
                      • +
                    +

                    Changes since 3.3.13-RC1

                    Bug

                      From 5f371ea62bf981d38532fac39be2ebcb331cb794 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 21 Oct 2024 12:58:00 -0700 Subject: [PATCH 0480/1214] [ticket/17416] Fix typos PHPBB-17416 Signed-off-by: Matt Friedman --- phpBB/language/en/help/faq.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/help/faq.php b/phpBB/language/en/help/faq.php index adfb6e674f9..666c0ad0b72 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -187,7 +187,7 @@ 'HELP_FAQ_WEBPUSH_GENERAL_ANSWER' => 'Make sure this forum is allowed to send notifications in your browser settings. Also, verify that your device’s system settings permit notifications from your web browser or app. Some browsers deliver notifications even when closed, whilst others only do so when the browser is open. View this table for browser support information. Finally, if you’re using an ad blocker, review its settings to make sure it’s not configured to block push notifications.', 'HELP_FAQ_WEBPUSH_GENERAL_QUESTION' => 'What if I’m still having trouble receiving notifications?', - 'HELP_FAQ_WEBPUSH_HOW_ANSWER' => 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe.” Your browser may ask for permission to send notifications—be sure to allow it. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser. For mobile devices such as iPhone or iPad, you may need to add the forum site to your Home Screen for push notifications to work, effectively turning it into a standalone web app. Follow your mobile device’s instructions to enable push notifications for iPhone/iPad or Android.', + 'HELP_FAQ_WEBPUSH_HOW_ANSWER' => 'Navigate to “Notification options” in your UCP (User Control Panel) and click “Subscribe.” Your browser may ask for permission to send notifications — be sure to allow it. If you’re still not receiving notifications, check your device’s system settings to ensure notifications are enabled for your browser. For mobile devices such as iPhone or iPad, you may need to add the forum site to your Home Screen for push notifications to work, effectively turning it into a standalone web app. Follow your mobile device’s instructions to enable push notifications for iPhone/iPad or Android.', 'HELP_FAQ_WEBPUSH_HOW_QUESTION' => 'How can I receive forum notification alerts on my computer or mobile device?', 'HELP_FAQ_WEBPUSH_SESSION_ANSWER' => 'Yes, you will continue to receive notifications even if you’re logged out.', 'HELP_FAQ_WEBPUSH_SESSION_QUESTION' => 'Will I receive notifications if I am logged out?', From dd49bb4a0a6835f207f91875024185782304d057 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 22 Oct 2024 19:00:17 +0200 Subject: [PATCH 0481/1214] [ticket/17414] Remove idempotency and use user ip for check PHPBB-17414 --- phpBB/phpbb/captcha/plugins/turnstile.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/captcha/plugins/turnstile.php b/phpBB/phpbb/captcha/plugins/turnstile.php index afd7a363b21..9a235edc3be 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -139,8 +139,7 @@ public function validate(): bool $form_data = [ 'secret' => $this->config['captcha_turnstile_secret'], 'response' => $turnstile_response, - 'remoteip' => $this->request->header('CF-Connecting-IP'), - //'idempotency_key' => $this->confirm_id, // check if we need this + 'remoteip' => $this->user->ip, ]; // Create guzzle client From 725cbd31c8d114c196edc661689adecb1ba64991 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 22 Oct 2024 20:43:13 +0200 Subject: [PATCH 0482/1214] [3.3.x] Update versions to 3.3.15-dev --- build/build.xml | 6 +++--- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 773b31897de..6a72273ff46 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - - - + + + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index a0cc5876635..3734899352d 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.14-RC1'); +@define('PHPBB_VERSION', '3.3.15-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7192d630c74..ed73c1d5328 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From b49fcc2a188934934d84bb7964ff66c3fc2f2f0b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 23 Oct 2024 21:29:18 +0200 Subject: [PATCH 0483/1214] [ticket/17304] Add HiDPI smilies PHPBB-17304 --- phpBB/docs/CREDITS.txt | 2 ++ phpBB/images/smilies/icon_arrow.svg | 1 + phpBB/images/smilies/icon_cool.svg | 1 + phpBB/images/smilies/icon_cry.svg | 1 + phpBB/images/smilies/icon_e_biggrin.svg | 1 + phpBB/images/smilies/icon_e_confused.svg | 1 + phpBB/images/smilies/icon_e_geek.svg | 1 + phpBB/images/smilies/icon_e_sad.svg | 1 + phpBB/images/smilies/icon_e_smile.svg | 1 + phpBB/images/smilies/icon_e_surprised.svg | 1 + phpBB/images/smilies/icon_e_ugeek.svg | 1 + phpBB/images/smilies/icon_e_wink.svg | 1 + phpBB/images/smilies/icon_eek.svg | 1 + phpBB/images/smilies/icon_evil.svg | 1 + phpBB/images/smilies/icon_exclaim.svg | 1 + phpBB/images/smilies/icon_idea.svg | 1 + phpBB/images/smilies/icon_lol.svg | 1 + phpBB/images/smilies/icon_mad.svg | 1 + phpBB/images/smilies/icon_mrgreen.svg | 1 + phpBB/images/smilies/icon_neutral.svg | 1 + phpBB/images/smilies/icon_question.svg | 1 + phpBB/images/smilies/icon_razz.svg | 1 + phpBB/images/smilies/icon_redface.svg | 1 + phpBB/images/smilies/icon_rolleyes.svg | 1 + phpBB/images/smilies/icon_twisted.svg | 1 + 25 files changed, 26 insertions(+) create mode 100644 phpBB/images/smilies/icon_arrow.svg create mode 100644 phpBB/images/smilies/icon_cool.svg create mode 100644 phpBB/images/smilies/icon_cry.svg create mode 100644 phpBB/images/smilies/icon_e_biggrin.svg create mode 100644 phpBB/images/smilies/icon_e_confused.svg create mode 100644 phpBB/images/smilies/icon_e_geek.svg create mode 100644 phpBB/images/smilies/icon_e_sad.svg create mode 100644 phpBB/images/smilies/icon_e_smile.svg create mode 100644 phpBB/images/smilies/icon_e_surprised.svg create mode 100644 phpBB/images/smilies/icon_e_ugeek.svg create mode 100644 phpBB/images/smilies/icon_e_wink.svg create mode 100644 phpBB/images/smilies/icon_eek.svg create mode 100644 phpBB/images/smilies/icon_evil.svg create mode 100644 phpBB/images/smilies/icon_exclaim.svg create mode 100644 phpBB/images/smilies/icon_idea.svg create mode 100644 phpBB/images/smilies/icon_lol.svg create mode 100644 phpBB/images/smilies/icon_mad.svg create mode 100644 phpBB/images/smilies/icon_mrgreen.svg create mode 100644 phpBB/images/smilies/icon_neutral.svg create mode 100644 phpBB/images/smilies/icon_question.svg create mode 100644 phpBB/images/smilies/icon_razz.svg create mode 100644 phpBB/images/smilies/icon_redface.svg create mode 100644 phpBB/images/smilies/icon_rolleyes.svg create mode 100644 phpBB/images/smilies/icon_twisted.svg diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 47621b23187..48a835fe02a 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -108,3 +108,5 @@ Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com Emoji by: Twemoji (c) 2018 Twitter, Inc, https://twemoji.twitter.com/ + +HiDPI smilies by rednoah: https://github.com/rednoah/phpBB-smilies diff --git a/phpBB/images/smilies/icon_arrow.svg b/phpBB/images/smilies/icon_arrow.svg new file mode 100644 index 00000000000..4d190756ce0 --- /dev/null +++ b/phpBB/images/smilies/icon_arrow.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_cool.svg b/phpBB/images/smilies/icon_cool.svg new file mode 100644 index 00000000000..500729316d2 --- /dev/null +++ b/phpBB/images/smilies/icon_cool.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_cry.svg b/phpBB/images/smilies/icon_cry.svg new file mode 100644 index 00000000000..e9312f9d7a2 --- /dev/null +++ b/phpBB/images/smilies/icon_cry.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_biggrin.svg b/phpBB/images/smilies/icon_e_biggrin.svg new file mode 100644 index 00000000000..6e3803be049 --- /dev/null +++ b/phpBB/images/smilies/icon_e_biggrin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_confused.svg b/phpBB/images/smilies/icon_e_confused.svg new file mode 100644 index 00000000000..b9561e32041 --- /dev/null +++ b/phpBB/images/smilies/icon_e_confused.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_geek.svg b/phpBB/images/smilies/icon_e_geek.svg new file mode 100644 index 00000000000..77af7d61f9e --- /dev/null +++ b/phpBB/images/smilies/icon_e_geek.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_sad.svg b/phpBB/images/smilies/icon_e_sad.svg new file mode 100644 index 00000000000..69a323f1552 --- /dev/null +++ b/phpBB/images/smilies/icon_e_sad.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_smile.svg b/phpBB/images/smilies/icon_e_smile.svg new file mode 100644 index 00000000000..c273c77f1fb --- /dev/null +++ b/phpBB/images/smilies/icon_e_smile.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_surprised.svg b/phpBB/images/smilies/icon_e_surprised.svg new file mode 100644 index 00000000000..ad5ce8bdc5b --- /dev/null +++ b/phpBB/images/smilies/icon_e_surprised.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_ugeek.svg b/phpBB/images/smilies/icon_e_ugeek.svg new file mode 100644 index 00000000000..0ae02fcc76f --- /dev/null +++ b/phpBB/images/smilies/icon_e_ugeek.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_e_wink.svg b/phpBB/images/smilies/icon_e_wink.svg new file mode 100644 index 00000000000..f07eaf36ac5 --- /dev/null +++ b/phpBB/images/smilies/icon_e_wink.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_eek.svg b/phpBB/images/smilies/icon_eek.svg new file mode 100644 index 00000000000..d3bbc31ae96 --- /dev/null +++ b/phpBB/images/smilies/icon_eek.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_evil.svg b/phpBB/images/smilies/icon_evil.svg new file mode 100644 index 00000000000..2636a078ec9 --- /dev/null +++ b/phpBB/images/smilies/icon_evil.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_exclaim.svg b/phpBB/images/smilies/icon_exclaim.svg new file mode 100644 index 00000000000..6d14ccd2e08 --- /dev/null +++ b/phpBB/images/smilies/icon_exclaim.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_idea.svg b/phpBB/images/smilies/icon_idea.svg new file mode 100644 index 00000000000..0f5ff849bbd --- /dev/null +++ b/phpBB/images/smilies/icon_idea.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_lol.svg b/phpBB/images/smilies/icon_lol.svg new file mode 100644 index 00000000000..93d0fe76433 --- /dev/null +++ b/phpBB/images/smilies/icon_lol.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_mad.svg b/phpBB/images/smilies/icon_mad.svg new file mode 100644 index 00000000000..1575f95c149 --- /dev/null +++ b/phpBB/images/smilies/icon_mad.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_mrgreen.svg b/phpBB/images/smilies/icon_mrgreen.svg new file mode 100644 index 00000000000..a8157d4041a --- /dev/null +++ b/phpBB/images/smilies/icon_mrgreen.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_neutral.svg b/phpBB/images/smilies/icon_neutral.svg new file mode 100644 index 00000000000..2363cce8654 --- /dev/null +++ b/phpBB/images/smilies/icon_neutral.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_question.svg b/phpBB/images/smilies/icon_question.svg new file mode 100644 index 00000000000..caa067b21c6 --- /dev/null +++ b/phpBB/images/smilies/icon_question.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_razz.svg b/phpBB/images/smilies/icon_razz.svg new file mode 100644 index 00000000000..a959ffc79d0 --- /dev/null +++ b/phpBB/images/smilies/icon_razz.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_redface.svg b/phpBB/images/smilies/icon_redface.svg new file mode 100644 index 00000000000..0b333e519ad --- /dev/null +++ b/phpBB/images/smilies/icon_redface.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_rolleyes.svg b/phpBB/images/smilies/icon_rolleyes.svg new file mode 100644 index 00000000000..4d737dd4bc7 --- /dev/null +++ b/phpBB/images/smilies/icon_rolleyes.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/phpBB/images/smilies/icon_twisted.svg b/phpBB/images/smilies/icon_twisted.svg new file mode 100644 index 00000000000..264129041ac --- /dev/null +++ b/phpBB/images/smilies/icon_twisted.svg @@ -0,0 +1 @@ + \ No newline at end of file From 25fca31646210c19d1e9dbaa7d2be2a8b901c383 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 23 Oct 2024 21:29:35 +0200 Subject: [PATCH 0484/1214] [ticket/17304] Stop using twemoji and rely on system emojis PHPBB-17304 --- phpBB/docs/CREDITS.txt | 3 --- phpBB/phpbb/textformatter/s9e/factory.php | 10 +--------- phpBB/styles/prosilver/theme/common.css | 7 +------ 3 files changed, 2 insertions(+), 18 deletions(-) diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt index 48a835fe02a..9155fc9a2b7 100644 --- a/phpBB/docs/CREDITS.txt +++ b/phpBB/docs/CREDITS.txt @@ -106,7 +106,4 @@ MIT licensed: Symfony2 (c) 2004-2011 Fabien Potencier, https://symfony.com/ Cookie Consent (c) 2015 Silktide Ltd, https://cookieconsent.insites.com -Emoji by: -Twemoji (c) 2018 Twitter, Inc, https://twemoji.twitter.com/ - HiDPI smilies by rednoah: https://github.com/rednoah/phpBB-smilies diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 79521b753ba..78f8cbe6c66 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -358,15 +358,7 @@ function ($m) // Load the Emoji plugin and modify its tag's template to obey viewsmilies $tag = $configurator->Emoji->getTag(); - $tag->template = ' - - {.} - - - {.} - - '; - $tag->template = '' . str_replace('class="emoji"', 'class="emoji smilies"', $tag->template) . ''; + $tag->template = ''; /** * Modify the s9e\TextFormatter configurator after the default settings are set diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 66fff05404b..59db92a032e 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -1224,14 +1224,9 @@ ul.linklist:after, content: ""; } -/* stylelint-disable declaration-property-unit-allowed-list */ .emoji { - width: 1em; - min-width: 18px; - height: 1em; - min-height: 18px; + font-size: 17px; } -/* stylelint-enable declaration-property-unit-allowed-list */ .smilies { vertical-align: text-bottom; From e8a878dc79a8773a03b2d059705cc9212605894d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 23 Oct 2024 21:57:06 +0200 Subject: [PATCH 0485/1214] [ticket/17304] Add migration for HiDPI smilies PHPBB-17304 --- .../db/migration/data/v400/hidpi_smilies.php | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php diff --git a/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php b/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php new file mode 100644 index 00000000000..60f65b5f14e --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php @@ -0,0 +1,89 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class hidpi_smilies extends migration +{ + private array $default_smilies = [ + 'icon_arrow', + 'icon_cool', + 'icon_cry', + 'icon_e_biggrin', + 'icon_e_confused', + 'icon_e_geek', + 'icon_e_sad', + 'icon_e_smile', + 'icon_e_surprised', + 'icon_e_ugeek', + 'icon_e_wink', + 'icon_eek', + 'icon_evil', + 'icon_exclaim', + 'icon_idea', + 'icon_lol', + 'icon_mad', + 'icon_mrgreen', + 'icon_neutral', + 'icon_question', + 'icon_razz', + 'icon_redface', + 'icon_rolleyes', + 'icon_twisted', + ]; + + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev' + ]; + } + + public function update_data(): array + { + return [ + ['custom', [[$this, 'gif_to_svg_smilies']]], + ]; + } + + public function revert_data(): array + { + return [ + ['custom', [[$this, 'svg_to_gif_smilies']]], + ]; + } + + public function gif_to_svg_smilies(): void + { + foreach ($this->default_smilies as $smiley) + { + $sql = 'UPDATE ' . $this->tables['smilies'] . "smilies + SET smiley_url = '" . $this->db->sql_escape($smiley) . ".svg' + WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".gif'"; + $this->db->sql_query($sql); + } + } + + public function svg_to_gif_smilies(): void + { + foreach ($this->default_smilies as $smiley) + { + $sql = 'UPDATE ' . $this->tables['smilies'] . " + SET smiley_url = '" . $this->db->sql_escape($smiley) . ".gif' + WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".svg'"; + $this->db->sql_query($sql); + } + } +} From 20d65aea1fc4082c749b8c6eda126f5b5e8e40df Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 23 Oct 2024 22:04:07 +0200 Subject: [PATCH 0486/1214] [ticket/17304] Fix table in migration and use svg icons in schema PHPBB-17304 --- phpBB/install/schemas/schema_data.sql | 84 +++++++++---------- .../db/migration/data/v400/hidpi_smilies.php | 2 +- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index a160057fd24..0238e402eac 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -709,48 +709,48 @@ INSERT INTO phpbb_posts (topic_id, forum_id, poster_id, icon_id, post_time, post INSERT INTO phpbb_topics_posted (user_id, topic_id, topic_posted) VALUES (2, 1, 1); # -- Smilies -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 1); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-D', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 2); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':grin:', 'icon_e_biggrin.gif', '{L_SMILIES_VERY_HAPPY}', 15, 17, 3); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 4); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-)', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 5); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':smile:', 'icon_e_smile.gif', '{L_SMILIES_SMILE}', 15, 17, 6); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 7); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';-)', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 8); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':wink:', 'icon_e_wink.gif', '{L_SMILIES_WINK}', 15, 17, 9); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 10); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-(', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 11); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':sad:', 'icon_e_sad.gif', '{L_SMILIES_SAD}', 15, 17, 12); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 13); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 14); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.gif', '{L_SMILIES_SURPRISED}', 15, 17, 15); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':shock:', 'icon_eek.gif', '{L_SMILIES_SHOCKED}', 15, 17, 16); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 17); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-?', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 18); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':???:', 'icon_e_confused.gif', '{L_SMILIES_CONFUSED}', 15, 17, 19); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 20); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.gif', '{L_SMILIES_COOL}', 15, 17, 21); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.gif', '{L_SMILIES_LAUGHING}', 15, 17, 22); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 23); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 24); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.gif', '{L_SMILIES_MAD}', 15, 17, 25); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 26); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 27); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.gif', '{L_SMILIES_RAZZ}', 15, 17, 28); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.gif', '{L_SMILIES_EMARRASSED}', 15, 17, 29); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.gif', '{L_SMILIES_CRYING}', 15, 17, 30); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.gif', '{L_SMILIES_EVIL}', 15, 17, 31); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.gif', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.gif', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.gif', '{L_SMILIES_EXCLAMATION}', 15, 17, 34); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.gif', '{L_SMILIES_QUESTION}', 15, 17, 35); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.gif', '{L_SMILIES_IDEA}', 15, 17, 36); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.gif', '{L_SMILIES_ARROW}', 15, 17, 37); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 38); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.gif', '{L_SMILIES_NEUTRAL}', 15, 17, 39); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.gif', '{L_SMILIES_MR_GREEN}', 15, 17, 40); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':geek:', 'icon_e_geek.gif', '{L_SMILIES_GEEK}', 17, 17, 41); -INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.gif', '{L_SMILIES_UBER_GEEK}', 17, 18, 42); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':D', 'icon_e_biggrin.svg', '{L_SMILIES_VERY_HAPPY}', 15, 17, 1); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-D', 'icon_e_biggrin.svg', '{L_SMILIES_VERY_HAPPY}', 15, 17, 2); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':grin:', 'icon_e_biggrin.svg', '{L_SMILIES_VERY_HAPPY}', 15, 17, 3); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':)', 'icon_e_smile.svg', '{L_SMILIES_SMILE}', 15, 17, 4); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-)', 'icon_e_smile.svg', '{L_SMILIES_SMILE}', 15, 17, 5); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':smile:', 'icon_e_smile.svg', '{L_SMILIES_SMILE}', 15, 17, 6); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';)', 'icon_e_wink.svg', '{L_SMILIES_WINK}', 15, 17, 7); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (';-)', 'icon_e_wink.svg', '{L_SMILIES_WINK}', 15, 17, 8); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':wink:', 'icon_e_wink.svg', '{L_SMILIES_WINK}', 15, 17, 9); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':(', 'icon_e_sad.svg', '{L_SMILIES_SAD}', 15, 17, 10); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-(', 'icon_e_sad.svg', '{L_SMILIES_SAD}', 15, 17, 11); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':sad:', 'icon_e_sad.svg', '{L_SMILIES_SAD}', 15, 17, 12); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':o', 'icon_e_surprised.svg', '{L_SMILIES_SURPRISED}', 15, 17, 13); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-o', 'icon_e_surprised.svg', '{L_SMILIES_SURPRISED}', 15, 17, 14); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':eek:', 'icon_e_surprised.svg', '{L_SMILIES_SURPRISED}', 15, 17, 15); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':shock:', 'icon_eek.svg', '{L_SMILIES_SHOCKED}', 15, 17, 16); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?', 'icon_e_confused.svg', '{L_SMILIES_CONFUSED}', 15, 17, 17); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-?', 'icon_e_confused.svg', '{L_SMILIES_CONFUSED}', 15, 17, 18); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':???:', 'icon_e_confused.svg', '{L_SMILIES_CONFUSED}', 15, 17, 19); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES ('8-)', 'icon_cool.svg', '{L_SMILIES_COOL}', 15, 17, 20); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cool:', 'icon_cool.svg', '{L_SMILIES_COOL}', 15, 17, 21); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':lol:', 'icon_lol.svg', '{L_SMILIES_LAUGHING}', 15, 17, 22); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':x', 'icon_mad.svg', '{L_SMILIES_MAD}', 15, 17, 23); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-x', 'icon_mad.svg', '{L_SMILIES_MAD}', 15, 17, 24); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mad:', 'icon_mad.svg', '{L_SMILIES_MAD}', 15, 17, 25); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':P', 'icon_razz.svg', '{L_SMILIES_RAZZ}', 15, 17, 26); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-P', 'icon_razz.svg', '{L_SMILIES_RAZZ}', 15, 17, 27); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':razz:', 'icon_razz.svg', '{L_SMILIES_RAZZ}', 15, 17, 28); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':oops:', 'icon_redface.svg', '{L_SMILIES_EMARRASSED}', 15, 17, 29); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':cry:', 'icon_cry.svg', '{L_SMILIES_CRYING}', 15, 17, 30); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':evil:', 'icon_evil.svg', '{L_SMILIES_EVIL}', 15, 17, 31); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':twisted:', 'icon_twisted.svg', '{L_SMILIES_TWISTED_EVIL}', 15, 17, 32); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':roll:', 'icon_rolleyes.svg', '{L_SMILIES_ROLLING_EYES}', 15, 17, 33); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':!:', 'icon_exclaim.svg', '{L_SMILIES_EXCLAMATION}', 15, 17, 34); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':?:', 'icon_question.svg', '{L_SMILIES_QUESTION}', 15, 17, 35); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':idea:', 'icon_idea.svg', '{L_SMILIES_IDEA}', 15, 17, 36); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':arrow:', 'icon_arrow.svg', '{L_SMILIES_ARROW}', 15, 17, 37); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':|', 'icon_neutral.svg', '{L_SMILIES_NEUTRAL}', 15, 17, 38); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':-|', 'icon_neutral.svg', '{L_SMILIES_NEUTRAL}', 15, 17, 39); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':mrgreen:', 'icon_mrgreen.svg', '{L_SMILIES_MR_GREEN}', 15, 17, 40); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':geek:', 'icon_e_geek.svg', '{L_SMILIES_GEEK}', 17, 17, 41); +INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.svg', '{L_SMILIES_UBER_GEEK}', 17, 18, 42); # -- icons INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.gif', 16, 16, 1, 1); diff --git a/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php b/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php index 60f65b5f14e..f51810f0954 100644 --- a/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php +++ b/phpBB/phpbb/db/migration/data/v400/hidpi_smilies.php @@ -69,7 +69,7 @@ public function gif_to_svg_smilies(): void { foreach ($this->default_smilies as $smiley) { - $sql = 'UPDATE ' . $this->tables['smilies'] . "smilies + $sql = 'UPDATE ' . $this->tables['smilies'] . " SET smiley_url = '" . $this->db->sql_escape($smiley) . ".svg' WHERE smiley_url = '" . $this->db->sql_escape($smiley) . ".gif'"; $this->db->sql_query($sql); From 14e9ad1060bd3c1cee6a648f0f552392e6dfe2e7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 23 Oct 2024 22:42:04 +0200 Subject: [PATCH 0487/1214] [ticket/17304] Change expected text parsing content PHPBB-17304 --- tests/text_formatter/s9e/default_formatting_test.php | 4 ++-- tests/text_processing/tickets_data/PHPBB3-15348.html | 2 +- tests/text_processing/tickets_data/PHPBB3-16074.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index 97b04c2fb7d..3f637676b3a 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -310,11 +310,11 @@ public function get_default_formatting_tests() ), array( "Emoji: \xF0\x9F\x98\x80", - 'Emoji: ' . ' + "Emoji: \xF0\x9F\x98\x80", ), array( "Emoji: \xF0\x9F\x98\x80", - "Emoji: \xF0\x9F\x98\x80", + "Emoji: \xF0\x9F\x98\x80", function ($container) { $container->get('text_formatter.renderer')->set_viewsmilies(false); diff --git a/tests/text_processing/tickets_data/PHPBB3-15348.html b/tests/text_processing/tickets_data/PHPBB3-15348.html index 33336083e33..564e6fda595 100644 --- a/tests/text_processing/tickets_data/PHPBB3-15348.html +++ b/tests/text_processing/tickets_data/PHPBB3-15348.html @@ -1 +1 @@ -:o k: :ok: \ No newline at end of file +:o k: :ok: \ No newline at end of file diff --git a/tests/text_processing/tickets_data/PHPBB3-16074.html b/tests/text_processing/tickets_data/PHPBB3-16074.html index 8b2e5aad8af..04d72697b8b 100644 --- a/tests/text_processing/tickets_data/PHPBB3-16074.html +++ b/tests/text_processing/tickets_data/PHPBB3-16074.html @@ -1 +1 @@ -:man_judge: 👨‍⚖️ \ No newline at end of file +:man_judge: 👨‍⚖️ \ No newline at end of file From 42eed1f917b429881197eb7342ae17a8bf2cf09b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 24 Oct 2024 18:16:30 +0200 Subject: [PATCH 0488/1214] [ticket/17304] Update acp smilies test to svg PHPBB-17304 --- tests/functional/acp_smilies_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/acp_smilies_test.php b/tests/functional/acp_smilies_test.php index 955a00b488d..c8aa1d9b7d6 100644 --- a/tests/functional/acp_smilies_test.php +++ b/tests/functional/acp_smilies_test.php @@ -24,8 +24,8 @@ public function test_htmlspecialchars() // Create the BBCode $crawler = self::request('GET', 'adm/index.php?i=acp_icons&sid=' . $this->sid . '&mode=smilies&action=edit&id=1'); $form = $crawler->selectButton('Submit')->form(array( - 'code[icon_e_biggrin.gif]' => '>:D', - 'emotion[icon_e_biggrin.gif]' => '>:D' + 'code[icon_e_biggrin.svg]' => '>:D', + 'emotion[icon_e_biggrin.svg]' => '>:D' )); self::submit($form); From d116f82cdcb951c31a2597d2b152a01704e8f2d2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 27 Oct 2024 16:08:14 +0100 Subject: [PATCH 0489/1214] [ticket/17418] Add SVG versions of topic icons PHPBB-17418 --- phpBB/images/icons/misc/fire.svg | 36 ++++++++++++ phpBB/images/icons/misc/heart.svg | 31 ++++++++++ phpBB/images/icons/misc/radioactive.svg | 30 ++++++++++ phpBB/images/icons/misc/star.svg | 19 +++++++ phpBB/images/icons/misc/thinking.svg | 76 +++++++++++++++++++++++++ phpBB/images/icons/smile/alert.svg | 32 +++++++++++ phpBB/images/icons/smile/info.svg | 36 ++++++++++++ phpBB/images/icons/smile/mrgreen.svg | 39 +++++++++++++ phpBB/images/icons/smile/question.svg | 35 ++++++++++++ phpBB/images/icons/smile/redface.svg | 63 ++++++++++++++++++++ 10 files changed, 397 insertions(+) create mode 100644 phpBB/images/icons/misc/fire.svg create mode 100644 phpBB/images/icons/misc/heart.svg create mode 100644 phpBB/images/icons/misc/radioactive.svg create mode 100644 phpBB/images/icons/misc/star.svg create mode 100644 phpBB/images/icons/misc/thinking.svg create mode 100644 phpBB/images/icons/smile/alert.svg create mode 100644 phpBB/images/icons/smile/info.svg create mode 100644 phpBB/images/icons/smile/mrgreen.svg create mode 100644 phpBB/images/icons/smile/question.svg create mode 100644 phpBB/images/icons/smile/redface.svg diff --git a/phpBB/images/icons/misc/fire.svg b/phpBB/images/icons/misc/fire.svg new file mode 100644 index 00000000000..5645475690b --- /dev/null +++ b/phpBB/images/icons/misc/fire.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/misc/heart.svg b/phpBB/images/icons/misc/heart.svg new file mode 100644 index 00000000000..f25d0a3c649 --- /dev/null +++ b/phpBB/images/icons/misc/heart.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/misc/radioactive.svg b/phpBB/images/icons/misc/radioactive.svg new file mode 100644 index 00000000000..372c84e4237 --- /dev/null +++ b/phpBB/images/icons/misc/radioactive.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/misc/star.svg b/phpBB/images/icons/misc/star.svg new file mode 100644 index 00000000000..e5e88794b96 --- /dev/null +++ b/phpBB/images/icons/misc/star.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/misc/thinking.svg b/phpBB/images/icons/misc/thinking.svg new file mode 100644 index 00000000000..b3fdc9fca36 --- /dev/null +++ b/phpBB/images/icons/misc/thinking.svg @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/smile/alert.svg b/phpBB/images/icons/smile/alert.svg new file mode 100644 index 00000000000..173ba4d7800 --- /dev/null +++ b/phpBB/images/icons/smile/alert.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/smile/info.svg b/phpBB/images/icons/smile/info.svg new file mode 100644 index 00000000000..f6e9ef7512d --- /dev/null +++ b/phpBB/images/icons/smile/info.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/smile/mrgreen.svg b/phpBB/images/icons/smile/mrgreen.svg new file mode 100644 index 00000000000..ef639a5ccdc --- /dev/null +++ b/phpBB/images/icons/smile/mrgreen.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/smile/question.svg b/phpBB/images/icons/smile/question.svg new file mode 100644 index 00000000000..7a7bf1602a0 --- /dev/null +++ b/phpBB/images/icons/smile/question.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/phpBB/images/icons/smile/redface.svg b/phpBB/images/icons/smile/redface.svg new file mode 100644 index 00000000000..99693be14bd --- /dev/null +++ b/phpBB/images/icons/smile/redface.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 422741e432f5e9a24dc97e57b4cde88634bd812a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 27 Oct 2024 16:15:08 +0100 Subject: [PATCH 0490/1214] [ticket/17418] Adjust animation of redface PHPBB-17418 --- phpBB/images/icons/smile/redface.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/images/icons/smile/redface.svg b/phpBB/images/icons/smile/redface.svg index 99693be14bd..b3fddd7361f 100644 --- a/phpBB/images/icons/smile/redface.svg +++ b/phpBB/images/icons/smile/redface.svg @@ -49,7 +49,7 @@ - + From 4dc69f959f82fe36f3f7aae01366044b2610afb5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 27 Oct 2024 16:21:02 +0100 Subject: [PATCH 0491/1214] [ticket/17418] Fix broken path in redface PHPBB-17418 --- phpBB/images/icons/smile/redface.svg | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/phpBB/images/icons/smile/redface.svg b/phpBB/images/icons/smile/redface.svg index b3fddd7361f..84fe0db5ef5 100644 --- a/phpBB/images/icons/smile/redface.svg +++ b/phpBB/images/icons/smile/redface.svg @@ -28,7 +28,7 @@ stroke-linejoin: round; } - + @@ -44,15 +44,14 @@ - - + + - - - - - - + + + + + From 0f3c9f70fc0070936aee5c16cb7611aa634559a1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 27 Oct 2024 16:53:33 +0100 Subject: [PATCH 0492/1214] [ticket/17418] Add migration for switching from gif to svg icons PHPBB-17418 --- .../db/migration/data/v400/hidpi_icons.php | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/hidpi_icons.php diff --git a/phpBB/phpbb/db/migration/data/v400/hidpi_icons.php b/phpBB/phpbb/db/migration/data/v400/hidpi_icons.php new file mode 100644 index 00000000000..6e91b15ca53 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/hidpi_icons.php @@ -0,0 +1,75 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class hidpi_icons extends migration +{ + private array $default_icons = [ + 'misc/fire', + 'misc/heart', + 'misc/radioactive', + 'misc/star', + 'misc/thinking', + 'smile/alert', + 'smile/info', + 'smile/mrgreen', + 'smile/question', + 'smile/redface', + ]; + + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev' + ]; + } + + public function update_data(): array + { + return [ + ['custom', [[$this, 'gif_to_svg_icons']]], + ]; + } + + public function revert_data(): array + { + return [ + ['custom', [[$this, 'svg_to_gif_icons']]], + ]; + } + + public function gif_to_svg_icons(): void + { + foreach ($this->default_icons as $smiley) + { + $sql = 'UPDATE ' . $this->tables['icons'] . " + SET icons_url = '" . $this->db->sql_escape($smiley) . ".svg' + WHERE icons_url = '" . $this->db->sql_escape($smiley) . ".gif'"; + $this->db->sql_query($sql); + } + } + + public function svg_to_gif_icons(): void + { + foreach ($this->default_icons as $smiley) + { + $sql = 'UPDATE ' . $this->tables['icons'] . " + SET icons_url = '" . $this->db->sql_escape($smiley) . ".gif' + WHERE icons_url = '" . $this->db->sql_escape($smiley) . ".svg'"; + $this->db->sql_query($sql); + } + } +} From ecabd85162ec77dfc2666b0780ce3615509fe1db Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 27 Oct 2024 16:54:42 +0100 Subject: [PATCH 0493/1214] [ticket/17418] Default to svg icons during install PHPBB-17418 --- phpBB/install/schemas/schema_data.sql | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 13af5fa3040..21b26ee9c8e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -756,16 +756,16 @@ INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_heigh INSERT INTO phpbb_smilies (code, smiley_url, emotion, smiley_width, smiley_height, smiley_order) VALUES (':ugeek:', 'icon_e_ugeek.svg', '{L_SMILIES_UBER_GEEK}', 17, 18, 42); # -- icons -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.gif', 16, 16, 1, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface.gif', 16, 16, 9, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mrgreen.gif', 16, 16, 10, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/heart.gif', 16, 16, 4, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/star.gif', 16, 16, 2, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/radioactive.gif', 16, 16, 3, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/thinking.gif', 16, 16, 5, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/info.gif', 16, 16, 8, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.gif', 16, 16, 6, 1); -INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alert.gif', 16, 16, 7, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/fire.svg', 16, 16, 1, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/redface.svg', 16, 16, 9, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/mrgreen.svg', 16, 16, 10, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/heart.svg', 16, 16, 4, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/star.svg', 16, 16, 2, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/radioactive.svg', 16, 16, 3, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('misc/thinking.svg', 16, 16, 5, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/info.svg', 16, 16, 8, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/question.svg', 16, 16, 6, 1); +INSERT INTO phpbb_icons (icons_url, icons_width, icons_height, icons_order, display_on_posting) VALUES ('smile/alert.svg', 16, 16, 7, 1); # -- reasons INSERT INTO phpbb_reports_reasons (reason_title, reason_description, reason_order) VALUES ('warez', '{L_REPORT_WAREZ}', 1); From 116e0f3dbab99ab758912c59ce88f161e6c309ed Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 27 Oct 2024 16:54:55 +0100 Subject: [PATCH 0494/1214] [ticket/17418] Use icon width and height for acp display PHPBB-17418 --- phpBB/adm/style/acp_icons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_icons.html b/phpBB/adm/style/acp_icons.html index 25d5cb52070..9a5179419e1 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -105,7 +105,7 @@

                      {L_TITLE}

                      - {items.TEXT_ALT} + {items.TEXT_ALT} [{items.IMG}] From c252fb9bfb3ad1e542d6eac6d6c7a602aec1a40f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 28 Oct 2024 20:20:36 +0100 Subject: [PATCH 0495/1214] [ticket/17421] Rename extensions section to "not installed" PHPBB-17421 --- phpBB/adm/style/acp_ext_list.html | 10 +++++----- phpBB/docs/events.md | 26 +++++++++++++------------ phpBB/includes/acp/acp_extensions.php | 6 +++--- phpBB/language/en/acp/extensions.php | 6 +++--- tests/functional/extension_acp_test.php | 8 ++++---- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 0984214c6f7..be75eaf317c 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -42,7 +42,7 @@

                      {L_EXTENSIONS_ADMIN}

                      - {% for list in ['enabled', 'disabled', 'available'] %} + {% for list in ['enabled', 'disabled', 'not_installed'] %} {% set blockname = attribute(loops, list) %} {% if blockname|length %} @@ -51,8 +51,8 @@

                      {L_EXTENSIONS_ADMIN}

                      {% EVENT acp_ext_list_enabled_title_after %} {% elseif list == 'disabled' %} {% EVENT acp_ext_list_disabled_title_after %} - {% elseif list == 'available' %} - {% EVENT acp_ext_list_available_title_after %} + {% elseif list == 'not_installed' %} + {% EVENT acp_ext_list_not_installed_title_after %} {% endif %} @@ -63,8 +63,8 @@

                      {L_EXTENSIONS_ADMIN}

                      {% EVENT acp_ext_list_enabled_name_after %} {% elseif list == 'disabled' %} {% EVENT acp_ext_list_disabled_name_after %} - {% elseif list == 'available' %} - {% EVENT acp_ext_list_available_name_after %} + {% elseif list == 'not_installed' %} + {% EVENT acp_ext_list_not_installed_name_after %} {% endif %} diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 2578c967abe..cc37ede34e3 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -70,18 +70,6 @@ acp_ext_details_notice * Since: 3.1.11-RC1 * Purpose: Add extension detail notices after version check information. -acp_ext_list_available_name_after -=== -* Location: adm/style/acp_ext_list.html -* Since: 3.3.14-RC1 -* Purpose: Add content after the name of available extensions in the list - -acp_ext_list_available_title_after -=== -* Location: adm/style/acp_ext_list.html -* Since: 3.3.14-RC1 -* Purpose: Add text after available extensions section title. - acp_ext_list_disabled_name_after === * Location: adm/style/acp_ext_list.html @@ -106,6 +94,20 @@ acp_ext_list_enabled_title_after * Since: 3.1.11-RC1 * Purpose: Add text after enabled extensions section title. +acp_ext_list_not_installed_name_after +=== +* Location: adm/style/acp_ext_list.html +* Since: 3.3.14-RC1 +* Changed: 3.3.14 Renamed from acp_ext_list_available_name_after +* Purpose: Add content after the name of not installed extensions in the list + +acp_ext_list_not_installed_title_after +=== +* Location: adm/style/acp_ext_list.html +* Since: 3.3.14-RC1 +* Changed: 3.3.14 Renamed from acp_ext_list_available_title_after +* Purpose: Add text after not installed extensions section title. + acp_forums_custom_settings === * Location: adm/style/acp_forums.html diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index f481f764d1c..277e7bdf487 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -575,7 +575,7 @@ public function list_available_exts() catch (exception_interface $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); - $this->template->assign_block_vars('available', array( + $this->template->assign_block_vars('not_installed', array( 'META_DISPLAY_NAME' => $this->user->lang('EXTENSION_INVALID_LIST', $name, $message), 'S_VERSIONCHECK' => false, )); @@ -589,9 +589,9 @@ public function list_available_exts() $block_vars['NAME'] = $name; $block_vars['U_DETAILS'] = $this->u_action . '&action=details&ext_name=' . urlencode($name); - $this->template->assign_block_vars('available', $block_vars); + $this->template->assign_block_vars('not_installed', $block_vars); - $this->output_actions('available', array( + $this->output_actions('not_installed', array( 'ENABLE' => $this->u_action . '&action=enable_pre&ext_name=' . urlencode($name), )); } diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php index 16668b5161b..05d7049980c 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -47,9 +47,9 @@ 'DETAILS' => 'Details', - 'EXTENSIONS_AVAILABLE' => 'Available Extensions', - 'EXTENSIONS_DISABLED' => 'Disabled Extensions', - 'EXTENSIONS_ENABLED' => 'Enabled Extensions', + 'EXTENSIONS_NOT_INSTALLED' => 'Not installed Extensions', + 'EXTENSIONS_DISABLED' => 'Disabled Extensions', + 'EXTENSIONS_ENABLED' => 'Enabled Extensions', 'EXTENSION_DELETE_DATA' => 'Delete data', 'EXTENSION_DISABLE' => 'Disable', diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 3ecdd6e05c4..e5fa455e543 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -85,7 +85,7 @@ public function test_list() $this->assertCount(1, $crawler->filter('.ext_enabled')); $this->assertCount(3, $crawler->filter('.ext_disabled')); - $this->assertCount(4, $crawler->filter('.ext_available')); + $this->assertCount(4, $crawler->filter('.ext_not_installed')); $this->assertStringContainsString('phpBB Foo Extension', $crawler->filter('.ext_enabled')->eq(0)->text()); $this->assertContainsLang('EXTENSION_DISABLE', $crawler->filter('.ext_enabled')->eq(0)->text()); @@ -99,9 +99,9 @@ public function test_list() $this->assertStringContainsString('The “vendor/test3” extension is not valid.', $crawler->filter('.ext_disabled')->eq(1)->text()); - $this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_available')->eq(0)->text()); - $this->assertContainsLang('DETAILS', $crawler->filter('.ext_available')->eq(0)->text()); - $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_available')->eq(0)->text()); + $this->assertStringContainsString('phpBB Bar Extension', $crawler->filter('.ext_not_installed')->eq(0)->text()); + $this->assertContainsLang('DETAILS', $crawler->filter('.ext_not_installed')->eq(0)->text()); + $this->assertContainsLang('EXTENSION_ENABLE', $crawler->filter('.ext_not_installed')->eq(0)->text()); // Check that invalid extensions are not listed. $this->assertStringNotContainsString('phpBB BarFoo Extension', $crawler->filter('.table1')->text()); From be529025414722da3bd0c7bd14c152f043184570 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 30 Oct 2024 21:22:37 +0700 Subject: [PATCH 0496/1214] [ticket/17422] Fix author_id search results sorting PHPBB-17422 --- phpBB/phpbb/search/base.php | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index e7d0774b6c6..e33dfc8f75b 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -76,17 +76,10 @@ function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $ } } - // change the start to the actual end of the current request if the sort direction differs - // from the dirction in the cache and reverse the ids later + // If the sort direction differs from the direction in the cache, then reverse the ids array if ($reverse_ids) { - $start = $result_count - $start - $per_page; - - // the user requested a page past the last index - if ($start < 0) - { - return SEARCH_RESULT_NOT_IN_CACHE; - } + $stored_ids = array_reverse($stored_ids); } for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++) @@ -102,11 +95,6 @@ function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $ } unset($stored_ids); - if ($reverse_ids) - { - $id_ary = array_reverse($id_ary); - } - if (!$complete) { return SEARCH_RESULT_INCOMPLETE; From eeede1ab6c101030e0e2df97eff5fa6f727525ac Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 31 Oct 2024 00:51:05 +0700 Subject: [PATCH 0497/1214] [ticket/17422] Add author_id search tests PHPBB-17422 --- tests/functional/search/base.php | 37 ++++++++++++++++++- .../phpbb_functional_test_case.php | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 0e3aa80fa32..04b69a4934f 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -49,6 +49,30 @@ protected function assert_search_topics_by_author($author, $topics_found, $sort_ $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); } + protected function assert_search_posts_by_author_id($author_id, $posts_found, $sort_key = '', $sort_dir = '') + { + // Test obtaining data from cache if sorting direction is set + if (!$sort_dir) + { + $this->purge_cache(); + } + $crawler = self::request('GET', 'search.php?author_id=' . $author_id . ($sort_key ? "&sk=$sort_key" : '') . ($sort_dir ? "&sk=$sort_dir" : '')); + $this->assertEquals($posts_found, $crawler->filter('.postbody')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $posts_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + + protected function assert_search_topics_by_author_id($author_id, $topics_found, $sort_key = '', $sort_dir = '') + { + // Test obtaining data from cache if sorting direction is set + if (!$sort_dir) + { + $this->purge_cache(); + } + $crawler = self::request('GET', 'search.php?sr=topics&author_id=' . $author_id . ($sort_key ? "&sk=$sort_key" : '') . ($sort_dir ? "&sk=$sort_dir" : '')); + $this->assertEquals($topics_found, $crawler->filter('.row')->count(), $this->search_backend); + $this->assertStringContainsString("Search found $topics_found match", $crawler->filter('.searchresults-title')->text(), $this->search_backend); + } + protected function assert_search_in_topic($topic_id, $keywords, $posts_found, $sort_key = '') { $this->purge_cache(); @@ -93,10 +117,16 @@ public function test_search_backend() $this->add_lang('common'); // Create a new standard user if needed, topic and post to test searh for author - if (!$this->user_exists('searchforauthoruser')) + $searchforauthoruser_name = 'searchforauthoruser'; + $searchforauthoruser_id = null; // if the user exists, array with user_id will be returned + if (!$this->user_exists($searchforauthoruser_name, $searchforauthoruser_id)) { $searchforauthoruser_id = $this->create_user('searchforauthoruser'); } + else + { + $searchforauthoruser_id = (int) $searchforauthoruser_id[0]; + } $this->remove_user_group('NEWLY_REGISTERED', ['searchforauthoruser']); $this->set_flood_interval(0); $this->login('searchforauthoruser'); @@ -161,6 +191,11 @@ public function test_search_backend() $this->assert_search_posts_by_author('searchforauthoruser', 2, $sort_key); $this->assert_search_topics_by_author('searchforauthoruser', 1, $sort_key); + + $this->assert_search_posts_by_author_id($searchforauthoruser_id, 2, $sort_key); + $this->assert_search_topics_by_author_id($searchforauthoruser_id, 1, $sort_key); + $this->assert_search_posts_by_author_id($searchforauthoruser_id, 2, $sort_key, 'a'); //search asc order + $this->assert_search_topics_by_author_id($searchforauthoruser_id, 1, $sort_key, 'a'); // search asc order } $this->assert_search_not_found('loremipsumdedo'); diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 9e4cb364d0d..1652be8e448 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1525,7 +1525,7 @@ protected function set_flood_interval($flood_interval) * * @return bool Returns true if a user exists, false otherwise */ - protected function user_exists($username, $user_id = null) + protected function user_exists(&$username, &$user_id = null) { global $db; From 7086fa746fcba97ffe03df55f49a11b24b35a55a Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 31 Oct 2024 09:29:25 +0700 Subject: [PATCH 0498/1214] [ticket/17422] Fix tests PHPBB-17422 --- tests/functional/ucp_attachments_test.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/functional/ucp_attachments_test.php b/tests/functional/ucp_attachments_test.php index d8aac88b497..96149117866 100644 --- a/tests/functional/ucp_attachments_test.php +++ b/tests/functional/ucp_attachments_test.php @@ -24,7 +24,8 @@ protected function setUp(): void $this->path = __DIR__ . '/fixtures/files/'; $this->add_lang('posting'); - if (!$this->user_exists('ucp-file-test')) + $username = 'ucp-file-test'; + if (!$this->user_exists($username)) { $this->create_user('ucp-file-test'); } From 4194cb2228ad257cda5db8963990d95f30a362c6 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 31 Oct 2024 14:55:35 +0700 Subject: [PATCH 0499/1214] [ticket/17422] Adjust tests code PHPBB-17422 --- tests/functional/search/base.php | 6 ++---- tests/functional/ucp_attachments_test.php | 3 +-- tests/test_framework/phpbb_functional_test_case.php | 8 +++++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/functional/search/base.php b/tests/functional/search/base.php index 04b69a4934f..e5ee1feee31 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -117,15 +117,13 @@ public function test_search_backend() $this->add_lang('common'); // Create a new standard user if needed, topic and post to test searh for author - $searchforauthoruser_name = 'searchforauthoruser'; - $searchforauthoruser_id = null; // if the user exists, array with user_id will be returned - if (!$this->user_exists($searchforauthoruser_name, $searchforauthoruser_id)) + if (!$searchforauthoruser_id = $this->user_exists('searchforauthoruser')) { $searchforauthoruser_id = $this->create_user('searchforauthoruser'); } else { - $searchforauthoruser_id = (int) $searchforauthoruser_id[0]; + $searchforauthoruser_id = key($searchforauthoruser_id); } $this->remove_user_group('NEWLY_REGISTERED', ['searchforauthoruser']); $this->set_flood_interval(0); diff --git a/tests/functional/ucp_attachments_test.php b/tests/functional/ucp_attachments_test.php index 96149117866..d8aac88b497 100644 --- a/tests/functional/ucp_attachments_test.php +++ b/tests/functional/ucp_attachments_test.php @@ -24,8 +24,7 @@ protected function setUp(): void $this->path = __DIR__ . '/fixtures/files/'; $this->add_lang('posting'); - $username = 'ucp-file-test'; - if (!$this->user_exists($username)) + if (!$this->user_exists('ucp-file-test')) { $this->create_user('ucp-file-test'); } diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 1652be8e448..6f8bc2d0136 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1523,9 +1523,9 @@ protected function set_flood_interval($flood_interval) * @param string $username The username to check or empty if user_id is used * @param int $user_id The user id to check or empty if username is used * - * @return bool Returns true if a user exists, false otherwise + * @return array Returns user_id => username array or empty array if user does not exist */ - protected function user_exists(&$username, &$user_id = null) + protected function user_exists($username = '', $user_id = '') { global $db; @@ -1540,6 +1540,8 @@ protected function user_exists(&$username, &$user_id = null) require_once(__DIR__ . '/../../phpBB/includes/functions_user.php'); } - return user_get_id_name($user_id, $username) ? false : true; + user_get_id_name($user_id, $username, false, true); + + return $username; } } From b40cdb757fab3f28ef922c21ef39804674d4d8f5 Mon Sep 17 00:00:00 2001 From: kaileymsnay Date: Mon, 11 Nov 2024 14:13:29 -0500 Subject: [PATCH 0500/1214] [ticket/17431] Add more vars to memberlist event PHPBB3-17431 --- phpBB/memberlist.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c846bdde055..dce5eb8d901 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -816,11 +816,26 @@ * Modify user's template vars before we display the profile * * @event core.memberlist_modify_view_profile_template_vars - * @var array template_ary Array with user's template vars + * @var array template_ary Array with user's template vars + * @var int user_id The user ID + * @var bool user_notes_enabled Is the mcp user notes module enabled? + * @var bool warn_user_enabled Is the mcp warnings module enabled? + * @var bool friends_enabled Is the ucp friends module enabled? + * @var bool foes_enabled Is the ucp foes module enabled? + * @var bool friend Is the user friend? + * @var bool foe Is the user foe? * @since 3.2.6-RC1 + * @changed 3.3.15-RC1 Added vars user_id, user_notes_enabled, warn_user_enabled, friend, friends_enabled, foe, foes_enabled */ $vars = array( 'template_ary', + 'user_id', + 'user_notes_enabled', + 'warn_user_enabled', + 'friend', + 'friends_enabled', + 'foe', + 'foes_enabled', ); extract($phpbb_dispatcher->trigger_event('core.memberlist_modify_view_profile_template_vars', compact($vars))); From c385131073fc036a4e1ba4d7f60277c76947a6f0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 11 Nov 2024 20:29:36 +0100 Subject: [PATCH 0501/1214] [ticket/17432] Update composer dependencies PHPBB-17432 --- phpBB/composer.lock | 431 ++++++++++++++++++++++---------------------- 1 file changed, 216 insertions(+), 215 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index a3c2669f69e..8fe9b37b7ef 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -216,16 +216,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137" + "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/48a792895a2b7a6ee65dd5442c299d7b835b6137", - "reference": "48a792895a2b7a6ee65dd5442c299d7b835b6137", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3b1fc3f0be055baa7c6258b1467849c3e8204eb2", + "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2", "shasum": "" }, "require": { @@ -272,7 +272,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.2" + "source": "https://github.com/composer/ca-bundle/tree/1.5.3" }, "funding": [ { @@ -288,20 +288,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T07:49:53+00:00" + "time": "2024-11-04T10:15:26+00:00" }, { "name": "composer/class-map-generator", - "version": "1.3.4", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3" + "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", - "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/98bbf6780e56e0fd2404fe4b82eb665a0f93b783", + "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783", "shasum": "" }, "require": { @@ -314,8 +314,8 @@ "phpstan/phpstan-deprecation-rules": "^1", "phpstan/phpstan-phpunit": "^1", "phpstan/phpstan-strict-rules": "^1.1", - "symfony/filesystem": "^5.4 || ^6", - "symfony/phpunit-bridge": "^5" + "phpunit/phpunit": "^8", + "symfony/filesystem": "^5.4 || ^6" }, "type": "library", "extra": { @@ -345,7 +345,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.3.4" + "source": "https://github.com/composer/class-map-generator/tree/1.4.0" }, "funding": [ { @@ -361,25 +361,25 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:13:04+00:00" + "time": "2024-10-03T18:14:00+00:00" }, { "name": "composer/composer", - "version": "2.7.9", + "version": "2.8.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "e30ccdd665828ae66eb1be78f056e39e1d5f55ab" + "reference": "6e543d03187c882ea1c6ba43add2467754427803" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/e30ccdd665828ae66eb1be78f056e39e1d5f55ab", - "reference": "e30ccdd665828ae66eb1be78f056e39e1d5f55ab", + "url": "https://api.github.com/repos/composer/composer/zipball/6e543d03187c882ea1c6ba43add2467754427803", + "reference": "6e543d03187c882ea1c6ba43add2467754427803", "shasum": "" }, "require": { "composer/ca-bundle": "^1.5", - "composer/class-map-generator": "^1.3.3", + "composer/class-map-generator": "^1.4.0", "composer/metadata-minifier": "^1.0", "composer/pcre": "^2.2 || ^3.2", "composer/semver": "^3.3", @@ -419,7 +419,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "2.7-dev" + "dev-main": "2.8-dev" }, "phpstan": { "includes": [ @@ -459,7 +459,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.7.9" + "source": "https://github.com/composer/composer/tree/2.8.2" }, "funding": [ { @@ -475,7 +475,7 @@ "type": "tidelift" } ], - "time": "2024-09-04T12:43:28+00:00" + "time": "2024-10-29T15:12:11+00:00" }, { "name": "composer/installers", @@ -1919,27 +1919,27 @@ }, { "name": "laminas/laminas-code", - "version": "4.14.0", + "version": "4.15.1", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "562e02b7d85cb9142b5116cc76c4c7c162a11a1c" + "reference": "877ad42fe9c164785182fca8afa3f416a056884d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/562e02b7d85cb9142b5116cc76c4c7c162a11a1c", - "reference": "562e02b7d85cb9142b5116cc76c4c7c162a11a1c", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/877ad42fe9c164785182fca8afa3f416a056884d", + "reference": "877ad42fe9c164785182fca8afa3f416a056884d", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" }, "require-dev": { "doctrine/annotations": "^2.0.1", "ext-phar": "*", - "laminas/laminas-coding-standard": "^2.5.0", - "laminas/laminas-stdlib": "^3.17.0", - "phpunit/phpunit": "^10.3.3", + "laminas/laminas-coding-standard": "^3.0.0", + "laminas/laminas-stdlib": "^3.18.0", + "phpunit/phpunit": "^10.5.37", "psalm/plugin-phpunit": "^0.19.0", "vimeo/psalm": "^5.15.0" }, @@ -1978,7 +1978,7 @@ "type": "community_bridge" } ], - "time": "2024-06-17T08:50:25+00:00" + "time": "2024-10-25T10:15:16+00:00" }, { "name": "marc1706/fast-image-size", @@ -3306,16 +3306,16 @@ }, { "name": "symfony/config", - "version": "v6.4.8", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "12e7e52515ce37191b193cf3365903c4f3951e35" + "reference": "4e55e7e4ffddd343671ea972216d4509f46c22ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/12e7e52515ce37191b193cf3365903c4f3951e35", - "reference": "12e7e52515ce37191b193cf3365903c4f3951e35", + "url": "https://api.github.com/repos/symfony/config/zipball/4e55e7e4ffddd343671ea972216d4509f46c22ef", + "reference": "4e55e7e4ffddd343671ea972216d4509f46c22ef", "shasum": "" }, "require": { @@ -3361,7 +3361,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.8" + "source": "https://github.com/symfony/config/tree/v6.4.14" }, "funding": [ { @@ -3377,20 +3377,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-11-04T11:33:53+00:00" }, { "name": "symfony/console", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765" + "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/72d080eb9edf80e36c19be61f72c98ed8273b765", - "reference": "72d080eb9edf80e36c19be61f72c98ed8273b765", + "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b", + "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b", "shasum": "" }, "require": { @@ -3455,7 +3455,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.12" + "source": "https://github.com/symfony/console/tree/v6.4.14" }, "funding": [ { @@ -3471,20 +3471,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:15:52+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e" + "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", - "reference": "cfb9d34a1cdd4911bc737a5358fd1cf8ebfb536e", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", + "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", "shasum": "" }, "require": { @@ -3536,7 +3536,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.12" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.13" }, "funding": [ { @@ -3552,7 +3552,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:18:25+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3623,16 +3623,16 @@ }, { "name": "symfony/error-handler", - "version": "v6.4.10", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "231f1b2ee80f72daa1972f7340297d67439224f0" + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/231f1b2ee80f72daa1972f7340297d67439224f0", - "reference": "231f1b2ee80f72daa1972f7340297d67439224f0", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/9e024324511eeb00983ee76b9aedc3e6ecd993d9", + "reference": "9e024324511eeb00983ee76b9aedc3e6ecd993d9", "shasum": "" }, "require": { @@ -3678,7 +3678,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.10" + "source": "https://github.com/symfony/error-handler/tree/v6.4.14" }, "funding": [ { @@ -3694,20 +3694,20 @@ "type": "tidelift" } ], - "time": "2024-07-26T12:30:32+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b" + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/8d7507f02b06e06815e56bb39aa0128e3806208b", - "reference": "8d7507f02b06e06815e56bb39aa0128e3806208b", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", "shasum": "" }, "require": { @@ -3758,7 +3758,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.8" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" }, "funding": [ { @@ -3774,7 +3774,7 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3854,16 +3854,16 @@ }, { "name": "symfony/filesystem", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12" + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/f810e3cbdf7fdc35983968523d09f349fa9ada12", - "reference": "f810e3cbdf7fdc35983968523d09f349fa9ada12", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", + "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", "shasum": "" }, "require": { @@ -3900,7 +3900,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.12" + "source": "https://github.com/symfony/filesystem/tree/v6.4.13" }, "funding": [ { @@ -3916,20 +3916,20 @@ "type": "tidelift" } ], - "time": "2024-09-16T16:01:33+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/finder", - "version": "v6.4.11", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453" + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/d7eb6daf8cd7e9ac4976e9576b32042ef7253453", - "reference": "d7eb6daf8cd7e9ac4976e9576b32042ef7253453", + "url": "https://api.github.com/repos/symfony/finder/zipball/daea9eca0b08d0ed1dc9ab702a46128fd1be4958", + "reference": "daea9eca0b08d0ed1dc9ab702a46128fd1be4958", "shasum": "" }, "require": { @@ -3964,7 +3964,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.11" + "source": "https://github.com/symfony/finder/tree/v6.4.13" }, "funding": [ { @@ -3980,20 +3980,20 @@ "type": "tidelift" } ], - "time": "2024-08-13T14:27:37+00:00" + "time": "2024-10-01T08:30:56+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56" + "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", - "reference": "fbebfcce21084d3e91ea987ae5bdd8c71ff0fd56", + "url": "https://api.github.com/repos/symfony/http-client/zipball/05d88cbd816ad6e0202edd9a9963cb9d615b8826", + "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826", "shasum": "" }, "require": { @@ -4057,7 +4057,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.12" + "source": "https://github.com/symfony/http-client/tree/v6.4.14" }, "funding": [ { @@ -4073,7 +4073,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:21:33+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/http-client-contracts", @@ -4155,16 +4155,16 @@ }, { "name": "symfony/http-foundation", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "133ac043875f59c26c55e79cf074562127cce4d2" + "reference": "ba020a321a95519303a3f09ec2824d34d601c388" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/133ac043875f59c26c55e79cf074562127cce4d2", - "reference": "133ac043875f59c26c55e79cf074562127cce4d2", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388", + "reference": "ba020a321a95519303a3f09ec2824d34d601c388", "shasum": "" }, "require": { @@ -4212,7 +4212,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.12" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.14" }, "funding": [ { @@ -4228,20 +4228,20 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:18:25+00:00" + "time": "2024-11-05T16:39:55+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "96df83d51b5f78804f70c093b97310794fd6257b" + "reference": "8278a947d0369754a47b758a9e17b72cab970951" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/96df83d51b5f78804f70c093b97310794fd6257b", - "reference": "96df83d51b5f78804f70c093b97310794fd6257b", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951", + "reference": "8278a947d0369754a47b758a9e17b72cab970951", "shasum": "" }, "require": { @@ -4326,7 +4326,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.12" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.14" }, "funding": [ { @@ -4342,20 +4342,20 @@ "type": "tidelift" } ], - "time": "2024-09-21T06:02:57+00:00" + "time": "2024-11-06T09:45:21+00:00" }, { "name": "symfony/mime", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "abe16ee7790b16aa525877419deb0f113953f0e1" + "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/abe16ee7790b16aa525877419deb0f113953f0e1", - "reference": "abe16ee7790b16aa525877419deb0f113953f0e1", + "url": "https://api.github.com/repos/symfony/mime/zipball/1de1cf14d99b12c7ebbb850491ec6ae3ed468855", + "reference": "1de1cf14d99b12c7ebbb850491ec6ae3ed468855", "shasum": "" }, "require": { @@ -4411,7 +4411,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.12" + "source": "https://github.com/symfony/mime/tree/v6.4.13" }, "funding": [ { @@ -4427,7 +4427,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:18:25+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5140,16 +5140,16 @@ }, { "name": "symfony/process", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3" + "reference": "25214adbb0996d18112548de20c281be9f27279f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/3f94e5f13ff58df371a7ead461b6e8068900fbb3", - "reference": "3f94e5f13ff58df371a7ead461b6e8068900fbb3", + "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", + "reference": "25214adbb0996d18112548de20c281be9f27279f", "shasum": "" }, "require": { @@ -5181,7 +5181,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.12" + "source": "https://github.com/symfony/process/tree/v6.4.14" }, "funding": [ { @@ -5197,20 +5197,20 @@ "type": "tidelift" } ], - "time": "2024-09-17T12:47:12+00:00" + "time": "2024-11-06T09:25:01+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "b8119e0b248ef0711c25cd09acc729102122621c" + "reference": "8932b572e147e80fb498045c580eb14215197529" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/b8119e0b248ef0711c25cd09acc729102122621c", - "reference": "b8119e0b248ef0711c25cd09acc729102122621c", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/8932b572e147e80fb498045c580eb14215197529", + "reference": "8932b572e147e80fb498045c580eb14215197529", "shasum": "" }, "require": { @@ -5248,7 +5248,7 @@ "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.8" + "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.13" }, "funding": [ { @@ -5264,20 +5264,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/routing", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f" + "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/a7c8036bd159486228dc9be3e846a00a0dda9f9f", - "reference": "a7c8036bd159486228dc9be3e846a00a0dda9f9f", + "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278", + "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278", "shasum": "" }, "require": { @@ -5331,7 +5331,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.12" + "source": "https://github.com/symfony/routing/tree/v6.4.13" }, "funding": [ { @@ -5347,7 +5347,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:32:26+00:00" + "time": "2024-10-01T08:30:56+00:00" }, { "name": "symfony/service-contracts", @@ -5434,16 +5434,16 @@ }, { "name": "symfony/string", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b" + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f8a1ccebd0997e16112dfecfd74220b78e5b284b", - "reference": "f8a1ccebd0997e16112dfecfd74220b78e5b284b", + "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", "shasum": "" }, "require": { @@ -5500,7 +5500,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.12" + "source": "https://github.com/symfony/string/tree/v6.4.13" }, "funding": [ { @@ -5516,7 +5516,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T08:15:52+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/translation-contracts", @@ -5598,16 +5598,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194" + "reference": "ec3511eef0576f378b2758da9e1c157086babd59" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/09c0df13f822a1b80c5972ca1aa9eeb1288e1194", - "reference": "09c0df13f822a1b80c5972ca1aa9eeb1288e1194", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ec3511eef0576f378b2758da9e1c157086babd59", + "reference": "ec3511eef0576f378b2758da9e1c157086babd59", "shasum": "" }, "require": { @@ -5687,7 +5687,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.12" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.13" }, "funding": [ { @@ -5703,20 +5703,20 @@ "type": "tidelift" } ], - "time": "2024-09-15T06:35:36+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.11", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "ee14c8254a480913268b1e3b1cba8045ed122694" + "reference": "93c09246038178717a9c14b809ea8151ffcf7091" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/ee14c8254a480913268b1e3b1cba8045ed122694", - "reference": "ee14c8254a480913268b1e3b1cba8045ed122694", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091", + "reference": "93c09246038178717a9c14b809ea8151ffcf7091", "shasum": "" }, "require": { @@ -5772,7 +5772,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.11" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.14" }, "funding": [ { @@ -5788,20 +5788,20 @@ "type": "tidelift" } ], - "time": "2024-08-30T16:03:21+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.9", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "f9a060622e0d93777b7f8687ec4860191e16802e" + "reference": "0f605f72a363f8743001038a176eeb2a11223b51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/f9a060622e0d93777b7f8687ec4860191e16802e", - "reference": "f9a060622e0d93777b7f8687ec4860191e16802e", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0f605f72a363f8743001038a176eeb2a11223b51", + "reference": "0f605f72a363f8743001038a176eeb2a11223b51", "shasum": "" }, "require": { @@ -5849,7 +5849,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.9" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.13" }, "funding": [ { @@ -5865,20 +5865,20 @@ "type": "tidelift" } ], - "time": "2024-06-24T15:53:56+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "762ee56b2649659380e0ef4d592d807bc17b7971" + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/762ee56b2649659380e0ef4d592d807bc17b7971", - "reference": "762ee56b2649659380e0ef4d592d807bc17b7971", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", + "reference": "e99b4e94d124b29ee4cf3140e1b537d2dad8cec9", "shasum": "" }, "require": { @@ -5921,7 +5921,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.12" + "source": "https://github.com/symfony/yaml/tree/v6.4.13" }, "funding": [ { @@ -5937,20 +5937,20 @@ "type": "tidelift" } ], - "time": "2024-09-17T12:47:12+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "twig/twig", - "version": "v3.14.0", + "version": "v3.14.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72" + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/126b2c97818dbff0cdf3fbfc881aedb3d40aae72", - "reference": "126b2c97818dbff0cdf3fbfc881aedb3d40aae72", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", + "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", "shasum": "" }, "require": { @@ -6004,7 +6004,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.14.0" + "source": "https://github.com/twigphp/Twig/tree/v3.14.2" }, "funding": [ { @@ -6016,7 +6016,7 @@ "type": "tidelift" } ], - "time": "2024-09-09T17:55:12+00:00" + "time": "2024-11-07T12:36:22+00:00" }, { "name": "web-token/jwt-key-mgmt", @@ -6990,16 +6990,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/123267b2c49fbf30d78a7b2d333f6be754b94845", + "reference": "123267b2c49fbf30d78a7b2d333f6be754b94845", "shasum": "" }, "require": { @@ -7038,7 +7038,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.12.1" }, "funding": [ { @@ -7046,7 +7046,7 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2024-11-08T17:47:46+00:00" }, { "name": "netresearch/jsonmapper", @@ -7101,16 +7101,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.19.2", + "version": "v4.19.4", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "0ed4c8949a32986043e977dbe14776c14d644c45" + "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ed4c8949a32986043e977dbe14776c14d644c45", - "reference": "0ed4c8949a32986043e977dbe14776c14d644c45", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/715f4d25e225bc47b293a8b997fe6ce99bf987d2", + "reference": "715f4d25e225bc47b293a8b997fe6ce99bf987d2", "shasum": "" }, "require": { @@ -7119,7 +7119,7 @@ }, "require-dev": { "ircmaxell/php-yacc": "^0.0.7", - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0" }, "bin": [ "bin/php-parse" @@ -7151,9 +7151,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.4" }, - "time": "2024-09-17T19:36:00+00:00" + "time": "2024-09-29T15:01:53+00:00" }, { "name": "phar-io/manifest", @@ -7440,16 +7440,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.1", + "version": "5.5.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" + "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", - "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", + "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", "shasum": "" }, "require": { @@ -7462,13 +7462,13 @@ "webmozart/assert": "^1.9.1" }, "require-dev": { - "mockery/mockery": "~1.3.5", + "mockery/mockery": "~1.3.5 || ~1.6.0", "phpstan/extension-installer": "^1.1", "phpstan/phpstan": "^1.8", "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^5.13" + "psalm/phar": "^5.26" }, "type": "library", "extra": { @@ -7498,29 +7498,29 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" }, - "time": "2024-05-21T05:55:05+00:00" + "time": "2024-11-06T11:58:54+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.2", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "153ae662783729388a584b4361f2545e4d841e3c" + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", - "reference": "153ae662783729388a584b4361f2545e4d841e3c", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.13" + "phpstan/phpdoc-parser": "^1.18|^2.0" }, "require-dev": { "ext-tokenizer": "*", @@ -7556,22 +7556,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" }, - "time": "2024-02-23T11:10:43+00:00" + "time": "2024-11-09T15:12:26+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "1.32.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -7603,9 +7603,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.32.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-09-26T07:23:32+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpunit/php-code-coverage", @@ -9207,16 +9207,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8" + "reference": "65d4b3fd9556e4b5b41287bef93c671f8f9f86ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/62ab90b92066ef6cce5e79365625b4b1432464c8", - "reference": "62ab90b92066ef6cce5e79365625b4b1432464c8", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/65d4b3fd9556e4b5b41287bef93c671f8f9f86ab", + "reference": "65d4b3fd9556e4b5b41287bef93c671f8f9f86ab", "shasum": "" }, "require": { @@ -9255,7 +9255,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.4.8" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.13" }, "funding": [ { @@ -9271,20 +9271,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/cache", - "version": "v6.4.12", + "version": "v6.4.14", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8" + "reference": "36fb8aa88833708e9f29014b6f15fac051a8b613" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", - "reference": "a463451b7f6ac4a47b98dbfc78ec2d3560c759d8", + "url": "https://api.github.com/repos/symfony/cache/zipball/36fb8aa88833708e9f29014b6f15fac051a8b613", + "reference": "36fb8aa88833708e9f29014b6f15fac051a8b613", "shasum": "" }, "require": { @@ -9351,7 +9351,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.12" + "source": "https://github.com/symfony/cache/tree/v6.4.14" }, "funding": [ { @@ -9367,7 +9367,7 @@ "type": "tidelift" } ], - "time": "2024-09-16T16:01:33+00:00" + "time": "2024-11-05T15:34:40+00:00" }, { "name": "symfony/cache-contracts", @@ -9447,16 +9447,16 @@ }, { "name": "symfony/css-selector", - "version": "v6.4.8", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08" + "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/4b61b02fe15db48e3687ce1c45ea385d1780fe08", - "reference": "4b61b02fe15db48e3687ce1c45ea385d1780fe08", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e", + "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e", "shasum": "" }, "require": { @@ -9492,7 +9492,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.8" + "source": "https://github.com/symfony/css-selector/tree/v6.4.13" }, "funding": [ { @@ -9508,20 +9508,20 @@ "type": "tidelift" } ], - "time": "2024-05-31T14:49:08+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0" + "reference": "ae074dffb018c37a57071990d16e6152728dd972" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/9d307ecbcb917001692be333cdc58f474fdb37f0", - "reference": "9d307ecbcb917001692be333cdc58f474fdb37f0", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ae074dffb018c37a57071990d16e6152728dd972", + "reference": "ae074dffb018c37a57071990d16e6152728dd972", "shasum": "" }, "require": { @@ -9559,7 +9559,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.12" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.13" }, "funding": [ { @@ -9575,20 +9575,20 @@ "type": "tidelift" } ], - "time": "2024-09-15T06:35:36+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "symfony/framework-bundle", - "version": "v6.4.12", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "6a9665bd1fae37b198429775c6132f193339434f" + "reference": "e8b0bd921f9bd35ea4d1508067c3f3f6e2036418" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/6a9665bd1fae37b198429775c6132f193339434f", - "reference": "6a9665bd1fae37b198429775c6132f193339434f", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/e8b0bd921f9bd35ea4d1508067c3f3f6e2036418", + "reference": "e8b0bd921f9bd35ea4d1508067c3f3f6e2036418", "shasum": "" }, "require": { @@ -9627,6 +9627,7 @@ "symfony/mime": "<6.4", "symfony/property-access": "<5.4", "symfony/property-info": "<5.4", + "symfony/runtime": "<5.4.45|>=6.0,<6.4.13|>=7.0,<7.1.6", "symfony/scheduler": "<6.4.4|>=7.0.0,<7.0.4", "symfony/security-core": "<5.4", "symfony/security-csrf": "<5.4", @@ -9707,7 +9708,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.12" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.13" }, "funding": [ { @@ -9723,7 +9724,7 @@ "type": "tidelift" } ], - "time": "2024-09-20T13:34:56+00:00" + "time": "2024-10-25T15:07:50+00:00" }, { "name": "theseer/tokenizer", From 930286df0562ac04ed18f8170d97bd52e98e9bd4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 11 Nov 2024 20:34:32 +0100 Subject: [PATCH 0502/1214] [ticket/17432] Update node dependencies PHPBB-17432 --- package-lock.json | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97fb758d555..102d21cd0ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1039,10 +1039,11 @@ } }, "node_modules/cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1784,9 +1785,9 @@ } }, "node_modules/express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1795,7 +1796,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", @@ -6780,9 +6781,9 @@ "dev": true }, "cookie": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz", - "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==", + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", + "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "dev": true }, "cookie-signature": { @@ -7317,9 +7318,9 @@ } }, "express": { - "version": "4.21.0", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.0.tgz", - "integrity": "sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==", + "version": "4.21.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.21.1.tgz", + "integrity": "sha512-YSFlK1Ee0/GC8QaO91tHcDxJiE/X4FbpAyQWkxAvG6AXCuR65YzK8ua6D9hvi/TzUfZMpc+BwuM1IPw8fmQBiQ==", "dev": true, "requires": { "accepts": "~1.3.8", @@ -7327,7 +7328,7 @@ "body-parser": "1.20.3", "content-disposition": "0.5.4", "content-type": "~1.0.4", - "cookie": "0.6.0", + "cookie": "0.7.1", "cookie-signature": "1.0.6", "debug": "2.6.9", "depd": "2.0.0", From 1f48926b1df15f86251ed0a968a3d1a9273a3619 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 18 Nov 2024 21:19:37 +0100 Subject: [PATCH 0503/1214] [prep-release-3.3.14] Update version numbers to 3.3.14 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 773b31897de..e758614ddcd 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index a0cc5876635..e6c44d0ede6 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.14-RC1'); +@define('PHPBB_VERSION', '3.3.14'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 56bee134ba4..58bb9843701 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.14-RC1'); +define('PHPBB_VERSION', '3.3.14'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 7192d630c74..542fe1bd9ce 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.14'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From ff08756ea0490097af72ea3608ce3a87eae7ce07 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 18 Nov 2024 21:23:18 +0100 Subject: [PATCH 0504/1214] [prep-release-3.3.14] Add migration for 3.3.14 --- phpBB/phpbb/db/migration/data/v33x/v3314.php | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3314.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3314.php b/phpBB/phpbb/db/migration/data/v33x/v3314.php new file mode 100644 index 00000000000..ce333dbf5a1 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3314.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3314 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.14', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3314rc1', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.14']], + ]; + } +} From 72ae28d583dcb248fdd3d672378bfc32515facc5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 18 Nov 2024 21:34:22 +0100 Subject: [PATCH 0505/1214] [prep-release-3.3.14] Update changelog for 3.3.14 --- phpBB/docs/CHANGELOG.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 638bdbdf1c6..4674867ecd8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

                      Changelog

                      1. Changelog
                          +
                        • Changes since 3.3.14-RC1
                        • Changes since 3.3.13
                        • Changes since 3.3.13-RC1
                        • Changes since 3.3.12
                          • @@ -172,6 +173,12 @@

                          Changelog

                          +

                          Changes since 3.3.14-RC1

                          +

                          Improvement

                          +
                            +
                          • [PHPBB-17421] - Rename section for not installed extensions to not installed
                            • +
                          +

                          Changes since 3.3.13

                          Bug

                            From 150bd59c82f2dca8b65652559d920f14ad53dfcc Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 21 Nov 2024 22:46:31 +0700 Subject: [PATCH 0506/1214] [ticket/17436] Fix phpBB 2.0 converter PHP fatal error PHPBB-17436 --- phpBB/install/convertors/functions_phpbb20.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index b89c0865335..85a98ee7393 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1418,9 +1418,9 @@ function phpbb_attachment_extension_group_name() $result = $db->sql_query($sql); $extension_groups_updated = array(); - while ($lang_dir = $db->sql_fetchfield('lang_dir')) + while ($row = $db->sql_fetchrow($result)) { - $lang_dir = basename($lang_dir); + $lang_dir = basename($row['lang_dir']); $lang_file = $phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx; if (!file_exists($lang_file)) From 6726268195978dc2155bffef2ba75612d7bdf42c Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Wed, 20 Nov 2024 17:51:50 +0100 Subject: [PATCH 0507/1214] [ticket/17434] Update Vagrantfile ruby syntax PHPBB-17434 --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index ab225c9ad91..c80dfd98f86 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -11,15 +11,15 @@ aliasesPath = "vagrant/aliases" require File.expand_path(confDir + '/scripts/homestead.rb') Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - if File.exists? aliasesPath then + if File.exist? aliasesPath then config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases" end - if File.exists? homesteadYamlPath then + if File.exist? homesteadYamlPath then Homestead.configure(config, YAML::load(File.read(homesteadYamlPath))) end - if File.exists? afterScriptPath then + if File.exist? afterScriptPath then config.vm.provision "shell", path: afterScriptPath end end From 5d0b1661f21e129e013b7287bb51297aca4b3d7f Mon Sep 17 00:00:00 2001 From: Alexey Dolzhenko Date: Sat, 9 Nov 2024 21:55:30 +0700 Subject: [PATCH 0508/1214] [ticket/17429] Adding event before users have been added to a group PHPBB-17429 --- phpBB/includes/functions_user.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 4846436a72f..31b886a7dee 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2759,6 +2759,26 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, return 'GROUP_USERS_EXIST'; } + /** + * Event before users are added to a group + * + * @event core.group_add_user_before + * @var int group_id ID of the group to which users are added + * @var string group_name Name of the group + * @var array user_id_ary IDs of the users which are added + * @var array username_ary names of the users which are added + * @var int pending Pending setting, 1 if user(s) added are pending + * @since 3.3.14 + */ + $vars = array( + 'group_id', + 'group_name', + 'user_id_ary', + 'username_ary', + 'pending', + ); + extract($phpbb_dispatcher->trigger_event('core.group_add_user_before', compact($vars))); + $db->sql_transaction('begin'); // Insert the new users From 5538b9a37b1bf7dc15fe923aebd149966fb0ac24 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 24 Nov 2024 20:15:18 +0100 Subject: [PATCH 0509/1214] [ticket/17429] Add add_id_ary to event and fix since version PHPBB-17429 --- phpBB/includes/functions_user.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 31b886a7dee..a87b79d3a65 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2765,10 +2765,11 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, * @event core.group_add_user_before * @var int group_id ID of the group to which users are added * @var string group_name Name of the group - * @var array user_id_ary IDs of the users which are added - * @var array username_ary names of the users which are added + * @var array user_id_ary IDs of the users to be added + * @var array username_ary Names of the users to be added * @var int pending Pending setting, 1 if user(s) added are pending - * @since 3.3.14 + * @var array add_id_ary IDs of the users to be added who are not members yet + * @since 3.3.15-RC1 */ $vars = array( 'group_id', @@ -2776,6 +2777,7 @@ function group_user_add($group_id, $user_id_ary = false, $username_ary = false, 'user_id_ary', 'username_ary', 'pending', + 'add_id_ary', ); extract($phpbb_dispatcher->trigger_event('core.group_add_user_before', compact($vars))); From 5dc93ea51e243f48282bd2fe401db95ced7729d5 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 17 Nov 2024 21:22:21 +0700 Subject: [PATCH 0510/1214] [ticket/17433] Clarify wording for use system cron ACP setting PHPBB-17433 --- phpBB/includes/acp/acp_board.php | 2 +- phpBB/language/en/acp/board.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index bfc2c0b97f9..42832bb9062 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -386,7 +386,7 @@ function main($id, $mode) 'vars' => array( 'legend1' => 'ACP_SERVER_SETTINGS', 'gzip_compress' => array('lang' => 'ENABLE_GZIP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), - 'use_system_cron' => array('lang' => 'USE_SYSTEM_CRON', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'use_system_cron' => array('lang' => 'USE_SYSTEM_CRON', 'validate' => 'bool', 'type' => 'radio:enabled_disabled', 'explain' => true), 'legend2' => 'PATH_SETTINGS', 'enable_mod_rewrite' => array('lang' => 'MOD_REWRITE_ENABLE', 'validate' => 'bool', 'type' => 'custom', 'method' => 'enable_mod_rewrite', 'explain' => true), diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 834f8b29b6e..6f4da2890c0 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -494,7 +494,7 @@ 'UPLOAD_ICONS_PATH' => 'Extension group icons storage path', 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/upload_icons.', 'USE_SYSTEM_CRON' => 'Run periodic tasks from system cron', - 'USE_SYSTEM_CRON_EXPLAIN' => 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for bin/phpbbcli.php cron:run to be run by the system cron facility at regular intervals (e.g. every 5 minutes).', + 'USE_SYSTEM_CRON_EXPLAIN' => 'When disabled, phpBB will arrange for periodic tasks to be run automatically. When enabled, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for bin/phpbbcli.php cron:run to be run by the system cron facility at regular intervals (e.g. every 5 minutes).', )); // Security Settings From 32a1d8296993b7769bb2acbf65323c3ebfd5b870 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 20 Nov 2024 11:23:15 +0700 Subject: [PATCH 0511/1214] [ticket/17433] Specify "operating" system term PHPBB-17433 --- phpBB/language/en/acp/board.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 6f4da2890c0..e99632e4424 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -493,8 +493,8 @@ 'SMILIES_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/smilies.', 'UPLOAD_ICONS_PATH' => 'Extension group icons storage path', 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/upload_icons.', - 'USE_SYSTEM_CRON' => 'Run periodic tasks from system cron', - 'USE_SYSTEM_CRON_EXPLAIN' => 'When disabled, phpBB will arrange for periodic tasks to be run automatically. When enabled, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for bin/phpbbcli.php cron:run to be run by the system cron facility at regular intervals (e.g. every 5 minutes).', + 'USE_SYSTEM_CRON' => 'Run periodic tasks from operating system cron', + 'USE_SYSTEM_CRON_EXPLAIN' => 'When disabled, phpBB will arrange for periodic tasks to be run automatically. When enabled, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for bin/phpbbcli.php cron:run to be run by the operating system cron facility at regular intervals (e.g. every 5 minutes).', )); // Security Settings From 7baba29d9d9a34dcc2ac050963cbf0d50f0f4567 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 25 Nov 2024 12:39:53 +0700 Subject: [PATCH 0512/1214] [ticket/17443] Increase Guzzle client request timeout for version checks PHPBB-17443 --- phpBB/phpbb/version_helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 3e11c3419e4..4844c6e62ec 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -381,7 +381,7 @@ public function get_versions($force_update = false, $force_cache = false) } else if ($info === false || $force_update) { - $info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80); + $info = $this->file_downloader->get($this->host, $this->path, $this->file, $this->use_ssl ? 443 : 80, 30); $error_string = $this->file_downloader->get_error_string(); if (!empty($error_string)) From 253579761d95be031f4265a004873c13e36d7019 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 25 Nov 2024 13:30:33 +0700 Subject: [PATCH 0513/1214] [ticket/17443] Fix HTTP 403 response to Guzzle client requests for some hosts PHPBB-17443 --- phpBB/phpbb/file_downloader.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index 14607ece0c8..c73983f464d 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -51,6 +51,10 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6 return new Client([ 'base_uri' => $host, 'timeout' => $timeout, + 'headers' => [ + 'user-agent' => 'phpBB/' . PHPBB_VERSION, + 'accept' => 'text/html,application/xhtml+xml,application/xml' + ], ]); } From 13945f56a9daf89e5e87b87257c62d89da142aa9 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 25 Nov 2024 16:06:44 +0700 Subject: [PATCH 0514/1214] [ticket/17443] Use default */* accept header (like curl etc) PHPBB-17443 --- phpBB/phpbb/file_downloader.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index c73983f464d..0dcb3e58543 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -53,7 +53,7 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6 'timeout' => $timeout, 'headers' => [ 'user-agent' => 'phpBB/' . PHPBB_VERSION, - 'accept' => 'text/html,application/xhtml+xml,application/xml' + 'accept' => '*/*', ], ]); } From 91f82f386f4d8729ece8de22c16d971cf9695d53 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 28 Nov 2024 13:05:01 +0700 Subject: [PATCH 0515/1214] [ticket/17445] Don't require email templates presence for webpush notifications PHPBB-17445 --- phpBB/phpbb/notification/method/webpush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 9d19cb22002..56d280deec0 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -93,7 +93,7 @@ public function get_type(): string */ public function is_available(type_interface $notification_type = null): bool { - return parent::is_available($notification_type) && $this->config['webpush_enable'] + return $this->config['webpush_enable'] && !empty($this->config['webpush_vapid_public']) && !empty($this->config['webpush_vapid_private']); } From 637eaf03fb82d7bea70b4e5131972e1dd4b6b65b Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 28 Nov 2024 22:28:22 +0700 Subject: [PATCH 0516/1214] [ticket/17445] Adjust code logic PHPBB-17445 --- phpBB/phpbb/notification/method/webpush.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 56d280deec0..71104608212 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -94,7 +94,8 @@ public function get_type(): string public function is_available(type_interface $notification_type = null): bool { return $this->config['webpush_enable'] - && !empty($this->config['webpush_vapid_public']) && !empty($this->config['webpush_vapid_private']); + && $this->config['webpush_vapid_public'] + && $this->config['webpush_vapid_private']; } /** From 8978594d6d9c92be3a35f2adec138516df3670f0 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 15:45:42 -0500 Subject: [PATCH 0517/1214] [ticket/17446] Add acp_account_activation_edit_add event Event added for additional account activation methods. PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index bfc2c0b97f9..336c22d354f 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -931,6 +931,18 @@ function select_acc_activation($selected_value, $value) ); $act_options = ''; + + /** + * Event to add and/or modify account activation configurations + * + * @event core.acp_account_activation_edit_add + * @var array act_ary Array of account activation methods + * @var string act_options Options avialbe in the activation method + * @since 3.3.15-RC1 + */ + $vars = array('act_ary', 'act_options'); + extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); + foreach ($act_ary as $key => $data) { list($available, $value) = $data; From 332ecb3d9c350dcf2941dd43b92d6cea458dd111 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 15:56:30 -0500 Subject: [PATCH 0518/1214] [ticket/17446] Use array shorthand PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 336c22d354f..9d8a1f3bcd2 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -940,7 +940,7 @@ function select_acc_activation($selected_value, $value) * @var string act_options Options avialbe in the activation method * @since 3.3.15-RC1 */ - $vars = array('act_ary', 'act_options'); + $vars = ['act_ary', 'act_options']; extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); foreach ($act_ary as $key => $data) From 922fde6d53f8d6eec47b263cbe47a01c2be5b225 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 23:02:40 -0500 Subject: [PATCH 0519/1214] [ticket/17446] Add $phpbb_dispatcher and docblock updates PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 9d8a1f3bcd2..bb183361605 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -921,7 +921,7 @@ function select_ref_check($value, $key = '') */ function select_acc_activation($selected_value, $value) { - global $user, $config; + global $user, $config, $phpbb_dispatcher; $act_ary = array( 'ACC_DISABLE' => array(true, USER_ACTIVATION_DISABLE), @@ -933,13 +933,13 @@ function select_acc_activation($selected_value, $value) $act_options = ''; /** - * Event to add and/or modify account activation configurations - * - * @event core.acp_account_activation_edit_add - * @var array act_ary Array of account activation methods - * @var string act_options Options avialbe in the activation method - * @since 3.3.15-RC1 - */ + * Event to add and/or modify account activation configurations + * + * @event core.acp_account_activation_edit_add + * @var array act_ary Array of account activation methods + * @var string act_options Options avialbe in the activation method + * @since 3.3.15-RC1 + */ $vars = ['act_ary', 'act_options']; extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); From c2c9e4e6b0d94ac4e9ff2fdd21d24e33e079d31b Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 30 Nov 2024 11:10:23 +0700 Subject: [PATCH 0520/1214] [ticket/17445] Inherit from base rather than from of message_base PHPBB-17445 --- phpBB/phpbb/notification/method/webpush.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 71104608212..94e5dfa20f3 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -28,7 +28,7 @@ * This class handles sending push messages for notifications */ -class webpush extends messenger_base implements extended_method_interface +class webpush extends base implements extended_method_interface { /** @var config */ protected $config; @@ -70,12 +70,13 @@ class webpush extends messenger_base implements extended_method_interface public function __construct(config $config, driver_interface $db, log_interface $log, user_loader $user_loader, user $user, string $phpbb_root_path, string $php_ext, string $notification_webpush_table, string $push_subscriptions_table) { - parent::__construct($user_loader, $phpbb_root_path, $php_ext); - $this->config = $config; $this->db = $db; $this->log = $log; + $this->user_loader = $user_loader; $this->user = $user; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $php_ext; $this->notification_webpush_table = $notification_webpush_table; $this->push_subscriptions_table = $push_subscriptions_table; } From 8619ff35268365852bd71b4e80f87cbb917c67be Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 30 Nov 2024 11:46:16 +0700 Subject: [PATCH 0521/1214] [ticket/17445] Add missing class property definitions PHPBB-17445 --- phpBB/phpbb/notification/method/webpush.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/phpBB/phpbb/notification/method/webpush.php b/phpBB/phpbb/notification/method/webpush.php index 94e5dfa20f3..25b22d54d84 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -39,9 +39,18 @@ class webpush extends base implements extended_method_interface /** @var log_interface */ protected $log; + /** @var user_loader */ + protected $user_loader; + /** @var user */ protected $user; + /** @var string */ + protected $phpbb_root_path; + + /** @var string */ + protected $php_ext; + /** @var string Notification Web Push table */ protected $notification_webpush_table; From a4879e924954ef69f8007ac1dd4aa9a99c4277f6 Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 23:57:35 -0500 Subject: [PATCH 0522/1214] [ticket/17446] Fix typo PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index bb183361605..acd2a72cf7d 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -937,7 +937,7 @@ function select_acc_activation($selected_value, $value) * * @event core.acp_account_activation_edit_add * @var array act_ary Array of account activation methods - * @var string act_options Options avialbe in the activation method + * @var string act_options Options available in the activation method * @since 3.3.15-RC1 */ $vars = ['act_ary', 'act_options']; From 65283a9ab86bc43e919b8f6c76546562b78aa0fc Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 23:31:34 -0500 Subject: [PATCH 0523/1214] [ticket/17446] Master: Add acp_account_activation_edit_add event PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 959388e075c..4ab5e739bd8 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -938,7 +938,7 @@ function full_folder_select($value, $key = '') */ function select_acc_activation($selected_value, $value) { - global $user, $config; + global $user, $config, $phpbb_dispatcher; $act_ary = [ 'ACC_DISABLE' => [true, USER_ACTIVATION_DISABLE], @@ -948,6 +948,18 @@ function select_acc_activation($selected_value, $value) ]; $act_options = []; + + /** + * Event to add and/or modify account activation configurations + * + * @event core.acp_account_activation_edit_add + * @var array act_ary Array of account activation methods + * @var array act_options Options avialbe in the activation method + * @since 3.3.15-RC1 + */ + $vars = ['act_ary', 'act_options']; + extract($phpbb_dispatcher->trigger_event('core.acp_account_activation_edit_add', compact($vars))); + foreach ($act_ary as $key => $data) { list($available, $value) = $data; From 8b274d4006ee77e812b17d18024b7cbd3a9520ab Mon Sep 17 00:00:00 2001 From: Kailey M Snay Date: Fri, 29 Nov 2024 23:55:34 -0500 Subject: [PATCH 0524/1214] [ticket/17446] Master: Fix typo PHPBB-17446 --- phpBB/includes/acp/acp_board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 4ab5e739bd8..9359a57a1c0 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -954,7 +954,7 @@ function select_acc_activation($selected_value, $value) * * @event core.acp_account_activation_edit_add * @var array act_ary Array of account activation methods - * @var array act_options Options avialbe in the activation method + * @var array act_options Options available in the activation method * @since 3.3.15-RC1 */ $vars = ['act_ary', 'act_options']; From 5da62d729fd98018a1347fda1c7f3c8a8bae3a9e Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 5 Dec 2024 17:22:32 -0800 Subject: [PATCH 0525/1214] [ticket/17449] Better handling of emoji in site name for webpush manifest PHPBB-17449 --- phpBB/adm/style/admin.js | 16 ++++++++++++++++ phpBB/phpbb/manifest.php | 7 +++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 4f7f5a990b3..a5c090d8c02 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -162,6 +162,22 @@ function parse_document(container) }); + /** + * Dynamically control a text field's maxlength (allows emoji to be counted as 1 character) + */ + container.find('#sitename_short').each(function() { + const $this = this; + const maxLength = $this.maxLength; + $this.maxLength = maxLength * 2; + $this.addEventListener('input', () => { + const inputChars = Array.from($this.value); + if (inputChars.length > maxLength) { + $this.value = inputChars.slice(0, maxLength).join(''); + } + }); + + }); + /** * Responsive tabs */ diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 1a7d0148e59..a2701b28c38 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -69,9 +69,12 @@ public function handle(): JsonResponse $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : $this->path_helper->get_web_root_path(); + $sitename = html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8'); + $sitename_short = html_entity_decode($this->config['sitename_short'], ENT_QUOTES, 'UTF-8'); + $manifest = [ - 'name' => $this->config['sitename'], - 'short_name' => $this->config['sitename_short'] ?: substr($this->config['sitename'], 0, 12), + 'name' => $sitename, + 'short_name' => $sitename_short ?: utf8_substr($sitename, 0, 12), 'display' => 'standalone', 'orientation' => 'portrait', 'dir' => $this->language->lang('DIRECTION'), From c83b6e6a972633a14810e363752adfa53e0297c1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 5 Dec 2024 17:23:08 -0800 Subject: [PATCH 0526/1214] [ticket/17449] Add non apple mobile web app meta tags PHPBB-17449 --- phpBB/styles/prosilver/template/overall_header.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 49f2d3bff6b..397ccde28fa 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -5,8 +5,10 @@ + + {META} <!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> From 7bf31e816543a6e4cf38812c57309589fe9bd531 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 16 Dec 2024 00:30:40 +0700 Subject: [PATCH 0527/1214] [ticket/17454] Fix displaying emojis in sitename within webpush header PHPBB-17454 --- phpBB/phpbb/ucp/controller/webpush.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 313965db63f..50d3eb37398 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -244,7 +244,7 @@ private function get_notification_data(string $notification_data): string $this->user_loader->load_users($notification->users_to_query()); return json_encode([ - 'heading' => $this->config['sitename'], + 'heading' => html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8'), 'title' => strip_tags(html_entity_decode($notification->get_title(), ENT_NOQUOTES, 'UTF-8')), 'text' => strip_tags(html_entity_decode($notification->get_reference(), ENT_NOQUOTES, 'UTF-8')), 'url' => htmlspecialchars_decode($notification->get_url()), From 7540720c79926106a6693f00ba0420df4a08f8f1 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 16 Dec 2024 20:04:33 +0700 Subject: [PATCH 0528/1214] [ticket/17455] Fix PHP warning on MySQLi connection failure PHPBB-17455 --- phpBB/phpbb/db/driver/mysqli.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 6182801da60..9e2e9a99265 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -63,10 +63,10 @@ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = fals if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS)) { - $this->db_connect_id = ''; + $this->connect_error = 'Failed to establish a connection to the MySQL database engine. Please ensure MySQL server is running and the database configuration parameters are correct.'; } - if ($this->db_connect_id && $this->dbname != '') + if (!$this->connect_error && $this->db_connect_id && $this->dbname != '') { // Disable loading local files on client side @mysqli_options($this->db_connect_id, MYSQLI_OPT_LOCAL_INFILE, false); From 6c77240e0c6883a2f84d418d99a91e6a04f383db Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 17 Dec 2024 16:23:03 +0700 Subject: [PATCH 0529/1214] [ticket/17457] Protect manifest request by CORS to prevent guest sessions PHPBB-17457 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 397ccde28fa..62a90ecfc20 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -62,7 +62,7 @@ - + From 6371dfc62fe1a1145a34e482c339bf03bf8495d3 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 19 Dec 2024 23:08:12 +0700 Subject: [PATCH 0530/1214] [ticket/17457] Use "use-credentials" to make the code more relevant PHPBB-17457 --- phpBB/styles/prosilver/template/overall_header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 62a90ecfc20..b80d7ade3a0 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -62,7 +62,7 @@ - + From 3ffdb4cce3859625b7be2e8d721d57d97dcc1740 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 20 Dec 2024 20:17:32 -0800 Subject: [PATCH 0531/1214] [ticket/17457] Help clients cache the manifest PHPBB-17457 --- phpBB/phpbb/manifest.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index a2701b28c38..811b063fc0a 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -93,6 +93,10 @@ public function handle(): JsonResponse $vars = array('manifest', 'board_path'); extract($this->phpbb_dispatcher->trigger_event('core.modify_manifest', compact($vars))); - return new JsonResponse($manifest); + $response = new JsonResponse($manifest); + $response->setPublic(); + $response->setMaxAge(3600); + $response->headers->addCacheControlDirective('must-revalidate', true); + return $response; } } From b6b0973e9ec1a8b1eddb4b3db77790d0063e2549 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 20 Dec 2024 20:18:31 -0800 Subject: [PATCH 0532/1214] =?UTF-8?q?[ticket/17457]=20Remove=20dir=20from?= =?UTF-8?q?=20manifest,=20it=E2=80=99s=20not=20implemented?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PHPBB-17457 --- phpBB/config/default/container/services.yml | 1 - phpBB/phpbb/manifest.php | 9 +-------- tests/functional/manifest_test.php | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 253a70342a9..8a4336e832d 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -161,7 +161,6 @@ services: class: phpbb\manifest arguments: - '@config' - - '@language' - '@path_helper' - '@event_dispatcher' - '@user' diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 811b063fc0a..1eb84eb6a72 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -16,7 +16,6 @@ use phpbb\config\config; use phpbb\event\dispatcher_interface; use phpbb\exception\http_exception; -use phpbb\language\language; use Symfony\Component\HttpFoundation\JsonResponse; use Symfony\Component\HttpFoundation\Response; @@ -25,9 +24,6 @@ class manifest /** @var config */ protected $config; - /** @var language */ - protected $language; - /** @var path_helper */ protected $path_helper; @@ -41,17 +37,15 @@ class manifest * Constructor for manifest controller * * @param config $config - * @param language $language * @param path_helper $path_helper * @param dispatcher_interface $phpbb_dispatcher * @param user $user */ - public function __construct(config $config, language $language, path_helper $path_helper, dispatcher_interface $phpbb_dispatcher, user $user) + public function __construct(config $config, path_helper $path_helper, dispatcher_interface $phpbb_dispatcher, user $user) { $this->config = $config; $this->path_helper = $path_helper; $this->phpbb_dispatcher = $phpbb_dispatcher; - $this->language = $language; $this->user = $user; } @@ -77,7 +71,6 @@ public function handle(): JsonResponse 'short_name' => $sitename_short ?: utf8_substr($sitename, 0, 12), 'display' => 'standalone', 'orientation' => 'portrait', - 'dir' => $this->language->lang('DIRECTION'), 'start_url' => $board_path, 'scope' => $board_path, ]; diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php index 2099dd76618..0d94be0debf 100644 --- a/tests/functional/manifest_test.php +++ b/tests/functional/manifest_test.php @@ -25,7 +25,6 @@ public function test_manifest() 'short_name' => 'yourdomain', 'display' => 'standalone', 'orientation' => 'portrait', - 'dir' => 'ltr', 'start_url' => $url_path, 'scope' => $url_path, ]; From a707fe30dd66a7de85d80e0b2c23a6479f8d80bf Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 20 Dec 2024 20:19:17 -0800 Subject: [PATCH 0533/1214] [ticket/17457] Add more variables to manifest core event PHPBB-17457 --- phpBB/phpbb/manifest.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 1eb84eb6a72..4418327a2c4 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -79,11 +79,13 @@ public function handle(): JsonResponse * Event to modify manifest data before it is outputted * * @event core.modify_manifest - * @var array manifest Array of manifest members - * @var string board_path Path to the board root + * @var array manifest Array of manifest members + * @var string board_url Url to the board root + * @var string sitename Full name of the board + * @var string sitename_short Shortened name of the board * @since 4.0.0-a1 */ - $vars = array('manifest', 'board_path'); + $vars = ['manifest', 'board_url', 'sitename', 'sitename_short']; extract($this->phpbb_dispatcher->trigger_event('core.modify_manifest', compact($vars))); $response = new JsonResponse($manifest); From 11b071f626c3691a82d2e0722f577ca4c3c617c2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 20 Dec 2024 20:43:08 -0800 Subject: [PATCH 0534/1214] [ticket/17457] Oops fix changed variable name PHPBB-17457 --- phpBB/phpbb/manifest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 4418327a2c4..880db6a4442 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -80,12 +80,12 @@ public function handle(): JsonResponse * * @event core.modify_manifest * @var array manifest Array of manifest members - * @var string board_url Url to the board root + * @var string board_path Path to the board root * @var string sitename Full name of the board * @var string sitename_short Shortened name of the board * @since 4.0.0-a1 */ - $vars = ['manifest', 'board_url', 'sitename', 'sitename_short']; + $vars = ['manifest', 'board_path', 'sitename', 'sitename_short']; extract($this->phpbb_dispatcher->trigger_event('core.modify_manifest', compact($vars))); $response = new JsonResponse($manifest); From 0bf195c46ffec1cfae7813f97a77b4e9cce734c1 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 21 Dec 2024 09:40:49 -0800 Subject: [PATCH 0535/1214] [ticket/17457] Allow bots but let reverse proxies know PHPBB-17457 --- phpBB/phpbb/manifest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 880db6a4442..6b48138517e 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -15,9 +15,7 @@ use phpbb\config\config; use phpbb\event\dispatcher_interface; -use phpbb\exception\http_exception; use Symfony\Component\HttpFoundation\JsonResponse; -use Symfony\Component\HttpFoundation\Response; class manifest { @@ -56,11 +54,6 @@ public function __construct(config $config, path_helper $path_helper, dispatcher */ public function handle(): JsonResponse { - if ($this->user->data['is_bot']) - { - throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); - } - $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : $this->path_helper->get_web_root_path(); $sitename = html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8'); @@ -92,6 +85,13 @@ public function handle(): JsonResponse $response->setPublic(); $response->setMaxAge(3600); $response->headers->addCacheControlDirective('must-revalidate', true); + + if (!empty($this->user->data['is_bot'])) + { + // Let reverse proxies know we detected a bot. + $response->headers->set('X-PHPBB-IS-BOT', 'yes'); + } + return $response; } } From e9c445925b6fd42936dde13357d8e33329748bf0 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 24 Nov 2024 00:15:10 +0100 Subject: [PATCH 0536/1214] [ticket/17361] Rewrite storage PHPBB-17361 --- phpBB/adm/style/acp_storage.html | 2 +- .../default/container/services_storage.yml | 20 +- phpBB/includes/acp/acp_database.php | 2 +- phpBB/includes/acp/acp_main.php | 2 +- phpBB/includes/acp/acp_storage.php | 18 +- phpBB/includes/functions_user.php | 3 +- phpBB/phpbb/attachment/upload.php | 2 +- .../db/migration/data/v400/storage_track.php | 23 +- .../data/v400/storage_track_index.php | 48 +++ phpBB/phpbb/files/filespec_storage.php | 2 +- .../storage/adapter/adapter_interface.php | 61 +-- phpBB/phpbb/storage/adapter/local.php | 213 +---------- phpBB/phpbb/storage/adapter_factory.php | 9 +- phpBB/phpbb/storage/controller/attachment.php | 14 +- phpBB/phpbb/storage/controller/avatar.php | 2 +- phpBB/phpbb/storage/controller/controller.php | 4 +- .../storage/exception/storage_exception.php | 2 +- phpBB/phpbb/storage/file_tracker.php | 198 ++++++++++ phpBB/phpbb/storage/helper.php | 6 +- phpBB/phpbb/storage/provider/local.php | 6 +- .../storage/provider/provider_interface.php | 6 +- phpBB/phpbb/storage/storage.php | 349 ++---------------- phpBB/phpbb/storage/stream_interface.php | 41 -- tests/storage/adapter/local_test.php | 88 +---- 24 files changed, 383 insertions(+), 738 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/storage_track_index.php create mode 100644 phpBB/phpbb/storage/file_tracker.php delete mode 100644 phpBB/phpbb/storage/stream_interface.php diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index 86c9298828b..f064438acaf 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -82,7 +82,7 @@

                            {{ lang('WARNING') }}

                            {% set buttons = [] %} {% for button in options.buttons %} - {% set new_button = button | merge({"name": input_name, "checked": button.value == input_value}) %} + {% set new_button = button | merge({"name": input_name, "label": lang(button.label), "checked": button.value == input_value}) %} {% set buttons = buttons | merge([new_button]) %} {% endfor %} diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml index 4ff6f96ae36..1109aa626be 100644 --- a/phpBB/config/default/container/services_storage.yml +++ b/phpBB/config/default/container/services_storage.yml @@ -4,33 +4,27 @@ services: storage.attachment: class: phpbb\storage\storage arguments: - - '@dbal.conn' - - '@cache.driver' - '@storage.adapter.factory' + - '@storage.file_tracker' - 'attachment' - - '%tables.storage%' tags: - { name: storage } storage.avatar: class: phpbb\storage\storage arguments: - - '@dbal.conn' - - '@cache.driver' - '@storage.adapter.factory' + - '@storage.file_tracker' - 'avatar' - - '%tables.storage%' tags: - { name: storage } storage.backup: class: phpbb\storage\storage arguments: - - '@dbal.conn' - - '@cache.driver' - '@storage.adapter.factory' + - '@storage.file_tracker' - 'backup' - - '%tables.storage%' tags: - { name: storage } @@ -124,3 +118,11 @@ services: - '@storage.state_helper' - '@storage.provider_collection' - '@storage.adapter_collection' + + storage.file_tracker: + class: phpbb\storage\file_tracker + arguments: + - '@dbal.conn' + - '@cache.driver' + - '%tables.storage%' + diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 85943dc5e49..2b95ff3ad58 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -279,7 +279,7 @@ function main($id, $mode) try { - $stream = $storage->read_stream($backup_info['file_name']); + $stream = $storage->read($backup_info['file_name']); $fp = fopen($temp_file_name, 'w+b'); stream_copy_to_stream($stream, $fp); diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 3692dd40bd0..8b8a08be802 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -496,7 +496,7 @@ function main($id, $mode) $upload_dir_size = get_formatted_filesize($config['upload_dir_size']); $storage_avatar = $phpbb_container->get('storage.avatar'); - $avatar_dir_size = get_formatted_filesize($storage_avatar->get_size()); + $avatar_dir_size = get_formatted_filesize($storage_avatar->total_size()); if ($posts_per_day > $total_posts) { diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 2adf833562e..35c07074b6c 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -431,8 +431,8 @@ protected function storage_stats(): void $storage_stats[] = [ 'name' => $this->lang->lang('STORAGE_' . strtoupper($storage->get_name()) . '_TITLE'), - 'files' => $storage->get_num_files(), - 'size' => get_formatted_filesize($storage->get_size()), + 'files' => $storage->total_files(), + 'size' => get_formatted_filesize($storage->total_size()), 'free_space' => $free_space, ]; } @@ -619,10 +619,18 @@ protected function validate_data(string $storage_name, array &$messages): void */ protected function validate_path(string $storage_name, array &$messages) : void { - $current_provider = $this->storage_helper->get_current_provider($storage_name); - $options = $this->storage_helper->get_provider_options($current_provider); + if ($this->request->is_set_post('submit')) + { + $provider = $this->request->variable([$storage_name, 'provider'], ''); + } + else + { + $provider = $this->storage_helper->get_current_provider($storage_name); + } + + $options = $this->storage_helper->get_provider_options($provider); - if ($this->provider_collection->get_by_class($current_provider)->get_name() == 'local' && isset($options['path'])) + if ($this->provider_collection->get_by_class($provider)->get_name() === 'local' && isset($options['path'])) { $path = $this->request->is_set_post('submit') ? $this->request->variable([$storage_name, 'path'], '') : $this->storage_helper->get_current_definition($storage_name, 'path'); diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 737332f4fac..78512d19713 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2124,7 +2124,8 @@ function group_correct_avatar($group_id, $old_entry) try { - $storage->rename($old_filename, $new_filename); + $storage->write($new_filename, $storage->read($old_filename)); + $storage->delete($old_filename); $sql = 'UPDATE ' . GROUPS_TABLE . ' SET group_avatar = \'' . $db->sql_escape($new_entry) . "' diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php index c0b0c490c44..ba9ffa25261 100644 --- a/phpBB/phpbb/attachment/upload.php +++ b/phpBB/phpbb/attachment/upload.php @@ -245,7 +245,7 @@ protected function create_thumbnail() // Move the thumbnail from temp folder to the storage $fp = fopen($destination, 'rb'); - $this->storage->write_stream($destination_name, $fp); + $this->storage->write($destination_name, $fp); if (is_resource($fp)) { diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php index 7cf05503d65..d9890fd80fa 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_track.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php @@ -15,7 +15,7 @@ use phpbb\db\migration\container_aware_migration; use phpbb\storage\exception\storage_exception; -use phpbb\storage\storage; +use phpbb\storage\file_tracker; class storage_track extends container_aware_migration { @@ -70,8 +70,8 @@ public function update_data() public function track_avatars() { - /** @var storage $storage */ - $storage = $this->container->get('storage.avatar'); + /** @var file_tracker $file_tracker */ + $file_tracker = $this->container->get('storage.file_tracker'); $sql = 'SELECT user_avatar FROM ' . USERS_TABLE . " @@ -95,7 +95,8 @@ public function track_avatars() try { - $storage->track_file($this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext); + $filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext; + $file_tracker->track_file('avatar', $filename, filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename)); } catch (storage_exception $e) { @@ -107,8 +108,8 @@ public function track_avatars() public function track_attachments() { - /** @var storage $storage */ - $storage = $this->container->get('storage.attachment'); + /** @var file_tracker $file_tracker */ + $file_tracker = $this->container->get('storage.file_tracker'); $sql = 'SELECT physical_filename, thumbnail FROM ' . ATTACHMENTS_TABLE; @@ -119,7 +120,7 @@ public function track_attachments() { try { - $storage->track_file($row['physical_filename']); + $file_tracker->track_file('attachment', $row['physical_filename'], filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/' . $row['physical_filename'])); } catch (storage_exception $e) { @@ -130,7 +131,7 @@ public function track_attachments() { try { - $storage->track_file('thumb_' . $row['physical_filename']); + $file_tracker->track_file('attachment', 'thumb_' . $row['physical_filename'], filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/thumb_' . $row['physical_filename'])); } catch (storage_exception $e) { @@ -143,8 +144,8 @@ public function track_attachments() public function track_backups() { - /** @var storage $storage */ - $storage = $this->container->get('storage.backup'); + /** @var file_tracker $file_tracker */ + $file_tracker = $this->container->get('storage.file_tracker'); $sql = 'SELECT filename FROM ' . BACKUPS_TABLE; @@ -155,7 +156,7 @@ public function track_backups() { try { - $storage->track_file($row['filename']); + $file_tracker->track_file('backup', $row['filename'], filesize($this->phpbb_root_path . $this->config['storage\\backup\\config\\path'] . '/' . $row['filename'])); } catch (storage_exception $e) { diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track_index.php b/phpBB/phpbb/db/migration/data/v400/storage_track_index.php new file mode 100644 index 00000000000..63f57f5e00f --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/storage_track_index.php @@ -0,0 +1,48 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\container_aware_migration; + +class storage_track_index extends container_aware_migration +{ + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v400\storage_track', + ]; + } + + public function update_schema() + { + return [ + 'add_unique_index' => [ + $this->table_prefix . 'storage' => [ + 'uidx_storage' => ['file_path', 'storage'], + ], + ] + ]; + } + + public function revert_schema() + { + return [ + 'drop_keys' => [ + $this->table_prefix . 'storage' => [ + 'uidx_storage', + ], + ], + ]; + } +} diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php index 83678718b5a..5ded1e380b7 100644 --- a/phpBB/phpbb/files/filespec_storage.php +++ b/phpBB/phpbb/files/filespec_storage.php @@ -446,7 +446,7 @@ public function move_file($storage, $overwrite = false, $skip_image_check = fals { $fp = fopen($this->filename, 'rb'); - $storage->write_stream($this->destination_file, $fp); + $storage->write($this->destination_file, $fp); if (is_resource($fp)) { diff --git a/phpBB/phpbb/storage/adapter/adapter_interface.php b/phpBB/phpbb/storage/adapter/adapter_interface.php index d7fcd77bcb9..db7a5475d4a 100644 --- a/phpBB/phpbb/storage/adapter/adapter_interface.php +++ b/phpBB/phpbb/storage/adapter/adapter_interface.php @@ -25,32 +25,26 @@ interface adapter_interface public function configure(array $options): void; /** - * Dumps content into a file + * Reads a file as a stream * - * @param string $path - * @param string $content - * @throws storage_exception When the file cannot be written - */ - public function put_contents(string $path, string $content): void; - - /** - * Read the contents of a file + * @param string $path File to read * - * @param string $path The file to read - * - * @return string Returns file contents - * @throws storage_exception When cannot read file contents + * @return resource Returns a file pointer + * @throws storage_exception When unable to open file */ - public function get_contents(string $path): string; + public function read(string $path); /** - * Checks the existence of files or directories + * Writes a new file using a stream * - * @param string $path file/directory to check + * @param string $path The target file + * @param resource $resource The resource * - * @return bool Returns true if the file/directory exist, false otherwise. + * @return int Returns the number of bytes written + * @throws storage_exception When target file exists + * When target file cannot be created */ - public function exists(string $path): bool; + public function write(string $path, $resource): int; /** * Removes files or directories @@ -61,37 +55,6 @@ public function exists(string $path): bool; */ public function delete(string $path): void; - /** - * Rename a file or a directory - * - * @param string $path_orig The original file/direcotry - * @param string $path_dest The target file/directory - * - * @throws storage_exception When file/directory cannot be renamed - */ - public function rename(string $path_orig, string $path_dest): void; - - /** - * Copies a file - * - * @param string $path_orig The original filename - * @param string $path_dest The target filename - * - * @throws storage_exception When the file cannot be copied - */ - public function copy(string $path_orig, string $path_dest): void; - - /** - * Get file size in bytes - * - * @param string $path The file - * - * @return int Size in bytes. - * - * @throws storage_exception When unable to retrieve file size - */ - public function file_size(string $path): int; - /** * Get space available in bytes * diff --git a/phpBB/phpbb/storage/adapter/local.php b/phpBB/phpbb/storage/adapter/local.php index 72d92096d51..3099df62415 100644 --- a/phpBB/phpbb/storage/adapter/local.php +++ b/phpBB/phpbb/storage/adapter/local.php @@ -13,7 +13,6 @@ namespace phpbb\storage\adapter; -use phpbb\storage\stream_interface; use phpbb\storage\exception\storage_exception; use phpbb\filesystem\exception\filesystem_exception; use phpbb\filesystem\filesystem; @@ -22,7 +21,7 @@ /** * Experimental */ -class local implements adapter_interface, stream_interface +class local implements adapter_interface { /** * Filesystem component @@ -47,16 +46,6 @@ class local implements adapter_interface, stream_interface */ protected $root_path; - /** - * Relative path from $phpbb_root_path to the storage folder - * Always finish with slash (/) character - * Example: - * - images/avatars/upload/ - * - * @var string path - */ - protected $path; - /** * Constructor * @@ -71,176 +60,20 @@ public function __construct(filesystem $filesystem, string $phpbb_root_path) /** * {@inheritdoc} - */ - public function configure(array $options): void - { - $this->path = $options['path']; - - if (substr($this->path, -1, 1) !== '/') - { - $this->path = $this->path . '/'; - } - - $this->root_path = filesystem_helper::realpath($this->phpbb_root_path . $options['path']) . DIRECTORY_SEPARATOR; - } - - /** - * {@inheritdoc} - */ - public function put_contents(string $path, string $content): void - { - $this->ensure_directory_exists($path); - - try - { - $this->filesystem->dump_file($this->root_path . $this->get_path($path) . $this->get_filename($path), $content); - } - catch (filesystem_exception $e) - { - throw new storage_exception('STORAGE_CANNOT_WRITE_FILE', $path, array(), $e); - } - } - - /** - * {@inheritdoc} - */ - public function get_contents(string $path): string - { - $content = @file_get_contents($this->root_path . $this->get_path($path) . $this->get_filename($path)); - - if ($content === false) - { - throw new storage_exception('STORAGE_CANNOT_READ_FILE', $path); - } - - return $content; - } - - /** - * {@inheritdoc} - */ - public function exists(string $path): bool - { - return $this->filesystem->exists($this->root_path . $this->get_path($path) . $this->get_filename($path)); - } - - /** - * {@inheritdoc} - */ - public function delete(string $path): void - { - try - { - $this->filesystem->remove($this->root_path . $this->get_path($path) . $this->get_filename($path)); - } - catch (filesystem_exception $e) - { - throw new storage_exception('STORAGE_CANNOT_DELETE', $path, array(), $e); - } - } - - /** - * {@inheritdoc} - */ - public function rename(string $path_orig, string $path_dest): void - { - $this->ensure_directory_exists($path_dest); - - try - { - $this->filesystem->rename($this->root_path . $this->get_path($path_orig) . $this->get_filename($path_orig), $this->root_path . $this->get_path($path_dest) . $this->get_filename($path_dest), false); - } - catch (filesystem_exception $e) - { - throw new storage_exception('STORAGE_CANNOT_RENAME', $path_orig, array(), $e); - } - } - - /** - * {@inheritdoc} - */ - public function copy(string $path_orig, string $path_dest): void - { - $this->ensure_directory_exists($path_dest); - - try - { - $this->filesystem->copy($this->root_path . $this->get_path($path_orig) . $this->get_filename($path_orig), $this->root_path . $this->get_path($path_dest) . $this->get_filename($path_dest), false); - } - catch (filesystem_exception $e) - { - throw new storage_exception('STORAGE_CANNOT_COPY', $path_orig, array(), $e); - } - } - - /** - * Creates a directory recursively. - * - * @param string $path The directory path - * - * @throws storage_exception On any directory creation failure - */ - protected function create_dir(string $path): void - { - try - { - $this->filesystem->mkdir($this->root_path . $path); - } - catch (filesystem_exception $e) - { - throw new storage_exception('STORAGE_CANNOT_CREATE_DIR', $path, array(), $e); - } - } - - /** - * Ensures that the directory of a file exists. - * - * @param string $path The file path * - * @throws storage_exception On any directory creation failure - */ - protected function ensure_directory_exists(string $path): void - { - $path = dirname($this->root_path . $this->get_path($path) . $this->get_filename($path)); - $path = filesystem_helper::make_path_relative($path, $this->root_path); - - if (!$this->exists($path)) - { - $this->create_dir($path); - } - } - - /** - * Get the path to the file * - * @param string $path The file path - * @return string */ - protected function get_path(string $path): string - { - $dirname = dirname($path); - $dirname = ($dirname != '.') ? $dirname . DIRECTORY_SEPARATOR : ''; - - return $dirname; - } - - /** - * To be used in other PR - * - * @param string $path The file path - * @return string - */ - protected function get_filename(string $path): string + public function configure(array $options): void { - return basename($path); + $this->root_path = filesystem_helper::realpath($this->phpbb_root_path . $options['path']) . DIRECTORY_SEPARATOR; } /** * {@inheritdoc} */ - public function read_stream(string $path) + public function read(string $path) { - $stream = @fopen($this->root_path . $this->get_path($path) . $this->get_filename($path), 'rb'); + $stream = @fopen($this->root_path . $path, 'rb'); if (!$stream) { @@ -253,39 +86,39 @@ public function read_stream(string $path) /** * {@inheritdoc} */ - public function write_stream(string $path, $resource): void + public function write(string $path, $resource): int { - $this->ensure_directory_exists($path); - - $stream = @fopen($this->root_path . $this->get_path($path) . $this->get_filename($path), 'w+b'); + $stream = @fopen($this->root_path . $path, 'w+b'); if (!$stream) { throw new storage_exception('STORAGE_CANNOT_CREATE_FILE', $path); } - if (stream_copy_to_stream($resource, $stream) === false) + if (($size = stream_copy_to_stream($resource, $stream)) === false) { fclose($stream); throw new storage_exception('STORAGE_CANNOT_COPY_RESOURCE'); } fclose($stream); + + return $size; } /** * {@inheritdoc} */ - public function file_size(string $path): int + public function delete(string $path): void { - $size = @filesize($this->root_path . $this->get_path($path) . $this->get_filename($path)); - - if ($size === null) + try { - throw new storage_exception('STORAGE_CANNOT_GET_FILESIZE'); + $this->filesystem->remove($this->root_path . $path); + } + catch (filesystem_exception $e) + { + throw new storage_exception('STORAGE_CANNOT_DELETE', $path, array(), $e); } - - return $size; } /** @@ -293,20 +126,12 @@ public function file_size(string $path): int */ public function free_space(): float { - if (function_exists('disk_free_space')) - { - $free_space = @disk_free_space($this->root_path); - - if ($free_space === false) - { - throw new storage_exception('STORAGE_CANNOT_GET_FREE_SPACE'); - } - } - else + if (!function_exists('disk_free_space') || ($free_space = @disk_free_space($this->root_path)) === false) { throw new storage_exception('STORAGE_CANNOT_GET_FREE_SPACE'); } return $free_space; } + } diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php index 61ea8794829..3d55fc7a41e 100644 --- a/phpBB/phpbb/storage/adapter_factory.php +++ b/phpBB/phpbb/storage/adapter_factory.php @@ -67,20 +67,20 @@ public function get(string $storage_name): mixed $options[$definition] = $this->config['storage\\' . $storage_name . '\\config\\' . $definition]; } - return $this->get_with_options($storage_name, $options); + return $this->get_with_options($storage_name, $provider_class, $options); } /** - * Obtains a configured adapters for a given storage with custom options + * Obtains a configured adapters with custom options * * @param string $storage_name + * @param string $provider_class * @param array $options * * @return mixed */ - public function get_with_options(string $storage_name, array $options): mixed + public function get_with_options(string $storage_name, string $provider_class, array $options): mixed { - $provider_class = $this->config['storage\\' . $storage_name . '\\provider']; $provider = $this->providers->get_by_class($provider_class); if (!$provider->is_available()) @@ -89,6 +89,7 @@ public function get_with_options(string $storage_name, array $options): mixed } $adapter = $this->adapters->get_by_class($provider->get_adapter_class()); + $options['storage'] = $storage_name; $adapter->configure($options); return $adapter; diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 9d84fceb457..7aed1ccdb37 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -293,11 +293,11 @@ public function handle_attachment(int $id, string $filename): Response /** * Remove non valid characters https://github.com/symfony/http-foundation/commit/c7df9082ee7205548a97031683bc6550b5dc9551 */ - protected function filenameFallback($filename) + protected function filenameFallback($filename): string { - $filename = preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename); + $filename = (string) preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename); - return (!empty($filename)) ?: 'File'; + return !empty($filename) ? $filename : 'File'; } /** @@ -305,7 +305,7 @@ protected function filenameFallback($filename) */ protected function prepare(StreamedResponse $response, string $file): void { - $response->setPrivate(); // By default should be private, but make sure of it + $response->setPrivate(); // By default, should be private, but make sure of it parent::prepare($response, $file); } @@ -445,7 +445,7 @@ protected function download_allowed(): bool if (!$url) { - return ($this->config['secure_allow_empty_referer']) ? true : false; + return (bool) $this->config['secure_allow_empty_referer']; } // Split URL into domain and script part @@ -453,13 +453,13 @@ protected function download_allowed(): bool if ($url === false) { - return ($this->config['secure_allow_empty_referer']) ? true : false; + return (bool) $this->config['secure_allow_empty_referer']; } $hostname = $url['host']; unset($url); - $allowed = ($this->config['secure_allow_deny']) ? false : true; + $allowed = !$this->config['secure_allow_deny']; $iplist = array(); if (($ip_ary = @gethostbynamel($hostname)) !== false) diff --git a/phpBB/phpbb/storage/controller/avatar.php b/phpBB/phpbb/storage/controller/avatar.php index 720745e2cce..ba8a8a4e957 100644 --- a/phpBB/phpbb/storage/controller/avatar.php +++ b/phpBB/phpbb/storage/controller/avatar.php @@ -90,7 +90,7 @@ protected function decode_filename(string $file): string } $ext = substr(strrchr($file, '.'), 1); - $file = (int) $file; + $file = (int) $file; // This removes the timestamp leaving only the user id return $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $file . '.' . $ext; } diff --git a/phpBB/phpbb/storage/controller/controller.php b/phpBB/phpbb/storage/controller/controller.php index 94af901eed3..155d3df7a6a 100644 --- a/phpBB/phpbb/storage/controller/controller.php +++ b/phpBB/phpbb/storage/controller/controller.php @@ -159,7 +159,7 @@ protected function prepare(StreamedResponse $response, string $file): void @set_time_limit(0); - $fp = $this->storage->read_stream($file); + $fp = $this->storage->read($file); // Close db connection $this->file_gc(); @@ -173,7 +173,7 @@ protected function prepare(StreamedResponse $response, string $file): void flush(); // Terminate script to avoid the execution of terminate events - // This avoid possible errors with db connection closed + // This avoids possible errors with db connection closed exit; }); diff --git a/phpBB/phpbb/storage/exception/storage_exception.php b/phpBB/phpbb/storage/exception/storage_exception.php index 08c0cfa4ef1..205cf825617 100644 --- a/phpBB/phpbb/storage/exception/storage_exception.php +++ b/phpBB/phpbb/storage/exception/storage_exception.php @@ -36,7 +36,7 @@ public function __construct($message = '', $filename = '', $parameters = [], \Ex * * @return string */ - public function get_filename() + public function get_filename(): string { $parameters = $this->get_parameters(); return $parameters['filename']; diff --git a/phpBB/phpbb/storage/file_tracker.php b/phpBB/phpbb/storage/file_tracker.php new file mode 100644 index 00000000000..c858b733ac8 --- /dev/null +++ b/phpBB/phpbb/storage/file_tracker.php @@ -0,0 +1,198 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\storage; + +use phpbb\cache\driver\driver_interface as cache; +use phpbb\db\driver\driver_interface as db; +use phpbb\storage\exception\storage_exception; + +class file_tracker +{ + + /** + * @var db + */ + protected $db; + + /** + * Cache driver + * @var cache + */ + protected $cache; + + /** + * @var string + */ + protected $storage_table; + + /** + * Constructor + * + * @param db $db + * @param cache $cache + * @param string $storage_table + */ + public function __construct(db $db, cache $cache, string $storage_table) + { + $this->db = $db; + $this->cache = $cache; + $this->storage_table = $storage_table; + } + + /** + * Track file in database + * + * @param string $storage Storage name + * @param string $path The target file + * @param int $size Size in bytes + */ + public function track_file(string $storage, string $path, int $size): void + { + $sql_ary = array( + 'file_path' => $path, + 'storage' => $storage, + 'filesize' => $size, + ); + + $sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary); + $this->db->sql_query($sql); + + $this->cache->destroy('_storage_' . $storage . '_totalsize'); + $this->cache->destroy('_storage_' . $storage . '_numfiles'); + } + + /** + * Untrack file + * + * @param string $storage Storage name + * @param string $path The target file + */ + public function untrack_file(string $storage, $path): void + { + $sql_ary = array( + 'file_path' => $path, + 'storage' => $storage, + ); + + $sql = 'DELETE FROM ' . $this->storage_table . ' + WHERE ' . $this->db->sql_build_array('DELETE', $sql_ary); + $this->db->sql_query($sql); + + $this->cache->destroy('_storage_' . $storage . '_totalsize'); + $this->cache->destroy('_storage_' . $storage . '_numfiles'); + } + + /** + * Check if a file is tracked + * + * @param string $storage Storage name + * @param string $path The file + * + * @return bool True if file is tracked + */ + public function is_tracked(string $storage, string $path): bool + { + $sql_ary = array( + 'file_path' => $path, + 'storage' => $storage, + ); + + $sql = 'SELECT file_id FROM ' . $this->storage_table . ' + WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + return $row !== false; + } + + /** + * Get file size in bytes + * + * @param string $path The file + * + * @return int Size in bytes. + * + * @throws storage_exception When unable to retrieve file size + */ + public function file_size(string $storage, string $path): int + { + $sql_ary = array( + 'file_path' => $path, + 'storage' => $storage, + ); + + $sql = 'SELECT filesize FROM ' . $this->storage_table . ' + WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + return (int) $row['filesize']; + } + + /** + * Get number of tracked storage files for a storage + * + * @param string $storage Storage name + * + * @return int Number of files + */ + public function total_files(string $storage): int + { + $number_files = $this->cache->get('_storage_' . $storage. '_numfiles'); + + if ($number_files === false) + { + $sql = 'SELECT COUNT(file_id) AS numfiles + FROM ' . $this->storage_table . " + WHERE storage = '" . $this->db->sql_escape($storage) . "'"; + $result = $this->db->sql_query($sql); + + $number_files = $this->db->sql_fetchfield('numfiles'); + $this->cache->put('_storage_' . $storage . '_numfiles', $number_files); + + $this->db->sql_freeresult($result); + } + + return (int) $number_files; + } + + /** + * Get total storage size + * + * @param string $storage Storage name + * + * @return float Size in bytes + */ + public function total_size(string $storage): float + { + $total_size = $this->cache->get('_storage_' . $storage . '_totalsize'); + + if ($total_size === false) + { + $sql = 'SELECT SUM(filesize) AS totalsize + FROM ' . $this->storage_table . " + WHERE storage = '" . $this->db->sql_escape($storage) . "'"; + $result = $this->db->sql_query($sql); + + $total_size = $this->db->sql_fetchfield('totalsize'); + $this->cache->put('_storage_' . $storage . '_totalsize', $total_size); + + $this->db->sql_freeresult($result); + } + + return (float) $total_size; + } +} diff --git a/phpBB/phpbb/storage/helper.php b/phpBB/phpbb/storage/helper.php index 66921b60a78..66db2f4e8d3 100644 --- a/phpBB/phpbb/storage/helper.php +++ b/phpBB/phpbb/storage/helper.php @@ -129,7 +129,7 @@ public function get_new_adapter(string $storage_name): mixed $options[$definition] = $this->state_helper->new_definition_value($storage_name, $definition); } - $adapters[$storage_name] = $this->adapter_factory->get_with_options($storage_name, $options); + $adapters[$storage_name] = $this->adapter_factory->get_with_options($storage_name, $provider_class, $options); } return $adapters[$storage_name]; @@ -193,8 +193,8 @@ public function copy_file_to_new_adapter($storage_name, $file): void $current_adapter = $this->get_current_adapter($storage_name); $new_adapter = $this->get_new_adapter($storage_name); - $stream = $current_adapter->read_stream($file); - $new_adapter->write_stream($file, $stream); + $stream = $current_adapter->read($file); + $new_adapter->write($file, $stream); if (is_resource($stream)) { diff --git a/phpBB/phpbb/storage/provider/local.php b/phpBB/phpbb/storage/provider/local.php index c6338e0c311..67a1789434b 100644 --- a/phpBB/phpbb/storage/provider/local.php +++ b/phpBB/phpbb/storage/provider/local.php @@ -18,7 +18,7 @@ class local implements provider_interface /** * {@inheritdoc} */ - public function get_name() + public function get_name(): string { return 'local'; } @@ -34,7 +34,7 @@ public function get_adapter_class(): string /** * {@inheritdoc} */ - public function get_options() + public function get_options(): array { return [ 'path' => [ @@ -47,7 +47,7 @@ public function get_options() /** * {@inheritdoc} */ - public function is_available() + public function is_available(): bool { return true; } diff --git a/phpBB/phpbb/storage/provider/provider_interface.php b/phpBB/phpbb/storage/provider/provider_interface.php index 484b660aa8d..aa01a51e372 100644 --- a/phpBB/phpbb/storage/provider/provider_interface.php +++ b/phpBB/phpbb/storage/provider/provider_interface.php @@ -20,7 +20,7 @@ interface provider_interface * * @return string */ - public function get_name(); + public function get_name(): string; /** * Gets adapter class @@ -34,12 +34,12 @@ public function get_adapter_class(): string; * * @return array Configuration keys */ - public function get_options(); + public function get_options(): array; /** * Return true if the adapter is available * * @return bool */ - public function is_available(); + public function is_available(): bool; } diff --git a/phpBB/phpbb/storage/storage.php b/phpBB/phpbb/storage/storage.php index fa1ca0d204d..b07ea624416 100644 --- a/phpBB/phpbb/storage/storage.php +++ b/phpBB/phpbb/storage/storage.php @@ -13,8 +13,6 @@ namespace phpbb\storage; -use phpbb\cache\driver\driver_interface as cache; -use phpbb\db\driver\driver_interface as db; use phpbb\storage\adapter\adapter_interface; use phpbb\storage\exception\storage_exception; @@ -28,48 +26,33 @@ class storage */ protected $adapter; - /** - * @var db - */ - protected $db; - - /** - * Cache driver - * @var cache - */ - protected $cache; - /** * @var adapter_factory */ protected $factory; /** - * @var string + * @var file_tracker */ - protected $storage_name; + protected $file_tracker; /** * @var string */ - protected $storage_table; + protected $storage_name; /** * Constructor * - * @param db $db - * @param cache $cache * @param adapter_factory $factory + * @param file_tracker $file_tracker * @param string $storage_name - * @param string $storage_table */ - public function __construct(db $db, cache $cache, adapter_factory $factory, string $storage_name, string $storage_table) + public function __construct(adapter_factory $factory, file_tracker $file_tracker, string $storage_name) { - $this->db = $db; - $this->cache = $cache; $this->factory = $factory; + $this->file_tracker = $file_tracker; $this->storage_name = $storage_name; - $this->storage_table = $storage_table; } /** @@ -97,131 +80,6 @@ protected function get_adapter(): mixed return $this->adapter; } - /** - * Dumps content into a file - * - * @param string $path The file to be written to. - * @param string $content The data to write into the file. - * - * @throws storage_exception When the file already exists - * When the file cannot be written - */ - public function put_contents(string $path, string $content): void - { - if ($this->exists($path)) - { - throw new storage_exception('STORAGE_FILE_EXISTS', $path); - } - - $this->get_adapter()->put_contents($path, $content); - $this->track_file($path); - } - - /** - * Read the contents of a file - * - * @param string $path The file to read - * - * @return string Returns file contents - * - * @throws storage_exception When the file doesn't exist - * When cannot read file contents - * - */ - public function get_contents(string $path): string - { - if (!$this->exists($path)) - { - throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); - } - - return $this->get_adapter()->get_contents($path); - } - - /** - * Checks the existence of files or directories - * - * @param string $path file/directory to check - * @param bool $full_check check in the filesystem too - * - * @return bool Returns true if the file/directory exist, false otherwise - */ - public function exists(string $path, bool $full_check = false): bool - { - return ($this->is_tracked($path) && (!$full_check || $this->get_adapter()->exists($path))); - } - - /** - * Removes files or directories - * - * @param string $path file/directory to remove - * - * @throws storage_exception When removal fails - * When the file doesn't exist - */ - public function delete(string $path): void - { - if (!$this->exists($path)) - { - throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); - } - - $this->get_adapter()->delete($path); - $this->untrack_file($path); - } - - /** - * Rename a file or a directory - * - * @param string $path_orig The original file/direcotry - * @param string $path_dest The target file/directory - * - * @throws storage_exception When the file doesn't exist - * When target exists - * When file/directory cannot be renamed - */ - public function rename(string $path_orig, string $path_dest): void - { - if (!$this->exists($path_orig)) - { - throw new storage_exception('STORAGE_FILE_NO_EXIST', $path_orig); - } - - if ($this->exists($path_dest)) - { - throw new storage_exception('STORAGE_FILE_EXISTS', $path_dest); - } - - $this->get_adapter()->rename($path_orig, $path_dest); - $this->track_rename($path_orig, $path_dest); - } - - /** - * Copies a file - * - * @param string $path_orig The original filename - * @param string $path_dest The target filename - * - * @throws storage_exception When the file doesn't exist - * When target exists - * When the file cannot be copied - */ - public function copy(string $path_orig, string $path_dest): void - { - if (!$this->exists($path_orig)) - { - throw new storage_exception('STORAGE_FILE_NO_EXIST', $path_orig); - } - - if ($this->exists($path_dest)) - { - throw new storage_exception('STORAGE_FILE_EXISTS', $path_dest); - } - - $this->get_adapter()->copy($path_orig, $path_dest); - $this->track_file($path_dest); - } - /** * Reads a file as a stream * @@ -232,29 +90,14 @@ public function copy(string $path_orig, string $path_dest): void * When unable to open file * */ - public function read_stream(string $path) + public function read(string $path) { if (!$this->exists($path)) { throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } - $stream = null; - $adapter = $this->get_adapter(); - - if ($adapter instanceof stream_interface) - { - $stream = $adapter->read_stream($path); - } - else - { - // Simulate the stream - $stream = fopen('php://temp', 'w+b'); - fwrite($stream, $adapter->get_contents($path)); - rewind($stream); - } - - return $stream; + return $this->get_adapter()->read($path); } /** @@ -266,7 +109,7 @@ public function read_stream(string $path) * @throws storage_exception When the file exist * When target file cannot be created */ - public function write_stream(string $path, $resource): void + public function write(string $path, $resource): void { if ($this->exists($path)) { @@ -278,120 +121,39 @@ public function write_stream(string $path, $resource): void throw new storage_exception('STORAGE_INVALID_RESOURCE'); } - $adapter = $this->get_adapter(); - - if ($adapter instanceof stream_interface) - { - $adapter->write_stream($path, $resource); - $this->track_file($path); - } - else - { - // Simulate the stream - $adapter->put_contents($path, stream_get_contents($resource)); - } + $size = $this->get_adapter()->write($path, $resource); + $this->file_tracker->track_file($this->storage_name, $path, $size); } /** - * Track file in database + * Removes files or directories * - * @param string $path The target file - * @param bool $update Update file size when already tracked + * @param string $path file/directory to remove + * + * @throws storage_exception When removal fails + * When the file doesn't exist */ - public function track_file(string $path, bool $update = false): void + public function delete(string $path): void { - if (!$this->get_adapter()->exists($path)) + if (!$this->exists($path)) { throw new storage_exception('STORAGE_FILE_NO_EXIST', $path); } - $sql_ary = array( - 'file_path' => $path, - 'storage' => $this->get_name(), - ); - - // Get file, if exist update filesize, if not add new record - $sql = 'SELECT * FROM ' . $this->storage_table . ' - WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); - $result = $this->db->sql_query($sql); - $row = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); - - if (!$row) - { - $sql_ary['filesize'] = $this->get_adapter()->file_size($path); - - $sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary); - $this->db->sql_query($sql); - } - else if ($update) - { - $sql = 'UPDATE ' . $this->storage_table . ' - SET filesize = ' . $this->get_adapter()->file_size($path) . ' - WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); - $this->db->sql_query($sql); - } - - $this->cache->destroy('_storage_' . $this->get_name() . '_totalsize'); - $this->cache->destroy('_storage_' . $this->get_name() . '_numfiles'); - } - - /** - * Untrack file - * - * @param string $path The target file - */ - public function untrack_file($path) - { - $sql_ary = array( - 'file_path' => $path, - 'storage' => $this->get_name(), - ); - - $sql = 'DELETE FROM ' . $this->storage_table . ' - WHERE ' . $this->db->sql_build_array('DELETE', $sql_ary); - $this->db->sql_query($sql); - - $this->cache->destroy('_storage_' . $this->get_name() . '_totalsize'); - $this->cache->destroy('_storage_' . $this->get_name() . '_numfiles'); + $this->get_adapter()->delete($path); + $this->file_tracker->untrack_file($this->get_name(), $path); } /** - * Check if a file is tracked - * - * @param string $path The file + * Checks the existence of files or directories * - * @return bool True if file is tracked - */ - public function is_tracked(string $path): bool - { - $sql_ary = array( - 'file_path' => $path, - 'storage' => $this->get_name(), - ); - - $sql = 'SELECT file_id FROM ' . $this->storage_table . ' - WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); - $result = $this->db->sql_query($sql); - $row = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); - - return $row !== false; - } - - /** - * Rename tracked file + * @param string $path file/directory to check * - * @param string $path_orig The original file/direcotry - * @param string $path_dest The target file/directory + * @return bool Returns true if the file/directory exist, false otherwise */ - protected function track_rename(string $path_orig, string $path_dest): void + public function exists(string $path): bool { - $sql = 'UPDATE ' . $this->storage_table . " - SET file_path = '" . $this->db->sql_escape($path_dest) . "' - WHERE file_path = '" . $this->db->sql_escape($path_orig) . "' - AND storage = '" . $this->db->sql_escape($this->get_name()) . "'"; - $this->db->sql_query($sql); + return $this->file_tracker->is_tracked($this->get_name(), $path); } /** @@ -400,73 +162,30 @@ protected function track_rename(string $path_orig, string $path_dest): void * @param string $path The file * * @return int Size in bytes. - * - * @throws storage_exception When unable to retrieve file size */ public function file_size(string $path): int { - $sql_ary = array( - 'file_path' => $path, - 'storage' => $this->get_name(), - ); - - $sql = 'SELECT filesize FROM ' . $this->storage_table . ' - WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); - $result = $this->db->sql_query($sql); - $row = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); - - return $row !== false && !empty($row['filesize']) ? $row['filesize'] : $this->get_adapter()->file_size($path); + return $this->file_tracker->file_size($this->get_name(), $path); } /** - * Get total storage size + * Return the number of files stored in this storage * - * @return int Size in bytes + * @return int Number of files. */ - public function get_size(): int + public function total_files(): int { - $total_size = $this->cache->get('_storage_' . $this->get_name() . '_totalsize'); - - if ($total_size === false) - { - $sql = 'SELECT SUM(filesize) AS totalsize - FROM ' . $this->storage_table . " - WHERE storage = '" . $this->db->sql_escape($this->get_name()) . "'"; - $result = $this->db->sql_query($sql); - - $total_size = (int) $this->db->sql_fetchfield('totalsize'); - $this->cache->put('_storage_' . $this->get_name() . '_totalsize', $total_size); - - $this->db->sql_freeresult($result); - } - - return (int) $total_size; + return $this->file_tracker->total_files($this->get_name()); } /** - * Get number of storage files + * Get total storage size * - * @return int Number of files + * @return float Size in bytes */ - public function get_num_files(): int + public function total_size(): float { - $number_files = $this->cache->get('_storage_' . $this->get_name() . '_numfiles'); - - if ($number_files === false) - { - $sql = 'SELECT COUNT(file_id) AS numfiles - FROM ' . $this->storage_table . " - WHERE storage = '" . $this->db->sql_escape($this->get_name()) . "'"; - $result = $this->db->sql_query($sql); - - $number_files = (int) $this->db->sql_fetchfield('numfiles'); - $this->cache->put('_storage_' . $this->get_name() . '_numfiles', $number_files); - - $this->db->sql_freeresult($result); - } - - return (int) $number_files; + return $this->file_tracker->total_size($this->get_name()); } /** diff --git a/phpBB/phpbb/storage/stream_interface.php b/phpBB/phpbb/storage/stream_interface.php deleted file mode 100644 index 424ffcb95c2..00000000000 --- a/phpBB/phpbb/storage/stream_interface.php +++ /dev/null @@ -1,41 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\storage; - -use phpbb\storage\exception\storage_exception; - -interface stream_interface -{ - /** - * Reads a file as a stream - * - * @param string $path File to read - * - * @return resource Returns a file pointer - * @throws storage_exception When unable to open file - */ - public function read_stream(string $path); - - /** - * Writes a new file using a stream - * - * @param string $path The target file - * @param resource $resource The resource - * - * @return void - * @throws storage_exception When target file exists - * When target file cannot be created - */ - public function write_stream(string $path, $resource): void; -} diff --git a/tests/storage/adapter/local_test.php b/tests/storage/adapter/local_test.php index 2fee54b2f50..01a78845969 100644 --- a/tests/storage/adapter/local_test.php +++ b/tests/storage/adapter/local_test.php @@ -22,51 +22,6 @@ protected function setUp(): void $this->adapter->configure(['path' => 'test_path']); } - public function test_put_contents(): void - { - // When - $this->adapter->put_contents('file.txt', 'abc'); - - // Then - $this->assertFileExists($this->path . 'file.txt'); - $this->assertFileContains($this->path . 'file.txt', 'abc'); - - // Clean test - unlink($this->path . 'file.txt'); - } - - public function test_get_contents(): void - { - // Given - file_put_contents($this->path . 'file.txt', 'abc'); - - // When - $content = $this->adapter->get_contents('file.txt'); - - // Then - $this->assertEquals('abc', $content); - - // Clean test - unlink($this->path . 'file.txt'); - } - - public function test_exists(): void - { - // Given - touch($this->path . 'file.txt'); - - // When - $existent_file = $this->adapter->exists('file.txt'); - $non_existent_file = $this->adapter->exists('noexist.txt'); - - // Then - $this->assertTrue($existent_file); - $this->assertFalse($non_existent_file); - - // Clean test - unlink($this->path . 'file.txt'); - } - public function test_delete_file(): void { // Given @@ -80,48 +35,13 @@ public function test_delete_file(): void $this->assertFileDoesNotExist($this->path . 'file.txt'); } - public function test_rename(): void - { - // Given - touch($this->path . 'file.txt'); - $this->assertFileExists($this->path . 'file.txt'); - $this->assertFileDoesNotExist($this->path . 'file2.txt'); - - // When - $this->adapter->rename('file.txt', 'file2.txt'); - - // Then - $this->assertFileDoesNotExist($this->path . 'file.txt'); - $this->assertFileExists($this->path . 'file2.txt'); - - // Clean test - unlink($this->path . 'file2.txt'); - } - - public function test_copy(): void - { - // Given - file_put_contents($this->path . 'file.txt', 'abc'); - - // When - $this->adapter->copy('file.txt', 'file2.txt'); - - // Then - $this->assertFileContains($this->path . 'file.txt', 'abc'); - $this->assertFileContains($this->path . 'file2.txt', 'abc'); - - // Clean test - unlink($this->path . 'file.txt'); - unlink($this->path . 'file2.txt'); - } - - public function test_read_stream() + public function test_read() { // Given file_put_contents($this->path . 'file.txt', 'abc'); // When - $stream = $this->adapter->read_stream('file.txt'); + $stream = $this->adapter->read('file.txt'); // Then $this->assertIsResource($stream); @@ -132,14 +52,14 @@ public function test_read_stream() unlink($this->path . 'file.txt'); } - public function test_write_stream() + public function test_write() { // Given file_put_contents($this->path . 'file.txt', 'abc'); $stream = fopen($this->path . 'file.txt', 'rb'); // When - $this->adapter->write_stream('file2.txt', $stream); + $this->adapter->write('file2.txt', $stream); fclose($stream); // Then From 6d9a8ae8afce9b45bebd55abb58d3c175b4fe06c Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Thu, 28 Nov 2024 21:21:15 +0100 Subject: [PATCH 0537/1214] [ticket/17361] Remove fclose after write PHPBB-17361 --- phpBB/phpbb/attachment/upload.php | 5 ----- phpBB/phpbb/files/filespec_storage.php | 5 ----- phpBB/phpbb/storage/helper.php | 5 ----- 3 files changed, 15 deletions(-) diff --git a/phpBB/phpbb/attachment/upload.php b/phpBB/phpbb/attachment/upload.php index ba9ffa25261..f1ae0b8533a 100644 --- a/phpBB/phpbb/attachment/upload.php +++ b/phpBB/phpbb/attachment/upload.php @@ -246,11 +246,6 @@ protected function create_thumbnail() $fp = fopen($destination, 'rb'); $this->storage->write($destination_name, $fp); - - if (is_resource($fp)) - { - fclose($fp); - } } else { diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php index 5ded1e380b7..f223976b9ee 100644 --- a/phpBB/phpbb/files/filespec_storage.php +++ b/phpBB/phpbb/files/filespec_storage.php @@ -447,11 +447,6 @@ public function move_file($storage, $overwrite = false, $skip_image_check = fals $fp = fopen($this->filename, 'rb'); $storage->write($this->destination_file, $fp); - - if (is_resource($fp)) - { - fclose($fp); - } } catch (\phpbb\storage\exception\storage_exception $e) { diff --git a/phpBB/phpbb/storage/helper.php b/phpBB/phpbb/storage/helper.php index 66db2f4e8d3..429e9b0a7ca 100644 --- a/phpBB/phpbb/storage/helper.php +++ b/phpBB/phpbb/storage/helper.php @@ -195,11 +195,6 @@ public function copy_file_to_new_adapter($storage_name, $file): void $stream = $current_adapter->read($file); $new_adapter->write($file, $stream); - - if (is_resource($stream)) - { - fclose($stream); - } } From a8399c14319378bc0a008a87821dcb11abf04088 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Thu, 28 Nov 2024 22:19:04 +0100 Subject: [PATCH 0538/1214] [ticket/17361] Use storage in commands create and delete thumbnail PHPBB-17361 --- .../default/container/services_console.yml | 8 ++- .../console/command/thumbnail/delete.php | 59 +++++++++++-------- .../console/command/thumbnail/generate.php | 59 ++++++++++++------- .../console/command/thumbnail/recreate.php | 21 ++++++- 4 files changed, 97 insertions(+), 50 deletions(-) diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 6c85e22f9ae..e1c965ce170 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -284,20 +284,21 @@ services: console.command.thumbnail.delete: class: phpbb\console\command\thumbnail\delete arguments: - - '@config' - '@user' - '@dbal.conn' - - '%core.root_path%' + - '@language' + - '@storage.attachment' tags: - { name: console.command } console.command.thumbnail.generate: class: phpbb\console\command\thumbnail\generate arguments: - - '@config' - '@user' - '@dbal.conn' - '@cache' + - '@language' + - '@storage.attachment' - '%core.root_path%' - '%core.php_ext%' tags: @@ -307,6 +308,7 @@ services: class: phpbb\console\command\thumbnail\recreate arguments: - '@user' + - '@language' tags: - { name: console.command } diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php index 21fb843e7db..8b767cbbd8f 100644 --- a/phpBB/phpbb/console/command/thumbnail/delete.php +++ b/phpBB/phpbb/console/command/thumbnail/delete.php @@ -12,6 +12,11 @@ */ namespace phpbb\console\command\thumbnail; +use phpbb\db\driver\driver_interface; +use phpbb\language\language; +use phpbb\storage\exception\storage_exception; +use phpbb\storage\storage; +use phpbb\user; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -20,14 +25,19 @@ class delete extends \phpbb\console\command\command { /** - * @var \phpbb\config\config + * @var driver_interface */ - protected $config; + protected $db; /** - * @var \phpbb\db\driver\driver_interface - */ - protected $db; + * @var language + */ + protected $language; + + /** + * @var storage + */ + protected $storage; /** * phpBB root path @@ -38,16 +48,16 @@ class delete extends \phpbb\console\command\command /** * Constructor * - * @param \phpbb\config\config $config The config - * @param \phpbb\user $user The user object (used to get language information) - * @param \phpbb\db\driver\driver_interface $db Database connection - * @param string $phpbb_root_path Root path + * @param user $user The user object (used to get language information) + * @param driver_interface $db Database connection + * @param language $language Language + * @param storage $storage Storage */ - public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\db\driver\driver_interface $db, $phpbb_root_path) + public function __construct(user $user, driver_interface $db, language $language, storage $storage) { - $this->config = $config; $this->db = $db; - $this->phpbb_root_path = $phpbb_root_path; + $this->language = $language; + $this->storage = $storage; parent::__construct($user); } @@ -61,7 +71,7 @@ protected function configure() { $this ->setName('thumbnail:delete') - ->setDescription($this->user->lang('CLI_DESCRIPTION_THUMBNAIL_DELETE')) + ->setDescription($this->language->lang('CLI_DESCRIPTION_THUMBNAIL_DELETE')) ; } @@ -79,7 +89,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { $io = new SymfonyStyle($input, $output); - $io->section($this->user->lang('CLI_THUMBNAIL_DELETING')); + $io->section($this->language->lang('CLI_THUMBNAIL_DELETING')); $sql = 'SELECT COUNT(*) AS nb_missing_thumbnails FROM ' . ATTACHMENTS_TABLE . ' @@ -90,7 +100,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($nb_missing_thumbnails === 0) { - $io->warning($this->user->lang('CLI_THUMBNAIL_NOTHING_TO_DELETE')); + $io->warning($this->language->lang('CLI_THUMBNAIL_NOTHING_TO_DELETE')); return symfony_command::SUCCESS; } @@ -101,7 +111,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $progress = $this->create_progress_bar($nb_missing_thumbnails, $io, $output); - $progress->setMessage($this->user->lang('CLI_THUMBNAIL_DELETING')); + $progress->setMessage($this->language->lang('CLI_THUMBNAIL_DELETING')); $progress->start(); @@ -109,10 +119,10 @@ protected function execute(InputInterface $input, OutputInterface $output) $return = symfony_command::SUCCESS; while ($row = $this->db->sql_fetchrow($result)) { - $thumbnail_path = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename']; - - if (@unlink($thumbnail_path)) + try { + $this->storage->delete('thumb_' . $row['physical_filename']); + $thumbnail_deleted[] = $row['attach_id']; if (count($thumbnail_deleted) === 250) @@ -121,12 +131,11 @@ protected function execute(InputInterface $input, OutputInterface $output) $thumbnail_deleted = array(); } - $progress->setMessage($this->user->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename'])); - } - else - { + $progress->setMessage($this->language->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename'])); + } catch (storage_exception $e) { $return = symfony_command::FAILURE; - $progress->setMessage('' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . ''); + $progress->setMessage('' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . ''); + } $progress->advance(); @@ -141,7 +150,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $progress->finish(); $io->newLine(2); - $io->success($this->user->lang('CLI_THUMBNAIL_DELETING_DONE')); + $io->success($this->language->lang('CLI_THUMBNAIL_DELETING_DONE')); return $return; } diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index 9be4ce5a2e3..8c8c46dd6d5 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -13,6 +13,11 @@ namespace phpbb\console\command\thumbnail; +use phpbb\cache\service; +use phpbb\db\driver\driver_interface; +use phpbb\language\language; +use phpbb\storage\storage; +use phpbb\user; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -20,21 +25,27 @@ class generate extends \phpbb\console\command\command { - /** - * @var \phpbb\config\config - */ - protected $config; /** - * @var \phpbb\db\driver\driver_interface + * @var driver_interface */ protected $db; /** - * @var \phpbb\cache\service + * @var service */ protected $cache; + /** + * @var language + */ + protected $language; + + /** + * @var storage + */ + protected $storage; + /** * phpBB root path * @var string @@ -51,18 +62,20 @@ class generate extends \phpbb\console\command\command /** * Constructor * - * @param \phpbb\config\config $config The config - * @param \phpbb\user $user The user object (used to get language information) - * @param \phpbb\db\driver\driver_interface $db Database connection - * @param \phpbb\cache\service $cache The cache service + * @param user $user The user object (used to get language information) + * @param driver_interface $db Database connection + * @param service $cache The cache service + * @param language $language Language + * @param storage $storage Storage * @param string $phpbb_root_path Root path * @param string $php_ext PHP extension */ - public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\db\driver\driver_interface $db, \phpbb\cache\service $cache, $phpbb_root_path, $php_ext) + public function __construct(user $user, driver_interface $db, service $cache, language $language, storage $storage, string $phpbb_root_path, string $php_ext) { - $this->config = $config; $this->db = $db; $this->cache = $cache; + $this->language = $language; + $this->storage = $storage; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -78,7 +91,7 @@ protected function configure() { $this ->setName('thumbnail:generate') - ->setDescription($this->user->lang('CLI_DESCRIPTION_THUMBNAIL_GENERATE')) + ->setDescription($this->language->lang('CLI_DESCRIPTION_THUMBNAIL_GENERATE')) ; } @@ -96,7 +109,7 @@ protected function execute(InputInterface $input, OutputInterface $output) { $io = new SymfonyStyle($input, $output); - $io->section($this->user->lang('CLI_THUMBNAIL_GENERATING')); + $io->section($this->language->lang('CLI_THUMBNAIL_GENERATING')); $sql = 'SELECT COUNT(*) AS nb_missing_thumbnails FROM ' . ATTACHMENTS_TABLE . ' @@ -107,7 +120,7 @@ protected function execute(InputInterface $input, OutputInterface $output) if ($nb_missing_thumbnails === 0) { - $io->warning($this->user->lang('CLI_THUMBNAIL_NOTHING_TO_GENERATE')); + $io->warning($this->language->lang('CLI_THUMBNAIL_NOTHING_TO_GENERATE')); return symfony_command::SUCCESS; } @@ -125,7 +138,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $progress = $this->create_progress_bar($nb_missing_thumbnails, $io, $output); - $progress->setMessage($this->user->lang('CLI_THUMBNAIL_GENERATING')); + $progress->setMessage($this->language->lang('CLI_THUMBNAIL_GENERATING')); $progress->start(); @@ -134,11 +147,15 @@ protected function execute(InputInterface $input, OutputInterface $output) { if (isset($extensions[$row['extension']]['display_cat']) && $extensions[$row['extension']]['display_cat'] == \phpbb\attachment\attachment_category::IMAGE) { - $source = $this->phpbb_root_path . $this->config['upload_path'] . '/' . $row['physical_filename']; - $destination = $this->phpbb_root_path . $this->config['upload_path'] . '/thumb_' . $row['physical_filename']; + $source = tempnam(sys_get_temp_dir(), 'thumbnail_source'); + $destination = tempnam(sys_get_temp_dir(), 'thumbnail_destination'); + + file_put_contents($source, $this->storage->read($row['physical_filename'])); if (create_thumbnail($source, $destination, $row['mimetype'])) { + $this->storage->write('thumb_' . $row['physical_filename'], fopen($destination, 'rb')); + $thumbnail_created[] = (int) $row['attach_id']; if (count($thumbnail_created) === 250) @@ -147,11 +164,11 @@ protected function execute(InputInterface $input, OutputInterface $output) $thumbnail_created = array(); } - $progress->setMessage($this->user->lang('CLI_THUMBNAIL_GENERATED', $row['real_filename'], $row['physical_filename'])); + $progress->setMessage($this->language->lang('CLI_THUMBNAIL_GENERATED', $row['real_filename'], $row['physical_filename'])); } else { - $progress->setMessage('' . $this->user->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . ''); + $progress->setMessage('' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . ''); } } @@ -167,7 +184,7 @@ protected function execute(InputInterface $input, OutputInterface $output) $progress->finish(); $io->newLine(2); - $io->success($this->user->lang('CLI_THUMBNAIL_GENERATING_DONE')); + $io->success($this->language->lang('CLI_THUMBNAIL_GENERATING_DONE')); return symfony_command::SUCCESS; } diff --git a/phpBB/phpbb/console/command/thumbnail/recreate.php b/phpBB/phpbb/console/command/thumbnail/recreate.php index cffa2c29dc3..a0a0524b898 100644 --- a/phpBB/phpbb/console/command/thumbnail/recreate.php +++ b/phpBB/phpbb/console/command/thumbnail/recreate.php @@ -12,6 +12,8 @@ */ namespace phpbb\console\command\thumbnail; +use phpbb\language\language; +use phpbb\user; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\ArrayInput; @@ -19,6 +21,23 @@ class recreate extends \phpbb\console\command\command { + /** + * @var language + */ + protected $language; + + /** + * Constructor + * + * @param language $language Language + */ + public function __construct(user $user, language $language) + { + $this->language = $language; + + parent::__construct($user); + } + /** * Sets the command name and description * @@ -28,7 +47,7 @@ protected function configure() { $this ->setName('thumbnail:recreate') - ->setDescription($this->user->lang('CLI_DESCRIPTION_THUMBNAIL_RECREATE')) + ->setDescription($this->language->lang('CLI_DESCRIPTION_THUMBNAIL_RECREATE')) ; } From 4becf438e12f43ca3bd07fb7cd2cb6767fcbc231 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Thu, 28 Nov 2024 22:24:28 +0100 Subject: [PATCH 0539/1214] [ticket/17361] Remove temp files PHPBB-17361 --- phpBB/phpbb/console/command/thumbnail/generate.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index 8c8c46dd6d5..dfc64805105 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -151,10 +151,12 @@ protected function execute(InputInterface $input, OutputInterface $output) $destination = tempnam(sys_get_temp_dir(), 'thumbnail_destination'); file_put_contents($source, $this->storage->read($row['physical_filename'])); + @unlink($source); if (create_thumbnail($source, $destination, $row['mimetype'])) { $this->storage->write('thumb_' . $row['physical_filename'], fopen($destination, 'rb')); + @unlink($destination); $thumbnail_created[] = (int) $row['attach_id']; From 9bf9538dc642aeb2ae076bdbe8aad125bc566458 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Thu, 28 Nov 2024 22:30:37 +0100 Subject: [PATCH 0540/1214] [ticket/17361] Update thumbnail_test test PHPBB-17361 --- .../console/command/thumbnail/generate.php | 3 ++- tests/console/thumbnail_test.php | 27 +++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index dfc64805105..52ae19a9de8 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -151,11 +151,12 @@ protected function execute(InputInterface $input, OutputInterface $output) $destination = tempnam(sys_get_temp_dir(), 'thumbnail_destination'); file_put_contents($source, $this->storage->read($row['physical_filename'])); - @unlink($source); if (create_thumbnail($source, $destination, $row['mimetype'])) { $this->storage->write('thumb_' . $row['physical_filename'], fopen($destination, 'rb')); + + @unlink($source); @unlink($destination); $thumbnail_created[] = (int) $row['attach_id']; diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index 3a08e4b1ac1..ebe0dff62e0 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -24,6 +24,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case protected $config; protected $cache; protected $user; + protected $storage; protected $phpEx; protected $phpbb_root_path; protected $application; @@ -46,11 +47,10 @@ protected function setUp(): void $config = $this->config = new \phpbb\config\config(array( 'img_min_thumb_filesize' => 2, - 'img_max_thumb_width' => 2, - 'upload_path' => 'files', + 'img_max_thumb_width' => 2 )); - $this->db = $this->db = $this->new_dbal(); + $this->db = $this->new_dbal(); $this->language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); $this->phpbb_root_path = $phpbb_root_path; @@ -62,13 +62,24 @@ protected function setUp(): void 'txt' => array('display_cat' => attachment_category::NONE), ))); - $this->application = new Application(); - $this->application->add(new generate($config, $this->user, $this->db, $this->cache, $this->phpbb_root_path, $this->phpEx)); - $this->application->add(new delete($config, $this->user, $this->db, $this->phpbb_root_path)); - $this->application->add(new recreate($this->user)); - $phpbb_filesystem = new \phpbb\filesystem\filesystem(); + $this->storage = $this->createMock('\phpbb\storage\storage'); + $this->storage->method('write')->willReturnCallback(function ($path, $data) use ($phpbb_root_path) { + file_put_contents($phpbb_root_path . 'files/' . $path, $data); + }); + $this->storage->method('read')->willReturnCallback(function ($path) use ($phpbb_root_path) { + return fopen($phpbb_root_path . 'files/' . $path, 'rb'); + }); + $this->storage->method('delete')->willReturnCallback(function ($path) use ($phpbb_root_path) { + unlink($phpbb_root_path . 'files/' . $path); + }); + + $this->application = new Application(); + $this->application->add(new generate($this->user, $this->db, $this->cache, $this->language, $this->storage, $this->phpbb_root_path, $this->phpEx)); + $this->application->add(new delete($this->user, $this->db, $this->language, $this->storage)); + $this->application->add(new recreate($this->user, $this->language)); + copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_1'); copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/test_png_2'); copy(__DIR__ . '/fixtures/png.png', $this->phpbb_root_path . 'files/thumb_test_png_2'); From be3966c0cbd3558670a75a4062e6c74ac5a1cb1e Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Fri, 29 Nov 2024 21:43:58 +0100 Subject: [PATCH 0541/1214] [ticket/17361] Remove temp files always PHPBB-17361 --- phpBB/phpbb/console/command/thumbnail/delete.php | 4 +++- phpBB/phpbb/console/command/thumbnail/generate.php | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/console/command/thumbnail/delete.php b/phpBB/phpbb/console/command/thumbnail/delete.php index 8b767cbbd8f..114969c0d06 100644 --- a/phpBB/phpbb/console/command/thumbnail/delete.php +++ b/phpBB/phpbb/console/command/thumbnail/delete.php @@ -132,7 +132,9 @@ protected function execute(InputInterface $input, OutputInterface $output) } $progress->setMessage($this->language->lang('CLI_THUMBNAIL_DELETED', $row['real_filename'], $row['physical_filename'])); - } catch (storage_exception $e) { + } + catch (storage_exception $e) + { $return = symfony_command::FAILURE; $progress->setMessage('' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . ''); diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index 52ae19a9de8..c0bda918f42 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -156,9 +156,6 @@ protected function execute(InputInterface $input, OutputInterface $output) { $this->storage->write('thumb_' . $row['physical_filename'], fopen($destination, 'rb')); - @unlink($source); - @unlink($destination); - $thumbnail_created[] = (int) $row['attach_id']; if (count($thumbnail_created) === 250) @@ -173,6 +170,9 @@ protected function execute(InputInterface $input, OutputInterface $output) { $progress->setMessage('' . $this->language->lang('CLI_THUMBNAIL_SKIPPED', $row['real_filename'], $row['physical_filename']) . ''); } + + @unlink($source); + @unlink($destination); } $progress->advance(); From a44295a1ba21fa3141dedf151db405ecd9448232 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 30 Nov 2024 01:25:17 +0100 Subject: [PATCH 0542/1214] [ticket/17361] Move language keys to storage adapters PHPBB-17361 --- phpBB/adm/style/acp_storage.html | 39 +++++------ .../default/container/services_storage.yml | 1 + phpBB/language/en/acp/storage.php | 1 + phpBB/phpbb/storage/provider/local.php | 30 +++++++- .../storage/provider/provider_interface.php | 69 ++++++++++++++++++- phpBB/phpbb/template/twig/extension/forms.php | 2 +- 6 files changed, 118 insertions(+), 24 deletions(-) diff --git a/phpBB/adm/style/acp_storage.html b/phpBB/adm/style/acp_storage.html index f064438acaf..f3b93020f8b 100644 --- a/phpBB/adm/style/acp_storage.html +++ b/phpBB/adm/style/acp_storage.html @@ -47,7 +47,7 @@

                            {{ lang('WARNING') }}

                            {% for provider in PROVIDERS %} {% if provider.is_available %} {% endif %} {% endfor %} @@ -59,43 +59,42 @@

                            {{ lang('WARNING') }}

                            {% for provider in PROVIDERS %} {% if provider.is_available %}
                            - {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ lang('STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_NAME') }} + {{ lang('STORAGE_' ~ storage.get_name | upper ~ '_TITLE') }} - {{ provider.get_title }} {% for name, options in provider.get_options %}
                            - {% set title = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper %} - {% set description = 'STORAGE_ADAPTER_' ~ provider.get_name | upper ~ '_OPTION_' ~ name | upper ~ '_EXPLAIN' %} - - {% if lang_defined(description) %} -
                            {{ lang(description) }} + + {% if options.description %} +
                            {{ options.description }} {% endif %}
                            {% set input_name = storage.get_name ~ '[' ~ name ~ ']' %} {% set input_value = attribute(config, 'storage\\' ~ storage.get_name ~ '\\config\\' ~ name) %} + {% set form_macro = options.form_macro %} - {% if options.tag == 'input' %} - {{ FormsInput(options | merge({"name": input_name, "value": input_value})) }} - {% elseif options.tag == 'textarea' %} - {{ FormsTextarea(options | merge({"name": input_name, "content": input_value})) }} - {% elseif options.tag == 'radio' %} + {% if form_macro.tag == 'input' %} + {{ FormsInput(form_macro | merge({"name": input_name, "value": input_value})) }} + {% elseif form_macro.tag == 'textarea' %} + {{ FormsTextarea(form_macro | merge({"name": input_name, "content": input_value})) }} + {% elseif form_macro.tag == 'radio' %} {% set buttons = [] %} - {% for button in options.buttons %} - {% set new_button = button | merge({"name": input_name, "label": lang(button.label), "checked": button.value == input_value}) %} + {% for button in form_macro.buttons %} + {% set new_button = button | merge({"name": input_name, "checked": button.value == input_value}) %} {% set buttons = buttons | merge([new_button]) %} {% endfor %} - {{ FormsRadioButtons(options | merge({"buttons": buttons})) }} - {% elseif options.tag == 'select' %} + {{ FormsRadioButtons(form_macro | merge({"buttons": buttons})) }} + {% elseif form_macro.tag == 'select' %} {% set select_options = [] %} - {% for option in options.options %} + {% for option in form_macro.options %} {% set new_option = option | merge({"selected": option.value == input_value}) %} {% set select_options = select_options | merge([new_option]) %} {% endfor %} - {{ FormsSelect(options | merge({"name": input_name, "options": select_options})) }} + {{ FormsSelect(form_macro | merge({"name": input_name, "options": select_options})) }} {% endif %}
                            @@ -109,9 +108,9 @@

                            {{ lang('WARNING') }}

                            - + - +
                            diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml index 1109aa626be..8db8ceaedea 100644 --- a/phpBB/config/default/container/services_storage.yml +++ b/phpBB/config/default/container/services_storage.yml @@ -72,6 +72,7 @@ services: storage.provider.local: class: phpbb\storage\provider\local arguments: + - '@language' tags: - { name: storage.provider } diff --git a/phpBB/language/en/acp/storage.php b/phpBB/language/en/acp/storage.php index 9f928ee58ea..575805e6503 100644 --- a/phpBB/language/en/acp/storage.php +++ b/phpBB/language/en/acp/storage.php @@ -65,6 +65,7 @@ // Local adapter 'STORAGE_ADAPTER_LOCAL_NAME' => 'Local', 'STORAGE_ADAPTER_LOCAL_OPTION_PATH' => 'Path', + 'STORAGE_ADAPTER_LOCAL_OPTION_PATH_EXPLAIN' => 'Storage path for files.
                            For example: files, images/avatars/upload or store.', // Form validation 'STORAGE_UPDATE_SUCCESSFUL' => 'All storage types were successfully updated.', diff --git a/phpBB/phpbb/storage/provider/local.php b/phpBB/phpbb/storage/provider/local.php index 67a1789434b..11bca055ce8 100644 --- a/phpBB/phpbb/storage/provider/local.php +++ b/phpBB/phpbb/storage/provider/local.php @@ -13,8 +13,25 @@ namespace phpbb\storage\provider; +use phpbb\language\language; + class local implements provider_interface { + /** + * @var language + */ + protected $language; + + /** + * Constructor + * + * @param language $language + */ + public function __construct(language $language) + { + $this->language = $language; + } + /** * {@inheritdoc} */ @@ -23,6 +40,11 @@ public function get_name(): string return 'local'; } + public function get_title(): string + { + return $this->language->lang('STORAGE_ADAPTER_LOCAL_NAME'); + } + /** * {@inheritdoc} */ @@ -38,8 +60,12 @@ public function get_options(): array { return [ 'path' => [ - 'tag' => 'input', - 'type' => 'text', + 'title' => $this->language->lang('STORAGE_ADAPTER_LOCAL_OPTION_PATH'), + 'description' => $this->language->lang('STORAGE_ADAPTER_LOCAL_OPTION_PATH_EXPLAIN'), + 'form_macro' => [ + 'tag' => 'input', + 'type' => 'text', + ], ], ]; } diff --git a/phpBB/phpbb/storage/provider/provider_interface.php b/phpBB/phpbb/storage/provider/provider_interface.php index aa01a51e372..7baac79f722 100644 --- a/phpBB/phpbb/storage/provider/provider_interface.php +++ b/phpBB/phpbb/storage/provider/provider_interface.php @@ -22,6 +22,13 @@ interface provider_interface */ public function get_name(): string; + /** + * Gets adapter title for acp + * + * @return string + */ + public function get_title(): string; + /** * Gets adapter class * @@ -32,7 +39,67 @@ public function get_adapter_class(): string; /** * Gets adapter options * - * @return array Configuration keys + * Example: + * public function get_options() + * { + * return [ + * 'text-test' => [ + * 'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXT_TEST'), + * 'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXT_TEST_EXPLAIN'), + * 'form_macro' => [ + * 'tag' => 'input', + * 'type' => 'text', + * ], + * ], + * 'password-test' => [ + * 'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_PASSWORD_TEST'), + * 'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_PASSWORD_TEST_EXPLAIN'), + * 'form_macro' => [ + * 'tag' => 'input', + * 'type' => 'password', + * ], + * ], + * 'radio-test' => [ + * 'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST'), + * 'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST_EXPLAIN'), + * 'form_macro' => [ + * 'tag' => 'radio', + * 'buttons' => [ + * [ + * 'type' => 'radio', + * 'value' => '1', + * 'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST_LABEL_ONE'), + * ], + * [ + * 'type' => 'radio', + * 'value' => '2', + * 'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_RADIO_TEST_LABEL_TWO'), + * ], + * ], + * ], + * ], + * 'select-test' => [ + * 'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST'), + * 'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST_EXPLAIN'), + * 'form_macro' => [ + * 'tag' => 'select', + * 'options' => [ + * ['value' => 'one', 'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST_LABEL_ONE')], + * ['value' => 'two', 'label' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_SELECT_TEST_LABEL_TWO')], + * ], + * ], + * ], + * 'textarea-test' => [ + * 'title' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXTAREA_TEST'), + * 'description' => $this->language->lang('STORAGE_ADAPTER_DEMO_OPTION_TEXTAREA_TEST_EXPLAIN'), + * 'form_macro' => [ + * 'tag' => 'textarea', + * ] + * ], + * ]; + * } + * + * @return array Configuration keys */ public function get_options(): array; diff --git a/phpBB/phpbb/template/twig/extension/forms.php b/phpBB/phpbb/template/twig/extension/forms.php index b146aacfb97..bf1bed006e9 100644 --- a/phpBB/phpbb/template/twig/extension/forms.php +++ b/phpBB/phpbb/template/twig/extension/forms.php @@ -206,7 +206,7 @@ public function textarea(environment $environment, array $form_data): string { return $environment->render('macros/forms/textarea.twig', [ 'CLASS' => (string) ($form_data['class'] ?? ''), - 'ID' => (string) $form_data['id'], + 'ID' => (string) ($form_data['id'] ?? ''), 'DATA' => $form_data['data'] ?? [], 'NAME' => (string) $form_data['name'], 'ROWS' => (int) ($form_data['rows'] ?? ''), From 1f7ae9e2b0d9d487e1be6c9136d301c07b519b48 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 30 Nov 2024 03:22:46 +0100 Subject: [PATCH 0543/1214] [ticket/17361] Fix migrations PHPBB-17361 --- phpBB/includes/acp/acp_database.php | 7 +- .../data/v400/storage_attachment.php | 9 +++ .../db/migration/data/v400/storage_avatar.php | 9 +++ .../db/migration/data/v400/storage_backup.php | 17 +++++ .../data/v400/storage_backup_data.php | 65 +++++++++++++++++++ .../db/migration/data/v400/storage_track.php | 1 + phpBB/phpbb/storage/adapter_factory.php | 2 +- 7 files changed, 103 insertions(+), 7 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/storage_backup_data.php diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php index 2b95ff3ad58..7743ce5dbc8 100644 --- a/phpBB/includes/acp/acp_database.php +++ b/phpBB/includes/acp/acp_database.php @@ -162,12 +162,7 @@ function main($id, $mode) throw new \phpbb\exception\runtime_exception('CANNOT_OPEN_FILE'); } - $storage->write_stream($file, $fp); - - if (is_resource($fp)) - { - fclose($fp); - } + $storage->write($file, $fp); // Remove file from tmp @unlink($temp_dir . '/' . $file); diff --git a/phpBB/phpbb/db/migration/data/v400/storage_attachment.php b/phpBB/phpbb/db/migration/data/v400/storage_attachment.php index d9f60ccdace..9e1919f3f3e 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_attachment.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_attachment.php @@ -38,4 +38,13 @@ public function update_data() ['config.remove', ['upload_path']], ]; } + + public function revert_data() + { + return [ + ['config.remove', ['storage\\attachment\\provider']], + ['config.remove', ['storage\\attachment\\config\\path']], + ['config.add', ['upload_path', 'files']], + ]; + } } diff --git a/phpBB/phpbb/db/migration/data/v400/storage_avatar.php b/phpBB/phpbb/db/migration/data/v400/storage_avatar.php index 5afed251d75..f9de7cd8a53 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_avatar.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_avatar.php @@ -38,4 +38,13 @@ public function update_data() ['config.remove', ['avatar_path']], ]; } + + public function revert_data() + { + return [ + ['config.remove', ['storage\\avatar\\provider']], + ['config.remove', ['storage\\avatar\\config\\path']], + ['config.add', ['avatar_path', 'images/avatars/upload']], + ]; + } } diff --git a/phpBB/phpbb/db/migration/data/v400/storage_backup.php b/phpBB/phpbb/db/migration/data/v400/storage_backup.php index f764f5636ec..d9f19c42f03 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_backup.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_backup.php @@ -45,6 +45,15 @@ public function update_schema() ]; } + public function revert_schema() + { + return [ + 'drop_tables' => [ + $this->table_prefix . 'backups', + ], + ]; + } + public function update_data() { return [ @@ -52,4 +61,12 @@ public function update_data() ['config.add', ['storage\\backup\\config\\path', 'store']], ]; } + + public function revert_data() + { + return [ + ['config.remove', ['storage\\backup\\provider']], + ['config.remove', ['storage\\backup\\config\\path']], + ]; + } } diff --git a/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php new file mode 100644 index 00000000000..507d4a09d90 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php @@ -0,0 +1,65 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class storage_backup_data extends migration +{ + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v400\storage_backup', + ]; + } + + public function update_data() + { + return [ + ['custom', [[$this, 'update_backup_data']]], + ]; + } + + public function update_backup_data() + { + $methods = ['sql', 'sql.gz', 'sql.bz2']; + + $dir = $this->phpbb_root_path . 'store/'; + $dh = @opendir($dir); + + if ($dh) + { + while (($file = readdir($dh)) !== false) + { + echo "FILE $file\n"; + if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches)) + { + if (in_array($matches[2], $methods)) + { + $insert_ary = [ + 'filename' => $file, + ]; + + $sql = 'INSERT INTO ' . $this->table_prefix . 'backups ' . $this->db->sql_build_array('INSERT', $insert_ary); + + $this->db->sql_query($sql); + } + } + + } + + closedir($dh); + } + } +} diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php index d9890fd80fa..ebda4c86783 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_track.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php @@ -30,6 +30,7 @@ public static function depends_on() '\phpbb\db\migration\data\v400\storage_attachment', '\phpbb\db\migration\data\v400\storage_avatar', '\phpbb\db\migration\data\v400\storage_backup', + '\phpbb\db\migration\data\v400\storage_backup_data', ]; } diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php index 3d55fc7a41e..1cf4ae12cda 100644 --- a/phpBB/phpbb/storage/adapter_factory.php +++ b/phpBB/phpbb/storage/adapter_factory.php @@ -89,7 +89,7 @@ public function get_with_options(string $storage_name, string $provider_class, a } $adapter = $this->adapters->get_by_class($provider->get_adapter_class()); - $options['storage'] = $storage_name; + $options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensiosn $adapter->configure($options); return $adapter; From d6953a0422dd0ff6e967caa45db2df9b3b1a4421 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 30 Nov 2024 14:45:19 +0100 Subject: [PATCH 0544/1214] [ticket/17361] Use new adapter options format in acp_storage PHPBB-17361 --- phpBB/includes/acp/acp_storage.php | 22 +++++++++---------- .../data/v400/storage_backup_data.php | 1 - phpBB/phpbb/language/language.php | 4 ++-- phpBB/phpbb/storage/adapter_factory.php | 2 +- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/phpBB/includes/acp/acp_storage.php b/phpBB/includes/acp/acp_storage.php index 35c07074b6c..a35f6d4f0c6 100644 --- a/phpBB/includes/acp/acp_storage.php +++ b/phpBB/includes/acp/acp_storage.php @@ -378,7 +378,6 @@ private function get_modified_storages(): array foreach ($this->storage_collection as $storage) { $storage_name = $storage->get_name(); - $options = $this->storage_helper->get_provider_options($this->storage_helper->get_current_provider($storage_name)); $modified = false; @@ -389,6 +388,8 @@ private function get_modified_storages(): array } else { + $options = $this->storage_helper->get_provider_options($this->storage_helper->get_current_provider($storage_name)); + // Check if options have been modified foreach (array_keys($options) as $definition) { @@ -535,30 +536,29 @@ protected function validate_data(string $storage_name, array &$messages): void $this->validate_path($storage_name, $messages); // Check options - $new_options = $this->storage_helper->get_provider_options($this->request->variable([$storage_name, 'provider'], '')); + $new_provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], '')); - foreach ($new_options as $definition_key => $definition_value) + foreach ($new_provider->get_options() as $definition_key => $definition_value) { - $provider = $this->provider_collection->get_by_class($this->request->variable([$storage_name, 'provider'], '')); - $definition_title = $this->lang->lang('STORAGE_ADAPTER_' . strtoupper($provider->get_name()) . '_OPTION_' . strtoupper($definition_key)); + $definition_title = $definition_value['title']; $value = $this->request->variable([$storage_name, $definition_key], ''); - switch ($definition_value['tag']) + switch ($definition_value['form_macro']['tag']) { case 'text': - if ($definition_value['type'] == 'email' && filter_var($value, FILTER_VALIDATE_EMAIL)) + if ($definition_value['form_macro']['type'] === 'email' && filter_var($value, FILTER_VALIDATE_EMAIL)) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_EMAIL_INCORRECT_FORMAT', $definition_title, $storage_title); } - $maxlength = $definition_value['max'] ?? 255; + $maxlength = $definition_value['form_macro']['max'] ?? 255; if (strlen($value) > $maxlength) { $messages[] = $this->lang->lang('STORAGE_FORM_TYPE_TEXT_TOO_LONG', $definition_title, $storage_title); } - if ($provider->get_name() == 'local' && $definition_key == 'path') + if ($new_provider->get_name() === 'local' && $definition_key === 'path') { $path = $value; @@ -575,7 +575,7 @@ protected function validate_data(string $storage_name, array &$messages): void case 'radio': $found = false; - foreach ($definition_value['buttons'] as $button) + foreach ($definition_value['form_macro']['buttons'] as $button) { if ($button['value'] == $value) { @@ -592,7 +592,7 @@ protected function validate_data(string $storage_name, array &$messages): void case 'select': $found = false; - foreach ($definition_value['options'] as $option) + foreach ($definition_value['form_macro']['options'] as $option) { if ($option['value'] == $value) { diff --git a/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php index 507d4a09d90..772a03b9450 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php @@ -42,7 +42,6 @@ public function update_backup_data() { while (($file = readdir($dh)) !== false) { - echo "FILE $file\n"; if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches)) { if (in_array($matches[2], $methods)) diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php index 1c51049de56..4336c8f9f2f 100644 --- a/phpBB/phpbb/language/language.php +++ b/phpBB/phpbb/language/language.php @@ -230,10 +230,10 @@ public function is_set($key) * Params are the language key and the parameters to be substituted. * This function/functionality is inspired by SHS` and Ashe. * - * Example call: $user->lang('NUM_POSTS_IN_QUEUE', 1); + * Example call: $language->lang('NUM_POSTS_IN_QUEUE', 1); * * If the first parameter is an array, the elements are used as keys and subkeys to get the language entry: - * Example: $user->lang(array('datetime', 'AGO'), 1) uses $user->lang['datetime']['AGO'] as language entry. + * Example: $language->lang(array('datetime', 'AGO'), 1) uses $language->lang['datetime']['AGO'] as language entry. * * @return string Return localized string or the language key if the translation is not available */ diff --git a/phpBB/phpbb/storage/adapter_factory.php b/phpBB/phpbb/storage/adapter_factory.php index 1cf4ae12cda..e80d25cfbc4 100644 --- a/phpBB/phpbb/storage/adapter_factory.php +++ b/phpBB/phpbb/storage/adapter_factory.php @@ -89,7 +89,7 @@ public function get_with_options(string $storage_name, string $provider_class, a } $adapter = $this->adapters->get_by_class($provider->get_adapter_class()); - $options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensiosn + $options['storage'] = $storage_name; // Inject storage name into options so it can be used by extensions $adapter->configure($options); return $adapter; From b33f17e7ce630f5860f26f4f7c1c5824dd9472ec Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Tue, 24 Dec 2024 19:30:05 +0100 Subject: [PATCH 0545/1214] [ticket/17361] Use filesystem classes for tempnam and temp dir. Code reviews. PHPBB-17361 --- .../default/container/services_console.yml | 1 + .../console/command/thumbnail/generate.php | 24 ++++++-- .../console/command/thumbnail/recreate.php | 1 + .../data/v400/storage_backup_data.php | 8 +-- phpBB/phpbb/filesystem/temp.php | 55 +++++++++++++------ phpBB/phpbb/storage/file_tracker.php | 27 ++++----- tests/console/thumbnail_test.php | 8 ++- 7 files changed, 86 insertions(+), 38 deletions(-) diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index e1c965ce170..3cfacb080b4 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -299,6 +299,7 @@ services: - '@cache' - '@language' - '@storage.attachment' + - '@filesystem.temp' - '%core.root_path%' - '%core.php_ext%' tags: diff --git a/phpBB/phpbb/console/command/thumbnail/generate.php b/phpBB/phpbb/console/command/thumbnail/generate.php index c0bda918f42..38e36466485 100644 --- a/phpBB/phpbb/console/command/thumbnail/generate.php +++ b/phpBB/phpbb/console/command/thumbnail/generate.php @@ -13,8 +13,10 @@ namespace phpbb\console\command\thumbnail; +use phpbb\attachment\attachment_category; use phpbb\cache\service; use phpbb\db\driver\driver_interface; +use phpbb\filesystem\temp; use phpbb\language\language; use phpbb\storage\storage; use phpbb\user; @@ -22,6 +24,7 @@ use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Style\SymfonyStyle; +use Symfony\Component\Filesystem\Filesystem as symfony_filesystem; class generate extends \phpbb\console\command\command { @@ -41,11 +44,21 @@ class generate extends \phpbb\console\command\command */ protected $language; + /** + * @var symfony_filesystem + */ + protected $symfony_filesystem; + /** * @var storage */ protected $storage; + /** + * @var temp + */ + protected $temp; + /** * phpBB root path * @var string @@ -67,15 +80,18 @@ class generate extends \phpbb\console\command\command * @param service $cache The cache service * @param language $language Language * @param storage $storage Storage + * @param temp $temp Temp * @param string $phpbb_root_path Root path * @param string $php_ext PHP extension */ - public function __construct(user $user, driver_interface $db, service $cache, language $language, storage $storage, string $phpbb_root_path, string $php_ext) + public function __construct(user $user, driver_interface $db, service $cache, language $language, storage $storage, temp $temp, string $phpbb_root_path, string $php_ext) { $this->db = $db; $this->cache = $cache; + $this->symfony_filesystem = new symfony_filesystem(); $this->language = $language; $this->storage = $storage; + $this->temp = $temp; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -145,10 +161,10 @@ protected function execute(InputInterface $input, OutputInterface $output) $thumbnail_created = array(); while ($row = $this->db->sql_fetchrow($result)) { - if (isset($extensions[$row['extension']]['display_cat']) && $extensions[$row['extension']]['display_cat'] == \phpbb\attachment\attachment_category::IMAGE) + if (isset($extensions[$row['extension']]['display_cat']) && $extensions[$row['extension']]['display_cat'] == attachment_category::IMAGE) { - $source = tempnam(sys_get_temp_dir(), 'thumbnail_source'); - $destination = tempnam(sys_get_temp_dir(), 'thumbnail_destination'); + $source = $this->symfony_filesystem->tempnam($this->temp->get_dir(), 'thumbnail_source'); + $destination = $this->symfony_filesystem->tempnam($this->temp->get_dir(), 'thumbnail_destination'); file_put_contents($source, $this->storage->read($row['physical_filename'])); diff --git a/phpBB/phpbb/console/command/thumbnail/recreate.php b/phpBB/phpbb/console/command/thumbnail/recreate.php index a0a0524b898..4b774c251de 100644 --- a/phpBB/phpbb/console/command/thumbnail/recreate.php +++ b/phpBB/phpbb/console/command/thumbnail/recreate.php @@ -29,6 +29,7 @@ class recreate extends \phpbb\console\command\command /** * Constructor * + * @param user $user User * @param language $language Language */ public function __construct(user $user, language $language) diff --git a/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php index 772a03b9450..190445a04fa 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_backup_data.php @@ -36,11 +36,11 @@ public function update_backup_data() $methods = ['sql', 'sql.gz', 'sql.bz2']; $dir = $this->phpbb_root_path . 'store/'; - $dh = @opendir($dir); + $handle = @opendir($dir); - if ($dh) + if ($handle) { - while (($file = readdir($dh)) !== false) + while (($file = readdir($handle)) !== false) { if (preg_match('#^backup_(\d{10,})_(?:[a-z\d]{16}|[a-z\d]{32})\.(sql(?:\.(?:gz|bz2))?)$#i', $file, $matches)) { @@ -58,7 +58,7 @@ public function update_backup_data() } - closedir($dh); + closedir($handle); } } } diff --git a/phpBB/phpbb/filesystem/temp.php b/phpBB/phpbb/filesystem/temp.php index 649221d8022..4c8a71d6008 100644 --- a/phpBB/phpbb/filesystem/temp.php +++ b/phpBB/phpbb/filesystem/temp.php @@ -13,8 +13,20 @@ namespace phpbb\filesystem; +use phpbb\filesystem\exception\filesystem_exception; + class temp { + /** + * @var filesystem + */ + protected $filesystem; + + /** + * @var string + */ + protected $cache_temp_dir; + /** * @var string Temporary directory path */ @@ -23,23 +35,10 @@ class temp /** * Constructor */ - public function __construct($filesystem, $cache_temp_dir) + public function __construct(filesystem $filesystem, string $cache_temp_dir) { - $tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : ''; - - // Prevent trying to write to system temp dir in case of open_basedir - // restrictions being in effect - if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir)) - { - $tmp_dir = $cache_temp_dir; - - if (!is_dir($tmp_dir)) - { - $filesystem->mkdir($tmp_dir, 0777); - } - } - - $this->temp_dir = helper::realpath($tmp_dir); + $this->filesystem = $filesystem; + $this->cache_temp_dir = $cache_temp_dir; } /** @@ -49,6 +48,30 @@ public function __construct($filesystem, $cache_temp_dir) */ public function get_dir() { + if ($this->temp_dir === null) + { + $tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : ''; + + // Prevent trying to write to system temp dir in case of open_basedir + // restrictions being in effect + if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir)) + { + $tmp_dir = $this->cache_temp_dir; + + if (!is_dir($tmp_dir)) + { + $this->filesystem->mkdir($tmp_dir, 0777); + } + } + + $this->temp_dir = helper::realpath($tmp_dir); + + if ($this->temp_dir === false) + { + throw new filesystem_exception('FILESYSTEM_CANNOT_CREATE_DIRECTORY', $tmp_dir); + } + } + return $this->temp_dir; } } diff --git a/phpBB/phpbb/storage/file_tracker.php b/phpBB/phpbb/storage/file_tracker.php index c858b733ac8..ab6f1c8a11b 100644 --- a/phpBB/phpbb/storage/file_tracker.php +++ b/phpBB/phpbb/storage/file_tracker.php @@ -19,7 +19,6 @@ class file_tracker { - /** * @var db */ @@ -59,11 +58,11 @@ public function __construct(db $db, cache $cache, string $storage_table) */ public function track_file(string $storage, string $path, int $size): void { - $sql_ary = array( + $sql_ary = [ 'file_path' => $path, 'storage' => $storage, 'filesize' => $size, - ); + ]; $sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary); $this->db->sql_query($sql); @@ -80,10 +79,10 @@ public function track_file(string $storage, string $path, int $size): void */ public function untrack_file(string $storage, $path): void { - $sql_ary = array( + $sql_ary = [ 'file_path' => $path, 'storage' => $storage, - ); + ]; $sql = 'DELETE FROM ' . $this->storage_table . ' WHERE ' . $this->db->sql_build_array('DELETE', $sql_ary); @@ -103,13 +102,14 @@ public function untrack_file(string $storage, $path): void */ public function is_tracked(string $storage, string $path): bool { - $sql_ary = array( + $sql_ary = [ 'file_path' => $path, 'storage' => $storage, - ); + ]; - $sql = 'SELECT file_id FROM ' . $this->storage_table . ' - WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); + $sql = 'SELECT file_id + FROM ' . $this->storage_table . ' + WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); $result = $this->db->sql_query($sql); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); @@ -128,13 +128,14 @@ public function is_tracked(string $storage, string $path): bool */ public function file_size(string $storage, string $path): int { - $sql_ary = array( + $sql_ary = [ 'file_path' => $path, 'storage' => $storage, - ); + ]; - $sql = 'SELECT filesize FROM ' . $this->storage_table . ' - WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); + $sql = 'SELECT filesize + FROM ' . $this->storage_table . ' + WHERE ' . $this->db->sql_build_array('SELECT', $sql_ary); $result = $this->db->sql_query($sql); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index ebe0dff62e0..3a006d27d77 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -25,6 +25,7 @@ class phpbb_console_command_thumbnail_test extends phpbb_database_test_case protected $cache; protected $user; protected $storage; + protected $temp; protected $phpEx; protected $phpbb_root_path; protected $application; @@ -75,8 +76,13 @@ protected function setUp(): void unlink($phpbb_root_path . 'files/' . $path); }); + $this->temp = $this->createMock('\phpbb\filesystem\temp'); + $this->temp->method('get_dir')->willReturnCallback(function () { + return sys_get_temp_dir(); + }); + $this->application = new Application(); - $this->application->add(new generate($this->user, $this->db, $this->cache, $this->language, $this->storage, $this->phpbb_root_path, $this->phpEx)); + $this->application->add(new generate($this->user, $this->db, $this->cache, $this->language, $this->storage, $this->temp, $this->phpbb_root_path, $this->phpEx)); $this->application->add(new delete($this->user, $this->db, $this->language, $this->storage)); $this->application->add(new recreate($this->user, $this->language)); From bac5ac45daa8ec17a734890b8cfd93be2af64312 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 14 Dec 2024 15:36:45 -0500 Subject: [PATCH 0546/1214] [ticket/17450] Remove obsolete requirement for JSON extension PHPBB-17450 --- phpBB/composer.json | 1 - phpBB/composer.lock | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 2d75027ff00..1d43e78ad90 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -27,7 +27,6 @@ }, "require": { "php": "^8.1", - "ext-json": "*", "ext-pdo": "*", "ext-zlib": "*", "bantu/ini-get-wrapper": "~1.0", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 8fe9b37b7ef..3dea51aad67 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "504e019821be33ba6ad322b37d698744", + "content-hash": "f6e182dafa1a6e6a60136e35d5379532", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -9952,7 +9952,6 @@ "prefer-lowest": false, "platform": { "php": "^8.1", - "ext-json": "*", "ext-pdo": "*", "ext-zlib": "*" }, From 44d4c99cba7bf5f8a931c190a25cafb71c19245d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 14 Dec 2024 15:38:10 -0500 Subject: [PATCH 0547/1214] [ticket/17450] Update composer.lock to latest versions PHPBB-17450 --- phpBB/composer.lock | 451 ++++++++++++++++++++++---------------------- 1 file changed, 225 insertions(+), 226 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 3dea51aad67..8e8d73f4d16 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -216,16 +216,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.3", + "version": "1.5.4", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2" + "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/3b1fc3f0be055baa7c6258b1467849c3e8204eb2", - "reference": "3b1fc3f0be055baa7c6258b1467849c3e8204eb2", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/bc0593537a463e55cadf45fd938d23b75095b7e1", + "reference": "bc0593537a463e55cadf45fd938d23b75095b7e1", "shasum": "" }, "require": { @@ -272,7 +272,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.3" + "source": "https://github.com/composer/ca-bundle/tree/1.5.4" }, "funding": [ { @@ -288,20 +288,20 @@ "type": "tidelift" } ], - "time": "2024-11-04T10:15:26+00:00" + "time": "2024-11-27T15:35:25+00:00" }, { "name": "composer/class-map-generator", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783" + "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/98bbf6780e56e0fd2404fe4b82eb665a0f93b783", - "reference": "98bbf6780e56e0fd2404fe4b82eb665a0f93b783", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915", + "reference": "4b0a223cf5be7c9ee7e0ef1bc7db42b4a97c9915", "shasum": "" }, "require": { @@ -310,10 +310,10 @@ "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" }, "require-dev": { - "phpstan/phpstan": "^1.6", - "phpstan/phpstan-deprecation-rules": "^1", - "phpstan/phpstan-phpunit": "^1", - "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-deprecation-rules": "^1 || ^2", + "phpstan/phpstan-phpunit": "^1 || ^2", + "phpstan/phpstan-strict-rules": "^1.1 || ^2", "phpunit/phpunit": "^8", "symfony/filesystem": "^5.4 || ^6" }, @@ -345,7 +345,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.4.0" + "source": "https://github.com/composer/class-map-generator/tree/1.5.0" }, "funding": [ { @@ -361,20 +361,20 @@ "type": "tidelift" } ], - "time": "2024-10-03T18:14:00+00:00" + "time": "2024-11-25T16:11:06+00:00" }, { "name": "composer/composer", - "version": "2.8.2", + "version": "2.8.4", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "6e543d03187c882ea1c6ba43add2467754427803" + "reference": "112e37d1dca22b3fdb81cf3524ab4994f47fdb8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/6e543d03187c882ea1c6ba43add2467754427803", - "reference": "6e543d03187c882ea1c6ba43add2467754427803", + "url": "https://api.github.com/repos/composer/composer/zipball/112e37d1dca22b3fdb81cf3524ab4994f47fdb8c", + "reference": "112e37d1dca22b3fdb81cf3524ab4994f47fdb8c", "shasum": "" }, "require": { @@ -388,7 +388,7 @@ "justinrainbow/json-schema": "^5.3", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", - "react/promise": "^3.2", + "react/promise": "^2.11 || ^3.2", "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", @@ -418,13 +418,13 @@ ], "type": "library", "extra": { - "branch-alias": { - "dev-main": "2.8-dev" - }, "phpstan": { "includes": [ "phpstan/rules.neon" ] + }, + "branch-alias": { + "dev-main": "2.8-dev" } }, "autoload": { @@ -459,7 +459,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.8.2" + "source": "https://github.com/composer/composer/tree/2.8.4" }, "funding": [ { @@ -475,7 +475,7 @@ "type": "tidelift" } ], - "time": "2024-10-29T15:12:11+00:00" + "time": "2024-12-11T10:57:47+00:00" }, { "name": "composer/installers", @@ -772,16 +772,16 @@ }, { "name": "composer/pcre", - "version": "3.3.1", + "version": "3.3.2", "source": { "type": "git", "url": "https://github.com/composer/pcre.git", - "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4" + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/pcre/zipball/63aaeac21d7e775ff9bc9d45021e1745c97521c4", - "reference": "63aaeac21d7e775ff9bc9d45021e1745c97521c4", + "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e", + "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e", "shasum": "" }, "require": { @@ -791,8 +791,8 @@ "phpstan/phpstan": "<1.11.10" }, "require-dev": { - "phpstan/phpstan": "^1.11.10", - "phpstan/phpstan-strict-rules": "^1.1", + "phpstan/phpstan": "^1.12 || ^2", + "phpstan/phpstan-strict-rules": "^1 || ^2", "phpunit/phpunit": "^8 || ^9" }, "type": "library", @@ -831,7 +831,7 @@ ], "support": { "issues": "https://github.com/composer/pcre/issues", - "source": "https://github.com/composer/pcre/tree/3.3.1" + "source": "https://github.com/composer/pcre/tree/3.3.2" }, "funding": [ { @@ -847,7 +847,7 @@ "type": "tidelift" } ], - "time": "2024-08-27T18:44:43+00:00" + "time": "2024-11-12T16:29:46+00:00" }, { "name": "composer/semver", @@ -1282,29 +1282,27 @@ }, { "name": "doctrine/deprecations", - "version": "1.1.3", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab" + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", - "reference": "dfbaa3c2d2e9a9df1118213f3b8b0c597bb99fab", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/31610dbb31faa98e6b5447b62340826f54fbc4e9", + "reference": "31610dbb31faa98e6b5447b62340826f54fbc4e9", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "require-dev": { - "doctrine/coding-standard": "^9", - "phpstan/phpstan": "1.4.10 || 1.10.15", - "phpstan/phpstan-phpunit": "^1.0", + "doctrine/coding-standard": "^9 || ^12", + "phpstan/phpstan": "1.4.10 || 2.0.3", + "phpstan/phpstan-phpunit": "^1.0 || ^2", "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psalm/plugin-phpunit": "0.18.4", - "psr/log": "^1 || ^2 || ^3", - "vimeo/psalm": "4.30.0 || 5.12.0" + "psr/log": "^1 || ^2 || ^3" }, "suggest": { "psr/log": "Allows logging deprecations via PSR-3 logger implementation" @@ -1312,7 +1310,7 @@ "type": "library", "autoload": { "psr-4": { - "Doctrine\\Deprecations\\": "lib/Doctrine/Deprecations" + "Doctrine\\Deprecations\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -1323,9 +1321,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.3" + "source": "https://github.com/doctrine/deprecations/tree/1.1.4" }, - "time": "2024-01-30T19:34:25+00:00" + "time": "2024-12-07T21:18:45+00:00" }, { "name": "doctrine/event-manager", @@ -1919,16 +1917,16 @@ }, { "name": "laminas/laminas-code", - "version": "4.15.1", + "version": "4.16.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "877ad42fe9c164785182fca8afa3f416a056884d" + "reference": "1793e78dad4108b594084d05d1fb818b85b110af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/877ad42fe9c164785182fca8afa3f416a056884d", - "reference": "877ad42fe9c164785182fca8afa3f416a056884d", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1793e78dad4108b594084d05d1fb818b85b110af", + "reference": "1793e78dad4108b594084d05d1fb818b85b110af", "shasum": "" }, "require": { @@ -1978,7 +1976,7 @@ "type": "community_bridge" } ], - "time": "2024-10-25T10:15:16+00:00" + "time": "2024-11-20T13:15:13+00:00" }, { "name": "marc1706/fast-image-size", @@ -3381,16 +3379,16 @@ }, { "name": "symfony/console", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b" + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/897c2441ed4eec8a8a2c37b943427d24dba3f26b", - "reference": "897c2441ed4eec8a8a2c37b943427d24dba3f26b", + "url": "https://api.github.com/repos/symfony/console/zipball/f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", + "reference": "f1fc6f47283e27336e7cebb9e8946c8de7bff9bd", "shasum": "" }, "require": { @@ -3455,7 +3453,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.14" + "source": "https://github.com/symfony/console/tree/v6.4.15" }, "funding": [ { @@ -3471,20 +3469,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.13", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96" + "reference": "7a379d8871f6a36f01559c14e11141cc02eb8dc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", - "reference": "728ae8f4e190133ce99d6d5f0bc1e8c8bd7c7a96", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/7a379d8871f6a36f01559c14e11141cc02eb8dc8", + "reference": "7a379d8871f6a36f01559c14e11141cc02eb8dc8", "shasum": "" }, "require": { @@ -3536,7 +3534,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.13" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.16" }, "funding": [ { @@ -3552,20 +3550,20 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-11-25T14:52:46+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1" + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", - "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", "shasum": "" }, "require": { @@ -3603,7 +3601,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" }, "funding": [ { @@ -3619,7 +3617,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/error-handler", @@ -3778,16 +3776,16 @@ }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50" + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50", - "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", + "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", "shasum": "" }, "require": { @@ -3834,7 +3832,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" }, "funding": [ { @@ -3850,7 +3848,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/filesystem", @@ -3984,23 +3982,23 @@ }, { "name": "symfony/http-client", - "version": "v6.4.14", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826" + "reference": "60a113666fa67e598abace38e5f46a0954d8833d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/05d88cbd816ad6e0202edd9a9963cb9d615b8826", - "reference": "05d88cbd816ad6e0202edd9a9963cb9d615b8826", + "url": "https://api.github.com/repos/symfony/http-client/zipball/60a113666fa67e598abace38e5f46a0954d8833d", + "reference": "60a113666fa67e598abace38e5f46a0954d8833d", "shasum": "" }, "require": { "php": ">=8.1", "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/http-client-contracts": "^3.4.1", + "symfony/http-client-contracts": "~3.4.3|^3.5.1", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -4057,7 +4055,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.14" + "source": "https://github.com/symfony/http-client/tree/v6.4.16" }, "funding": [ { @@ -4073,20 +4071,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T16:39:55+00:00" + "time": "2024-11-27T11:52:33+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.5.0", + "version": "v3.5.2", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "20414d96f391677bf80078aa55baece78b82647d" + "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/20414d96f391677bf80078aa55baece78b82647d", - "reference": "20414d96f391677bf80078aa55baece78b82647d", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645", + "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645", "shasum": "" }, "require": { @@ -4094,12 +4092,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -4135,7 +4133,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2" }, "funding": [ { @@ -4151,20 +4149,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-12-07T08:49:48+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.14", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "ba020a321a95519303a3f09ec2824d34d601c388" + "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/ba020a321a95519303a3f09ec2824d34d601c388", - "reference": "ba020a321a95519303a3f09ec2824d34d601c388", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/431771b7a6f662f1575b3cfc8fd7617aa9864d57", + "reference": "431771b7a6f662f1575b3cfc8fd7617aa9864d57", "shasum": "" }, "require": { @@ -4174,12 +4172,12 @@ "symfony/polyfill-php83": "^1.27" }, "conflict": { - "symfony/cache": "<6.3" + "symfony/cache": "<6.4.12|>=7.0,<7.1.5" }, "require-dev": { "doctrine/dbal": "^2.13.1|^3|^4", "predis/predis": "^1.1|^2.0", - "symfony/cache": "^6.3|^7.0", + "symfony/cache": "^6.4.12|^7.1.5", "symfony/dependency-injection": "^5.4|^6.0|^7.0", "symfony/expression-language": "^5.4|^6.0|^7.0", "symfony/http-kernel": "^5.4.12|^6.0.12|^6.1.4|^7.0", @@ -4212,7 +4210,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.14" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.16" }, "funding": [ { @@ -4228,20 +4226,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T16:39:55+00:00" + "time": "2024-11-13T18:58:10+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.14", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8278a947d0369754a47b758a9e17b72cab970951" + "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8278a947d0369754a47b758a9e17b72cab970951", - "reference": "8278a947d0369754a47b758a9e17b72cab970951", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", + "reference": "8838b5b21d807923b893ccbfc2cbeda0f1bc00f0", "shasum": "" }, "require": { @@ -4326,7 +4324,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.14" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.16" }, "funding": [ { @@ -4342,7 +4340,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:45:21+00:00" + "time": "2024-11-27T12:49:36+00:00" }, { "name": "symfony/mime", @@ -4455,8 +4453,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -4531,8 +4529,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -4610,8 +4608,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -4692,8 +4690,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -4776,8 +4774,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -4850,8 +4848,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -4926,8 +4924,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -5006,8 +5004,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -5082,8 +5080,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -5140,16 +5138,16 @@ }, { "name": "symfony/process", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "25214adbb0996d18112548de20c281be9f27279f" + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/25214adbb0996d18112548de20c281be9f27279f", - "reference": "25214adbb0996d18112548de20c281be9f27279f", + "url": "https://api.github.com/repos/symfony/process/zipball/3cb242f059c14ae08591c5c4087d1fe443564392", + "reference": "3cb242f059c14ae08591c5c4087d1fe443564392", "shasum": "" }, "require": { @@ -5181,7 +5179,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.14" + "source": "https://github.com/symfony/process/tree/v6.4.15" }, "funding": [ { @@ -5197,7 +5195,7 @@ "type": "tidelift" } ], - "time": "2024-11-06T09:25:01+00:00" + "time": "2024-11-06T14:19:14+00:00" }, { "name": "symfony/proxy-manager-bridge", @@ -5268,16 +5266,16 @@ }, { "name": "symfony/routing", - "version": "v6.4.13", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278" + "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/640a74250d13f9c30d5ca045b6aaaabcc8215278", - "reference": "640a74250d13f9c30d5ca045b6aaaabcc8215278", + "url": "https://api.github.com/repos/symfony/routing/zipball/91e02e606b4b705c2f4fb42f7e7708b7923a3220", + "reference": "91e02e606b4b705c2f4fb42f7e7708b7923a3220", "shasum": "" }, "require": { @@ -5331,7 +5329,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.13" + "source": "https://github.com/symfony/routing/tree/v6.4.16" }, "funding": [ { @@ -5347,20 +5345,20 @@ "type": "tidelift" } ], - "time": "2024-10-01T08:30:56+00:00" + "time": "2024-11-13T15:31:34+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f" + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", - "reference": "bd1d9e59a81d8fa4acdcea3f617c581f7475a80f", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", "shasum": "" }, "require": { @@ -5414,7 +5412,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" }, "funding": [ { @@ -5430,20 +5428,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/string", - "version": "v6.4.13", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627" + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", - "reference": "38371c60c71c72b3d64d8d76f6b1bb81a2cc3627", + "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", "shasum": "" }, "require": { @@ -5500,7 +5498,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.13" + "source": "https://github.com/symfony/string/tree/v6.4.15" }, "funding": [ { @@ -5516,20 +5514,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2024-11-13T13:31:12+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a" + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", - "reference": "b9d2189887bb6b2e0367a9fc7136c5239ab9b05a", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", + "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", "shasum": "" }, "require": { @@ -5578,7 +5576,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" }, "funding": [ { @@ -5594,20 +5592,20 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/twig-bridge", - "version": "v6.4.13", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "ec3511eef0576f378b2758da9e1c157086babd59" + "reference": "32ec012ed4f6426441a66014471bdb26674744be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/ec3511eef0576f378b2758da9e1c157086babd59", - "reference": "ec3511eef0576f378b2758da9e1c157086babd59", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/32ec012ed4f6426441a66014471bdb26674744be", + "reference": "32ec012ed4f6426441a66014471bdb26674744be", "shasum": "" }, "require": { @@ -5687,7 +5685,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.13" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.16" }, "funding": [ { @@ -5703,20 +5701,20 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-11-25T11:59:11+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.14", + "version": "v6.4.15", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "93c09246038178717a9c14b809ea8151ffcf7091" + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/93c09246038178717a9c14b809ea8151ffcf7091", - "reference": "93c09246038178717a9c14b809ea8151ffcf7091", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", + "reference": "38254d5a5ac2e61f2b52f9caf54e7aa3c9d36b80", "shasum": "" }, "require": { @@ -5772,7 +5770,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.14" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.15" }, "funding": [ { @@ -5788,7 +5786,7 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-08T15:28:48+00:00" }, { "name": "symfony/var-exporter", @@ -5941,16 +5939,16 @@ }, { "name": "twig/twig", - "version": "v3.14.2", + "version": "v3.17.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a" + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", - "reference": "0b6f9d8370bb3b7f1ce5313ed8feb0fafd6e399a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", + "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", "shasum": "" }, "require": { @@ -5961,6 +5959,7 @@ "symfony/polyfill-php81": "^1.29" }, "require-dev": { + "phpstan/phpstan": "^2.0", "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, @@ -6004,7 +6003,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.14.2" + "source": "https://github.com/twigphp/Twig/tree/v3.17.1" }, "funding": [ { @@ -6016,7 +6015,7 @@ "type": "tidelift" } ], - "time": "2024-11-07T12:36:22+00:00" + "time": "2024-12-12T09:58:10+00:00" }, { "name": "web-token/jwt-key-mgmt", @@ -7440,16 +7439,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.5.1", + "version": "5.6.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f" + "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/0c70d2c566e899666f367ab7b80986beb3581e6f", - "reference": "0c70d2c566e899666f367ab7b80986beb3581e6f", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", + "reference": "e5e784149a09bd69d9a5e3b01c5cbd2e2bd653d8", "shasum": "" }, "require": { @@ -7458,7 +7457,7 @@ "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7", + "phpstan/phpdoc-parser": "^1.7|^2.0", "webmozart/assert": "^1.9.1" }, "require-dev": { @@ -7498,9 +7497,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.5.1" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.1" }, - "time": "2024-11-06T11:58:54+00:00" + "time": "2024-12-07T09:39:29+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -7562,30 +7561,30 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.33.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", - "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/c00d78fb6b29658347f9d37ebe104bffadf36299", + "reference": "c00d78fb6b29658347f9d37ebe104bffadf36299", "shasum": "" }, "require": { - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "doctrine/annotations": "^2.0", - "nikic/php-parser": "^4.15", + "nikic/php-parser": "^5.3.0", "php-parallel-lint/php-parallel-lint": "^1.2", "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.5", - "phpstan/phpstan-phpunit": "^1.1", - "phpstan/phpstan-strict-rules": "^1.0", - "phpunit/phpunit": "^9.5", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", + "phpunit/phpunit": "^9.6", "symfony/process": "^5.2" }, "type": "library", @@ -7603,9 +7602,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.0.0" }, - "time": "2024-10-13T11:25:22+00:00" + "time": "2024-10-13T11:29:49+00:00" }, { "name": "phpunit/php-code-coverage", @@ -7928,16 +7927,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.6.21", + "version": "9.6.22", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa" + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", - "reference": "de6abf3b6f8dd955fac3caad3af7a9504e8c2ffa", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f80235cb4d3caa59ae09be3adf1ded27521d1a9c", + "reference": "f80235cb4d3caa59ae09be3adf1ded27521d1a9c", "shasum": "" }, "require": { @@ -7948,7 +7947,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.12.0", + "myclabs/deep-copy": "^1.12.1", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=7.3", @@ -8011,7 +8010,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.21" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.22" }, "funding": [ { @@ -8027,7 +8026,7 @@ "type": "tidelift" } ], - "time": "2024-09-19T10:50:18+00:00" + "time": "2024-12-05T13:48:26+00:00" }, { "name": "psalm/plugin-symfony", @@ -9127,16 +9126,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.10.3", + "version": "3.11.2", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c" + "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/62d32998e820bddc40f99f8251958aed187a5c9c", - "reference": "62d32998e820bddc40f99f8251958aed187a5c9c", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/1368f4a58c3c52114b86b1abe8f4098869cb0079", + "reference": "1368f4a58c3c52114b86b1abe8f4098869cb0079", "shasum": "" }, "require": { @@ -9203,7 +9202,7 @@ "type": "open_collective" } ], - "time": "2024-09-18T10:38:58+00:00" + "time": "2024-12-11T16:04:26+00:00" }, { "name": "symfony/browser-kit", @@ -9275,16 +9274,16 @@ }, { "name": "symfony/cache", - "version": "v6.4.14", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "36fb8aa88833708e9f29014b6f15fac051a8b613" + "reference": "70d60e9a3603108563010f8592dff15a6f15dfae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/36fb8aa88833708e9f29014b6f15fac051a8b613", - "reference": "36fb8aa88833708e9f29014b6f15fac051a8b613", + "url": "https://api.github.com/repos/symfony/cache/zipball/70d60e9a3603108563010f8592dff15a6f15dfae", + "reference": "70d60e9a3603108563010f8592dff15a6f15dfae", "shasum": "" }, "require": { @@ -9351,7 +9350,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.14" + "source": "https://github.com/symfony/cache/tree/v6.4.16" }, "funding": [ { @@ -9367,20 +9366,20 @@ "type": "tidelift" } ], - "time": "2024-11-05T15:34:40+00:00" + "time": "2024-11-20T10:10:54+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.5.0", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197" + "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/df6a1a44c890faded49a5fca33c2d5c5fd3c2197", - "reference": "df6a1a44c890faded49a5fca33c2d5c5fd3c2197", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b", + "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b", "shasum": "" }, "require": { @@ -9427,7 +9426,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.5.0" + "source": "https://github.com/symfony/cache-contracts/tree/v3.5.1" }, "funding": [ { @@ -9443,7 +9442,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T09:32:20+00:00" + "time": "2024-09-25T14:20:29+00:00" }, { "name": "symfony/css-selector", @@ -9512,16 +9511,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v6.4.13", + "version": "v6.4.16", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "ae074dffb018c37a57071990d16e6152728dd972" + "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/ae074dffb018c37a57071990d16e6152728dd972", - "reference": "ae074dffb018c37a57071990d16e6152728dd972", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/4304e6ad5c894a9c72831ad459f627bfd35d766d", + "reference": "4304e6ad5c894a9c72831ad459f627bfd35d766d", "shasum": "" }, "require": { @@ -9559,7 +9558,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.13" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.16" }, "funding": [ { @@ -9575,7 +9574,7 @@ "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2024-11-13T15:06:22+00:00" }, { "name": "symfony/framework-bundle", @@ -9851,11 +9850,11 @@ "type": "project", "extra": { "branch-alias": { - "dev-master": "5.x-dev", - "dev-4.x": "4.x-dev", - "dev-3.x": "3.x-dev", + "dev-1.x": "1.x-dev", "dev-2.x": "2.x-dev", - "dev-1.x": "1.x-dev" + "dev-3.x": "3.x-dev", + "dev-4.x": "4.x-dev", + "dev-master": "5.x-dev" } }, "autoload": { From 8af43d29448a4c7fdb697c7507d57d9484894353 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Dec 2024 22:56:17 +0100 Subject: [PATCH 0548/1214] [ticket/17450] Update twig to 3.18 to fix bc break PHPBB-17450 --- phpBB/composer.lock | 88 ++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 8e8d73f4d16..47607417ab3 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -797,13 +797,13 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "3.x-dev" - }, "phpstan": { "includes": [ "extension.neon" ] + }, + "branch-alias": { + "dev-main": "3.x-dev" } }, "autoload": { @@ -1450,8 +1450,8 @@ "type": "library", "extra": { "thanks": { - "name": "ocramius/proxy-manager", - "url": "https://github.com/Ocramius/ProxyManager" + "url": "https://github.com/Ocramius/ProxyManager", + "name": "ocramius/proxy-manager" } }, "autoload": { @@ -3571,12 +3571,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -3794,12 +3794,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -5371,12 +5371,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -5535,12 +5535,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { @@ -5939,16 +5939,16 @@ }, { "name": "twig/twig", - "version": "v3.17.1", + "version": "v3.18.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71" + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/677ef8da6497a03048192aeeb5aa3018e379ac71", - "reference": "677ef8da6497a03048192aeeb5aa3018e379ac71", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", + "reference": "acffa88cc2b40dbe42eaf3a5025d6c0d4600cc50", "shasum": "" }, "require": { @@ -6003,7 +6003,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.17.1" + "source": "https://github.com/twigphp/Twig/tree/v3.18.0" }, "funding": [ { @@ -6015,7 +6015,7 @@ "type": "tidelift" } ], - "time": "2024-12-12T09:58:10+00:00" + "time": "2024-12-29T10:51:50+00:00" }, { "name": "web-token/jwt-key-mgmt", @@ -8030,23 +8030,23 @@ }, { "name": "psalm/plugin-symfony", - "version": "v5.2.5", + "version": "v5.2.6", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-symfony.git", - "reference": "fb801a9b3d12ace9fb619febfaa3ae0bc1dbb196" + "reference": "1638f172b4ae5f283ee6b1b58fff3e44aa628742" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/fb801a9b3d12ace9fb619febfaa3ae0bc1dbb196", - "reference": "fb801a9b3d12ace9fb619febfaa3ae0bc1dbb196", + "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/1638f172b4ae5f283ee6b1b58fff3e44aa628742", + "reference": "1638f172b4ae5f283ee6b1b58fff3e44aa628742", "shasum": "" }, "require": { "ext-simplexml": "*", "php": "^8.1", "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0", - "vimeo/psalm": "^5.16" + "vimeo/psalm": "^5.16 || dev-master" }, "require-dev": { "doctrine/annotations": "^1.8|^2", @@ -8089,9 +8089,9 @@ "description": "Psalm Plugin for Symfony", "support": { "issues": "https://github.com/psalm/psalm-plugin-symfony/issues", - "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.5" + "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.6" }, - "time": "2024-07-03T11:57:02+00:00" + "time": "2024-12-21T08:46:26+00:00" }, { "name": "sebastian/cli-parser", @@ -9058,16 +9058,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876" + "reference": "7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/f56b220fe2db1ade4c88098d83413ebdfc3bf876", - "reference": "f56b220fe2db1ade4c88098d83413ebdfc3bf876", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67", + "reference": "7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67", "shasum": "" }, "require": { @@ -9110,7 +9110,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.3.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.4.0" }, "funding": [ { @@ -9122,7 +9122,7 @@ "type": "github" } ], - "time": "2024-05-01T10:20:27+00:00" + "time": "2024-12-16T12:45:15+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -9388,12 +9388,12 @@ }, "type": "library", "extra": { + "thanks": { + "url": "https://github.com/symfony/contracts", + "name": "symfony/contracts" + }, "branch-alias": { "dev-main": "3.5-dev" - }, - "thanks": { - "name": "symfony/contracts", - "url": "https://github.com/symfony/contracts" } }, "autoload": { From f99ee32d0304aa54730ef2199525eb6af390d4a7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 1 Jan 2025 21:09:08 +0100 Subject: [PATCH 0549/1214] [ticket/17450] Remove check for json extension as this is part of default PHP PHPBB-17450 --- phpBB/language/en/install.php | 2 -- .../task/check_server_environment.php | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 5b8b38f4ccc..50ec74f933d 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -110,8 +110,6 @@ 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.', 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', 'PCRE_UTF_SUPPORT_EXPLAIN' => 'phpBB will not run if your PHP installation is not compiled with UTF-8 support in the PCRE extension.', - 'PHP_JSON_SUPPORT' => 'PHP JSON support', - 'PHP_JSON_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the PHP JSON extension needs to be available.', 'PHP_MBSTRING_SUPPORT' => 'PHP mbstring support', 'PHP_MBSTRING_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the PHP mbstring extension needs to be available.', 'PHP_XML_SUPPORT' => 'PHP XML/DOM support', diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php index be48cf19678..bb43ed4b2f6 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php +++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php @@ -68,9 +68,6 @@ public function run() // Check for PCRE support $this->check_pcre(); - // Check for JSON support - $this->check_json(); - // Check for mbstring support $this->check_mbstring(); @@ -142,22 +139,6 @@ protected function check_pcre() $this->set_test_passed(false); } - /** - * Checks whether PHP's JSON extension is available or not - */ - protected function check_json() - { - if (@extension_loaded('json')) - { - $this->set_test_passed(true); - return; - } - - $this->response_helper->add_error_message('PHP_JSON_SUPPORT', 'PHP_JSON_SUPPORT_EXPLAIN'); - - $this->set_test_passed(false); - } - /** * Checks whether PHP's mbstring extension is available or not */ From 059e82de8f5e43f993f9336c982d2556efcab24d Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 2 Jan 2025 17:33:41 +0700 Subject: [PATCH 0550/1214] [ticket/17455] Remove outdated mysqli_connect_error function existence check PHPBB-17455 --- phpBB/phpbb/db/driver/mysqli.php | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php index 9e2e9a99265..0f4a6e86289 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -59,9 +59,12 @@ function sql_connect($sqlserver, $sqluser, $sqlpassword, $database, $port = fals } } - $this->db_connect_id = mysqli_init(); + if (!$this->db_connect_id = mysqli_init()) + { + $this->connect_error = 'Failed to initialize MySQLi object.'; - if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS)) + } + else if (!@mysqli_real_connect($this->db_connect_id, $this->server, $this->user, $sqlpassword, $this->dbname, $port, $socket, MYSQLI_CLIENT_FOUND_ROWS)) { $this->connect_error = 'Failed to establish a connection to the MySQL database engine. Please ensure MySQL server is running and the database configuration parameters are correct.'; } @@ -357,15 +360,8 @@ function _sql_error() if ($this->db_connect_id) { $error = [ - 'message' => $this->db_connect_id->error, - 'code' => $this->db_connect_id->errno, - ]; - } - else if (function_exists('mysqli_connect_error')) - { - $error = [ - 'message' => $this->db_connect_id->connect_error, - 'code' => $this->db_connect_id->connect_errno, + 'message' => $this->db_connect_id->connect_error ?: $this->db_connect_id->error, + 'code' => $this->db_connect_id->connect_errno ?: $this->db_connect_id->errno, ]; } else From df5ab5b5d842659ad681e86fd519dcc74b352d0f Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 5 May 2023 19:59:45 +0700 Subject: [PATCH 0551/1214] [ticket/17135] Introduce Symfony Mailer for emails backend PHPBB3-17135 --- phpBB/includes/functions_messenger.php | 1662 ++++++------------------ phpBB/phpbb/message/message.php | 8 +- tests/email/email_parsing_test.php | 13 +- tests/email/headers_encoding_test.php | 48 - 4 files changed, 433 insertions(+), 1298 deletions(-) delete mode 100644 tests/email/headers_encoding_test.php diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index c94a2a5c423..390463fe3a7 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -11,6 +11,12 @@ * */ +use Symfony\Component\Mailer\Transport; +use Symfony\Component\Mailer\Mailer; +use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Email; +use Symfony\Component\Mime\Header\Headers; + /** * @ignore */ @@ -24,85 +30,115 @@ */ class messenger { + private const PRIORITY_MAP = [ + Email::PRIORITY_HIGHEST => 'Highest', + Email::PRIORITY_HIGH => 'High', + Email::PRIORITY_NORMAL => 'Normal', + Email::PRIORITY_LOW => 'Low', + Email::PRIORITY_LOWEST => 'Lowest', + ]; + private const HEADER_CLASS_MAP = [ + 'date' => DateHeader::class, + 'from' => MailboxListHeader::class, + 'sender' => MailboxHeader::class, + 'reply-to' => MailboxListHeader::class, + 'to' => MailboxListHeader::class, + 'cc' => MailboxListHeader::class, + 'bcc' => MailboxListHeader::class, + 'message-id' => IdentificationHeader::class, + 'in-reply-to' => UnstructuredHeader::class, + 'references' => UnstructuredHeader::class, + 'return-path' => PathHeader::class, + ]; + var $msg, $replyto, $from, $subject; - var $addresses = array(); - var $extra_headers = array(); + var $addresses = []; + var $extra_headers = []; - var $mail_priority = MAIL_NORMAL_PRIORITY; + /** + * Possible values are: + * Email::PRIORITY_HIGHEST + * Email::PRIORITY_HIGH + * Email::PRIORITY_NORMAL + * Email::PRIORITY_LOW + * Email::PRIORITY_LOWEST + */ + var $mail_priority = Email::PRIORITY_NORMAL; var $use_queue = true; /** @var \phpbb\template\template */ protected $template; /** - * Constructor - */ + * Constructor + */ function __construct($use_queue = true) { - global $config; - - $this->use_queue = (!$config['email_package_size']) ? false : $use_queue; + global $phpbb_container, $phpbb_root_path, $phpEx; + + $this->phpbb_container = $phpbb_container; + $this->config = $this->phpbb_container->get('config'); + $this->dispatcher = $this->phpbb_container->get('dispatcher'); + $this->language = $this->phpbb_container->get('language'); + $this->log = $this->phpbb_container->get('log'); + $this->request = $this->phpbb_container->get('request'); + $this->user = $this->phpbb_container->get('user'); + $this->email = new Email(); + $this->headers = $this->email->getHeaders(); + $this->use_queue = (!$this->config['email_package_size']) ? false : $use_queue; $this->subject = ''; + $this->root_path = $phpbb_root_path; + $this->php_ext = $phpEx; } /** - * Resets all the data (address, template file, etc etc) to default - */ + * Resets all the data (address, template file, etc etc) to default + */ function reset() { - $this->addresses = $this->extra_headers = array(); + $this->addresses = $this->extra_headers = []; $this->msg = $this->replyto = $this->from = ''; - $this->mail_priority = MAIL_NORMAL_PRIORITY; + $this->mail_priority = Email::PRIORITY_NORMAL; } /** - * Set addresses for to/im as available - * - * @param array $user User row - */ + * Set addresses for to/im as available + * + * @param array $user User row + */ function set_addresses($user) { if (isset($user['user_email']) && $user['user_email']) { - $this->to($user['user_email'], (isset($user['username']) ? $user['username'] : '')); + $this->email->to(new Address($user['user_email'], $user['username'] ?: '')); } if (isset($user['user_jabber']) && $user['user_jabber']) { - $this->im($user['user_jabber'], (isset($user['username']) ? $user['username'] : '')); + $this->im($user['user_jabber'], $user['username'] ?: ''); } } /** - * Sets an email address to send to - */ + * Sets an email address to send to + */ function to($address, $realname = '') { - global $config; - if (!trim($address)) { return; } - $pos = isset($this->addresses['to']) ? count($this->addresses['to']) : 0; - - $this->addresses['to'][$pos]['email'] = trim($address); - // If empty sendmail_path on windows, PHP changes the to line - if (!$config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\') - { - $this->addresses['to'][$pos]['name'] = ''; - } - else - { - $this->addresses['to'][$pos]['name'] = trim($realname); - } + $windows_empty_sendmail_path = !$this->config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\'; + + $to = new Address(trim($address), $windows_empty_sendmail_path ? '' : trim($realname)); + $this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to); } /** - * Sets an cc address to send to - */ + * Sets an cc address to send to + */ function cc($address, $realname = '') { if (!trim($address)) @@ -110,14 +146,13 @@ function cc($address, $realname = '') return; } - $pos = isset($this->addresses['cc']) ? count($this->addresses['cc']) : 0; - $this->addresses['cc'][$pos]['email'] = trim($address); - $this->addresses['cc'][$pos]['name'] = trim($realname); + $cc = new Address(trim($address), trim($realname)); + $this->email->getCc() ? $this->email->addCc($to) : $this->email->cc($to); } /** - * Sets an bcc address to send to - */ + * Sets an bcc address to send to + */ function bcc($address, $realname = '') { if (!trim($address)) @@ -125,14 +160,13 @@ function bcc($address, $realname = '') return; } - $pos = isset($this->addresses['bcc']) ? count($this->addresses['bcc']) : 0; - $this->addresses['bcc'][$pos]['email'] = trim($address); - $this->addresses['bcc'][$pos]['name'] = trim($realname); + $bcc = new Address(trim($address), trim($realname)); + $this->email->getBcc() ? $this->email->addBcc($to) : $this->email->bcc($to); } /** - * Sets a im contact to send to - */ + * Sets a im contact to send to + */ function im($address, $realname = '') { // IM-Addresses could be empty @@ -147,67 +181,73 @@ function im($address, $realname = '') } /** - * Set the reply to address - */ + * Set the reply to address + */ function replyto($address) { - $this->replyto = trim($address); + $this->replyto = new Address(trim($address)); + $this->email->getReplyTo() ? $this->email->addReplyTo($this->replyto) : $this->email->replyTo($this->replyto); } /** - * Set the from address - */ + * Set the from address + */ function from($address) { - $this->from = trim($address); + $this->from = new Address(trim($address)); + $this->email->getFrom() ? $this->email->addFrom($this->from) : $this->email->from($this->from); } /** - * set up subject for mail - */ + * set up subject for mail + */ function subject($subject = '') { - $this->subject = trim($subject); + $this->email->subject(trim($subject)); } /** - * set up extra mail headers - */ - function headers($headers) + * set up extra mail headers + */ + function headers($header_name, $header_value) { - $this->extra_headers[] = trim($headers); + $this->headers->addTextHeader(trim($header_name), trim($header_value)); } /** - * Adds X-AntiAbuse headers - * - * @param \phpbb\config\config $config Config object - * @param \phpbb\user $user User object - * @return void - */ + * Adds X-AntiAbuse headers + * + * @param \phpbb\config\config $config Config object + * @param \phpbb\user $user User object + * @return void + */ function anti_abuse_headers($config, $user) { - $this->headers('X-AntiAbuse: Board servername - ' . mail_encode($config['server_name'])); - $this->headers('X-AntiAbuse: User_id - ' . $user->data['user_id']); - $this->headers('X-AntiAbuse: Username - ' . mail_encode($user->data['username'])); - $this->headers('X-AntiAbuse: User IP - ' . $user->ip); + $this->headers->addTextHeader('X-AntiAbuse', 'Board servername - ' . $config['server_name']); + $this->headers->addTextHeader('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); + $this->headers->addTextHeader('X-AntiAbuse', 'Username - ' . $user->data['username']); + $this->headers->addTextHeader('X-AntiAbuse', 'User IP - ' . $user->ip); } /** - * Set the email priority - */ - function set_mail_priority($priority = MAIL_NORMAL_PRIORITY) + * Set the email priority + * Possible values are: + * Email::PRIORITY_HIGHEST + * Email::PRIORITY_HIGH + * Email::PRIORITY_NORMAL + * Email::PRIORITY_LOW + * Email::PRIORITY_LOWEST + */ + function set_mail_priority($priority = Email::PRIORITY_NORMAL) { - $this->mail_priority = $priority; + $this->email->priority($priority); } /** - * Set email template to use - */ + * Set email template to use + */ function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '') { - global $config, $phpbb_root_path, $user; - $template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix; $this->setup_template(); @@ -222,7 +262,7 @@ function template($template_file, $template_lang = '', $template_path = '', $tem // fall back to board default language if the user's language is // missing $template_file. If this does not exist either, // $this->template->set_filenames will do a trigger_error - $template_lang = basename($config['default_lang']); + $template_lang = basename($this->config['default_lang']); } $ext_template_paths = array( @@ -240,20 +280,20 @@ function template($template_file, $template_lang = '', $template_path = '', $tem } else { - $template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; + $template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; $template_path .= $template_lang . '/email'; $template_paths = array( $template_path . $template_dir_prefix, ); - $board_language = basename($config['default_lang']); + $board_language = basename($this->config['default_lang']); // we can only specify default language fallback when the path is not a custom one for which we // do not know the default language alternative if ($template_lang !== $board_language) { - $fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; + $fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; $fallback_template_path .= $board_language . '/email'; $template_paths[] = $fallback_template_path . $template_dir_prefix; @@ -266,7 +306,7 @@ function template($template_file, $template_lang = '', $template_path = '', $tem // If everything fails just fall back to en template if ($template_lang !== 'en' && $board_language !== 'en') { - $fallback_template_path = (!empty($user->lang_path)) ? $user->lang_path : $phpbb_root_path . 'language/'; + $fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; $fallback_template_path .= 'en/email'; $template_paths[] = $fallback_template_path . $template_dir_prefix; @@ -288,8 +328,8 @@ function template($template_file, $template_lang = '', $template_path = '', $tem } /** - * assign variables to email template - */ + * assign variables to email template + */ function assign_vars($vars) { $this->setup_template(); @@ -305,61 +345,65 @@ function assign_block_vars($blockname, $vars) } /** - * Send the mail out to the recipients set previously in var $this->addresses - * - * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH - * @param bool $break Flag indicating if the function only formats the subject - * and the message without sending it - * - * @return bool - */ + * Send the mail out to the recipients set previously in var $this->addresses + * + * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH + * @param bool $break Flag indicating if the function only formats the subject + * and the message without sending it + * + * @return bool + */ function send($method = NOTIFY_EMAIL, $break = false) { - global $config, $user, $phpbb_dispatcher; - // We add some standard variables we always use, no need to specify them always - $this->assign_vars(array( + $this->assign_vars([ 'U_BOARD' => generate_board_url(), - 'EMAIL_SIG' => str_replace('
                            ', "\n", "-- \n" . html_entity_decode($config['board_email_sig'], ENT_COMPAT)), - 'SITENAME' => html_entity_decode($config['sitename'], ENT_COMPAT), - )); + 'EMAIL_SIG' => str_replace('
                            ', "\n", "-- \n" . html_entity_decode($this->config['board_email_sig'], ENT_COMPAT)), + 'SITENAME' => html_entity_decode($this->config['sitename'], ENT_COMPAT), + ]); - $subject = $this->subject; + $email = $this->email; + $subject = $this->email->getSubject(); $template = $this->template; /** - * Event to modify the template before parsing - * - * @event core.modify_notification_template - * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH - * @var bool break Flag indicating if the function only formats the subject - * and the message without sending it - * @var string subject The message subject - * @var \phpbb\template\template template The (readonly) template object - * @since 3.2.4-RC1 - */ - $vars = array('method', 'break', 'subject', 'template'); - extract($phpbb_dispatcher->trigger_event('core.modify_notification_template', compact($vars))); + * Event to modify the template before parsing + * + * @event core.modify_notification_template + * @var bool break Flag indicating if the function only formats the subject + * and the message without sending it + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH + * @var string subject The message subject + * @var \phpbb\template\template template The (readonly) template object + * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email. + */ + $vars = ['break', 'email', 'method', 'subject', 'template']; + extract($this->dispatcher->trigger_event('core.modify_notification_template', compact($vars))); // Parse message through template $message = trim($this->template->assign_display('body')); /** - * Event to modify notification message text after parsing - * - * @event core.modify_notification_message - * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH - * @var bool break Flag indicating if the function only formats the subject - * and the message without sending it - * @var string subject The message subject - * @var string message The message text - * @since 3.1.11-RC1 - */ - $vars = array('method', 'break', 'subject', 'message'); - extract($phpbb_dispatcher->trigger_event('core.modify_notification_message', compact($vars))); - + * Event to modify notification message text after parsing + * + * @event core.modify_notification_message + * @var bool break Flag indicating if the function only formats the subject + * and the message without sending it + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var string message The message text + * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH + * @var string subject The message subject + * @since 3.1.11-RC1 + * @changed 4.0.0-a1 Added vars: email. + */ + $vars = ['break', 'email', 'message', 'method', 'subject']; + extract($this->dispatcher->trigger_event('core.modify_notification_message', compact($vars))); + + $this->email = $email; $this->subject = $subject; $this->msg = $message; - unset($subject, $message, $template); + unset($email, $subject, $message, $template); // Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding $this->msg = str_replace("\r\n", "\n", $this->msg); @@ -370,17 +414,17 @@ function send($method = NOTIFY_EMAIL, $break = false) $match = array(); if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) { - $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']); + $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); } else { - $this->subject = (($this->subject != '') ? $this->subject : $user->lang['NO_EMAIL_SUBJECT']); + $this->subject = (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); } if (preg_match('#^(List-Unsubscribe:(.*?))$#m', $this->msg, $match)) { - $this->extra_headers[] = $match[1]; + $this->headers->addTextHeader('List-Unsubscribe', trim($match[2])); $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); } @@ -389,6 +433,9 @@ function send($method = NOTIFY_EMAIL, $break = false) $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); } + $this->email->subject($this->subject); + $this->email->text($this->msg); + if ($break) { return true; @@ -415,24 +462,22 @@ function send($method = NOTIFY_EMAIL, $break = false) } /** - * Add error message to log - */ + * Add error message to log + */ function error($type, $msg) { - global $user, $config, $request, $phpbb_log; - // Session doesn't exist, create it - if (!isset($user->session_id) || $user->session_id === '') + if (!isset($this->user->session_id) || $this->user->session_id === '') { - $user->session_begin(); + $this->user->session_begin(); } - $calling_page = html_entity_decode($request->server('REQUEST_URI'), ENT_COMPAT); + $calling_page = html_entity_decode($this->request->server('REQUEST_URI'), ENT_COMPAT); switch ($type) { case 'EMAIL': - $message = 'EMAIL/' . (($config['smtp_delivery']) ? 'SMTP' : 'PHP/mail()') . ''; + $message = 'EMAIL/' . (($this->config['smtp_delivery']) ? 'SMTP' : 'PHP/mail()') . ''; break; default: @@ -441,17 +486,15 @@ function error($type, $msg) } $message .= '
                            ' . htmlspecialchars($calling_page, ENT_COMPAT) . '

                            ' . $msg . '
                            '; - $phpbb_log->add('critical', $user->data['user_id'], $user->ip, 'LOG_ERROR_' . $type, false, array($message)); + $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]); } /** - * Save to queue - */ + * Save to queue + */ function save_queue() { - global $config; - - if ($config['email_package_size'] && $this->use_queue && !empty($this->queue)) + if ($this->config['email_package_size'] && $this->use_queue && !empty($this->queue)) { $this->queue->save(); return; @@ -459,128 +502,176 @@ function save_queue() } /** - * Generates a valid message id to be used in emails - * - * @return string message id - */ - function generate_message_id() + * Detect proper method to add header + * + * @return string + */ + public function get_header_method(string $name) { - global $config, $request; - - $domain = ($config['server_name']) ?: $request->server('SERVER_NAME', 'phpbb.generated'); + $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class); + $method = 'add'.ucfirst(array_pop($parts)); + if ('addUnstructuredHeader' === $method) + { + $method = 'addTextHeader'; + } + else if ('addIdentificationHeader' === $method) + { + $method = 'addIdHeader'; + } - return md5(unique_id()) . '@' . $domain; + return $method; } /** - * Return email header - */ - function build_header($to, $cc, $bcc) + * Set email headers + */ + function build_header() { - global $config, $phpbb_dispatcher; - - // We could use keys here, but we won't do this for 3.0.x to retain backwards compatibility - $headers = array(); - - $headers[] = 'From: ' . $this->from; + $headers = []; - if ($cc) + $board_contact = $this->config['board_contact']; + if (empty($this->email->getReplyTo())) { - $headers[] = 'Cc: ' . $cc; + $this->replyto = $board_contact; + $headers['Reply-To'] = $this->replyto; } - if ($bcc) + if (empty($this->email->getFrom())) { - $headers[] = 'Bcc: ' . $bcc; + $this->from = $board_contact; + $headers['From'] = $this->from; } - $headers[] = 'Reply-To: ' . $this->replyto; - $headers[] = 'Return-Path: <' . $config['board_email'] . '>'; - $headers[] = 'Sender: <' . $config['board_email'] . '>'; - $headers[] = 'MIME-Version: 1.0'; - $headers[] = 'Message-ID: <' . $this->generate_message_id() . '>'; - $headers[] = 'Date: ' . date('r', time()); - $headers[] = 'Content-Type: text/plain; charset=UTF-8'; // format=flowed - $headers[] = 'Content-Transfer-Encoding: 8bit'; // 7bit - - $headers[] = 'X-Priority: ' . $this->mail_priority; - $headers[] = 'X-MSMail-Priority: ' . (($this->mail_priority == MAIL_LOW_PRIORITY) ? 'Low' : (($this->mail_priority == MAIL_NORMAL_PRIORITY) ? 'Normal' : 'High')); - $headers[] = 'X-Mailer: phpBB3'; - $headers[] = 'X-MimeOLE: phpBB3'; - $headers[] = 'X-phpBB-Origin: phpbb://' . str_replace(array('http://', 'https://'), array('', ''), generate_board_url()); + $headers['Return-Path'] = new Address($this->config['board_email']); + $headers['Sender'] = new Address($this->config['board_email']); + $headers['X-Priority'] = sprintf('%d (%s)', $this->mail_priority, self::PRIORITY_MAP[$this->mail_priority]); + $headers['X-MSMail-Priority'] = self::PRIORITY_MAP[$this->mail_priority]; + $headers['X-Mailer'] = 'phpBB3'; + $headers['X-MimeOLE'] = 'phpBB3'; + $headers['X-phpBB-Origin'] = 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()); /** - * Event to modify email header entries - * - * @event core.modify_email_headers - * @var array headers Array containing email header entries - * @since 3.1.11-RC1 - */ + * Event to modify email header entries + * + * @event core.modify_email_headers + * @var array headers Array containing email header entries + * @since 3.1.11-RC1 + */ $vars = array('headers'); - extract($phpbb_dispatcher->trigger_event('core.modify_email_headers', compact($vars))); + extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars))); - if (count($this->extra_headers)) + foreach ($headers as $header => $value) { - $headers = array_merge($headers, $this->extra_headers); + // addMailboxListHeader() requires value to be array + if ($this->get_header_method($header) == 'addMailboxListHeader') + { + $value = [$value]; + } + $this->headers->addHeader($header, $value); } - return $headers; + return true; } /** - * Send out emails - */ - function msg_email() + * Generates a valid transport to send email + * + * @param bool $dummy Flag to disable mail delivery + * @return Symfony\Component\Mailer\Transport Symfony Transport object + */ + function get_transport($dummy = false) { - global $config, $phpbb_dispatcher; + if ($dummy) + { + $dsn = 'null://null'; + } + else if ($this->config['smtp_delivery']) + { + $user = urlencode($this->config['smtp_username']); + $password = urlencode($this->config['smtp_password']); + $smtp_host = urlencode($this->config['smtp_host']); + $smtp_port = $this->config['smtp_port']; + $dsn = "smtp://$user:$password@$smtp_host:$smtp_port"; + } + else + { + $dsn = 'sendmail://default'; + } + + $transport = Transport::fromDsn($dsn); + + if ($this->config['smtp_delivery']) + { + // Set ssl context options, see http://php.net/manual/en/context.ssl.php + $verify_peer = (bool) $this->config['smtp_verify_peer']; + $verify_peer_name = (bool) $this->config['smtp_verify_peer_name']; + $allow_self_signed = (bool) $this->config['smtp_allow_self_signed']; + $options = [ + 'ssl' => [ + 'verify_peer' => $verify_peer, + 'verify_peer_name' => $verify_peer_name, + 'allow_self_signed' => $allow_self_signed, + ] + ]; + $transport->getStream()->setStreamOptions($options); + } - if (empty($config['email_enable'])) + return $transport; + } + + /** + * Send out emails + */ + function msg_email() + { + if (empty($this->config['email_enable'])) { return false; } // Addresses to send to? - if (empty($this->addresses) || (empty($this->addresses['to']) && empty($this->addresses['cc']) && empty($this->addresses['bcc']))) + if (empty($this->email->getTo())) { // Send was successful. ;) return true; } $use_queue = false; - if ($config['email_package_size'] && $this->use_queue) + if ($this->config['email_package_size'] && $this->use_queue) { if (empty($this->queue)) { $this->queue = new queue(); - $this->queue->init('email', $config['email_package_size']); + $this->queue->init('email', $this->config['email_package_size']); } $use_queue = true; } - $contact_name = html_entity_decode($config['board_contact_name'], ENT_COMPAT); - $board_contact = (($contact_name !== '') ? '"' . mail_encode($contact_name) . '" ' : '') . '<' . $config['board_contact'] . '>'; + $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); + $board_contact = $this->config['board_contact']; $break = false; - $addresses = $this->addresses; $subject = $this->subject; $msg = $this->msg; + $email = $this->email; /** - * Event to send message via external transport - * - * @event core.notification_message_email - * @var bool break Flag indicating if the function return after hook - * @var array addresses The message recipients - * @var string subject The message subject - * @var string msg The message text - * @since 3.2.4-RC1 - */ + * Event to send message via external transport + * + * @event core.notification_message_email + * @var bool break Flag indicating if the function return after hook + * @var string subject The message subject + * @var string msg The message text + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses + */ $vars = array( 'break', - 'addresses', 'subject', 'msg', + 'email', ); - extract($phpbb_dispatcher->trigger_event('core.notification_message_email', compact($vars))); + extract($this->dispatcher->trigger_event('core.notification_message_email', compact($vars))); $this->addresses = $addresses; $this->subject = $subject; @@ -592,66 +683,87 @@ function msg_email() return true; } - if (empty($this->replyto)) - { - $this->replyto = $board_contact; - } - - if (empty($this->from)) + if (empty($this->email->getReplyto())) { - $this->from = $board_contact; + $this->email->replyTo(new Address($board_contact)); } - $encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL; - - // Build to, cc and bcc strings - $to = $cc = $bcc = ''; - foreach ($this->addresses as $type => $address_ary) + if (empty($this->email->getFrom())) { - if ($type == 'im') - { - continue; - } - - foreach ($address_ary as $which_ary) - { - ${$type} .= ((${$type} != '') ? ', ' : '') . (($which_ary['name'] != '') ? mail_encode($which_ary['name'], $encode_eol) . ' <' . $which_ary['email'] . '>' : $which_ary['email']); - } + $this->email->from(new Address($board_contact)); } // Build header - $headers = $this->build_header($to, $cc, $bcc); + $this->build_header(); // Send message ... if (!$use_queue) { - $mail_to = ($to == '') ? 'undisclosed-recipients:;' : $to; - $err_msg = ''; + $transport = $this->get_transport(); + $mailer = new Mailer($transport); + + $subject = $this->subject; + $msg = $this->msg; + $headers = $this->headers; + $email = $this->email; + /** + * Modify data before sending out emails with PHP's mail function + * + * @event core.phpbb_mail_before + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var string headers The email headers + * @since 3.3.6-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters. + */ + $vars = [ + 'email', + 'subject', + 'msg', + 'headers', + ]; + extract($this->dispatcher->trigger_event('core.phpbb_mail_before', compact($vars))); + + $this->subject = $subject; + $this->msg = $msg; + $this->headers = $headers; + $this->email = $email; - if ($config['smtp_delivery']) - { - $result = smtpmail($this->addresses, mail_encode($this->subject), wordwrap(utf8_wordwrap($this->msg), 997, "\n", true), $err_msg, $headers); - } - else + try { - $result = phpbb_mail($mail_to, $this->subject, $this->msg, $headers, $encode_eol, $err_msg); + $mailer->send($this->email); } - - if (!$result) + catch (TransportExceptionInterface $e) { - $this->error('EMAIL', $err_msg); + $this->error('EMAIL', $e->getDebug()); return false; } + + /** + * Execute code after sending out emails with PHP's mail function + * + * @event core.phpbb_mail_after + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var string headers The email headers + * @since 3.3.6-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters, $result. + */ + $vars = [ + 'email', + 'subject', + 'msg', + 'headers', + ]; + extract($this->dispatcher->trigger_event('core.phpbb_mail_after', compact($vars))); } else { - $this->queue->put('email', array( - 'to' => $to, - 'addresses' => $this->addresses, - 'subject' => $this->subject, - 'msg' => $this->msg, - 'headers' => $headers) - ); + $this->queue->put('email', [ + 'email' => $this->email, + ]); } return true; @@ -662,9 +774,7 @@ function msg_email() */ function msg_jabber() { - global $config, $user, $phpbb_root_path, $phpEx; - - if (empty($config['jab_enable']) || empty($config['jab_host']) || empty($config['jab_username']) || empty($config['jab_password'])) + if (empty($this->config['jab_enable']) || empty($this->config['jab_host']) || empty($this->config['jab_username']) || empty($this->config['jab_password'])) { return false; } @@ -676,12 +786,12 @@ function msg_jabber() } $use_queue = false; - if ($config['jab_package_size'] && $this->use_queue) + if ($this->config['jab_package_size'] && $this->use_queue) { if (empty($this->queue)) { $this->queue = new queue(); - $this->queue->init('jabber', $config['jab_package_size']); + $this->queue->init('jabber', $this->config['jab_package_size']); } $use_queue = true; } @@ -695,18 +805,18 @@ function msg_jabber() if (!$use_queue) { - include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], html_entity_decode($config['jab_password'], ENT_COMPAT), $config['jab_use_ssl'], $config['jab_verify_peer'], $config['jab_verify_peer_name'], $config['jab_allow_self_signed']); + include_once($this->root_path . 'includes/functions_jabber.' . $this->php_ext); + $this->jabber = new jabber($this->config['jab_host'], $this->config['jab_port'], $this->config['jab_username'], html_entity_decode($this->config['jab_password'], ENT_COMPAT), $this->config['jab_use_ssl'], $this->config['jab_verify_peer'], $this->config['jab_verify_peer_name'], $this->config['jab_allow_self_signed']); if (!$this->jabber->connect()) { - $this->error('JABBER', $user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->jabber->get_log()); + $this->error('JABBER', $this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->jabber->get_log()); return false; } if (!$this->jabber->login()) { - $this->error('JABBER', $user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->jabber->get_log()); + $this->error('JABBER', $this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->jabber->get_log()); return false; } @@ -734,8 +844,6 @@ function msg_jabber() */ protected function setup_template() { - global $phpbb_container, $phpbb_dispatcher; - if ($this->template instanceof \phpbb\template\template) { return; @@ -749,20 +857,20 @@ protected function setup_template() $phpbb_container->getParameter('core.template.cache_path'), $phpbb_container->get('ext.manager'), new \phpbb\template\twig\loader(), - $phpbb_dispatcher, - array() + $this->dispatcher, + [] ); - $template_environment->setLexer($phpbb_container->get('template.twig.lexer')); + $template_environment->setLexer($this->phpbb_container->get('template.twig.lexer')); $this->template = new \phpbb\template\twig\twig( - $phpbb_container->get('path_helper'), - $phpbb_container->get('config'), + $this->phpbb_container->get('path_helper'), + $this->config, new \phpbb\template\context(), $template_environment, - $phpbb_container->getParameter('core.template.cache_path'), - $phpbb_container->get('user'), - $phpbb_container->get('template.twig.extensions.collection'), - $phpbb_container->get('ext.manager') + $this->phpbb_container->getParameter('core.template.cache_path'), + $this->user, + $this->phpbb_container->get('template.twig.extensions.collection'), + $this->phpbb_container->get('ext.manager') ); } @@ -782,8 +890,8 @@ protected function set_template_paths($path_name, $paths) */ class queue { - var $data = array(); - var $queue_data = array(); + var $data = []; + var $queue_data = []; var $package_size = 0; var $cache_file = ''; var $eol = "\n"; @@ -798,11 +906,15 @@ class queue */ function __construct() { - global $phpEx, $phpbb_root_path, $phpbb_filesystem, $phpbb_container; - - $this->data = array(); - $this->cache_file = $phpbb_container->getParameter('core.cache_dir') . "queue.$phpEx"; - $this->filesystem = $phpbb_filesystem; + global $phpbb_container; + + $this->phpbb_container = $phpbb_container; + $this->php_ext = $this->phpbb_container->getParameter('core.php_ext'); + $this->root_path = $this->phpbb_container->getParameter('core.root_path'); + $this->cache_file = $this->phpbb_container->getParameter('core.cache_dir') . "queue.{$this->php_ext}"; + $this->filesystem = $this->phpbb_container->get('filesystem'); + $this->config = $this->phpbb_container->get('config'); + $this->dispatcher = $this->phpbb_container->get('dispatcher'); } /** @@ -829,25 +941,23 @@ function put($object, $scope) */ function process() { - global $config, $phpEx, $phpbb_root_path, $user, $phpbb_dispatcher; - $lock = new \phpbb\lock\flock($this->cache_file); $lock->acquire(); // avoid races, check file existence once $have_cache_file = file_exists($this->cache_file); - if (!$have_cache_file || $config['last_queue_run'] > time() - $config['queue_interval']) + if (!$have_cache_file || $this->config['last_queue_run'] > time() - $this->config['queue_interval']) { if (!$have_cache_file) { - $config->set('last_queue_run', time(), false); + $this->config->set('last_queue_run', time(), false); } $lock->release(); return; } - $config->set('last_queue_run', time(), false); + $this->config->set('last_queue_run', time(), false); include($this->cache_file); @@ -880,7 +990,7 @@ function process() { case 'email': // Delete the email queued objects if mailing is disabled - if (!$config['email_enable']) + if (!$this->config['email_enable']) { unset($this->queue_data['email']); continue 2; @@ -888,26 +998,26 @@ function process() break; case 'jabber': - if (!$config['jab_enable']) + if (!$this->config['jab_enable']) { unset($this->queue_data['jabber']); continue 2; } - include_once($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - $this->jabber = new jabber($config['jab_host'], $config['jab_port'], $config['jab_username'], html_entity_decode($config['jab_password'], ENT_COMPAT), $config['jab_use_ssl'], $config['jab_verify_peer'], $config['jab_verify_peer_name'], $config['jab_allow_self_signed']); + include_once($this->root_path . 'includes/functions_jabber.' . $this->php_ext); + $this->jabber = new jabber($this->config['jab_host'], $this->config['jab_port'], $this->config['jab_username'], html_entity_decode($this->config['jab_password'], ENT_COMPAT), $this->config['jab_use_ssl'], $this->config['jab_verify_peer'], $this->config['jab_verify_peer_name'], $this->config['jab_allow_self_signed']); if (!$this->jabber->connect()) { $messenger = new messenger(); - $messenger->error('JABBER', $user->lang['ERR_JAB_CONNECT']); + $messenger->error('JABBER', $this->user->lang['ERR_JAB_CONNECT']); continue 2; } if (!$this->jabber->login()) { $messenger = new messenger(); - $messenger->error('JABBER', $user->lang['ERR_JAB_AUTH']); + $messenger->error('JABBER', $this->user->lang['ERR_JAB_AUTH']); continue 2; } @@ -928,42 +1038,33 @@ function process() case 'email': $break = false; /** - * Event to send message via external transport - * - * @event core.notification_message_process - * @var bool break Flag indicating if the function return after hook - * @var array addresses The message recipients - * @var string subject The message subject - * @var string msg The message text - * @since 3.2.4-RC1 - */ - $vars = array( + * Event to send message via external transport + * + * @event core.notification_message_process + * @var bool break Flag indicating if the function return after hook + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, subject, msg. + */ + $vars = [ 'break', - 'addresses', - 'subject', - 'msg', - ); - extract($phpbb_dispatcher->trigger_event('core.notification_message_process', compact($vars))); + 'email', + ]; + extract($this->dispatcher->trigger_event('core.notification_message_process', compact($vars))); if (!$break) { - $err_msg = ''; - $to = (!$to) ? 'undisclosed-recipients:;' : $to; + $messenger = new messenger(); + $transport = $messenger->get_transport(); + $mailer = new Mailer($transport); - if ($config['smtp_delivery']) - { - $result = smtpmail($addresses, mail_encode($subject), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $err_msg, $headers); - } - else + try { - $encode_eol = $config['smtp_delivery'] || PHP_VERSION_ID >= 80000 ? "\r\n" : PHP_EOL; - $result = phpbb_mail($to, $subject, $msg, $headers, $encode_eol, $err_msg); + $mailer->send($email); } - - if (!$result) + catch (TransportExceptionInterface $e) { - $messenger = new messenger(); - $messenger->error('EMAIL', $err_msg); + $messenger->error('EMAIL', $e->getDebug()); continue 2; } } @@ -1085,932 +1186,3 @@ function save() $lock->release(); } } - -/** -* Replacement or substitute for PHP's mail command -*/ -function smtpmail($addresses, $subject, $message, &$err_msg, $headers = false) -{ - global $config, $user; - - // Fix any bare linefeeds in the message to make it RFC821 Compliant. - $message = preg_replace("#(?lang['NO_EMAIL_SUBJECT'])) ? $user->lang['NO_EMAIL_SUBJECT'] : 'No email subject specified'; - return false; - } - - if (trim($message) == '') - { - $err_msg = (isset($user->lang['NO_EMAIL_MESSAGE'])) ? $user->lang['NO_EMAIL_MESSAGE'] : 'Email message was blank'; - return false; - } - - $mail_rcpt = $mail_to = $mail_cc = array(); - - // Build correct addresses for RCPT TO command and the client side display (TO, CC) - if (isset($addresses['to']) && count($addresses['to'])) - { - foreach ($addresses['to'] as $which_ary) - { - $mail_to[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>'; - $mail_rcpt['to'][] = '<' . trim($which_ary['email']) . '>'; - } - } - - if (isset($addresses['bcc']) && count($addresses['bcc'])) - { - foreach ($addresses['bcc'] as $which_ary) - { - $mail_rcpt['bcc'][] = '<' . trim($which_ary['email']) . '>'; - } - } - - if (isset($addresses['cc']) && count($addresses['cc'])) - { - foreach ($addresses['cc'] as $which_ary) - { - $mail_cc[] = ($which_ary['name'] != '') ? mail_encode(trim($which_ary['name'])) . ' <' . trim($which_ary['email']) . '>' : '<' . trim($which_ary['email']) . '>'; - $mail_rcpt['cc'][] = '<' . trim($which_ary['email']) . '>'; - } - } - - $smtp = new smtp_class(); - - $errno = 0; - $errstr = ''; - - $smtp->add_backtrace('Connecting to ' . $config['smtp_host'] . ':' . $config['smtp_port']); - - // Ok we have error checked as much as we can to this point let's get on it already. - if (!class_exists('\phpbb\error_collector')) - { - global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/error_collector.' . $phpEx); - } - $collector = new \phpbb\error_collector; - $collector->install(); - - $options = array(); - $verify_peer = (bool) $config['smtp_verify_peer']; - $verify_peer_name = (bool) $config['smtp_verify_peer_name']; - $allow_self_signed = (bool) $config['smtp_allow_self_signed']; - $remote_socket = $config['smtp_host'] . ':' . $config['smtp_port']; - - // Set ssl context options, see http://php.net/manual/en/context.ssl.php - $options['ssl'] = array('verify_peer' => $verify_peer, 'verify_peer_name' => $verify_peer_name, 'allow_self_signed' => $allow_self_signed); - $socket_context = stream_context_create($options); - - $smtp->socket = @stream_socket_client($remote_socket, $errno, $errstr, 20, STREAM_CLIENT_CONNECT, $socket_context); - $collector->uninstall(); - $error_contents = $collector->format_errors(); - - if (!$smtp->socket) - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - } - - $err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; - $err_msg .= ($error_contents) ? '

                            ' . htmlspecialchars($error_contents, ENT_COMPAT) : ''; - return false; - } - - // Wait for reply - if ($err_msg = $smtp->server_parse('220', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Let me in. This function handles the complete authentication process - if ($err_msg = $smtp->log_into_server($config['smtp_host'], $config['smtp_username'], html_entity_decode($config['smtp_password'], ENT_COMPAT), $config['smtp_auth_method'])) - { - $smtp->close_session($err_msg); - return false; - } - - // From this point onward most server response codes should be 250 - // Specify who the mail is from.... - $smtp->server_send('MAIL FROM:<' . $config['board_email'] . '>'); - if ($err_msg = $smtp->server_parse('250', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Specify each user to send to and build to header. - $to_header = implode(', ', $mail_to); - $cc_header = implode(', ', $mail_cc); - - // Now tell the MTA to send the Message to the following people... [TO, BCC, CC] - $rcpt = false; - foreach ($mail_rcpt as $type => $mail_to_addresses) - { - foreach ($mail_to_addresses as $mail_to_address) - { - // Add an additional bit of error checking to the To field. - if (preg_match('#[^ ]+\@[^ ]+#', $mail_to_address)) - { - $smtp->server_send("RCPT TO:$mail_to_address"); - if ($err_msg = $smtp->server_parse('250', __LINE__)) - { - // We continue... if users are not resolved we do not care - if ($smtp->numeric_response_code != 550) - { - $smtp->close_session($err_msg); - return false; - } - } - else - { - $rcpt = true; - } - } - } - } - - // We try to send messages even if a few people do not seem to have valid email addresses, but if no one has, we have to exit here. - if (!$rcpt) - { - $user->session_begin(); - $err_msg .= '

                            '; - $err_msg .= (isset($user->lang['INVALID_EMAIL_LOG'])) ? sprintf($user->lang['INVALID_EMAIL_LOG'], htmlspecialchars($mail_to_address, ENT_COMPAT)) : '' . htmlspecialchars($mail_to_address, ENT_COMPAT) . ' possibly an invalid email address?'; - $smtp->close_session($err_msg); - return false; - } - - // Ok now we tell the server we are ready to start sending data - $smtp->server_send('DATA'); - - // This is the last response code we look for until the end of the message. - if ($err_msg = $smtp->server_parse('354', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Send the Subject Line... - $smtp->server_send("Subject: $subject"); - - // Now the To Header. - $to_header = ($to_header == '') ? 'undisclosed-recipients:;' : $to_header; - $smtp->server_send("To: $to_header"); - - // Now the CC Header. - if ($cc_header != '') - { - $smtp->server_send("CC: $cc_header"); - } - - // Now any custom headers.... - if ($headers !== false) - { - $smtp->server_send("$headers\r\n"); - } - - // Ok now we are ready for the message... - $smtp->server_send($message); - - // Ok the all the ingredients are mixed in let's cook this puppy... - $smtp->server_send('.'); - if ($err_msg = $smtp->server_parse('250', __LINE__)) - { - $smtp->close_session($err_msg); - return false; - } - - // Now tell the server we are done and close the socket... - $smtp->server_send('QUIT'); - $smtp->close_session($err_msg); - - return true; -} - -/** -* SMTP Class -* Auth Mechanisms originally taken from the AUTH Modules found within the PHP Extension and Application Repository (PEAR) -* See docs/AUTHORS for more details -*/ -class smtp_class -{ - var $server_response = ''; - var $socket = 0; - protected $socket_tls = false; - var $responses = array(); - var $commands = array(); - var $numeric_response_code = 0; - - var $backtrace = false; - var $backtrace_log = array(); - - function __construct() - { - // Always create a backtrace for admins to identify SMTP problems - $this->backtrace = true; - $this->backtrace_log = array(); - } - - /** - * Add backtrace message for debugging - */ - function add_backtrace($message) - { - if ($this->backtrace) - { - $this->backtrace_log[] = utf8_htmlspecialchars($message, ENT_COMPAT); - } - } - - /** - * Send command to smtp server - */ - function server_send($command, $private_info = false) - { - fputs($this->socket, $command . "\r\n"); - - (!$private_info) ? $this->add_backtrace("# $command") : $this->add_backtrace('# Omitting sensitive information'); - - // We could put additional code here - } - - /** - * We use the line to give the support people an indication at which command the error occurred - */ - function server_parse($response, $line) - { - global $user; - - $this->server_response = ''; - $this->responses = array(); - $this->numeric_response_code = 0; - - while (substr($this->server_response, 3, 1) != ' ') - { - if (!($this->server_response = fgets($this->socket, 256))) - { - return (isset($user->lang['NO_EMAIL_RESPONSE_CODE'])) ? $user->lang['NO_EMAIL_RESPONSE_CODE'] : 'Could not get mail server response codes'; - } - $this->responses[] = substr(rtrim($this->server_response), 4); - $this->numeric_response_code = (int) substr($this->server_response, 0, 3); - - $this->add_backtrace("LINE: $line <- {$this->server_response}"); - } - - if (!(substr($this->server_response, 0, 3) == $response)) - { - $this->numeric_response_code = (int) substr($this->server_response, 0, 3); - return (isset($user->lang['EMAIL_SMTP_ERROR_RESPONSE'])) ? sprintf($user->lang['EMAIL_SMTP_ERROR_RESPONSE'], $line, $this->server_response) : "Ran into problems sending Mail at Line $line. Response: $this->server_response"; - } - - return 0; - } - - /** - * Close session - */ - function close_session(&$err_msg) - { - fclose($this->socket); - - if ($this->backtrace) - { - $message = '

                            Backtrace

                            ' . implode('
                            ', $this->backtrace_log) . '

                            '; - $err_msg .= $message; - } - } - - /** - * Log into server and get possible auth codes if neccessary - */ - function log_into_server($hostname, $username, $password, $default_auth_method) - { - global $user; - - // Here we try to determine the *real* hostname (reverse DNS entry preferrably) - if (function_exists('php_uname') && !empty($local_host = php_uname('n'))) - { - // Able to resolve name to IP - if (($addr = @gethostbyname($local_host)) !== $local_host) - { - // Able to resolve IP back to name - if (!empty($name = @gethostbyaddr($addr)) && $name !== $addr) - { - $local_host = $name; - } - } - } - else - { - $local_host = $user->host; - } - - // If we are authenticating through pop-before-smtp, we - // have to login ones before we get authenticated - // NOTE: on some configurations the time between an update of the auth database takes so - // long that the first email send does not work. This is not a biggie on a live board (only - // the install mail will most likely fail) - but on a dynamic ip connection this might produce - // severe problems and is not fixable! - if ($default_auth_method == 'POP-BEFORE-SMTP' && $username && $password) - { - global $config; - - $errno = 0; - $errstr = ''; - - $this->server_send("QUIT"); - fclose($this->socket); - - $this->pop_before_smtp($hostname, $username, $password); - $username = $password = $default_auth_method = ''; - - // We need to close the previous session, else the server is not - // able to get our ip for matching... - if (!$this->socket = @fsockopen($config['smtp_host'], $config['smtp_port'], $errno, $errstr, 10)) - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - } - - $err_msg = (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; - return $err_msg; - } - - // Wait for reply - if ($err_msg = $this->server_parse('220', __LINE__)) - { - $this->close_session($err_msg); - return $err_msg; - } - } - - $hello_result = $this->hello($local_host); - if (!is_null($hello_result)) - { - return $hello_result; - } - - // SMTP STARTTLS (RFC 3207) - if (!$this->socket_tls) - { - $this->socket_tls = $this->starttls(); - - if ($this->socket_tls) - { - // Switched to TLS - // RFC 3207: "The client MUST discard any knowledge obtained from the server, [...]" - // So say hello again - $hello_result = $this->hello($local_host); - - if (!is_null($hello_result)) - { - return $hello_result; - } - } - } - - // If we are not authenticated yet, something might be wrong if no username and passwd passed - if (!$username || !$password) - { - return false; - } - - if (!isset($this->commands['AUTH'])) - { - return (isset($user->lang['SMTP_NO_AUTH_SUPPORT'])) ? $user->lang['SMTP_NO_AUTH_SUPPORT'] : 'SMTP server does not support authentication'; - } - - // Get best authentication method - $available_methods = explode(' ', $this->commands['AUTH']); - - // Define the auth ordering if the default auth method was not found - $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5'); - $method = ''; - - if (in_array($default_auth_method, $available_methods)) - { - $method = $default_auth_method; - } - else - { - foreach ($auth_methods as $_method) - { - if (in_array($_method, $available_methods)) - { - $method = $_method; - break; - } - } - } - - if (!$method) - { - return (isset($user->lang['NO_SUPPORTED_AUTH_METHODS'])) ? $user->lang['NO_SUPPORTED_AUTH_METHODS'] : 'No supported authentication methods'; - } - - $method = strtolower(str_replace('-', '_', $method)); - return $this->$method($username, $password); - } - - /** - * SMTP EHLO/HELO - * - * @return mixed Null if the authentication process is supposed to continue - * False if already authenticated - * Error message (string) otherwise - */ - protected function hello($hostname) - { - // Try EHLO first - $this->server_send("EHLO $hostname"); - if ($err_msg = $this->server_parse('250', __LINE__)) - { - // a 503 response code means that we're already authenticated - if ($this->numeric_response_code == 503) - { - return false; - } - - // If EHLO fails, we try HELO - $this->server_send("HELO $hostname"); - if ($err_msg = $this->server_parse('250', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - } - - foreach ($this->responses as $response) - { - $response = explode(' ', $response); - $response_code = $response[0]; - unset($response[0]); - $this->commands[$response_code] = implode(' ', $response); - } - - return null; - } - - /** - * SMTP STARTTLS (RFC 3207) - * - * @return bool Returns true if TLS was started - * Otherwise false - */ - protected function starttls() - { - global $config; - - // allow SMTPS (what was used by phpBB 3.0) if hostname is prefixed with tls:// or ssl:// - if (strpos($config['smtp_host'], 'tls://') === 0 || strpos($config['smtp_host'], 'ssl://') === 0) - { - return true; - } - - if (!function_exists('stream_socket_enable_crypto')) - { - return false; - } - - if (!isset($this->commands['STARTTLS'])) - { - return false; - } - - $this->server_send('STARTTLS'); - - if ($err_msg = $this->server_parse('220', __LINE__)) - { - return false; - } - - $result = false; - $stream_meta = stream_get_meta_data($this->socket); - - if (socket_set_blocking($this->socket, 1)) - { - // https://secure.php.net/manual/en/function.stream-socket-enable-crypto.php#119122 - $crypto = (phpbb_version_compare(PHP_VERSION, '5.6.7', '<')) ? STREAM_CRYPTO_METHOD_TLS_CLIENT : STREAM_CRYPTO_METHOD_SSLv23_CLIENT; - $result = stream_socket_enable_crypto($this->socket, true, $crypto); - socket_set_blocking($this->socket, (int) $stream_meta['blocked']); - } - - return $result; - } - - /** - * Pop before smtp authentication - */ - function pop_before_smtp($hostname, $username, $password) - { - global $user; - - if (!$this->socket = @fsockopen($hostname, 110, $errno, $errstr, 10)) - { - if ($errstr) - { - $errstr = utf8_convert_message($errstr); - } - - return (isset($user->lang['NO_CONNECT_TO_SMTP_HOST'])) ? sprintf($user->lang['NO_CONNECT_TO_SMTP_HOST'], $errno, $errstr) : "Could not connect to smtp host : $errno : $errstr"; - } - - $this->server_send("USER $username", true); - if ($err_msg = $this->server_parse('+OK', __LINE__)) - { - return $err_msg; - } - - $this->server_send("PASS $password", true); - if ($err_msg = $this->server_parse('+OK', __LINE__)) - { - return $err_msg; - } - - $this->server_send('QUIT'); - fclose($this->socket); - - return false; - } - - /** - * Plain authentication method - */ - function plain($username, $password) - { - $this->server_send('AUTH PLAIN'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $base64_method_plain = base64_encode("\0" . $username . "\0" . $password); - $this->server_send($base64_method_plain, true); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } - - /** - * Login authentication method - */ - function login($username, $password) - { - $this->server_send('AUTH LOGIN'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $this->server_send(base64_encode($username), true); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return $err_msg; - } - - $this->server_send(base64_encode($password), true); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } - - /** - * cram_md5 authentication method - */ - function cram_md5($username, $password) - { - $this->server_send('AUTH CRAM-MD5'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $md5_challenge = base64_decode($this->responses[0]); - $password = (strlen($password) > 64) ? pack('H32', md5($password)) : ((strlen($password) < 64) ? str_pad($password, 64, chr(0)) : $password); - $md5_digest = md5((substr($password, 0, 64) ^ str_repeat(chr(0x5C), 64)) . (pack('H32', md5((substr($password, 0, 64) ^ str_repeat(chr(0x36), 64)) . $md5_challenge)))); - - $base64_method_cram_md5 = base64_encode($username . ' ' . $md5_digest); - - $this->server_send($base64_method_cram_md5, true); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } - - /** - * digest_md5 authentication method - * A real pain in the *** - */ - function digest_md5($username, $password) - { - global $config, $user; - - $this->server_send('AUTH DIGEST-MD5'); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return ($this->numeric_response_code == 503) ? false : $err_msg; - } - - $md5_challenge = base64_decode($this->responses[0]); - - // Parse the md5 challenge - from AUTH_SASL (PEAR) - $tokens = array(); - while (preg_match('/^([a-z-]+)=("[^"]+(?host; - } - - // Maxbuf - if (empty($tokens['maxbuf'])) - { - $tokens['maxbuf'] = 65536; - } - - // Required: nonce, algorithm - if (empty($tokens['nonce']) || empty($tokens['algorithm'])) - { - $tokens = array(); - } - $md5_challenge = $tokens; - - if (!empty($md5_challenge)) - { - $str = ''; - for ($i = 0; $i < 32; $i++) - { - $str .= chr(mt_rand(0, 255)); - } - $cnonce = base64_encode($str); - - $digest_uri = 'smtp/' . $config['smtp_host']; - - $auth_1 = sprintf('%s:%s:%s', pack('H32', md5(sprintf('%s:%s:%s', $username, $md5_challenge['realm'], $password))), $md5_challenge['nonce'], $cnonce); - $auth_2 = 'AUTHENTICATE:' . $digest_uri; - $response_value = md5(sprintf('%s:%s:00000001:%s:auth:%s', md5($auth_1), $md5_challenge['nonce'], $cnonce, md5($auth_2))); - - $input_string = sprintf('username="%s",realm="%s",nonce="%s",cnonce="%s",nc="00000001",qop=auth,digest-uri="%s",response=%s,%d', $username, $md5_challenge['realm'], $md5_challenge['nonce'], $cnonce, $digest_uri, $response_value, $md5_challenge['maxbuf']); - } - else - { - return (isset($user->lang['INVALID_DIGEST_CHALLENGE'])) ? $user->lang['INVALID_DIGEST_CHALLENGE'] : 'Invalid digest challenge'; - } - - $base64_method_digest_md5 = base64_encode($input_string); - $this->server_send($base64_method_digest_md5, true); - if ($err_msg = $this->server_parse('334', __LINE__)) - { - return $err_msg; - } - - $this->server_send(' '); - if ($err_msg = $this->server_parse('235', __LINE__)) - { - return $err_msg; - } - - return false; - } -} - -/** - * Encodes the given string for proper display in UTF-8 or US-ASCII. - * - * This version is based on iconv_mime_encode() implementation - * from symfomy/polyfill-iconv - * https://github.com/symfony/polyfill-iconv/blob/fd324208ec59a39ebe776e6e9ec5540ad4f40aaa/Iconv.php#L355 - * - * @param string $str - * @param string $eol Lines delimiter (optional to be backwards compatible) - * - * @return string - */ -function mail_encode($str, $eol = "\r\n") -{ - // Check if string contains ASCII only characters - $is_ascii = strlen($str) === utf8_strlen($str); - - $scheme = $is_ascii ? 'Q' : 'B'; - - // Define start delimiter, end delimiter - // Use the Quoted-Printable encoding for ASCII strings to avoid unnecessary encoding in Base64 - $start = '=?' . ($is_ascii ? 'US-ASCII' : 'UTF-8') . '?' . $scheme . '?'; - $end = '?='; - - // Maximum encoded-word length is 75 as per RFC 2047 section 2. - // $split_length *must* be a multiple of 4, but <= 75 - strlen($start . $eol . $end)!!! - $split_length = 75 - strlen($start . $eol . $end); - $split_length = $split_length - $split_length % 4; - - $line_length = strlen($start) + strlen($end); - $line_offset = strlen($start) + 1; - $line_data = ''; - - $is_quoted_printable = 'Q' === $scheme; - - preg_match_all('/./us', $str, $chars); - $chars = $chars[0] ?? []; - - $str = []; - foreach ($chars as $char) - { - $encoded_char = $is_quoted_printable - ? $char = preg_replace_callback( - '/[()<>@,;:\\\\".\[\]=_?\x20\x00-\x1F\x80-\xFF]/', - function ($matches) - { - $hex = dechex(ord($matches[0])); - $hex = strlen($hex) == 1 ? "0$hex" : $hex; - return '=' . strtoupper($hex); - }, - $char - ) - : base64_encode($line_data . $char); - - if (isset($encoded_char[$split_length - $line_length])) - { - if (!$is_quoted_printable) - { - $line_data = base64_encode($line_data); - } - $str[] = $start . $line_data . $end; - $line_length = $line_offset; - $line_data = ''; - } - - $line_data .= $char; - $is_quoted_printable && $line_length += strlen($char); - } - - if ($line_data !== '') - { - if (!$is_quoted_printable) - { - $line_data = base64_encode($line_data); - } - $str[] = $start . $line_data . $end; - } - - return implode($eol . ' ', $str); -} - -/** - * Wrapper for sending out emails with the PHP's mail function - */ -function phpbb_mail($to, $subject, $msg, $headers, $eol, &$err_msg) -{ - global $config, $phpbb_root_path, $phpEx, $phpbb_dispatcher; - - // Convert Numeric Character References to UTF-8 chars (ie. Emojis) - $subject = utf8_decode_ncr($subject); - $msg = utf8_decode_ncr($msg); - - /** - * We use the EOL character for the OS here because the PHP mail function does not correctly transform line endings. - * On Windows SMTP is used (SMTP is \r\n), on UNIX a command is used... - * Reference: http://bugs.php.net/bug.php?id=15841 - */ - $headers = implode($eol, $headers); - - if (!class_exists('\phpbb\error_collector')) - { - include($phpbb_root_path . 'includes/error_collector.' . $phpEx); - } - - $collector = new \phpbb\error_collector; - $collector->install(); - - /** - * On some PHP Versions mail() *may* fail if there are newlines within the subject. - * Newlines are used as a delimiter for lines in mail_encode() according to RFC 2045 section 6.8. - * Because PHP can't decide what is wanted we revert back to the non-RFC-compliant way of separating by one space - * (Use '' as parameter to mail_encode() results in SPACE used) - */ - $additional_parameters = $config['email_force_sender'] ? '-f' . $config['board_email'] : ''; - - /** - * Modify data before sending out emails with PHP's mail function - * - * @event core.phpbb_mail_before - * @var string to The message recipient - * @var string subject The message subject - * @var string msg The message text - * @var string headers The email headers - * @var string eol The endline character - * @var string additional_parameters The additional parameters - * @since 3.3.6-RC1 - */ - $vars = [ - 'to', - 'subject', - 'msg', - 'headers', - 'eol', - 'additional_parameters', - ]; - extract($phpbb_dispatcher->trigger_event('core.phpbb_mail_before', compact($vars))); - - $result = mail($to, mail_encode($subject, ''), wordwrap(utf8_wordwrap($msg), 997, "\n", true), $headers, $additional_parameters); - - /** - * Execute code after sending out emails with PHP's mail function - * - * @event core.phpbb_mail_after - * @var string to The message recipient - * @var string subject The message subject - * @var string msg The message text - * @var string headers The email headers - * @var string eol The endline character - * @var string additional_parameters The additional parameters - * @var bool result True if the email was sent, false otherwise - * @since 3.3.6-RC1 - */ - $vars = [ - 'to', - 'subject', - 'msg', - 'headers', - 'eol', - 'additional_parameters', - 'result', - ]; - extract($phpbb_dispatcher->trigger_event('core.phpbb_mail_after', compact($vars))); - - $collector->uninstall(); - $err_msg = $collector->format_errors(); - - return $result; -} diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index d77f56c73f0..554fe48a124 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -250,16 +250,16 @@ public function send(\messenger $messenger, $contact) $messenger->to($recipient['address'], $recipient['name']); $messenger->im($recipient['jabber'], $recipient['username']); - $messenger->headers('X-AntiAbuse: Board servername - ' . $this->server_name); - $messenger->headers('X-AntiAbuse: User IP - ' . $this->sender_ip); + $messenger->headers('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger->headers('X-AntiAbuse', 'User IP - ' . $this->sender_ip); if ($this->sender_id) { - $messenger->headers('X-AntiAbuse: User_id - ' . $this->sender_id); + $messenger->headers('X-AntiAbuse', 'User_id - ' . $this->sender_id); } if ($this->sender_username) { - $messenger->headers('X-AntiAbuse: Username - ' . $this->sender_username); + $messenger->headers('X-AntiAbuse', 'Username - ' . $this->sender_username); } $messenger->subject(html_entity_decode($this->subject, ENT_COMPAT)); diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index a346508624a..e287bea407e 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -70,6 +70,7 @@ protected function setUp(): void $phpbb_container->set('assets.bag', $assets_bag); $context = new \phpbb\template\context(); + $dispatcher = new \phpbb\event\dispatcher(); $twig = new \phpbb\template\twig\environment( $assets_bag, $config, @@ -78,7 +79,7 @@ protected function setUp(): void $cache_path, null, new \phpbb\template\twig\loader(''), - new \phpbb\event\dispatcher(), + $dispatcher, array( 'cache' => false, 'debug' => false, @@ -95,6 +96,16 @@ protected function setUp(): void $twig->addExtension($twig_extension); $phpbb_container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig)); + $phpbb_container->set('dispatcher', $dispatcher); + $phpbb_container->set('language', $lang); + $phpbb_container->set('request', $request); + + $db = $this->getMockBuilder('\phpbb\db\driver\mysqli') + ->disableOriginalConstructor() + ->getMock(); + $auth = $this->createMock('\phpbb\auth\auth'); + $log = new \phpbb\log\log($db, $user, $auth, $dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $phpbb_container->set('log', $log); if (!class_exists('messenger')) { diff --git a/tests/email/headers_encoding_test.php b/tests/email/headers_encoding_test.php deleted file mode 100644 index a884a4cc216..00000000000 --- a/tests/email/headers_encoding_test.php +++ /dev/null @@ -1,48 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -class phpbb_headers_encoding_test extends phpbb_test_case -{ - protected function setUp(): void - { - global $phpbb_root_path, $phpEx; - - if (!function_exists('mail_encode')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - } - - public function headers_encoding_data() - { - return [ - ['test@yourdomain.com ', 'Q', 'US-ASCII'], - ['test@yourdomain.com <Несуществующий почтовый адрес phpBB>', 'B', 'UTF-8'], - ["\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88\xE3\x83\x86\xE3\x82\xB9\xE3\x83\x88", 'B', 'UTF-8'], - ]; - } - - /** - * @dataProvider headers_encoding_data - */ - public function test_headers_encoding($header, $scheme, $encoding) - { - $encoded_string = mail_encode($header); - $this->assertStringStartsWith("=?$encoding?$scheme?", $encoded_string); - $this->assertStringEndsWith('?=', $encoded_string); - - // Result of iconv_mime_decode() on decoded header should be equal to initial header - $decoded_string = iconv_mime_decode($encoded_string, 0, $encoding); - $this->assertEquals(0, strcmp($header, $decoded_string)); - } -} From 715496b76de749c7008ee845f9eea58d41557003 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 5 May 2023 21:24:15 +0700 Subject: [PATCH 0552/1214] [ticket/17135] Fix invalid smtp in tests PHPBB3-17135 --- phpBB/includes/functions_messenger.php | 4 ++-- tests/test_framework/phpbb_functional_test_case.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 390463fe3a7..dd22f6bb9ce 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -581,7 +581,7 @@ function build_header() */ function get_transport($dummy = false) { - if ($dummy) + if ($dummy || empty($this->config['smtp_host'])) { $dsn = 'null://null'; } @@ -600,7 +600,7 @@ function get_transport($dummy = false) $transport = Transport::fromDsn($dsn); - if ($this->config['smtp_delivery']) + if ($this->config['smtp_delivery'] && $dsn != 'null://null') { // Set ssl context options, see http://php.net/manual/en/context.ssl.php $verify_peer = (bool) $this->config['smtp_verify_peer']; diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 2ce670d3903..ddfca1e0bee 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -418,7 +418,7 @@ protected static function install_board() $iohandler->set_input('email_enable', true); $iohandler->set_input('smtp_delivery', '1'); - $iohandler->set_input('smtp_host', 'nxdomain.phpbb.com'); + $iohandler->set_input('smtp_host', ''); $iohandler->set_input('smtp_auth', 'PLAIN'); $iohandler->set_input('smtp_user', 'nxuser'); $iohandler->set_input('smtp_pass', 'nxpass'); From d5f411a16d9245cdb93d81db26d3ade1e4787b28 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 5 May 2023 23:31:01 +0700 Subject: [PATCH 0553/1214] [ticket/17135] Remove SMTP auth method option Symfony Mailer handles SMTP auth method internally. PHPBB3-17135 --- phpBB/docs/install-config.sample.yml | 1 - phpBB/includes/acp/acp_board.php | 25 ------------ .../includes/questionnaire/questionnaire.php | 1 - phpBB/install/schemas/schema_data.sql | 1 - phpBB/language/en/acp/board.php | 7 ---- .../data/v400/remove_smtp_auth_method.php | 38 +++++++++++++++++++ .../console/command/install/install.php | 1 - .../phpbb/install/installer_configuration.php | 3 -- .../task/add_config_settings.php | 1 - .../obtain_data/task/obtain_email_data.php | 20 ---------- .../phpbb_functional_test_case.php | 1 - vagrant/phpbb-install-config.yml | 1 - 12 files changed, 38 insertions(+), 62 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php diff --git a/phpBB/docs/install-config.sample.yml b/phpBB/docs/install-config.sample.yml index a354e52e2f5..5ef6c643bea 100644 --- a/phpBB/docs/install-config.sample.yml +++ b/phpBB/docs/install-config.sample.yml @@ -23,7 +23,6 @@ installer: smtp_delivery : ~ smtp_host: ~ smtp_port: ~ - smtp_auth: ~ smtp_user: ~ smtp_pass: ~ diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index bda5661278e..2afa79b1e65 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -473,7 +473,6 @@ function main($id, $mode) 'smtp_delivery' => array('lang' => 'USE_SMTP', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'smtp_host' => array('lang' => 'SMTP_SERVER', 'validate' => 'string', 'type' => 'text:25:50', 'explain' => true), 'smtp_port' => array('lang' => 'SMTP_PORT', 'validate' => 'int:0:99999', 'type' => 'number:0:99999', 'explain' => true), - 'smtp_auth_method' => array('lang' => 'SMTP_AUTH_METHOD', 'validate' => 'string', 'type' => 'select', 'method' => 'mail_auth_select', 'explain' => true), 'smtp_username' => array('lang' => 'SMTP_USERNAME', 'validate' => 'string', 'type' => 'text:25:255', 'explain' => true), 'smtp_password' => array('lang' => 'SMTP_PASSWORD', 'validate' => 'string', 'type' => 'password:25:255', 'explain' => true), 'smtp_verify_peer' => array('lang' => 'SMTP_VERIFY_PEER', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), @@ -884,30 +883,6 @@ function select_auth_method($selected_method, $key = '') ]; } - /** - * Select mail authentication method - */ - function mail_auth_select($selected_method, $key = '') - { - global $user; - - $auth_methods = ['PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP']; - $s_smtp_auth_options = []; - - foreach ($auth_methods as $method) - { - $s_smtp_auth_options[] = [ - 'value' => $method, - 'selected' => $selected_method == $method, - 'label' => $user->lang('SMTP_' . str_replace('-', '_', $method)), - ]; - } - - return [ - 'options' => $s_smtp_auth_options, - ]; - } - /** * Select full folder action */ diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 74675e0e038..319537f3e31 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -435,7 +435,6 @@ function get_data() 'secure_downloads' => true, 'session_gc' => true, 'session_length' => true, - 'smtp_auth_method' => true, 'smtp_delivery' => true, 'topics_per_page' => true, 'version' => true, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 21b26ee9c8e..43b8f95fc8e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -287,7 +287,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('sitename_short', ' INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_path', 'images/smilies'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smilies_per_page', '50'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_allow_self_signed', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_auth_method', 'PLAIN'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_delivery', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_host', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('smtp_port', '25'); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 633df91138c..e46091c9545 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -553,15 +553,8 @@ 'SEND_TEST_EMAIL_EXPLAIN' => 'This will send a test email to the address defined in your account.', 'SMTP_ALLOW_SELF_SIGNED' => 'Allow self-signed SSL certificates', 'SMTP_ALLOW_SELF_SIGNED_EXPLAIN'=> 'Allow connections to SMTP server with self-signed SSL certificate.
                            Warning: Allowing self-signed SSL certificates may cause security implications.', - 'SMTP_AUTH_METHOD' => 'Authentication method for SMTP', - 'SMTP_AUTH_METHOD_EXPLAIN' => 'Only used if a username/password is set, ask your provider if you are unsure which method to use.', - 'SMTP_CRAM_MD5' => 'CRAM-MD5', - 'SMTP_DIGEST_MD5' => 'DIGEST-MD5', - 'SMTP_LOGIN' => 'LOGIN', 'SMTP_PASSWORD' => 'SMTP password', 'SMTP_PASSWORD_EXPLAIN' => 'Only enter a password if your SMTP server requires it.
                            Warning: This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.', - 'SMTP_PLAIN' => 'PLAIN', - 'SMTP_POP_BEFORE_SMTP' => 'POP-BEFORE-SMTP', 'SMTP_PORT' => 'SMTP server port', 'SMTP_PORT_EXPLAIN' => 'Only change this if you know your SMTP server is on a different port.', 'SMTP_SERVER' => 'SMTP server address', diff --git a/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php b/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php new file mode 100644 index 00000000000..eed17067b77 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php @@ -0,0 +1,38 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_smtp_auth_method extends migration +{ + public function effectively_installed() + { + return !$this->config->offsetExists('smtp_auth_method'); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function update_data() + { + return [ + ['config.remove', ['smtp_auth_method']], + ]; + } +} diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php index 84c8aa688af..6641f9b9449 100644 --- a/phpBB/phpbb/install/console/command/install/install.php +++ b/phpBB/phpbb/install/console/command/install/install.php @@ -195,7 +195,6 @@ private function register_configuration(cli_iohandler $iohandler, $config) $iohandler->set_input('smtp_delivery', $config['email']['smtp_delivery']); $iohandler->set_input('smtp_host', $config['email']['smtp_host']); $iohandler->set_input('smtp_port', $config['email']['smtp_port']); - $iohandler->set_input('smtp_auth', $config['email']['smtp_auth']); $iohandler->set_input('smtp_user', $config['email']['smtp_user']); $iohandler->set_input('smtp_pass', $config['email']['smtp_pass']); $iohandler->set_input('submit_email', 'submit'); diff --git a/phpBB/phpbb/install/installer_configuration.php b/phpBB/phpbb/install/installer_configuration.php index 974080dc55e..f1051095e27 100644 --- a/phpBB/phpbb/install/installer_configuration.php +++ b/phpBB/phpbb/install/installer_configuration.php @@ -97,9 +97,6 @@ public function getConfigTreeBuilder() ->scalarNode('smtp_port') ->defaultValue(null) ->end() - ->scalarNode('smtp_auth') - ->defaultValue(null) - ->end() ->scalarNode('smtp_user') ->defaultValue(null) ->end() diff --git a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php index 5b9a9da5360..14c88a04d31 100644 --- a/phpBB/phpbb/install/module/install_database/task/add_config_settings.php +++ b/phpBB/phpbb/install/module/install_database/task/add_config_settings.php @@ -150,7 +150,6 @@ public function run() 'smtp_delivery' => $this->install_config->get('smtp_delivery'), 'smtp_host' => $this->install_config->get('smtp_host'), 'smtp_port' => $this->install_config->get('smtp_port'), - 'smtp_auth_method' => $this->install_config->get('smtp_auth'), 'smtp_username' => $this->install_config->get('smtp_user'), 'smtp_password' => $this->install_config->get('smtp_pass'), diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php index 93c0eb385e2..3c6508f6a7b 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_email_data.php @@ -52,12 +52,9 @@ public function run() $smtp_delivery = $this->io_handler->get_input('smtp_delivery', ''); $smtp_host = $this->io_handler->get_input('smtp_host', '', true); $smtp_port = $this->io_handler->get_input('smtp_port', ''); - $smtp_auth = $this->io_handler->get_input('smtp_auth', ''); $smtp_user = $this->io_handler->get_input('smtp_user', '', true); $smtp_passwd = $this->io_handler->get_input('smtp_pass', '', true); - $auth_methods = array('PLAIN', 'LOGIN', 'CRAM-MD5', 'DIGEST-MD5', 'POP-BEFORE-SMTP'); - // Check if data is sent if ($this->io_handler->get_input('submit_email', false)) { @@ -65,22 +62,11 @@ public function run() $this->install_config->set('smtp_delivery', $smtp_delivery); $this->install_config->set('smtp_host', $smtp_host); $this->install_config->set('smtp_port', $smtp_port); - $this->install_config->set('smtp_auth', $smtp_auth); $this->install_config->set('smtp_user', $smtp_user); $this->install_config->set('smtp_pass', $smtp_passwd); } else { - $auth_options = array(); - foreach ($auth_methods as $method) - { - $auth_options[] = array( - 'value' => $method, - 'label' => 'SMTP_' . str_replace('-', '_', $method), - 'selected' => false, - ); - } - $email_form = array( 'email_enable' => array( 'label' => 'ENABLE_EMAIL', @@ -126,12 +112,6 @@ public function run() 'type' => 'text', 'default' => $smtp_port, ), - 'smtp_auth' => array( - 'label' => 'SMTP_AUTH_METHOD', - 'description' => 'SMTP_AUTH_METHOD_EXPLAIN', - 'type' => 'select', - 'options' => $auth_options, - ), 'smtp_user' => array( 'label' => 'SMTP_USERNAME', 'description' => 'SMTP_USERNAME_EXPLAIN', diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index ddfca1e0bee..3e9b654b0e4 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -419,7 +419,6 @@ protected static function install_board() $iohandler->set_input('email_enable', true); $iohandler->set_input('smtp_delivery', '1'); $iohandler->set_input('smtp_host', ''); - $iohandler->set_input('smtp_auth', 'PLAIN'); $iohandler->set_input('smtp_user', 'nxuser'); $iohandler->set_input('smtp_pass', 'nxpass'); $iohandler->set_input('submit_email', 'submit'); diff --git a/vagrant/phpbb-install-config.yml b/vagrant/phpbb-install-config.yml index db7b525b9f6..0b899582997 100644 --- a/vagrant/phpbb-install-config.yml +++ b/vagrant/phpbb-install-config.yml @@ -38,7 +38,6 @@ installer: enabled: false smtp_delivery : ~ smtp_host: ~ - smtp_auth: ~ smtp_user: ~ smtp_pass: ~ From 3ef7f806b3882e99420e1eca4618a8cd3773465f Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 12 May 2023 19:56:16 +0700 Subject: [PATCH 0554/1214] [ticket/17135] Further formatting and adjusting the messenger code PHPBB3-17135 --- phpBB/includes/functions_messenger.php | 431 ++++++++++++++++--------- tests/email/email_parsing_test.php | 2 + 2 files changed, 284 insertions(+), 149 deletions(-) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index dd22f6bb9ce..6a32349d4fc 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1,15 +1,15 @@ -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ use Symfony\Component\Mailer\Transport; use Symfony\Component\Mailer\Mailer; @@ -18,18 +18,19 @@ use Symfony\Component\Mime\Header\Headers; /** -* @ignore -*/ + * @ignore + */ if (!defined('IN_PHPBB')) { exit; } /** -* Messenger -*/ + * Messenger class + */ class messenger { + /** @var array */ private const PRIORITY_MAP = [ Email::PRIORITY_HIGHEST => 'Highest', Email::PRIORITY_HIGH => 'High', @@ -37,6 +38,8 @@ class messenger Email::PRIORITY_LOW => 'Low', Email::PRIORITY_LOWEST => 'Lowest', ]; + + /** @var array */ private const HEADER_CLASS_MAP = [ 'date' => DateHeader::class, 'from' => MailboxListHeader::class, @@ -51,11 +54,22 @@ class messenger 'return-path' => PathHeader::class, ]; - var $msg, $replyto, $from, $subject; - var $addresses = []; - var $extra_headers = []; + /** @var array */ + protected $addresses = []; + + /** + * @var string + * + * Symfony Mailer transport DSN + */ + protected $dsn = ''; + + /** @var string */ + protected $from; /** + * @var int + * * Possible values are: * Email::PRIORITY_HIGHEST * Email::PRIORITY_HIGH @@ -63,18 +77,34 @@ class messenger * Email::PRIORITY_LOW * Email::PRIORITY_LOWEST */ - var $mail_priority = Email::PRIORITY_NORMAL; - var $use_queue = true; + protected $mail_priority = Email::PRIORITY_NORMAL; + + /** @var string */ + protected $msg; + + /** @var string */ + protected $replyto; + + /** @var string */ + protected $subject; /** @var \phpbb\template\template */ protected $template; + /** @var Symfony\Component\Mailer\Transport */ + protected $transport; + + /** @var bool */ + protected $use_queue = true; + /** - * Constructor + * Messenger class constructor + * + * @param bool $use_queue Flag to switch the use of the messenger file queue */ function __construct($use_queue = true) { - global $phpbb_container, $phpbb_root_path, $phpEx; + global $phpbb_container; $this->phpbb_container = $phpbb_container; $this->config = $this->phpbb_container->get('config'); @@ -87,16 +117,19 @@ function __construct($use_queue = true) $this->headers = $this->email->getHeaders(); $this->use_queue = (!$this->config['email_package_size']) ? false : $use_queue; $this->subject = ''; - $this->root_path = $phpbb_root_path; - $this->php_ext = $phpEx; + $this->php_ext = $this->phpbb_container->getParameter('core.php_ext'); + $this->root_path = $this->phpbb_container->getParameter('core.root_path'); + $this->set_transport(); } /** * Resets all the data (address, template file, etc etc) to default + * + * @return void */ - function reset() + public function reset() { - $this->addresses = $this->extra_headers = []; + $this->addresses = []; $this->msg = $this->replyto = $this->from = ''; $this->mail_priority = Email::PRIORITY_NORMAL; } @@ -105,8 +138,9 @@ function reset() * Set addresses for to/im as available * * @param array $user User row + * @return void */ - function set_addresses($user) + public function set_addresses($user) { if (isset($user['user_email']) && $user['user_email']) { @@ -120,9 +154,13 @@ function set_addresses($user) } /** - * Sets an email address to send to + * Sets email address to send to + * + * @param string $address Email "To" recipient address + * @param string $realname Email "To" recipient name + * @return void */ - function to($address, $realname = '') + public function to($address, $realname = '') { if (!trim($address)) { @@ -137,9 +175,13 @@ function to($address, $realname = '') } /** - * Sets an cc address to send to + * Sets cc address to send to + * + * @param string $address Email carbon copy recipient address + * @param string $realname Email carbon copy recipient name + * @return void */ - function cc($address, $realname = '') + public function cc($address, $realname = '') { if (!trim($address)) { @@ -151,9 +193,13 @@ function cc($address, $realname = '') } /** - * Sets an bcc address to send to + * Sets bcc address to send to + * + * @param string $address Email black carbon copy recipient address + * @param string $realname Email black carbon copy recipient name + * @return void */ - function bcc($address, $realname = '') + public function bcc($address, $realname = '') { if (!trim($address)) { @@ -166,8 +212,12 @@ function bcc($address, $realname = '') /** * Sets a im contact to send to + * + * @param string $address Jabber recipient address + * @param string $realname Jabber recipient name + * @return void */ - function im($address, $realname = '') + public function im($address, $realname = '') { // IM-Addresses could be empty if (!trim($address)) @@ -182,8 +232,11 @@ function im($address, $realname = '') /** * Set the reply to address + * + * @param string $address Email "Reply to" address + * @return void */ - function replyto($address) + public function replyto($address) { $this->replyto = new Address(trim($address)); $this->email->getReplyTo() ? $this->email->addReplyTo($this->replyto) : $this->email->replyTo($this->replyto); @@ -191,25 +244,36 @@ function replyto($address) /** * Set the from address + * + * @param string $address Email "from" address + * @return void */ - function from($address) + public function from($address) { $this->from = new Address(trim($address)); $this->email->getFrom() ? $this->email->addFrom($this->from) : $this->email->from($this->from); } /** - * set up subject for mail + * Set up subject for mail + * + * @param string $subject Email subject + * @return void */ - function subject($subject = '') + public function subject($subject = '') { - $this->email->subject(trim($subject)); + $this->subject = $subject; + $this->email->subject(trim($this->subject)); } /** - * set up extra mail headers + * Set up extra mail headers + * + * @param string $header_name Email header name + * @param string $header_value Email header body + * @return void */ - function headers($header_name, $header_value) + public function headers($header_name, $header_value) { $this->headers->addTextHeader(trim($header_name), trim($header_value)); } @@ -221,7 +285,7 @@ function headers($header_name, $header_value) * @param \phpbb\user $user User object * @return void */ - function anti_abuse_headers($config, $user) + public function anti_abuse_headers($config, $user) { $this->headers->addTextHeader('X-AntiAbuse', 'Board servername - ' . $config['server_name']); $this->headers->addTextHeader('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); @@ -231,22 +295,33 @@ function anti_abuse_headers($config, $user) /** * Set the email priority + * * Possible values are: - * Email::PRIORITY_HIGHEST - * Email::PRIORITY_HIGH - * Email::PRIORITY_NORMAL - * Email::PRIORITY_LOW - * Email::PRIORITY_LOWEST + * Email::PRIORITY_HIGHEST = 1 + * Email::PRIORITY_HIGH = 2 + * Email::PRIORITY_NORMAL = 3 + * Email::PRIORITY_LOW = 4 + * Email::PRIORITY_LOWEST = 5 + * + * @param int $priority Email priority level + * @return void */ - function set_mail_priority($priority = Email::PRIORITY_NORMAL) + public function set_mail_priority($priority = Email::PRIORITY_NORMAL) { $this->email->priority($priority); } /** * Set email template to use + * + * @param string $template_file Email template file name + * @param string $template_lang Email template language + * @param string $template_path Email template path + * @param string $template_dir_prefix Email template directory prefix + * + * @return bool */ - function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '') + public function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '') { $template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix; @@ -265,27 +340,27 @@ function template($template_file, $template_lang = '', $template_path = '', $tem $template_lang = basename($this->config['default_lang']); } - $ext_template_paths = array( - array( + $ext_template_paths = [ + [ 'name' => $template_lang . '_email', 'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix, - ), - ); + ], + ]; if ($template_path) { - $template_paths = array( + $template_paths = [ $template_path . $template_dir_prefix, - ); + ]; } else { $template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; $template_path .= $template_lang . '/email'; - $template_paths = array( + $template_paths = [ $template_path . $template_dir_prefix, - ); + ]; $board_language = basename($this->config['default_lang']); @@ -298,10 +373,10 @@ function template($template_file, $template_lang = '', $template_path = '', $tem $template_paths[] = $fallback_template_path . $template_dir_prefix; - $ext_template_paths[] = array( + $ext_template_paths[] = [ 'name' => $board_language . '_email', 'ext_path' => 'language/' . $board_language . '/email' . $template_dir_prefix, - ); + ]; } // If everything fails just fall back to en template if ($template_lang !== 'en' && $board_language !== 'en') @@ -311,33 +386,36 @@ function template($template_file, $template_lang = '', $template_path = '', $tem $template_paths[] = $fallback_template_path . $template_dir_prefix; - $ext_template_paths[] = array( + $ext_template_paths[] = [ 'name' => 'en_email', 'ext_path' => 'language/en/email' . $template_dir_prefix, - ); + ]; } } $this->set_template_paths($ext_template_paths, $template_paths); - $this->template->set_filenames(array( + $this->template->set_filenames([ 'body' => $template_file . '.txt', - )); + ]); return true; } /** - * assign variables to email template + * Assign variables to email template + * + * @param array $vars Array of VAR => VALUE to assign to email template + * @return void */ - function assign_vars($vars) + public function assign_vars($vars) { $this->setup_template(); $this->template->assign_vars($vars); } - function assign_block_vars($blockname, $vars) + public function assign_block_vars($blockname, $vars) { $this->setup_template(); @@ -345,15 +423,14 @@ function assign_block_vars($blockname, $vars) } /** - * Send the mail out to the recipients set previously in var $this->addresses + * Send the mail out to the recipients * * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH * @param bool $break Flag indicating if the function only formats the subject * and the message without sending it - * * @return bool */ - function send($method = NOTIFY_EMAIL, $break = false) + public function send($method = NOTIFY_EMAIL, $break = false) { // We add some standard variables we always use, no need to specify them always $this->assign_vars([ @@ -411,7 +488,7 @@ function send($method = NOTIFY_EMAIL, $break = false) // We now try and pull a subject from the email body ... if it exists, // do this here because the subject may contain a variable $drop_header = ''; - $match = array(); + $match = []; if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) { $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); @@ -463,8 +540,12 @@ function send($method = NOTIFY_EMAIL, $break = false) /** * Add error message to log + * + * @param string $type Error type: EMAIL / etc + * @param string $msg Error message text + * @return void */ - function error($type, $msg) + public function error($type, $msg) { // Session doesn't exist, create it if (!isset($this->user->session_id) || $this->user->session_id === '') @@ -490,9 +571,10 @@ function error($type, $msg) } /** - * Save to queue + * Save message data to the messemger file queue + * @return void */ - function save_queue() + public function save_queue() { if ($this->config['email_package_size'] && $this->use_queue && !empty($this->queue)) { @@ -502,11 +584,12 @@ function save_queue() } /** - * Detect proper method to add header + * Detect proper Header class method to add header * + * @param string $name Email header name * @return string */ - public function get_header_method(string $name) + protected function get_header_method(string $name) { $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class); $method = 'add'.ucfirst(array_pop($parts)); @@ -524,8 +607,10 @@ public function get_header_method(string $name) /** * Set email headers + * + * @return bool */ - function build_header() + protected function build_header() { $headers = []; @@ -557,7 +642,7 @@ function build_header() * @var array headers Array containing email header entries * @since 3.1.11-RC1 */ - $vars = array('headers'); + $vars = ['headers']; extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars))); foreach ($headers as $header => $value) @@ -574,33 +659,64 @@ function build_header() } /** - * Generates a valid transport to send email + * Generates valid DSN for Symfony Mailer transport * - * @param bool $dummy Flag to disable mail delivery - * @return Symfony\Component\Mailer\Transport Symfony Transport object + * @param string $dsn Symfony Mailer transport DSN + * @return void */ - function get_transport($dummy = false) + public function set_dsn($dsn = '') { - if ($dummy || empty($this->config['smtp_host'])) + if (!empty($dsn)) { - $dsn = 'null://null'; + $this->dsn = $dsn; } else if ($this->config['smtp_delivery']) { - $user = urlencode($this->config['smtp_username']); - $password = urlencode($this->config['smtp_password']); - $smtp_host = urlencode($this->config['smtp_host']); - $smtp_port = $this->config['smtp_port']; - $dsn = "smtp://$user:$password@$smtp_host:$smtp_port"; + if (empty($this->config['smtp_host'])) + { + $this->dsn = 'null://null'; + } + else + { + $user = urlencode($this->config['smtp_username']); + $password = urlencode($this->config['smtp_password']); + $smtp_host = urlencode($this->config['smtp_host']); + $smtp_port = $this->config['smtp_port']; + + $this->dsn = "smtp://$user:$password@$smtp_host:$smtp_port"; + } } else { - $dsn = 'sendmail://default'; + $this->dsn = 'sendmail://default'; + } + } + + /** + * Get Symfony Mailer transport DSN + * + * @return void + */ + public function get_dsn() + { + return $this->dsn; + } + + /** + * Generates a valid transport to send email + * + * @return void + */ + public function set_transport() + { + if (empty($this->dsn)) + { + $this->set_dsn(); } - $transport = Transport::fromDsn($dsn); + $this->transport = Transport::fromDsn($this->dsn); - if ($this->config['smtp_delivery'] && $dsn != 'null://null') + if ($this->config['smtp_delivery'] && !in_array($this->dsn, ['null://null', 'sendmail://default'])) { // Set ssl context options, see http://php.net/manual/en/context.ssl.php $verify_peer = (bool) $this->config['smtp_verify_peer']; @@ -613,16 +729,26 @@ function get_transport($dummy = false) 'allow_self_signed' => $allow_self_signed, ] ]; - $transport->getStream()->setStreamOptions($options); + $this->transport->getStream()->setStreamOptions($options); } + } - return $transport; + /** + * Get mailer transport object + * + * @return Symfony\Component\Mailer\Transport Symfony Mailer transport object + */ + public function get_transport() + { + return $this->transport; } /** * Send out emails + * + * @return bool */ - function msg_email() + protected function msg_email() { if (empty($this->config['email_enable'])) { @@ -665,12 +791,12 @@ function msg_email() * @since 3.2.4-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses */ - $vars = array( + $vars = [ 'break', 'subject', 'msg', 'email', - ); + ]; extract($this->dispatcher->trigger_event('core.notification_message_email', compact($vars))); $this->addresses = $addresses; @@ -699,8 +825,7 @@ function msg_email() // Send message ... if (!$use_queue) { - $transport = $this->get_transport(); - $mailer = new Mailer($transport); + $mailer = new Mailer($this->transport); $subject = $this->subject; $msg = $this->msg; @@ -770,9 +895,11 @@ function msg_email() } /** - * Send jabber message out - */ - function msg_jabber() + * Send jabber message out + * + * @return bool + */ + protected function msg_jabber() { if (empty($this->config['jab_enable']) || empty($this->config['jab_host']) || empty($this->config['jab_username']) || empty($this->config['jab_password'])) { @@ -796,7 +923,7 @@ function msg_jabber() $use_queue = true; } - $addresses = array(); + $addresses = []; foreach ($this->addresses['im'] as $type => $uid_ary) { $addresses[] = $uid_ary['uid']; @@ -829,19 +956,21 @@ function msg_jabber() } else { - $this->queue->put('jabber', array( + $this->queue->put('jabber', [ 'addresses' => $addresses, 'subject' => $this->subject, - 'msg' => $this->msg) - ); + 'msg' => $this->msg + ]); } unset($addresses); return true; } /** - * Setup template engine - */ + * Setup template engine + * + * @return void + */ protected function setup_template() { if ($this->template instanceof \phpbb\template\template) @@ -875,8 +1004,12 @@ protected function setup_template() } /** - * Set template paths to load - */ + * Set template paths to load + * + * @param string $path_name Email template path name + * @param string $paths Email template paths + * @return void + */ protected function set_template_paths($path_name, $paths) { $this->setup_template(); @@ -886,15 +1019,18 @@ protected function set_template_paths($path_name, $paths) } /** -* handling email and jabber queue -*/ + * Handling messenger file queue + */ class queue { - var $data = []; - var $queue_data = []; - var $package_size = 0; - var $cache_file = ''; - var $eol = "\n"; + /** @var array */ + protected $data = []; + + /** @var array */ + protected $queue_data = []; + + /** @var string */ + protected $cache_file = ''; /** * @var \phpbb\filesystem\filesystem_interface @@ -902,8 +1038,8 @@ class queue protected $filesystem; /** - * constructor - */ + * Messenger file queue class constructor + */ function __construct() { global $phpbb_container; @@ -918,28 +1054,37 @@ function __construct() } /** - * Init a queue object - */ - function init($object, $package_size) + * Init a queue object + * + * @param string $object Queue object type: email/jabber/etc + * @param int $package_size Size of the messenger package to send + * @return void + */ + public function init($object, $package_size) { - $this->data[$object] = array(); + $this->data[$object] = []; $this->data[$object]['package_size'] = $package_size; - $this->data[$object]['data'] = array(); + $this->data[$object]['data'] = []; } /** - * Put object in queue - */ - function put($object, $scope) + * Put message into the messenger file queue + * + * @param string $object Queue object type: email/jabber/etc + * @param mixed $message_data Message data to send + * @return void + */ + public function put($object, $message_data) { - $this->data[$object]['data'][] = $scope; + $this->data[$object]['data'][] = $message_data; } /** - * Process queue - * Using lock file - */ - function process() + * Process the messemger file queue (using lock file) + * + * @return void + */ + public function process() { $lock = new \phpbb\lock\flock($this->cache_file); $lock->acquire(); @@ -973,19 +1118,6 @@ function process() $package_size = $data_ary['package_size']; $num_items = (!$package_size || count($data_ary['data']) < $package_size) ? count($data_ary['data']) : $package_size; - /* - * This code is commented out because it causes problems on some web hosts. - * The core problem is rather restrictive email sending limits. - * This code is nly useful if you have no such restrictions from the - * web host and the package size setting is wrong. - - // If the amount of emails to be sent is way more than package_size than we need to increase it to prevent backlogs... - if (count($data_ary['data']) > $package_size * 2.5) - { - $num_items = count($data_ary['data']); - } - */ - switch ($object) { case 'email': @@ -1055,8 +1187,7 @@ function process() if (!$break) { $messenger = new messenger(); - $transport = $messenger->get_transport(); - $mailer = new Mailer($transport); + $mailer = new Mailer($messenger->get_transport()); try { @@ -1132,9 +1263,11 @@ function process() } /** - * Save queue - */ - function save() + * Save message data to the messenger file queue + * + * @return void + */ + public function save() { if (!count($this->data)) { @@ -1180,7 +1313,7 @@ function save() // Do nothing } - $this->data = array(); + $this->data = []; } $lock->release(); diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index e287bea407e..dd7b055ac77 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -106,6 +106,8 @@ protected function setUp(): void $auth = $this->createMock('\phpbb\auth\auth'); $log = new \phpbb\log\log($db, $user, $auth, $dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); $phpbb_container->set('log', $log); + $phpbb_container->setParameter('core.root_path', $phpbb_root_path); + $phpbb_container->setParameter('core.php_ext', $phpEx); if (!class_exists('messenger')) { From 1869b2a99e1d79c44706f600fe95bd54881c4be2 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 23 May 2023 14:03:07 +0700 Subject: [PATCH 0555/1214] [ticket/17135] Further formatting and adjusting the messenger code PHPBB3-17135 --- phpBB/includes/functions_jabber.php | 431 +++++++++++++++---------- phpBB/includes/functions_messenger.php | 145 ++++++--- 2 files changed, 362 insertions(+), 214 deletions(-) diff --git a/phpBB/includes/functions_jabber.php b/phpBB/includes/functions_jabber.php index ec7d090257f..282e6105a2c 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/includes/functions_jabber.php @@ -31,65 +31,134 @@ */ class jabber { - var $connection = null; - var $session = array(); - var $timeout = 10; - - var $server; - var $connect_server; - var $port; - var $username; - var $password; - var $use_ssl; - var $verify_peer; - var $verify_peer_name; - var $allow_self_signed; - var $resource = 'functions_jabber.phpbb.php'; - - var $enable_logging; - var $log_array; - - var $features = array(); + /** @var string */ + protected $connect_server; + + /** @var resource */ + protected $connection = null; + + /** @var bool */ + protected $enable_logging = true; + + /** @var array */ + protected $features = []; + + /** @var array */ + protected $jid = []; + + /** @var array */ + protected $log_array = []; + + /** @var string */ + protected $password; + + /** @var string */ + protected $port; + + /** @var string */ + protected $resource = 'functions_jabber.phpbb.php'; + + /** @var string */ + protected $server; + + /** @var array */ + protected $session = []; + + /** @var array */ + protected $stream_options = []; + + /** @var int */ + protected $timeout = 10; + + /** @var bool */ + protected $use_ssl = false; + + /** @var string */ + protected $username; /** @var string Stream close handshake */ private const STREAM_CLOSE_HANDSHAKE = ''; /** - * Constructor - * - * @param string $server Jabber server - * @param int $port Jabber server port - * @param string $username Jabber username or JID - * @param string $password Jabber password - * @param bool $use_ssl Use ssl - * @param bool $verify_peer Verify SSL certificate - * @param bool $verify_peer_name Verify Jabber peer name - * @param bool $allow_self_signed Allow self signed certificates - */ - function __construct($server, $port, $username, $password, $use_ssl = false, $verify_peer = true, $verify_peer_name = true, $allow_self_signed = false) + * Jabber class constructor + * + * Use (username() call should go before server() + * and ssl() call should go before port() and stream_options()): + * + * new jabber() + * -> username($username) + * -> password($password) + * -> ssl($use_ssl) + * -> server($server) + * -> port($port) + * -> stream_options( + * 'verify_peer' => true, + * 'verify_peer_name' => true, + * 'allow_self_signed' => false, + * ); + */ + function __construct() { - $this->connect_server = ($server) ? $server : 'localhost'; - $this->port = ($port) ? $port : 5222; + } - // Get the server and the username - if (strpos($username, '@') === false) + /** + * Set ssl context options + * See http://php.net/manual/en/context.ssl.php + * + * @param array $options SSL context options array + * @return $this + */ + public function stream_options($options = []) + { + if ($this->use_ssl) { - $this->server = $this->connect_server; - $this->username = $username; + // Set default stream options and change it if needed + $this->stream_options['ssl'] = array_merge([ + 'verify_peer' => true, + 'verify_peer_name' => true, + 'allow_self_signed' => false, + ], $options); } - else - { - $jid = explode('@', $username, 2); - $this->username = $jid[0]; - $this->server = $jid[1]; - } + return $this; + } - $this->password = $password; - $this->use_ssl = ($use_ssl && self::can_use_ssl()) ? true : false; - $this->verify_peer = $verify_peer; - $this->verify_peer_name = $verify_peer_name; - $this->allow_self_signed = $allow_self_signed; + /** + * Set password to connect to server + * + * @param string $password Password to connect to server + * @return $this + */ + public function password($password = '') + { + $this->password = $password; + + return $this; + } + + /** + * Set use of ssl to connect to server + * + * @param bool $use_ssl Flag indicating use of ssl to connect to server + * @return $this + */ + public function ssl($use_ssl = false) + { + $this->use_ssl = $use_ssl && self::can_use_ssl(); + + return $this; + } + + /** + * Set port to connect to server + * use_ssl flag should be set first + * + * @param string $port Port to connect to server + * @return $this + */ + public function port($port = '') + { + $this->port = ($port) ? $port : 5222; // Change port if we use SSL if ($this->port == 5222 && $this->use_ssl) @@ -97,21 +166,56 @@ function __construct($server, $port, $username, $password, $use_ssl = false, $ve $this->port = 5223; } - $this->enable_logging = true; - $this->log_array = array(); + return $this; + } + + /** + * Set username to connect to server + * + * @param string $username Username to connect to server + * @return $this + */ + public function username($username = '') + { + if (strpos($username, '@') === false) + { + $this->username = $username; + } + else + { + $this->jid = explode('@', $username, 2); + $this->username = $this->jid[0]; + } + + return $this; + } + + /** + * Set server to connect + * Username should be set first + * + * @param string $server Server to connect + * @return $this + */ + public function server($server = '') + { + $this->connect_server = ($server) ? $server : 'localhost'; + $this->server = $this->jid[1] ?? $this->connect_server; + + return $this; } /** - * Able to use the SSL functionality? - */ + * Able to use the SSL functionality? + */ public static function can_use_ssl() { return @extension_loaded('openssl'); } /** - * Able to use TLS? - */ + * Able to use TLS? + */ public static function can_use_tls() { if (!@extension_loaded('openssl') || !function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('stream_set_blocking') || !function_exists('stream_get_wrappers')) @@ -135,19 +239,19 @@ public static function can_use_tls() } /** - * Sets the resource which is used. No validation is done here, only escaping. - * @param string $name - * @access public - */ - function set_resource($name) + * Sets the resource which is used. No validation is done here, only escaping. + * @param string $name + * @access public + */ + public function set_resource($name) { $this->resource = $name; } /** - * Connect - */ - function connect() + * Connect + */ + public function connect() { /* if (!$this->check_jid($this->username . '@' . $this->server)) { @@ -157,7 +261,7 @@ function connect() $this->session['ssl'] = $this->use_ssl; - if ($this->open_socket($this->connect_server, $this->port, $this->use_ssl, $this->verify_peer, $this->verify_peer_name, $this->allow_self_signed)) + if ($this->open_socket($this->connect_server, $this->port)) { $this->send("\n"); $this->send("\n"); @@ -174,9 +278,9 @@ function connect() } /** - * Disconnect - */ - function disconnect() + * Disconnect + */ + public function disconnect() { if ($this->connected()) { @@ -195,7 +299,7 @@ function disconnect() $this->add_to_log("Error: Unexpected stream close handshake reply ”{$stream_close_reply}”"); } - $this->session = array(); + $this->session = []; return fclose($this->connection); } @@ -203,20 +307,20 @@ function disconnect() } /** - * Connected? - */ - function connected() + * Connected? + */ + public function connected() { - return (is_resource($this->connection) && !feof($this->connection)) ? true : false; + return is_resource($this->connection) && !feof($this->connection); } /** - * Initiates login (using data from contructor, after calling connect()) - * @access public - * @return bool - */ - function login() + * Initiates login (using data from contructor, after calling connect()) + * + * @return bool + */ + public function login() { if (empty($this->features)) { @@ -228,12 +332,13 @@ function login() } /** - * Send data to the Jabber server - * @param string $xml - * @access public - * @return bool - */ - function send($xml) + * Send data to the Jabber server + * + * @param string $xml + * + * @return bool + */ + public function send($xml) { if ($this->connected()) { @@ -248,17 +353,14 @@ function send($xml) } /** - * OpenSocket - * @param string $server host to connect to - * @param int $port port number - * @param bool $use_ssl use ssl or not - * @param bool $verify_peer verify ssl certificate - * @param bool $verify_peer_name verify peer name - * @param bool $allow_self_signed allow self-signed ssl certificates - * @access public - * @return bool - */ - function open_socket($server, $port, $use_ssl, $verify_peer, $verify_peer_name, $allow_self_signed) + * OpenSocket + * + * @param string $server host to connect to + * @param int $port port number + * + * @return bool + */ + public function open_socket($server, $port) { if (@function_exists('dns_get_record')) { @@ -269,21 +371,8 @@ function open_socket($server, $port, $use_ssl, $verify_peer, $verify_peer_name, } } - $options = array(); - - if ($use_ssl) - { - $remote_socket = 'ssl://' . $server . ':' . $port; - - // Set ssl context options, see http://php.net/manual/en/context.ssl.php - $options['ssl'] = array('verify_peer' => $verify_peer, 'verify_peer_name' => $verify_peer_name, 'allow_self_signed' => $allow_self_signed); - } - else - { - $remote_socket = $server . ':' . $port; - } - - $socket_context = stream_context_create($options); + $remote_socket = $this->use_ssl ? 'ssl://' . $server . ':' . $port : $server . ':' . $port; + $socket_context = stream_context_create($this->stream_options); if ($this->connection = @stream_socket_client($remote_socket, $errorno, $errorstr, $this->timeout, STREAM_CLIENT_CONNECT, $socket_context)) { @@ -299,9 +388,9 @@ function open_socket($server, $port, $use_ssl, $verify_peer, $verify_peer_name, } /** - * Return log - */ - function get_log() + * Return log + */ + public function get_log() { if ($this->enable_logging && count($this->log_array)) { @@ -312,9 +401,9 @@ function get_log() } /** - * Add information to log - */ - function add_to_log($string) + * Add information to log + */ + protected function add_to_log($string) { if ($this->enable_logging) { @@ -323,12 +412,12 @@ function add_to_log($string) } /** - * Listens to the connection until it gets data or the timeout is reached. - * Thus, it should only be called if data is expected to be received. - * @access public - * @return mixed either false for timeout or an array with the received data - */ - function listen($timeout = 10, $wait = false) + * Listens to the connection until it gets data or the timeout is reached. + * Thus, it should only be called if data is expected to be received. + * + * @return mixed either false for timeout or an array with the received data + */ + public function listen($timeout = 10, $wait = false) { if (!$this->connected()) { @@ -358,11 +447,11 @@ function listen($timeout = 10, $wait = false) } /** - * Initiates account registration (based on data used for contructor) - * @access public - * @return bool - */ - function register() + * Initiates account registration (based on data used for contructor) + * + * @return bool + */ + public function register() { if (!isset($this->session['id']) || isset($this->session['jid'])) { @@ -375,13 +464,14 @@ function register() } /** - * Sets account presence. No additional info required (default is "online" status) - * @param $message online, offline... - * @param $type dnd, away, chat, xa or nothing - * @param $unavailable set this to true if you want to become unavailable - * @access public - * @return bool - */ + * Sets account presence. No additional info required (default is "online" status) + * + * @param string $message online, offline... + * @param string $type dnd, away, chat, xa or nothing + * @param bool $unavailable set this to true if you want to become unavailable + * + * @return bool + */ function send_presence($message = '', $type = '', $unavailable = false) { if (!isset($this->session['jid'])) @@ -402,11 +492,12 @@ function send_presence($message = '', $type = '', $unavailable = false) } /** - * This handles all the different XML elements - * @param array $xml - * @access public - * @return bool - */ + * This handles all the different XML elements + * + * @param array $xml + * + * @return bool + */ function response($xml) { if (!is_array($xml) || !count($xml)) @@ -716,7 +807,17 @@ function response($xml) } } - function send_message($to, $text, $subject = '', $type = 'normal') + /** + * Send Jabber message + * + * @param string $to Recepient usermane + * @param string $text Message text + * @param string $subject Message subject + * @param string $type Message type + * + * @return string + */ + public function send_message($to, $text, $subject = '', $type = 'normal') { if (!isset($this->session['jid'])) { @@ -736,12 +837,13 @@ function send_message($to, $text, $subject = '', $type = 'normal') } /** - * Encrypts a password as in RFC 2831 - * @param array $data Needs data from the client-server connection - * @access public - * @return string - */ - function encrypt_password($data) + * Encrypts a password as in RFC 2831 + * + * @param array $data Needs data from the client-server connection + * + * @return string + */ + public function encrypt_password($data) { // let's me think about again... foreach (array('realm', 'cnonce', 'digest-uri') as $key) @@ -770,12 +872,12 @@ function encrypt_password($data) } /** - * parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,... - * @param string $data - * @access public - * @return array a => b ... - */ - function parse_data($data) + * parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,... + * @param string $data + * + * @return array a => b ... + */ + public function parse_data($data) { $data = explode(',', $data); $pairs = array(); @@ -802,12 +904,13 @@ function parse_data($data) } /** - * opposite of jabber::parse_data() - * @param array $data - * @access public - * @return string - */ - function implode_data($data) + * opposite of jabber::parse_data() + * + * @param array $data + * + * @return string + */ + public function implode_data($data) { $return = array(); foreach ($data as $key => $value) @@ -818,10 +921,10 @@ function implode_data($data) } /** - * xmlize() - * @author Hans Anderson - * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ - */ + * xmlize() + * @author Hans Anderson + * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ + */ function xmlize($data, $skip_white = 1, $encoding = 'UTF-8') { $data = trim($data); @@ -854,10 +957,10 @@ function xmlize($data, $skip_white = 1, $encoding = 'UTF-8') } /** - * _xml_depth() - * @author Hans Anderson - * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ - */ + * _xml_depth() + * @author Hans Anderson + * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ + */ function _xml_depth($vals, &$i) { $children = array(); diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 6a32349d4fc..323ab319993 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -54,9 +54,18 @@ class messenger 'return-path' => PathHeader::class, ]; + /** @var array */ + protected $additional_headers = []; + /** @var array */ protected $addresses = []; + /** @var \phpbb\config\config */ + protected $config; + + /** @var \phpbb\event\dispatcher */ + protected $dispatcher; + /** * @var string * @@ -67,6 +76,15 @@ class messenger /** @var string */ protected $from; + /** @var Symfony\Component\Mime\Header\Headers */ + protected $headers; + + /** @var \phpbb\language\language */ + protected $language; + + /** @var \phpbb\log\log_interface */ + protected $log; + /** * @var int * @@ -82,9 +100,21 @@ class messenger /** @var string */ protected $msg; + /** @var string */ + protected $php_ext; + + /** @var queue */ + protected $queue; + /** @var string */ protected $replyto; + /** @var \phpbb\request\request */ + protected $request; + + /** @var string */ + protected $root_path; + /** @var string */ protected $subject; @@ -97,6 +127,9 @@ class messenger /** @var bool */ protected $use_queue = true; + /** @var phpbb\user */ + protected $user; + /** * Messenger class constructor * @@ -144,7 +177,7 @@ public function set_addresses($user) { if (isset($user['user_email']) && $user['user_email']) { - $this->email->to(new Address($user['user_email'], $user['username'] ?: '')); + $this->to($user['user_email'], $user['username'] ?: ''); } if (isset($user['user_jabber']) && $user['user_jabber']) @@ -273,9 +306,17 @@ public function subject($subject = '') * @param string $header_value Email header body * @return void */ - public function headers($header_name, $header_value) + public function header($header_name, $header_value) { - $this->headers->addTextHeader(trim($header_name), trim($header_value)); + $header_name = trim($header_name); + $header_value = trim($header_value); + + // addMailboxListHeader() requires value to be array + if ($this->get_header_method($header_name) == 'addMailboxListHeader') + { + $header_value = [$header_value]; + } + $this->headers->addHeader($header_name, $header_value); } /** @@ -287,10 +328,10 @@ public function headers($header_name, $header_value) */ public function anti_abuse_headers($config, $user) { - $this->headers->addTextHeader('X-AntiAbuse', 'Board servername - ' . $config['server_name']); - $this->headers->addTextHeader('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); - $this->headers->addTextHeader('X-AntiAbuse', 'Username - ' . $user->data['username']); - $this->headers->addTextHeader('X-AntiAbuse', 'User IP - ' . $user->ip); + $this->header('X-AntiAbuse', 'Board servername - ' . $config['server_name']); + $this->header('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); + $this->header('X-AntiAbuse', 'Username - ' . $user->data['username']); + $this->header('X-AntiAbuse', 'User IP - ' . $user->ip); } /** @@ -415,6 +456,13 @@ public function assign_vars($vars) $this->template->assign_vars($vars); } + /** + * Assign block of variables to email template + * + * @param string $blockname Template block name + * @param array $vars Array of VAR => VALUE to assign to email template block + * @return void + */ public function assign_block_vars($blockname, $vars) { $this->setup_template(); @@ -423,14 +471,11 @@ public function assign_block_vars($blockname, $vars) } /** - * Send the mail out to the recipients + * Prepare message before sending out to the recipients * - * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH - * @param bool $break Flag indicating if the function only formats the subject - * and the message without sending it - * @return bool + * @return void */ - public function send($method = NOTIFY_EMAIL, $break = false) + public function prepare_message() { // We add some standard variables we always use, no need to specify them always $this->assign_vars([ @@ -446,16 +491,13 @@ public function send($method = NOTIFY_EMAIL, $break = false) * Event to modify the template before parsing * * @event core.modify_notification_template - * @var bool break Flag indicating if the function only formats the subject - * and the message without sending it * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH * @var string subject The message subject * @var \phpbb\template\template template The (readonly) template object * @since 3.2.4-RC1 - * @changed 4.0.0-a1 Added vars: email. + * @changed 4.0.0-a1 Added vars: email. Removed vars: method, break. */ - $vars = ['break', 'email', 'method', 'subject', 'template']; + $vars = ['email', 'subject', 'template']; extract($this->dispatcher->trigger_event('core.modify_notification_template', compact($vars))); // Parse message through template @@ -465,16 +507,13 @@ public function send($method = NOTIFY_EMAIL, $break = false) * Event to modify notification message text after parsing * * @event core.modify_notification_message - * @var bool break Flag indicating if the function only formats the subject - * and the message without sending it * @var Symfony\Component\Mime\Email email The Symfony Email object * @var string message The message text - * @var int method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH * @var string subject The message subject * @since 3.1.11-RC1 - * @changed 4.0.0-a1 Added vars: email. + * @changed 4.0.0-a1 Added vars: email. Removed vars: method, break. */ - $vars = ['break', 'email', 'message', 'method', 'subject']; + $vars = ['email', 'message', 'subject']; extract($this->dispatcher->trigger_event('core.modify_notification_message', compact($vars))); $this->email = $email; @@ -489,30 +528,39 @@ public function send($method = NOTIFY_EMAIL, $break = false) // do this here because the subject may contain a variable $drop_header = ''; $match = []; - if (preg_match('#^(Subject:(.*?))$#m', $this->msg, $match)) + if (preg_match('#^(Subject):(.*?)$#m', $this->msg, $match)) { $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); - $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); + $drop_header .= '[\r\n]*?' . preg_quote($match[0], '#'); } else { $this->subject = (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); } - if (preg_match('#^(List-Unsubscribe:(.*?))$#m', $this->msg, $match)) + if (preg_match('#^(List-Unsubscribe):(.*?)$#m', $this->msg, $match)) { - $this->headers->addTextHeader('List-Unsubscribe', trim($match[2])); - $drop_header .= '[\r\n]*?' . preg_quote($match[1], '#'); + $drop_header .= '[\r\n]*?' . preg_quote($match[0], '#'); + $this->additional_headers[$match[1]] = trim($match[2]); } if ($drop_header) { $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); } + } - $this->email->subject($this->subject); - $this->email->text($this->msg); - + /** + * Send the mail out to the recipients + * + * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH + * @param bool $break Flag indicating if the function only formats the subject + * and the message without sending it + * @return bool + */ + public function send($method = NOTIFY_EMAIL, $break = false) + { + $this->prepare_message(); if ($break) { return true; @@ -617,13 +665,13 @@ protected function build_header() $board_contact = $this->config['board_contact']; if (empty($this->email->getReplyTo())) { - $this->replyto = $board_contact; + $this->replyto($board_contact); $headers['Reply-To'] = $this->replyto; } if (empty($this->email->getFrom())) { - $this->from = $board_contact; + $this->from($board_contact); $headers['From'] = $this->from; } @@ -647,12 +695,7 @@ protected function build_header() foreach ($headers as $header => $value) { - // addMailboxListHeader() requires value to be array - if ($this->get_header_method($header) == 'addMailboxListHeader') - { - $value = [$value]; - } - $this->headers->addHeader($header, $value); + $this->header($header, $value); } return true; @@ -719,15 +762,10 @@ public function set_transport() if ($this->config['smtp_delivery'] && !in_array($this->dsn, ['null://null', 'sendmail://default'])) { // Set ssl context options, see http://php.net/manual/en/context.ssl.php - $verify_peer = (bool) $this->config['smtp_verify_peer']; - $verify_peer_name = (bool) $this->config['smtp_verify_peer_name']; - $allow_self_signed = (bool) $this->config['smtp_allow_self_signed']; - $options = [ - 'ssl' => [ - 'verify_peer' => $verify_peer, - 'verify_peer_name' => $verify_peer_name, - 'allow_self_signed' => $allow_self_signed, - ] + $options['ssl'] = [ + 'verify_peer' => (bool) $this->config['smtp_verify_peer'], + 'verify_peer_name' => (bool) $this->config['smtp_verify_peer_name'], + 'allow_self_signed' => (bool) $this->config['smtp_allow_self_signed'], ]; $this->transport->getStream()->setStreamOptions($options); } @@ -776,6 +814,9 @@ protected function msg_email() $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); $board_contact = $this->config['board_contact']; + $this->email->subject($this->subject); + $this->email->text($this->msg); + $break = false; $subject = $this->subject; $msg = $this->msg; @@ -811,15 +852,19 @@ protected function msg_email() if (empty($this->email->getReplyto())) { - $this->email->replyTo(new Address($board_contact)); + $this->replyto($board_contact); } if (empty($this->email->getFrom())) { - $this->email->from(new Address($board_contact)); + $this->from($board_contact); } // Build header + foreach ($this->additional_headers as $header_name => $header_value) + { + $this->header($header_name, $header_value); + } $this->build_header(); // Send message ... From df5b7fd66e9da5964683b51069d15fc7dc5219ff Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 5 Jun 2023 22:47:14 +0700 Subject: [PATCH 0556/1214] [ticket/17135] Refactor messenger code to services [ci skip] PHPBB3-17135 --- phpBB/config/default/container/services.yml | 1 + .../default/container/services_messenger.yml | 46 ++ phpBB/phpbb/messenger/method/base.php | 408 +++++++++++++ phpBB/phpbb/messenger/method/email.php | 576 ++++++++++++++++++ .../messenger/method/jabber.php} | 247 ++++++-- 5 files changed, 1213 insertions(+), 65 deletions(-) create mode 100644 phpBB/config/default/container/services_messenger.yml create mode 100644 phpBB/phpbb/messenger/method/base.php create mode 100644 phpBB/phpbb/messenger/method/email.php rename phpBB/{includes/functions_jabber.php => phpbb/messenger/method/jabber.php} (79%) diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 8a4336e832d..c09f21b5c6a 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -19,6 +19,7 @@ imports: - { resource: services_http.yml } - { resource: services_language.yml } - { resource: services_mention.yml } + - { resource: services_messenger.yml } - { resource: services_migrator.yml } - { resource: services_mimetype_guesser.yml } - { resource: services_module.yml } diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml new file mode 100644 index 00000000000..659a4fa558f --- /dev/null +++ b/phpBB/config/default/container/services_messenger.yml @@ -0,0 +1,46 @@ +parameters: + core.messenger_queue_file: '%core.cache_dir%queue.%core.php_ext%' + +services: + messenger.method_collection: + class: phpbb\di\service_collection + arguments: + - '@service_container' + tags: + - { name: service_collection, tag: messenger.method, class_name_aware: true } + + messenger.method_base: + class: phpbb\messenger\method\base + shared: false + arguments: + - '@config' + - '@dispatcher' + - '@language' + - '@log' + - '@request' + - '@user' + - '@messenger.queue' + + messenger.method_email: + class: phpbb\messenger\method\email + shared: false + parent: messenger.method_base + calls: + - [init, []] + - [set_transport, []] + + messenger.method_jabber: + class: phpbb\messenger\method\jabber + shared: false + parent: messenger.method_base + calls: + - [init, []] + + messenger.queue: + class: phpbb\messenger\queue + shared: false + arguments: + - '@config' + - '@dispatcher' + - '@messenger.method_collection' + - '%core.messenger_queue_file%' diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php new file mode 100644 index 00000000000..507b5beea8d --- /dev/null +++ b/phpBB/phpbb/messenger/method/base.php @@ -0,0 +1,408 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\messenger\method; + +use phpbb\config\config; +use phpbb\event\dispatcher; +use phpbb\language\language; +use phpbb\log\log_interface; +use phpbb\request\request; +use phpbb\messenger\queue; +use phpbb\template\template; +use phpbb\user; + +/** + * Messenger base class + */ +class base +{ + /** @var array */ + protected $additional_headers = []; + + /** @var array */ + protected $addresses = []; + + /** @var config */ + protected $config; + + /** @var dispatcher */ + protected $dispatcher; + + /** @var language */ + protected $language; + + /** @var log_interface */ + protected $log; + + /** @var string */ + protected $msg = ''; + + /** @var queue */ + protected $queue; + + /** @var request */ + protected $request; + + /** @var string */ + protected $subject = ''; + + /** @var template */ + protected $template; + + /** @var bool */ + protected $use_queue = true; + + /** @var user */ + protected $user; + + /** + * Messenger base class constructor + * + * @param config $config + * @param dispatcher $dispatcher + * @param language $language + * @param log_interface $log + * @param request $request + * @param user $user + * @param queue $queue + */ + function __construct(config $config, dispatcher $dispatcher, language $language, log_interface $log, request $request, user $user, queue $queue) + { + $this->config = $config; + $this->dispatcher = $dispatcher; + $this->language = $language; + $this->log = $log; + $this->request = $request; + $this->user = $user; + $this->queue = $queue; + + $this->set_use_queue(); + } + + /** + * Sets the use of messenger queue flag + * + * @return void + */ + public function set_use_queue($use_queue = true) + { + $this->use_queue = $use_queue; + } + + /** + * Resets all the data (address, template file, etc etc) to default + * + * @return void + */ + public function reset() + { + $this->addresses = []; + $this->msg = ''; + } + + /** + * Set addresses for to/im as available + * + * @param array $user User row + * @return void + */ + public function set_addresses($user) + { + } + + /** + * Set up subject for mail + * + * @param string $subject Email subject + * @return void + */ + public function subject($subject = '') + { + $this->subject = $subject; + } + + /** + * Set email template to use + * + * @param string $template_file Email template file name + * @param string $template_lang Email template language + * @param string $template_path Email template path + * @param string $template_dir_prefix Email template directory prefix + * + * @return bool + */ + public function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '') + { + $template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix; + + $this->setup_template(); + + if (!trim($template_file)) + { + trigger_error('No template file for emailing set.', E_USER_ERROR); + } + + if (!trim($template_lang)) + { + // fall back to board default language if the user's language is + // missing $template_file. If this does not exist either, + // $this->template->set_filenames will do a trigger_error + $template_lang = basename($this->config['default_lang']); + } + + $ext_template_paths = [ + [ + 'name' => $template_lang . '_email', + 'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix, + ], + ]; + + if ($template_path) + { + $template_paths = [ + $template_path . $template_dir_prefix, + ]; + } + else + { + $template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; + $template_path .= $template_lang . '/email'; + + $template_paths = [ + $template_path . $template_dir_prefix, + ]; + + $board_language = basename($this->config['default_lang']); + + // we can only specify default language fallback when the path is not a custom one for which we + // do not know the default language alternative + if ($template_lang !== $board_language) + { + $fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; + $fallback_template_path .= $board_language . '/email'; + + $template_paths[] = $fallback_template_path . $template_dir_prefix; + + $ext_template_paths[] = [ + 'name' => $board_language . '_email', + 'ext_path' => 'language/' . $board_language . '/email' . $template_dir_prefix, + ]; + } + // If everything fails just fall back to en template + if ($template_lang !== 'en' && $board_language !== 'en') + { + $fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; + $fallback_template_path .= 'en/email'; + + $template_paths[] = $fallback_template_path . $template_dir_prefix; + + $ext_template_paths[] = [ + 'name' => 'en_email', + 'ext_path' => 'language/en/email' . $template_dir_prefix, + ]; + } + } + + $this->set_template_paths($ext_template_paths, $template_paths); + + $this->template->set_filenames([ + 'body' => $template_file . '.txt', + ]); + + return true; + } + + /** + * Assign variables to email template + * + * @param array $vars Array of VAR => VALUE to assign to email template + * @return void + */ + public function assign_vars($vars) + { + $this->setup_template(); + + $this->template->assign_vars($vars); + } + + /** + * Assign block of variables to email template + * + * @param string $blockname Template block name + * @param array $vars Array of VAR => VALUE to assign to email template block + * @return void + */ + public function assign_block_vars($blockname, $vars) + { + $this->setup_template(); + + $this->template->assign_block_vars($blockname, $vars); + } + + /** + * Prepare message before sending out to the recipients + * + * @return void + */ + public function prepare_message() + { + // We add some standard variables we always use, no need to specify them always + $this->assign_vars([ + 'U_BOARD' => generate_board_url(), + 'EMAIL_SIG' => str_replace('
                            ', "\n", "-- \n" . html_entity_decode($this->config['board_email_sig'], ENT_COMPAT)), + 'SITENAME' => html_entity_decode($this->config['sitename'], ENT_COMPAT), + ]); + + $subject = $this->email->getSubject(); + $template = $this->template; + /** + * Event to modify the template before parsing + * + * @event core.modify_notification_template + * @var string subject The message subject + * @var \phpbb\template\template template The (readonly) template object + * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: method, break. + */ + $vars = ['subject', 'template']; + extract($this->dispatcher->trigger_event('core.modify_notification_template', compact($vars))); + + // Parse message through template + $message = trim($this->template->assign_display('body')); + + /** + * Event to modify notification message text after parsing + * + * @event core.modify_notification_message + * @var string message The message text + * @var string subject The message subject + * @since 3.1.11-RC1 + * @changed 4.0.0-a1 Removed vars: method, break. + */ + $vars = ['message', 'subject']; + extract($this->dispatcher->trigger_event('core.modify_notification_message', compact($vars))); + + $this->subject = $subject; + $this->msg = $message; + unset($subject, $message, $template); + + // Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding + $this->msg = str_replace("\r\n", "\n", $this->msg); + + // We now try and pull a subject from the email body ... if it exists, + // do this here because the subject may contain a variable + $drop_header = ''; + $match = []; + if (preg_match('#^(Subject):(.*?)$#m', $this->msg, $match)) + { + $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $this->language->lang('NO_EMAIL_SUBJECT')); + $drop_header .= '[\r\n]*?' . preg_quote($match[0], '#'); + } + else + { + $this->subject = (($this->subject != '') ? $this->subject : $this->language->lang('NO_EMAIL_SUBJECT')); + } + + if (preg_match('#^(List-Unsubscribe):(.*?)$#m', $this->msg, $match)) + { + $drop_header .= '[\r\n]*?' . preg_quote($match[0], '#'); + $this->additional_headers[$match[1]] = trim($match[2]); + } + + if ($drop_header) + { + $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); + } + } + + /** + * Add error message to log + * + * @param string $type Error type: EMAIL / etc + * @param string $msg Error message text + * @return void + */ + public function error($type, $msg) + { + // Session doesn't exist, create it + if (!isset($this->user->session_id) || $this->user->session_id === '') + { + $this->user->session_begin(); + } + + $calling_page = html_entity_decode($this->request->server('PHP_SELF'), ENT_COMPAT); + $message = '' . $type . '
                            ' . htmlspecialchars($calling_page, ENT_COMPAT) . '

                            ' . $msg . '
                            '; + $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]); + } + + /** + * Save message data to the messemger file queue + * @return void + */ + public function save_queue() + { + $this->queue->save(); + return; + } + + /** + * Setup template engine + * + * @return void + */ + protected function setup_template() + { + if ($this->template instanceof \phpbb\template\template) + { + return; + } + + $template_environment = new \phpbb\template\twig\environment( + $this->config, + $this->phpbb_container->get('filesystem'), + $this->phpbb_container->get('path_helper'), + $this->phpbb_container->getParameter('core.template.cache_path'), + $this->phpbb_container->get('ext.manager'), + new \phpbb\template\twig\loader(), + $this->dispatcher, + [] + ); + $template_environment->setLexer($this->phpbb_container->get('template.twig.lexer')); + + $this->template = new \phpbb\template\twig\twig( + $this->phpbb_container->get('path_helper'), + $this->config, + new \phpbb\template\context(), + $template_environment, + $this->phpbb_container->getParameter('core.template.cache_path'), + $this->user, + $this->phpbb_container->get('template.twig.extensions.collection'), + $this->phpbb_container->get('ext.manager') + ); + } + + /** + * Set template paths to load + * + * @param string $path_name Email template path name + * @param string $paths Email template paths + * @return void + */ + protected function set_template_paths($path_name, $paths) + { + $this->setup_template(); + + $this->template->set_custom_style($path_name, $paths); + } +} diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php new file mode 100644 index 00000000000..039591feb7a --- /dev/null +++ b/phpBB/phpbb/messenger/method/email.php @@ -0,0 +1,576 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\messenger\method; + +use Symfony\Component\Mailer\Transport; +use Symfony\Component\Mailer\Mailer; +use Symfony\Component\Mime\Address; +use Symfony\Component\Mime\Email; +use Symfony\Component\Mime\Header\Headers; + +/** + * Messenger class + */ +class email extends base +{ + /** @var array */ + private const PRIORITY_MAP = [ + Email::PRIORITY_HIGHEST => 'Highest', + Email::PRIORITY_HIGH => 'High', + Email::PRIORITY_NORMAL => 'Normal', + Email::PRIORITY_LOW => 'Low', + Email::PRIORITY_LOWEST => 'Lowest', + ]; + + /** @var array */ + private const HEADER_CLASS_MAP = [ + 'date' => DateHeader::class, + 'from' => MailboxListHeader::class, + 'sender' => MailboxHeader::class, + 'reply-to' => MailboxListHeader::class, + 'to' => MailboxListHeader::class, + 'cc' => MailboxListHeader::class, + 'bcc' => MailboxListHeader::class, + 'message-id' => IdentificationHeader::class, + 'in-reply-to' => UnstructuredHeader::class, + 'references' => UnstructuredHeader::class, + 'return-path' => PathHeader::class, + ]; + + /** + * @var string + * + * Symfony Mailer transport DSN + */ + protected $dsn = ''; + + /** @var string */ + protected $from; + + /** @var Symfony\Component\Mime\Header\Headers */ + protected $headers; + + /** + * @var int + * + * Possible values are: + * Email::PRIORITY_HIGHEST + * Email::PRIORITY_HIGH + * Email::PRIORITY_NORMAL + * Email::PRIORITY_LOW + * Email::PRIORITY_LOWEST + */ + protected $mail_priority = Email::PRIORITY_NORMAL; + + /** @var queue */ + protected $queue; + + /** @var string */ + protected $replyto = ''; + + /** @var Symfony\Component\Mailer\Transport */ + protected $transport; + + /** + * Check if the messenger method is enabled + * @return void + */ + public function is_enabled() + { + return (bool) $this->config['email_enable']; + } + + /** + * Inits/resets the data to default + * + * @return void + */ + public function init() + { + $this->email = new Email(); + $this->headers = $this->email->getHeaders(); + $this->msg = $this->replyto = $this->from = ''; + $this->mail_priority = Email::PRIORITY_NORMAL; + } + + /** + * Sets the use of messenger queue flag + * + * @return void + */ + public function set_use_queue($use_queue = true) + { + $this->use_queue = !$this->config['email_package_size'] ? false : $use_queue; + } + + /** + * Set address as available + * + * @param array $user User row + * @return void + */ + public function set_addresses($user) + { + if (isset($user['user_email']) && $user['user_email']) + { + $this->to($user['user_email'], $user['username'] ?: ''); + } + } + + /** + * Sets email address to send to + * + * @param string $address Email "To" recipient address + * @param string $realname Email "To" recipient name + * @return void + */ + public function to($address, $realname = '') + { + if (!$address = trim($address)) + { + return; + } + + // If empty sendmail_path on windows, PHP changes the to line + $windows_empty_sendmail_path = !$this->config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\'; + + $to = new Address($address, $windows_empty_sendmail_path ? '' : trim($realname)); + $this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to); + } + + /** + * Sets cc address to send to + * + * @param string $address Email carbon copy recipient address + * @param string $realname Email carbon copy recipient name + * @return void + */ + public function cc($address, $realname = '') + { + if (!$address = trim($address)) + { + return; + } + + $cc = new Address($address, trim($realname)); + $this->email->getCc() ? $this->email->addCc($to) : $this->email->cc($to); + } + + /** + * Sets bcc address to send to + * + * @param string $address Email black carbon copy recipient address + * @param string $realname Email black carbon copy recipient name + * @return void + */ + public function bcc($address, $realname = '') + { + if (!$address = trim($address)) + { + return; + } + + $bcc = new Address($address, trim($realname)); + $this->email->getBcc() ? $this->email->addBcc($to) : $this->email->bcc($to); + } + + /** + * Set the reply to address + * + * @param string $address Email "Reply to" address + * @return void + */ + public function replyto($address) + { + $this->replyto = new Address(trim($address)); + $this->email->getReplyTo() ? $this->email->addReplyTo($this->replyto) : $this->email->replyTo($this->replyto); + } + + /** + * Set the from address + * + * @param string $address Email "from" address + * @return void + */ + public function from($address) + { + $this->from = new Address(trim($address)); + $this->email->getFrom() ? $this->email->addFrom($this->from) : $this->email->from($this->from); + } + + /** + * Set up subject for mail + * + * @param string $subject Email subject + * @return void + */ + public function subject($subject = '') + { + parent::subject(trim($subject)); + $this->email->subject($this->subject); + } + + /** + * Set up extra mail headers + * + * @param string $header_name Email header name + * @param string $header_value Email header body + * @return void + */ + public function header($header_name, $header_value) + { + $header_name = trim($header_name); + $header_value = trim($header_value); + + // addMailboxListHeader() requires value to be array + if ($this->get_header_method($header_name) == 'addMailboxListHeader') + { + $header_value = [$header_value]; + } + $this->headers->addHeader($header_name, $header_value); + } + + /** + * Adds X-AntiAbuse headers + * + * @param \phpbb\config\config $config Config object + * @param \phpbb\user $user User object + * @return void + */ + public function anti_abuse_headers($config, $user) + { + $this->header('X-AntiAbuse', 'Board servername - ' . $config['server_name']); + $this->header('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); + $this->header('X-AntiAbuse', 'Username - ' . $user->data['username']); + $this->header('X-AntiAbuse', 'User IP - ' . $user->ip); + } + + /** + * Set the email priority + * + * Possible values are: + * Email::PRIORITY_HIGHEST = 1 + * Email::PRIORITY_HIGH = 2 + * Email::PRIORITY_NORMAL = 3 + * Email::PRIORITY_LOW = 4 + * Email::PRIORITY_LOWEST = 5 + * + * @param int $priority Email priority level + * @return void + */ + public function set_mail_priority($priority = Email::PRIORITY_NORMAL) + { + $this->email->priority($priority); + } + + /** + * Add error message to log + * + * @param string $msg Error message text + * @return void + */ + public function error($msg) + { + $type = 'EMAIL/' . ($this->config['smtp_delivery']) ? 'SMTP' : 'PHP/mail()'; + parent::error($type, $msg); + } + + /** + * Save message data to the messenger file queue + * @return void + */ + public function save_queue() + { + if ($this->config['email_package_size'] && $this->use_queue && !empty($this->queue)) + { + $this->queue->save(); + return; + } + } + + /** + * Detect proper Header class method to add header + * + * @param string $name Email header name + * @return string + */ + protected function get_header_method(string $name) + { + $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class); + $method = 'add'.ucfirst(array_pop($parts)); + if ('addUnstructuredHeader' === $method) + { + $method = 'addTextHeader'; + } + else if ('addIdentificationHeader' === $method) + { + $method = 'addIdHeader'; + } + + return $method; + } + + /** + * Set email headers + * + * @return bool + */ + protected function build_header() + { + $headers = []; + + $board_contact = $this->config['board_contact']; + if (empty($this->email->getReplyTo())) + { + $this->replyto($board_contact); + $headers['Reply-To'] = $this->replyto; + } + + if (empty($this->email->getFrom())) + { + $this->from($board_contact); + $headers['From'] = $this->from; + } + + $headers['Return-Path'] = new Address($this->config['board_email']); + $headers['Sender'] = new Address($this->config['board_email']); + $headers['X-Priority'] = sprintf('%d (%s)', $this->mail_priority, self::PRIORITY_MAP[$this->mail_priority]); + $headers['X-MSMail-Priority'] = self::PRIORITY_MAP[$this->mail_priority]; + $headers['X-Mailer'] = 'phpBB3'; + $headers['X-MimeOLE'] = 'phpBB3'; + $headers['X-phpBB-Origin'] = 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()); + + /** + * Event to modify email header entries + * + * @event core.modify_email_headers + * @var array headers Array containing email header entries + * @since 3.1.11-RC1 + */ + $vars = ['headers']; + extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars))); + + foreach ($headers as $header => $value) + { + $this->header($header, $value); + } + + return true; + } + + /** + * Generates valid DSN for Symfony Mailer transport + * + * @param string $dsn Symfony Mailer transport DSN + * @return void + */ + public function set_dsn($dsn = '') + { + if (!empty($dsn)) + { + $this->dsn = $dsn; + } + else if ($this->config['smtp_delivery']) + { + if (empty($this->config['smtp_host'])) + { + $this->dsn = 'null://null'; + } + else + { + $user = urlencode($this->config['smtp_username']); + $password = urlencode($this->config['smtp_password']); + $smtp_host = urlencode($this->config['smtp_host']); + $smtp_port = $this->config['smtp_port']; + + $this->dsn = "smtp://$user:$password@$smtp_host:$smtp_port"; + } + } + else + { + $this->dsn = 'sendmail://default'; + } + } + + /** + * Get Symfony Mailer transport DSN + * + * @return void + */ + public function get_dsn() + { + return $this->dsn; + } + + /** + * Generates a valid transport to send email + * + * @return void + */ + public function set_transport() + { + if (empty($this->dsn)) + { + $this->set_dsn(); + } + + $this->transport = Transport::fromDsn($this->dsn); + + if ($this->config['smtp_delivery'] && !in_array($this->dsn, ['null://null', 'sendmail://default'])) + { + // Set ssl context options, see http://php.net/manual/en/context.ssl.php + $options['ssl'] = [ + 'verify_peer' => (bool) $this->config['smtp_verify_peer'], + 'verify_peer_name' => (bool) $this->config['smtp_verify_peer_name'], + 'allow_self_signed' => (bool) $this->config['smtp_allow_self_signed'], + ]; + $this->transport->getStream()->setStreamOptions($options); + } + } + + /** + * Get mailer transport object + * + * @return Symfony\Component\Mailer\Transport Symfony Mailer transport object + */ + public function get_transport() + { + return $this->transport; + } + + /** + * Send out emails + * + * @return bool + */ + protected function send() + { + $this->prepare_message(); + + $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); + $board_contact = trim($this->config['board_contact']); + + $this->email->subject($this->subject); + $this->email->text($this->msg); + + $subject = $this->subject; + $msg = $this->msg; + $email = $this->email; + /** + * Event to send message via external transport + * + * @event core.notification_message_email + * @var string subject The message subject + * @var string msg The message text + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, break + */ + $vars = [ + 'subject', + 'msg', + 'email', + ]; + extract($this->dispatcher->trigger_event('core.notification_message_email', compact($vars))); + + if (empty($this->email->getReplyto())) + { + $this->replyto($board_contact); + } + + if (empty($this->email->getFrom())) + { + $this->from($board_contact); + } + + // Build headers + foreach ($this->additional_headers as $header_name => $header_value) + { + $this->header($header_name, $header_value); + } + $this->build_header(); + + // Send message ... + if (!$this->use_queue) + { + $mailer = new Mailer($this->transport); + + $subject = $this->subject; + $msg = $this->msg; + $headers = $this->headers; + $email = $this->email; + /** + * Modify data before sending out emails with PHP's mail function + * + * @event core.phpbb_mail_before + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var string headers The email headers + * @since 3.3.6-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters. + */ + $vars = [ + 'email', + 'subject', + 'msg', + 'headers', + ]; + extract($this->dispatcher->trigger_event('core.phpbb_mail_before', compact($vars))); + + $this->subject = $subject; + $this->msg = $msg; + $this->headers = $headers; + $this->email = $email; + + try + { + $mailer->send($this->email); + } + catch (TransportExceptionInterface $e) + { + $this->error($e->getDebug()); + return false; + } + + /** + * Execute code after sending out emails with PHP's mail function + * + * @event core.phpbb_mail_after + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var string headers The email headers + * @since 3.3.6-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters, $result. + */ + $vars = [ + 'email', + 'subject', + 'msg', + 'headers', + ]; + extract($this->dispatcher->trigger_event('core.phpbb_mail_after', compact($vars))); + } + else + { + $this->queue->init('email', $this->config['email_package_size']); + $this->queue->put('email', [ + 'email' => $this->email, + ]); + } + + return true; + } +} diff --git a/phpBB/includes/functions_jabber.php b/phpBB/phpbb/messenger/method/jabber.php similarity index 79% rename from phpBB/includes/functions_jabber.php rename to phpBB/phpbb/messenger/method/jabber.php index 282e6105a2c..2e7f2040da4 100644 --- a/phpBB/includes/functions_jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -1,35 +1,30 @@ -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\messenger\method; /** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* -* Jabber class from Flyspray project -* -* @version class.jabber2.php 1595 2008-09-19 (0.9.9) -* @copyright 2006 Flyspray.org -* @author Florian Schmitz (floele) -* -* Only slightly modified by Acyd Burn -*/ -class jabber + * + * Based on Jabber class from Flyspray project + * + * @version class.jabber2.php 1595 2008-09-19 (0.9.9) + * @copyright 2006 Flyspray.org + * @author Florian Schmitz (floele) + * + * Slightly modified by Acyd Burn (2006) + * Refactored to a service (2023) + */ +class jabber extends base { /** @var string */ protected $connect_server; @@ -70,6 +65,9 @@ class jabber /** @var int */ protected $timeout = 10; + /** @var array */ + protected $to = []; + /** @var bool */ protected $use_ssl = false; @@ -80,25 +78,49 @@ class jabber private const STREAM_CLOSE_HANDSHAKE = '                            '; /** - * Jabber class constructor - * - * Use (username() call should go before server() - * and ssl() call should go before port() and stream_options()): + * Set initial parameter values + * To init correctly, username() call should go before server() + * and ssl() call should go before port() and stream_options() calls. * - * new jabber() - * -> username($username) - * -> password($password) - * -> ssl($use_ssl) - * -> server($server) - * -> port($port) - * -> stream_options( + * Example: + * $this->username($username) + * ->password($password) + * ->ssl($use_ssl) + * ->server($server) + * ->port($port) + * ->stream_options( * 'verify_peer' => true, * 'verify_peer_name' => true, * 'allow_self_signed' => false, * ); + * + * @return void */ - function __construct() + public function init() { + $this->username($this->config['jab_username']) + ->password($this->config['jab_password']) + ->ssl((bool) $this->config['jab_use_ssl']) + ->server($this->config['jab_host']) + ->port($this->config['jab_port']) + ->stream_options['ssl'] = [ + 'verify_peer' => $this->config['jab_verify_peer'], + 'verify_peer_name' => $this->config['jab_verify_peer_name'], + 'allow_self_signed' => $this->config['jab_allow_self_signed'], + ]; + } + + /** + * Check if the messenger method is enabled + * @return void + */ + public function is_enabled() + { + return + empty($this->config['jab_enable']) || + empty($this->config['jab_host']) || + empty($this->config['jab_username']) || + empty($this->config['jab_password']); } /** @@ -112,12 +134,8 @@ public function stream_options($options = []) { if ($this->use_ssl) { - // Set default stream options and change it if needed - $this->stream_options['ssl'] = array_merge([ - 'verify_peer' => true, - 'verify_peer_name' => true, - 'allow_self_signed' => false, - ], $options); + // Change default stream options if needed + $this->stream_options['ssl'] = array_merge($this->stream_options['ssl'], $options); } return $this; @@ -131,7 +149,7 @@ public function stream_options($options = []) */ public function password($password = '') { - $this->password = $password; + $this->password = html_entity_decode($password, ENT_COMPAT); return $this; } @@ -263,8 +281,8 @@ public function connect() if ($this->open_socket($this->connect_server, $this->port)) { - $this->send("\n"); - $this->send("\n"); + $this->send_xml("\n"); + $this->send_xml("\n"); } else { @@ -331,6 +349,105 @@ public function login() return $this->response($this->features); } + /** + * Set address as available + * + * @param array $user User row + * @return void + */ + public function set_addresses($user) + { + if (isset($user['user_jabber']) && $user['user_jabber']) + { + $this->to($user['user_jabber'], (isset($user['username']) ? $user['username'] : '')); + } + } + + /** + * Sets jabber contact to send message to + * + * @param string $address Jabber "To" recipient address + * @param string $realname Jabber "To" recipient name + * @return void + */ + public function to($address, $realname = '') + { + // IM-Addresses could be empty + if (!trim($address)) + { + return; + } + + $pos = !empty($this->to) ? count($this->to) : 0; + $this->to[$pos]['uid'] = trim($address); + $this->to[$pos]['name'] = trim($realname); + } + + /** + * Sets the use of messenger queue flag + * + * @return void + */ + public function set_use_queue($use_queue = true) + { + $this->use_queue = !$this->config['jab_package_size'] ? false : $use_queue; + } + + /** + * Send jabber message out + */ + public function send() + { + $this->prepare_message(); + + if (empty($this->to)) + { + $this->add_to_log('Error: Could not send, recepient addresses undefined.'); + return false; + } + + $addresses = []; + foreach ($this->to as $uid_ary) + { + $addresses[] = $uid_ary['uid']; + } + $addresses = array_unique($addresses); + + if (!$this->use_queue) + { + if (!$this->connect()) + { + $this->error('JABBER', $this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->get_log()); + return false; + } + + if (!$this->login()) + { + $this->error('JABBER', $this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->get_log()); + return false; + } + + foreach ($addresses as $address) + { + $this->send_message($address, $this->msg, $this->subject); + } + + $this->disconnect(); + } + else + { + $this->queue->init('jabber', $this->config['jab_package_size']); + $this->queue->put('jabber', array( + 'addresses' => $addresses, + 'subject' => $this->subject, + 'msg' => $this->msg) + ); + } + unset($addresses); + + return true; + } + /** * Send data to the Jabber server * @@ -338,7 +455,7 @@ public function login() * * @return bool */ - public function send($xml) + public function send_xml($xml) { if ($this->connected()) { @@ -459,7 +576,7 @@ public function register() return false; } - $this->send(""); + $this->send_xml(""); return $this->response($this->listen()); } @@ -488,7 +605,7 @@ function send_presence($message = '', $type = '', $unavailable = false) $this->session['sent_presence'] = !$unavailable; - return $this->send("" . $type . $message . ''); + return $this->send_xml("" . $type . $message . ''); } /** @@ -567,7 +684,7 @@ function response($xml) // session required? $this->session['sess_required'] = isset($xml['stream:features'][0]['#']['session']); - $this->send(" + $this->send_xml(" " . utf8_htmlspecialchars($this->resource) . ' @@ -579,7 +696,7 @@ function response($xml) if (!$this->session['ssl'] && self::can_use_tls() && self::can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls'])) { $this->add_to_log('Switching to TLS.'); - $this->send("\n"); + $this->send_xml("\n"); return $this->response($this->listen()); } @@ -605,18 +722,18 @@ function response($xml) if (in_array('DIGEST-MD5', $methods)) { - $this->send(""); + $this->send_xml(""); } else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls']))) { // http://www.ietf.org/rfc/rfc4616.txt (PLAIN SASL Mechanism) - $this->send("" + $this->send_xml("" . base64_encode($this->username . '@' . $this->server . chr(0) . $this->username . chr(0) . $this->password) . ''); } else if (in_array('ANONYMOUS', $methods)) { - $this->send(""); + $this->send_xml(""); } else { @@ -653,7 +770,7 @@ function response($xml) // second challenge? if (isset($decoded['rspauth'])) { - $this->send(""); + $this->send_xml(""); } else { @@ -680,7 +797,7 @@ function response($xml) } } - $this->send("" . base64_encode($this->implode_data($response)) . ''); + $this->send_xml("" . base64_encode($this->implode_data($response)) . ''); } return $this->response($this->listen()); @@ -707,15 +824,15 @@ function response($xml) $this->session['tls'] = true; // new stream - $this->send("\n"); - $this->send("\n"); + $this->send_xml("\n"); + $this->send_xml("\n"); return $this->response($this->listen()); break; case 'success': // Yay, authentication successful. - $this->send("\n"); + $this->send_xml("\n"); $this->session['authenticated'] = true; // we have to wait for another response @@ -738,7 +855,7 @@ function response($xml) // and (maybe) yet another request to be able to send messages *finally* if ($this->session['sess_required']) { - $this->send(" + $this->send_xml(" "); return $this->response($this->listen()); @@ -752,7 +869,7 @@ function response($xml) break; case 'reg_1': - $this->send(" + $this->send_xml(" " . utf8_htmlspecialchars($this->username) . " " . utf8_htmlspecialchars($this->password) . " @@ -829,7 +946,7 @@ public function send_message($to, $text, $subject = '', $type = 'normal') $type = 'normal'; } - return $this->send(" + return $this->send_xml(" " . utf8_htmlspecialchars($subject) . " " . utf8_htmlspecialchars($text) . " " From 5be1f5d5c9db05d2329d10701e2b72bb7e5d2986 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 6 Jun 2023 12:54:15 +0700 Subject: [PATCH 0557/1214] [ticket/17135] Refactor messenger code to services [ci skip] PHPBB3-17135 --- .../default/container/services_console.yml | 2 + .../default/container/services_cron.yml | 5 +- .../default/container/services_messenger.yml | 14 ++-- .../container/services_notification.yml | 2 + .../config/default/container/services_ucp.yml | 1 + .../container/services_install_finish.yml | 2 - phpBB/memberlist.php | 28 +++---- phpBB/phpbb/console/command/user/activate.php | 31 ++++---- phpBB/phpbb/console/command/user/add.php | 32 ++++---- phpBB/phpbb/cron/task/core/queue.php | 36 ++++----- .../install_finish/task/notify_user.php | 78 ++++++++----------- phpBB/phpbb/message/form.php | 4 +- phpBB/phpbb/message/message.php | 72 +++++++++-------- phpBB/phpbb/messenger/method/base.php | 42 ++++++++-- phpBB/phpbb/messenger/method/email.php | 23 +++--- phpBB/phpbb/messenger/method/jabber.php | 10 +++ phpBB/phpbb/notification/method/email.php | 30 +++++-- phpBB/phpbb/notification/method/jabber.php | 18 +++-- .../notification/method/messenger_base.php | 56 +++++++------ phpBB/phpbb/ucp/controller/reset_password.php | 42 +++++----- 20 files changed, 294 insertions(+), 234 deletions(-) diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 6c85e22f9ae..704c122d597 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -331,6 +331,7 @@ services: - '@user_loader' - '%core.root_path%' - '%core.php_ext%' + - '@messenger.method_collection' tags: - { name: console.command } @@ -344,6 +345,7 @@ services: - '@passwords.manager' - '%core.root_path%' - '%core.php_ext%' + - '@messenger.method_collection' tags: - { name: console.command } diff --git a/phpBB/config/default/container/services_cron.yml b/phpBB/config/default/container/services_cron.yml index a19ed9900d4..85d5c1631f3 100644 --- a/phpBB/config/default/container/services_cron.yml +++ b/phpBB/config/default/container/services_cron.yml @@ -86,10 +86,9 @@ services: cron.task.core.queue: class: phpbb\cron\task\core\queue arguments: - - '%core.root_path%' - - '%core.php_ext%' - '@config' - - '%core.cache_dir%' + - '@messenger.queue' + - '%core.messenger_queue_file%' calls: - [set_name, [cron.task.core.queue]] tags: diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index 659a4fa558f..83037d6427e 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -9,7 +9,7 @@ services: tags: - { name: service_collection, tag: messenger.method, class_name_aware: true } - messenger.method_base: + messenger.method.base: class: phpbb\messenger\method\base shared: false arguments: @@ -21,20 +21,24 @@ services: - '@user' - '@messenger.queue' - messenger.method_email: + messenger.method.email: class: phpbb\messenger\method\email shared: false - parent: messenger.method_base + parent: messenger.method.base calls: - [init, []] - [set_transport, []] + tags: + - { name: messenger.method } - messenger.method_jabber: + messenger.method.jabber: class: phpbb\messenger\method\jabber shared: false - parent: messenger.method_base + parent: messenger.method.base calls: - [init, []] + tags: + - { name: messenger.method } messenger.queue: class: phpbb\messenger\queue diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index 92592850f9c..0ac9dc6a885 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -229,6 +229,7 @@ services: - '%core.root_path%' - '%core.php_ext%' - '%tables.notification_emails%' + - '@messenger.method_collection' tags: - { name: notification.method } @@ -241,6 +242,7 @@ services: - '@config' - '%core.root_path%' - '%core.php_ext%' + - '@messenger.method_collection' tags: - { name: notification.method } diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index acd78f8440f..6321e431dbf 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -26,6 +26,7 @@ services: - '%tables.users%' - '%core.root_path%' - '%core.php_ext%' + - '@messenger.method_collection' phpbb.ucp.controller.webpush: class: phpbb\ucp\controller\webpush diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml index b200118e113..c9acdad0254 100644 --- a/phpBB/config/installer/container/services_install_finish.yml +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -23,8 +23,6 @@ services: - '@installer.helper.container_factory' - '@installer.helper.config' - '@installer.helper.iohandler' - - '%core.root_path%' - - '%core.php_ext%' tags: - { name: install_finish, order: 3 } diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 28b1adbdeec..f61fd215024 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -428,8 +428,6 @@ if (check_form_key('memberlist_messaging')) { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']); $message = $request->variable('message', '', true); @@ -438,22 +436,22 @@ trigger_error('EMPTY_MESSAGE_IM'); } - $messenger = new messenger(false); - - $messenger->template('profile_send_im', $row['user_lang']); - $messenger->subject(html_entity_decode($subject, ENT_COMPAT)); + $messenger = $phpbb_container->get('messenger.method_collection'); + $jabber = $messenger->offsetGet('messenger.method.jabber'); + $jabber->set_use_queue(false); - $messenger->replyto($user->data['user_email']); - $messenger->set_addresses($row); + $jabber->template('profile_send_im', $row['user_lang']); + $jabber->subject(html_entity_decode($subject, ENT_COMPAT)); + $jabber->set_addresses($row); - $messenger->assign_vars(array( + $jabber->assign_vars([ 'BOARD_CONTACT' => phpbb_get_board_contact($config, $phpEx), 'FROM_USERNAME' => html_entity_decode($user->data['username'], ENT_COMPAT), 'TO_USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), - 'MESSAGE' => html_entity_decode($message, ENT_COMPAT)) - ); + 'MESSAGE' => html_entity_decode($message, ENT_COMPAT), + ]); - $messenger->send(NOTIFY_IM); + $jabber->send(); $s_select = 'S_SENT_JABBER'; } @@ -903,10 +901,7 @@ case 'contactadmin': case 'email': - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } + $messenger = $phpbb_container->get('messenger.method_collection'); $user_id = $request->variable('u', 0); $topic_id = $request->variable('t', 0); @@ -940,7 +935,6 @@ if ($request->is_set_post('submit')) { - $messenger = new messenger(false); $form->submit($messenger); } diff --git a/phpBB/phpbb/console/command/user/activate.php b/phpBB/phpbb/console/command/user/activate.php index 1d635b46dc5..9157206e0a7 100644 --- a/phpBB/phpbb/console/command/user/activate.php +++ b/phpBB/phpbb/console/command/user/activate.php @@ -20,6 +20,7 @@ use phpbb\notification\manager; use phpbb\user; use phpbb\user_loader; +use phpbb\di\service_collection; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -58,6 +59,9 @@ class activate extends command */ protected $php_ext; + /** @var service_collection */ + protected $messenger; + /** * Construct method * @@ -69,8 +73,9 @@ class activate extends command * @param user_loader $user_loader * @param string $phpbb_root_path * @param string $php_ext + * @param service_collection $messenger */ - public function __construct(user $user, config $config, language $language, log_interface $log, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext) + public function __construct(user $user, config $config, language $language, log_interface $log, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext, service_collection $messenger) { $this->config = $config; $this->language = $language; @@ -79,6 +84,7 @@ public function __construct(user $user, config $config, language $language, log_ $this->user_loader = $user_loader; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; + $this->messenger = $messenger; $this->language->add_lang('acp/users'); parent::__construct($user); @@ -194,20 +200,15 @@ protected function send_notification($user_row, InputInterface $input) if ($input->getOption('send-email')) { - if (!class_exists('messenger')) - { - require($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); - } - - $messenger = new \messenger(false); - $messenger->template('admin_welcome_activated', $user_row['user_lang']); - $messenger->set_addresses($user_row); - $messenger->anti_abuse_headers($this->config, $this->user); - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT)) - ); - - $messenger->send(NOTIFY_EMAIL); + $email = $this->messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template('admin_welcome_activated', $user_row['user_lang']); + $email->set_addresses($user_row); + $email->anti_abuse_headers($this->config, $this->user); + $email->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + ]); + $email->send(); } } } diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index c01aac7cb68..3a54cc409f4 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -20,6 +20,7 @@ use phpbb\language\language; use phpbb\passwords\manager; use phpbb\user; +use phpbb\di\service_collection; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; @@ -59,6 +60,9 @@ class add extends command */ protected $php_ext; + /** @var service_collection */ + protected $messenger; + /** * Construct method * @@ -69,8 +73,9 @@ class add extends command * @param manager $password_manager * @param string $phpbb_root_path * @param string $php_ext + * @param service_collection $messenger */ - public function __construct(user $user, driver_interface $db, config $config, language $language, manager $password_manager, $phpbb_root_path, $php_ext) + public function __construct(user $user, driver_interface $db, config $config, language $language, manager $password_manager, $phpbb_root_path, $php_ext, service_collection $messenger) { $this->db = $db; $this->config = $config; @@ -78,6 +83,7 @@ public function __construct(user $user, driver_interface $db, config $config, la $this->password_manager = $password_manager; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; + $this->messenger = $messenger; $this->language->add_lang('ucp'); parent::__construct($user); @@ -307,24 +313,18 @@ protected function send_activation_email($user_id) $user_actkey = $this->get_activation_key($user_id); - if (!class_exists('messenger')) - { - require($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); - } - - $messenger = new \messenger(false); - $messenger->template($email_template, $this->user->lang_name); - $messenger->to($this->data['email'], $this->data['username']); - $messenger->anti_abuse_headers($this->config, $this->user); - $messenger->assign_vars(array( + $email = $this->messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template($email_template, $this->user->lang_name); + $email->to($this->data['email'], $this->data['username']); + $email->anti_abuse_headers($this->config, $this->user); + $email->assign_vars([ 'WELCOME_MSG' => html_entity_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($this->data['username'], ENT_COMPAT), 'PASSWORD' => html_entity_decode($this->data['new_password'], ENT_COMPAT), - 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey") - ); - - $messenger->send(NOTIFY_EMAIL); - } + 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey", + ]); + $email->send(); /** * Get user activation key diff --git a/phpBB/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php index 2f0d91d0464..5e1f0d1be9d 100644 --- a/phpBB/phpbb/cron/task/core/queue.php +++ b/phpBB/phpbb/cron/task/core/queue.php @@ -13,30 +13,35 @@ namespace phpbb\cron\task\core; +use \phpbb\config\config; +use \phpbb\messenger\queue; + /** * Queue cron task. Sends email and jabber messages queued by other scripts. */ class queue extends \phpbb\cron\task\base { - protected $phpbb_root_path; - protected $php_ext; - protected $cache_dir; + /** var config */ protected $config; + /** var queue */ + protected $queue; + + /** var string */ + protected $queue_cache_file; + /** * Constructor. * - * @param string $phpbb_root_path The root path - * @param string $php_ext PHP file extension - * @param \phpbb\config\config $config The config - * @param string $cache_dir phpBB cache directory + * @param config $config The config + * @param string $queue_cache_file The messenger file queue cache filename + * @param queue $queue The messenger file queue object */ - public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $config, $cache_dir) + public function __construct(config $config, queue $queue, $queue_cache_file) { - $this->phpbb_root_path = $phpbb_root_path; - $this->php_ext = $php_ext; $this->config = $config; - $this->cache_dir = $cache_dir; + $this->queue = $queue; + $this->queue_cache_file = $queue_cache_file; } /** @@ -46,12 +51,7 @@ public function __construct($phpbb_root_path, $php_ext, \phpbb\config\config $co */ public function run() { - if (!class_exists('queue')) - { - include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); - } - $queue = new \queue(); - $queue->process(); + $this->queue->process(); } /** @@ -63,7 +63,7 @@ public function run() */ public function is_runnable() { - return file_exists($this->cache_dir . 'queue.' . $this->php_ext); + return file_exists($this->queue_cache_file); } /** diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php index 6fb7bc2743f..4d3402a6f53 100644 --- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php +++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php @@ -14,62 +14,48 @@ namespace phpbb\install\module\install_finish\task; use phpbb\config\db; +use phpbb\install\helper\config; +use phpbb\install\helper\iohandler\iohandler_interface; +use phpbb\auth\auth; +use phpbb\log\log_interface; +use phpbb\user; +use phpbb\install\helper\container_factory; +use phpbb\di\service_collection; /** * Logs installation and sends an email to the admin */ class notify_user extends \phpbb\install\task_base { - /** - * @var \phpbb\install\helper\config - */ + /** @var config */ protected $install_config; - /** - * @var \phpbb\install\helper\iohandler\iohandler_interface - */ + /** @var iohandler_interface */ protected $iohandler; - /** - * @var \phpbb\auth\auth - */ + /** @var auth */ protected $auth; - /** - * @var db - */ + /** @var db */ protected $config; - /** - * @var \phpbb\log\log_interface - */ + /** @var log_interface */ protected $log; - /** - * @var \phpbb\user - */ + /** @var user */ protected $user; - /** - * @var string - */ - protected $phpbb_root_path; - - /** - * @var string - */ - protected $php_ext; + /** @var service_collection */ + protected $messenger; /** * Constructor * - * @param \phpbb\install\helper\container_factory $container - * @param \phpbb\install\helper\config $install_config - * @param \phpbb\install\helper\iohandler\iohandler_interface $iohandler - * @param string $phpbb_root_path - * @param string $php_ext + * @param container_factory $container + * @param config $install_config + * @param iohandler_interface $iohandler */ - public function __construct(\phpbb\install\helper\container_factory $container, \phpbb\install\helper\config $install_config, \phpbb\install\helper\iohandler\iohandler_interface $iohandler, $phpbb_root_path, $php_ext) + public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler) { $this->install_config = $install_config; $this->iohandler = $iohandler; @@ -77,8 +63,7 @@ public function __construct(\phpbb\install\helper\container_factory $container, $this->auth = $container->get('auth'); $this->log = $container->get('log'); $this->user = $container->get('user'); - $this->phpbb_root_path = $phpbb_root_path; - $this->php_ext = $php_ext; + $this->messenger = $container->get('messenger.method_collection'); // We need to reload config for cases when it doesn't have all values /** @var \phpbb\cache\driver\driver_interface $cache */ @@ -107,17 +92,16 @@ public function run() if ($this->config['email_enable']) { - include ($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); - - $messenger = new \messenger(false); - $messenger->template('installed', $this->install_config->get('user_language', 'en')); - $messenger->to($this->config['board_email'], $this->install_config->get('admin_name')); - $messenger->anti_abuse_headers($this->config, $this->user); - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($this->install_config->get('admin_name'), ENT_COMPAT), - 'PASSWORD' => html_entity_decode($this->install_config->get('admin_passwd'), ENT_COMPAT)) - ); - $messenger->send(NOTIFY_EMAIL); + $email = $this->messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template('installed', $this->install_config->get('user_language', 'en')); + $email->to($this->config['board_email'], $this->install_config->get('admin_name')); + $email->anti_abuse_headers($this->config, $this->user); + $email->assign_vars([ + 'USERNAME' => html_entity_decode($this->install_config->get('admin_name'), ENT_COMPAT), + 'PASSWORD' => html_entity_decode($this->install_config->get('admin_passwd'), ENT_COMPAT), + ]); + $email->send(); } // Login admin @@ -141,7 +125,7 @@ public function run() $this->user->ip, 'LOG_INSTALL_INSTALLED', false, - array($this->config['version']) + [$this->config['version']] ); // Remove install_lock diff --git a/phpBB/phpbb/message/form.php b/phpBB/phpbb/message/form.php index c23b1689065..479d6872121 100644 --- a/phpBB/phpbb/message/form.php +++ b/phpBB/phpbb/message/form.php @@ -129,10 +129,10 @@ public function bind(\phpbb\request\request_interface $request) /** * Submit form, generate the email and send it * - * @param \messenger $messenger + * @param \phpbb\di\service_collection $messenger * @return void */ - public function submit(\messenger $messenger) + public function submit(\phpbb\di\service_collection $messenger) { if (!check_form_key('memberlist_email')) { diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 554fe48a124..23960d47788 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -138,10 +138,10 @@ public function add_recipient($recipient_name, $recipient_address, $recipient_la { $this->recipients[] = array( 'name' => $recipient_name, - 'address' => $recipient_address, + 'user_email' => $recipient_address, 'lang' => $recipient_lang, 'username' => $recipient_username, - 'jabber' => $recipient_jabber, + 'user_jabber' => $recipient_jabber, 'notify_type' => $recipient_notify_type, 'to_name' => $recipient_name, ); @@ -220,10 +220,10 @@ public function cc_sender() $this->recipients[] = array( 'lang' => $this->sender_lang, - 'address' => $this->sender_address, + 'user_email' => $this->sender_address, 'name' => $this->sender_name, 'username' => $this->sender_username, - 'jabber' => $this->sender_jabber, + 'user_jabber' => $this->sender_jabber, 'notify_type' => $this->sender_notify_type, 'to_name' => $this->recipients[0]['to_name'], ); @@ -232,11 +232,11 @@ public function cc_sender() /** * Send the email * - * @param \messenger $messenger + * @param \phpbb\di\service_collection $messenger * @param string $contact * @return void */ - public function send(\messenger $messenger, $contact) + public function send(\phpbb\di\service_collection $messenger, $contact) { if (!count($this->recipients)) { @@ -245,38 +245,46 @@ public function send(\messenger $messenger, $contact) foreach ($this->recipients as $recipient) { - $messenger->template($this->template, $recipient['lang']); - $messenger->replyto($this->sender_address); - $messenger->to($recipient['address'], $recipient['name']); - $messenger->im($recipient['jabber'], $recipient['username']); + $messenger_collection_iterator = $this->messenger->getIterator(); + while ($messenger_collection_iterator->valid()) + { + $messenger_method = $messenger_collection_iterator->current(); + $messenger_method->set_use_queue(false); + if ($messenger_method->get_id() == $recipient['notify_type'] || $recipient['notify_type'] == NOTIFY_BOTH) + { + $messenger_method->template($this->template, $recipient['lang']); + $messenger_method->set_addresses($recipient); + $messenger_method->replyto($this->sender_address); - $messenger->headers('X-AntiAbuse', 'Board servername - ' . $this->server_name); - $messenger->headers('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + $messenger_method->headers('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger_method->headers('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + if ($this->sender_id) + { + $messenger_method->headers('X-AntiAbuse', 'User_id - ' . $this->sender_id); + } + if ($this->sender_username) + { + $messenger_method->headers('X-AntiAbuse', 'Username - ' . $this->sender_username); + } - if ($this->sender_id) - { - $messenger->headers('X-AntiAbuse', 'User_id - ' . $this->sender_id); - } - if ($this->sender_username) - { - $messenger->headers('X-AntiAbuse', 'Username - ' . $this->sender_username); - } + $messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT)); - $messenger->subject(html_entity_decode($this->subject, ENT_COMPAT)); + $messenger_method->assign_vars([ + 'BOARD_CONTACT' => $contact, + 'TO_USERNAME' => html_entity_decode($recipient['to_name'], ENT_COMPAT), + 'FROM_USERNAME' => html_entity_decode($this->sender_name, ENT_COMPAT), + 'MESSAGE' => html_entity_decode($this->body, ENT_COMPAT), + ]); - $messenger->assign_vars(array( - 'BOARD_CONTACT' => $contact, - 'TO_USERNAME' => html_entity_decode($recipient['to_name'], ENT_COMPAT), - 'FROM_USERNAME' => html_entity_decode($this->sender_name, ENT_COMPAT), - 'MESSAGE' => html_entity_decode($this->body, ENT_COMPAT)) - ); + if (count($this->template_vars)) + { + $messenger_method->assign_vars($this->template_vars); + } - if (count($this->template_vars)) - { - $messenger->assign_vars($this->template_vars); + $messenger_method->send(); + } + $messenger_collection_iterator->next(); } - - $messenger->send($recipient['notify_type']); } } } diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 507b5beea8d..d743d00b48e 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -132,6 +132,38 @@ public function subject($subject = '') $this->subject = $subject; } + /** + * Adds antiabuse headers + * + * @param \phpbb\config\config $config Config object + * @param \phpbb\user $user User object + * @return void + */ + public function anti_abuse_headers($config, $user) + { + } + + /** + * Set up extra headers + * + * @param string $header_name Email header name + * @param string $header_value Email header body + * @return void + */ + public function header($header_name, $header_value) + { + } + + /** + * Set the reply to address + * + * @param string $address Email "Reply to" address + * @return void + */ + public function replyto($address) + { + } + /** * Set email template to use * @@ -232,7 +264,6 @@ public function template($template_file, $template_lang = '', $template_path = ' public function assign_vars($vars) { $this->setup_template(); - $this->template->assign_vars($vars); } @@ -352,13 +383,15 @@ public function error($type, $msg) */ public function save_queue() { - $this->queue->save(); - return; + if ($this->use_queue && !empty($this->queue)) + { + $this->queue->save(); + return; + } } /** * Setup template engine - * * @return void */ protected function setup_template() @@ -402,7 +435,6 @@ protected function setup_template() protected function set_template_paths($path_name, $paths) { $this->setup_template(); - $this->template->set_custom_style($path_name, $paths); } } diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 039591feb7a..f6683e82d03 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -82,6 +82,16 @@ class email extends base /** @var Symfony\Component\Mailer\Transport */ protected $transport; + /** + * Get messenger method id + * + * @return int + */ + public function get_id() + { + return NOTIFY_EMAIL; + } + /** * Check if the messenger method is enabled * @return void @@ -286,19 +296,6 @@ public function error($msg) parent::error($type, $msg); } - /** - * Save message data to the messenger file queue - * @return void - */ - public function save_queue() - { - if ($this->config['email_package_size'] && $this->use_queue && !empty($this->queue)) - { - $this->queue->save(); - return; - } - } - /** * Detect proper Header class method to add header * diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index 2e7f2040da4..33a8d19eb3e 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -110,6 +110,16 @@ public function init() ]; } + /** + * Get messenger method id + * + * @return int + */ + public function get_id() + { + return NOTIFY_IM; + } + /** * Check if the messenger method is enabled * @return void diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index cffd259c0e4..dd181ac5a3e 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -14,6 +14,11 @@ namespace phpbb\notification\method; use phpbb\notification\type\type_interface; +use phpbb\user; +use phpbb\user_loader; +use phpbb\config\config; +use phpbb\db\driver\driver_interface; +use phpbb\di\service_collection; /** * Email notification method class @@ -34,20 +39,33 @@ class email extends \phpbb\notification\method\messenger_base /** @var string Notification emails table */ protected $notification_emails_table; + /** @var service_collection */ + protected $messenger; + /** * Notification Method email Constructor * - * @param \phpbb\user_loader $user_loader - * @param \phpbb\user $user - * @param \phpbb\config\config $config - * @param \phpbb\db\driver\driver_interface $db + * @param user_loader $user_loader + * @param user $user + * @param config $config + * @param driver_interface $db * @param string $phpbb_root_path * @param string $php_ext * @param string $notification_emails_table + * @param service_collection $messenger */ - public function __construct(\phpbb\user_loader $user_loader, \phpbb\user $user, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, $phpbb_root_path, $php_ext, $notification_emails_table) + public function __construct( + user_loader $user_loader, + user $user, + config $config, + driver_interface $db, + $phpbb_root_path, + $php_ext, + $notification_emails_table, + service_collection $messenger + ) { - parent::__construct($user_loader, $phpbb_root_path, $php_ext); + parent::__construct($messenger, $user_loader, $phpbb_root_path, $php_ext); $this->user = $user; $this->config = $config; diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php index 9a1aadb9a0d..57651521393 100644 --- a/phpBB/phpbb/notification/method/jabber.php +++ b/phpBB/phpbb/notification/method/jabber.php @@ -14,6 +14,10 @@ namespace phpbb\notification\method; use phpbb\notification\type\type_interface; +use phpbb\user; +use phpbb\user_loader; +use phpbb\config\config; +use phpbb\di\service_collection; /** * Jabber notification method class @@ -28,18 +32,22 @@ class jabber extends \phpbb\notification\method\messenger_base /** @var \phpbb\config\config */ protected $config; + /** @var service_collection */ + protected $messenger; + /** * Notification Method jabber Constructor * - * @param \phpbb\user_loader $user_loader - * @param \phpbb\user $user - * @param \phpbb\config\config $config + * @param user_loader $user_loader + * @param user $user + * @param config $config * @param string $phpbb_root_path * @param string $php_ext + * @param service_collection $messenger */ - public function __construct(\phpbb\user_loader $user_loader, \phpbb\user $user, \phpbb\config\config $config, $phpbb_root_path, $php_ext) + public function __construct(user_loader $user_loader, user $user, config $config, $phpbb_root_path, $php_ext, service_collection $messenger) { - parent::__construct($user_loader, $phpbb_root_path, $php_ext); + parent::__construct($messenger, $user_loader, $phpbb_root_path, $php_ext); $this->user = $user; $this->config = $config; diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 85461b282d3..0d9b3c163b5 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -14,6 +14,8 @@ namespace phpbb\notification\method; use phpbb\notification\type\type_interface; +use phpbb\di\service_collection; +use phpbb\user_loader; /** * Abstract notification method handling email and jabber notifications @@ -21,7 +23,10 @@ */ abstract class messenger_base extends \phpbb\notification\method\base { - /** @var \phpbb\user_loader */ + /** @var service_collection */ + protected $messenger; + + /** @var user_loader */ protected $user_loader; /** @var string */ @@ -33,12 +38,14 @@ abstract class messenger_base extends \phpbb\notification\method\base /** * Notification Method Board Constructor * - * @param \phpbb\user_loader $user_loader + * @param service_collection $messenger + * @param user_loader $user_loader * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(\phpbb\user_loader $user_loader, $phpbb_root_path, $php_ext) + public function __construct(service_collection $messenger, user_loader $user_loader, $phpbb_root_path, $php_ext) { + $this->messenger = $messenger; $this->user_loader = $user_loader; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -73,7 +80,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = } // Load all users we want to notify (we need their email address) - $user_ids = array(); + $user_ids = []; foreach ($this->queue as $notification) { $user_ids[] = $notification->user_id; @@ -89,13 +96,6 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = // Load all the users we need $this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE)); - // Load the messenger - if (!class_exists('messenger')) - { - include($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); - } - $messenger = new \messenger(); - // Time to go through the queue and send emails /** @var type_interface $notification */ foreach ($this->queue as $notification) @@ -112,22 +112,28 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = continue; } - $messenger->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix); - - $messenger->set_addresses($user); - - $messenger->assign_vars(array_merge(array( - 'USERNAME' => $user['username'], - - 'U_NOTIFICATION_SETTINGS' => generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options', - ), $notification->get_email_template_variables())); - - $messenger->send($notify_method); + $messenger_collection_iterator = $this->messenger->getIterator(); + while ($messenger_collection_iterator->valid()) + { + $messenger_method = $messenger_collection_iterator->current(); + if ($messenger_method->get_id() == $notify_method || $notify_method == NOTIFY_BOTH) + { + $messenger_method->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix); + $messenger_method->set_addresses($user); + $messenger_method->assign_vars(array_merge([ + 'USERNAME' => $user['username'], + 'U_NOTIFICATION_SETTINGS' => generate_board_url() . '/ucp.' . $this->php_ext . '?i=ucp_notifications&mode=notification_options', + ], $notification->get_email_template_variables())); + + $messenger_method->send(); + + // Save the queue in the messenger method class (has to be called or these messages could be lost) + $messenger_method->save_queue(); + } + $messenger_collection_iterator->next(); + } } - // Save the queue in the messenger class (has to be called or these emails could be lost?) - $messenger->save_queue(); - // We're done, empty the queue $this->empty_queue(); } diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 64c43a5d00a..ae01972d7f7 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -25,6 +25,7 @@ use phpbb\request\request; use phpbb\template\template; use phpbb\user; +use phpbb\di\service_collection; use Symfony\Component\HttpFoundation\Response; /** @@ -71,6 +72,9 @@ class reset_password /** @var string PHP extension */ protected $php_ext; + /** @var service_collection */ + protected $messenger; + /** * Reset password controller constructor. * @@ -87,11 +91,12 @@ class reset_password * @param string $users_table * @param string $root_path * @param string $php_ext + * @param service_collection $messenger */ public function __construct(config $config, driver_interface $db, dispatcher $dispatcher, helper $helper, language $language, log_interface $log, manager $passwords_manager, request $request, template $template, user $user, string $users_table, - string $root_path, string $php_ext) + string $root_path, string $php_ext, service_collection $messenger) { $this->config = $config; $this->db = $db; @@ -106,6 +111,7 @@ public function __construct(config $config, driver_interface $db, dispatcher $di $this->users_table = $users_table; $this->root_path = $root_path; $this->php_ext = $php_ext; + $this->messenger = $messenger; } /** @@ -250,29 +256,19 @@ public function request() WHERE user_id = ' . $user_row['user_id']; $this->db->sql_query($sql); - if (!class_exists('messenger')) - { - include($this->root_path . 'includes/functions_messenger.' . $this->php_ext); - } - - /** @var \messenger $messenger */ - $messenger = new \messenger(false); - - $messenger->template('user_forgot_password', $user_row['user_lang']); - - $messenger->set_addresses($user_row); - - $messenger->anti_abuse_headers($this->config, $this->user); - - $messenger->assign_vars([ - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_RESET_PASSWORD' => generate_board_url(true) . $this->helper->route('phpbb_ucp_reset_password_controller', [ - 'u' => $user_row['user_id'], - 'token' => $reset_token, - ], false) + $email = $this->messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template('user_forgot_password', $user_row['user_lang']); + $email->set_addresses($user_row); + $email->anti_abuse_headers($this->config, $this->user); + $email->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + 'U_RESET_PASSWORD' => generate_board_url(true) . $this->helper->route('phpbb_ucp_reset_password_controller', [ + 'u' => $user_row['user_id'], + 'token' => $reset_token, + ], false) ]); - - $messenger->send($user_row['user_notify_type']); + $email->send(); return $this->helper->message($message); } From 1f952ca6d84ab48178157d00f887a159d0af4393 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 6 Jun 2023 16:41:55 +0700 Subject: [PATCH 0558/1214] [ticket/17135] Refactor messenger code to services [ci skip] PHPBB3-17135 --- phpBB/includes/ucp/ucp_register.php | 30 ++++++------ phpBB/includes/ucp/ucp_resend.php | 62 +++++++++++++++---------- phpBB/phpbb/message/message.php | 12 ++--- phpBB/phpbb/messenger/method/base.php | 36 ++++++++++---- phpBB/phpbb/messenger/method/email.php | 5 +- phpBB/phpbb/messenger/method/jabber.php | 15 ++++++ 6 files changed, 101 insertions(+), 59 deletions(-) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index b8d0d78b404..734c83089b2 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -458,30 +458,26 @@ function main($id, $mode) if ($config['email_enable']) { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - - $messenger->template($email_template, $data['lang']); - - $messenger->to($data['email'], $data['username']); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $this->messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template($email_template, $data['lang']); + $email->to($data['email'], $data['username']); + $email->anti_abuse_headers($config, $user); + $email->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($data['username'], ENT_COMPAT), 'PASSWORD' => html_entity_decode($data['new_password'], ENT_COMPAT), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey") - ); + 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey", + ]); if ($coppa) { - $messenger->assign_vars(array( + $email->assign_vars([ 'FAX_INFO' => $config['coppa_fax'], 'MAIL_INFO' => $config['coppa_mail'], - 'EMAIL_ADDRESS' => $data['email']) - ); + 'EMAIL_ADDRESS' => $data['email'], + ]); } /** @@ -510,7 +506,7 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_welcome_email_before', compact($vars))); - $messenger->send(NOTIFY_EMAIL); + $email->send(); } if ($config['require_activation'] == USER_ACTIVATION_ADMIN) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 31e08786638..122aeeca377 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -30,7 +30,7 @@ class ucp_resend function main($id, $mode) { global $config, $phpbb_root_path, $phpEx; - global $db, $user, $auth, $template, $request; + global $db, $user, $auth, $template, $request, $phpbb_container; $username = $request->variable('username', '', true); $email = strtolower($request->variable('email', '')); @@ -94,32 +94,33 @@ function main($id, $mode) $coppa = ($row['group_name'] == 'REGISTERED_COPPA' && $row['group_type'] == GROUP_SPECIAL) ? true : false; - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $messenger = new messenger(false); + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa) { - $messenger->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); - $messenger->set_addresses($user_row); + $email->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); + $email->set_addresses($user_row); - $messenger->anti_abuse_headers($config, $user); + $email->anti_abuse_headers($config, $user); - $messenger->assign_vars(array( + $email->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}") - ); + 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", + ]); if ($coppa) { - $messenger->assign_vars(array( + $email->assign_vars([ 'FAX_INFO' => $config['coppa_fax'], 'MAIL_INFO' => $config['coppa_mail'], - 'EMAIL_ADDRESS' => $user_row['user_email']) - ); + 'EMAIL_ADDRESS' => $user_row['user_email'], + ]); } - $messenger->send(NOTIFY_EMAIL); + $email->send(); } if ($config['require_activation'] == USER_ACTIVATION_ADMIN) @@ -132,20 +133,31 @@ function main($id, $mode) WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); $result = $db->sql_query($sql); + $messenger_collection_iterator = $messenger->getIterator(); while ($row = $db->sql_fetchrow($result)) { - $messenger->template('admin_activate', $row['user_lang']); - $messenger->set_addresses($row); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_USER_DETAILS' => generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}") - ); - - $messenger->send($row['user_notify_type']); + while ($messenger_collection_iterator->valid()) + { + $messenger_method = $messenger_collection_iterator->current(); + $messenger_method->set_use_queue(false); + if ($messenger_method->get_id() == $row['user_notify_type'] || $row['user_notify_type'] == NOTIFY_BOTH) + { + $messenger_method->template('admin_activate', $row['user_lang']); + $messenger_method->set_addresses($row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + 'U_USER_DETAILS' => generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", + 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", + ]); + + $messenger_method->send(); + + // Save the queue in the messenger method class (has to be called or these messages could be lost) + $messenger_method->save_queue(); + } + $messenger_collection_iterator->next(); + } } $db->sql_freeresult($result); } diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 23960d47788..2a750c1f21e 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -141,7 +141,7 @@ public function add_recipient($recipient_name, $recipient_address, $recipient_la 'user_email' => $recipient_address, 'lang' => $recipient_lang, 'username' => $recipient_username, - 'user_jabber' => $recipient_jabber, + 'user_jabber' => $recipient_jabber, 'notify_type' => $recipient_notify_type, 'to_name' => $recipient_name, ); @@ -245,7 +245,7 @@ public function send(\phpbb\di\service_collection $messenger, $contact) foreach ($this->recipients as $recipient) { - $messenger_collection_iterator = $this->messenger->getIterator(); + $messenger_collection_iterator = $messenger->getIterator(); while ($messenger_collection_iterator->valid()) { $messenger_method = $messenger_collection_iterator->current(); @@ -256,15 +256,15 @@ public function send(\phpbb\di\service_collection $messenger, $contact) $messenger_method->set_addresses($recipient); $messenger_method->replyto($this->sender_address); - $messenger_method->headers('X-AntiAbuse', 'Board servername - ' . $this->server_name); - $messenger_method->headers('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); if ($this->sender_id) { - $messenger_method->headers('X-AntiAbuse', 'User_id - ' . $this->sender_id); + $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); } if ($this->sender_username) { - $messenger_method->headers('X-AntiAbuse', 'Username - ' . $this->sender_username); + $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); } $messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT)); diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index d743d00b48e..71e0b798d1f 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -25,14 +25,11 @@ /** * Messenger base class */ -class base +abstract class base { /** @var array */ protected $additional_headers = []; - /** @var array */ - protected $addresses = []; - /** @var config */ protected $config; @@ -90,6 +87,15 @@ function __construct(config $config, dispatcher $dispatcher, language $language, $this->set_use_queue(); } + /** + * Get messenger method id + * @return mixed + */ + abstract public function get_id() + { + return; + } + /** * Sets the use of messenger queue flag * @@ -105,10 +111,12 @@ public function set_use_queue($use_queue = true) * * @return void */ - public function reset() + abstract public function reset() { - $this->addresses = []; + $this->subject = $this->additional_headers = []; $this->msg = ''; + $this->use_queue = true; + unset($this->template); } /** @@ -117,7 +125,7 @@ public function reset() * @param array $user User row * @return void */ - public function set_addresses($user) + abstract public function set_addresses($user) { } @@ -164,6 +172,14 @@ public function replyto($address) { } + /** + * Send out messages + * @return bool + */ + abstract protected function send() + { + } + /** * Set email template to use * @@ -295,7 +311,7 @@ public function prepare_message() 'SITENAME' => html_entity_decode($this->config['sitename'], ENT_COMPAT), ]); - $subject = $this->email->getSubject(); + $subject = $this->subject; $template = $this->template; /** * Event to modify the template before parsing @@ -304,7 +320,7 @@ public function prepare_message() * @var string subject The message subject * @var \phpbb\template\template template The (readonly) template object * @since 3.2.4-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: method, break. + * @changed 4.0.0-a1 Removed vars: method, break. */ $vars = ['subject', 'template']; extract($this->dispatcher->trigger_event('core.modify_notification_template', compact($vars))); @@ -378,7 +394,7 @@ public function error($type, $msg) } /** - * Save message data to the messemger file queue + * Save message data to the messenger file queue * @return void */ public function save_queue() diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index f6683e82d03..d8025d431bd 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -106,12 +106,14 @@ public function is_enabled() * * @return void */ - public function init() + public function reset() { $this->email = new Email(); $this->headers = $this->email->getHeaders(); $this->msg = $this->replyto = $this->from = ''; $this->mail_priority = Email::PRIORITY_NORMAL; + + parent::reset(); } /** @@ -567,6 +569,7 @@ protected function send() 'email' => $this->email, ]); } + $this->reset(); return true; } diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index 33a8d19eb3e..439150a013e 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -393,6 +393,19 @@ public function to($address, $realname = '') $this->to[$pos]['name'] = trim($realname); } + /** + * Inits/resets the data to default + * + * @return void + */ + public function reset() + { + $this->msg = ''; + $this->to = []; + + parent::reset(); + } + /** * Sets the use of messenger queue flag * @@ -455,6 +468,8 @@ public function send() } unset($addresses); + $this->reset(); + return true; } From 5873c72ca5dd53d964bc7ab25cce1e24490ed7a4 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 7 Jun 2023 21:16:41 +0700 Subject: [PATCH 0559/1214] [ticket/17135] Refactor messenger code to services [ci skip] PHPBB3-17135 --- phpBB/phpbb/messenger/method/base.php | 19 +++ phpBB/phpbb/messenger/method/email.php | 74 ++++++++ phpBB/phpbb/messenger/method/jabber.php | 88 +++++++++- phpBB/phpbb/messenger/queue.php | 217 ++++++++++++++++++++++++ 4 files changed, 390 insertions(+), 8 deletions(-) create mode 100644 phpBB/phpbb/messenger/queue.php diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 71e0b798d1f..28b9cde636f 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -96,6 +96,15 @@ abstract public function get_id() return; } + /** + * get messenger method fie queue object name + * @return string + */ + abstract public function get_queue_object_name($user) + { + return ''; + } + /** * Sets the use of messenger queue flag * @@ -180,6 +189,16 @@ abstract protected function send() { } + /** + * Send messages from the queue + * + * @param array $queue_data Queue data array + * @return void + */ + abstract public function process_queue(&$queue_data) + { + } + /** * Set email template to use * diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index d8025d431bd..1968c6771ec 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -92,6 +92,15 @@ public function get_id() return NOTIFY_EMAIL; } + /** + * get messenger method fie queue object name + * @return string + */ + abstract public function get_queue_object_name($user) + { + return 'email'; + } + /** * Check if the messenger method is enabled * @return void @@ -438,6 +447,71 @@ public function set_transport() } } + /** + * Send messages from the queue + * + * @param array $queue_data Queue data array + * @return void + */ + public function process_queue(&$queue_data) + { + $queue_object_name = $this->get_queue_object_name(); + $messages_count = count($queue_data[$queue_object_name]['data']; + + if (!$this->is_enabled() || !$messages_count) + { + unset($queue_data[$queue_object_name]); + return; + } + + @set_time_limit(0); + + $package_size = $queue_data[$queue_object_name]['package_size'] ?? 0; + $num_items = (!$package_size || $messages_count < $package_size) ? $messages_count : $package_size; + $mailer = new Mailer($this->transport); + + for ($i = 0; $i < $num_items; $i++) + { + // Make variables available... + extract(array_shift($queue_data[$queue_object_name]['data'])); + + $break = false; + /** + * Event to send message via external transport + * + * @event core.notification_message_process + * @var bool break Flag indicating if the function return after hook + * @var Symfony\Component\Mime\Email email The Symfony Email object + * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, subject, msg. + */ + $vars = [ + 'break', + 'email', + ]; + extract($this->dispatcher->trigger_event('core.notification_message_process', compact($vars))); + + if (!$break) + { + try + { + $mailer->send($email); + } + catch (TransportExceptionInterface $e) + { + $this->error('EMAIL', $e->getDebug()); + continue; + } + } + } + + // No more data for this object? Unset it + if (!count($this->queue_data[$queue_object_name]['data'])) + { + unset($this->queue_data[$queue_object_name]); + } + } + /** * Get mailer transport object * diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index 439150a013e..9661efc64a6 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -120,6 +120,15 @@ public function get_id() return NOTIFY_IM; } + /** + * get messenger method fie queue object name + * @return string + */ + abstract public function get_queue_object_name($user) + { + return 'jabber'; + } + /** * Check if the messenger method is enabled * @return void @@ -127,10 +136,10 @@ public function get_id() public function is_enabled() { return - empty($this->config['jab_enable']) || - empty($this->config['jab_host']) || - empty($this->config['jab_username']) || - empty($this->config['jab_password']); + !empty($this->config['jab_enable']) && + !empty($this->config['jab_host']) && + !empty($this->config['jab_username']) && + !empty($this->config['jab_password']); } /** @@ -416,6 +425,65 @@ public function set_use_queue($use_queue = true) $this->use_queue = !$this->config['jab_package_size'] ? false : $use_queue; } + /** + * Send messages from the queue + * + * @param array $queue_data Queue data array + * @return void + */ + public function process_queue(&$queue_data) + { + $queue_object_name = $this->get_queue_object_name(); + $messages_count = count($queue_data[$queue_object_name]['data']; + + if (!$this->is_enabled() || !$messages_count) + { + unset($queue_data[$queue_object_name]); + return; + } + + @set_time_limit(0); + + $package_size = $queue_data[$queue_object_name]['package_size'] ?? 0; + $num_items = (!$package_size || $messages_count < $package_size) ? $messages_count : $package_size; + $mailer = new Mailer($this->transport); + + for ($i = 0; $i < $num_items; $i++) + { + // Make variables available... + extract(array_shift($queue_data[$queue_object_name]['data'])); + + if (!$this->connect()) + { + $this->error('JABBER', $this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->get_log()); + return false; + } + + if (!$this->login()) + { + $this->error('JABBER', $this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->get_log()); + return false; + } + + foreach ($addresses as $address) + { + if ($this->send_message($address, $msg, $subject) === false) + { + $this->error('JABBER', $this->get_log()); + continue; + } + } + } + + // No more data for this object? Unset it + if (!count($this->queue_data[$queue_object_name]['data'])) + { + unset($this->queue_data[$queue_object_name]); + } + + $this->disconnect(); + } + /** * Send jabber message out */ @@ -452,7 +520,11 @@ public function send() foreach ($addresses as $address) { - $this->send_message($address, $this->msg, $this->subject); + if ($this->send_message($address, $this->msg, $this->subject) === false) + { + $this->error('JABBER', $this->get_log()); + continue; + } } $this->disconnect(); @@ -460,11 +532,11 @@ public function send() else { $this->queue->init('jabber', $this->config['jab_package_size']); - $this->queue->put('jabber', array( + $this->queue->put('jabber', [ 'addresses' => $addresses, 'subject' => $this->subject, - 'msg' => $this->msg) - ); + 'msg' => $this->msg, + ]); } unset($addresses); diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php new file mode 100644 index 00000000000..eb2406e2733 --- /dev/null +++ b/phpBB/phpbb/messenger/queue.php @@ -0,0 +1,217 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\messenger; + +use phpbb\config\config; +use phpbb\event\dispatcher; +use phpbb\di\service_collection; +use phpbb\filesystem\filesystem; + +/** + * Handling messenger file queue + */ +class queue +{ + /** @var string */ + protected $cache_file; + + /** @var config */ + protected $config; + + /** @var array */ + protected $data = []; + + /** @var dispatcher */ + protected $dispatcher; + + /** @var phpbb\filesystem\filesystem_interface */ + protected $filesystem; + + /** @var service_collection */ + protected $messenger_method_collection; + + /** @var int */ + protected $package_size = 0; + + /** @var array */ + protected $queue_data = []; + + /** + * Messenger queue constructor. + * + * @param config $config + * @param dispatcher $dispatcher + * @param service_collection $messenger_method_collection + * @param string $cache_file + */ + function __construct(config $config, dispatcher $dispatcher, service_collection $messenger_method_collection, $cache_file) + { + $this->config = $config; + $this->dispatcher = $dispatcher; + $this->messenger_method_collection = $messenger_method_collection; + $this->filesystem = new filesystem(); + $this->cache_file = $cache_file; + } + + /** + * Init a queue object + * + * @param string $object Queue object type: email/jabber/etc + * @param int $package_size Size of the messenger package to send + * @return void + */ + public function init($object, $package_size) + { + $this->data[$object] = []; + $this->data[$object]['package_size'] = $package_size; + $this->data[$object]['data'] = []; + } + + /** + * Put message into the messenger file queue + * + * @param string $object Queue object type: email/jabber/etc + * @param mixed $message_data Message data to send + * @return void + */ + public function put($object, $message_data) + { + $this->data[$object]['data'][] = $message_data; + } + + /** + * Process the messenger file queue (using lock file) + * + * @return void + */ + public function process() + { + $lock = new \phpbb\lock\flock($this->cache_file); + $lock->acquire(); + + // avoid races, check file existence once + $have_cache_file = file_exists($this->cache_file); + if (!$have_cache_file || $this->config['last_queue_run'] > time() - $this->config['queue_interval']) + { + if (!$have_cache_file) + { + $this->config->set('last_queue_run', time(), false); + } + + $lock->release(); + return; + } + + $this->config->set('last_queue_run', time(), false); + + include($this->cache_file); + + $messenger_collection_iterator = $this->messenger_method_collection->getIterator(); + while ($messenger_collection_iterator->valid()) + { + $messenger_method = $messenger_collection_iterator->current(); + if (isset($this->queue_data[$messenger_method->get_queue_object_name()]) + { + $messenger_method->process_queue($this->queue_data); + } + $messenger_collection_iterator->next(); + } + + if (!count($this->queue_data)) + { + @unlink($this->cache_file); + } + else + { + if ($fp = @fopen($this->cache_file, 'wb')) + { + fwrite($fp, "queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>"); + fclose($fp); + + if (function_exists('opcache_invalidate')) + { + @opcache_invalidate($this->cache_file); + } + + try + { + $this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE); + } + catch (\phpbb\filesystem\exception\filesystem_exception $e) + { + // Do nothing + } + } + } + + $lock->release(); + } + + /** + * Save message data to the messenger file queue + * + * @return void + */ + public function save() + { + if (!count($this->data)) + { + return; + } + + $lock = new \phpbb\lock\flock($this->cache_file); + $lock->acquire(); + + if (file_exists($this->cache_file)) + { + include($this->cache_file); + + foreach ($this->queue_data as $object => $data_ary) + { + if (isset($this->data[$object]) && count($this->data[$object])) + { + $this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']); + } + else + { + $this->data[$object]['data'] = $data_ary['data']; + } + } + } + + if ($fp = @fopen($this->cache_file, 'w')) + { + fwrite($fp, "queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>"); + fclose($fp); + + if (function_exists('opcache_invalidate')) + { + @opcache_invalidate($this->cache_file); + } + + try + { + $this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE); + } + catch (\phpbb\filesystem\exception\filesystem_exception $e) + { + // Do nothing + } + + $this->data = []; + } + + $lock->release(); + } +} From f95816cbe3f331df651140c30d6f82fd3b40dba9 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 8 Jun 2023 15:23:09 +0700 Subject: [PATCH 0560/1214] [ticket/17135] Refactor messenger code to services [ci skip] PHPBB3-17135 --- build/psalm_bootstrap.php | 1 - phpBB/includes/acp/acp_board.php | 18 +++---- phpBB/includes/acp/acp_email.php | 69 ++++++++++++++------------ phpBB/includes/acp/acp_inactive.php | 71 ++++++++++++--------------- phpBB/includes/acp/acp_users.php | 56 ++++++++------------- phpBB/includes/mcp/mcp_pm_reports.php | 2 - phpBB/includes/mcp/mcp_queue.php | 7 --- phpBB/includes/mcp/mcp_reports.php | 2 - phpBB/includes/mcp/mcp_topic.php | 1 - phpBB/includes/ucp/ucp_activate.php | 34 +++++++------ phpBB/includes/ucp/ucp_profile.php | 24 ++++----- tests/email/email_parsing_test.php | 27 +++++----- 12 files changed, 141 insertions(+), 171 deletions(-) diff --git a/build/psalm_bootstrap.php b/build/psalm_bootstrap.php index 03afd6da3d9..92099c77f50 100644 --- a/build/psalm_bootstrap.php +++ b/build/psalm_bootstrap.php @@ -33,7 +33,6 @@ require_once $phpbb_root_path . 'includes/functions_content.' . $phpEx; require_once $phpbb_root_path . 'includes/functions_display.' . $phpEx; require_once $phpbb_root_path . 'includes/functions_mcp.' . $phpEx; -require_once $phpbb_root_path . 'includes/functions_messenger.' . $phpEx; require_once $phpbb_root_path . 'includes/functions_module.' . $phpEx; require_once $phpbb_root_path . 'includes/functions_posting.' . $phpEx; require_once $phpbb_root_path . 'includes/functions_privmsgs.' . $phpEx; diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 2afa79b1e65..3537b67737a 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -720,17 +720,17 @@ function main($id, $mode) { if ($config['email_enable']) { - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - $messenger->template('test'); - $messenger->set_addresses($user->data); - $messenger->anti_abuse_headers($config, $user); - $messenger->assign_vars(array( + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template('test'); + $email->set_addresses($user->data); + $email->anti_abuse_headers($config, $user); + $email->assign_vars([ 'USERNAME' => html_entity_decode($user->data['username'], ENT_COMPAT), 'MESSAGE' => html_entity_decode($request->variable('send_test_email_text', '', true), ENT_COMPAT), - )); - $messenger->send(NOTIFY_EMAIL); + ]); + $email->send(); trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action)); } diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index cddf7b33247..23f7885e531 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -182,25 +182,13 @@ function main($id, $mode) } } - // Send the messages - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - - if (!function_exists('get_group_name')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - $messenger = new messenger($use_queue); - $errored = false; $email_template = 'admin_send_email'; - $template_data = array( + $template_data = [ 'CONTACT_EMAIL' => phpbb_get_board_contact($config, $phpEx), 'MESSAGE' => html_entity_decode($message, ENT_COMPAT), - ); + ]; $generate_log_entry = true; /** @@ -229,31 +217,50 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars))); + $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger_collection_iterator = $messenger->getIterator(); for ($i = 0, $size = count($email_list); $i < $size; $i++) { $used_lang = $email_list[$i][0]['lang']; $used_method = $email_list[$i][0]['method']; - for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + while ($messenger_collection_iterator->valid()) { - $email_row = $email_list[$i][$j]; - - $messenger->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']); - $messenger->im($email_row['jabber'], $email_row['name']); - } - - $messenger->template($email_template, $used_lang); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->subject(html_entity_decode($subject, ENT_COMPAT)); - $messenger->set_mail_priority($priority); + $messenger_method = $messenger_collection_iterator->current(); + if ($messenger_method->get_id() == $used_method || $used_method == NOTIFY_BOTH) + { + $messenger_method->set_use_queue($use_queue); + $messenger_method->template($email_template, $used_lang); + $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); + $messenger_method->assign_vars($template_data); - $messenger->assign_vars($template_data); + if ($messenger_method->get_id() == NOTIFY_EMAIL) + { + for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + { + $email_row = $email_list[$i][$j]; + $messenger_method->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']); + } + + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->set_mail_priority($priority); + } + else if ($messenger_method->get_id() == NOTIFY_JABBER) + { + for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + { + $email_row = $email_list[$i][$j]; + $messenger_method->to($email_row['jabber'], $email_row['name']); + } + } - if (!($messenger->send($used_method))) - { - $errored = true; + $errored = !$messenger_method->send(); + if ($use_queue) + { + $messenger_method->save_queue(); + } + } + $messenger_collection_iterator->next(); } } unset($email_list); diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 0301a53c2ba..13427a81915 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -114,29 +114,20 @@ function main($id, $mode) if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users)) { - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - - $messenger = new messenger(false); + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); foreach ($inactive_users as $row) { - $messenger->template('admin_welcome_activated', $row['user_lang']); - - $messenger->set_addresses($row); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT)) - ); - - $messenger->send(NOTIFY_EMAIL); + $email->template('admin_welcome_activated', $row['user_lang']); + $email->set_addresses($row); + $email->anti_abuse_headers($config, $user); + $email->assign_vars([ + 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), + ]); + $email->send(); } - - $messenger->save_queue(); } if (!empty($inactive_users)) @@ -207,37 +198,37 @@ function main($id, $mode) if ($row = $db->sql_fetchrow($result)) { // Send the messages - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - - $messenger = new messenger(); $usernames = $user_ids = array(); + $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger_collection_iterator = $messenger->getIterator(); do { - $messenger->template('user_remind_inactive', $row['user_lang']); - - $messenger->set_addresses($row); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), - 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey']) - ); - - $messenger->send($row['user_notify_type']); + while ($messenger_collection_iterator->valid()) + { + $messenger_method = $messenger_collection_iterator->current(); + if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH) + { + $messenger_method->template('user_remind_inactive', $row['user_lang']); + $messenger_method->set_addresses($row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), + 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), + 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'], + ]); + + $messenger_method->send(); + $messenger_method->save_queue(); + } + $messenger_collection_iterator->next(); + } $usernames[] = $row['username']; $user_ids[] = (int) $row['user_id']; } while ($row = $db->sql_fetchrow($result)); - $messenger->save_queue(); - // Add the remind state to the database and increase activation expiration by one day $sql = 'UPDATE ' . USERS_TABLE . ' SET user_reminded = user_reminded + 1, diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 75b1cde0d81..707e6b55411 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -364,11 +364,6 @@ function main($id, $mode) if ($config['email_enable']) { - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - $server_url = generate_board_url(); $user_actkey = gen_rand_string(mt_rand(6, 10)); @@ -403,21 +398,18 @@ function main($id, $mode) $db->sql_query($sql); // Start sending email - $messenger = new messenger(false); - - $messenger->template($email_template, $user_row['user_lang']); - - $messenger->set_addresses($user_row); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template($email_template, $user_row['user_lang']); + $email->set_addresses($user_row); + $email->anti_abuse_headers($config, $user); + $email->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey") - ); - - $messenger->send(NOTIFY_EMAIL); + 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey", + ]); + $email->send(); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_REACTIVATE', false, array($user_row['username'])); $phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_REACTIVATE_USER', false, array( @@ -462,24 +454,16 @@ function main($id, $mode) $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']); - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - - $messenger = new messenger(false); - - $messenger->template('admin_welcome_activated', $user_row['user_lang']); - - $messenger->set_addresses($user_row); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT)) - ); - - $messenger->send(NOTIFY_EMAIL); + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $messenger->offsetGet('messenger.method.email'); + $email->set_use_queue(false); + $email->template('admin_welcome_activated', $user_row['user_lang']); + $email->set_addresses($user_row); + $email->anti_abuse_headers($config, $user); + $email->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + ]); + $email->send(); } } diff --git a/phpBB/includes/mcp/mcp_pm_reports.php b/phpBB/includes/mcp/mcp_pm_reports.php index 63fabb35db7..afb3cb102d8 100644 --- a/phpBB/includes/mcp/mcp_pm_reports.php +++ b/phpBB/includes/mcp/mcp_pm_reports.php @@ -51,8 +51,6 @@ function main($id, $mode) { case 'close': case 'delete': - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $report_id_list = $request->variable('report_id_list', array(0)); if (!count($report_id_list)) diff --git a/phpBB/includes/mcp/mcp_queue.php b/phpBB/includes/mcp/mcp_queue.php index fbde670bd04..57f6d4c94b8 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -50,8 +50,6 @@ public function main($id, $mode) { case 'approve': case 'restore': - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $post_id_list = $request->variable('post_id_list', array(0)); $topic_id_list = $request->variable('topic_id_list', array(0)); @@ -113,11 +111,6 @@ public function main($id, $mode) return; } - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - if (!empty($topic_id_list)) { $post_visibility = ($mode == 'deleted_topics') ? ITEM_DELETED : array(ITEM_UNAPPROVED, ITEM_REAPPROVE); diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 97d1dbbfdae..7843bc1efe5 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -49,8 +49,6 @@ function main($id, $mode) { case 'close': case 'delete': - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $report_id_list = $request->variable('report_id_list', array(0)); if (!count($report_id_list)) diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php index cad43866fce..d19d1ad9d7c 100644 --- a/phpBB/includes/mcp/mcp_topic.php +++ b/phpBB/includes/mcp/mcp_topic.php @@ -107,7 +107,6 @@ function mcp_topic_view($id, $mode, $action) } include_once($phpbb_root_path . 'includes/functions_posting.' . $phpEx); - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); if (!count($post_id_list)) { diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index da25425e3af..2db88c6934b 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -131,21 +131,25 @@ function main($id, $mode) $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']); - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - - $messenger = new messenger(false); - - $messenger->template('admin_welcome_activated', $user_row['user_lang']); - - $messenger->set_addresses($user_row); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT)) - ); - - $messenger->send($user_row['user_notify_type']); + $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger_collection_iterator = $messenger->getIterator(); + while ($messenger_collection_iterator->valid()) + { + $messenger_method = $messenger_collection_iterator->current(); + if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH) + { + $messenger_method->set_use_queue(false); + $messenger_method->template('admin_welcome_activated', $user_row['user_lang']); + $messenger_method->set_addresses($user_row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + ]); + + $messenger_method->send(); + } + $messenger_collection_iterator->next(); + } $message = 'ACCOUNT_ACTIVE_ADMIN'; } diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 36ccd76156a..c142a2af739 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -170,27 +170,21 @@ function main($id, $mode) { $message = ($config['require_activation'] == USER_ACTIVATION_SELF) ? 'ACCOUNT_EMAIL_CHANGED' : 'ACCOUNT_EMAIL_CHANGED_ADMIN'; - include_once($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - $server_url = generate_board_url(); $user_actkey = gen_rand_string(mt_rand(6, 10)); - $messenger = new messenger(false); - + $messenger = $phpbb_container->get('messenger.method_collection'); + $email = $messenger->offsetGet('messenger.method.email'); $template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate'; - $messenger->template($template_file, $user->data['user_lang']); - - $messenger->to($data['email'], $data['username']); - - $messenger->anti_abuse_headers($config, $user); - - $messenger->assign_vars(array( + $email->template($template_file, $user->data['user_lang']); + $email->to($data['email'], $data['username']); + $email->anti_abuse_headers($config, $user); + $email->assign_vars([ 'USERNAME' => html_entity_decode($data['username'], ENT_COMPAT), - 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey") - ); - - $messenger->send(NOTIFY_EMAIL); + 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey", + ]); + $email->send(); if ($config['require_activation'] == USER_ACTIVATION_ADMIN) { diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index dd7b055ac77..ff0854be211 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -109,14 +109,17 @@ protected function setUp(): void $phpbb_container->setParameter('core.root_path', $phpbb_root_path); $phpbb_container->setParameter('core.php_ext', $phpEx); - if (!class_exists('messenger')) - { - include($phpbb_root_path . 'includes/functions_messenger.' . $phpEx); - } - - $this->messenger = new \messenger(); - - $reflection = new ReflectionObject($this->messenger); + $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; + $phpbb_container->setParameter('core.cache_dir', $core_cache_dir); + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; + $phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $phpbb_container->set('messenger.queue', $messenger_queue); + $this->email = new \phpbb\messenger\email($config, $dispatcher, $lang, $log, $request, $user, $messenger_queue); + + $reflection = new ReflectionObject($this->email); $this->reflection_template_property = $reflection->getProperty('template'); $this->reflection_template_property->setAccessible(true); } @@ -136,9 +139,9 @@ public function test_email_parsing($author_name, $forum_name, $topic_title, $use { global $config, $phpEx, $user; - $this->messenger->set_addresses($user->data); + $this->email->set_addresses($user->data); - $this->messenger->assign_vars(array( + $this->email->assign_vars(array( 'EMAIL_SIG' => str_replace('
                            ', "\n", "-- \n" . html_entity_decode($config['board_email_sig'], ENT_COMPAT)), 'SITENAME' => html_entity_decode($config['sitename'], ENT_COMPAT), @@ -150,9 +153,9 @@ public function test_email_parsing($author_name, $forum_name, $topic_title, $use 'U_FORUM' => generate_board_url() . "/viewforum.{$phpEx}?f=1", 'U_STOP_WATCHING_FORUM' => generate_board_url() . "/viewforum.{$phpEx}?uid=2&f=1&unwatch=forum", )); - $this->messenger->template('newtopic_notify', $user->data['user_lang'], '', ''); + $this->email->template('newtopic_notify', $user->data['user_lang'], '', ''); - $reflection_template = $this->reflection_template_property->getValue($this->messenger); + $reflection_template = $this->reflection_template_property->getValue($this->email); $msg = trim($reflection_template->assign_display('body')); $this->assertStringContainsString($author_name, $msg); From a7b5369138d8bc479688c86d34596c28f4a712e5 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 8 Jun 2023 21:17:01 +0700 Subject: [PATCH 0561/1214] [ticket/17135] Refactor messenger code to services PHPBB3-17135 --- .../default/container/services_messenger.yml | 13 +- .../container/services_install_finish.yml | 1 + phpBB/includes/ucp/ucp_register.php | 2 +- phpBB/phpbb/console/command/user/add.php | 1 + phpBB/phpbb/cron/task/core/queue.php | 9 +- .../install_finish/task/notify_user.php | 7 +- phpBB/phpbb/message/admin_form.php | 2 +- phpBB/phpbb/message/topic_form.php | 2 +- phpBB/phpbb/message/user_form.php | 2 +- phpBB/phpbb/messenger/method/base.php | 116 +++++++++++------- .../method/{email.php => phpbb_email.php} | 82 +++++-------- .../method/{jabber.php => phpbb_jabber.php} | 46 +++---- phpBB/phpbb/messenger/queue.php | 2 +- phpBB/phpbb/notification/method/email.php | 6 +- phpBB/phpbb/notification/method/jabber.php | 4 +- tests/console/user/activate_test.php | 3 +- tests/console/user/add_test.php | 3 +- tests/console/user/base.php | 5 + tests/email/email_parsing_test.php | 15 ++- tests/notification/base.php | 5 + .../notification_method_email_test.php | 8 +- tests/notification/submit_post_base.php | 6 + 22 files changed, 191 insertions(+), 149 deletions(-) rename phpBB/phpbb/messenger/method/{email.php => phpbb_email.php} (88%) rename phpBB/phpbb/messenger/method/{jabber.php => phpbb_jabber.php} (97%) diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index 83037d6427e..ff7df470c42 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -20,23 +20,28 @@ services: - '@request' - '@user' - '@messenger.queue' + - '@path_helper' + - '@ext.manager' + - '@template.twig.extensions.collection' + - '@template.twig.lexer' + - '%core.template.cache_path%' messenger.method.email: - class: phpbb\messenger\method\email + class: phpbb\messenger\method\phpbb_email shared: false parent: messenger.method.base calls: - - [init, []] + - [reset, []] - [set_transport, []] tags: - { name: messenger.method } messenger.method.jabber: - class: phpbb\messenger\method\jabber + class: phpbb\messenger\method\phpbb_jabber shared: false parent: messenger.method.base calls: - - [init, []] + - [reset, []] tags: - { name: messenger.method } diff --git a/phpBB/config/installer/container/services_install_finish.yml b/phpBB/config/installer/container/services_install_finish.yml index c9acdad0254..9eb05b8a44a 100644 --- a/phpBB/config/installer/container/services_install_finish.yml +++ b/phpBB/config/installer/container/services_install_finish.yml @@ -23,6 +23,7 @@ services: - '@installer.helper.container_factory' - '@installer.helper.config' - '@installer.helper.iohandler' + - '%core.root_path%' tags: - { name: install_finish, order: 3 } diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 734c83089b2..92a54a37cb5 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -459,7 +459,7 @@ function main($id, $mode) if ($config['email_enable']) { $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $this->messenger->offsetGet('messenger.method.email'); + $email = $messenger->offsetGet('messenger.method.email'); $email->set_use_queue(false); $email->template($email_template, $data['lang']); $email->to($data['email'], $data['username']); diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 3a54cc409f4..9813608034a 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -325,6 +325,7 @@ protected function send_activation_email($user_id) 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey", ]); $email->send(); + } /** * Get user activation key diff --git a/phpBB/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php index 5e1f0d1be9d..9395a538de3 100644 --- a/phpBB/phpbb/cron/task/core/queue.php +++ b/phpBB/phpbb/cron/task/core/queue.php @@ -13,8 +13,7 @@ namespace phpbb\cron\task\core; -use \phpbb\config\config; -use \phpbb\messenger\queue; +use phpbb\config\config; /** * Queue cron task. Sends email and jabber messages queued by other scripts. @@ -24,7 +23,7 @@ class queue extends \phpbb\cron\task\base /** var config */ protected $config; - /** var queue */ + /** var \phpbb\messenger\queue */ protected $queue; /** var string */ @@ -35,9 +34,9 @@ class queue extends \phpbb\cron\task\base * * @param config $config The config * @param string $queue_cache_file The messenger file queue cache filename - * @param queue $queue The messenger file queue object + * @param \phpbb\messenger\queue $queue The messenger file queue object */ - public function __construct(config $config, queue $queue, $queue_cache_file) + public function __construct(config $config, \phpbb\messenger\queue $queue, $queue_cache_file) { $this->config = $config; $this->queue = $queue; diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php index 4d3402a6f53..8c973311e5e 100644 --- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php +++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php @@ -42,6 +42,9 @@ class notify_user extends \phpbb\install\task_base /** @var log_interface */ protected $log; + /** @var string */ + protected $phpbb_root_path; + /** @var user */ protected $user; @@ -54,8 +57,9 @@ class notify_user extends \phpbb\install\task_base * @param container_factory $container * @param config $install_config * @param iohandler_interface $iohandler + * @param string $phpbb_root_path */ - public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler) + public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler, $phpbb_root_path) { $this->install_config = $install_config; $this->iohandler = $iohandler; @@ -64,6 +68,7 @@ public function __construct(container_factory $container, config $install_config $this->log = $container->get('log'); $this->user = $container->get('user'); $this->messenger = $container->get('messenger.method_collection'); + $this->phpbb_root_path = $phpbb_root_path; // We need to reload config for cases when it doesn't have all values /** @var \phpbb\cache\driver\driver_interface $cache */ diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index ae1c1d8614a..2c3305dc032 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -85,7 +85,7 @@ public function bind(\phpbb\request\request_interface $request) /** * {inheritDoc} */ - public function submit(\messenger $messenger) + public function submit(\phpbb\di\service_collection $messenger) { if (!$this->subject) { diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php index e8344417efe..facde9a4625 100644 --- a/phpBB/phpbb/message/topic_form.php +++ b/phpBB/phpbb/message/topic_form.php @@ -108,7 +108,7 @@ public function bind(\phpbb\request\request_interface $request) /** * {inheritDoc} */ - public function submit(\messenger $messenger) + public function submit(\phpbb\di\service_collection $messenger) { if (!$this->recipient_address || !preg_match('/^' . get_preg_expression('email') . '$/i', $this->recipient_address)) { diff --git a/phpBB/phpbb/message/user_form.php b/phpBB/phpbb/message/user_form.php index 007e5754077..46a012297df 100644 --- a/phpBB/phpbb/message/user_form.php +++ b/phpBB/phpbb/message/user_form.php @@ -96,7 +96,7 @@ public function bind(\phpbb\request\request_interface $request) /** * {inheritDoc} */ - public function submit(\messenger $messenger) + public function submit(\phpbb\di\service_collection $messenger) { if (!$this->subject) { diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 28b9cde636f..4dfbff4559b 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -14,12 +14,16 @@ namespace phpbb\messenger\method; use phpbb\config\config; +use phpbb\di\service_collection; use phpbb\event\dispatcher; +use phpbb\extension\manager; use phpbb\language\language; use phpbb\log\log_interface; +use phpbb\path_helper; use phpbb\request\request; use phpbb\messenger\queue; use phpbb\template\template; +use phpbb\template\twig\lexer; use phpbb\user; /** @@ -36,6 +40,9 @@ abstract class base /** @var dispatcher */ protected $dispatcher; + /** @var manager */ + protected $ext_manager; + /** @var language */ protected $language; @@ -48,6 +55,9 @@ abstract class base /** @var queue */ protected $queue; + /** @var path_helper */ + protected $path_helper; + /** @var request */ protected $request; @@ -57,6 +67,15 @@ abstract class base /** @var template */ protected $template; + /** @var string */ + protected $template_cache_path; + + /** @var service_collection */ + protected $twig_extensions_collection; + + /** @var lexer */ + protected $twig_lexer; + /** @var bool */ protected $use_queue = true; @@ -73,8 +92,26 @@ abstract class base * @param request $request * @param user $user * @param queue $queue + * @param path_helper $path_helper + * @param manager $ext_manager + * @param service_collection $twig_extensions_collection + * @param lexer $twig_lexer + * @param string $template_cache_path */ - function __construct(config $config, dispatcher $dispatcher, language $language, log_interface $log, request $request, user $user, queue $queue) + function __construct( + config $config, + dispatcher $dispatcher, + language $language, + log_interface $log, + request $request, + user $user, + queue $queue, + path_helper $path_helper, + manager $ext_manager, + service_collection $twig_extensions_collection, + lexer $twig_lexer, + $template_cache_path + ) { $this->config = $config; $this->dispatcher = $dispatcher; @@ -83,6 +120,11 @@ function __construct(config $config, dispatcher $dispatcher, language $language, $this->request = $request; $this->user = $user; $this->queue = $queue; + $this->path_helper = $path_helper; + $this->ext_manager = $ext_manager; + $this->twig_extensions_collection = $twig_extensions_collection; + $this->twig_lexer = $twig_lexer; + $this->template_cache_path = $template_cache_path; $this->set_use_queue(); } @@ -91,19 +133,7 @@ function __construct(config $config, dispatcher $dispatcher, language $language, * Get messenger method id * @return mixed */ - abstract public function get_id() - { - return; - } - - /** - * get messenger method fie queue object name - * @return string - */ - abstract public function get_queue_object_name($user) - { - return ''; - } + abstract public function get_id(); /** * Sets the use of messenger queue flag @@ -120,13 +150,7 @@ public function set_use_queue($use_queue = true) * * @return void */ - abstract public function reset() - { - $this->subject = $this->additional_headers = []; - $this->msg = ''; - $this->use_queue = true; - unset($this->template); - } + abstract public function reset(); /** * Set addresses for to/im as available @@ -134,9 +158,13 @@ abstract public function reset() * @param array $user User row * @return void */ - abstract public function set_addresses($user) - { - } + abstract public function set_addresses($user); + + /** + * Get messenger method fie queue object name + * @return string + */ + abstract public function get_queue_object_name(); /** * Set up subject for mail @@ -152,8 +180,8 @@ public function subject($subject = '') /** * Adds antiabuse headers * - * @param \phpbb\config\config $config Config object - * @param \phpbb\user $user User object + * @param config $config Config object + * @param user $user User object * @return void */ public function anti_abuse_headers($config, $user) @@ -185,9 +213,7 @@ public function replyto($address) * Send out messages * @return bool */ - abstract protected function send() - { - } + abstract protected function send(); /** * Send messages from the queue @@ -195,9 +221,7 @@ abstract protected function send() * @param array $queue_data Queue data array * @return void */ - abstract public function process_queue(&$queue_data) - { - } + abstract public function process_queue(&$queue_data); /** * Set email template to use @@ -336,8 +360,8 @@ public function prepare_message() * Event to modify the template before parsing * * @event core.modify_notification_template - * @var string subject The message subject - * @var \phpbb\template\template template The (readonly) template object + * @var string subject The message subject + * @var template template The (readonly) template object * @since 3.2.4-RC1 * @changed 4.0.0-a1 Removed vars: method, break. */ @@ -395,11 +419,10 @@ public function prepare_message() /** * Add error message to log * - * @param string $type Error type: EMAIL / etc * @param string $msg Error message text * @return void */ - public function error($type, $msg) + public function error($msg) { // Session doesn't exist, create it if (!isset($this->user->session_id) || $this->user->session_id === '') @@ -407,6 +430,7 @@ public function error($type, $msg) $this->user->session_begin(); } + $type = strtoupper($this->get_queue_object_name()); $calling_page = html_entity_decode($this->request->server('PHP_SELF'), ENT_COMPAT); $message = '' . $type . '
                            ' . htmlspecialchars($calling_page, ENT_COMPAT) . '

                            ' . $msg . '
                            '; $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]); @@ -431,32 +455,32 @@ public function save_queue() */ protected function setup_template() { - if ($this->template instanceof \phpbb\template\template) + if (isset($this->template) && $this->template instanceof template) { return; } $template_environment = new \phpbb\template\twig\environment( $this->config, - $this->phpbb_container->get('filesystem'), - $this->phpbb_container->get('path_helper'), - $this->phpbb_container->getParameter('core.template.cache_path'), - $this->phpbb_container->get('ext.manager'), + new \phpbb\filesystem\filesystem(), + $this->path_helper, + $this->template_cache_path, + $this->ext_manager, new \phpbb\template\twig\loader(), $this->dispatcher, [] ); - $template_environment->setLexer($this->phpbb_container->get('template.twig.lexer')); + $template_environment->setLexer($this->twig_lexer); $this->template = new \phpbb\template\twig\twig( - $this->phpbb_container->get('path_helper'), + $this->path_helper, $this->config, new \phpbb\template\context(), $template_environment, - $this->phpbb_container->getParameter('core.template.cache_path'), + $this->template_cache_path, $this->user, - $this->phpbb_container->get('template.twig.extensions.collection'), - $this->phpbb_container->get('ext.manager') + $this->twig_extensions_collection, + $this->ext_manager ); } diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/phpbb_email.php similarity index 88% rename from phpBB/phpbb/messenger/method/email.php rename to phpBB/phpbb/messenger/method/phpbb_email.php index 1968c6771ec..768ba27b452 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/phpbb_email.php @@ -22,7 +22,7 @@ /** * Messenger class */ -class email extends base +class phpbb_email extends base { /** @var array */ private const PRIORITY_MAP = [ @@ -58,7 +58,7 @@ class email extends base /** @var string */ protected $from; - /** @var Symfony\Component\Mime\Header\Headers */ + /** @var Headers */ protected $headers; /** @@ -79,13 +79,11 @@ class email extends base /** @var string */ protected $replyto = ''; - /** @var Symfony\Component\Mailer\Transport */ + /** @var Transport */ protected $transport; /** - * Get messenger method id - * - * @return int + * {@inheritDoc} */ public function get_id() { @@ -93,10 +91,9 @@ public function get_id() } /** - * get messenger method fie queue object name - * @return string + * {@inheritDoc} */ - abstract public function get_queue_object_name($user) + public function get_queue_object_name() { return 'email'; } @@ -111,9 +108,7 @@ public function is_enabled() } /** - * Inits/resets the data to default - * - * @return void + * {@inheritDoc} */ public function reset() { @@ -122,7 +117,10 @@ public function reset() $this->msg = $this->replyto = $this->from = ''; $this->mail_priority = Email::PRIORITY_NORMAL; - parent::reset(); + $this->subject = $this->additional_headers = []; + $this->msg = ''; + $this->use_queue = true; + unset($this->template); } /** @@ -136,10 +134,7 @@ public function set_use_queue($use_queue = true) } /** - * Set address as available - * - * @param array $user User row - * @return void + * {@inheritDoc} */ public function set_addresses($user) { @@ -251,8 +246,8 @@ public function subject($subject = '') */ public function header($header_name, $header_value) { - $header_name = trim($header_name); - $header_value = trim($header_value); + $header_name = $header_name; + $header_value = $header_value; // addMailboxListHeader() requires value to be array if ($this->get_header_method($header_name) == 'addMailboxListHeader') @@ -295,18 +290,6 @@ public function set_mail_priority($priority = Email::PRIORITY_NORMAL) $this->email->priority($priority); } - /** - * Add error message to log - * - * @param string $msg Error message text - * @return void - */ - public function error($msg) - { - $type = 'EMAIL/' . ($this->config['smtp_delivery']) ? 'SMTP' : 'PHP/mail()'; - parent::error($type, $msg); - } - /** * Detect proper Header class method to add header * @@ -448,15 +431,12 @@ public function set_transport() } /** - * Send messages from the queue - * - * @param array $queue_data Queue data array - * @return void + * {@inheritDoc} */ public function process_queue(&$queue_data) { $queue_object_name = $this->get_queue_object_name(); - $messages_count = count($queue_data[$queue_object_name]['data']; + $messages_count = count($queue_data[$queue_object_name]['data']); if (!$this->is_enabled() || !$messages_count) { @@ -480,8 +460,8 @@ public function process_queue(&$queue_data) * Event to send message via external transport * * @event core.notification_message_process - * @var bool break Flag indicating if the function return after hook - * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var bool break Flag indicating if the function return after hook + * @var Email email The Symfony Email object * @since 3.2.4-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, subject, msg. */ @@ -515,7 +495,7 @@ public function process_queue(&$queue_data) /** * Get mailer transport object * - * @return Symfony\Component\Mailer\Transport Symfony Mailer transport object + * @return Transport Symfony Mailer transport object */ public function get_transport() { @@ -527,7 +507,7 @@ public function get_transport() * * @return bool */ - protected function send() + public function send() { $this->prepare_message(); @@ -544,9 +524,9 @@ protected function send() * Event to send message via external transport * * @event core.notification_message_email - * @var string subject The message subject - * @var string msg The message text - * @var Symfony\Component\Mime\Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var Email email The Symfony Email object * @since 3.2.4-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, break */ @@ -587,10 +567,10 @@ protected function send() * Modify data before sending out emails with PHP's mail function * * @event core.phpbb_mail_before - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var string subject The message subject - * @var string msg The message text - * @var string headers The email headers + * @var Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var string headers The email headers * @since 3.3.6-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters. */ @@ -621,10 +601,10 @@ protected function send() * Execute code after sending out emails with PHP's mail function * * @event core.phpbb_mail_after - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var string subject The message subject - * @var string msg The message text - * @var string headers The email headers + * @var Email email The Symfony Email object + * @var string subject The message subject + * @var string msg The message text + * @var string headers The email headers * @since 3.3.6-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters, $result. */ diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/phpbb_jabber.php similarity index 97% rename from phpBB/phpbb/messenger/method/jabber.php rename to phpBB/phpbb/messenger/method/phpbb_jabber.php index 9661efc64a6..874f28d06a6 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/phpbb_jabber.php @@ -24,7 +24,7 @@ * Slightly modified by Acyd Burn (2006) * Refactored to a service (2023) */ -class jabber extends base +class phpbb_jabber extends base { /** @var string */ protected $connect_server; @@ -87,8 +87,8 @@ class jabber extends base * ->password($password) * ->ssl($use_ssl) * ->server($server) - * ->port($port) - * ->stream_options( + * ->port($port) + * ->stream_options( * 'verify_peer' => true, * 'verify_peer_name' => true, * 'allow_self_signed' => false, @@ -99,10 +99,10 @@ class jabber extends base public function init() { $this->username($this->config['jab_username']) - ->password($this->config['jab_password']) - ->ssl((bool) $this->config['jab_use_ssl']) - ->server($this->config['jab_host']) - ->port($this->config['jab_port']) + ->password($this->config['jab_password']) + ->ssl((bool) $this->config['jab_use_ssl']) + ->server($this->config['jab_host']) + ->port($this->config['jab_port']) ->stream_options['ssl'] = [ 'verify_peer' => $this->config['jab_verify_peer'], 'verify_peer_name' => $this->config['jab_verify_peer_name'], @@ -111,9 +111,7 @@ public function init() } /** - * Get messenger method id - * - * @return int + * {@inheritDoc} */ public function get_id() { @@ -121,10 +119,9 @@ public function get_id() } /** - * get messenger method fie queue object name - * @return string + * {@inheritDoc} */ - abstract public function get_queue_object_name($user) + public function get_queue_object_name() { return 'jabber'; } @@ -369,10 +366,7 @@ public function login() } /** - * Set address as available - * - * @param array $user User row - * @return void + * {@inheritDoc} */ public function set_addresses($user) { @@ -403,16 +397,17 @@ public function to($address, $realname = '') } /** - * Inits/resets the data to default - * - * @return void + * {@inheritDoc} */ public function reset() { $this->msg = ''; - $this->to = []; + $this->to = []; - parent::reset(); + $this->subject = $this->additional_headers = []; + $this->msg = ''; + $this->use_queue = true; + unset($this->template); } /** @@ -426,15 +421,12 @@ public function set_use_queue($use_queue = true) } /** - * Send messages from the queue - * - * @param array $queue_data Queue data array - * @return void + * {@inheritDoc} */ public function process_queue(&$queue_data) { $queue_object_name = $this->get_queue_object_name(); - $messages_count = count($queue_data[$queue_object_name]['data']; + $messages_count = count($queue_data[$queue_object_name]['data']); if (!$this->is_enabled() || !$messages_count) { diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php index eb2406e2733..6245642dd74 100644 --- a/phpBB/phpbb/messenger/queue.php +++ b/phpBB/phpbb/messenger/queue.php @@ -121,7 +121,7 @@ public function process() while ($messenger_collection_iterator->valid()) { $messenger_method = $messenger_collection_iterator->current(); - if (isset($this->queue_data[$messenger_method->get_queue_object_name()]) + if (isset($this->queue_data[$messenger_method->get_queue_object_name()])) { $messenger_method->process_queue($this->queue_data); } diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index dd181ac5a3e..2c612367cc7 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -27,13 +27,13 @@ class email extends \phpbb\notification\method\messenger_base { - /** @var \phpbb\user */ + /** @var user */ protected $user; - /** @var \phpbb\config\config */ + /** @var config */ protected $config; - /** @var \phpbb\db\driver\driver_interface */ + /** @var driver_interface */ protected $db; /** @var string Notification emails table */ diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php index 57651521393..4a0e52fc621 100644 --- a/phpBB/phpbb/notification/method/jabber.php +++ b/phpBB/phpbb/notification/method/jabber.php @@ -26,10 +26,10 @@ class jabber extends \phpbb\notification\method\messenger_base { - /** @var \phpbb\user */ + /** @var user */ protected $user; - /** @var \phpbb\config\config */ + /** @var config */ protected $config; /** @var service_collection */ diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 8eaaa4e4fcd..5df59a37112 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -41,7 +41,8 @@ public function get_command_tester() $this->notifications, $this->user_loader, $this->phpbb_root_path, - $this->php_ext + $this->php_ext, + $this->messenger_method_collection )); $command = $application->find('user:activate'); diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php index 67f1c84e72b..3e2d2cfedff 100644 --- a/tests/console/user/add_test.php +++ b/tests/console/user/add_test.php @@ -32,7 +32,8 @@ public function get_command_tester($question_answers = []) $this->language, $this->passwords_manager, $this->phpbb_root_path, - $this->php_ext + $this->php_ext, + $this->messenger_method_collection )); $command = $application->find('user:add'); diff --git a/tests/console/user/base.php b/tests/console/user/base.php index 008ac23d05b..7d14b9a6641 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -105,6 +105,11 @@ protected function setUp(): void $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); + $this->messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $this->messenger_method_collection->add('messenger.method.email'); + $this->messenger_method_collection->add('messenger.method.jabber'); + $phpbb_container->set('messenger.method_collection', $this->messenger_method_collection); + parent::setUp(); } diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index ff0854be211..8e536fcd7a7 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -95,7 +95,8 @@ protected function setUp(): void $phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection); $twig->addExtension($twig_extension); - $phpbb_container->set('template.twig.lexer', new \phpbb\template\twig\lexer($twig)); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $phpbb_container->set('template.twig.lexer', $twig_lexer); $phpbb_container->set('dispatcher', $dispatcher); $phpbb_container->set('language', $lang); $phpbb_container->set('request', $request); @@ -111,13 +112,23 @@ protected function setUp(): void $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; $phpbb_container->setParameter('core.cache_dir', $core_cache_dir); + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; $phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file); $phpbb_container->set('messenger.queue', $messenger_queue); - $this->email = new \phpbb\messenger\email($config, $dispatcher, $lang, $log, $request, $user, $messenger_queue); + + $this->email = new \phpbb\messenger\method\phpbb_email( + $config, $dispatcher, $lang, $log, $request, $user, $messenger_queue, + $phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer, + $cache_path + ); + $phpbb_container->set('messenger.method.email', $this->email); $reflection = new ReflectionObject($this->email); $this->reflection_template_property = $reflection->getProperty('template'); diff --git a/tests/notification/base.php b/tests/notification/base.php index 8e6f67c2198..07fef3a1c5e 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -146,6 +146,11 @@ protected function setUp(): void $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $messenger_method_collection->add('messenger.method.jabber'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $phpbb_container->compile(); $this->notifications->setDependencies($this->auth, $this->config); diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 6b464b1c42d..15811cc9680 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -105,6 +105,11 @@ protected function setUp(): void ) ); + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $messenger_method_collection->add('messenger.method.jabber'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $this->notification_method_email = $this->getMockBuilder('\phpbb\notification\method\email') ->setConstructorArgs([ $phpbb_container->get('user_loader'), @@ -113,7 +118,8 @@ protected function setUp(): void $phpbb_container->get('dbal.conn'), $phpbb_root_path, $phpEx, - $phpbb_container->getParameter('tables.notification_emails') + $phpbb_container->getParameter('tables.notification_emails'), + $phpbb_container->get('messenger.method_collection') ]) ->setMethods(['notify_using_messenger']) ->getMock(); diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 124ac4d1b4d..57b12425091 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -158,6 +158,12 @@ protected function setUp(): void $phpbb_container->setParameter('tables.notification_push', 'phpbb_notification_push'); $phpbb_container->setParameter('tables.push_subscriptions', 'phpbb_push_subscriptions'); $phpbb_container->set('content.visibility', new \phpbb\content_visibility($auth, $config, $phpbb_dispatcher, $db, $user, $phpbb_root_path, $phpEx, FORUMS_TABLE, POSTS_TABLE, TOPICS_TABLE, USERS_TABLE)); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $messenger_method_collection->add('messenger.method.jabber'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); $phpbb_container->compile(); From 83294fed8464c2ff3edae9cbdfa7f707bec90393 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 9 Jun 2023 11:56:32 +0700 Subject: [PATCH 0562/1214] [ticket/17135] Fix Psalm and other issues PHPBB3-17135 --- .../default/container/services_messenger.yml | 1 + phpBB/phpbb/message/message.php | 1 + phpBB/phpbb/messenger/method/base.php | 31 ++++++---- phpBB/phpbb/messenger/method/phpbb_email.php | 59 +++++++++++-------- phpBB/phpbb/messenger/method/phpbb_jabber.php | 52 ++++++++-------- phpBB/phpbb/messenger/queue.php | 3 +- .../notification/method/messenger_base.php | 1 + tests/email/email_parsing_test.php | 2 +- 8 files changed, 84 insertions(+), 66 deletions(-) diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index ff7df470c42..c28789f6c54 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -25,6 +25,7 @@ services: - '@template.twig.extensions.collection' - '@template.twig.lexer' - '%core.template.cache_path%' + - '%core.php_ext%' messenger.method.email: class: phpbb\messenger\method\phpbb_email diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 2a750c1f21e..0fed6fb7a5a 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -245,6 +245,7 @@ public function send(\phpbb\di\service_collection $messenger, $contact) foreach ($this->recipients as $recipient) { + /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $messenger->getIterator(); while ($messenger_collection_iterator->valid()) { diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 4dfbff4559b..8bf7b0cee32 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -22,7 +22,6 @@ use phpbb\path_helper; use phpbb\request\request; use phpbb\messenger\queue; -use phpbb\template\template; use phpbb\template\twig\lexer; use phpbb\user; @@ -58,13 +57,16 @@ abstract class base /** @var path_helper */ protected $path_helper; + /** @var string */ + protected $root_path; + /** @var request */ protected $request; /** @var string */ protected $subject = ''; - /** @var template */ + /** @var \phpbb\template\template */ protected $template; /** @var string */ @@ -97,6 +99,7 @@ abstract class base * @param service_collection $twig_extensions_collection * @param lexer $twig_lexer * @param string $template_cache_path + * @param string $phpbb_root_path */ function __construct( config $config, @@ -110,7 +113,8 @@ function __construct( manager $ext_manager, service_collection $twig_extensions_collection, lexer $twig_lexer, - $template_cache_path + $template_cache_path, + $phpbb_root_path ) { $this->config = $config; @@ -125,6 +129,7 @@ function __construct( $this->twig_extensions_collection = $twig_extensions_collection; $this->twig_lexer = $twig_lexer; $this->template_cache_path = $template_cache_path; + $this->root_path = $phpbb_root_path; $this->set_use_queue(); } @@ -135,6 +140,12 @@ function __construct( */ abstract public function get_id(); + /** + * Check if the messenger method is enabled + * @return bool + */ + abstract public function is_enabled(); + /** * Sets the use of messenger queue flag * @@ -360,8 +371,8 @@ public function prepare_message() * Event to modify the template before parsing * * @event core.modify_notification_template - * @var string subject The message subject - * @var template template The (readonly) template object + * @var string subject The message subject + * @var string template The (readonly) template object * @since 3.2.4-RC1 * @changed 4.0.0-a1 Removed vars: method, break. */ @@ -375,8 +386,8 @@ public function prepare_message() * Event to modify notification message text after parsing * * @event core.modify_notification_message - * @var string message The message text - * @var string subject The message subject + * @var string message The message text + * @var string subject The message subject * @since 3.1.11-RC1 * @changed 4.0.0-a1 Removed vars: method, break. */ @@ -455,7 +466,7 @@ public function save_queue() */ protected function setup_template() { - if (isset($this->template) && $this->template instanceof template) + if (isset($this->template) && $this->template instanceof \phpbb\template\template) { return; } @@ -487,8 +498,8 @@ protected function setup_template() /** * Set template paths to load * - * @param string $path_name Email template path name - * @param string $paths Email template paths + * @param string|array $path_name Email template path name + * @param string|array $paths Email template paths * @return void */ protected function set_template_paths($path_name, $paths) diff --git a/phpBB/phpbb/messenger/method/phpbb_email.php b/phpBB/phpbb/messenger/method/phpbb_email.php index 768ba27b452..98d7497e70d 100644 --- a/phpBB/phpbb/messenger/method/phpbb_email.php +++ b/phpBB/phpbb/messenger/method/phpbb_email.php @@ -17,7 +17,13 @@ use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email; +use Symfony\Component\Mime\Header\DateHeader; use Symfony\Component\Mime\Header\Headers; +use Symfony\Component\Mime\Header\IdentificationHeader; +use Symfony\Component\Mime\Header\MailboxHeader; +use Symfony\Component\Mime\Header\MailboxListHeader; +use Symfony\Component\Mime\Header\PathHeader; +use Symfony\Component\Mime\Header\UnstructuredHeader; /** * Messenger class @@ -55,7 +61,10 @@ class phpbb_email extends base */ protected $dsn = ''; - /** @var string */ + /** @var Email */ + protected $email; + + /** @var Address */ protected $from; /** @var Headers */ @@ -73,13 +82,13 @@ class phpbb_email extends base */ protected $mail_priority = Email::PRIORITY_NORMAL; - /** @var queue */ + /** @var \phpbb\messenger\queue */ protected $queue; - /** @var string */ - protected $replyto = ''; + /** @var Address */ + protected $replyto; - /** @var Transport */ + /** @var \Symfony\Component\Mailer\Transport\AbstractTransport */ protected $transport; /** @@ -99,8 +108,7 @@ public function get_queue_object_name() } /** - * Check if the messenger method is enabled - * @return void + * {@inheritDoc} */ public function is_enabled() { @@ -114,13 +122,12 @@ public function reset() { $this->email = new Email(); $this->headers = $this->email->getHeaders(); - $this->msg = $this->replyto = $this->from = ''; + $this->subject = $this->msg = ''; $this->mail_priority = Email::PRIORITY_NORMAL; - $this->subject = $this->additional_headers = []; - $this->msg = ''; + $this->additional_headers = []; $this->use_queue = true; - unset($this->template); + unset($this->template, $this->replyto, $this->from); } /** @@ -180,7 +187,7 @@ public function cc($address, $realname = '') } $cc = new Address($address, trim($realname)); - $this->email->getCc() ? $this->email->addCc($to) : $this->email->cc($to); + $this->email->getCc() ? $this->email->addCc($cc) : $this->email->cc($cc); } /** @@ -198,7 +205,7 @@ public function bcc($address, $realname = '') } $bcc = new Address($address, trim($realname)); - $this->email->getBcc() ? $this->email->addBcc($to) : $this->email->bcc($to); + $this->email->getBcc() ? $this->email->addBcc($bcc) : $this->email->bcc($bcc); } /** @@ -397,7 +404,7 @@ public function set_dsn($dsn = '') /** * Get Symfony Mailer transport DSN * - * @return void + * @return string */ public function get_dsn() { @@ -418,7 +425,7 @@ public function set_transport() $this->transport = Transport::fromDsn($this->dsn); - if ($this->config['smtp_delivery'] && !in_array($this->dsn, ['null://null', 'sendmail://default'])) + if ($this->config['smtp_delivery'] && method_exists($this->transport, 'getStream')) { // Set ssl context options, see http://php.net/manual/en/context.ssl.php $options['ssl'] = [ @@ -460,8 +467,8 @@ public function process_queue(&$queue_data) * Event to send message via external transport * * @event core.notification_message_process - * @var bool break Flag indicating if the function return after hook - * @var Email email The Symfony Email object + * @var string break Flag indicating if the function return after hook + * @var string email The Symfony Email object * @since 3.2.4-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, subject, msg. */ @@ -477,25 +484,25 @@ public function process_queue(&$queue_data) { $mailer->send($email); } - catch (TransportExceptionInterface $e) + catch (\Symfony\Component\Mailer\Exception\TransportExceptionInterface $e) { - $this->error('EMAIL', $e->getDebug()); + $this->error($e->getDebug()); continue; } } } // No more data for this object? Unset it - if (!count($this->queue_data[$queue_object_name]['data'])) + if (!count($queue_data[$queue_object_name]['data'])) { - unset($this->queue_data[$queue_object_name]); + unset($queue_data[$queue_object_name]); } } /** * Get mailer transport object * - * @return Transport Symfony Mailer transport object + * @return \Symfony\Component\Mailer\Transport\TransportInterface Symfony Mailer transport object */ public function get_transport() { @@ -526,7 +533,7 @@ public function send() * @event core.notification_message_email * @var string subject The message subject * @var string msg The message text - * @var Email email The Symfony Email object + * @var string email The Symfony Email object * @since 3.2.4-RC1 * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, break */ @@ -567,7 +574,7 @@ public function send() * Modify data before sending out emails with PHP's mail function * * @event core.phpbb_mail_before - * @var Email email The Symfony Email object + * @var string email The Symfony Email object * @var string subject The message subject * @var string msg The message text * @var string headers The email headers @@ -591,7 +598,7 @@ public function send() { $mailer->send($this->email); } - catch (TransportExceptionInterface $e) + catch (\Symfony\Component\Mailer\Exception\TransportExceptionInterface $e) { $this->error($e->getDebug()); return false; @@ -601,7 +608,7 @@ public function send() * Execute code after sending out emails with PHP's mail function * * @event core.phpbb_mail_after - * @var Email email The Symfony Email object + * @var string email The Symfony Email object * @var string subject The message subject * @var string msg The message text * @var string headers The email headers diff --git a/phpBB/phpbb/messenger/method/phpbb_jabber.php b/phpBB/phpbb/messenger/method/phpbb_jabber.php index 874f28d06a6..1bf212a25f8 100644 --- a/phpBB/phpbb/messenger/method/phpbb_jabber.php +++ b/phpBB/phpbb/messenger/method/phpbb_jabber.php @@ -29,7 +29,7 @@ class phpbb_jabber extends base /** @var string */ protected $connect_server; - /** @var resource */ + /** @var resource|null */ protected $connection = null; /** @var bool */ @@ -47,7 +47,7 @@ class phpbb_jabber extends base /** @var string */ protected $password; - /** @var string */ + /** @var int */ protected $port; /** @var string */ @@ -127,8 +127,7 @@ public function get_queue_object_name() } /** - * Check if the messenger method is enabled - * @return void + * {@inheritDoc} */ public function is_enabled() { @@ -187,10 +186,10 @@ public function ssl($use_ssl = false) * Set port to connect to server * use_ssl flag should be set first * - * @param string $port Port to connect to server + * @param int $port Port to connect to server * @return $this */ - public function port($port = '') + public function port($port = 5222) { $this->port = ($port) ? $port : 5222; @@ -334,6 +333,7 @@ public function disconnect() } $this->session = []; + /** @psalm-suppress InvalidPropertyAssignmentValue */ return fclose($this->connection); } @@ -352,7 +352,7 @@ public function connected() /** * Initiates login (using data from contructor, after calling connect()) * - * @return bool + * @return bool|void */ public function login() { @@ -401,11 +401,8 @@ public function to($address, $realname = '') */ public function reset() { - $this->msg = ''; - $this->to = []; - - $this->subject = $this->additional_headers = []; - $this->msg = ''; + $this->subject = $this->msg = ''; + $this->additional_headers = $this->to = []; $this->use_queue = true; unset($this->template); } @@ -438,7 +435,6 @@ public function process_queue(&$queue_data) $package_size = $queue_data[$queue_object_name]['package_size'] ?? 0; $num_items = (!$package_size || $messages_count < $package_size) ? $messages_count : $package_size; - $mailer = new Mailer($this->transport); for ($i = 0; $i < $num_items; $i++) { @@ -447,30 +443,30 @@ public function process_queue(&$queue_data) if (!$this->connect()) { - $this->error('JABBER', $this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->get_log()); - return false; + $this->error($this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->get_log()); + return; } if (!$this->login()) { - $this->error('JABBER', $this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->get_log()); - return false; + $this->error($this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->get_log()); + return; } foreach ($addresses as $address) { if ($this->send_message($address, $msg, $subject) === false) { - $this->error('JABBER', $this->get_log()); + $this->error($this->get_log()); continue; } } } // No more data for this object? Unset it - if (!count($this->queue_data[$queue_object_name]['data'])) + if (!count($queue_data[$queue_object_name]['data'])) { - unset($this->queue_data[$queue_object_name]); + unset($queue_data[$queue_object_name]); } $this->disconnect(); @@ -500,13 +496,13 @@ public function send() { if (!$this->connect()) { - $this->error('JABBER', $this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->get_log()); + $this->error($this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->get_log()); return false; } if (!$this->login()) { - $this->error('JABBER', $this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->get_log()); + $this->error($this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->get_log()); return false; } @@ -514,7 +510,7 @@ public function send() { if ($this->send_message($address, $this->msg, $this->subject) === false) { - $this->error('JABBER', $this->get_log()); + $this->error($this->get_log()); continue; } } @@ -542,7 +538,7 @@ public function send() * * @param string $xml * - * @return bool + * @return int|bool */ public function send_xml($xml) { @@ -655,7 +651,7 @@ public function listen($timeout = 10, $wait = false) /** * Initiates account registration (based on data used for contructor) * - * @return bool + * @return bool|void */ public function register() { @@ -676,7 +672,7 @@ public function register() * @param string $type dnd, away, chat, xa or nothing * @param bool $unavailable set this to true if you want to become unavailable * - * @return bool + * @return int|bool */ function send_presence($message = '', $type = '', $unavailable = false) { @@ -702,7 +698,7 @@ function send_presence($message = '', $type = '', $unavailable = false) * * @param array $xml * - * @return bool + * @return bool|void */ function response($xml) { @@ -1021,7 +1017,7 @@ function response($xml) * @param string $subject Message subject * @param string $type Message type * - * @return string + * @return int|bool */ public function send_message($to, $text, $subject = '', $type = 'normal') { diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php index 6245642dd74..22068342698 100644 --- a/phpBB/phpbb/messenger/queue.php +++ b/phpBB/phpbb/messenger/queue.php @@ -35,7 +35,7 @@ class queue /** @var dispatcher */ protected $dispatcher; - /** @var phpbb\filesystem\filesystem_interface */ + /** @var \phpbb\filesystem\filesystem_interface */ protected $filesystem; /** @var service_collection */ @@ -117,6 +117,7 @@ public function process() include($this->cache_file); + /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger_method_collection->getIterator(); while ($messenger_collection_iterator->valid()) { diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 0d9b3c163b5..38e48944f0c 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -112,6 +112,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = continue; } + /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger->getIterator(); while ($messenger_collection_iterator->valid()) { diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index 8e536fcd7a7..76770c789a9 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -126,7 +126,7 @@ protected function setUp(): void $this->email = new \phpbb\messenger\method\phpbb_email( $config, $dispatcher, $lang, $log, $request, $user, $messenger_queue, $phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer, - $cache_path + $cache_path, $phpbb_root_path ); $phpbb_container->set('messenger.method.email', $this->email); From b57f1f7751cbbf22a65895c3318450c0ace1e72f Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 9 Jun 2023 21:35:25 +0700 Subject: [PATCH 0563/1214] [ticket/17135] Suppress psalm UndefinedFunction invalid annotations in tests PHPBB3-17135 --- phpBB/phpbb/template/twig/extension.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 7fde9e2cac2..fa9fca0705f 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -164,6 +164,7 @@ public function loop_subset(\Twig\Environment $env, $item, $start, $end = null, // We always include the last element (this was the past design) $end = ($end == -1 || $end === null) ? null : $end + 1; + /** @psalm-suppress UndefinedFunction */ return twig_slice($env, $item, $start, $end, $preserveKeys); } @@ -213,6 +214,7 @@ public function lang_js(): string { $args = func_get_args(); + /** @psalm-suppress UndefinedFunction */ return twig_escape_filter($this->environment, call_user_func_array([$this, 'lang'], $args), 'js'); } From 068987eba6347850c09141ca8b6bc040f035bc56 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 5 Nov 2023 23:12:13 +0700 Subject: [PATCH 0564/1214] [ticket/17135] Rebase to reflect upgrading to Symfony 6.3 PHPBB3-17135 --- phpBB/composer.json | 1 + phpBB/composer.lock | 224 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 225 insertions(+) diff --git a/phpBB/composer.json b/phpBB/composer.json index 1d43e78ad90..c77ab77819c 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -51,6 +51,7 @@ "symfony/http-foundation": "^6.3", "symfony/http-kernel": "^6.3", "symfony/polyfill-mbstring": "^1.23", + "symfony/mailer": "^6.3", "symfony/mime": "^6.3", "symfony/process": "^6.3", "symfony/proxy-manager-bridge": "^6.3", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 47607417ab3..ba6cff7047f 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -1417,6 +1417,150 @@ ], "time": "2022-10-12T20:51:15+00:00" }, + { + "name": "doctrine/lexer", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "84a527db05647743d50373e0ec53a152f2cde568" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/84a527db05647743d50373e0ec53a152f2cde568", + "reference": "84a527db05647743d50373e0ec53a152f2cde568", + "shasum": "" + }, + "require": { + "php": "^8.1" + }, + "require-dev": { + "doctrine/coding-standard": "^10", + "phpstan/phpstan": "^1.9", + "phpunit/phpunit": "^9.5", + "psalm/plugin-phpunit": "^0.18.3", + "vimeo/psalm": "^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Doctrine\\Common\\Lexer\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "https://www.doctrine-project.org/projects/lexer.html", + "keywords": [ + "annotations", + "docblock", + "lexer", + "parser", + "php" + ], + "support": { + "issues": "https://github.com/doctrine/lexer/issues", + "source": "https://github.com/doctrine/lexer/tree/3.0.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", + "type": "tidelift" + } + ], + "time": "2022-12-15T16:57:16+00:00" + }, + { + "name": "egulias/email-validator", + "version": "4.0.2", + "source": { + "type": "git", + "url": "https://github.com/egulias/EmailValidator.git", + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ebaaf5be6c0286928352e054f2d5125608e5405e", + "reference": "ebaaf5be6c0286928352e054f2d5125608e5405e", + "shasum": "" + }, + "require": { + "doctrine/lexer": "^2.0 || ^3.0", + "php": ">=8.1", + "symfony/polyfill-intl-idn": "^1.26" + }, + "require-dev": { + "phpunit/phpunit": "^10.2", + "vimeo/psalm": "^5.12" + }, + "suggest": { + "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Egulias\\EmailValidator\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Eduardo Gulias Davis" + } + ], + "description": "A library for validating emails against several RFCs", + "homepage": "https://github.com/egulias/EmailValidator", + "keywords": [ + "email", + "emailvalidation", + "emailvalidator", + "validation", + "validator" + ], + "support": { + "issues": "https://github.com/egulias/EmailValidator/issues", + "source": "https://github.com/egulias/EmailValidator/tree/4.0.2" + }, + "funding": [ + { + "url": "https://github.com/egulias", + "type": "github" + } + ], + "time": "2023-10-06T06:47:41+00:00" + }, { "name": "friendsofphp/proxy-manager-lts", "version": "v1.0.18", @@ -4342,6 +4486,86 @@ ], "time": "2024-11-27T12:49:36+00:00" }, + { + "name": "symfony/mailer", + "version": "v6.3.5", + "source": { + "type": "git", + "url": "https://github.com/symfony/mailer.git", + "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mailer/zipball/d89611a7830d51b5e118bca38e390dea92f9ea06", + "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06", + "shasum": "" + }, + "require": { + "egulias/email-validator": "^2.1.10|^3|^4", + "php": ">=8.1", + "psr/event-dispatcher": "^1", + "psr/log": "^1|^2|^3", + "symfony/event-dispatcher": "^5.4|^6.0", + "symfony/mime": "^6.2", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/messenger": "<6.2", + "symfony/mime": "<6.2", + "symfony/twig-bridge": "<6.2.1" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0", + "symfony/http-client": "^5.4|^6.0", + "symfony/messenger": "^6.2", + "symfony/twig-bridge": "^6.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps sending emails", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/mailer/tree/v6.3.5" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-09-06T09:47:15+00:00" + }, { "name": "symfony/mime", "version": "v6.4.13", From 51fae82718c3f09945b16dda469086e0727f541e Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 5 Jun 2024 10:16:05 +0700 Subject: [PATCH 0565/1214] [ticket/17135] Fix rebasing issues PHPBB-17135 --- phpBB/config/default/container/services_messenger.yml | 1 + phpBB/phpbb/messenger/method/base.php | 8 ++++++++ tests/email/email_parsing_test.php | 2 +- tests/notification/notification_method_webpush_test.php | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index c28789f6c54..d6625430efd 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -13,6 +13,7 @@ services: class: phpbb\messenger\method\base shared: false arguments: + - '@assets.bag' - '@config' - '@dispatcher' - '@language' diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 8bf7b0cee32..809d2b28541 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -22,6 +22,7 @@ use phpbb\path_helper; use phpbb\request\request; use phpbb\messenger\queue; +use phpbb\template\assets_bag; use phpbb\template\twig\lexer; use phpbb\user; @@ -33,6 +34,9 @@ abstract class base /** @var array */ protected $additional_headers = []; + /** @var assets_bag */ + protected $assets_bag; + /** @var config */ protected $config; @@ -87,6 +91,7 @@ abstract class base /** * Messenger base class constructor * + * @param assets_bag $assets_bag * @param config $config * @param dispatcher $dispatcher * @param language $language @@ -102,6 +107,7 @@ abstract class base * @param string $phpbb_root_path */ function __construct( + assets_bag $assets_bag, config $config, dispatcher $dispatcher, language $language, @@ -117,6 +123,7 @@ function __construct( $phpbb_root_path ) { + $this->assets_bag = $assets_bag; $this->config = $config; $this->dispatcher = $dispatcher; $this->language = $language; @@ -472,6 +479,7 @@ protected function setup_template() } $template_environment = new \phpbb\template\twig\environment( + $this->assets_bag, $this->config, new \phpbb\filesystem\filesystem(), $this->path_helper, diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index 76770c789a9..1a464e86aab 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -124,7 +124,7 @@ protected function setUp(): void $phpbb_container->set('messenger.queue', $messenger_queue); $this->email = new \phpbb\messenger\method\phpbb_email( - $config, $dispatcher, $lang, $log, $request, $user, $messenger_queue, + $assets_bag, $config, $dispatcher, $lang, $log, $request, $user, $messenger_queue, $phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer, $cache_path, $phpbb_root_path ); diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index 1116a62c6f3..e52bf9a7acc 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -180,7 +180,7 @@ protected function setUp(): void $phpbb_root_path, $phpEx, $phpbb_container->getParameter('tables.notification_push'), - $phpbb_container->getParameter('tables.push_subscriptions') + $phpbb_container->getParameter('tables.push_subscriptions'), ); $phpbb_container->set('notification.method.webpush', $this->notification_method_webpush); From 499464e1d397dbcd494d88762210e400c9fc0fb4 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 23 Jun 2024 13:26:43 +0700 Subject: [PATCH 0566/1214] [ticket/17135] Fix code review issues PHPBB-17135 --- .../default/container/services_console.yml | 4 +- .../default/container/services_messenger.yml | 16 +- .../config/default/container/services_ucp.yml | 2 +- phpBB/includes/acp/acp_board.php | 15 +- phpBB/includes/acp/acp_email.php | 6 +- phpBB/includes/acp/acp_inactive.php | 21 +- phpBB/includes/acp/acp_users.php | 30 +- phpBB/includes/functions_messenger.php | 1366 ----------------- phpBB/includes/ucp/ucp_activate.php | 6 +- phpBB/includes/ucp/ucp_profile.php | 13 +- phpBB/includes/ucp/ucp_register.php | 17 +- phpBB/includes/ucp/ucp_resend.php | 21 +- phpBB/memberlist.php | 5 +- phpBB/phpbb/console/command/user/activate.php | 26 +- phpBB/phpbb/console/command/user/add.php | 26 +- .../data/v400/remove_smtp_auth_method.php | 7 + .../install_finish/task/notify_user.php | 14 +- phpBB/phpbb/message/message.php | 6 +- phpBB/phpbb/messenger/method/base.php | 96 +- .../method/{phpbb_email.php => email.php} | 214 +-- .../method/{phpbb_jabber.php => jabber.php} | 172 ++- phpBB/phpbb/messenger/queue.php | 19 +- .../notification/method/messenger_base.php | 4 +- phpBB/phpbb/ucp/controller/reset_password.php | 29 +- 24 files changed, 353 insertions(+), 1782 deletions(-) delete mode 100644 phpBB/includes/functions_messenger.php rename phpBB/phpbb/messenger/method/{phpbb_email.php => email.php} (72%) rename phpBB/phpbb/messenger/method/{phpbb_jabber.php => jabber.php} (88%) diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index 704c122d597..ba6658f8891 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -327,11 +327,11 @@ services: - '@config' - '@language' - '@log' + - '@messenger.method_collection' - '@notification_manager' - '@user_loader' - '%core.root_path%' - '%core.php_ext%' - - '@messenger.method_collection' tags: - { name: console.command } @@ -342,10 +342,10 @@ services: - '@dbal.conn' - '@config' - '@language' + - '@messenger.method_collection' - '@passwords.manager' - '%core.root_path%' - '%core.php_ext%' - - '@messenger.method_collection' tags: - { name: console.command } diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index d6625430efd..c2ff6fa679b 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -16,34 +16,34 @@ services: - '@assets.bag' - '@config' - '@dispatcher' + - '@ext.manager' - '@language' - '@log' - - '@request' - - '@user' - '@messenger.queue' - '@path_helper' - - '@ext.manager' + - '@request' - '@template.twig.extensions.collection' - '@template.twig.lexer' + - '@user' + - '%core.root_path%' - '%core.template.cache_path%' - - '%core.php_ext%' messenger.method.email: - class: phpbb\messenger\method\phpbb_email + class: phpbb\messenger\method\email shared: false parent: messenger.method.base calls: - - [reset, []] + - [init, []] - [set_transport, []] tags: - { name: messenger.method } messenger.method.jabber: - class: phpbb\messenger\method\phpbb_jabber + class: phpbb\messenger\method\jabber shared: false parent: messenger.method.base calls: - - [reset, []] + - [init, []] tags: - { name: messenger.method } diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index 6321e431dbf..bbe5d35f2b4 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -19,6 +19,7 @@ services: - '@controller.helper' - '@language' - '@log' + - '@messenger.method.email' - '@passwords.manager' - '@request' - '@template' @@ -26,7 +27,6 @@ services: - '%tables.users%' - '%core.root_path%' - '%core.php_ext%' - - '@messenger.method_collection' phpbb.ucp.controller.webpush: class: phpbb\ucp\controller\webpush diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 3537b67737a..b20d0d9753b 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -720,17 +720,16 @@ function main($id, $mode) { if ($config['email_enable']) { - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template('test'); - $email->set_addresses($user->data); - $email->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method = $phpbb_container->get('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template('test'); + $email_method->set_addresses($user->data); + $email_method->anti_abuse_headers($config, $user); + $email_method->assign_vars([ 'USERNAME' => html_entity_decode($user->data['username'], ENT_COMPAT), 'MESSAGE' => html_entity_decode($request->variable('send_test_email_text', '', true), ENT_COMPAT), ]); - $email->send(); + $email_method->send(); trigger_error($user->lang('TEST_EMAIL_SENT') . adm_back_link($this->u_action)); } diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 23f7885e531..630b1bcb148 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -217,16 +217,15 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars))); - $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); for ($i = 0, $size = count($email_list); $i < $size; $i++) { $used_lang = $email_list[$i][0]['lang']; $used_method = $email_list[$i][0]['method']; - while ($messenger_collection_iterator->valid()) + foreach ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); if ($messenger_method->get_id() == $used_method || $used_method == NOTIFY_BOTH) { $messenger_method->set_use_queue($use_queue); @@ -260,7 +259,6 @@ function main($id, $mode) $messenger_method->save_queue(); } } - $messenger_collection_iterator->next(); } } unset($email_list); diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 13427a81915..9d5d7303481 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -114,19 +114,18 @@ function main($id, $mode) if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !empty($inactive_users)) { - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); + $email_method = $phpbb_container->get('messenger.method.email'); + $email_method->set_use_queue(false); foreach ($inactive_users as $row) { - $email->template('admin_welcome_activated', $row['user_lang']); - $email->set_addresses($row); - $email->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method->template('admin_welcome_activated', $row['user_lang']); + $email_method->set_addresses($row); + $email_method->anti_abuse_headers($config, $user); + $email_method->assign_vars([ 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), ]); - $email->send(); + $email_method->send(); } } @@ -199,14 +198,13 @@ function main($id, $mode) { // Send the messages $usernames = $user_ids = array(); - $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); do { - while ($messenger_collection_iterator->valid()) + foreach ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH) { $messenger_method->template('user_remind_inactive', $row['user_lang']); @@ -221,7 +219,6 @@ function main($id, $mode) $messenger_method->send(); $messenger_method->save_queue(); } - $messenger_collection_iterator->next(); } $usernames[] = $row['username']; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 707e6b55411..d88d0503871 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -398,18 +398,17 @@ function main($id, $mode) $db->sql_query($sql); // Start sending email - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template($email_template, $user_row['user_lang']); - $email->set_addresses($user_row); - $email->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method = $phpbb_container->get('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template($email_template, $user_row['user_lang']); + $email_method->set_addresses($user_row); + $email_method->anti_abuse_headers($config, $user); + $email_method->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k=$user_actkey", ]); - $email->send(); + $email_method->send(); $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_USER_REACTIVATE', false, array($user_row['username'])); $phpbb_log->add('user', $user->data['user_id'], $user->ip, 'LOG_USER_REACTIVATE_USER', false, array( @@ -454,16 +453,15 @@ function main($id, $mode) $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']); - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template('admin_welcome_activated', $user_row['user_lang']); - $email->set_addresses($user_row); - $email->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method = $phpbb_container->get('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template('admin_welcome_activated', $user_row['user_lang']); + $email_method->set_addresses($user_row); + $email_method->anti_abuse_headers($config, $user); + $email_method->assign_vars([ 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), ]); - $email->send(); + $email_method->send(); } } diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php deleted file mode 100644 index 323ab319993..00000000000 --- a/phpBB/includes/functions_messenger.php +++ /dev/null @@ -1,1366 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -use Symfony\Component\Mailer\Transport; -use Symfony\Component\Mailer\Mailer; -use Symfony\Component\Mime\Address; -use Symfony\Component\Mime\Email; -use Symfony\Component\Mime\Header\Headers; - -/** - * @ignore - */ -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** - * Messenger class - */ -class messenger -{ - /** @var array */ - private const PRIORITY_MAP = [ - Email::PRIORITY_HIGHEST => 'Highest', - Email::PRIORITY_HIGH => 'High', - Email::PRIORITY_NORMAL => 'Normal', - Email::PRIORITY_LOW => 'Low', - Email::PRIORITY_LOWEST => 'Lowest', - ]; - - /** @var array */ - private const HEADER_CLASS_MAP = [ - 'date' => DateHeader::class, - 'from' => MailboxListHeader::class, - 'sender' => MailboxHeader::class, - 'reply-to' => MailboxListHeader::class, - 'to' => MailboxListHeader::class, - 'cc' => MailboxListHeader::class, - 'bcc' => MailboxListHeader::class, - 'message-id' => IdentificationHeader::class, - 'in-reply-to' => UnstructuredHeader::class, - 'references' => UnstructuredHeader::class, - 'return-path' => PathHeader::class, - ]; - - /** @var array */ - protected $additional_headers = []; - - /** @var array */ - protected $addresses = []; - - /** @var \phpbb\config\config */ - protected $config; - - /** @var \phpbb\event\dispatcher */ - protected $dispatcher; - - /** - * @var string - * - * Symfony Mailer transport DSN - */ - protected $dsn = ''; - - /** @var string */ - protected $from; - - /** @var Symfony\Component\Mime\Header\Headers */ - protected $headers; - - /** @var \phpbb\language\language */ - protected $language; - - /** @var \phpbb\log\log_interface */ - protected $log; - - /** - * @var int - * - * Possible values are: - * Email::PRIORITY_HIGHEST - * Email::PRIORITY_HIGH - * Email::PRIORITY_NORMAL - * Email::PRIORITY_LOW - * Email::PRIORITY_LOWEST - */ - protected $mail_priority = Email::PRIORITY_NORMAL; - - /** @var string */ - protected $msg; - - /** @var string */ - protected $php_ext; - - /** @var queue */ - protected $queue; - - /** @var string */ - protected $replyto; - - /** @var \phpbb\request\request */ - protected $request; - - /** @var string */ - protected $root_path; - - /** @var string */ - protected $subject; - - /** @var \phpbb\template\template */ - protected $template; - - /** @var Symfony\Component\Mailer\Transport */ - protected $transport; - - /** @var bool */ - protected $use_queue = true; - - /** @var phpbb\user */ - protected $user; - - /** - * Messenger class constructor - * - * @param bool $use_queue Flag to switch the use of the messenger file queue - */ - function __construct($use_queue = true) - { - global $phpbb_container; - - $this->phpbb_container = $phpbb_container; - $this->config = $this->phpbb_container->get('config'); - $this->dispatcher = $this->phpbb_container->get('dispatcher'); - $this->language = $this->phpbb_container->get('language'); - $this->log = $this->phpbb_container->get('log'); - $this->request = $this->phpbb_container->get('request'); - $this->user = $this->phpbb_container->get('user'); - $this->email = new Email(); - $this->headers = $this->email->getHeaders(); - $this->use_queue = (!$this->config['email_package_size']) ? false : $use_queue; - $this->subject = ''; - $this->php_ext = $this->phpbb_container->getParameter('core.php_ext'); - $this->root_path = $this->phpbb_container->getParameter('core.root_path'); - $this->set_transport(); - } - - /** - * Resets all the data (address, template file, etc etc) to default - * - * @return void - */ - public function reset() - { - $this->addresses = []; - $this->msg = $this->replyto = $this->from = ''; - $this->mail_priority = Email::PRIORITY_NORMAL; - } - - /** - * Set addresses for to/im as available - * - * @param array $user User row - * @return void - */ - public function set_addresses($user) - { - if (isset($user['user_email']) && $user['user_email']) - { - $this->to($user['user_email'], $user['username'] ?: ''); - } - - if (isset($user['user_jabber']) && $user['user_jabber']) - { - $this->im($user['user_jabber'], $user['username'] ?: ''); - } - } - - /** - * Sets email address to send to - * - * @param string $address Email "To" recipient address - * @param string $realname Email "To" recipient name - * @return void - */ - public function to($address, $realname = '') - { - if (!trim($address)) - { - return; - } - - // If empty sendmail_path on windows, PHP changes the to line - $windows_empty_sendmail_path = !$this->config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\'; - - $to = new Address(trim($address), $windows_empty_sendmail_path ? '' : trim($realname)); - $this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to); - } - - /** - * Sets cc address to send to - * - * @param string $address Email carbon copy recipient address - * @param string $realname Email carbon copy recipient name - * @return void - */ - public function cc($address, $realname = '') - { - if (!trim($address)) - { - return; - } - - $cc = new Address(trim($address), trim($realname)); - $this->email->getCc() ? $this->email->addCc($to) : $this->email->cc($to); - } - - /** - * Sets bcc address to send to - * - * @param string $address Email black carbon copy recipient address - * @param string $realname Email black carbon copy recipient name - * @return void - */ - public function bcc($address, $realname = '') - { - if (!trim($address)) - { - return; - } - - $bcc = new Address(trim($address), trim($realname)); - $this->email->getBcc() ? $this->email->addBcc($to) : $this->email->bcc($to); - } - - /** - * Sets a im contact to send to - * - * @param string $address Jabber recipient address - * @param string $realname Jabber recipient name - * @return void - */ - public function im($address, $realname = '') - { - // IM-Addresses could be empty - if (!trim($address)) - { - return; - } - - $pos = isset($this->addresses['im']) ? count($this->addresses['im']) : 0; - $this->addresses['im'][$pos]['uid'] = trim($address); - $this->addresses['im'][$pos]['name'] = trim($realname); - } - - /** - * Set the reply to address - * - * @param string $address Email "Reply to" address - * @return void - */ - public function replyto($address) - { - $this->replyto = new Address(trim($address)); - $this->email->getReplyTo() ? $this->email->addReplyTo($this->replyto) : $this->email->replyTo($this->replyto); - } - - /** - * Set the from address - * - * @param string $address Email "from" address - * @return void - */ - public function from($address) - { - $this->from = new Address(trim($address)); - $this->email->getFrom() ? $this->email->addFrom($this->from) : $this->email->from($this->from); - } - - /** - * Set up subject for mail - * - * @param string $subject Email subject - * @return void - */ - public function subject($subject = '') - { - $this->subject = $subject; - $this->email->subject(trim($this->subject)); - } - - /** - * Set up extra mail headers - * - * @param string $header_name Email header name - * @param string $header_value Email header body - * @return void - */ - public function header($header_name, $header_value) - { - $header_name = trim($header_name); - $header_value = trim($header_value); - - // addMailboxListHeader() requires value to be array - if ($this->get_header_method($header_name) == 'addMailboxListHeader') - { - $header_value = [$header_value]; - } - $this->headers->addHeader($header_name, $header_value); - } - - /** - * Adds X-AntiAbuse headers - * - * @param \phpbb\config\config $config Config object - * @param \phpbb\user $user User object - * @return void - */ - public function anti_abuse_headers($config, $user) - { - $this->header('X-AntiAbuse', 'Board servername - ' . $config['server_name']); - $this->header('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); - $this->header('X-AntiAbuse', 'Username - ' . $user->data['username']); - $this->header('X-AntiAbuse', 'User IP - ' . $user->ip); - } - - /** - * Set the email priority - * - * Possible values are: - * Email::PRIORITY_HIGHEST = 1 - * Email::PRIORITY_HIGH = 2 - * Email::PRIORITY_NORMAL = 3 - * Email::PRIORITY_LOW = 4 - * Email::PRIORITY_LOWEST = 5 - * - * @param int $priority Email priority level - * @return void - */ - public function set_mail_priority($priority = Email::PRIORITY_NORMAL) - { - $this->email->priority($priority); - } - - /** - * Set email template to use - * - * @param string $template_file Email template file name - * @param string $template_lang Email template language - * @param string $template_path Email template path - * @param string $template_dir_prefix Email template directory prefix - * - * @return bool - */ - public function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '') - { - $template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix; - - $this->setup_template(); - - if (!trim($template_file)) - { - trigger_error('No template file for emailing set.', E_USER_ERROR); - } - - if (!trim($template_lang)) - { - // fall back to board default language if the user's language is - // missing $template_file. If this does not exist either, - // $this->template->set_filenames will do a trigger_error - $template_lang = basename($this->config['default_lang']); - } - - $ext_template_paths = [ - [ - 'name' => $template_lang . '_email', - 'ext_path' => 'language/' . $template_lang . '/email' . $template_dir_prefix, - ], - ]; - - if ($template_path) - { - $template_paths = [ - $template_path . $template_dir_prefix, - ]; - } - else - { - $template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; - $template_path .= $template_lang . '/email'; - - $template_paths = [ - $template_path . $template_dir_prefix, - ]; - - $board_language = basename($this->config['default_lang']); - - // we can only specify default language fallback when the path is not a custom one for which we - // do not know the default language alternative - if ($template_lang !== $board_language) - { - $fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; - $fallback_template_path .= $board_language . '/email'; - - $template_paths[] = $fallback_template_path . $template_dir_prefix; - - $ext_template_paths[] = [ - 'name' => $board_language . '_email', - 'ext_path' => 'language/' . $board_language . '/email' . $template_dir_prefix, - ]; - } - // If everything fails just fall back to en template - if ($template_lang !== 'en' && $board_language !== 'en') - { - $fallback_template_path = (!empty($this->user->lang_path)) ? $this->user->lang_path : $this->root_path . 'language/'; - $fallback_template_path .= 'en/email'; - - $template_paths[] = $fallback_template_path . $template_dir_prefix; - - $ext_template_paths[] = [ - 'name' => 'en_email', - 'ext_path' => 'language/en/email' . $template_dir_prefix, - ]; - } - } - - $this->set_template_paths($ext_template_paths, $template_paths); - - $this->template->set_filenames([ - 'body' => $template_file . '.txt', - ]); - - return true; - } - - /** - * Assign variables to email template - * - * @param array $vars Array of VAR => VALUE to assign to email template - * @return void - */ - public function assign_vars($vars) - { - $this->setup_template(); - - $this->template->assign_vars($vars); - } - - /** - * Assign block of variables to email template - * - * @param string $blockname Template block name - * @param array $vars Array of VAR => VALUE to assign to email template block - * @return void - */ - public function assign_block_vars($blockname, $vars) - { - $this->setup_template(); - - $this->template->assign_block_vars($blockname, $vars); - } - - /** - * Prepare message before sending out to the recipients - * - * @return void - */ - public function prepare_message() - { - // We add some standard variables we always use, no need to specify them always - $this->assign_vars([ - 'U_BOARD' => generate_board_url(), - 'EMAIL_SIG' => str_replace('
                            ', "\n", "-- \n" . html_entity_decode($this->config['board_email_sig'], ENT_COMPAT)), - 'SITENAME' => html_entity_decode($this->config['sitename'], ENT_COMPAT), - ]); - - $email = $this->email; - $subject = $this->email->getSubject(); - $template = $this->template; - /** - * Event to modify the template before parsing - * - * @event core.modify_notification_template - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var string subject The message subject - * @var \phpbb\template\template template The (readonly) template object - * @since 3.2.4-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: method, break. - */ - $vars = ['email', 'subject', 'template']; - extract($this->dispatcher->trigger_event('core.modify_notification_template', compact($vars))); - - // Parse message through template - $message = trim($this->template->assign_display('body')); - - /** - * Event to modify notification message text after parsing - * - * @event core.modify_notification_message - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var string message The message text - * @var string subject The message subject - * @since 3.1.11-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: method, break. - */ - $vars = ['email', 'message', 'subject']; - extract($this->dispatcher->trigger_event('core.modify_notification_message', compact($vars))); - - $this->email = $email; - $this->subject = $subject; - $this->msg = $message; - unset($email, $subject, $message, $template); - - // Because we use \n for newlines in the body message we need to fix line encoding errors for those admins who uploaded email template files in the wrong encoding - $this->msg = str_replace("\r\n", "\n", $this->msg); - - // We now try and pull a subject from the email body ... if it exists, - // do this here because the subject may contain a variable - $drop_header = ''; - $match = []; - if (preg_match('#^(Subject):(.*?)$#m', $this->msg, $match)) - { - $this->subject = (trim($match[2]) != '') ? trim($match[2]) : (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); - $drop_header .= '[\r\n]*?' . preg_quote($match[0], '#'); - } - else - { - $this->subject = (($this->subject != '') ? $this->subject : $this->user->lang['NO_EMAIL_SUBJECT']); - } - - if (preg_match('#^(List-Unsubscribe):(.*?)$#m', $this->msg, $match)) - { - $drop_header .= '[\r\n]*?' . preg_quote($match[0], '#'); - $this->additional_headers[$match[1]] = trim($match[2]); - } - - if ($drop_header) - { - $this->msg = trim(preg_replace('#' . $drop_header . '#s', '', $this->msg)); - } - } - - /** - * Send the mail out to the recipients - * - * @param int $method User notification method NOTIFY_EMAIL|NOTIFY_IM|NOTIFY_BOTH - * @param bool $break Flag indicating if the function only formats the subject - * and the message without sending it - * @return bool - */ - public function send($method = NOTIFY_EMAIL, $break = false) - { - $this->prepare_message(); - if ($break) - { - return true; - } - - switch ($method) - { - case NOTIFY_EMAIL: - $result = $this->msg_email(); - break; - - case NOTIFY_IM: - $result = $this->msg_jabber(); - break; - - case NOTIFY_BOTH: - $result = $this->msg_email(); - $this->msg_jabber(); - break; - } - - $this->reset(); - return $result; - } - - /** - * Add error message to log - * - * @param string $type Error type: EMAIL / etc - * @param string $msg Error message text - * @return void - */ - public function error($type, $msg) - { - // Session doesn't exist, create it - if (!isset($this->user->session_id) || $this->user->session_id === '') - { - $this->user->session_begin(); - } - - $calling_page = html_entity_decode($this->request->server('REQUEST_URI'), ENT_COMPAT); - - switch ($type) - { - case 'EMAIL': - $message = 'EMAIL/' . (($this->config['smtp_delivery']) ? 'SMTP' : 'PHP/mail()') . ''; - break; - - default: - $message = "$type"; - break; - } - - $message .= '
                            ' . htmlspecialchars($calling_page, ENT_COMPAT) . '

                            ' . $msg . '
                            '; - $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]); - } - - /** - * Save message data to the messemger file queue - * @return void - */ - public function save_queue() - { - if ($this->config['email_package_size'] && $this->use_queue && !empty($this->queue)) - { - $this->queue->save(); - return; - } - } - - /** - * Detect proper Header class method to add header - * - * @param string $name Email header name - * @return string - */ - protected function get_header_method(string $name) - { - $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class); - $method = 'add'.ucfirst(array_pop($parts)); - if ('addUnstructuredHeader' === $method) - { - $method = 'addTextHeader'; - } - else if ('addIdentificationHeader' === $method) - { - $method = 'addIdHeader'; - } - - return $method; - } - - /** - * Set email headers - * - * @return bool - */ - protected function build_header() - { - $headers = []; - - $board_contact = $this->config['board_contact']; - if (empty($this->email->getReplyTo())) - { - $this->replyto($board_contact); - $headers['Reply-To'] = $this->replyto; - } - - if (empty($this->email->getFrom())) - { - $this->from($board_contact); - $headers['From'] = $this->from; - } - - $headers['Return-Path'] = new Address($this->config['board_email']); - $headers['Sender'] = new Address($this->config['board_email']); - $headers['X-Priority'] = sprintf('%d (%s)', $this->mail_priority, self::PRIORITY_MAP[$this->mail_priority]); - $headers['X-MSMail-Priority'] = self::PRIORITY_MAP[$this->mail_priority]; - $headers['X-Mailer'] = 'phpBB3'; - $headers['X-MimeOLE'] = 'phpBB3'; - $headers['X-phpBB-Origin'] = 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()); - - /** - * Event to modify email header entries - * - * @event core.modify_email_headers - * @var array headers Array containing email header entries - * @since 3.1.11-RC1 - */ - $vars = ['headers']; - extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars))); - - foreach ($headers as $header => $value) - { - $this->header($header, $value); - } - - return true; - } - - /** - * Generates valid DSN for Symfony Mailer transport - * - * @param string $dsn Symfony Mailer transport DSN - * @return void - */ - public function set_dsn($dsn = '') - { - if (!empty($dsn)) - { - $this->dsn = $dsn; - } - else if ($this->config['smtp_delivery']) - { - if (empty($this->config['smtp_host'])) - { - $this->dsn = 'null://null'; - } - else - { - $user = urlencode($this->config['smtp_username']); - $password = urlencode($this->config['smtp_password']); - $smtp_host = urlencode($this->config['smtp_host']); - $smtp_port = $this->config['smtp_port']; - - $this->dsn = "smtp://$user:$password@$smtp_host:$smtp_port"; - } - } - else - { - $this->dsn = 'sendmail://default'; - } - } - - /** - * Get Symfony Mailer transport DSN - * - * @return void - */ - public function get_dsn() - { - return $this->dsn; - } - - /** - * Generates a valid transport to send email - * - * @return void - */ - public function set_transport() - { - if (empty($this->dsn)) - { - $this->set_dsn(); - } - - $this->transport = Transport::fromDsn($this->dsn); - - if ($this->config['smtp_delivery'] && !in_array($this->dsn, ['null://null', 'sendmail://default'])) - { - // Set ssl context options, see http://php.net/manual/en/context.ssl.php - $options['ssl'] = [ - 'verify_peer' => (bool) $this->config['smtp_verify_peer'], - 'verify_peer_name' => (bool) $this->config['smtp_verify_peer_name'], - 'allow_self_signed' => (bool) $this->config['smtp_allow_self_signed'], - ]; - $this->transport->getStream()->setStreamOptions($options); - } - } - - /** - * Get mailer transport object - * - * @return Symfony\Component\Mailer\Transport Symfony Mailer transport object - */ - public function get_transport() - { - return $this->transport; - } - - /** - * Send out emails - * - * @return bool - */ - protected function msg_email() - { - if (empty($this->config['email_enable'])) - { - return false; - } - - // Addresses to send to? - if (empty($this->email->getTo())) - { - // Send was successful. ;) - return true; - } - - $use_queue = false; - if ($this->config['email_package_size'] && $this->use_queue) - { - if (empty($this->queue)) - { - $this->queue = new queue(); - $this->queue->init('email', $this->config['email_package_size']); - } - $use_queue = true; - } - - $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); - $board_contact = $this->config['board_contact']; - - $this->email->subject($this->subject); - $this->email->text($this->msg); - - $break = false; - $subject = $this->subject; - $msg = $this->msg; - $email = $this->email; - /** - * Event to send message via external transport - * - * @event core.notification_message_email - * @var bool break Flag indicating if the function return after hook - * @var string subject The message subject - * @var string msg The message text - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @since 3.2.4-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses - */ - $vars = [ - 'break', - 'subject', - 'msg', - 'email', - ]; - extract($this->dispatcher->trigger_event('core.notification_message_email', compact($vars))); - - $this->addresses = $addresses; - $this->subject = $subject; - $this->msg = $msg; - unset($addresses, $subject, $msg); - - if ($break) - { - return true; - } - - if (empty($this->email->getReplyto())) - { - $this->replyto($board_contact); - } - - if (empty($this->email->getFrom())) - { - $this->from($board_contact); - } - - // Build header - foreach ($this->additional_headers as $header_name => $header_value) - { - $this->header($header_name, $header_value); - } - $this->build_header(); - - // Send message ... - if (!$use_queue) - { - $mailer = new Mailer($this->transport); - - $subject = $this->subject; - $msg = $this->msg; - $headers = $this->headers; - $email = $this->email; - /** - * Modify data before sending out emails with PHP's mail function - * - * @event core.phpbb_mail_before - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var string subject The message subject - * @var string msg The message text - * @var string headers The email headers - * @since 3.3.6-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters. - */ - $vars = [ - 'email', - 'subject', - 'msg', - 'headers', - ]; - extract($this->dispatcher->trigger_event('core.phpbb_mail_before', compact($vars))); - - $this->subject = $subject; - $this->msg = $msg; - $this->headers = $headers; - $this->email = $email; - - try - { - $mailer->send($this->email); - } - catch (TransportExceptionInterface $e) - { - $this->error('EMAIL', $e->getDebug()); - return false; - } - - /** - * Execute code after sending out emails with PHP's mail function - * - * @event core.phpbb_mail_after - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @var string subject The message subject - * @var string msg The message text - * @var string headers The email headers - * @since 3.3.6-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: to, eol, additional_parameters, $result. - */ - $vars = [ - 'email', - 'subject', - 'msg', - 'headers', - ]; - extract($this->dispatcher->trigger_event('core.phpbb_mail_after', compact($vars))); - } - else - { - $this->queue->put('email', [ - 'email' => $this->email, - ]); - } - - return true; - } - - /** - * Send jabber message out - * - * @return bool - */ - protected function msg_jabber() - { - if (empty($this->config['jab_enable']) || empty($this->config['jab_host']) || empty($this->config['jab_username']) || empty($this->config['jab_password'])) - { - return false; - } - - if (empty($this->addresses['im'])) - { - // Send was successful. ;) - return true; - } - - $use_queue = false; - if ($this->config['jab_package_size'] && $this->use_queue) - { - if (empty($this->queue)) - { - $this->queue = new queue(); - $this->queue->init('jabber', $this->config['jab_package_size']); - } - $use_queue = true; - } - - $addresses = []; - foreach ($this->addresses['im'] as $type => $uid_ary) - { - $addresses[] = $uid_ary['uid']; - } - $addresses = array_unique($addresses); - - if (!$use_queue) - { - include_once($this->root_path . 'includes/functions_jabber.' . $this->php_ext); - $this->jabber = new jabber($this->config['jab_host'], $this->config['jab_port'], $this->config['jab_username'], html_entity_decode($this->config['jab_password'], ENT_COMPAT), $this->config['jab_use_ssl'], $this->config['jab_verify_peer'], $this->config['jab_verify_peer_name'], $this->config['jab_allow_self_signed']); - - if (!$this->jabber->connect()) - { - $this->error('JABBER', $this->user->lang['ERR_JAB_CONNECT'] . '
                            ' . $this->jabber->get_log()); - return false; - } - - if (!$this->jabber->login()) - { - $this->error('JABBER', $this->user->lang['ERR_JAB_AUTH'] . '
                            ' . $this->jabber->get_log()); - return false; - } - - foreach ($addresses as $address) - { - $this->jabber->send_message($address, $this->msg, $this->subject); - } - - $this->jabber->disconnect(); - } - else - { - $this->queue->put('jabber', [ - 'addresses' => $addresses, - 'subject' => $this->subject, - 'msg' => $this->msg - ]); - } - unset($addresses); - return true; - } - - /** - * Setup template engine - * - * @return void - */ - protected function setup_template() - { - if ($this->template instanceof \phpbb\template\template) - { - return; - } - - $template_environment = new \phpbb\template\twig\environment( - $phpbb_container->get('assets.bag'), - $phpbb_container->get('config'), - $phpbb_container->get('filesystem'), - $phpbb_container->get('path_helper'), - $phpbb_container->getParameter('core.template.cache_path'), - $phpbb_container->get('ext.manager'), - new \phpbb\template\twig\loader(), - $this->dispatcher, - [] - ); - $template_environment->setLexer($this->phpbb_container->get('template.twig.lexer')); - - $this->template = new \phpbb\template\twig\twig( - $this->phpbb_container->get('path_helper'), - $this->config, - new \phpbb\template\context(), - $template_environment, - $this->phpbb_container->getParameter('core.template.cache_path'), - $this->user, - $this->phpbb_container->get('template.twig.extensions.collection'), - $this->phpbb_container->get('ext.manager') - ); - } - - /** - * Set template paths to load - * - * @param string $path_name Email template path name - * @param string $paths Email template paths - * @return void - */ - protected function set_template_paths($path_name, $paths) - { - $this->setup_template(); - - $this->template->set_custom_style($path_name, $paths); - } -} - -/** - * Handling messenger file queue - */ -class queue -{ - /** @var array */ - protected $data = []; - - /** @var array */ - protected $queue_data = []; - - /** @var string */ - protected $cache_file = ''; - - /** - * @var \phpbb\filesystem\filesystem_interface - */ - protected $filesystem; - - /** - * Messenger file queue class constructor - */ - function __construct() - { - global $phpbb_container; - - $this->phpbb_container = $phpbb_container; - $this->php_ext = $this->phpbb_container->getParameter('core.php_ext'); - $this->root_path = $this->phpbb_container->getParameter('core.root_path'); - $this->cache_file = $this->phpbb_container->getParameter('core.cache_dir') . "queue.{$this->php_ext}"; - $this->filesystem = $this->phpbb_container->get('filesystem'); - $this->config = $this->phpbb_container->get('config'); - $this->dispatcher = $this->phpbb_container->get('dispatcher'); - } - - /** - * Init a queue object - * - * @param string $object Queue object type: email/jabber/etc - * @param int $package_size Size of the messenger package to send - * @return void - */ - public function init($object, $package_size) - { - $this->data[$object] = []; - $this->data[$object]['package_size'] = $package_size; - $this->data[$object]['data'] = []; - } - - /** - * Put message into the messenger file queue - * - * @param string $object Queue object type: email/jabber/etc - * @param mixed $message_data Message data to send - * @return void - */ - public function put($object, $message_data) - { - $this->data[$object]['data'][] = $message_data; - } - - /** - * Process the messemger file queue (using lock file) - * - * @return void - */ - public function process() - { - $lock = new \phpbb\lock\flock($this->cache_file); - $lock->acquire(); - - // avoid races, check file existence once - $have_cache_file = file_exists($this->cache_file); - if (!$have_cache_file || $this->config['last_queue_run'] > time() - $this->config['queue_interval']) - { - if (!$have_cache_file) - { - $this->config->set('last_queue_run', time(), false); - } - - $lock->release(); - return; - } - - $this->config->set('last_queue_run', time(), false); - - include($this->cache_file); - - foreach ($this->queue_data as $object => $data_ary) - { - @set_time_limit(0); - - if (!isset($data_ary['package_size'])) - { - $data_ary['package_size'] = 0; - } - - $package_size = $data_ary['package_size']; - $num_items = (!$package_size || count($data_ary['data']) < $package_size) ? count($data_ary['data']) : $package_size; - - switch ($object) - { - case 'email': - // Delete the email queued objects if mailing is disabled - if (!$this->config['email_enable']) - { - unset($this->queue_data['email']); - continue 2; - } - break; - - case 'jabber': - if (!$this->config['jab_enable']) - { - unset($this->queue_data['jabber']); - continue 2; - } - - include_once($this->root_path . 'includes/functions_jabber.' . $this->php_ext); - $this->jabber = new jabber($this->config['jab_host'], $this->config['jab_port'], $this->config['jab_username'], html_entity_decode($this->config['jab_password'], ENT_COMPAT), $this->config['jab_use_ssl'], $this->config['jab_verify_peer'], $this->config['jab_verify_peer_name'], $this->config['jab_allow_self_signed']); - - if (!$this->jabber->connect()) - { - $messenger = new messenger(); - $messenger->error('JABBER', $this->user->lang['ERR_JAB_CONNECT']); - continue 2; - } - - if (!$this->jabber->login()) - { - $messenger = new messenger(); - $messenger->error('JABBER', $this->user->lang['ERR_JAB_AUTH']); - continue 2; - } - - break; - - default: - $lock->release(); - return; - } - - for ($i = 0; $i < $num_items; $i++) - { - // Make variables available... - extract(array_shift($this->queue_data[$object]['data'])); - - switch ($object) - { - case 'email': - $break = false; - /** - * Event to send message via external transport - * - * @event core.notification_message_process - * @var bool break Flag indicating if the function return after hook - * @var Symfony\Component\Mime\Email email The Symfony Email object - * @since 3.2.4-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, subject, msg. - */ - $vars = [ - 'break', - 'email', - ]; - extract($this->dispatcher->trigger_event('core.notification_message_process', compact($vars))); - - if (!$break) - { - $messenger = new messenger(); - $mailer = new Mailer($messenger->get_transport()); - - try - { - $mailer->send($email); - } - catch (TransportExceptionInterface $e) - { - $messenger->error('EMAIL', $e->getDebug()); - continue 2; - } - } - break; - - case 'jabber': - foreach ($addresses as $address) - { - if ($this->jabber->send_message($address, $msg, $subject) === false) - { - $messenger = new messenger(); - $messenger->error('JABBER', $this->jabber->get_log()); - continue 3; - } - } - break; - } - } - - // No more data for this object? Unset it - if (!count($this->queue_data[$object]['data'])) - { - unset($this->queue_data[$object]); - } - - // Post-object processing - switch ($object) - { - case 'jabber': - // Hang about a couple of secs to ensure the messages are - // handled, then disconnect - $this->jabber->disconnect(); - break; - } - } - - if (!count($this->queue_data)) - { - @unlink($this->cache_file); - } - else - { - if ($fp = @fopen($this->cache_file, 'wb')) - { - fwrite($fp, "queue_data = unserialize(" . var_export(serialize($this->queue_data), true) . ");\n\n?>"); - fclose($fp); - - if (function_exists('opcache_invalidate')) - { - @opcache_invalidate($this->cache_file); - } - - try - { - $this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE); - } - catch (\phpbb\filesystem\exception\filesystem_exception $e) - { - // Do nothing - } - } - } - - $lock->release(); - } - - /** - * Save message data to the messenger file queue - * - * @return void - */ - public function save() - { - if (!count($this->data)) - { - return; - } - - $lock = new \phpbb\lock\flock($this->cache_file); - $lock->acquire(); - - if (file_exists($this->cache_file)) - { - include($this->cache_file); - - foreach ($this->queue_data as $object => $data_ary) - { - if (isset($this->data[$object]) && count($this->data[$object])) - { - $this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']); - } - else - { - $this->data[$object]['data'] = $data_ary['data']; - } - } - } - - if ($fp = @fopen($this->cache_file, 'w')) - { - fwrite($fp, "queue_data = unserialize(" . var_export(serialize($this->data), true) . ");\n\n?>"); - fclose($fp); - - if (function_exists('opcache_invalidate')) - { - @opcache_invalidate($this->cache_file); - } - - try - { - $this->filesystem->phpbb_chmod($this->cache_file, \phpbb\filesystem\filesystem_interface::CHMOD_READ | \phpbb\filesystem\filesystem_interface::CHMOD_WRITE); - } - catch (\phpbb\filesystem\exception\filesystem_exception $e) - { - // Do nothing - } - - $this->data = []; - } - - $lock->release(); - } -} diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 2db88c6934b..b8867fcdb30 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -131,11 +131,10 @@ function main($id, $mode) $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']); - $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); - while ($messenger_collection_iterator->valid()) + foreach ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH) { $messenger_method->set_use_queue(false); @@ -148,7 +147,6 @@ function main($id, $mode) $messenger_method->send(); } - $messenger_collection_iterator->next(); } $message = 'ACCOUNT_ACTIVE_ADMIN'; diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index c142a2af739..0b34598e141 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -174,17 +174,16 @@ function main($id, $mode) $user_actkey = gen_rand_string(mt_rand(6, 10)); - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); + $email_method = $phpbb_container->get('messenger.method.email'); $template_file = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? 'user_activate_inactive' : 'user_activate'; - $email->template($template_file, $user->data['user_lang']); - $email->to($data['email'], $data['username']); - $email->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method->template($template_file, $user->data['user_lang']); + $email_method->to($data['email'], $data['username']); + $email_method->anti_abuse_headers($config, $user); + $email_method->assign_vars([ 'USERNAME' => html_entity_decode($data['username'], ENT_COMPAT), 'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u={$user->data['user_id']}&k=$user_actkey", ]); - $email->send(); + $email_method->send(); if ($config['require_activation'] == USER_ACTIVATION_ADMIN) { diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 92a54a37cb5..6736ea25f0d 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -458,13 +458,12 @@ function main($id, $mode) if ($config['email_enable']) { - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template($email_template, $data['lang']); - $email->to($data['email'], $data['username']); - $email->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method = $phpbb_container->get('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template($email_template, $data['lang']); + $email_method->to($data['email'], $data['username']); + $email_method->anti_abuse_headers($config, $user); + $email_method->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($data['username'], ENT_COMPAT), 'PASSWORD' => html_entity_decode($data['new_password'], ENT_COMPAT), @@ -473,7 +472,7 @@ function main($id, $mode) if ($coppa) { - $email->assign_vars([ + $email_method->assign_vars([ 'FAX_INFO' => $config['coppa_fax'], 'MAIL_INFO' => $config['coppa_mail'], 'EMAIL_ADDRESS' => $data['email'], @@ -506,7 +505,7 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_welcome_email_before', compact($vars))); - $email->send(); + $email_method->send(); } if ($config['require_activation'] == USER_ACTIVATION_ADMIN) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 122aeeca377..ab108bc15dd 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -94,18 +94,17 @@ function main($id, $mode) $coppa = ($row['group_name'] == 'REGISTERED_COPPA' && $row['group_type'] == GROUP_SPECIAL) ? true : false; - $messenger = $phpbb_container->get('messenger.method_collection'); - $email = $messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); + $email_method = $phpbb_container->get('messenger.method.email'); + $email_method->set_use_queue(false); if ($config['require_activation'] == USER_ACTIVATION_SELF || $coppa) { - $email->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); - $email->set_addresses($user_row); + $email_method->template(($coppa) ? 'coppa_resend_inactive' : 'user_resend_inactive', $user_row['user_lang']); + $email_method->set_addresses($user_row); - $email->anti_abuse_headers($config, $user); + $email_method->anti_abuse_headers($config, $user); - $email->assign_vars([ + $email_method->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", @@ -113,14 +112,14 @@ function main($id, $mode) if ($coppa) { - $email->assign_vars([ + $email_method->assign_vars([ 'FAX_INFO' => $config['coppa_fax'], 'MAIL_INFO' => $config['coppa_mail'], 'EMAIL_ADDRESS' => $user_row['user_email'], ]); } - $email->send(); + $email_method->send(); } if ($config['require_activation'] == USER_ACTIVATION_ADMIN) @@ -136,9 +135,8 @@ function main($id, $mode) $messenger_collection_iterator = $messenger->getIterator(); while ($row = $db->sql_fetchrow($result)) { - while ($messenger_collection_iterator->valid()) + foreach ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); $messenger_method->set_use_queue(false); if ($messenger_method->get_id() == $row['user_notify_type'] || $row['user_notify_type'] == NOTIFY_BOTH) { @@ -156,7 +154,6 @@ function main($id, $mode) // Save the queue in the messenger method class (has to be called or these messages could be lost) $messenger_method->save_queue(); } - $messenger_collection_iterator->next(); } } $db->sql_freeresult($result); diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index f61fd215024..be4b467a5f0 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -436,8 +436,7 @@ trigger_error('EMPTY_MESSAGE_IM'); } - $messenger = $phpbb_container->get('messenger.method_collection'); - $jabber = $messenger->offsetGet('messenger.method.jabber'); + $jabber = $phpbb_container->get('messenger.method.jabber'); $jabber->set_use_queue(false); $jabber->template('profile_send_im', $row['user_lang']); @@ -901,7 +900,7 @@ case 'contactadmin': case 'email': - $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); $user_id = $request->variable('u', 0); $topic_id = $request->variable('t', 0); diff --git a/phpBB/phpbb/console/command/user/activate.php b/phpBB/phpbb/console/command/user/activate.php index 9157206e0a7..23f1b390e32 100644 --- a/phpBB/phpbb/console/command/user/activate.php +++ b/phpBB/phpbb/console/command/user/activate.php @@ -39,6 +39,9 @@ class activate extends command /** @var log_interface */ protected $log; + /** @var service_collection */ + protected $messenger; + /** @var manager */ protected $notifications; @@ -59,9 +62,6 @@ class activate extends command */ protected $php_ext; - /** @var service_collection */ - protected $messenger; - /** * Construct method * @@ -69,22 +69,22 @@ class activate extends command * @param config $config * @param language $language * @param log_interface $log + * @param service_collection $messenger * @param manager $notifications * @param user_loader $user_loader * @param string $phpbb_root_path * @param string $php_ext - * @param service_collection $messenger */ - public function __construct(user $user, config $config, language $language, log_interface $log, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext, service_collection $messenger) + public function __construct(user $user, config $config, language $language, log_interface $log, service_collection $messenger, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext) { $this->config = $config; $this->language = $language; $this->log = $log; + $this->messenger = $messenger; $this->notifications = $notifications; $this->user_loader = $user_loader; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - $this->messenger = $messenger; $this->language->add_lang('acp/users'); parent::__construct($user); @@ -200,15 +200,15 @@ protected function send_notification($user_row, InputInterface $input) if ($input->getOption('send-email')) { - $email = $this->messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template('admin_welcome_activated', $user_row['user_lang']); - $email->set_addresses($user_row); - $email->anti_abuse_headers($this->config, $this->user); - $email->assign_vars([ + $email_method = $this->messenger->offsetGet('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template('admin_welcome_activated', $user_row['user_lang']); + $email_method->set_addresses($user_row); + $email_method->anti_abuse_headers($this->config, $this->user); + $email_method->assign_vars([ 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), ]); - $email->send(); + $email_method->send(); } } } diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 9813608034a..1ad3770c764 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -43,6 +43,9 @@ class add extends command /** @var language */ protected $language; + /** @var service_collection */ + protected $messenger; + /** @var manager */ protected $password_manager; @@ -60,9 +63,6 @@ class add extends command */ protected $php_ext; - /** @var service_collection */ - protected $messenger; - /** * Construct method * @@ -70,20 +70,20 @@ class add extends command * @param driver_interface $db * @param config $config * @param language $language + * @param service_collection $messenger * @param manager $password_manager * @param string $phpbb_root_path * @param string $php_ext - * @param service_collection $messenger */ - public function __construct(user $user, driver_interface $db, config $config, language $language, manager $password_manager, $phpbb_root_path, $php_ext, service_collection $messenger) + public function __construct(user $user, driver_interface $db, config $config, language $language, service_collection $messenger, manager $password_manager, $phpbb_root_path, $php_ext) { $this->db = $db; $this->config = $config; $this->language = $language; + $this->messenger = $messenger; $this->password_manager = $password_manager; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; - $this->messenger = $messenger; $this->language->add_lang('ucp'); parent::__construct($user); @@ -313,18 +313,18 @@ protected function send_activation_email($user_id) $user_actkey = $this->get_activation_key($user_id); - $email = $this->messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template($email_template, $this->user->lang_name); - $email->to($this->data['email'], $this->data['username']); - $email->anti_abuse_headers($this->config, $this->user); - $email->assign_vars([ + $email_method = $this->messenger->offsetGet('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template($email_template, $this->user->lang_name); + $email_method->to($this->data['email'], $this->data['username']); + $email_method->anti_abuse_headers($this->config, $this->user); + $email_method->assign_vars([ 'WELCOME_MSG' => html_entity_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($this->data['username'], ENT_COMPAT), 'PASSWORD' => html_entity_decode($this->data['new_password'], ENT_COMPAT), 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey", ]); - $email->send(); + $email_method->send(); } /** diff --git a/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php b/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php index eed17067b77..830307c1e8e 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_smtp_auth_method.php @@ -35,4 +35,11 @@ public function update_data() ['config.remove', ['smtp_auth_method']], ]; } + + public function revert_data() + { + return [ + ['config.add', ['smtp_auth_method', 'PLAIN']], + ]; + } } diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php index 8c973311e5e..3f2c439bdd2 100644 --- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php +++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php @@ -97,16 +97,16 @@ public function run() if ($this->config['email_enable']) { - $email = $this->messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template('installed', $this->install_config->get('user_language', 'en')); - $email->to($this->config['board_email'], $this->install_config->get('admin_name')); - $email->anti_abuse_headers($this->config, $this->user); - $email->assign_vars([ + $email_method = $this->messenger->offsetGet('messenger.method.email'); + $email_method->set_use_queue(false); + $email_method->template('installed', $this->install_config->get('user_language', 'en')); + $email_method->to($this->config['board_email'], $this->install_config->get('admin_name')); + $email_method->anti_abuse_headers($this->config, $this->user); + $email_method->assign_vars([ 'USERNAME' => html_entity_decode($this->install_config->get('admin_name'), ENT_COMPAT), 'PASSWORD' => html_entity_decode($this->install_config->get('admin_passwd'), ENT_COMPAT), ]); - $email->send(); + $email_method->send(); } // Login admin diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 0fed6fb7a5a..34295d1a025 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -247,15 +247,14 @@ public function send(\phpbb\di\service_collection $messenger, $contact) { /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $messenger->getIterator(); - while ($messenger_collection_iterator->valid()) + foreach ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); $messenger_method->set_use_queue(false); if ($messenger_method->get_id() == $recipient['notify_type'] || $recipient['notify_type'] == NOTIFY_BOTH) { $messenger_method->template($this->template, $recipient['lang']); $messenger_method->set_addresses($recipient); - $messenger_method->replyto($this->sender_address); + $messenger_method->reply_to($this->sender_address); $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); @@ -284,7 +283,6 @@ public function send(\phpbb\di\service_collection $messenger, $contact) $messenger_method->send(); } - $messenger_collection_iterator->next(); } } } diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 809d2b28541..1d6e23ad29b 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -61,12 +61,12 @@ abstract class base /** @var path_helper */ protected $path_helper; - /** @var string */ - protected $root_path; - /** @var request */ protected $request; + /** @var string */ + protected $root_path; + /** @var string */ protected $subject = ''; @@ -94,95 +94,98 @@ abstract class base * @param assets_bag $assets_bag * @param config $config * @param dispatcher $dispatcher + * @param manager $ext_manager * @param language $language * @param log_interface $log - * @param request $request - * @param user $user * @param queue $queue * @param path_helper $path_helper - * @param manager $ext_manager + * @param request $request * @param service_collection $twig_extensions_collection * @param lexer $twig_lexer - * @param string $template_cache_path + * @param user $user * @param string $phpbb_root_path + * @param string $template_cache_path */ - function __construct( + public function __construct( assets_bag $assets_bag, config $config, dispatcher $dispatcher, + manager $ext_manager, language $language, log_interface $log, - request $request, - user $user, queue $queue, path_helper $path_helper, - manager $ext_manager, + request $request, service_collection $twig_extensions_collection, lexer $twig_lexer, - $template_cache_path, - $phpbb_root_path + user $user, + $phpbb_root_path, + $template_cache_path ) { $this->assets_bag = $assets_bag; $this->config = $config; $this->dispatcher = $dispatcher; + $this->ext_manager = $ext_manager; $this->language = $language; $this->log = $log; - $this->request = $request; - $this->user = $user; $this->queue = $queue; $this->path_helper = $path_helper; - $this->ext_manager = $ext_manager; + $this->request = $request; $this->twig_extensions_collection = $twig_extensions_collection; $this->twig_lexer = $twig_lexer; - $this->template_cache_path = $template_cache_path; + $this->user = $user; $this->root_path = $phpbb_root_path; + $this->template_cache_path = $template_cache_path; $this->set_use_queue(); } /** * Get messenger method id - * @return mixed + * + * @return int */ - abstract public function get_id(); + abstract public function get_id(): int; /** * Check if the messenger method is enabled + * * @return bool */ - abstract public function is_enabled(); + abstract public function is_enabled(): bool; /** * Sets the use of messenger queue flag * * @return void */ - public function set_use_queue($use_queue = true) + public function set_use_queue(bool $use_queue = true): void { $this->use_queue = $use_queue; } /** - * Resets all the data (address, template file, etc etc) to default + * Initializes all the data (address, template file, etc) or resets to default * * @return void */ - abstract public function reset(); + abstract public function init(): void; /** * Set addresses for to/im as available * - * @param array $user User row + * @param array $user_row User row * @return void */ - abstract public function set_addresses($user); + abstract public function set_addresses(array $user_row): void; /** * Get messenger method fie queue object name + * * @return string */ - abstract public function get_queue_object_name(); + abstract public function get_queue_object_name(): string; /** * Set up subject for mail @@ -190,7 +193,7 @@ abstract public function get_queue_object_name(); * @param string $subject Email subject * @return void */ - public function subject($subject = '') + public function subject(string $subject = ''): void { $this->subject = $subject; } @@ -202,9 +205,7 @@ public function subject($subject = '') * @param user $user User object * @return void */ - public function anti_abuse_headers($config, $user) - { - } + abstract public function anti_abuse_headers(config $config, user $user): void; /** * Set up extra headers @@ -213,9 +214,7 @@ public function anti_abuse_headers($config, $user) * @param string $header_value Email header body * @return void */ - public function header($header_name, $header_value) - { - } + abstract public function header(string $header_name, string $header_value): void; /** * Set the reply to address @@ -223,15 +222,14 @@ public function header($header_name, $header_value) * @param string $address Email "Reply to" address * @return void */ - public function replyto($address) - { - } + abstract public function reply_to($address): void; /** * Send out messages + * * @return bool */ - abstract protected function send(); + abstract protected function send(): bool; /** * Send messages from the queue @@ -239,7 +237,7 @@ abstract protected function send(); * @param array $queue_data Queue data array * @return void */ - abstract public function process_queue(&$queue_data); + abstract public function process_queue(array &$queue_data): void; /** * Set email template to use @@ -251,17 +249,12 @@ abstract public function process_queue(&$queue_data); * * @return bool */ - public function template($template_file, $template_lang = '', $template_path = '', $template_dir_prefix = '') + public function template(string $template_file, string $template_lang = '', string $template_path = '', string $template_dir_prefix = ''): bool { $template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix; $this->setup_template(); - if (!trim($template_file)) - { - trigger_error('No template file for emailing set.', E_USER_ERROR); - } - if (!trim($template_lang)) { // fall back to board default language if the user's language is @@ -338,7 +331,7 @@ public function template($template_file, $template_lang = '', $template_path = ' * @param array $vars Array of VAR => VALUE to assign to email template * @return void */ - public function assign_vars($vars) + public function assign_vars(array $vars): void { $this->setup_template(); $this->template->assign_vars($vars); @@ -351,7 +344,7 @@ public function assign_vars($vars) * @param array $vars Array of VAR => VALUE to assign to email template block * @return void */ - public function assign_block_vars($blockname, $vars) + public function assign_block_vars(string $blockname, array $vars): void { $this->setup_template(); @@ -363,7 +356,7 @@ public function assign_block_vars($blockname, $vars) * * @return void */ - public function prepare_message() + public function prepare_message(): void { // We add some standard variables we always use, no need to specify them always $this->assign_vars([ @@ -440,7 +433,7 @@ public function prepare_message() * @param string $msg Error message text * @return void */ - public function error($msg) + public function error(string $msg): void { // Session doesn't exist, create it if (!isset($this->user->session_id) || $this->user->session_id === '') @@ -458,7 +451,7 @@ public function error($msg) * Save message data to the messenger file queue * @return void */ - public function save_queue() + public function save_queue(): void { if ($this->use_queue && !empty($this->queue)) { @@ -469,9 +462,10 @@ public function save_queue() /** * Setup template engine + * * @return void */ - protected function setup_template() + protected function setup_template(): void { if (isset($this->template) && $this->template instanceof \phpbb\template\template) { @@ -510,7 +504,7 @@ protected function setup_template() * @param string|array $paths Email template paths * @return void */ - protected function set_template_paths($path_name, $paths) + protected function set_template_paths(string|array $path_name, string|array $paths): void { $this->setup_template(); $this->template->set_custom_style($path_name, $paths); diff --git a/phpBB/phpbb/messenger/method/phpbb_email.php b/phpBB/phpbb/messenger/method/email.php similarity index 72% rename from phpBB/phpbb/messenger/method/phpbb_email.php rename to phpBB/phpbb/messenger/method/email.php index 98d7497e70d..d3642b263da 100644 --- a/phpBB/phpbb/messenger/method/phpbb_email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -16,7 +16,7 @@ use Symfony\Component\Mailer\Transport; use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mime\Address; -use Symfony\Component\Mime\Email; +use Symfony\Component\Mime\Email as symfony_email; use Symfony\Component\Mime\Header\DateHeader; use Symfony\Component\Mime\Header\Headers; use Symfony\Component\Mime\Header\IdentificationHeader; @@ -28,7 +28,7 @@ /** * Messenger class */ -class phpbb_email extends base +class email extends base { /** @var array */ private const PRIORITY_MAP = [ @@ -39,21 +39,6 @@ class phpbb_email extends base Email::PRIORITY_LOWEST => 'Lowest', ]; - /** @var array */ - private const HEADER_CLASS_MAP = [ - 'date' => DateHeader::class, - 'from' => MailboxListHeader::class, - 'sender' => MailboxHeader::class, - 'reply-to' => MailboxListHeader::class, - 'to' => MailboxListHeader::class, - 'cc' => MailboxListHeader::class, - 'bcc' => MailboxListHeader::class, - 'message-id' => IdentificationHeader::class, - 'in-reply-to' => UnstructuredHeader::class, - 'references' => UnstructuredHeader::class, - 'return-path' => PathHeader::class, - ]; - /** * @var string * @@ -86,7 +71,7 @@ class phpbb_email extends base protected $queue; /** @var Address */ - protected $replyto; + protected $reply_to; /** @var \Symfony\Component\Mailer\Transport\AbstractTransport */ protected $transport; @@ -94,7 +79,7 @@ class phpbb_email extends base /** * {@inheritDoc} */ - public function get_id() + public function get_id(): int { return NOTIFY_EMAIL; } @@ -102,7 +87,7 @@ public function get_id() /** * {@inheritDoc} */ - public function get_queue_object_name() + public function get_queue_object_name(): string { return 'email'; } @@ -110,7 +95,7 @@ public function get_queue_object_name() /** * {@inheritDoc} */ - public function is_enabled() + public function is_enabled(): bool { return (bool) $this->config['email_enable']; } @@ -118,16 +103,16 @@ public function is_enabled() /** * {@inheritDoc} */ - public function reset() + public function init(): void { - $this->email = new Email(); + $this->email = new symfony_email(); $this->headers = $this->email->getHeaders(); $this->subject = $this->msg = ''; $this->mail_priority = Email::PRIORITY_NORMAL; $this->additional_headers = []; $this->use_queue = true; - unset($this->template, $this->replyto, $this->from); + unset($this->template, $this->reply_to, $this->from); } /** @@ -135,7 +120,7 @@ public function reset() * * @return void */ - public function set_use_queue($use_queue = true) + public function set_use_queue(bool $use_queue = true): void { $this->use_queue = !$this->config['email_package_size'] ? false : $use_queue; } @@ -143,11 +128,11 @@ public function set_use_queue($use_queue = true) /** * {@inheritDoc} */ - public function set_addresses($user) + public function set_addresses(array $user_row): void { - if (isset($user['user_email']) && $user['user_email']) + if (isset($user_row['user_email']) && $user_row['user_email']) { - $this->to($user['user_email'], $user['username'] ?: ''); + $this->to($user_row['user_email'], $user_row['username'] ?: ''); } } @@ -158,7 +143,7 @@ public function set_addresses($user) * @param string $realname Email "To" recipient name * @return void */ - public function to($address, $realname = '') + public function to(string $address, string $realname = ''): void { if (!$address = trim($address)) { @@ -179,7 +164,7 @@ public function to($address, $realname = '') * @param string $realname Email carbon copy recipient name * @return void */ - public function cc($address, $realname = '') + public function cc(string $address, string $realname = ''): void { if (!$address = trim($address)) { @@ -197,7 +182,7 @@ public function cc($address, $realname = '') * @param string $realname Email black carbon copy recipient name * @return void */ - public function bcc($address, $realname = '') + public function bcc(string $address, string $realname = ''): void { if (!$address = trim($address)) { @@ -212,23 +197,35 @@ public function bcc($address, $realname = '') * Set the reply to address * * @param string $address Email "Reply to" address + * @param string $realname Email "Reply to" recipient name * @return void */ - public function replyto($address) + public function reply_to(string $address, string $realname = ''): void { - $this->replyto = new Address(trim($address)); - $this->email->getReplyTo() ? $this->email->addReplyTo($this->replyto) : $this->email->replyTo($this->replyto); + if (!$address = trim($address)) + { + return; + } + + $this->reply_to = new Address($address, trim($realname)); + $this->email->getReplyTo() ? $this->email->addReplyTo($this->reply_to) : $this->email->replyTo($this->reply_to); } /** * Set the from address * * @param string $address Email "from" address + * @param string $realname Email "from" recipient name * @return void */ - public function from($address) + public function from(string $address, string $realname = ''): void { - $this->from = new Address(trim($address)); + if (!$address = trim($address)) + { + return; + } + + $this->from = new Address($address, trim($realname)); $this->email->getFrom() ? $this->email->addFrom($this->from) : $this->email->from($this->from); } @@ -238,32 +235,12 @@ public function from($address) * @param string $subject Email subject * @return void */ - public function subject($subject = '') + public function subject(string $subject = ''): void { parent::subject(trim($subject)); $this->email->subject($this->subject); } - /** - * Set up extra mail headers - * - * @param string $header_name Email header name - * @param string $header_value Email header body - * @return void - */ - public function header($header_name, $header_value) - { - $header_name = $header_name; - $header_value = $header_value; - - // addMailboxListHeader() requires value to be array - if ($this->get_header_method($header_name) == 'addMailboxListHeader') - { - $header_value = [$header_value]; - } - $this->headers->addHeader($header_name, $header_value); - } - /** * Adds X-AntiAbuse headers * @@ -271,12 +248,12 @@ public function header($header_name, $header_value) * @param \phpbb\user $user User object * @return void */ - public function anti_abuse_headers($config, $user) + public function anti_abuse_headers(\phpbb\config\config $config, \phpbb\user $user): void { - $this->header('X-AntiAbuse', 'Board servername - ' . $config['server_name']); - $this->header('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); - $this->header('X-AntiAbuse', 'Username - ' . $user->data['username']); - $this->header('X-AntiAbuse', 'User IP - ' . $user->ip); + $this->headers->addHeader('X-AntiAbuse', 'Board servername - ' . $config['server_name']); + $this->headers->addHeader('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); + $this->headers->addHeader('X-AntiAbuse', 'Username - ' . $user->data['username']); + $this->headers->addHeader('X-AntiAbuse', 'User IP - ' . $user->ip); } /** @@ -292,79 +269,63 @@ public function anti_abuse_headers($config, $user) * @param int $priority Email priority level * @return void */ - public function set_mail_priority($priority = Email::PRIORITY_NORMAL) + public function set_mail_priority(int $priority = Email::PRIORITY_NORMAL): void { $this->email->priority($priority); } - /** - * Detect proper Header class method to add header - * - * @param string $name Email header name - * @return string - */ - protected function get_header_method(string $name) - { - $parts = explode('\\', self::HEADER_CLASS_MAP[strtolower($name)] ?? UnstructuredHeader::class); - $method = 'add'.ucfirst(array_pop($parts)); - if ('addUnstructuredHeader' === $method) - { - $method = 'addTextHeader'; - } - else if ('addIdentificationHeader' === $method) - { - $method = 'addIdHeader'; - } - - return $method; - } - /** * Set email headers * - * @return bool + * @return void */ - protected function build_header() + protected function build_headers(): void { - $headers = []; - $board_contact = $this->config['board_contact']; + $board_contact = trim($this->config['board_contact']); + $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); + if (empty($this->email->getReplyTo())) { - $this->replyto($board_contact); - $headers['Reply-To'] = $this->replyto; + $this->reply_to($board_contact, $contact_name); } if (empty($this->email->getFrom())) { - $this->from($board_contact); - $headers['From'] = $this->from; + $this->from($board_contact, $contact_name); } - $headers['Return-Path'] = new Address($this->config['board_email']); - $headers['Sender'] = new Address($this->config['board_email']); - $headers['X-Priority'] = sprintf('%d (%s)', $this->mail_priority, self::PRIORITY_MAP[$this->mail_priority]); - $headers['X-MSMail-Priority'] = self::PRIORITY_MAP[$this->mail_priority]; - $headers['X-Mailer'] = 'phpBB3'; - $headers['X-MimeOLE'] = 'phpBB3'; - $headers['X-phpBB-Origin'] = 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()); + $this->email->priority($this->mail_priority); + + $phpbb_headers = [ + 'Return-Path' => new Address($this->config['board_email']), + 'Sender' => new Address($this->config['board_email']), + 'X-MSMail-Priority' => self::PRIORITY_MAP[$this->mail_priority], + 'X-Mailer' => 'phpBB3', + 'X-MimeOLE' => 'phpBB3', + 'X-phpBB-Origin' => 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()), + ]; + + // Add additional headers + $phpbb_headers = array_merge($phpbb_headers, $this->additional_headers); + + foreach ($phpbb_headers as $header => $value) + { + $this->headers->addHeader($header, $value); + } + $headers = $this->headers; /** * Event to modify email header entries * * @event core.modify_email_headers - * @var array headers Array containing email header entries + * @var Headers headers Array containing email header entries * @since 3.1.11-RC1 + * @changed 4.0.0-a1 'headers' var type changed from array to \Symfony\Component\Mime\Header\Headers */ $vars = ['headers']; extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars))); - - foreach ($headers as $header => $value) - { - $this->header($header, $value); - } - - return true; + $this->headers = $headers; } /** @@ -373,7 +334,7 @@ protected function build_header() * @param string $dsn Symfony Mailer transport DSN * @return void */ - public function set_dsn($dsn = '') + public function set_dsn(string $dsn = ''): void { if (!empty($dsn)) { @@ -406,7 +367,7 @@ public function set_dsn($dsn = '') * * @return string */ - public function get_dsn() + public function get_dsn(): string { return $this->dsn; } @@ -416,7 +377,7 @@ public function get_dsn() * * @return void */ - public function set_transport() + public function set_transport(): void { if (empty($this->dsn)) { @@ -440,7 +401,7 @@ public function set_transport() /** * {@inheritDoc} */ - public function process_queue(&$queue_data) + public function process_queue(array &$queue_data): void { $queue_object_name = $this->get_queue_object_name(); $messages_count = count($queue_data[$queue_object_name]['data']); @@ -504,23 +465,18 @@ public function process_queue(&$queue_data) * * @return \Symfony\Component\Mailer\Transport\TransportInterface Symfony Mailer transport object */ - public function get_transport() + public function get_transport(): \Symfony\Component\Mailer\Transport\TransportInterface { return $this->transport; } /** - * Send out emails - * - * @return bool + * {@inheritDoc} */ - public function send() + public function send(): bool { $this->prepare_message(); - $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); - $board_contact = trim($this->config['board_contact']); - $this->email->subject($this->subject); $this->email->text($this->msg); @@ -543,23 +499,9 @@ public function send() 'email', ]; extract($this->dispatcher->trigger_event('core.notification_message_email', compact($vars))); + $this->email = $email; - if (empty($this->email->getReplyto())) - { - $this->replyto($board_contact); - } - - if (empty($this->email->getFrom())) - { - $this->from($board_contact); - } - - // Build headers - foreach ($this->additional_headers as $header_name => $header_value) - { - $this->header($header_name, $header_value); - } - $this->build_header(); + $this->build_headers(); // Send message ... if (!$this->use_queue) diff --git a/phpBB/phpbb/messenger/method/phpbb_jabber.php b/phpBB/phpbb/messenger/method/jabber.php similarity index 88% rename from phpBB/phpbb/messenger/method/phpbb_jabber.php rename to phpBB/phpbb/messenger/method/jabber.php index 1bf212a25f8..5e174c135b6 100644 --- a/phpBB/phpbb/messenger/method/phpbb_jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -22,9 +22,9 @@ * @author Florian Schmitz (floele) * * Slightly modified by Acyd Burn (2006) - * Refactored to a service (2023) + * Refactored to a service (2024) */ -class phpbb_jabber extends base +class jabber extends base { /** @var string */ protected $connect_server; @@ -96,7 +96,7 @@ class phpbb_jabber extends base * * @return void */ - public function init() + public function init(): void { $this->username($this->config['jab_username']) ->password($this->config['jab_password']) @@ -113,7 +113,7 @@ public function init() /** * {@inheritDoc} */ - public function get_id() + public function get_id(): int { return NOTIFY_IM; } @@ -121,7 +121,7 @@ public function get_id() /** * {@inheritDoc} */ - public function get_queue_object_name() + public function get_queue_object_name(): string { return 'jabber'; } @@ -129,7 +129,7 @@ public function get_queue_object_name() /** * {@inheritDoc} */ - public function is_enabled() + public function is_enabled(): bool { return !empty($this->config['jab_enable']) && @@ -143,9 +143,9 @@ public function is_enabled() * See http://php.net/manual/en/context.ssl.php * * @param array $options SSL context options array - * @return $this + * @return self */ - public function stream_options($options = []) + public function stream_options(array $options = []): self { if ($this->use_ssl) { @@ -160,9 +160,9 @@ public function stream_options($options = []) * Set password to connect to server * * @param string $password Password to connect to server - * @return $this + * @return self */ - public function password($password = '') + public function password(string $password = ''): self { $this->password = html_entity_decode($password, ENT_COMPAT); @@ -173,9 +173,9 @@ public function password($password = '') * Set use of ssl to connect to server * * @param bool $use_ssl Flag indicating use of ssl to connect to server - * @return $this + * @return self */ - public function ssl($use_ssl = false) + public function ssl(bool $use_ssl = false): self { $this->use_ssl = $use_ssl && self::can_use_ssl(); @@ -187,9 +187,9 @@ public function ssl($use_ssl = false) * use_ssl flag should be set first * * @param int $port Port to connect to server - * @return $this + * @return self */ - public function port($port = 5222) + public function port(int $port = 5222): self { $this->port = ($port) ? $port : 5222; @@ -206,9 +206,9 @@ public function port($port = 5222) * Set username to connect to server * * @param string $username Username to connect to server - * @return $this + * @return self */ - public function username($username = '') + public function username(string $username = ''): self { if (strpos($username, '@') === false) { @@ -228,9 +228,9 @@ public function username($username = '') * Username should be set first * * @param string $server Server to connect - * @return $this + * @return self */ - public function server($server = '') + public function server(string $server = ''): self { $this->connect_server = ($server) ? $server : 'localhost'; $this->server = $this->jid[1] ?? $this->connect_server; @@ -239,17 +239,21 @@ public function server($server = '') } /** - * Able to use the SSL functionality? + * Check if it's possible to use the SSL functionality + * + * @return bool */ - public static function can_use_ssl() + public static function can_use_ssl(): bool { return @extension_loaded('openssl'); } /** - * Able to use TLS? + * Check if it's possible to use TLS functionality + * + * @return bool */ - public static function can_use_tls() + public static function can_use_tls(): bool { if (!@extension_loaded('openssl') || !function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('stream_set_blocking') || !function_exists('stream_get_wrappers')) { @@ -272,19 +276,22 @@ public static function can_use_tls() } /** - * Sets the resource which is used. No validation is done here, only escaping. + * Sets the resource which is used. No validation is done here, only escaping + * * @param string $name - * @access public + * @return void */ - public function set_resource($name) + public function set_resource(string $name): void { $this->resource = $name; } /** - * Connect + * Connect to the server + * + * @return bool */ - public function connect() + public function connect(): bool { /* if (!$this->check_jid($this->username . '@' . $this->server)) { @@ -311,9 +318,11 @@ public function connect() } /** - * Disconnect + * Disconnect from the server + * + * @return bool */ - public function disconnect() + public function disconnect(): bool { if ($this->connected()) { @@ -341,9 +350,11 @@ public function disconnect() } /** - * Connected? + * Check if it's still connected to the server + * + * @return bool */ - public function connected() + public function connected(): bool { return is_resource($this->connection) && !feof($this->connection); } @@ -354,7 +365,7 @@ public function connected() * * @return bool|void */ - public function login() + public function login(): bool|void { if (empty($this->features)) { @@ -368,11 +379,11 @@ public function login() /** * {@inheritDoc} */ - public function set_addresses($user) + public function set_addresses(array $user_row): void { - if (isset($user['user_jabber']) && $user['user_jabber']) + if (isset($user_row['user_jabber']) && $user_row['user_jabber']) { - $this->to($user['user_jabber'], (isset($user['username']) ? $user['username'] : '')); + $this->to($user_row['user_jabber'], (isset($user_row['username']) ? $user_row['username'] : '')); } } @@ -383,7 +394,7 @@ public function set_addresses($user) * @param string $realname Jabber "To" recipient name * @return void */ - public function to($address, $realname = '') + public function to(string $address, string $realname = ''): void { // IM-Addresses could be empty if (!trim($address)) @@ -399,7 +410,7 @@ public function to($address, $realname = '') /** * {@inheritDoc} */ - public function reset() + public function init(): void { $this->subject = $this->msg = ''; $this->additional_headers = $this->to = []; @@ -408,11 +419,9 @@ public function reset() } /** - * Sets the use of messenger queue flag - * - * @return void + * {@inheritDoc} */ - public function set_use_queue($use_queue = true) + public function set_use_queue(bool $use_queue = true): void { $this->use_queue = !$this->config['jab_package_size'] ? false : $use_queue; } @@ -420,7 +429,7 @@ public function set_use_queue($use_queue = true) /** * {@inheritDoc} */ - public function process_queue(&$queue_data) + public function process_queue(array &$queue_data): void { $queue_object_name = $this->get_queue_object_name(); $messages_count = count($queue_data[$queue_object_name]['data']); @@ -473,9 +482,9 @@ public function process_queue(&$queue_data) } /** - * Send jabber message out - */ - public function send() + * {@inheritDoc} + */ + public function send(): void { $this->prepare_message(); @@ -537,10 +546,9 @@ public function send() * Send data to the Jabber server * * @param string $xml - * * @return int|bool */ - public function send_xml($xml) + public function send_xml(string $xml): int|bool { if ($this->connected()) { @@ -555,14 +563,14 @@ public function send_xml($xml) } /** - * OpenSocket + * Open socket * - * @param string $server host to connect to - * @param int $port port number + * @param string $server Host to connect to + * @param int $port Port number * * @return bool */ - public function open_socket($server, $port) + public function open_socket(string $server, int $port): bool { if (@function_exists('dns_get_record')) { @@ -590,9 +598,11 @@ public function open_socket($server, $port) } /** - * Return log + * Get connection log + * + * @return string */ - public function get_log() + public function get_log(): string { if ($this->enable_logging && count($this->log_array)) { @@ -604,8 +614,11 @@ public function get_log() /** * Add information to log + * + * @param string $string Log entry + * @return void */ - protected function add_to_log($string) + protected function add_to_log(string $string): void { if ($this->enable_logging) { @@ -617,9 +630,11 @@ protected function add_to_log($string) * Listens to the connection until it gets data or the timeout is reached. * Thus, it should only be called if data is expected to be received. * - * @return mixed either false for timeout or an array with the received data + * @param int $timeout Connection timeout + * @param bool $wait Flag indicating if it should wait for the responce until timeout + * @return bool|array Either false for timeout or an array with the received data */ - public function listen($timeout = 10, $wait = false) + public function listen(int $timeout = 10, bool $wait = false): bool|array { if (!$this->connected()) { @@ -653,7 +668,7 @@ public function listen($timeout = 10, $wait = false) * * @return bool|void */ - public function register() + public function register(): bool|void { if (!isset($this->session['id']) || isset($this->session['jid'])) { @@ -668,13 +683,12 @@ public function register() /** * Sets account presence. No additional info required (default is "online" status) * - * @param string $message online, offline... - * @param string $type dnd, away, chat, xa or nothing - * @param bool $unavailable set this to true if you want to become unavailable - * + * @param string $message Account status (online, offline) + * @param string $type Status type (dnd, away, chat, xa or nothing) + * @param bool $unavailable Set to true to make unavailable status * @return int|bool */ - function send_presence($message = '', $type = '', $unavailable = false) + function send_presence(string $message = '', string $type = '', bool $unavailable = false): int|bool { if (!isset($this->session['jid'])) { @@ -697,10 +711,9 @@ function send_presence($message = '', $type = '', $unavailable = false) * This handles all the different XML elements * * @param array $xml - * * @return bool|void */ - function response($xml) + function response(array $xml): bool|void { if (!is_array($xml) || !count($xml)) { @@ -1019,7 +1032,7 @@ function response($xml) * * @return int|bool */ - public function send_message($to, $text, $subject = '', $type = 'normal') + public function send_message(string $to, string $text, string $subject = '', string $type = 'normal'): int|bool { if (!isset($this->session['jid'])) { @@ -1042,10 +1055,9 @@ public function send_message($to, $text, $subject = '', $type = 'normal') * Encrypts a password as in RFC 2831 * * @param array $data Needs data from the client-server connection - * * @return string */ - public function encrypt_password($data) + public function encrypt_password(array $data): string { // let's me think about again... foreach (array('realm', 'cnonce', 'digest-uri') as $key) @@ -1074,12 +1086,12 @@ public function encrypt_password($data) } /** - * parse_data like a="b",c="d",... or like a="a, b", c, d="e", f=g,... - * @param string $data + * Parse data string like a="b",c="d",... or like a="a, b", c, d="e", f=g,... * + * @param string $data * @return array a => b ... */ - public function parse_data($data) + public function parse_data(string $data): array { $data = explode(',', $data); $pairs = array(); @@ -1106,13 +1118,12 @@ public function parse_data($data) } /** - * opposite of jabber::parse_data() - * - * @param array $data + * The opposite of jabber::parse_data() * + * @param array $data Data array * @return string */ - public function implode_data($data) + public function implode_data(arary $data): string { $return = array(); foreach ($data as $key => $value) @@ -1126,8 +1137,13 @@ public function implode_data($data) * xmlize() * @author Hans Anderson * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ + * + * @param string $data Data string + * @param string|int|bool $skip_white New XML parser option value + * @param string $encoding Encoding value + * @return string */ - function xmlize($data, $skip_white = 1, $encoding = 'UTF-8') + function xmlize(string $data, string|int|bool $skip_white = 1, string $encoding = 'UTF-8'): array { $data = trim($data); @@ -1162,8 +1178,12 @@ function xmlize($data, $skip_white = 1, $encoding = 'UTF-8') * _xml_depth() * @author Hans Anderson * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ + * + * @param array $vals XML data array + * @param int $i XML tags depth level + * @return array */ - function _xml_depth($vals, &$i) + function _xml_depth(array $vals, int &$i): array { $children = array(); diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php index 22068342698..abcc29c1bd7 100644 --- a/phpBB/phpbb/messenger/queue.php +++ b/phpBB/phpbb/messenger/queue.php @@ -41,9 +41,6 @@ class queue /** @var service_collection */ protected $messenger_method_collection; - /** @var int */ - protected $package_size = 0; - /** @var array */ protected $queue_data = []; @@ -55,7 +52,7 @@ class queue * @param service_collection $messenger_method_collection * @param string $cache_file */ - function __construct(config $config, dispatcher $dispatcher, service_collection $messenger_method_collection, $cache_file) + public function __construct(config $config, dispatcher $dispatcher, service_collection $messenger_method_collection, $cache_file) { $this->config = $config; $this->dispatcher = $dispatcher; @@ -71,7 +68,7 @@ function __construct(config $config, dispatcher $dispatcher, service_collection * @param int $package_size Size of the messenger package to send * @return void */ - public function init($object, $package_size) + public function init(string $object, int $package_size): void { $this->data[$object] = []; $this->data[$object]['package_size'] = $package_size; @@ -82,10 +79,10 @@ public function init($object, $package_size) * Put message into the messenger file queue * * @param string $object Queue object type: email/jabber/etc - * @param mixed $message_data Message data to send + * @param array $message_data Message data to send * @return void */ - public function put($object, $message_data) + public function put(string $object, array $message_data): void { $this->data[$object]['data'][] = $message_data; } @@ -95,7 +92,7 @@ public function put($object, $message_data) * * @return void */ - public function process() + public function process(): void { $lock = new \phpbb\lock\flock($this->cache_file); $lock->acquire(); @@ -119,14 +116,12 @@ public function process() /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger_method_collection->getIterator(); - while ($messenger_collection_iterator->valid()) + foreach ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); if (isset($this->queue_data[$messenger_method->get_queue_object_name()])) { $messenger_method->process_queue($this->queue_data); } - $messenger_collection_iterator->next(); } if (!count($this->queue_data)) @@ -164,7 +159,7 @@ public function process() * * @return void */ - public function save() + public function save(): void { if (!count($this->data)) { diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 38e48944f0c..7cbc532390f 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -114,9 +114,8 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger->getIterator(); - while ($messenger_collection_iterator->valid()) + while ($messenger_collection_iterator as $messenger_method) { - $messenger_method = $messenger_collection_iterator->current(); if ($messenger_method->get_id() == $notify_method || $notify_method == NOTIFY_BOTH) { $messenger_method->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix); @@ -131,7 +130,6 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = // Save the queue in the messenger method class (has to be called or these messages could be lost) $messenger_method->save_queue(); } - $messenger_collection_iterator->next(); } } diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index ae01972d7f7..95a2a82b121 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -25,7 +25,7 @@ use phpbb\request\request; use phpbb\template\template; use phpbb\user; -use phpbb\di\service_collection; +use phpbb\messenger\method\email; use Symfony\Component\HttpFoundation\Response; /** @@ -51,6 +51,9 @@ class reset_password /** @var log_interface */ protected $log; + /** @var email */ + protected $email_method; + /** @var manager */ protected $passwords_manager; @@ -72,9 +75,6 @@ class reset_password /** @var string PHP extension */ protected $php_ext; - /** @var service_collection */ - protected $messenger; - /** * Reset password controller constructor. * @@ -84,6 +84,7 @@ class reset_password * @param helper $helper * @param language $language * @param log_interface $log + * @param email $email_method * @param manager $passwords_manager * @param request $request * @param template $template @@ -91,12 +92,11 @@ class reset_password * @param string $users_table * @param string $root_path * @param string $php_ext - * @param service_collection $messenger */ public function __construct(config $config, driver_interface $db, dispatcher $dispatcher, helper $helper, - language $language, log_interface $log, manager $passwords_manager, + language $language, log_interface $log, email $email_method, manager $passwords_manager, request $request, template $template, user $user, string $users_table, - string $root_path, string $php_ext, service_collection $messenger) + string $root_path, string $php_ext) { $this->config = $config; $this->db = $db; @@ -104,6 +104,7 @@ public function __construct(config $config, driver_interface $db, dispatcher $di $this->helper = $helper; $this->language = $language; $this->log = $log; + $this->email_method = $email_method; $this->passwords_manager = $passwords_manager; $this->request = $request; $this->template = $template; @@ -111,7 +112,6 @@ public function __construct(config $config, driver_interface $db, dispatcher $di $this->users_table = $users_table; $this->root_path = $root_path; $this->php_ext = $php_ext; - $this->messenger = $messenger; } /** @@ -256,19 +256,18 @@ public function request() WHERE user_id = ' . $user_row['user_id']; $this->db->sql_query($sql); - $email = $this->messenger->offsetGet('messenger.method.email'); - $email->set_use_queue(false); - $email->template('user_forgot_password', $user_row['user_lang']); - $email->set_addresses($user_row); - $email->anti_abuse_headers($this->config, $this->user); - $email->assign_vars([ + $this->email_method->set_use_queue(false); + $this->email_method->template('user_forgot_password', $user_row['user_lang']); + $this->email_method->set_addresses($user_row); + $this->email_method->anti_abuse_headers($this->config, $this->user); + $this->email_method->assign_vars([ 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), 'U_RESET_PASSWORD' => generate_board_url(true) . $this->helper->route('phpbb_ucp_reset_password_controller', [ 'u' => $user_row['user_id'], 'token' => $reset_token, ], false) ]); - $email->send(); + $this->email_method->send(); return $this->helper->message($message); } From 3fddff240c6f86bafcdb3cd56692195daf780f8f Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 23 Jun 2024 14:29:17 +0700 Subject: [PATCH 0567/1214] [ticket/17135] Use email method instead of service collection where appropriate PHPBB-17135 --- .../default/container/services_console.yml | 4 +- phpBB/config/installer/container/services.yml | 1 + phpBB/phpbb/console/command/user/activate.php | 27 +++--- phpBB/phpbb/console/command/user/add.php | 27 +++--- .../install_finish/task/notify_user.php | 23 +++-- phpBB/phpbb/messenger/method/email.php | 8 +- tests/console/user/activate_test.php | 4 +- tests/console/user/add_test.php | 4 +- tests/console/user/base.php | 83 ++++++++++++++++++- 9 files changed, 124 insertions(+), 57 deletions(-) diff --git a/phpBB/config/default/container/services_console.yml b/phpBB/config/default/container/services_console.yml index ba6658f8891..81bc0f51b67 100644 --- a/phpBB/config/default/container/services_console.yml +++ b/phpBB/config/default/container/services_console.yml @@ -327,7 +327,7 @@ services: - '@config' - '@language' - '@log' - - '@messenger.method_collection' + - '@messenger.method.email' - '@notification_manager' - '@user_loader' - '%core.root_path%' @@ -342,7 +342,7 @@ services: - '@dbal.conn' - '@config' - '@language' - - '@messenger.method_collection' + - '@messenger.method.email' - '@passwords.manager' - '%core.root_path%' - '%core.php_ext%' diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml index 70fb0ee308d..7ef423afb11 100644 --- a/phpBB/config/installer/container/services.yml +++ b/phpBB/config/installer/container/services.yml @@ -5,6 +5,7 @@ imports: - { resource: ../../default/container/services_filesystem.yml } - { resource: ../../default/container/services_http.yml } - { resource: ../../default/container/services_language.yml } + - { resource: ../../default/container/services_messenger.yml } - { resource: ../../default/container/services_php.yml } - { resource: ../../default/container/services_routing.yml } - { resource: ../../default/container/services_twig.yml } diff --git a/phpBB/phpbb/console/command/user/activate.php b/phpBB/phpbb/console/command/user/activate.php index 23f1b390e32..9fa0f4182b0 100644 --- a/phpBB/phpbb/console/command/user/activate.php +++ b/phpBB/phpbb/console/command/user/activate.php @@ -17,10 +17,10 @@ use phpbb\console\command\command; use phpbb\language\language; use phpbb\log\log_interface; +use phpbb\messenger\method\email; use phpbb\notification\manager; use phpbb\user; use phpbb\user_loader; -use phpbb\di\service_collection; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputInterface; @@ -33,15 +33,15 @@ class activate extends command /** @var config */ protected $config; + /** @var email */ + protected $email_method; + /** @var language */ protected $language; /** @var log_interface */ protected $log; - /** @var service_collection */ - protected $messenger; - /** @var manager */ protected $notifications; @@ -69,18 +69,18 @@ class activate extends command * @param config $config * @param language $language * @param log_interface $log - * @param service_collection $messenger + * @param email $email_method * @param manager $notifications * @param user_loader $user_loader * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(user $user, config $config, language $language, log_interface $log, service_collection $messenger, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext) + public function __construct(user $user, config $config, language $language, log_interface $log, email $email_method, manager $notifications, user_loader $user_loader, $phpbb_root_path, $php_ext) { $this->config = $config; + $this->email_method = $email_method; $this->language = $language; $this->log = $log; - $this->messenger = $messenger; $this->notifications = $notifications; $this->user_loader = $user_loader; $this->phpbb_root_path = $phpbb_root_path; @@ -200,15 +200,14 @@ protected function send_notification($user_row, InputInterface $input) if ($input->getOption('send-email')) { - $email_method = $this->messenger->offsetGet('messenger.method.email'); - $email_method->set_use_queue(false); - $email_method->template('admin_welcome_activated', $user_row['user_lang']); - $email_method->set_addresses($user_row); - $email_method->anti_abuse_headers($this->config, $this->user); - $email_method->assign_vars([ + $this->email_method->set_use_queue(false); + $this->email_method->template('admin_welcome_activated', $user_row['user_lang']); + $this->email_method->set_addresses($user_row); + $this->email_method->anti_abuse_headers($this->config, $this->user); + $this->email_method->assign_vars([ 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), ]); - $email_method->send(); + $this->email_method->send(); } } } diff --git a/phpBB/phpbb/console/command/user/add.php b/phpBB/phpbb/console/command/user/add.php index 1ad3770c764..aeb0ee87ebe 100644 --- a/phpBB/phpbb/console/command/user/add.php +++ b/phpBB/phpbb/console/command/user/add.php @@ -18,9 +18,9 @@ use phpbb\db\driver\driver_interface; use phpbb\exception\runtime_exception; use phpbb\language\language; +use phpbb\messenger\method\email; use phpbb\passwords\manager; use phpbb\user; -use phpbb\di\service_collection; use Symfony\Component\Console\Command\Command as symfony_command; use Symfony\Component\Console\Helper\QuestionHelper; use Symfony\Component\Console\Input\InputInterface; @@ -40,12 +40,12 @@ class add extends command /** @var config */ protected $config; + /** @var email */ + protected $email_method; + /** @var language */ protected $language; - /** @var service_collection */ - protected $messenger; - /** @var manager */ protected $password_manager; @@ -75,12 +75,12 @@ class add extends command * @param string $phpbb_root_path * @param string $php_ext */ - public function __construct(user $user, driver_interface $db, config $config, language $language, service_collection $messenger, manager $password_manager, $phpbb_root_path, $php_ext) + public function __construct(user $user, driver_interface $db, config $config, language $language, email $email_method, manager $password_manager, $phpbb_root_path, $php_ext) { - $this->db = $db; $this->config = $config; + $this->db = $db; + $this->email_method = $email_method; $this->language = $language; - $this->messenger = $messenger; $this->password_manager = $password_manager; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; @@ -313,18 +313,17 @@ protected function send_activation_email($user_id) $user_actkey = $this->get_activation_key($user_id); - $email_method = $this->messenger->offsetGet('messenger.method.email'); - $email_method->set_use_queue(false); - $email_method->template($email_template, $this->user->lang_name); - $email_method->to($this->data['email'], $this->data['username']); - $email_method->anti_abuse_headers($this->config, $this->user); - $email_method->assign_vars([ + $this->email_method->set_use_queue(false); + $this->email_method->template($email_template, $this->user->lang_name); + $this->email_method->to($this->data['email'], $this->data['username']); + $this->email_method->anti_abuse_headers($this->config, $this->user); + $this->email_method->assign_vars([ 'WELCOME_MSG' => html_entity_decode($this->language->lang('WELCOME_SUBJECT', $this->config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($this->data['username'], ENT_COMPAT), 'PASSWORD' => html_entity_decode($this->data['new_password'], ENT_COMPAT), 'U_ACTIVATE' => generate_board_url() . "/ucp.{$this->php_ext}?mode=activate&u=$user_id&k=$user_actkey", ]); - $email_method->send(); + $this->email_method->send(); } /** diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php index 3f2c439bdd2..ff575130a4d 100644 --- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php +++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php @@ -20,7 +20,7 @@ use phpbb\log\log_interface; use phpbb\user; use phpbb\install\helper\container_factory; -use phpbb\di\service_collection; +use phpbb\messenger\method\email; /** * Logs installation and sends an email to the admin @@ -39,6 +39,9 @@ class notify_user extends \phpbb\install\task_base /** @var db */ protected $config; + /** @var email */ + protected $email_method; + /** @var log_interface */ protected $log; @@ -48,9 +51,6 @@ class notify_user extends \phpbb\install\task_base /** @var user */ protected $user; - /** @var service_collection */ - protected $messenger; - /** * Constructor * @@ -67,7 +67,7 @@ public function __construct(container_factory $container, config $install_config $this->auth = $container->get('auth'); $this->log = $container->get('log'); $this->user = $container->get('user'); - $this->messenger = $container->get('messenger.method_collection'); + $this->email_method = $container->get('messenger.method.email'); $this->phpbb_root_path = $phpbb_root_path; // We need to reload config for cases when it doesn't have all values @@ -97,16 +97,15 @@ public function run() if ($this->config['email_enable']) { - $email_method = $this->messenger->offsetGet('messenger.method.email'); - $email_method->set_use_queue(false); - $email_method->template('installed', $this->install_config->get('user_language', 'en')); - $email_method->to($this->config['board_email'], $this->install_config->get('admin_name')); - $email_method->anti_abuse_headers($this->config, $this->user); - $email_method->assign_vars([ + $this->email_method->set_use_queue(false); + $this->email_method->template('installed', $this->install_config->get('user_language', 'en')); + $this->email_method->to($this->config['board_email'], $this->install_config->get('admin_name')); + $this->email_method->anti_abuse_headers($this->config, $this->user); + $this->email_method->assign_vars([ 'USERNAME' => html_entity_decode($this->install_config->get('admin_name'), ENT_COMPAT), 'PASSWORD' => html_entity_decode($this->install_config->get('admin_passwd'), ENT_COMPAT), ]); - $email_method->send(); + $this->email_method->send(); } // Login admin diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index d3642b263da..187f869ce04 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -17,13 +17,7 @@ use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email as symfony_email; -use Symfony\Component\Mime\Header\DateHeader; use Symfony\Component\Mime\Header\Headers; -use Symfony\Component\Mime\Header\IdentificationHeader; -use Symfony\Component\Mime\Header\MailboxHeader; -use Symfony\Component\Mime\Header\MailboxListHeader; -use Symfony\Component\Mime\Header\PathHeader; -use Symfony\Component\Mime\Header\UnstructuredHeader; /** * Messenger class @@ -308,7 +302,7 @@ protected function build_headers(): void // Add additional headers $phpbb_headers = array_merge($phpbb_headers, $this->additional_headers); - + foreach ($phpbb_headers as $header => $value) { $this->headers->addHeader($header, $value); diff --git a/tests/console/user/activate_test.php b/tests/console/user/activate_test.php index 5df59a37112..2ff65c3e3b5 100644 --- a/tests/console/user/activate_test.php +++ b/tests/console/user/activate_test.php @@ -38,11 +38,11 @@ public function get_command_tester() $this->config, $this->language, $this->log, + $this->email, $this->notifications, $this->user_loader, $this->phpbb_root_path, - $this->php_ext, - $this->messenger_method_collection + $this->php_ext )); $command = $application->find('user:activate'); diff --git a/tests/console/user/add_test.php b/tests/console/user/add_test.php index 3e2d2cfedff..fb2618787e1 100644 --- a/tests/console/user/add_test.php +++ b/tests/console/user/add_test.php @@ -30,10 +30,10 @@ public function get_command_tester($question_answers = []) $this->db, $this->config, $this->language, + $this->email, $this->passwords_manager, $this->phpbb_root_path, - $this->php_ext, - $this->messenger_method_collection + $this->php_ext )); $command = $application->find('user:add'); diff --git a/tests/console/user/base.php b/tests/console/user/base.php index 7d14b9a6641..610e72f4918 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -105,10 +105,85 @@ protected function setUp(): void $phpbb_container->setParameter('tables.user_notifications', 'phpbb_user_notifications'); - $this->messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); - $this->messenger_method_collection->add('messenger.method.email'); - $this->messenger_method_collection->add('messenger.method.jabber'); - $phpbb_container->set('messenger.method_collection', $this->messenger_method_collection); + $assets_bag = new \phpbb\template\assets_bag(); + $phpbb_container->set('assets.bag', $assets_bag); + + $dispatcher = new \phpbb\event\dispatcher(); + $phpbb_container->set('dispatcher', $dispatcher); + + $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; + $phpbb_container->setParameter('core.cache_dir', $core_cache_dir); + + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; + $phpbb_container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $messenger_method_collection->add('messenger.method.email'); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + + $messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $phpbb_container->set('messenger.queue', $messenger_queue); + + $request = new phpbb_mock_request; + $phpbb_container->set('request', $request); + + $symfony_request = new \phpbb\symfony_request( + $request + ); + + $phpbb_path_helper = new \phpbb\path_helper( + $symfony_request, + $request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container->set('path_helper', $phpbb_path_helper); + + $extension_manager = new phpbb_mock_extension_manager( + __DIR__ . '/', + [] + ); + $phpbb_container->set('ext.manager', $extension_manager); + + $context = new \phpbb\template\context(); + $cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $phpbb_container->setParameter('core.template.cache_path', $cache_path); + $filesystem = new \phpbb\filesystem\filesystem(); + $phpbb_container->set('filesystem', $filesystem); + + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $this->config, + $filesystem, + $phpbb_path_helper, + $cache_path, + null, + new \phpbb\template\twig\loader(''), + $dispatcher, + [ + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ] + ); + $twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang); + $phpbb_container->set('template.twig.extensions.phpbb', $twig_extension); + + $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig_extensions_collection->add('template.twig.extensions.phpbb'); + $phpbb_container->set('template.twig.extensions.collection', $twig_extensions_collection); + + $twig->addExtension($twig_extension); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $phpbb_container->set('template.twig.lexer', $twig_lexer); + + $this->email = new \phpbb\messenger\method\phpbb_email( + $assets_bag, $this->config, $dispatcher, $this->language, $log, $request, $user, $messenger_queue, + $phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer, + $cache_path, $phpbb_root_path + ); + $phpbb_container->set('messenger.method.email', $this->email); parent::setUp(); } From 0c720eaf7ccd7b95c3576016717a2e2629f50b99 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 23 Jun 2024 14:55:01 +0700 Subject: [PATCH 0568/1214] [ticket/17135] Fix code flaws PHPBB-17135 --- .../default/container/services_messenger.yml | 4 +- phpBB/includes/acp/acp_email.php | 3 +- phpBB/includes/acp/acp_inactive.php | 4 +- phpBB/includes/ucp/ucp_activate.php | 2 +- phpBB/includes/ucp/ucp_register.php | 6 +- phpBB/memberlist.php | 2 +- phpBB/phpbb/messenger/method/base.php | 41 ++---- phpBB/phpbb/messenger/method/email.php | 62 ++++----- phpBB/phpbb/messenger/method/jabber.php | 35 +++--- .../notification/method/messenger_base.php | 2 +- tests/console/user/base.php | 58 +++++++-- tests/email/email_parsing_test.php | 19 ++- .../phpbb_functional_test_case.php | 118 ++++++++++++++++++ 13 files changed, 249 insertions(+), 107 deletions(-) diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index c2ff6fa679b..8645d2f17cc 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -16,9 +16,7 @@ services: - '@assets.bag' - '@config' - '@dispatcher' - - '@ext.manager' - '@language' - - '@log' - '@messenger.queue' - '@path_helper' - '@request' @@ -27,6 +25,8 @@ services: - '@user' - '%core.root_path%' - '%core.template.cache_path%' + - '@?ext.manager' + - '@?log' messenger.method.email: class: phpbb\messenger\method\email diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 630b1bcb148..677cea26b59 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -217,7 +217,8 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars))); - $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); + /** @var \phpbb\di\service_collection */ + $messenger = $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); for ($i = 0, $size = count($email_list); $i < $size; $i++) { diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 9d5d7303481..fa9ad8fa520 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -198,7 +198,9 @@ function main($id, $mode) { // Send the messages $usernames = $user_ids = array(); - $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); + + /** @var \phpbb\di\service_collection */ + $messenger = $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); do diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index b8867fcdb30..dcb2801fff6 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -131,7 +131,7 @@ function main($id, $mode) $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']); - $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); + $messenger = $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); foreach ($messenger_collection_iterator as $messenger_method) { diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 6736ea25f0d..e5319f1dbbc 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -458,6 +458,7 @@ function main($id, $mode) if ($config['email_enable']) { + /** var \phpbb\messenger\method\email */ $email_method = $phpbb_container->get('messenger.method.email'); $email_method->set_use_queue(false); $email_method->template($email_template, $data['lang']); @@ -490,8 +491,9 @@ function main($id, $mode) * @var string server_url Server URL * @var int user_id New user ID * @var string user_actkey User activation key - * @var messenger messenger phpBB Messenger + * @var \phpbb\messenger\method\email email_method phpBB email notification method * @since 3.2.4-RC1 + * @changed 4.0.0-a1 Added vars: email_method. Removed vars: messenger. */ $vars = array( 'user_row', @@ -501,7 +503,7 @@ function main($id, $mode) 'server_url', 'user_id', 'user_actkey', - 'messenger', + 'email_method', ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_welcome_email_before', compact($vars))); diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index be4b467a5f0..aa15cdd6be5 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -900,7 +900,7 @@ case 'contactadmin': case 'email': - $messenger = (\phpbb\di\service_collection) $phpbb_container->get('messenger.method_collection'); + $messenger = $phpbb_container->get('messenger.method_collection'); $user_id = $request->variable('u', 0); $topic_id = $request->variable('t', 0); diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 1d6e23ad29b..8b12128d430 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -94,9 +94,7 @@ abstract class base * @param assets_bag $assets_bag * @param config $config * @param dispatcher $dispatcher - * @param manager $ext_manager * @param language $language - * @param log_interface $log * @param queue $queue * @param path_helper $path_helper * @param request $request @@ -105,14 +103,14 @@ abstract class base * @param user $user * @param string $phpbb_root_path * @param string $template_cache_path + * @param manager $ext_manager + * @param log_interface $log */ public function __construct( assets_bag $assets_bag, config $config, dispatcher $dispatcher, - manager $ext_manager, language $language, - log_interface $log, queue $queue, path_helper $path_helper, request $request, @@ -120,7 +118,9 @@ public function __construct( lexer $twig_lexer, user $user, $phpbb_root_path, - $template_cache_path + $template_cache_path, + ?manager $ext_manager = null, + ?log_interface $log = null ) { $this->assets_bag = $assets_bag; @@ -198,32 +198,6 @@ public function subject(string $subject = ''): void $this->subject = $subject; } - /** - * Adds antiabuse headers - * - * @param config $config Config object - * @param user $user User object - * @return void - */ - abstract public function anti_abuse_headers(config $config, user $user): void; - - /** - * Set up extra headers - * - * @param string $header_name Email header name - * @param string $header_value Email header body - * @return void - */ - abstract public function header(string $header_name, string $header_value): void; - - /** - * Set the reply to address - * - * @param string $address Email "Reply to" address - * @return void - */ - abstract public function reply_to($address): void; - /** * Send out messages * @@ -444,7 +418,10 @@ public function error(string $msg): void $type = strtoupper($this->get_queue_object_name()); $calling_page = html_entity_decode($this->request->server('PHP_SELF'), ENT_COMPAT); $message = '' . $type . '
                            ' . htmlspecialchars($calling_page, ENT_COMPAT) . '

                            ' . $msg . '
                            '; - $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]); + if ($this->log) + { + $this->log->add('critical', $this->user->data['user_id'], $this->user->ip, 'LOG_ERROR_' . $type, false, [$message]); + } } /** diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 187f869ce04..c33f048fcc4 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -26,11 +26,11 @@ class email extends base { /** @var array */ private const PRIORITY_MAP = [ - Email::PRIORITY_HIGHEST => 'Highest', - Email::PRIORITY_HIGH => 'High', - Email::PRIORITY_NORMAL => 'Normal', - Email::PRIORITY_LOW => 'Low', - Email::PRIORITY_LOWEST => 'Lowest', + symfony_email::PRIORITY_HIGHEST => 'Highest', + symfony_email::PRIORITY_HIGH => 'High', + symfony_email::PRIORITY_NORMAL => 'Normal', + symfony_email::PRIORITY_LOW => 'Low', + symfony_email::PRIORITY_LOWEST => 'Lowest', ]; /** @@ -40,7 +40,7 @@ class email extends base */ protected $dsn = ''; - /** @var Email */ + /** @var symfony_email */ protected $email; /** @var Address */ @@ -53,13 +53,13 @@ class email extends base * @var int * * Possible values are: - * Email::PRIORITY_HIGHEST - * Email::PRIORITY_HIGH - * Email::PRIORITY_NORMAL - * Email::PRIORITY_LOW - * Email::PRIORITY_LOWEST + * symfony_email::PRIORITY_HIGHEST + * symfony_email::PRIORITY_HIGH + * symfony_email::PRIORITY_NORMAL + * symfony_email::PRIORITY_LOW + * symfony_email::PRIORITY_LOWEST */ - protected $mail_priority = Email::PRIORITY_NORMAL; + protected $mail_priority = symfony_email::PRIORITY_NORMAL; /** @var \phpbb\messenger\queue */ protected $queue; @@ -102,7 +102,7 @@ public function init(): void $this->email = new symfony_email(); $this->headers = $this->email->getHeaders(); $this->subject = $this->msg = ''; - $this->mail_priority = Email::PRIORITY_NORMAL; + $this->mail_priority = symfony_email::PRIORITY_NORMAL; $this->additional_headers = []; $this->use_queue = true; @@ -254,16 +254,16 @@ public function anti_abuse_headers(\phpbb\config\config $config, \phpbb\user $us * Set the email priority * * Possible values are: - * Email::PRIORITY_HIGHEST = 1 - * Email::PRIORITY_HIGH = 2 - * Email::PRIORITY_NORMAL = 3 - * Email::PRIORITY_LOW = 4 - * Email::PRIORITY_LOWEST = 5 + * symfony_email::PRIORITY_HIGHEST = 1 + * symfony_email::PRIORITY_HIGH = 2 + * symfony_email::PRIORITY_NORMAL = 3 + * symfony_email::PRIORITY_LOW = 4 + * symfony_email::PRIORITY_LOWEST = 5 * * @param int $priority Email priority level * @return void */ - public function set_mail_priority(int $priority = Email::PRIORITY_NORMAL): void + public function set_mail_priority(int $priority = symfony_email::PRIORITY_NORMAL): void { $this->email->priority($priority); } @@ -291,7 +291,7 @@ protected function build_headers(): void $this->email->priority($this->mail_priority); - $phpbb_headers = [ + $headers = [ 'Return-Path' => new Address($this->config['board_email']), 'Sender' => new Address($this->config['board_email']), 'X-MSMail-Priority' => self::PRIORITY_MAP[$this->mail_priority], @@ -301,25 +301,23 @@ protected function build_headers(): void ]; // Add additional headers - $phpbb_headers = array_merge($phpbb_headers, $this->additional_headers); + $headers = array_merge($headers, $this->additional_headers); - foreach ($phpbb_headers as $header => $value) - { - $this->headers->addHeader($header, $value); - } - - $headers = $this->headers; /** * Event to modify email header entries * * @event core.modify_email_headers - * @var Headers headers Array containing email header entries + * @var array headers Array containing email header entries * @since 3.1.11-RC1 - * @changed 4.0.0-a1 'headers' var type changed from array to \Symfony\Component\Mime\Header\Headers */ $vars = ['headers']; extract($this->dispatcher->trigger_event('core.modify_email_headers', compact($vars))); - $this->headers = $headers; + + foreach ($headers as $header => $value) + { + $this->headers->addHeader($header, $value); + } + } /** @@ -566,7 +564,9 @@ public function send(): bool 'email' => $this->email, ]); } - $this->reset(); + + // Reset the object + $this->init(); return true; } diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index 5e174c135b6..8e5e0a4e889 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -359,13 +359,12 @@ public function connected(): bool return is_resource($this->connection) && !feof($this->connection); } - /** * Initiates login (using data from contructor, after calling connect()) * - * @return bool|void + * @return bool|null */ - public function login(): bool|void + public function login(): bool|null { if (empty($this->features)) { @@ -410,7 +409,7 @@ public function to(string $address, string $realname = ''): void /** * {@inheritDoc} */ - public function init(): void + public function reset(): void { $this->subject = $this->msg = ''; $this->additional_headers = $this->to = []; @@ -484,7 +483,7 @@ public function process_queue(array &$queue_data): void /** * {@inheritDoc} */ - public function send(): void + public function send(): bool { $this->prepare_message(); @@ -666,9 +665,9 @@ public function listen(int $timeout = 10, bool $wait = false): bool|array /** * Initiates account registration (based on data used for contructor) * - * @return bool|void + * @return bool|null */ - public function register(): bool|void + public function register(): bool|null { if (!isset($this->session['id']) || isset($this->session['jid'])) { @@ -711,9 +710,9 @@ function send_presence(string $message = '', string $type = '', bool $unavailabl * This handles all the different XML elements * * @param array $xml - * @return bool|void + * @return bool|null */ - function response(array $xml): bool|void + function response(array $xml): bool|null { if (!is_array($xml) || !count($xml)) { @@ -728,20 +727,17 @@ function response(array $xml): bool|void { $this->response(array($key => $value)); } - return; + return true; } - else + else if (is_array(reset($xml)) && count(reset($xml)) > 1) { // or even multiple elements of the same type? // array('message' => array(0 => ..., 1 => ...)) - if (is_array(reset($xml)) && count(reset($xml)) > 1) + foreach (reset($xml) as $value) { - foreach (reset($xml) as $value) - { - $this->response(array(key($xml) => array(0 => $value))); - } - return; + $this->response(array(key($xml) => array(0 => $value))); } + return true; } switch (key($xml)) @@ -1012,6 +1008,7 @@ function response(array $xml): bool|void $message['subject'] = $xml['message'][0]['#']['subject'][0]['#']; } $this->session['messages'][] = $message; + return true; break; default: @@ -1123,7 +1120,7 @@ public function parse_data(string $data): array * @param array $data Data array * @return string */ - public function implode_data(arary $data): string + public function implode_data(array $data): string { $return = array(); foreach ($data as $key => $value) @@ -1141,7 +1138,7 @@ public function implode_data(arary $data): string * @param string $data Data string * @param string|int|bool $skip_white New XML parser option value * @param string $encoding Encoding value - * @return string + * @return array */ function xmlize(string $data, string|int|bool $skip_white = 1, string $encoding = 'UTF-8'): array { diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 7cbc532390f..97994f84af6 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -114,7 +114,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger->getIterator(); - while ($messenger_collection_iterator as $messenger_method) + foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $notify_method || $notify_method == NOTIFY_BOTH) { diff --git a/tests/console/user/base.php b/tests/console/user/base.php index 610e72f4918..511cfff9a3e 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -34,7 +34,7 @@ protected function setUp(): void { global $auth, $db, $cache, $config, $user, $phpbb_dispatcher, $phpbb_container, $phpbb_root_path, $phpEx; - $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = new \phpbb\event\dispatcher(); $phpbb_container = new phpbb_mock_container_builder(); $phpbb_container->set('cache.driver', new phpbb_mock_cache()); $phpbb_container->set('notification_manager', new phpbb_mock_notification_manager()); @@ -108,8 +108,7 @@ protected function setUp(): void $assets_bag = new \phpbb\template\assets_bag(); $phpbb_container->set('assets.bag', $assets_bag); - $dispatcher = new \phpbb\event\dispatcher(); - $phpbb_container->set('dispatcher', $dispatcher); + $phpbb_container->set('dispatcher', $phpbb_dispatcher); $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; $phpbb_container->setParameter('core.cache_dir', $core_cache_dir); @@ -121,7 +120,7 @@ protected function setUp(): void $messenger_method_collection->add('messenger.method.email'); $phpbb_container->set('messenger.method_collection', $messenger_method_collection); - $messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file); $phpbb_container->set('messenger.queue', $messenger_queue); $request = new phpbb_mock_request; @@ -139,9 +138,33 @@ protected function setUp(): void ); $phpbb_container->set('path_helper', $phpbb_path_helper); - $extension_manager = new phpbb_mock_extension_manager( + $factory = new \phpbb\db\tools\factory(); + $db_doctrine = $this->new_doctrine_dbal(); + $db_tools = $factory->get($db_doctrine); + $migrator = new \phpbb\db\migrator( + $phpbb_container, + $config, + $db, + $db_tools, + 'phpbb_migrations', + $phpbb_root_path, + $this->php_ext, + 'phpbb_', + self::get_core_tables(), + [], + new \phpbb\db\migration\helper() + ); + $phpbb_container->set('migrator', $migrator); + + $finder_factory = new \phpbb\finder\factory(null, false, $phpbb_root_path, $this->php_ext); + $extension_manager = new \phpbb\extension\manager( + $phpbb_container, + $db, + $config, + $finder_factory, + 'phpbb_ext', __DIR__ . '/', - [] + new \phpbb\cache\service(new phpbb_mock_cache(), $config, $db, $phpbb_dispatcher, $phpbb_root_path, $this->php_ext) ); $phpbb_container->set('ext.manager', $extension_manager); @@ -159,7 +182,7 @@ protected function setUp(): void $cache_path, null, new \phpbb\template\twig\loader(''), - $dispatcher, + $phpbb_dispatcher, [ 'cache' => false, 'debug' => false, @@ -167,7 +190,7 @@ protected function setUp(): void 'autoescape' => false, ] ); - $twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang); + $twig_extension = new \phpbb\template\twig\extension($context, $twig, $this->language); $phpbb_container->set('template.twig.extensions.phpbb', $twig_extension); $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); @@ -178,10 +201,21 @@ protected function setUp(): void $twig_lexer = new \phpbb\template\twig\lexer($twig); $phpbb_container->set('template.twig.lexer', $twig_lexer); - $this->email = new \phpbb\messenger\method\phpbb_email( - $assets_bag, $this->config, $dispatcher, $this->language, $log, $request, $user, $messenger_queue, - $phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer, - $cache_path, $phpbb_root_path + $this->email = new \phpbb\messenger\method\email( + $assets_bag, + $this->config, + $phpbb_dispatcher, + $this->language, + $messenger_queue, + $phpbb_path_helper, + $request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $this->log ); $phpbb_container->set('messenger.method.email', $this->email); diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index 1a464e86aab..fc1d1ef3be9 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -123,10 +123,21 @@ protected function setUp(): void $messenger_queue = new \phpbb\messenger\queue($config, $dispatcher, $messenger_method_collection, $core_messenger_queue_file); $phpbb_container->set('messenger.queue', $messenger_queue); - $this->email = new \phpbb\messenger\method\phpbb_email( - $assets_bag, $config, $dispatcher, $lang, $log, $request, $user, $messenger_queue, - $phpbb_path_helper, $extension_manager, $twig_extensions_collection, $twig_lexer, - $cache_path, $phpbb_root_path + $this->email = new \phpbb\messenger\method\email( + $assets_bag, + $config, + $dispatcher, + $lang, + $messenger_queue, + $phpbb_path_helper, + $request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $log ); $phpbb_container->set('messenger.method.email', $this->email); diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 3e9b654b0e4..79e76fd1aec 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -324,6 +324,123 @@ protected function get_extension_manager() return $extension_manager; } + protected static function get_messenger_method_email($container) + { + global $phpbb_root_path, $phpEx; + + $config = new \phpbb\config\config( + [ + 'version' => PHPBB_VERSION, + 'email_enable' => false, + 'email_package_size' => 0, + 'smtp_delivery' => 0, + 'default_lang' => 'en', + ] + ); + + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $lang = new \phpbb\language\language($lang_loader); + $user = new \phpbb\user($lang, '\phpbb\datetime'); + $container->set('user', $user); + $container->set('language', $lang); + + $assets_bag = new \phpbb\template\assets_bag(); + $container->set('assets.bag', $assets_bag); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $container->set('dispatcher', $phpbb_dispatcher); + + $core_cache_dir = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/'; + $container->setParameter('core.cache_dir', $core_cache_dir); + + $core_messenger_queue_file = $core_cache_dir . 'queue.' . $phpEx; + $container->setParameter('core.messenger_queue_file', $core_messenger_queue_file); + + $messenger_method_collection = new \phpbb\di\service_collection($container); + $messenger_method_collection->add('messenger.method.email'); + $container->set('messenger.method_collection', $messenger_method_collection); + + $messenger_queue = new \phpbb\messenger\queue($config, $phpbb_dispatcher, $messenger_method_collection, $core_messenger_queue_file); + $container->set('messenger.queue', $messenger_queue); + + $request = new phpbb_mock_request; + $container->set('request', $request); + + $symfony_request = new \phpbb\symfony_request( + $request + ); + + $phpbb_path_helper = new \phpbb\path_helper( + $symfony_request, + $request, + $phpbb_root_path, + $phpEx + ); + $container->set('path_helper', $phpbb_path_helper); + + $dbms = self::$config['dbms']; + $db = new $dbms(); + $db->sql_connect(self::$config['dbhost'], self::$config['dbuser'], self::$config['dbpasswd'], self::$config['dbname'], self::$config['dbport']); + + $extension_manager = new phpbb_mock_extension_manager($phpbb_root_path, [], $container); + $container->set('ext.manager', $extension_manager); + + $context = new \phpbb\template\context(); + $cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $container->setParameter('core.template.cache_path', $cache_path); + $filesystem = new \phpbb\filesystem\filesystem(); + $container->set('filesystem', $filesystem); + + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $config, + $filesystem, + $phpbb_path_helper, + $cache_path, + null, + new \phpbb\template\twig\loader(''), + $phpbb_dispatcher, + [ + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ] + ); + $twig_extension = new \phpbb\template\twig\extension($context, $twig, $lang); + $container->set('template.twig.extensions.phpbb', $twig_extension); + + $twig_extensions_collection = new \phpbb\di\service_collection($container); + $twig_extensions_collection->add('template.twig.extensions.phpbb'); + $container->set('template.twig.extensions.collection', $twig_extensions_collection); + + $twig->addExtension($twig_extension); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $container->set('template.twig.lexer', $twig_lexer); + + $auth = new \phpbb\auth\auth(); + $log = new \phpbb\log\log($db, $user, $auth, $phpbb_dispatcher, $phpbb_root_path, 'adm/', $phpEx, LOG_TABLE); + $container->set('log', $log); + + $email_method = new \phpbb\messenger\method\email( + $assets_bag, + $config, + $phpbb_dispatcher, + $lang, + $messenger_queue, + $phpbb_path_helper, + $request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $log + ); + $container->set('messenger.method.email', $email_method); + } + protected static function install_board() { global $phpbb_root_path, $phpEx; @@ -374,6 +491,7 @@ protected static function install_board() $container->set('installer.install_finish.notify_user', new phpbb_mock_null_installer_task()); $container->register('installer.install_finish.install_extensions')->setSynthetic(true); $container->set('installer.install_finish.install_extensions', new phpbb_mock_null_installer_task()); + self::get_messenger_method_email($container); $container->compile(); $language = $container->get('language'); From e3ed54f0b5d9346eda1dc6d0194e7dc5659bb0d9 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 24 Jun 2024 20:47:42 +0700 Subject: [PATCH 0569/1214] [ticket/17135] Attempt to fix Psalm issues PHPBB-17135 --- phpBB/phpbb/messenger/method/jabber.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index 8e5e0a4e889..199adcd65a8 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -362,9 +362,9 @@ public function connected(): bool /** * Initiates login (using data from contructor, after calling connect()) * - * @return bool|null + * @return bool */ - public function login(): bool|null + public function login(): bool { if (empty($this->features)) { @@ -710,9 +710,9 @@ function send_presence(string $message = '', string $type = '', bool $unavailabl * This handles all the different XML elements * * @param array $xml - * @return bool|null + * @return bool */ - function response(array $xml): bool|null + function response(array $xml): bool { if (!is_array($xml) || !count($xml)) { @@ -769,6 +769,7 @@ function response(array $xml): bool|null { return $this->response($this->features); } + return false; break; case 'stream:features': From e8cf35c583d96fa84b1433312daecb5e2845c930 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Oct 2024 22:04:05 +0700 Subject: [PATCH 0570/1214] [ticket/17135] Update Symfony mailer PHPBB-17135 --- tests/notification/notification_method_webpush_test.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index e52bf9a7acc..7967a0f7c6b 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -171,6 +171,9 @@ protected function setUp(): void $ban_manager = new \phpbb\ban\manager($collection, new \phpbb\cache\driver\dummy(), $this->db, $this->language, $this->log, $user, 'phpbb_bans', 'phpbb_users'); $phpbb_container->set('ban.manager', $ban_manager); + $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); + $phpbb_container->set('messenger.method_collection', $messenger_method_collection); + $this->notification_method_webpush = new \phpbb\notification\method\webpush( $phpbb_container->get('config'), $phpbb_container->get('dbal.conn'), @@ -180,7 +183,7 @@ protected function setUp(): void $phpbb_root_path, $phpEx, $phpbb_container->getParameter('tables.notification_push'), - $phpbb_container->getParameter('tables.push_subscriptions'), + $phpbb_container->getParameter('tables.push_subscriptions') ); $phpbb_container->set('notification.method.webpush', $this->notification_method_webpush); From 50e408bdea795be1915e664e10edb65dbc5478b2 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 8 Dec 2024 18:29:58 +0700 Subject: [PATCH 0571/1214] [ticket/17135] Add messenger method interface class PHPBB-17135 --- phpBB/phpbb/messenger/method/base.php | 32 ++++------ .../messenger/method/messenger_interface.php | 59 +++++++++++++++++++ 2 files changed, 72 insertions(+), 19 deletions(-) create mode 100644 phpBB/phpbb/messenger/method/messenger_interface.php diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 8b12128d430..15fa782d182 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -29,7 +29,7 @@ /** * Messenger base class */ -abstract class base +abstract class base implements messenger_interface { /** @var array */ protected $additional_headers = []; @@ -142,16 +142,12 @@ public function __construct( } /** - * Get messenger method id - * - * @return int + * {@inheritdoc} */ abstract public function get_id(): int; /** - * Check if the messenger method is enabled - * - * @return bool + * {@inheritdoc} */ abstract public function is_enabled(): bool; @@ -176,6 +172,7 @@ abstract public function init(): void; * Set addresses for to/im as available * * @param array $user_row User row + * * @return void */ abstract public function set_addresses(array $user_row): void; @@ -188,10 +185,7 @@ abstract public function set_addresses(array $user_row): void; abstract public function get_queue_object_name(): string; /** - * Set up subject for mail - * - * @param string $subject Email subject - * @return void + * {@inheritdoc} */ public function subject(string $subject = ''): void { @@ -199,16 +193,15 @@ public function subject(string $subject = ''): void } /** - * Send out messages - * - * @return bool + * {@inheritdoc} */ - abstract protected function send(): bool; + abstract public function send(): bool; /** * Send messages from the queue * * @param array $queue_data Queue data array + * * @return void */ abstract public function process_queue(array &$queue_data): void; @@ -303,6 +296,7 @@ public function template(string $template_file, string $template_lang = '', stri * Assign variables to email template * * @param array $vars Array of VAR => VALUE to assign to email template + * * @return void */ public function assign_vars(array $vars): void @@ -316,6 +310,7 @@ public function assign_vars(array $vars): void * * @param string $blockname Template block name * @param array $vars Array of VAR => VALUE to assign to email template block + * * @return void */ public function assign_block_vars(string $blockname, array $vars): void @@ -402,10 +397,7 @@ public function prepare_message(): void } /** - * Add error message to log - * - * @param string $msg Error message text - * @return void + * {@inheritdoc} */ public function error(string $msg): void { @@ -426,6 +418,7 @@ public function error(string $msg): void /** * Save message data to the messenger file queue + * * @return void */ public function save_queue(): void @@ -479,6 +472,7 @@ protected function setup_template(): void * * @param string|array $path_name Email template path name * @param string|array $paths Email template paths + * * @return void */ protected function set_template_paths(string|array $path_name, string|array $paths): void diff --git a/phpBB/phpbb/messenger/method/messenger_interface.php b/phpBB/phpbb/messenger/method/messenger_interface.php new file mode 100644 index 00000000000..980cd06a225 --- /dev/null +++ b/phpBB/phpbb/messenger/method/messenger_interface.php @@ -0,0 +1,59 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\messenger\method; + +/** + * Messenger method interface class + */ +interface messenger_interface +{ + /** + * Get messenger method id + * + * @return int + */ + public function get_id(): int; + + /** + * Check if the messenger method is enabled + * + * @return bool + */ + public function is_enabled(): bool; + + /** + * Set up subject for the message + * + * @param string $subject Email subject + * + * @return void + */ + public function subject(string $subject = ''): void; + + /** + * Send out messages + * + * @return bool + */ + public function send(): bool; + + /** + * Add error message to log + * + * @param string $msg Error message text + * + * @return void + */ + public function error(string $msg): void; +} From 2f6ec7fc65192f0491482258d82fe3689c4d0fcc Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 5 Jan 2025 16:01:06 +0700 Subject: [PATCH 0572/1214] [ticket/17135] Update Symfony mailer PHPBB-17135 --- phpBB/composer.lock | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index ba6cff7047f..bf9ac175e95 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6e182dafa1a6e6a60136e35d5379532", + "content-hash": "2ce7bc4e8f61d065ff471afa38f12394", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -4488,16 +4488,16 @@ }, { "name": "symfony/mailer", - "version": "v6.3.5", + "version": "v6.4.13", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06" + "reference": "c2f7e0d8d7ac8fe25faccf5d8cac462805db2663" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/d89611a7830d51b5e118bca38e390dea92f9ea06", - "reference": "d89611a7830d51b5e118bca38e390dea92f9ea06", + "url": "https://api.github.com/repos/symfony/mailer/zipball/c2f7e0d8d7ac8fe25faccf5d8cac462805db2663", + "reference": "c2f7e0d8d7ac8fe25faccf5d8cac462805db2663", "shasum": "" }, "require": { @@ -4505,8 +4505,8 @@ "php": ">=8.1", "psr/event-dispatcher": "^1", "psr/log": "^1|^2|^3", - "symfony/event-dispatcher": "^5.4|^6.0", - "symfony/mime": "^6.2", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -4517,10 +4517,10 @@ "symfony/twig-bridge": "<6.2.1" }, "require-dev": { - "symfony/console": "^5.4|^6.0", - "symfony/http-client": "^5.4|^6.0", - "symfony/messenger": "^6.2", - "symfony/twig-bridge": "^6.2" + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.2|^7.0", + "symfony/twig-bridge": "^6.2|^7.0" }, "type": "library", "autoload": { @@ -4548,7 +4548,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.3.5" + "source": "https://github.com/symfony/mailer/tree/v6.4.13" }, "funding": [ { @@ -4564,7 +4564,7 @@ "type": "tidelift" } ], - "time": "2023-09-06T09:47:15+00:00" + "time": "2024-09-25T14:18:03+00:00" }, { "name": "symfony/mime", From 28d5534d069c65f260400cdfbe295a19c44c1e1f Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 6 Jan 2025 18:24:32 +0700 Subject: [PATCH 0573/1214] [ticket/17135] Address review issues but constants PHPBB-17135 --- phpBB/includes/acp/acp_email.php | 19 +++++++++++++----- phpBB/includes/ucp/ucp_resend.php | 7 ++++--- phpBB/phpbb/messenger/method/base.php | 7 ++++--- phpBB/phpbb/messenger/method/email.php | 20 ++++++++++++------- phpBB/phpbb/messenger/method/jabber.php | 18 ++++++++--------- .../notification/method/messenger_base.php | 1 - phpBB/phpbb/template/twig/extension.php | 9 +++++---- 7 files changed, 49 insertions(+), 32 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 677cea26b59..9d8657a294e 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -227,25 +227,34 @@ function main($id, $mode) foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $used_method || $used_method == NOTIFY_BOTH) + $notify_method = $messenger_method->get_id(); + if ($notify_method == $used_method || $used_method == NOTIFY_BOTH) { $messenger_method->set_use_queue($use_queue); $messenger_method->template($email_template, $used_lang); $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); $messenger_method->assign_vars($template_data); - if ($messenger_method->get_id() == NOTIFY_EMAIL) + if ($notify_method == NOTIFY_EMAIL) { for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) { $email_row = $email_list[$i][$j]; - $messenger_method->{((count($email_list[$i]) == 1) ? 'to' : 'bcc')}($email_row['email'], $email_row['name']); + if (count($email_list[$i]) == 1) + { + $messenger_method->to($email_row['email'], $email_row['name']); + + } + else + { + $messenger_method->bcc($email_row['email'], $email_row['name']); + } } $messenger_method->anti_abuse_headers($config, $user); $messenger_method->set_mail_priority($priority); } - else if ($messenger_method->get_id() == NOTIFY_JABBER) + else if ($notify_method == NOTIFY_IM) { for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) { @@ -254,7 +263,7 @@ function main($id, $mode) } } - $errored = !$messenger_method->send(); + $errored = !$messenger_method->send() || $errored; if ($use_queue) { $messenger_method->save_queue(); diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index ab108bc15dd..278c086a8b9 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -92,6 +92,7 @@ function main($id, $mode) trigger_error('NO_GROUP'); } + $board_url = generate_board_url(); $coppa = ($row['group_name'] == 'REGISTERED_COPPA' && $row['group_type'] == GROUP_SPECIAL) ? true : false; $email_method = $phpbb_container->get('messenger.method.email'); @@ -107,7 +108,7 @@ function main($id, $mode) $email_method->assign_vars([ 'WELCOME_MSG' => html_entity_decode(sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), ENT_COMPAT), 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", + 'U_ACTIVATE' => $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", ]); if ($coppa) @@ -145,8 +146,8 @@ function main($id, $mode) $messenger_method->anti_abuse_headers($config, $user); $messenger_method->assign_vars([ 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_USER_DETAILS' => generate_board_url() . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", + 'U_USER_DETAILS' => $board_url . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", + 'U_ACTIVATE' => $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", ]); $messenger_method->send(); diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 15fa782d182..46d676013cf 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -117,8 +117,8 @@ public function __construct( service_collection $twig_extensions_collection, lexer $twig_lexer, user $user, - $phpbb_root_path, - $template_cache_path, + string $phpbb_root_path, + string $template_cache_path, ?manager $ext_manager = null, ?log_interface $log = null ) @@ -154,6 +154,8 @@ abstract public function is_enabled(): bool; /** * Sets the use of messenger queue flag * + * @param bool $use_queue Flag indicating if cached queue to be used + * * @return void */ public function set_use_queue(bool $use_queue = true): void @@ -426,7 +428,6 @@ public function save_queue(): void if ($this->use_queue && !empty($this->queue)) { $this->queue->save(); - return; } } diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index c33f048fcc4..a8927c23e3d 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -110,9 +110,7 @@ public function init(): void } /** - * Sets the use of messenger queue flag - * - * @return void + * {@inheritdoc} */ public function set_use_queue(bool $use_queue = true): void { @@ -124,7 +122,7 @@ public function set_use_queue(bool $use_queue = true): void */ public function set_addresses(array $user_row): void { - if (isset($user_row['user_email']) && $user_row['user_email']) + if (!empty($user_row['user_email'])) { $this->to($user_row['user_email'], $user_row['username'] ?: ''); } @@ -295,8 +293,8 @@ protected function build_headers(): void 'Return-Path' => new Address($this->config['board_email']), 'Sender' => new Address($this->config['board_email']), 'X-MSMail-Priority' => self::PRIORITY_MAP[$this->mail_priority], - 'X-Mailer' => 'phpBB3', - 'X-MimeOLE' => 'phpBB3', + 'X-Mailer' => 'phpBB', + 'X-MimeOLE' => 'phpBB', 'X-phpBB-Origin' => 'phpbb://' . str_replace(['http://', 'https://'], ['', ''], generate_board_url()), ]; @@ -472,6 +470,7 @@ public function send(): bool $this->email->subject($this->subject); $this->email->text($this->msg); + $break = false; $subject = $this->subject; $msg = $this->msg; $email = $this->email; @@ -479,13 +478,15 @@ public function send(): bool * Event to send message via external transport * * @event core.notification_message_email + * @var bool break Flag indicating if the function return after hook * @var string subject The message subject * @var string msg The message text * @var string email The Symfony Email object * @since 3.2.4-RC1 - * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses, break + * @changed 4.0.0-a1 Added vars: email. Removed vars: addresses */ $vars = [ + 'break', 'subject', 'msg', 'email', @@ -495,6 +496,11 @@ public function send(): bool $this->build_headers(); + if ($break) + { + return true; + } + // Send message ... if (!$this->use_queue) { diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index 199adcd65a8..b4fab795746 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -191,7 +191,7 @@ public function ssl(bool $use_ssl = false): self */ public function port(int $port = 5222): self { - $this->port = ($port) ? $port : 5222; + $this->port = ($port > 0) ? $port : 5222; // Change port if we use SSL if ($this->port == 5222 && $this->use_ssl) @@ -210,14 +210,14 @@ public function port(int $port = 5222): self */ public function username(string $username = ''): self { - if (strpos($username, '@') === false) + if (str_contains($username, '@')) { - $this->username = $username; + $this->jid = explode('@', $username, 2); + $this->username = $this->jid[0]; } else { - $this->jid = explode('@', $username, 2); - $this->username = $this->jid[0]; + $this->username = $username; } return $this; @@ -232,7 +232,7 @@ public function username(string $username = ''): self */ public function server(string $server = ''): self { - $this->connect_server = ($server) ? $server : 'localhost'; + $this->connect_server = $server ?: 'localhost'; $this->server = $this->jid[1] ?? $this->connect_server; return $this; @@ -407,7 +407,7 @@ public function to(string $address, string $realname = ''): void } /** - * {@inheritDoc} + * Resets all the data (address, template file, etc) to default */ public function reset(): void { @@ -663,7 +663,7 @@ public function listen(int $timeout = 10, bool $wait = false): bool|array } /** - * Initiates account registration (based on data used for contructor) + * Initiates account registration (based on data used for constructor) * * @return bool|null */ @@ -714,7 +714,7 @@ function send_presence(string $message = '', string $type = '', bool $unavailabl */ function response(array $xml): bool { - if (!is_array($xml) || !count($xml)) + if (!count($xml)) { return false; } diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 97994f84af6..4aaf01c133a 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -112,7 +112,6 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = continue; } - /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger->getIterator(); foreach ($messenger_collection_iterator as $messenger_method) { diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index fa9fca0705f..96a1aa91f11 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -14,6 +14,9 @@ namespace phpbb\template\twig; use Twig\Error\RuntimeError; +use Twig\Extension\CoreExtension; +use Twig\Extension\EscaperExtension; +use Twig\Runtime\EscaperRuntime; class extension extends \Twig\Extension\AbstractExtension { @@ -164,8 +167,7 @@ public function loop_subset(\Twig\Environment $env, $item, $start, $end = null, // We always include the last element (this was the past design) $end = ($end == -1 || $end === null) ? null : $end + 1; - /** @psalm-suppress UndefinedFunction */ - return twig_slice($env, $item, $start, $end, $preserveKeys); + return CoreExtension::slice($env->getCharset(), $item, $start, $end, $preserveKeys); } /** @@ -214,8 +216,7 @@ public function lang_js(): string { $args = func_get_args(); - /** @psalm-suppress UndefinedFunction */ - return twig_escape_filter($this->environment, call_user_func_array([$this, 'lang'], $args), 'js'); + return $this->environment->getRuntime(EscaperRuntime::class)->escape(call_user_func_array([$this, 'lang'], $args), 'js'); } /** From 0d8c0c422841fecbe82ce41ca00712888b0279c9 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 6 Jan 2025 20:01:52 +0700 Subject: [PATCH 0574/1214] [ticket/17135] Move notify method constants to interface class PHPBB-17135 --- phpBB/includes/acp/acp_email.php | 15 ++++++++------- phpBB/includes/acp/acp_inactive.php | 2 +- phpBB/includes/acp/acp_jabber.php | 19 +++++++------------ phpBB/includes/acp/acp_users.php | 7 ++++--- phpBB/includes/constants.php | 3 +++ phpBB/includes/functions_user.php | 4 +++- phpBB/includes/ucp/ucp_activate.php | 2 +- phpBB/includes/ucp/ucp_prefs.php | 12 +++++++----- phpBB/includes/ucp/ucp_profile.php | 6 ++++-- phpBB/includes/ucp/ucp_resend.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 4 +++- .../v310/notification_options_reconvert.php | 6 ++++-- phpBB/phpbb/message/admin_form.php | 6 ++++-- phpBB/phpbb/message/message.php | 8 +++++--- phpBB/phpbb/message/topic_form.php | 6 ++++-- phpBB/phpbb/messenger/method/email.php | 2 +- phpBB/phpbb/messenger/method/jabber.php | 2 +- .../messenger/method/messenger_interface.php | 9 +++++++++ phpBB/phpbb/notification/method/email.php | 3 ++- phpBB/phpbb/notification/method/jabber.php | 3 ++- .../notification/method/messenger_base.php | 4 ++-- 21 files changed, 76 insertions(+), 49 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 9d8657a294e..446067c2a88 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -11,6 +11,8 @@ * */ +use phpbb\messenger\method\messenger_interface; + /** * @ignore */ @@ -156,9 +158,9 @@ function main($id, $mode) foreach ($rows as $row) { - if (($row['user_notify_type'] == NOTIFY_EMAIL && $row['user_email']) || - ($row['user_notify_type'] == NOTIFY_IM && $row['user_jabber']) || - ($row['user_notify_type'] == NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber']))) + if (($row['user_notify_type'] == messenger_interface::NOTIFY_EMAIL && $row['user_email']) || + ($row['user_notify_type'] == messenger_interface::NOTIFY_IM && $row['user_jabber']) || + ($row['user_notify_type'] == messenger_interface::NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber']))) { if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type) { @@ -228,14 +230,14 @@ function main($id, $mode) foreach ($messenger_collection_iterator as $messenger_method) { $notify_method = $messenger_method->get_id(); - if ($notify_method == $used_method || $used_method == NOTIFY_BOTH) + if ($notify_method == $used_method || $used_method == messenger_interface::NOTIFY_BOTH) { $messenger_method->set_use_queue($use_queue); $messenger_method->template($email_template, $used_lang); $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); $messenger_method->assign_vars($template_data); - if ($notify_method == NOTIFY_EMAIL) + if ($notify_method == messenger_interface::NOTIFY_EMAIL) { for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) { @@ -243,7 +245,6 @@ function main($id, $mode) if (count($email_list[$i]) == 1) { $messenger_method->to($email_row['email'], $email_row['name']); - } else { @@ -254,7 +255,7 @@ function main($id, $mode) $messenger_method->anti_abuse_headers($config, $user); $messenger_method->set_mail_priority($priority); } - else if ($notify_method == NOTIFY_IM) + else if ($notify_method == messenger_interface::NOTIFY_IM) { for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) { diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index fa9ad8fa520..ec74d59169b 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -207,7 +207,7 @@ function main($id, $mode) { foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH) + if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) { $messenger_method->template('user_remind_inactive', $row['user_lang']); $messenger_method->set_addresses($row); diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index 07f5dadbffa..c952275daa9 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -30,15 +30,10 @@ class acp_jabber function main($id, $mode) { global $db, $user, $template, $phpbb_log, $request; - global $config, $phpbb_root_path, $phpEx; + global $config, $phpbb_container, $phpbb_root_path, $phpEx; $user->add_lang('acp/board'); - if (!class_exists('jabber')) - { - include($phpbb_root_path . 'includes/functions_jabber.' . $phpEx); - } - $submit = (isset($_POST['submit'])) ? true : false; if ($mode != 'settings') @@ -73,11 +68,11 @@ function main($id, $mode) $message = $user->lang['JAB_SETTINGS_CHANGED']; $log = 'JAB_SETTINGS_CHANGED'; + $jabber = $phpbb_container->get('messenger.method.jabber'); + // Is this feature enabled? Then try to establish a connection - if ($jab_enable) + if ($jabber->is_enabled()) { - $jabber = new jabber($jab_host, $jab_port, $jab_username, $jab_password, $jab_use_ssl, $jab_verify_peer, $jab_verify_peer_name, $jab_allow_self_signed); - if (!$jabber->connect()) { trigger_error($user->lang['ERR_JAB_CONNECT'] . '

                            ' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); @@ -97,12 +92,12 @@ function main($id, $mode) // We update the user table to be sure all users that have IM as notify type are set to both as notify type // We set this to both because users still have their jabber address entered and may want to receive jabber notifications again once it is re-enabled. $sql_ary = array( - 'user_notify_type' => NOTIFY_BOTH, + 'user_notify_type' => $jabber::NOTIFY_BOTH, ); $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_notify_type = ' . NOTIFY_IM; + WHERE user_notify_type = ' . $jabber::NOTIFY_IM; $db->sql_query($sql); } @@ -137,7 +132,7 @@ function main($id, $mode) 'JAB_VERIFY_PEER' => $jab_verify_peer, 'JAB_VERIFY_PEER_NAME' => $jab_verify_peer_name, 'JAB_ALLOW_SELF_SIGNED' => $jab_allow_self_signed, - 'S_CAN_USE_SSL' => jabber::can_use_ssl(), + 'S_CAN_USE_SSL' => $jabber::can_use_ssl(), 'S_GTALK_NOTE' => (!@function_exists('dns_get_record')) ? true : false, )); } diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index d88d0503871..a954ec09f03 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -16,6 +16,7 @@ */ use phpbb\controller\helper; +use phpbb\messenger\method\messenger_interface; if (!defined('IN_PHPBB')) { @@ -1792,9 +1793,9 @@ function main($id, $mode) 'MASS_EMAIL' => $data['massemail'], 'ALLOW_PM' => $data['allowpm'], 'HIDE_ONLINE' => $data['hideonline'], - 'NOTIFY_EMAIL' => ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false, - 'NOTIFY_IM' => ($data['notifymethod'] == NOTIFY_IM) ? true : false, - 'NOTIFY_BOTH' => ($data['notifymethod'] == NOTIFY_BOTH) ? true : false, + 'NOTIFY_EMAIL' => ($data['notifymethod'] == messenger_interface::NOTIFY_EMAIL) ? true : false, + 'NOTIFY_IM' => ($data['notifymethod'] == messenger_interface::NOTIFY_IM) ? true : false, + 'NOTIFY_BOTH' => ($data['notifymethod'] == messenger_interface::NOTIFY_BOTH) ? true : false, 'NOTIFY_PM' => $data['notifypm'], 'BBCODE' => $data['bbcode'], 'SMILIES' => $data['smilies'], diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 825a328d391..e9890d27e1d 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -120,8 +120,11 @@ define('POST_GLOBAL', 3); // Notify methods +/** @deprecated 4.0.0-a1 Replaced by \phpbb\messenger\method\messenger_interface::NOTIFY_EMAIL, to be removed in 5.0.0-a1 */ define('NOTIFY_EMAIL', 0); +/** @deprecated 4.0.0-a1 Replaced by \phpbb\messenger\method\messenger_interface::NOTIFY_IM, to be removed in 5.0.0-a1 */ define('NOTIFY_IM', 1); +/** @deprecated 4.0.0-a1 Replaced by \phpbb\messenger\method\messenger_interface::NOTIFY_BOTH, to be removed in 5.0.0-a1 */ define('NOTIFY_BOTH', 2); // Notify status diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index bb1b63f1772..7441b744130 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -11,6 +11,8 @@ * */ +use phpbb\messenger\method\messenger_interface; + /** * @ignore */ @@ -244,7 +246,7 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'user_notify' => 0, 'user_notify_pm' => 1, - 'user_notify_type' => NOTIFY_EMAIL, + 'user_notify_type' => messenger_interface::NOTIFY_EMAIL, 'user_allow_pm' => 1, 'user_allow_viewonline' => 1, 'user_allow_viewemail' => 1, diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index dcb2801fff6..c9dd3e553e2 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -135,7 +135,7 @@ function main($id, $mode) $messenger_collection_iterator = $messenger->getIterator(); foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == NOTIFY_BOTH) + if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) { $messenger_method->set_use_queue(false); $messenger_method->template('admin_welcome_activated', $user_row['user_lang']); diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 8c682cebc0c..d08a81b8545 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -11,6 +11,8 @@ * */ +use phpbb\messenger\method\messenger_interface; + /** * @ignore */ @@ -52,10 +54,10 @@ function main($id, $mode) 'allowpm' => $request->variable('allowpm', (bool) $user->data['user_allow_pm']), ); - if ($data['notifymethod'] == NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml'))) + if ($data['notifymethod'] == messenger_interface::NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml'))) { // Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct. - $data['notifymethod'] = NOTIFY_BOTH; + $data['notifymethod'] = messenger_interface::NOTIFY_BOTH; } /** @@ -182,9 +184,9 @@ function main($id, $mode) $template->assign_vars([ 'ERROR' => (count($error)) ? implode('
                            ', $error) : '', - 'S_NOTIFY_EMAIL' => ($data['notifymethod'] == NOTIFY_EMAIL) ? true : false, - 'S_NOTIFY_IM' => ($data['notifymethod'] == NOTIFY_IM) ? true : false, - 'S_NOTIFY_BOTH' => ($data['notifymethod'] == NOTIFY_BOTH) ? true : false, + 'S_NOTIFY_EMAIL' => ($data['notifymethod'] == messenger_interface::NOTIFY_EMAIL) ? true : false, + 'S_NOTIFY_IM' => ($data['notifymethod'] == messenger_interface::NOTIFY_IM) ? true : false, + 'S_NOTIFY_BOTH' => ($data['notifymethod'] == messenger_interface::NOTIFY_BOTH) ? true : false, 'S_VIEW_EMAIL' => $data['viewemail'], 'S_MASS_EMAIL' => $data['massemail'], 'S_ALLOW_PM' => $data['allowpm'], diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 0b34598e141..52b007a1fe6 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -11,6 +11,8 @@ * */ +use phpbb\messenger\method\messenger_interface; + /** * @ignore */ @@ -363,11 +365,11 @@ function main($id, $mode) { $data['notify'] = $user->data['user_notify_type']; - if ($data['notify'] == NOTIFY_IM && (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml'))) + if ($data['notify'] == messenger_interface::NOTIFY_IM && (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml'))) { // User has not filled in a jabber address (Or one of the modules is disabled or jabber is disabled) // Disable notify by Jabber now for this user. - $data['notify'] = NOTIFY_EMAIL; + $data['notify'] = messenger_interface::NOTIFY_EMAIL; } $sql_ary = array( diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 278c086a8b9..4c9c1a86c6f 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -139,7 +139,7 @@ function main($id, $mode) foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); - if ($messenger_method->get_id() == $row['user_notify_type'] || $row['user_notify_type'] == NOTIFY_BOTH) + if ($messenger_method->get_id() == $row['user_notify_type'] || $row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) { $messenger_method->template('admin_activate', $row['user_lang']); $messenger_method->set_addresses($row); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 864e6f3b6e4..8750c24dcc7 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -11,6 +11,8 @@ * */ +use phpbb\messenger\method\messenger_interface; + /** * NOTE to potential convertor authors. Please use this file to get * familiar with the structure since we added some bare explanations here. @@ -936,7 +938,7 @@ array('user_emailtime', 'users.user_emailtime', 'null_to_zero'), array('user_notify', 'users.user_notify', 'intval'), array('user_notify_pm', 'users.user_notify_pm', 'intval'), - array('user_notify_type', NOTIFY_EMAIL, ''), + array('user_notify_type', $messenger_method::NOTIFY_EMAIL, ''), array('user_allow_pm', 'users.user_allow_pm', 'intval'), array('user_allow_viewonline', 'users.user_allow_viewonline', 'intval'), array('user_allow_viewemail', 'users.user_viewemail', 'intval'), diff --git a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php index 7c03eef3475..7f58076a8d0 100644 --- a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php +++ b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php @@ -13,6 +13,8 @@ namespace phpbb\db\migration\data\v310; +use phpbb\messenger\method\messenger_interface; + class notification_options_reconvert extends \phpbb\db\migration\migration { public static function depends_on() @@ -67,12 +69,12 @@ public function perform_conversion(\phpbb\db\sql_insert_buffer $insert_buffer, $ // In-board notification $notification_methods[] = ''; - if ($row['user_notify_type'] == NOTIFY_EMAIL || $row['user_notify_type'] == NOTIFY_BOTH) + if ($row['user_notify_type'] == messenger_interface::NOTIFY_EMAIL || $row['user_notify_type'] == messenger_interface::NOTIFY_BOTH) { $notification_methods[] = 'email'; } - if ($row['user_notify_type'] == NOTIFY_IM || $row['user_notify_type'] == NOTIFY_BOTH) + if ($row['user_notify_type'] == messenger_interface::NOTIFY_IM || $row['user_notify_type'] == messenger_interface::NOTIFY_BOTH) { $notification_methods[] = 'jabber'; } diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index 2c3305dc032..72beaa38a68 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -13,6 +13,8 @@ namespace phpbb\message; +use phpbb\messenger\method\messenger_interface; + /** * Class admin_form * Displays a message to the user and allows him to send an email @@ -155,7 +157,7 @@ public function submit(\phpbb\di\service_collection $messenger) } $this->message->set_sender($this->user->ip, $this->sender_name, $this->sender_address, $this->user->lang_name); - $this->message->set_sender_notify_type(NOTIFY_EMAIL); + $this->message->set_sender_notify_type(messenger_interface::NOTIFY_EMAIL); } $this->message->set_template('contact_admin'); @@ -165,7 +167,7 @@ public function submit(\phpbb\di\service_collection $messenger) $this->user->lang['ADMINISTRATOR'], $this->config['board_contact'], $this->config['default_lang'], - NOTIFY_EMAIL + messenger_interface::NOTIFY_EMAIL ); $this->message->set_template_vars(array( diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 34295d1a025..90b8a1ff5f6 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -13,6 +13,8 @@ namespace phpbb\message; +use phpbb\messenger\method\messenger_interface; + /** * Class message * Holds all information for an email and sends it in the end @@ -46,7 +48,7 @@ class message /** @var string */ protected $sender_jabber = ''; /** @var int */ - protected $sender_notify_type = NOTIFY_EMAIL; + protected $sender_notify_type = messenger_interface::NOTIFY_EMAIL; /** @var array */ protected $recipients; @@ -134,7 +136,7 @@ public function add_recipient_from_user_row(array $user) * @param string $recipient_jabber * @return void */ - public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_notify_type = NOTIFY_EMAIL, $recipient_username = '', $recipient_jabber = '') + public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_notify_type = messenger_interface::NOTIFY_EMAIL, $recipient_username = '', $recipient_jabber = '') { $this->recipients[] = array( 'name' => $recipient_name, @@ -250,7 +252,7 @@ public function send(\phpbb\di\service_collection $messenger, $contact) foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); - if ($messenger_method->get_id() == $recipient['notify_type'] || $recipient['notify_type'] == NOTIFY_BOTH) + if ($messenger_method->get_id() == $recipient['notify_type'] || $recipient['notify_type'] == $messenger_method::NOTIFY_BOTH) { $messenger_method->template($this->template, $recipient['lang']); $messenger_method->set_addresses($recipient); diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php index facde9a4625..dd73a67ab2c 100644 --- a/phpBB/phpbb/message/topic_form.php +++ b/phpBB/phpbb/message/topic_form.php @@ -13,6 +13,8 @@ namespace phpbb\message; +use phpbb\messenger\method\messenger_interface; + /** * Class topic_form * Form used to send topics as notification emails @@ -130,9 +132,9 @@ public function submit(\phpbb\di\service_collection $messenger) $this->recipient_name, $this->recipient_address, $this->recipient_lang, - NOTIFY_EMAIL + messenger_interface::NOTIFY_EMAIL ); - $this->message->set_sender_notify_type(NOTIFY_EMAIL); + $this->message->set_sender_notify_type(messenger_interface::NOTIFY_EMAIL); parent::submit($messenger); } diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index a8927c23e3d..1bad23760c6 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -75,7 +75,7 @@ class email extends base */ public function get_id(): int { - return NOTIFY_EMAIL; + return self::NOTIFY_EMAIL; } /** diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php index b4fab795746..a4a2c07f616 100644 --- a/phpBB/phpbb/messenger/method/jabber.php +++ b/phpBB/phpbb/messenger/method/jabber.php @@ -115,7 +115,7 @@ public function init(): void */ public function get_id(): int { - return NOTIFY_IM; + return self::NOTIFY_IM; } /** diff --git a/phpBB/phpbb/messenger/method/messenger_interface.php b/phpBB/phpbb/messenger/method/messenger_interface.php index 980cd06a225..b733f3d3d4d 100644 --- a/phpBB/phpbb/messenger/method/messenger_interface.php +++ b/phpBB/phpbb/messenger/method/messenger_interface.php @@ -18,6 +18,15 @@ */ interface messenger_interface { + /** @var int Email notify method used */ + public const NOTIFY_EMAIL = 0; + + /** @var int Instant messaging (Jabber) notify method used */ + public const NOTIFY_IM = 1; + + /** @var int Both notify methods used */ + public const NOTIFY_BOTH = 2; + /** * Get messenger method id * diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index 2c612367cc7..8a2fff1bb95 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -19,6 +19,7 @@ use phpbb\config\config; use phpbb\db\driver\driver_interface; use phpbb\di\service_collection; +use phpbb\messenger\method\messenger_interface; /** * Email notification method class @@ -135,7 +136,7 @@ public function notify() $insert_buffer->flush(); - $this->notify_using_messenger(NOTIFY_EMAIL); + $this->notify_using_messenger(messenger_interface::NOTIFY_EMAIL); } /** diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php index 4a0e52fc621..e3482f98be0 100644 --- a/phpBB/phpbb/notification/method/jabber.php +++ b/phpBB/phpbb/notification/method/jabber.php @@ -18,6 +18,7 @@ use phpbb\user_loader; use phpbb\config\config; use phpbb\di\service_collection; +use phpbb\messenger\method\messenger_interface; /** * Jabber notification method class @@ -98,6 +99,6 @@ public function notify() return; } - $this->notify_using_messenger(NOTIFY_IM, 'short/'); + $this->notify_using_messenger(messenger_interface::NOTIFY_IM, 'short/'); } } diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 4aaf01c133a..ca93f4c8a2a 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -67,7 +67,7 @@ public function is_available(type_interface $notification_type = null) /** * Notify using phpBB messenger * - * @param int $notify_method Notify method for messenger (e.g. NOTIFY_IM) + * @param int $notify_method Notify method for messenger (e.g. \phpbb\messenger\method\messenger_interface::NOTIFY_IM) * @param string $template_dir_prefix Base directory to prepend to the email template name * * @return void @@ -115,7 +115,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = $messenger_collection_iterator = $this->messenger->getIterator(); foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $notify_method || $notify_method == NOTIFY_BOTH) + if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH) { $messenger_method->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix); $messenger_method->set_addresses($user); From cd17625e213d4846f3a40395d028747ffcf113b5 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 6 Jan 2025 20:54:34 +0700 Subject: [PATCH 0575/1214] [ticket/17135] Add ACP modules common test PHPBB-17135 --- phpBB/phpbb/template/twig/extension.php | 1 - tests/functional/acp_test.php | 60 +++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 tests/functional/acp_test.php diff --git a/phpBB/phpbb/template/twig/extension.php b/phpBB/phpbb/template/twig/extension.php index 96a1aa91f11..982601e41bd 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -15,7 +15,6 @@ use Twig\Error\RuntimeError; use Twig\Extension\CoreExtension; -use Twig\Extension\EscaperExtension; use Twig\Runtime\EscaperRuntime; class extension extends \Twig\Extension\AbstractExtension diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php new file mode 100644 index 00000000000..1dcd013fae9 --- /dev/null +++ b/tests/functional/acp_test.php @@ -0,0 +1,60 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +/** +* @group functional +*/ +class phpbb_functional_acp_test extends phpbb_functional_test_case +{ + public function test_all_acp_module_links() + { + $this->login(); + $this->admin_login(); + $this->add_lang(['common']); + + // Browse ACP main page + $crawler = self::request('GET', 'index.php'); + $crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link()); + + // Get all ACP module URLs array + $acp_modules = $crawler->filter('li.tab a')->each( + function ($node, $i) + { + // Filter out responsive mode links + if (empty($node->attr('class'))) + { + return $node->link(); + } + } + ); + + // Browse all ACP modules and get their mode URLs array + $acp_submodules = []; + foreach ($acp_modules as $module) + { + $crawler = self::$client->click($module); + $acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu_block li a')->each( + function ($node, $i) + { + return $node->link(); + } + )); + } + + // Browse all ACP submodules' modes + foreach ($acp_submodules as $acp_submodule) + { + self::$client->click($acp_submodule); + } + } +} From a447f957ba5c0b4956eef818baca6f24a196e412 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 6 Jan 2025 21:35:30 +0700 Subject: [PATCH 0576/1214] [ticket/17135] Assert xCP modules array is not empty and test output PHPBB-17135 --- tests/functional/acp_test.php | 7 ++++++- tests/functional/mcp/mcp_test.php | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php index 1dcd013fae9..bf37fc7203f 100644 --- a/tests/functional/acp_test.php +++ b/tests/functional/acp_test.php @@ -25,6 +25,7 @@ public function test_all_acp_module_links() // Browse ACP main page $crawler = self::request('GET', 'index.php'); $crawler = self::$client->click($crawler->selectLink($this->lang('ACP_SHORT'))->link()); + self::assert_response_html(); // Get all ACP module URLs array $acp_modules = $crawler->filter('li.tab a')->each( @@ -37,24 +38,28 @@ function ($node, $i) } } ); + $this->assertNotEmpty($acp_modules); // Browse all ACP modules and get their mode URLs array $acp_submodules = []; foreach ($acp_modules as $module) { $crawler = self::$client->click($module); - $acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu_block li a')->each( + self::assert_response_html(); + $acp_submodules = array_merge($acp_submodules, $crawler->filter('div.menu-block li a')->each( function ($node, $i) { return $node->link(); } )); } + $this->assertNotEmpty($acp_submodules); // Browse all ACP submodules' modes foreach ($acp_submodules as $acp_submodule) { self::$client->click($acp_submodule); + self::assert_response_html(); } } } diff --git a/tests/functional/mcp/mcp_test.php b/tests/functional/mcp/mcp_test.php index ff8dff4564f..b2d8fd6cac4 100644 --- a/tests/functional/mcp/mcp_test.php +++ b/tests/functional/mcp/mcp_test.php @@ -24,6 +24,7 @@ public function test_all_mcp_module_links() // Browse MCP main page $crawler = self::request('GET', 'index.php'); $crawler = self::$client->click($crawler->selectLink($this->lang('MCP_SHORT'))->link()); + self::assert_response_html(); // Get all MCP module URLs array $mcp_modules = $crawler->filter('.tabs a')->each( @@ -32,12 +33,14 @@ function ($node, $i) return $node->link(); } ); + $this->assertNotEmpty($mcp_modules); // Browse all MCP modules and get their mode URLs array $mcp_submodules = []; foreach ($mcp_modules as $module) { $crawler = self::$client->click($module); + self::assert_response_html(); $mcp_submodules = array_merge($mcp_submodules, $crawler->filter('.cp-menu a')->each( function ($node, $i) { @@ -45,11 +48,13 @@ function ($node, $i) } )); } + $this->assertNotEmpty($mcp_submodules); // Browse all MCP submodules' modes foreach ($mcp_submodules as $mcp_submodule) { self::$client->click($mcp_submodule); + self::assert_response_html(); } } } From 4dd08747e3adc9706f30920f4e72077d4d66006c Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 6 Jan 2025 22:31:58 +0700 Subject: [PATCH 0577/1214] [ticket/17135] Fix ACP jabber module PHPBB-17135 --- phpBB/includes/acp/acp_jabber.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php index c952275daa9..fce1dee1df5 100644 --- a/phpBB/includes/acp/acp_jabber.php +++ b/phpBB/includes/acp/acp_jabber.php @@ -32,6 +32,8 @@ function main($id, $mode) global $db, $user, $template, $phpbb_log, $request; global $config, $phpbb_container, $phpbb_root_path, $phpEx; + $jabber = $phpbb_container->get('messenger.method.jabber'); + $user->add_lang('acp/board'); $submit = (isset($_POST['submit'])) ? true : false; @@ -68,8 +70,6 @@ function main($id, $mode) $message = $user->lang['JAB_SETTINGS_CHANGED']; $log = 'JAB_SETTINGS_CHANGED'; - $jabber = $phpbb_container->get('messenger.method.jabber'); - // Is this feature enabled? Then try to establish a connection if ($jabber->is_enabled()) { From 3e0270d0cff96a9696211570528f521789913f00 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 7 Jan 2025 11:54:11 +0700 Subject: [PATCH 0578/1214] [ticket/17135] Optimize save_queue() method calls PHPBB-17135 --- phpBB/includes/acp/acp_email.php | 12 +++++++----- phpBB/includes/acp/acp_inactive.php | 14 +++++++++----- phpBB/includes/ucp/ucp_resend.php | 11 ++++++++--- .../phpbb/notification/method/messenger_base.php | 16 ++++++++++------ 4 files changed, 34 insertions(+), 19 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 446067c2a88..00ce89317cd 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -265,16 +265,18 @@ function main($id, $mode) } $errored = !$messenger_method->send() || $errored; - if ($use_queue) - { - $messenger_method->save_queue(); - } } } } unset($email_list); - $messenger->save_queue(); + if ($use_queue) + { + foreach ($messenger_collection_iterator as $messenger_method) + { + $messenger_method->save_queue(); + } + } if ($generate_log_entry) { diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index ec74d59169b..b9ff966b6dd 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -194,15 +194,15 @@ function main($id, $mode) $result = $db->sql_query($sql); + /** @var \phpbb\di\service_collection */ + $messenger = $phpbb_container->get('messenger.method_collection'); + $messenger_collection_iterator = $messenger->getIterator(); + if ($row = $db->sql_fetchrow($result)) { // Send the messages $usernames = $user_ids = array(); - /** @var \phpbb\di\service_collection */ - $messenger = $phpbb_container->get('messenger.method_collection'); - $messenger_collection_iterator = $messenger->getIterator(); - do { foreach ($messenger_collection_iterator as $messenger_method) @@ -219,7 +219,6 @@ function main($id, $mode) ]); $messenger_method->send(); - $messenger_method->save_queue(); } } @@ -242,6 +241,11 @@ function main($id, $mode) } $db->sql_freeresult($result); + foreach ($messenger_collection_iterator as $messenger_method) + { + $messenger_method->save_queue(); + } + // For remind we really need to redirect, else a refresh can result in more than one reminder $u_action = $this->u_action . "&$u_sort_param&start=$start"; $u_action .= ($per_page != $config['topics_per_page']) ? "&users_per_page=$per_page" : ''; diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 4c9c1a86c6f..76e748e85d3 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -133,6 +133,8 @@ function main($id, $mode) WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); $result = $db->sql_query($sql); + /** @var \phpbb\di\service_collection */ + $messenger = $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); while ($row = $db->sql_fetchrow($result)) { @@ -151,13 +153,16 @@ function main($id, $mode) ]); $messenger_method->send(); - - // Save the queue in the messenger method class (has to be called or these messages could be lost) - $messenger_method->save_queue(); } } } $db->sql_freeresult($result); + + // Save the queue in the messenger method class (has to be called or these messages could be lost) + foreach ($messenger_collection_iterator as $messenger_method) + { + $messenger_method->save_queue(); + } } $this->update_activation_expiration(); diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index ca93f4c8a2a..e4b97b7cacf 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -86,7 +86,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = $user_ids[] = $notification->user_id; } - // We do not send emails to banned users + // We do not notify banned users if (!function_exists('phpbb_get_banned_user_ids')) { include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); @@ -96,7 +96,9 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = // Load all the users we need $this->user_loader->load_users(array_diff($user_ids, $banned_users), array(USER_IGNORE)); - // Time to go through the queue and send emails + // Time to go through the queue and send notifications + $messenger_collection_iterator = $this->messenger->getIterator(); + /** @var type_interface $notification */ foreach ($this->queue as $notification) { @@ -112,7 +114,6 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = continue; } - $messenger_collection_iterator = $this->messenger->getIterator(); foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH) @@ -125,13 +126,16 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = ], $notification->get_email_template_variables())); $messenger_method->send(); - - // Save the queue in the messenger method class (has to be called or these messages could be lost) - $messenger_method->save_queue(); } } } + // Save the queue in the messenger method class (has to be called or these messages could be lost) + foreach ($messenger_collection_iterator as $messenger_method) + { + $messenger_method->save_queue(); + } + // We're done, empty the queue $this->empty_queue(); } From a2f99248cb5550ac7641676457a8450c8d499d1a Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 8 Jan 2025 10:27:55 +0700 Subject: [PATCH 0579/1214] [ticket/17135] Optimize save_queue() method call for acp_inactive PHPBB-17135 --- phpBB/includes/acp/acp_inactive.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index b9ff966b6dd..2436277e15c 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -227,6 +227,11 @@ function main($id, $mode) } while ($row = $db->sql_fetchrow($result)); + foreach ($messenger_collection_iterator as $messenger_method) + { + $messenger_method->save_queue(); + } + // Add the remind state to the database and increase activation expiration by one day $sql = 'UPDATE ' . USERS_TABLE . ' SET user_reminded = user_reminded + 1, @@ -241,11 +246,6 @@ function main($id, $mode) } $db->sql_freeresult($result); - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->save_queue(); - } - // For remind we really need to redirect, else a refresh can result in more than one reminder $u_action = $this->u_action . "&$u_sort_param&start=$start"; $u_action .= ($per_page != $config['topics_per_page']) ? "&users_per_page=$per_page" : ''; From 23010abcb8e9637d495f97132b25640e1b6f811e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 3 Nov 2024 19:50:24 +0100 Subject: [PATCH 0580/1214] [ticket/17459] Increase font sizes PHPBB-17459 --- phpBB/styles/prosilver/theme/buttons.css | 8 +- phpBB/styles/prosilver/theme/colours.css | 20 +--- phpBB/styles/prosilver/theme/common.css | 72 ++++++------- phpBB/styles/prosilver/theme/content.css | 108 ++++++++++---------- phpBB/styles/prosilver/theme/cp.css | 33 +++--- phpBB/styles/prosilver/theme/forms.css | 26 ++--- phpBB/styles/prosilver/theme/icons.css | 22 ++-- phpBB/styles/prosilver/theme/links.css | 4 +- phpBB/styles/prosilver/theme/responsive.css | 4 +- 9 files changed, 144 insertions(+), 153 deletions(-) diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index cf15eb394f3..f51510e0b97 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -4,7 +4,7 @@ .button { font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - font-size: 13px; + font-size: 16px; font-weight: 600; line-height: 1.4; text-align: center; @@ -16,7 +16,7 @@ justify-content: center; align-items: center; box-sizing: border-box; - height: 24px; + height: 30px; padding: 2px 8px; cursor: pointer; touch-action: manipulation; @@ -185,11 +185,11 @@ /* Responsive buttons in post body */ .post-buttons .dropdown { - top: 18px; + top: 30px; } .post-buttons .dropdown a { - font-size: 13px; + font-size: 16px; text-align: right; display: block; justify-content: start; diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index eb16158cc33..4af5c10fb91 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -97,15 +97,11 @@ th a:hover { .headerbar, .forumbg { background-color: #13a4ec; - background-image: -webkit-gradient(linear, left top, left bottom, from(#80d5ff), color-stop(0.1%, #0077b3), color-stop(30%, #13a4ec), to(#13a4ec)); - background-image: linear-gradient(to bottom, #80d5ff 0%, #0077b3 0.1%, #13a4ec 30%, #13a4ec 100%); background-repeat: repeat-x; } .forabg { - background-color: #0077b3; - background-image: -webkit-gradient(linear, left top, left bottom, from(#80d5ff), color-stop(0.1%, #13a4ec), color-stop(30%, #0077b3), to(#0077b3)); - background-image: linear-gradient(to bottom, #80d5ff 0%, #13a4ec 0.1%, #0077b3 30%, #0077b3 100%); + background-color: #13a4ec; background-repeat: repeat-x; } @@ -413,9 +409,7 @@ p.post-notice { /* colours and backgrounds for content.css */ ul.forums { - background-color: #edf4f7; - background-image: -webkit-gradient(linear, left top, left bottom, from(#b8d3e0), to(#edf4f7)); - background-image: linear-gradient(to bottom, #b8d3e0 0%, #edf4f7 100%); + background-color: #d2e4ec; } ul.topiclist > li { @@ -441,7 +435,7 @@ li.row strong { } li.row:hover { - background-color: #fffbcc; + background-color: #cde9f5; } li.row:hover dd { @@ -862,11 +856,7 @@ ul.cplist { .tabs .activetab > a, .tabs .activetab > a:hover { background-color: #c9dee8; - background-image: -webkit-gradient(linear, left top, left bottom, from(#e6f7ff), to(#c9dee8)); - background-image: linear-gradient(to bottom, #e6f7ff 0%, #c9dee8 100%); border-color: #c9dee8; - -webkit-box-shadow: 0 1px 1px #e6f7ff inset; - box-shadow: 0 1px 1px #e6f7ff inset; color: #212121; } @@ -885,9 +875,7 @@ ul.cplist { /* link styles for the sub-section links */ .navigation a { - background: #c0d3dd; - background-image: -webkit-gradient(linear, left top, right top, color-stop(50%, #aab9c0), to(#c0d3dd)); - background-image: linear-gradient(to right, #aab9c0 50%, #c0d3dd 100%); + background: #b5c6cf; color: #212121; } diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 59db92a032e..e4b12fb2e48 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -24,7 +24,7 @@ body { h1 { /* Forum name */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 20px; + font-size: 24px; font-weight: bold; margin-top: 15px; margin-right: 200px; @@ -33,7 +33,7 @@ h1 { h2 { /* Forum header titles */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 20px; + font-size: 24px; font-weight: normal; margin: 0.8em 0 0.2em; } @@ -45,7 +45,7 @@ h2.solo { h3 { /* Sub-headers (also used as post headers, but defined later) */ font-family: Arial, Helvetica, sans-serif; - font-size: 12px; + font-size: 16px; font-weight: bold; text-transform: uppercase; border-bottom: 1px solid transparent; @@ -57,13 +57,13 @@ h3 { h4 { /* Forum and topic list titles */ font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 18px; } p { - font-size: 11px; - line-height: 14px; - margin-bottom: 16px; + font-size: 14px; + line-height: 18px; + margin-bottom: 20px; } img { @@ -228,7 +228,7 @@ a:hover { .panel { border-radius: 7px; - margin-bottom: 4px; + margin-bottom: 8px; padding: 5px 10px; } @@ -262,8 +262,8 @@ ul.linklist { } ul.linklist > li { - font-size: 11px; - line-height: 24px; + font-size: 14px; + line-height: 30px; float: left; width: auto; margin-right: 7px; @@ -434,12 +434,12 @@ a.header-avatar img { } .dropdown-button-control .dropdown { - top: 24px; + top: 30px; } .dropdown-button-control.dropdown-up .dropdown { top: auto; - bottom: 24px; + bottom: 30px; } .dropdown .pointer, @@ -556,7 +556,7 @@ a.header-avatar img { } .dropdown li { - font-size: 11px !important; + font-size: 14px !important; line-height: normal !important; text-align: left; white-space: nowrap; @@ -678,9 +678,9 @@ table.table1 { } table.table1 thead th { - font-size: 10px; + font-size: 12px; font-weight: normal; - line-height: 13px; + line-height: 15px; text-transform: uppercase; padding: 0 0 4px 3px; } @@ -694,7 +694,7 @@ table.table1 tbody tr { } table.table1 td { - font-size: 11px; + font-size: 14px; } table.table1 tbody td { @@ -831,7 +831,7 @@ table.info tbody th { dl.details { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: 14px; } dl.details dt { @@ -882,7 +882,7 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Action-bars (container for post/reply buttons, pagination, etc.) ---------------------------------------- */ .action-bar { - font-size: 11px; + font-size: 14px; margin: 4px 0; } @@ -938,7 +938,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .pagination li.active span { font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - font-size: 13px; + font-size: 16px; font-weight: normal; line-height: 1.4; text-align: center; @@ -962,7 +962,7 @@ fieldset.fields1 dl.pmlist dd.recipients { } .pagination li.page-jump a i { - font-size: 16px; + font-size: 20px; } .pagination .arrow a { @@ -982,10 +982,10 @@ fieldset.fields1 dl.pmlist dd.recipients { .row .pagination li a, .row .pagination li span { - font-size: 9px; + font-size: 12px; border-radius: 2px; - width: 14px; - height: 17px; + width: 17px; + height: 22px; padding: 1px 3px; } @@ -1026,7 +1026,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .phpbb_alert div.alert_text > select, .phpbb_alert div.alert_text > textarea, .phpbb_alert div.alert_text > input { - font-size: 11px; + font-size: 14px; } .darkenwrapper { @@ -1141,13 +1141,13 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Miscellaneous styles ---------------------------------------- */ .copyright { - font-size: 10px; + font-size: 12px; text-align: center; padding: 10px; } .footer-row { - font-size: 10px; + font-size: 12px; line-height: 1.8; margin: 0; } @@ -1165,12 +1165,12 @@ fieldset.fields1 dl.pmlist dd.recipients { } .error { - font-size: 10px; + font-size: 12px; font-weight: bold; } div.rules { - font-size: 11px; + font-size: 18px; border-radius: 7px; margin: 10px 0; padding: 5px 10px; @@ -1243,7 +1243,7 @@ ul.linklist:after, } .member-search strong { - font-size: 11px; + font-size: 14px; } .dropdown-extended { @@ -1319,7 +1319,7 @@ ul.linklist:after, } .dropdown-extended .footer { - font-size: 12px; + font-size: 16px; text-align: center; } @@ -1372,7 +1372,7 @@ ul.linklist:after, } .notification-time { - font-size: 10px; + font-size: 12px; text-align: right; margin: 0; } @@ -1388,7 +1388,7 @@ ul.linklist:after, .notifications-title { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 13px !important; + font-size: 16px !important; } .notifications-title strong { @@ -1396,7 +1396,7 @@ ul.linklist:after, } .notifications-time { - font-size: 10px !important; + font-size: 12px !important; } .notification-text { @@ -1404,16 +1404,16 @@ ul.linklist:after, } .badge { - font-size: 10px; + font-size: 12px; line-height: 1; text-align: center; white-space: nowrap; border-radius: 10px; opacity: 0.8; position: relative; - top: 3px; + top: 5px; float: right; - margin-left: 3px; + margin-left: 5px; padding: 4px 6px; } diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index d942e08b377..1d612e989d3 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -37,7 +37,7 @@ ul.topiclist dd { } ul.topiclist dt { - font-size: 11px; + font-size: 14px; width: 100%; margin-right: -440px; } @@ -55,7 +55,7 @@ ul.topiclist.two-columns dt { } ul.topiclist dt .list-inner { - line-height: 16px; + line-height: 20px; margin-right: 440px; padding-right: 5px; padding-left: 5px; @@ -140,8 +140,8 @@ li.row strong { li.header dt, li.header dd { font-family: Arial, Helvetica, sans-serif; - font-size: 10px; - line-height: 16px; + font-size: 12px; + line-height: 20px; text-transform: uppercase; border-left-width: 0; margin: 2px 0 4px; @@ -193,7 +193,7 @@ dl.row-item dt { } dl.row-item dt .list-inner { - padding-left: 52px; /* Space for folder icon */ + padding-left: 54px; /* Space for folder icon */ } dl.row-item dt, @@ -207,8 +207,8 @@ dd.topics, dd.views, dd.extra, dd.mark { - font-size: 12px; - line-height: 26px; + font-size: 16px; + line-height: 32px; text-align: center; width: 80px; } @@ -236,16 +236,16 @@ dd.redirect, dd.moderation, dd.time, dd.info { - font-size: 11px; + font-size: 14px; width: 250px; } dd.redirect { - line-height: 26px; + line-height: 32px; } dd.time { - line-height: 22px; + line-height: 26px; } dd.lastpost > span, @@ -258,7 +258,7 @@ dd.moderation > span { } dd.lastpost > span { - line-height: 16px; + line-height: 20px; } dd.extra, @@ -267,8 +267,8 @@ dd.mark { } dd.option { - font-size: 11px; - line-height: 22px; + font-size: 14px; + line-height: 28px; text-align: center; width: 125px; } @@ -284,18 +284,18 @@ dd.option { } .postbody .ignore { - font-size: 11px; + font-size: 14px; } .postbody h3.first { /* The first post on the page uses this */ - font-size: 17px; + font-size: 20px; } .postbody h3 { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 15px; - line-height: 19px; + font-size: 18px; + line-height: 22px; text-transform: none; border: none; @@ -317,7 +317,7 @@ dd.option { } .postbody .content { - font-size: 13px; + font-size: 16px; overflow-x: auto; } @@ -374,17 +374,17 @@ dd.option { ---------------------------------------- */ .content { font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 13px; - line-height: 18px; + font-size: 16px; + line-height: 24px; clear: both; overflow: hidden; - min-height: 30px; + min-height: 36px; padding-bottom: 1px; } .content h2, .panel h2 { - font-size: 16px; + font-size: 20px; font-weight: normal; border-bottom: 1px solid transparent; margin-top: 8px; @@ -397,9 +397,9 @@ dd.option { } .panel p { - font-size: 12px; - line-height: 16px; - margin-bottom: 12px; + font-size: 16px; + line-height: 20px; + margin-bottom: 16px; } .content p { @@ -407,9 +407,9 @@ dd.option { } .agreement { - font-size: 12px; - line-height: 17px; - margin-bottom: 10px; + font-size: 16px; + line-height: 20px; + margin-bottom: 14px; } .agreement-text { @@ -419,10 +419,10 @@ dd.option { dl.faq { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; - line-height: 15px; - margin-top: 11px; - margin-bottom: 22px; + font-size: 14px; + line-height: 20px; + margin-top: 14px; + margin-bottom: 28px; } dl.faq dt { @@ -430,8 +430,8 @@ dl.faq dt { } .content dl.faq { - font-size: 12px; - margin-bottom: 6px; + font-size: 16px; + margin-bottom: 8px; } .content li { @@ -450,22 +450,22 @@ dl.faq dt { /* Post author */ p.author { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 10px; - line-height: 12px; + font-size: 12px; + line-height: 16px; clear: both; - margin-bottom: 8px; + margin-bottom: 10px; padding: 0 0 5px; } /* Post signature */ .signature { - font-size: 11px; - line-height: 16px; + font-size: 14px; + line-height: 20px; border-top: 1px solid transparent; clear: left; overflow: hidden; width: 100%; - margin-top: 16px; + margin-top: 20px; padding-top: 2px; } @@ -493,18 +493,18 @@ dd .signature { /* Post noticies */ .notice { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 10px; - line-height: 13px; + font-size: 12px; + line-height: 16px; border-top: 1px dashed transparent; clear: left; width: auto; - margin-top: 15px; + margin-top: 18px; padding-top: 2px; } /* Jump to post link for now */ ul.searchresults { - font-size: 12px; + font-size: 16px; text-align: right; clear: both; list-style: none; @@ -551,20 +551,20 @@ blockquote cite > span { /* Code block */ .codebox { - font-size: 13px; + font-size: 16px; word-wrap: normal; border: 1px solid transparent; - margin: 13px 0 16px; + margin: 16px 0 18px; } .codebox p { - font-size: 10px !important; + font-size: 12px !important; font-weight: bold; text-transform: uppercase; border-bottom: 1px solid transparent; display: block; margin-bottom: 0; - padding: 3px; + padding: 4px; } blockquote .codebox { @@ -584,7 +584,7 @@ blockquote .codebox { /* Attachments ---------------------------------------- */ .attachbox { - font-size: 13px; + font-size: 16px; border: 1px dashed transparent; float: left; clear: left; @@ -715,7 +715,7 @@ fieldset.polls dl.voted { } fieldset.polls dt { - font-size: 11px; + font-size: 14px; text-align: left; border-right: none; display: block; @@ -726,7 +726,7 @@ fieldset.polls dt { } fieldset.polls dd { - font-size: 11px; + font-size: 14px; border-left: none; float: left; width: 10%; @@ -761,7 +761,7 @@ fieldset.polls dd div { } .vote-submitted { - font-size: 12px; + font-size: 16px; font-weight: bold; text-align: center; } @@ -780,8 +780,8 @@ fieldset.polls dd div { .postprofile dd, .postprofile dt { - font-size: 10px; - line-height: 16px; + font-size: 12px; + line-height: 20px; margin-left: 8px; } diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 7daaccb08e9..2f84fc9b120 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -24,12 +24,12 @@ } .panel-container .panel p { - font-size: 11px; + font-size: 14px; } .panel-container .panel ol { - font-size: 11px; - margin-left: 22px; + font-size: 14px; + margin-left: 28px; } .panel-container .panel li.row { @@ -80,7 +80,7 @@ ul.cplist { } .panel-container .postbody p.author { - font-size: 11px; + font-size: 14px; } .cp-main .buttons { @@ -118,9 +118,9 @@ ul.cplist { .tabs .tab, .minitabs .tab { - font-size: 10px; + font-size: 12px; font-weight: bold; - line-height: 14px; + line-height: 18px; display: block; float: left; } @@ -144,7 +144,7 @@ ul.cplist { .tabs .tab > a { border: 1px solid transparent; border-radius: 4px 4px 0 0; - margin: 1px 1px 0 0; + margin: 1px 1px -1px 0; } .tabs .activetab > a { @@ -180,12 +180,12 @@ ul.cplist { } .responsive-tab > a.responsive-tab-link { - font-size: 16px; - line-height: 14px; + font-size: 20px; + line-height: 18px; text-decoration: none; position: relative; display: block; - width: 16px; + width: 20px; } .responsive-tab .responsive-tab-link:before { @@ -201,7 +201,7 @@ ul.cplist { .tabs .dropdown, .minitabs .dropdown { - font-size: 11px; + font-size: 14px; font-weight: normal; top: 20px; margin-right: -2px; @@ -248,11 +248,14 @@ ul.cplist { /* Link styles for the sub-section links */ .navigation a { - font-size: 10px; + font-size: 12px; text-decoration: none; display: block; margin: 1px 0; padding: 5px; + border: 1px solid transparent; + border-radius: 4px 0 0 4px; + } .navigation a:hover { @@ -269,12 +272,12 @@ ul.cplist { /* Friends list */ .cp-mini { - font-size: 10px; + font-size: 12px; border-radius: 7px; overflow-y: auto; max-height: 200px; - margin: 10px 15px 10px 5px; - padding: 5px 10px; + margin: 12px 15px 12px 5px; + padding: 5px 12px; } dl.mini dt { diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 4f67fae1dc8..288043c0114 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -9,13 +9,13 @@ ---------------------------------------- */ fieldset { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: 14px; border-width: 0; } input { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: 14px; font-weight: normal; vertical-align: middle; padding: 0 3px; @@ -23,7 +23,7 @@ input { select { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; + font-size: 14px; font-weight: normal; vertical-align: middle; border: 1px solid transparent; @@ -36,18 +36,18 @@ select:focus { } option { - padding-right: 11px; + padding-right: 14px; } select optgroup option { font-family: Verdana, Helvetica, Arial, sans-serif; - padding-right: 11px; + padding-right: 14px; } textarea { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 11px; - line-height: 18px; + font-size: 14px; + line-height: 20px; width: 60%; padding: 2px; } @@ -184,7 +184,7 @@ fieldset.display-options a { } .dropdown fieldset.display-options { - font-size: 11px; + font-size: 14px; margin: 0; padding: 0; } @@ -203,10 +203,10 @@ fieldset.display-options a { /* Display actions for ucp and mcp pages */ fieldset.display-actions { - line-height: 22px; + line-height: 28px; text-align: right; white-space: nowrap; - padding-right: 11px; + padding-right: 14px; } fieldset.display-actions label { @@ -216,7 +216,7 @@ fieldset.display-actions label { /* Not used anywhere */ fieldset.sort-options { - line-height: 22px; + line-height: 28px; } /* MCP forum selection */ @@ -262,7 +262,7 @@ fieldset.submit-buttons input { .message-box textarea { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 16px; outline: 3px dashed transparent; outline-offset: -4px; -webkit-box-sizing: border-box; @@ -369,7 +369,7 @@ input.disabled { float: left; -webkit-box-sizing: border-box; box-sizing: border-box; - height: 24px; + height: 30px; padding: 3px; } diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index d4b7dabefef..135f5d06751 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -12,14 +12,14 @@ svg { .o-icon { vertical-align: middle !important; - width: 14px; - height: 14px; + width: 18px; + height: 18px; } .o-icon-src-mdi, .o-icon-src-ic { - width: 18px; - height: 18px; + width: 22px; + height: 22px; } .o-icon-src-fa { @@ -28,7 +28,7 @@ svg { .o-icon-font { font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; - font-size: 14px; + font-size: 18px; font-style: normal; font-variant: normal; -webkit-font-smoothing: antialiased; @@ -57,7 +57,7 @@ span + .o-icon { blockquote cite:before, .uncited:before { - font-size: 36px; + font-size: 40px; vertical-align: bottom; display: inline-block; margin-top: 8px; @@ -72,9 +72,9 @@ blockquote cite:before, .c-forum-row-icon, .c-notification-check-icon { - font-size: 20px; - width: 20px; - height: 20px; + font-size: 24px; + width: 24px; + height: 24px; margin-top: 0; } @@ -86,8 +86,8 @@ blockquote cite:before, display: inline-flex; justify-content: center; align-items: center; - width: 32px; - height: 32px; + width: 36px; + height: 36px; margin-top: -17px; margin-left: 9px; } diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 8405ba42248..6f684633065 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -69,7 +69,7 @@ a.forumtitle, a.topictitle, span.topictitle { font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 16px; text-decoration: none; } @@ -151,7 +151,7 @@ a.lastsubject:hover { } .top { - font-size: 12px; + font-size: 14px; text-decoration: none; margin-top: 10px; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index c3b946c0eb1..c8f487c45f6 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -152,7 +152,7 @@ } } -@media (max-width: 700px) { +@media (max-width: 750px) { .responsive-hide { display: none !important; } @@ -182,7 +182,7 @@ .wrap { border: none; border-radius: 0; - min-width: 290px; + min-width: 390px; margin: 0; padding: 0 5px; } From 2d392791ad439205531f3a59a6a7f2fd46c3ad33 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 3 Nov 2024 19:51:27 +0100 Subject: [PATCH 0581/1214] [ticket/17459] Move mark forums read to quick links PHPBB-17459 --- phpBB/docs/events.md | 9 +++++++++ phpBB/styles/prosilver/template/index_body.html | 9 +-------- phpBB/styles/prosilver/template/navbar_header.html | 7 +++++++ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index cc37ede34e3..3dc40a907da 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -953,11 +953,19 @@ index_body_forumlist_body_after * Since: 3.1.1 * Purpose: Add content after the forum list body on the index page +index_body_forumlist_body_before +=== +* Locations: + + styles/prosilver/template/index_body.html +* Since: 4.0.0-a1 +* Purpose: Add content before the forum list body on the index page + index_body_markforums_after === * Locations: + styles/prosilver/template/index_body.html * Since: 3.1.0-RC2 +* Deprecated: 4.0.0-a1 Use index_body_forumlist_body_before instead * Purpose: Add content after the mark-read link above the forum list on Board index index_body_markforums_before @@ -965,6 +973,7 @@ index_body_markforums_before * Locations: + styles/prosilver/template/index_body.html * Since: 3.1.0-RC2 +* Deprecated: 4.0.0-a1 Use index_body_forumlist_body_before instead * Purpose: Add content before the mark-read link above the forum list on Board index index_body_stat_blocks_after diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index c2102faddd3..978c5dd2f30 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -1,15 +1,8 @@ -

                            {LAST_VISIT_DATE}{CURRENT_TIME}

                            -

                            {CURRENT_TIME}

                            - - -
                            - {L_MARK_FORUMS_READ} -
                            - + diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 8269f27fa60..6cd7ef44660 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -44,6 +44,13 @@ {{ Icon('font', 'file-lines', lang('SEARCH_ACTIVE_TOPICS'), false, 'far icon icon-blue') }} + {% if U_MARK_FORUMS %} +
                          • + + {{ Icon('font', 'book-open-reader', lang('MARK_FORUMS_READ'), false) }} + +
                            • + {% endif %}
                          • From 14d889f74f922402a7a20ac162d6085ddb1fd358 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 3 Nov 2024 19:51:50 +0100 Subject: [PATCH 0582/1214] [ticket/17459] Add to top button to FAQ PHPBB-17459 --- phpBB/styles/prosilver/template/ajax.js | 22 +++++++++++++++++++ phpBB/styles/prosilver/template/faq_body.html | 9 +++++--- phpBB/styles/prosilver/theme/colours.css | 9 ++++++++ phpBB/styles/prosilver/theme/links.css | 17 +++++++++++++- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/ajax.js b/phpBB/styles/prosilver/template/ajax.js index 3fb6a88a870..93e8fcef80f 100644 --- a/phpBB/styles/prosilver/template/ajax.js +++ b/phpBB/styles/prosilver/template/ajax.js @@ -392,6 +392,28 @@ $('#member_search').click(function () { return false; }); +/** + * Show to top button if available on page + */ +const $scrollTopButton = $('.to-top-button'); + +if ($scrollTopButton.length) { + // Show or hide the button based on scroll position + $(window).scroll(function () { + if ($(this).scrollTop() > 300) { + $scrollTopButton.fadeIn(); // Fade in the button + } else { + $scrollTopButton.fadeOut(); // Fade out the button + } + }); + + // Scroll smoothly to the top when the button is clicked + $scrollTopButton.click(function (e) { + e.preventDefault(); // Prevent the default anchor link behavior + $('html, body').animate({scrollTop: 0}, 500); // Smooth scroll to top + }); +} + /** * Automatically resize textarea */ diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 4f925fa6a22..542e894c61e 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -35,9 +35,6 @@

                            {faq_block.BLOCK_TITLE}

                            {faq_block.faq_row.FAQ_QUESTION}
                            {faq_block.faq_row.FAQ_ANSWER}
    - - {{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false) }} -
    @@ -46,5 +43,11 @@

    {faq_block.BLOCK_TITLE}

    +
    + + {{ Icon('font', 'chevron-up', '', false) }} + +
    + diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 4af5c10fb91..c642adb22ce 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -83,6 +83,15 @@ th a:hover { color: #9e9e9e; } +.to-top-button { + background-color: #0f4d8a; + opacity: 0.7; +} + +.to-top-button a { + color: #e6f7ff; +} + /* arrow links */ .arrow-left:hover, .arrow-right:hover { diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 6f684633065..87359530f92 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -153,7 +153,22 @@ a.lastsubject:hover { .top { font-size: 14px; text-decoration: none; - margin-top: 10px; + margin-top: 12px; +} + +.to-top-button { + position: fixed; + right: 24px; + bottom: 24px; + inline-size: 48px; + block-size: 48px; + border-radius: 50%; + display: none; +} + +.to-top-button .o-icon { + font-size: 32px; + padding: 8px; } /* Back to top of page */ From 74084107ed28f2219c80fe2c66e37c699a201be4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 3 Nov 2024 21:10:54 +0100 Subject: [PATCH 0583/1214] [ticket/17459] Start using CSS variables PHPBB-17459 --- phpBB/styles/prosilver/theme/base.css | 21 +++++++- phpBB/styles/prosilver/theme/buttons.css | 8 +-- phpBB/styles/prosilver/theme/common.css | 66 ++++++++++++------------ 3 files changed, 56 insertions(+), 39 deletions(-) diff --git a/phpBB/styles/prosilver/theme/base.css b/phpBB/styles/prosilver/theme/base.css index f4daeee1e50..1d8975a4eb1 100644 --- a/phpBB/styles/prosilver/theme/base.css +++ b/phpBB/styles/prosilver/theme/base.css @@ -21,9 +21,26 @@ * line-heights want to be a multiple of this number in order to maintain * vertical rhythm.) */ +:root { + /* Base font size */ + --ps-font-base: 16px; /* [1] */ + --ps-line-height: calc(var(--ps-font-base) * 1.5); /* [2] */ + + /* Headings */ + --ps-font-h1: calc(var(--ps-font-base) * 1.5); /* 24px */ + --ps-font-h2: calc(var(--ps-font-base) * 1.5); /* 24px */ + --ps-font-h3: calc(var(--ps-font-base) * 1.25); /* 20px */ + --ps-font-h4: calc(var(--ps-font-base) * 1.125); /* 18px */ + + /* Text and Paragraphs */ + --ps-font-normal: var(--ps-font-base); /* 16px */ + --ps-font-small: calc(var(--ps-font-base) * 0.875); /* 14px */ + --ps-font-tiny: calc(var(--ps-font-base) * 0.75); /* 12px */ +} + html { - font-size: 16px; /* [1] */ - line-height: 1.5; /* [2] */ + font-size: var(--ps-font-base); + line-height: var(--ps-line-height); -webkit-tap-highlight-color: rgba(0, 0, 0, 0); } diff --git a/phpBB/styles/prosilver/theme/buttons.css b/phpBB/styles/prosilver/theme/buttons.css index f51510e0b97..b0991d054c5 100644 --- a/phpBB/styles/prosilver/theme/buttons.css +++ b/phpBB/styles/prosilver/theme/buttons.css @@ -4,7 +4,7 @@ .button { font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - font-size: 16px; + font-size: var(--ps-font-normal); font-weight: 600; line-height: 1.4; text-align: center; @@ -16,7 +16,7 @@ justify-content: center; align-items: center; box-sizing: border-box; - height: 30px; + height: calc(var(--ps-font-normal) * 1.875); padding: 2px 8px; cursor: pointer; touch-action: manipulation; @@ -185,11 +185,11 @@ /* Responsive buttons in post body */ .post-buttons .dropdown { - top: 30px; + top: calc(var(--ps-font-normal) * 1.875); } .post-buttons .dropdown a { - font-size: 16px; + font-size: var(--ps-font-normal); text-align: right; display: block; justify-content: start; diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e4b12fb2e48..d16ffcb052b 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -13,7 +13,7 @@ html { body { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 16px; + font-size: var(--ps-font-normal); line-height: normal; word-wrap: break-word; margin: 0; @@ -24,7 +24,7 @@ body { h1 { /* Forum name */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 24px; + font-size: var(--ps-font-h1); font-weight: bold; margin-top: 15px; margin-right: 200px; @@ -33,7 +33,7 @@ h1 { h2 { /* Forum header titles */ font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 24px; + font-size: var(--ps-font-h2); font-weight: normal; margin: 0.8em 0 0.2em; } @@ -45,7 +45,7 @@ h2.solo { h3 { /* Sub-headers (also used as post headers, but defined later) */ font-family: Arial, Helvetica, sans-serif; - font-size: 16px; + font-size: var(--ps-font-normal); font-weight: bold; text-transform: uppercase; border-bottom: 1px solid transparent; @@ -57,13 +57,13 @@ h3 { h4 { /* Forum and topic list titles */ font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 18px; + font-size: var(--ps-font-h4); } p { - font-size: 14px; - line-height: 18px; - margin-bottom: 20px; + font-size: var(--ps-font-small); + line-height: calc(var(--ps-line-height) * 0.75); + margin-bottom: calc(var(--ps-line-height) / 1.2); } img { @@ -228,7 +228,7 @@ a:hover { .panel { border-radius: 7px; - margin-bottom: 8px; + margin-bottom: calc(var(--ps-font-base) * 0.5); padding: 5px 10px; } @@ -262,8 +262,8 @@ ul.linklist { } ul.linklist > li { - font-size: 14px; - line-height: 30px; + font-size: var(--ps-font-small); + line-height: calc(var(--ps-line-height) * 1.25); float: left; width: auto; margin-right: 7px; @@ -434,12 +434,12 @@ a.header-avatar img { } .dropdown-button-control .dropdown { - top: 30px; + top: calc(var(--ps-line-height) * 1.25); } .dropdown-button-control.dropdown-up .dropdown { top: auto; - bottom: 30px; + bottom: calc(var(--ps-line-height) * 1.25); } .dropdown .pointer, @@ -556,7 +556,7 @@ a.header-avatar img { } .dropdown li { - font-size: 14px !important; + font-size: var(--ps-font-small) !important; line-height: normal !important; text-align: left; white-space: nowrap; @@ -678,9 +678,9 @@ table.table1 { } table.table1 thead th { - font-size: 12px; + font-size: var(--ps-font-tiny); font-weight: normal; - line-height: 15px; + line-height: calc(var(--ps-line-height) / 1.5); text-transform: uppercase; padding: 0 0 4px 3px; } @@ -694,7 +694,7 @@ table.table1 tbody tr { } table.table1 td { - font-size: 14px; + font-size: var(--ps-font-small); } table.table1 tbody td { @@ -831,7 +831,7 @@ table.info tbody th { dl.details { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 14px; + font-size: var(--ps-font-small); } dl.details dt { @@ -882,7 +882,7 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Action-bars (container for post/reply buttons, pagination, etc.) ---------------------------------------- */ .action-bar { - font-size: 14px; + font-size: var(--ps-font-small); margin: 4px 0; } @@ -938,7 +938,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .pagination li.active span { font-family: "Open Sans", "Droid Sans", Verdana, Arial, Helvetica; - font-size: 16px; + font-size: var(--ps-font-normal); font-weight: normal; line-height: 1.4; text-align: center; @@ -962,7 +962,7 @@ fieldset.fields1 dl.pmlist dd.recipients { } .pagination li.page-jump a i { - font-size: 20px; + font-size: var(--ps-font-h3); } .pagination .arrow a { @@ -982,10 +982,10 @@ fieldset.fields1 dl.pmlist dd.recipients { .row .pagination li a, .row .pagination li span { - font-size: 12px; + font-size: var(--ps-font-tiny); border-radius: 2px; - width: 17px; - height: 22px; + width: calc(var(--ps-font-tiny) + 6px); + height: calc(var(--ps-font-normal) + 6px); padding: 1px 3px; } @@ -1026,7 +1026,7 @@ fieldset.fields1 dl.pmlist dd.recipients { .phpbb_alert div.alert_text > select, .phpbb_alert div.alert_text > textarea, .phpbb_alert div.alert_text > input { - font-size: 14px; + font-size: var(--ps-font-small); } .darkenwrapper { @@ -1141,13 +1141,13 @@ fieldset.fields1 dl.pmlist dd.recipients { /* Miscellaneous styles ---------------------------------------- */ .copyright { - font-size: 12px; + font-size: var(--ps-font-tiny); text-align: center; padding: 10px; } .footer-row { - font-size: 12px; + font-size: var(--ps-font-tiny); line-height: 1.8; margin: 0; } @@ -1170,7 +1170,7 @@ fieldset.fields1 dl.pmlist dd.recipients { } div.rules { - font-size: 18px; + font-size: var(--ps-font-h4); border-radius: 7px; margin: 10px 0; padding: 5px 10px; @@ -1243,7 +1243,7 @@ ul.linklist:after, } .member-search strong { - font-size: 14px; + font-size: var(--ps-font-small); } .dropdown-extended { @@ -1319,7 +1319,7 @@ ul.linklist:after, } .dropdown-extended .footer { - font-size: 16px; + font-size: var(--ps-font-normal); text-align: center; } @@ -1372,7 +1372,7 @@ ul.linklist:after, } .notification-time { - font-size: 12px; + font-size: var(--ps-font-tiny); text-align: right; margin: 0; } @@ -1388,7 +1388,7 @@ ul.linklist:after, .notifications-title { font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; - font-size: 16px !important; + font-size: var(--ps-font-normal) !important; } .notifications-title strong { @@ -1404,7 +1404,7 @@ ul.linklist:after, } .badge { - font-size: 12px; + font-size: var(--ps-font-tiny); line-height: 1; text-align: center; white-space: nowrap; From d32970348fc9785c06a4329fd6622f7ebdd58197 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 3 Nov 2024 22:09:53 +0100 Subject: [PATCH 0584/1214] [ticket/17459] Use css variables in content.css PHPBB-17459 --- phpBB/styles/prosilver/theme/content.css | 116 +++++++++++------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 1d612e989d3..610bb44fb99 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -37,7 +37,7 @@ ul.topiclist dd { } ul.topiclist dt { - font-size: 14px; + font-size: var(--ps-font-small); width: 100%; margin-right: -440px; } @@ -55,7 +55,7 @@ ul.topiclist.two-columns dt { } ul.topiclist dt .list-inner { - line-height: 20px; + line-height: calc(var(--ps-line-height) / 1.2); margin-right: 440px; padding-right: 5px; padding-left: 5px; @@ -140,8 +140,8 @@ li.row strong { li.header dt, li.header dd { font-family: Arial, Helvetica, sans-serif; - font-size: 12px; - line-height: 20px; + font-size: var(--ps-font-tiny); + line-height: 1.6; text-transform: uppercase; border-left-width: 0; margin: 2px 0 4px; @@ -207,8 +207,8 @@ dd.topics, dd.views, dd.extra, dd.mark { - font-size: 16px; - line-height: 32px; + font-size: var(--ps-font-normal); + line-height: 2; text-align: center; width: 80px; } @@ -236,16 +236,16 @@ dd.redirect, dd.moderation, dd.time, dd.info { - font-size: 14px; + font-size: var(--ps-font-small); width: 250px; } dd.redirect { - line-height: 32px; + line-height: calc(var(--ps-line-height) / 0.75); } dd.time { - line-height: 26px; + line-height: calc(var(--ps-line-height) * 1.1); } dd.lastpost > span, @@ -258,17 +258,17 @@ dd.moderation > span { } dd.lastpost > span { - line-height: 20px; + line-height: calc(var(--ps-line-height) / 1.2); } dd.extra, dd.mark { - line-height: 24px; + line-height: var(--ps-line-height); } dd.option { - font-size: 14px; - line-height: 28px; + font-size: var(--ps-font-small); + line-height: 1.75; text-align: center; width: 125px; } @@ -276,7 +276,7 @@ dd.option { /* Post body styles ---------------------------------------- */ .postbody { - line-height: 16px; + line-height: var(--ps-line-height); position: relative; float: left; width: 76%; @@ -284,18 +284,18 @@ dd.option { } .postbody .ignore { - font-size: 14px; + font-size: var(--ps-font-small); } .postbody h3.first { /* The first post on the page uses this */ - font-size: 20px; + font-size: var(--ps-font-h3); } .postbody h3 { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 18px; - line-height: 22px; + font-size: var(--ps-font-h4); + line-height: calc(var(--ps-font-h4) + 4px); text-transform: none; border: none; @@ -317,7 +317,7 @@ dd.option { } .postbody .content { - font-size: 16px; + font-size: var(--ps-font-normal); overflow-x: auto; } @@ -374,17 +374,17 @@ dd.option { ---------------------------------------- */ .content { font-family: "Lucida Grande", "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 16px; - line-height: 24px; + font-size: var(--ps-font-normal); + line-height: var(--ps-line-height); clear: both; overflow: hidden; - min-height: 36px; + min-height: calc(var(--ps-line-height) * 1.5); padding-bottom: 1px; } .content h2, .panel h2 { - font-size: 20px; + font-size: var(--ps-font-h3); font-weight: normal; border-bottom: 1px solid transparent; margin-top: 8px; @@ -397,9 +397,9 @@ dd.option { } .panel p { - font-size: 16px; - line-height: 20px; - margin-bottom: 16px; + font-size: var(--ps-font-normal); + line-height: 1.25; + margin-bottom: var(--ps-font-normal); } .content p { @@ -407,22 +407,22 @@ dd.option { } .agreement { - font-size: 16px; - line-height: 20px; - margin-bottom: 14px; + font-size: var(--ps-font-normal); + line-height: 1.25; + margin-bottom: var(--ps-font-small); } .agreement-text { - line-height: 17px; - margin-bottom: 10px; + line-height: calc(var(--ps-font-normal) * 1.25); + margin-bottom: var(--ps-font-small); } dl.faq { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; - margin-top: 14px; - margin-bottom: 28px; + font-size: var(--ps-font-small); + line-height: 1.4; + margin-top: var(--ps-font-small); + margin-bottom: calc(var(--ps-font-small) * 2); } dl.faq dt { @@ -430,8 +430,8 @@ dl.faq dt { } .content dl.faq { - font-size: 16px; - margin-bottom: 8px; + font-size: var(--ps-font-normal); + margin-bottom: calc(var(--ps-font-normal) / 2); } .content li { @@ -450,22 +450,22 @@ dl.faq dt { /* Post author */ p.author { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 12px; - line-height: 16px; + font-size: var(--ps-font-tiny); + line-height: 1.2; clear: both; - margin-bottom: 10px; + margin-bottom: calc(var(--ps-font-tiny) / 1.2); padding: 0 0 5px; } /* Post signature */ .signature { - font-size: 14px; - line-height: 20px; + font-size: var(--ps-font-small); + line-height: 1.4; border-top: 1px solid transparent; clear: left; overflow: hidden; width: 100%; - margin-top: 20px; + margin-top: calc(var(--ps-font-small) * 1.4); padding-top: 2px; } @@ -493,18 +493,18 @@ dd .signature { /* Post noticies */ .notice { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 12px; - line-height: 16px; + font-size: var(--ps-font-tiny); + line-height: 1.3; border-top: 1px dashed transparent; clear: left; width: auto; - margin-top: 18px; + margin-top: calc(var(--ps-font-tiny) * 1.3 + 2px); padding-top: 2px; } /* Jump to post link for now */ ul.searchresults { - font-size: 16px; + font-size: var(--ps-font-normal); text-align: right; clear: both; list-style: none; @@ -551,20 +551,20 @@ blockquote cite > span { /* Code block */ .codebox { - font-size: 16px; + font-size: var(--ps-font-normal); word-wrap: normal; border: 1px solid transparent; - margin: 16px 0 18px; + margin: var(--ps-font-normal) 0 calc(var(--ps-font-normal) + 2px); } .codebox p { - font-size: 12px !important; + font-size: var(--ps-font-tiny) !important; font-weight: bold; text-transform: uppercase; border-bottom: 1px solid transparent; display: block; margin-bottom: 0; - padding: 4px; + padding: calc(var(--ps-font-tiny) / 3); } blockquote .codebox { @@ -584,7 +584,7 @@ blockquote .codebox { /* Attachments ---------------------------------------- */ .attachbox { - font-size: 16px; + font-size: var(--ps-font-normal); border: 1px dashed transparent; float: left; clear: left; @@ -715,7 +715,7 @@ fieldset.polls dl.voted { } fieldset.polls dt { - font-size: 14px; + font-size: var(--ps-font-small); text-align: left; border-right: none; display: block; @@ -726,7 +726,7 @@ fieldset.polls dt { } fieldset.polls dd { - font-size: 14px; + font-size: var(--ps-font-small); border-left: none; float: left; width: 10%; @@ -761,7 +761,7 @@ fieldset.polls dd div { } .vote-submitted { - font-size: 16px; + font-size: var(--ps-font-normal); font-weight: bold; text-align: center; } @@ -769,7 +769,7 @@ fieldset.polls dd div { /* Poster profile block ---------------------------------------- */ .postprofile { - line-height: 16px; + line-height: calc(var(--ps-font-tiny) * 1.6); border: 1px solid transparent; border-width: 0 0 0 1px; float: right; @@ -780,8 +780,8 @@ fieldset.polls dd div { .postprofile dd, .postprofile dt { - font-size: 12px; - line-height: 20px; + font-size: var(--ps-font-tiny); + line-height: 1.6; margin-left: 8px; } From 79fc90dce3bf64f6fd2fe0122969416bfe242c1e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 4 Nov 2024 17:36:29 +0100 Subject: [PATCH 0585/1214] [ticket/17459] Extend usage of css variables PHPBB-17459 --- phpBB/styles/prosilver/theme/cp.css | 33 +++++++++++++------------- phpBB/styles/prosilver/theme/forms.css | 26 ++++++++++---------- phpBB/styles/prosilver/theme/icons.css | 22 ++++++++--------- phpBB/styles/prosilver/theme/links.css | 20 ++++++++-------- 4 files changed, 50 insertions(+), 51 deletions(-) diff --git a/phpBB/styles/prosilver/theme/cp.css b/phpBB/styles/prosilver/theme/cp.css index 2f84fc9b120..02581046676 100644 --- a/phpBB/styles/prosilver/theme/cp.css +++ b/phpBB/styles/prosilver/theme/cp.css @@ -24,12 +24,12 @@ } .panel-container .panel p { - font-size: 14px; + font-size: var(--ps-font-small); } .panel-container .panel ol { - font-size: 14px; - margin-left: 28px; + font-size: var(--ps-font-small); + margin-left: calc(var(--ps-font-small) * 2); } .panel-container .panel li.row { @@ -80,7 +80,7 @@ ul.cplist { } .panel-container .postbody p.author { - font-size: 14px; + font-size: var(--ps-font-small); } .cp-main .buttons { @@ -118,9 +118,9 @@ ul.cplist { .tabs .tab, .minitabs .tab { - font-size: 12px; + font-size: var(--ps-font-tiny); font-weight: bold; - line-height: 18px; + line-height: 1.4; display: block; float: left; } @@ -180,12 +180,12 @@ ul.cplist { } .responsive-tab > a.responsive-tab-link { - font-size: 20px; - line-height: 18px; + font-size: var(--ps-font-h3); + line-height: 0.875; text-decoration: none; position: relative; display: block; - width: 20px; + width: var(--ps-font-h3); } .responsive-tab .responsive-tab-link:before { @@ -201,7 +201,7 @@ ul.cplist { .tabs .dropdown, .minitabs .dropdown { - font-size: 14px; + font-size: var(--ps-font-small); font-weight: normal; top: 20px; margin-right: -2px; @@ -248,14 +248,13 @@ ul.cplist { /* Link styles for the sub-section links */ .navigation a { - font-size: 12px; + font-size: var(--ps-font-tiny); text-decoration: none; + border: 1px solid transparent; + border-radius: 4px 0 0 4px; display: block; margin: 1px 0; padding: 5px; - border: 1px solid transparent; - border-radius: 4px 0 0 4px; - } .navigation a:hover { @@ -272,12 +271,12 @@ ul.cplist { /* Friends list */ .cp-mini { - font-size: 12px; + font-size: var(--ps-font-tiny); border-radius: 7px; overflow-y: auto; max-height: 200px; - margin: 12px 15px 12px 5px; - padding: 5px 12px; + margin: var(--ps-font-tiny) 15px var(--ps-font-tiny) 5px; + padding: 5px var(--ps-font-tiny); } dl.mini dt { diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css index 288043c0114..25ecb496d8a 100644 --- a/phpBB/styles/prosilver/theme/forms.css +++ b/phpBB/styles/prosilver/theme/forms.css @@ -9,13 +9,13 @@ ---------------------------------------- */ fieldset { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 14px; + font-size: var(--ps-font-small); border-width: 0; } input { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 14px; + font-size: var(--ps-font-small); font-weight: normal; vertical-align: middle; padding: 0 3px; @@ -23,7 +23,7 @@ input { select { font-family: Verdana, Helvetica, Arial, sans-serif; - font-size: 14px; + font-size: var(--ps-font-small); font-weight: normal; vertical-align: middle; border: 1px solid transparent; @@ -36,18 +36,18 @@ select:focus { } option { - padding-right: 14px; + padding-right: var(--ps-font-small); } select optgroup option { font-family: Verdana, Helvetica, Arial, sans-serif; - padding-right: 14px; + padding-right: var(--ps-font-small); } textarea { font-family: "Lucida Grande", Verdana, Helvetica, Arial, sans-serif; - font-size: 14px; - line-height: 20px; + font-size: var(--ps-font-small); + line-height: 1.5; width: 60%; padding: 2px; } @@ -184,7 +184,7 @@ fieldset.display-options a { } .dropdown fieldset.display-options { - font-size: 14px; + font-size: var(--ps-font-small); margin: 0; padding: 0; } @@ -203,10 +203,10 @@ fieldset.display-options a { /* Display actions for ucp and mcp pages */ fieldset.display-actions { - line-height: 28px; + line-height: 2; text-align: right; white-space: nowrap; - padding-right: 14px; + padding-right: var(--ps-font-small); } fieldset.display-actions label { @@ -216,7 +216,7 @@ fieldset.display-actions label { /* Not used anywhere */ fieldset.sort-options { - line-height: 28px; + line-height: 2; } /* MCP forum selection */ @@ -262,7 +262,7 @@ fieldset.submit-buttons input { .message-box textarea { font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif; - font-size: 16px; + font-size: var(--ps-font-normal); outline: 3px dashed transparent; outline-offset: -4px; -webkit-box-sizing: border-box; @@ -369,7 +369,7 @@ input.disabled { float: left; -webkit-box-sizing: border-box; box-sizing: border-box; - height: 30px; + height: calc(var(--ps-line-height) * 1.25); padding: 3px; } diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css index 135f5d06751..153a7558816 100644 --- a/phpBB/styles/prosilver/theme/icons.css +++ b/phpBB/styles/prosilver/theme/icons.css @@ -12,14 +12,14 @@ svg { .o-icon { vertical-align: middle !important; - width: 18px; - height: 18px; + width: var(--ps-font-h4); + height: var(--ps-font-h4); } .o-icon-src-mdi, .o-icon-src-ic { - width: 22px; - height: 22px; + width: calc(var(--ps-font-h4) + 4px); /* icon + 2 * 2px padding */ + height: calc(var(--ps-font-h4) + 4px); /* icon + 2 * 2px padding */ } .o-icon-src-fa { @@ -28,7 +28,7 @@ svg { .o-icon-font { font-family: "Font Awesome 6 Free", "Font Awesome 6 Brands"; - font-size: 18px; + font-size: var(--ps-font-h4); font-style: normal; font-variant: normal; -webkit-font-smoothing: antialiased; @@ -57,7 +57,7 @@ span + .o-icon { blockquote cite:before, .uncited:before { - font-size: 40px; + font-size: calc(var(--ps-font-normal) * 2.5); vertical-align: bottom; display: inline-block; margin-top: 8px; @@ -72,9 +72,9 @@ blockquote cite:before, .c-forum-row-icon, .c-notification-check-icon { - font-size: 24px; - width: 24px; - height: 24px; + font-size: var(--ps-font-h1); + width: var(--ps-font-h1); + height: var(--ps-font-h1); margin-top: 0; } @@ -86,8 +86,8 @@ blockquote cite:before, display: inline-flex; justify-content: center; align-items: center; - width: 36px; - height: 36px; + width: calc(var(--ps-font-normal) * 2.25); + height: calc(var(--ps-font-normal) * 2.25); margin-top: -17px; margin-left: 9px; } diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 87359530f92..2f7ac86236e 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -69,7 +69,7 @@ a.forumtitle, a.topictitle, span.topictitle { font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; - font-size: 16px; + font-size: var(--ps-font-normal); text-decoration: none; } @@ -151,24 +151,24 @@ a.lastsubject:hover { } .top { - font-size: 14px; + font-size: var(--ps-font-small); text-decoration: none; - margin-top: 12px; + margin-top: calc(var(--ps-font-small) - 2px); } .to-top-button { - position: fixed; - right: 24px; - bottom: 24px; - inline-size: 48px; - block-size: 48px; border-radius: 50%; + position: fixed; + right: var(--ps-line-height); + bottom: var(--ps-line-height); display: none; + block-size: calc(var(--ps-line-height) * 2); + inline-size: calc(var(--ps-line-height) * 2); } .to-top-button .o-icon { - font-size: 32px; - padding: 8px; + font-size: calc(var(--ps-font-normal) * 2); + padding: calc(var(--ps-font-normal) / 2); } /* Back to top of page */ From c0ae7ccb3ea20b3b0ee543ece070e6571b036e0f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 14 Nov 2024 21:01:12 +0100 Subject: [PATCH 0586/1214] [ticket/17459] Display PM and notification icon without text PHPBB-17459 --- phpBB/styles/prosilver/template/navbar_header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 6cd7ef44660..702a0187653 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -167,7 +167,7 @@ {% if S_DISPLAY_PM %}
  • - {{ Icon('font', 'inbox', lang('PRIVATE_MESSAGES'), false) }} {PRIVATE_MESSAGE_COUNT} + {{ Icon('font', 'inbox', lang('PRIVATE_MESSAGES'), true) }} {PRIVATE_MESSAGE_COUNT}
    • {% endif %} @@ -175,7 +175,7 @@ {% if S_NOTIFICATIONS_DISPLAY %}
  • - {{ Icon('font', 'bell', lang('NOTIFICATIONS'), false) }}{NOTIFICATIONS_COUNT} + {{ Icon('font', 'bell', lang('NOTIFICATIONS'), true) }}{NOTIFICATIONS_COUNT} {% include 'notification_dropdown.html' %} From 31f9ffd56b3db4904d51db9389455ee66762cf34 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Dec 2024 20:51:39 +0100 Subject: [PATCH 0587/1214] [ticket/17459] Fix incorrect breadcrumbs spacing PHPBB-17459 --- phpBB/styles/prosilver/theme/common.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index d16ffcb052b..03b6ad131de 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -615,12 +615,12 @@ a.header-avatar img { .breadcrumbs .crumb { font-weight: bold; word-wrap: normal; - float: left; + display: inline-block; } .breadcrumbs .crumb:before { font-weight: bold; - padding: 0 0.5em; + padding: 0 0.1em; content: "\203A"; } From 58b5c8f5cf69e4ede036fbbc532f84d2c912ce26 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Dec 2024 20:54:44 +0100 Subject: [PATCH 0588/1214] [ticket/17459] Get rid of weird margin on small screens PHPBB-17459 --- phpBB/styles/prosilver/theme/responsive.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index c8f487c45f6..80e605df625 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -183,7 +183,7 @@ border: none; border-radius: 0; min-width: 390px; - margin: 0; + margin: 0 !important; padding: 0 5px; } From 555c760a4cfe58c036280153026ff04210bb6ada Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Dec 2024 20:59:50 +0100 Subject: [PATCH 0589/1214] [ticket/17459] Adjust postprofile sizing PHPBB-17459 --- phpBB/styles/prosilver/theme/content.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 610bb44fb99..7101aeee462 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -769,7 +769,7 @@ fieldset.polls dd div { /* Poster profile block ---------------------------------------- */ .postprofile { - line-height: calc(var(--ps-font-tiny) * 1.6); + line-height: calc(var(--ps-font-small) * 1.5); border: 1px solid transparent; border-width: 0 0 0 1px; float: right; @@ -780,7 +780,7 @@ fieldset.polls dd div { .postprofile dd, .postprofile dt { - font-size: var(--ps-font-tiny); + font-size: var(--ps-font-small); line-height: 1.6; margin-left: 8px; } From 353ea362f08e17f0065b206a566e248657dcc6e9 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 9 Jan 2025 21:27:54 +0700 Subject: [PATCH 0590/1214] [ticket/17460] Fix fa-arrow-circle-up icon rendering in Quote BBCode PHPBB3-17460 --- phpBB/styles/prosilver/template/bbcode.html | 4 ++-- tests/text_formatter/s9e/default_formatting_test.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/bbcode.html b/phpBB/styles/prosilver/template/bbcode.html index dc051eef3ea..f055e4acf1f 100644 --- a/phpBB/styles/prosilver/template/bbcode.html +++ b/phpBB/styles/prosilver/template/bbcode.html @@ -38,11 +38,11 @@ - + - + diff --git a/tests/text_formatter/s9e/default_formatting_test.php b/tests/text_formatter/s9e/default_formatting_test.php index 3f637676b3a..1b91aa7c83c 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -283,7 +283,7 @@ public function get_default_formatting_tests() ), array( '[quote=Username post_id=123]...[/quote]', - '
    Username wrote: ...
    ' + '
    Username wrote: ...
    ' ), array( // Users are not allowed to submit their own URL for the post From b404606a9fb053a093f0ec21105af76f066ac6a2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 9 Jan 2025 20:22:48 +0100 Subject: [PATCH 0591/1214] [ticket/17459] Add support for deprecated events to md_exporter PHPBB-17459 --- phpBB/phpbb/event/md_exporter.php | 11 +++-- tests/event/fixtures/normal_events.md.test | 16 +++++++ tests/event/md_exporter_test.php | 55 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/event/md_exporter.php b/phpBB/phpbb/event/md_exporter.php index 04e5f91ca27..d89ac512f91 100644 --- a/phpBB/phpbb/event/md_exporter.php +++ b/phpBB/phpbb/event/md_exporter.php @@ -169,7 +169,7 @@ public function crawl_eventsmd($md_file, $filter) list($file_details, $details) = explode("\n* Since: ", $details, 2); - $changed_versions = array(); + $changed_versions = []; if (strpos($details, "\n* Changed: ") !== false) { list($since, $details) = explode("\n* Changed: ", $details, 2); @@ -184,7 +184,11 @@ public function crawl_eventsmd($md_file, $filter) else { list($since, $description) = explode("\n* Purpose: ", $details, 2); - $changed_versions = array(); + } + + if (str_contains($since, "\n* Deprecated: ")) + { + list($since, $deprecated) = explode("\n* Deprecated: ", $since, 2); } $files = $this->validate_file_list($file_details); @@ -225,6 +229,7 @@ public function crawl_eventsmd($md_file, $filter) 'event' => $this->current_event, 'files' => $files, 'since' => $since, + 'deprecated' => $deprecated ?? '', 'changed' => $changes, 'description' => $description, ); @@ -451,7 +456,7 @@ public function validate_since($since) { if (!$this->validate_version($since)) { - throw new \LogicException("Invalid since information found for event '{$this->current_event}'"); + throw new \LogicException("Invalid since information found for event '{$this->current_event}': {$since}"); } return $since; diff --git a/tests/event/fixtures/normal_events.md.test b/tests/event/fixtures/normal_events.md.test index 47921c4e572..a045bd42ddf 100644 --- a/tests/event/fixtures/normal_events.md.test +++ b/tests/event/fixtures/normal_events.md.test @@ -18,3 +18,19 @@ acp_bbcodes_actions_prepend2 * Changed: 3.1.0-a5 Moved up * Changed: 3.1.0-a6 Moved down * Purpose: desc2 + +acp_bbcodes_actions_prepend2_deprecated +=== +* Location: adm/style/acp_bbcodes.html +* Since: 3.1.0-a4 +* Deprecated: 3.1.0-a6 +* Changed: 3.1.0-a5 Moved up +* Changed: 3.1.0-a6 Moved down +* Purpose: desc2 + +acp_bbcodes_actions_prepend_deprecated +=== +* Location: adm/style/acp_bbcodes.html +* Since: 3.1.0-a5 +* Deprecated: 3.1.0-a6 +* Purpose: desc2 diff --git a/tests/event/md_exporter_test.php b/tests/event/md_exporter_test.php index b9c5a531fcc..ee86c2f1612 100644 --- a/tests/event/md_exporter_test.php +++ b/tests/event/md_exporter_test.php @@ -24,6 +24,7 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a3', + 'deprecated' => '', 'changed' => array( '3.1.0-a4' => '', ), @@ -36,6 +37,7 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a5', + 'deprecated' => '', 'changed' => array(), 'description' => 'desc2' . "\n", ), @@ -46,12 +48,38 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a4', + 'deprecated' => '', 'changed' => array( '3.1.0-a5' => 'Moved up', '3.1.0-a6' => 'Moved down', ), 'description' => 'desc2' . "\n", ), + 'acp_bbcodes_actions_prepend2_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend2_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a4', + 'deprecated' => '3.1.0-a6', + 'changed' => array( + '3.1.0-a5' => 'Moved up', + '3.1.0-a6' => 'Moved down', + ), + 'description' => 'desc2' . "\n", + ), + 'acp_bbcodes_actions_prepend_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a5', + 'deprecated' => '3.1.0-a6', + 'changed' => array(), + 'description' => 'desc2' . "\n", + ), )), array('normal_events.md.test', '3.1.0-a5', '3.1.0-a5', array( 'acp_bbcodes_actions_prepend' => array( @@ -61,6 +89,7 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a5', + 'deprecated' => '', 'changed' => array(), 'description' => 'desc2' . "\n", ), @@ -71,12 +100,38 @@ static public function crawl_eventsmd_data() 'adm' => array('acp_bbcodes.html'), ), 'since' => '3.1.0-a4', + 'deprecated' => '', 'changed' => array( '3.1.0-a5' => 'Moved up', '3.1.0-a6' => 'Moved down', ), 'description' => 'desc2' . "\n", ), + 'acp_bbcodes_actions_prepend2_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend2_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a4', + 'deprecated' => '3.1.0-a6', + 'changed' => array( + '3.1.0-a5' => 'Moved up', + '3.1.0-a6' => 'Moved down', + ), + 'description' => 'desc2' . "\n", + ), + 'acp_bbcodes_actions_prepend_deprecated' => array( + 'event' => 'acp_bbcodes_actions_prepend_deprecated', + 'files' => array( + 'prosilver' => array(), + 'adm' => array('acp_bbcodes.html'), + ), + 'since' => '3.1.0-a5', + 'deprecated' => '3.1.0-a6', + 'changed' => array(), + 'description' => 'desc2' . "\n", + ), )), ); } From 90bd9d006e768fb96e3f093481c1af9b1e3aa0e6 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 18 Jan 2025 23:08:52 +0100 Subject: [PATCH 0592/1214] [ticket/17361] Add method to track multiple files in a single query PHPBB-17361 --- .../db/migration/data/v400/storage_track.php | 83 ++++++++++++------- phpBB/phpbb/storage/file_tracker.php | 27 +++++- 2 files changed, 75 insertions(+), 35 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php index ebda4c86783..4d50ac0393f 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_track.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php @@ -19,6 +19,8 @@ class storage_track extends container_aware_migration { + private const BATCH_SIZE = 100; + public function effectively_installed() { return $this->db_tools->sql_table_exists($this->tables['storage']); @@ -77,9 +79,9 @@ public function track_avatars() $sql = 'SELECT user_avatar FROM ' . USERS_TABLE . " WHERE user_avatar_type = 'avatar.driver.upload'"; - $result = $this->db->sql_query($sql); + $files = []; while ($row = $this->db->sql_fetchrow($result)) { $avatar_group = false; @@ -94,16 +96,24 @@ public function track_avatars() $ext = substr(strrchr($filename, '.'), 1); $filename = (int) $filename; - try - { - $filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext; - $file_tracker->track_file('avatar', $filename, filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename)); - } - catch (storage_exception $e) + $filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext; + $files[] = [ + 'file_path' => $filename, + 'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename), + ]; + + if (count($files) >= self::BATCH_SIZE) { - // If file doesn't exist, don't track it + $file_tracker->track_files('avatar', $files); + $files = []; } } + + if (!empty($files)) + { + $file_tracker->track_files('avatar', $files); + } + $this->db->sql_freeresult($result); } @@ -114,32 +124,36 @@ public function track_attachments() $sql = 'SELECT physical_filename, thumbnail FROM ' . ATTACHMENTS_TABLE; - $result = $this->db->sql_query($sql); + $files = []; while ($row = $this->db->sql_fetchrow($result)) { - try - { - $file_tracker->track_file('attachment', $row['physical_filename'], filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/' . $row['physical_filename'])); - } - catch (storage_exception $e) + $files[] = [ + 'file_path' => $row['physical_filename'], + 'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/' . $row['physical_filename']), + ]; + + if ($row['thumbnail'] == 1) { - // If file doesn't exist, don't track it + $files[] = [ + 'file_path' => 'thumb_' . $row['physical_filename'], + 'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/thumb_' . $row['physical_filename']), + ]; } - if ($row['thumbnail'] == 1) + if (count($files) >= self::BATCH_SIZE) { - try - { - $file_tracker->track_file('attachment', 'thumb_' . $row['physical_filename'], filesize($this->phpbb_root_path . $this->config['storage\\attachment\\config\\path'] . '/thumb_' . $row['physical_filename'])); - } - catch (storage_exception $e) - { - // If file doesn't exist, don't track it - } + $file_tracker->track_files('attachment', $files); + $files = []; } } + + if (!empty($files)) + { + $file_tracker->track_files('attachment', $files); + } + $this->db->sql_freeresult($result); } @@ -150,21 +164,28 @@ public function track_backups() $sql = 'SELECT filename FROM ' . BACKUPS_TABLE; - $result = $this->db->sql_query($sql); + $files = []; while ($row = $this->db->sql_fetchrow($result)) { - try - { - $file_tracker->track_file('backup', $row['filename'], filesize($this->phpbb_root_path . $this->config['storage\\backup\\config\\path'] . '/' . $row['filename'])); - } - catch (storage_exception $e) + $files[] = [ + 'file_path' => $row['filename'], + 'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\backup\\config\\path'] . '/' . $row['filename']), + ]; + + if (count($files) >= self::BATCH_SIZE) { - // If file doesn't exist, don't track it + $file_tracker->track_files('backup', $files); + $files = []; } } + if (!empty($files)) + { + $file_tracker->track_files('backup', $files); + } + $this->db->sql_freeresult($result); } } diff --git a/phpBB/phpbb/storage/file_tracker.php b/phpBB/phpbb/storage/file_tracker.php index ab6f1c8a11b..aa05756996b 100644 --- a/phpBB/phpbb/storage/file_tracker.php +++ b/phpBB/phpbb/storage/file_tracker.php @@ -58,14 +58,33 @@ public function __construct(db $db, cache $cache, string $storage_table) */ public function track_file(string $storage, string $path, int $size): void { - $sql_ary = [ + $file = [ 'file_path' => $path, - 'storage' => $storage, 'filesize' => $size, ]; - $sql = 'INSERT INTO ' . $this->storage_table . $this->db->sql_build_array('INSERT', $sql_ary); - $this->db->sql_query($sql); + $this->track_files($storage, [$file]); + } + + /** + * Track files in database + * + * @param string $storage Storage name + * @param array $files Array of files to track + */ + public function track_files(string $storage, array $files): void + { + $sql_ary = []; + foreach ($files as $file) + { + $sql_ary[] = [ + 'storage' => $storage, + 'file_path' => $file['file_path'], + 'filesize' => $file['filesize'], + ]; + } + + $this->db->sql_multi_insert($this->storage_table, $sql_ary); $this->cache->destroy('_storage_' . $storage . '_totalsize'); $this->cache->destroy('_storage_' . $storage . '_numfiles'); From 598d1c7f49586110ad2b70c61b178c41f078b094 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 18 Jan 2025 23:15:18 +0100 Subject: [PATCH 0593/1214] [ticket/17361] Change order of arguments PHPBB-17361 --- .../default/container/services_storage.yml | 2 +- phpBB/phpbb/storage/file_tracker.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/phpBB/config/default/container/services_storage.yml b/phpBB/config/default/container/services_storage.yml index 8db8ceaedea..98a44fae1f0 100644 --- a/phpBB/config/default/container/services_storage.yml +++ b/phpBB/config/default/container/services_storage.yml @@ -123,7 +123,7 @@ services: storage.file_tracker: class: phpbb\storage\file_tracker arguments: - - '@dbal.conn' - '@cache.driver' + - '@dbal.conn' - '%tables.storage%' diff --git a/phpBB/phpbb/storage/file_tracker.php b/phpBB/phpbb/storage/file_tracker.php index aa05756996b..6a34fde2392 100644 --- a/phpBB/phpbb/storage/file_tracker.php +++ b/phpBB/phpbb/storage/file_tracker.php @@ -19,17 +19,17 @@ class file_tracker { - /** - * @var db - */ - protected $db; - /** * Cache driver * @var cache */ protected $cache; + /** + * @var db + */ + protected $db; + /** * @var string */ @@ -38,14 +38,14 @@ class file_tracker /** * Constructor * - * @param db $db - * @param cache $cache - * @param string $storage_table + * @param cache $cache + * @param db $db + * @param string $storage_table */ - public function __construct(db $db, cache $cache, string $storage_table) + public function __construct(cache $cache,db $db, string $storage_table) { - $this->db = $db; $this->cache = $cache; + $this->db = $db; $this->storage_table = $storage_table; } From 921505ca3bf190d18d5dd412a2c7908548ec7b65 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 18 Jan 2025 23:24:34 +0100 Subject: [PATCH 0594/1214] [ticket/17361] Fix code style PHPBB-17361 --- phpBB/phpbb/db/migration/data/v400/storage_track.php | 1 - phpBB/phpbb/storage/file_tracker.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php index 4d50ac0393f..54827d7d297 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_track.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php @@ -14,7 +14,6 @@ namespace phpbb\db\migration\data\v400; use phpbb\db\migration\container_aware_migration; -use phpbb\storage\exception\storage_exception; use phpbb\storage\file_tracker; class storage_track extends container_aware_migration diff --git a/phpBB/phpbb/storage/file_tracker.php b/phpBB/phpbb/storage/file_tracker.php index 6a34fde2392..991eef2d7e0 100644 --- a/phpBB/phpbb/storage/file_tracker.php +++ b/phpBB/phpbb/storage/file_tracker.php @@ -42,7 +42,7 @@ class file_tracker * @param db $db * @param string $storage_table */ - public function __construct(cache $cache,db $db, string $storage_table) + public function __construct(cache $cache, db $db, string $storage_table) { $this->cache = $cache; $this->db = $db; From c9ff5a09f61ebf1bc3cd56c094d7a08f0b117566 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 19 Jan 2025 21:09:36 +0100 Subject: [PATCH 0595/1214] [ticket/17361] Fix file not deleted when there is an error PHPBB-17361 --- phpBB/phpbb/files/filespec_storage.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/phpbb/files/filespec_storage.php b/phpBB/phpbb/files/filespec_storage.php index f223976b9ee..fcda005d7ba 100644 --- a/phpBB/phpbb/files/filespec_storage.php +++ b/phpBB/phpbb/files/filespec_storage.php @@ -447,6 +447,7 @@ public function move_file($storage, $overwrite = false, $skip_image_check = fals $fp = fopen($this->filename, 'rb'); $storage->write($this->destination_file, $fp); + $this->file_moved = true; } catch (\phpbb\storage\exception\storage_exception $e) { From f0181cc6818124ce936fdcbeb194be97b495dfb7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 22 Jan 2025 17:36:18 +0100 Subject: [PATCH 0596/1214] [ticket/17459] Use rem for font size variables PHPBB-17459 --- phpBB/styles/prosilver/theme/base.css | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/theme/base.css b/phpBB/styles/prosilver/theme/base.css index 1d8975a4eb1..42a1aef5564 100644 --- a/phpBB/styles/prosilver/theme/base.css +++ b/phpBB/styles/prosilver/theme/base.css @@ -24,18 +24,18 @@ :root { /* Base font size */ --ps-font-base: 16px; /* [1] */ - --ps-line-height: calc(var(--ps-font-base) * 1.5); /* [2] */ + --ps-line-height: 1.5rem; /* [2] */ /* Headings */ - --ps-font-h1: calc(var(--ps-font-base) * 1.5); /* 24px */ - --ps-font-h2: calc(var(--ps-font-base) * 1.5); /* 24px */ - --ps-font-h3: calc(var(--ps-font-base) * 1.25); /* 20px */ - --ps-font-h4: calc(var(--ps-font-base) * 1.125); /* 18px */ + --ps-font-h1: 1.5rem; /* 24px */ + --ps-font-h2: 1.5rem; /* 24px */ + --ps-font-h3: 1.25rem; /* 20px */ + --ps-font-h4: 1.125rem; /* 18px */ /* Text and Paragraphs */ - --ps-font-normal: var(--ps-font-base); /* 16px */ - --ps-font-small: calc(var(--ps-font-base) * 0.875); /* 14px */ - --ps-font-tiny: calc(var(--ps-font-base) * 0.75); /* 12px */ + --ps-font-normal: 1rem; /* 16px */ + --ps-font-small: 0.875rem; /* 14px */ + --ps-font-tiny: 0.75rem; /* 12px */ } html { From 3d6e63154fec4280ac1937a1fd78eeae484e74f7 Mon Sep 17 00:00:00 2001 From: NeoDev Date: Wed, 22 Jan 2025 19:31:25 -0600 Subject: [PATCH 0597/1214] [ticket/17463] Remove extraneous '&' from search page urls Normally $u_show_results always starts with '&' as it is appended to the $u_sort_param variable. Which is fine if $u_sort_param is always populated, which it is, except when searching for new or unread posts. This fix adds a check for when $u_sort_param is empty and adds '&' as needed. PHPBB-17463 --- phpBB/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index 6c908a3451f..7ab8e15a1e0 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -697,10 +697,10 @@ $hilit = str_replace(' ', '|', $hilit); $u_hilit = urlencode(html_entity_decode(str_replace('|', ' ', $hilit), ENT_COMPAT)); - $u_show_results = '&sr=' . $show_results; + $u_show_results = 'sr=' . $show_results; $u_search_forum = implode('&fid%5B%5D=', $search_forum); - $u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results); + $u_search = append_sid("{$phpbb_root_path}search.$phpEx", (($u_sort_param) ? $u_sort_param . '&' : '') . $u_show_results); $u_search .= ($search_id) ? '&search_id=' . $search_id : ''; $u_search .= ($u_hilit) ? '&keywords=' . urlencode(html_entity_decode($keywords, ENT_COMPAT)) : ''; $u_search .= ($search_terms != 'all') ? '&terms=' . $search_terms : ''; From f9def4a725cdd5b6757dfa51866149906df8842d Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 23 Jan 2025 11:15:47 +0700 Subject: [PATCH 0598/1214] [ticket/17227] Fix rows duplication in memberlist PHPBB-17227 --- phpBB/memberlist.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index dce5eb8d901..126cb9b61a8 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1390,10 +1390,10 @@ $order_by .= $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); - // Unfortunately we must do this here for sorting by rank, else the sort order is applied wrongly - if ($sort_key == 'm') + // For sorting by non-unique columns (rank, posts) add unique sort key to avoid duplicated rows in results + if ($sort_key == 'm' || $sort_key == 'd') { - $order_by .= ', u.user_posts DESC'; + $order_by .= ', u.user_id ASC'; } /** From 6a47e3628c6fdec83ad2d541ba1c26275069ac39 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 25 Jan 2025 08:07:52 -0800 Subject: [PATCH 0599/1214] [ticket/17464] Update PWA-related meta tags PHPBB-17464 --- phpBB/includes/functions.php | 1 + phpBB/styles/prosilver/template/overall_header.html | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 8741047049a..030fd17d0c5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3806,6 +3806,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $template->assign_vars(array( 'SITENAME' => $config['sitename'], 'SITE_DESCRIPTION' => $config['site_desc'], + 'SITE_SHORTNAME' => (!empty($config['sitename_short'])) ? $config['sitename_short'] : utf8_substr($config['sitename'], 0, 12), 'PAGE_TITLE' => $page_title, 'SCRIPT_NAME' => str_replace('.' . $phpEx, '', $user->page['page_name']), 'LAST_VISIT_DATE' => sprintf($user->lang['YOU_LAST_VISIT'], $s_last_visit), diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index b80d7ade3a0..949d3fb1af3 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -5,10 +5,7 @@ - - - - + {META} <!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> From 0c1aeb862b745a672d9eec3295fe6ea2c1905f68 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Jan 2025 20:49:56 +0100 Subject: [PATCH 0600/1214] [ticket/17465] Start implementation of unit tests for webpush controller PHPBB-17465 --- tests/ucp/controller_webpush_test.php | 104 ++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 tests/ucp/controller_webpush_test.php diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php new file mode 100644 index 00000000000..9e845222399 --- /dev/null +++ b/tests/ucp/controller_webpush_test.php @@ -0,0 +1,104 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\exception\http_exception; +use phpbb\request\request_interface; +use phpbb\ucp\controller\webpush; + +class test_ucp_controller_webpush_test extends phpbb_test_case +{ + protected $config; + protected $controller; + protected $controller_helper; + protected $db; + protected $form_helper; + protected $language; + protected $notification; + protected $notification_manager; + protected $path_helper; + protected $request; + protected $template; + protected $user; + protected $user_loader; + + protected function setUp(): void + { + parent::setUp(); + + $this->config = $this->createMock(\phpbb\config\config::class); + $this->controller_helper = $this->createMock(\phpbb\controller\helper::class); + $this->db = $this->createMock(\phpbb\db\driver\driver_interface::class); + $this->form_helper = $this->createMock(\phpbb\form\form_helper::class); + $this->language = $this->createMock(\phpbb\language\language::class); + $this->notification = $this->createMock(\phpbb\notification\type\type_interface::class); + $this->notification_manager = $this->createMock(\phpbb\notification\manager::class); + $this->path_helper = $this->createMock(\phpbb\path_helper::class); + $this->request = $this->createMock(\phpbb\request\request_interface::class); + $this->template = $this->createMock(\Twig\Environment::class); + $this->user = $this->createMock(\phpbb\user::class); + $this->user_loader = $this->createMock(\phpbb\user_loader::class); + + $this->controller = new webpush( + $this->config, + $this->controller_helper, + $this->db, + $this->form_helper, + $this->language, + $this->notification_manager, + $this->path_helper, + $this->request, + $this->user_loader, + $this->user, + $this->template, + 'webpush_table', + 'subscription_table' + ); + } + + public function data_notification_no_data(): array + { + return [ + 'logged_in_user' => [ + USER_NORMAL, + 2, + [], + ], + 'anonymous_user' => [ + USER_NORMAL, + ANONYMOUS, + [ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ], + ], + ]; + } + + /** + * @dataProvider data_notification_no_data + */ + public function test_notification_no_data($user_type, $user_id, $request_data) + { + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap($request_data)); + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = $user_type; + $this->user->method('id')->willReturn($user_id); + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('AJAX_ERROR_TEXT'); + + $this->controller->notification(); + } +} From ac3e9f64d81cbba5f3f111db389863f904ca499e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Jan 2025 20:50:29 +0100 Subject: [PATCH 0601/1214] [ticket/17465] Throw bad request exceptions on invalid data requests PHPBB-17465 --- phpBB/phpbb/ucp/controller/webpush.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 50d3eb37398..c36f67d129f 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -165,6 +165,11 @@ private function get_user_notifications(): string $notification_data = $this->db->sql_fetchfield('push_data'); $this->db->sql_freeresult($result); + if (!$notification_data) + { + throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT'); + } + return $this->get_notification_data($notification_data); } @@ -192,6 +197,11 @@ private function get_anonymous_notifications(): string $notification_row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); + if (!$notification_row || !isset($notification_row['push_data']) || !isset($notification_row['push_token'])) + { + throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT'); + } + $notification_data = $notification_row['push_data']; $push_token = $notification_row['push_token']; From c5c6c96a50947cea9c8f04a0a7d3b42c0ce28802 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 28 Jan 2025 21:15:33 +0100 Subject: [PATCH 0602/1214] [ticket/17465] Cover more exceptions when handling notification PHPBB-17465 --- tests/ucp/controller_webpush_test.php | 62 +++++++++++++++++++++++---- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index 9e845222399..d4b63f09836 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -65,39 +65,85 @@ protected function setUp(): void ); } - public function data_notification_no_data(): array + public function data_notification_exceptions(): array { return [ - 'logged_in_user' => [ + 'not_ajax' => [ + false, + false, USER_NORMAL, 2, [], + 'NO_AUTH_OPERATION', ], - 'anonymous_user' => [ + 'is_bot' => [ + true, + true, + USER_NORMAL, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'inactive_user' => [ + true, + false, + USER_INACTIVE, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'ignore_user' => [ + true, + false, + USER_IGNORE, + 2, + [], + 'NO_AUTH_OPERATION', + ], + 'no_notification' => [ + true, + false, + USER_NORMAL, + 2, + [], + 'AJAX_ERROR_TEXT', + ], + 'no_notification_anonymous' => [ + true, + false, USER_NORMAL, ANONYMOUS, [ ['token', '', false, request_interface::REQUEST, 'foobar'], ], + 'AJAX_ERROR_TEXT', + ], + 'no_notification_anonymous_no_token' => [ + true, + false, + USER_NORMAL, + ANONYMOUS, + [], + 'NO_AUTH_OPERATION', ], ]; } /** - * @dataProvider data_notification_no_data + * @dataProvider data_notification_exceptions */ - public function test_notification_no_data($user_type, $user_id, $request_data) + public function test_notification_no_data($is_ajax, $is_bot, $user_type, $user_id, $request_data, $expected_message) { - $this->request->method('is_ajax')->willReturn(true); + $this->request->method('is_ajax')->willReturn($is_ajax); $this->request->expects($this->any()) ->method('variable') ->will($this->returnValueMap($request_data)); - $this->user->data['is_bot'] = false; + $this->user->data['is_bot'] = $is_bot; $this->user->data['user_type'] = $user_type; $this->user->method('id')->willReturn($user_id); $this->expectException(http_exception::class); - $this->expectExceptionMessage('AJAX_ERROR_TEXT'); + $this->expectExceptionMessage($expected_message); $this->controller->notification(); } From a86f368f3d43e11d48a7fcf097d669202565e8c7 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 2 Feb 2025 10:42:29 +0700 Subject: [PATCH 0603/1214] [ticket/17467] Provide TLS v.1.3 support for SMTP connections PHPBB-17467 --- phpBB/includes/functions_messenger.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php index 6781ec4e0fb..bf460056d93 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1615,12 +1615,10 @@ protected function starttls() $result = false; $stream_meta = stream_get_meta_data($this->socket); - if (socket_set_blocking($this->socket, 1)) + if (stream_set_blocking($this->socket, 1)) { - // https://secure.php.net/manual/en/function.stream-socket-enable-crypto.php#119122 - $crypto = (phpbb_version_compare(PHP_VERSION, '5.6.7', '<')) ? STREAM_CRYPTO_METHOD_TLS_CLIENT : STREAM_CRYPTO_METHOD_SSLv23_CLIENT; - $result = stream_socket_enable_crypto($this->socket, true, $crypto); - socket_set_blocking($this->socket, (int) $stream_meta['blocked']); + $result = stream_socket_enable_crypto($this->socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT); + stream_set_blocking($this->socket, (int) $stream_meta['blocked']); } return $result; From cd47344ee24f90a4870616e442a76a256a56876c Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 2 Feb 2025 19:46:49 +0700 Subject: [PATCH 0604/1214] [ticket/17468] Send reset password link to email only PHPBB-17468 --- phpBB/phpbb/ucp/controller/reset_password.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index a451856065b..59047c191a4 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -272,7 +272,7 @@ public function request() ], false) ]); - $messenger->send($user_row['user_notify_type']); + $messenger->send(NOTIFY_EMAIL); return $this->helper->message($message); } From c937b8f7ab8be7beee5067e592e0bb8085bdbcbc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 2 Feb 2025 17:15:34 +0100 Subject: [PATCH 0605/1214] [ticket/17465] Add unit tests for all functions in webpush controller PHPBB-17465 --- phpBB/phpbb/ucp/controller/webpush.php | 1 - tests/ucp/controller_webpush_test.php | 423 ++++++++++++++++++++++++- tests/ucp/fixtures/webpush.xml | 65 ++++ 3 files changed, 474 insertions(+), 15 deletions(-) create mode 100644 tests/ucp/fixtures/webpush.xml diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index c36f67d129f..95406840d4c 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -135,7 +135,6 @@ public function notification(): JsonResponse // Decode and return data if everything is fine $data = json_decode($notification_data, true); - $data['url'] = isset($data['url']) ? $this->path_helper->update_web_root_path($data['url']) : ''; return new JsonResponse($data); } diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index d4b63f09836..e68d50341c5 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -12,41 +12,67 @@ */ use phpbb\exception\http_exception; +use phpbb\notification\type\quote; use phpbb\request\request_interface; use phpbb\ucp\controller\webpush; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\Response; -class test_ucp_controller_webpush_test extends phpbb_test_case +class test_ucp_controller_webpush_test extends phpbb_database_test_case { + protected $auth; + protected $avatar_helper; protected $config; protected $controller; protected $controller_helper; protected $db; protected $form_helper; protected $language; - protected $notification; protected $notification_manager; protected $path_helper; + protected $phpbb_root_path; + protected $php_ext; protected $request; protected $template; protected $user; protected $user_loader; + protected function getDataSet() + { + return $this->createXMLDataSet(__DIR__ . '/fixtures/webpush.xml'); + } + protected function setUp(): void { + global $auth, $config, $phpbb_dispatcher, $user, $phpbb_root_path, $phpEx; + parent::setUp(); - $this->config = $this->createMock(\phpbb\config\config::class); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + + $this->auth = $this->createMock(\phpbb\auth\auth::class); + $auth = $this->auth; + $this->avatar_helper = $this->createMock(\phpbb\avatar\helper::class); + $this->config = new \phpbb\config\config([ + 'allow_nocensors' => false, + 'sitename' => 'yourdomain.com', + ]); + $config = $this->config; $this->controller_helper = $this->createMock(\phpbb\controller\helper::class); - $this->db = $this->createMock(\phpbb\db\driver\driver_interface::class); + $this->db = $this->new_dbal(); $this->form_helper = $this->createMock(\phpbb\form\form_helper::class); - $this->language = $this->createMock(\phpbb\language\language::class); - $this->notification = $this->createMock(\phpbb\notification\type\type_interface::class); + $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $this->language = new \phpbb\language\language($lang_loader); $this->notification_manager = $this->createMock(\phpbb\notification\manager::class); - $this->path_helper = $this->createMock(\phpbb\path_helper::class); + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + $symfony_request = $this->createMock(\phpbb\symfony_request::class); $this->request = $this->createMock(\phpbb\request\request_interface::class); $this->template = $this->createMock(\Twig\Environment::class); - $this->user = $this->createMock(\phpbb\user::class); - $this->user_loader = $this->createMock(\phpbb\user_loader::class); + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); + $user = $this->user; + $this->user_loader = new \phpbb\user_loader($this->avatar_helper, $this->db, $this->phpbb_root_path, $this->php_ext, 'phpbb_users'); + $this->path_helper = new \phpbb\path_helper($symfony_request, $this->request, $phpbb_root_path, $phpEx); $this->controller = new webpush( $this->config, @@ -60,8 +86,8 @@ protected function setUp(): void $this->user_loader, $this->user, $this->template, - 'webpush_table', - 'subscription_table' + 'phpbb_notification_push', + 'phpbb_push_subscriptions' ); } @@ -138,13 +164,382 @@ public function test_notification_no_data($is_ajax, $is_bot, $user_type, $user_i $this->request->expects($this->any()) ->method('variable') ->will($this->returnValueMap($request_data)); - $this->user->data['is_bot'] = $is_bot; - $this->user->data['user_type'] = $user_type; - $this->user->method('id')->willReturn($user_id); + $this->user->data = [ + 'is_bot' => $is_bot, + 'user_type' => $user_type, + 'user_id' => $user_id, + ]; $this->expectException(http_exception::class); $this->expectExceptionMessage($expected_message); $this->controller->notification(); } + + public function test_get_user_notification() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => 2, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB3"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_get_user_notification_anonymous() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, '0ccf8fcd96a66297b77b66109cbe9870e1a6fa66e42b9bf36d1f2c7263240058'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ['user_id', 0, false, request_interface::REQUEST, 2], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => ANONYMOUS, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB3"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_get_user_notification_anonymous_invalid_token() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, '488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967'], + ['item_id', 0, false, request_interface::REQUEST, 1], + ['type_id', 0, false, request_interface::REQUEST, 4], + ['user_id', 0, false, request_interface::REQUEST, 2], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => ANONYMOUS, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NO_AUTH_OPERATION'); + + $this->controller->notification(); + } + + public function test_get_user_notification_legacy() + { + global $cache; + $cache = $this->createMock(\phpbb\cache\service::class); + $cache->method('obtain_word_list')->willReturn([]); + + $this->auth->method('acl_get')->willReturn(true); + + $this->notification_manager->method('get_item_type_class') + ->willReturnCallback(function(string $type_name, array $row_data) { + $notification_type = new quote( + $this->db, + $this->language, + $this->user, + $this->auth, + $this->phpbb_root_path, + $this->php_ext, + 'phpbb_notifications' + ); + + $notification_type->set_user_loader($this->user_loader); + $notification_type->set_initial_data($row_data); + + return $notification_type; + }); + + $this->request->method('is_ajax')->willReturn(true); + $this->request->expects($this->any()) + ->method('variable') + ->will($this->returnValueMap([ + ['token', '', false, request_interface::REQUEST, 'foobar'], + ['item_id', 0, false, request_interface::REQUEST, 2], + ['type_id', 0, false, request_interface::REQUEST, 4], + ])); + $this->user->data = [ + 'is_bot' => false, + 'user_type' => USER_NORMAL, + 'user_id' => 2, + 'user_options' => 230271, + ]; + $this->user->lang = [ + 'GUEST' => 'Guest', + ]; + + $json_response = $this->controller->notification(); + + $response_data = json_decode($json_response->getContent(), true); + + $this->assertEquals([ + 'heading' => 'yourdomain.com', + 'title' => 'Quoted by Guest in:', + 'text' => '"Welcome to phpBB3"', + 'url' => 'phpBB/viewtopic.php?p=1#p1', + 'avatar' => [], + ], $response_data); + } + + public function test_worker() + { + $this->template->method('render')->willReturn('rendered_content'); + $this->controller_helper->method('route')->willReturn('test_route'); + $this->config['assets_version'] = '1.0'; + + $response = $this->controller->worker(); + + $this->assertInstanceOf(Response::class, $response); + $this->assertEquals('text/javascript; charset=UTF-8', $response->headers->get('Content-Type')); + $this->assertEquals('rendered_content', $response->getContent()); + $this->assertNull($response->headers->get('X-PHPBB-IS-BOT')); + } + + public function test_worker_bot() + { + $this->template->method('render')->willReturn('rendered_content'); + $this->controller_helper->method('route')->willReturn('test_route'); + $this->config['assets_version'] = '1.0'; + $this->user->data['is_bot'] = true; + + $response = $this->controller->worker(); + + $this->assertEquals('yes', $response->headers->get('X-PHPBB-IS-BOT')); + } + + public function test_check_subscribe_requests_invalid_form_token() + { + $this->form_helper->method('check_form_tokens')->willReturn(false); + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('FORM_INVALID'); + + $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); + $check_subscribe_reflection->setAccessible(true); + $check_subscribe_reflection->invoke($this->controller); + } + + public function test_check_subscribe_requests_anonymous_user() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = ANONYMOUS; + + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NO_AUTH_OPERATION'); + + $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); + $check_subscribe_reflection->setAccessible(true); + $check_subscribe_reflection->invoke($this->controller); + } + + public function test_subscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->method('get')->willReturn(json_encode([ + 'endpoint' => 'test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => '1', + ], $row); + } + + public function test_unsubscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->method('get')->willReturn(json_encode([ + 'endpoint' => 'test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => '1', + ], $row); + + // Now unsubscribe + $response = $this->controller->unsubscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2'; + $result = $this->db->sql_query($sql); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEmpty($row); + } } diff --git a/tests/ucp/fixtures/webpush.xml b/tests/ucp/fixtures/webpush.xml new file mode 100644 index 00000000000..3e209be3916 --- /dev/null +++ b/tests/ucp/fixtures/webpush.xml @@ -0,0 +1,65 @@ + + + + item_id + push_data + push_token + user_id + notification_type_id + notification_time + + 1 + + 488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967 + 2 + 4 + 1738437884 + + + 2 + + 488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967 + 2 + 4 + 1738437884 + +
    + + notification_type_id + notification_type_name + notification_type_enabled + + 4 + notification.type.quote + 1 + +
    + + user_id + username_clean + user_permissions + user_sig + user_form_salt + + 1 + Anonymous + + + + + + 2 + poster + + + sua0m6f0ektt1g9z + + + 3 + test + + + abcdef + +
    +     From e75d7a841006fab143757c8baf2e54fe29bdb47d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 6 Feb 2025 19:48:42 +0100 Subject: [PATCH 0606/1214] [ticket/17465] Remove obsolete json_decode PHPBB-17465 --- phpBB/phpbb/ucp/controller/webpush.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 95406840d4c..01111f9ca41 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -133,10 +133,7 @@ public function notification(): JsonResponse $notification_data = $this->get_anonymous_notifications(); } - // Decode and return data if everything is fine - $data = json_decode($notification_data, true); - - return new JsonResponse($data); + return new JsonResponse($notification_data, 200, [], true); } /** From 353aa653b45946f3e3a5939303b947463fd88b46 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 10 Feb 2025 19:32:13 +0100 Subject: [PATCH 0607/1214] [ticket/17459] Adjust spacing of blocks on index PHPBB-17459 --- phpBB/styles/prosilver/theme/common.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 03b6ad131de..e8f32465e25 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -161,7 +161,7 @@ a:hover { .page-body { clear: both; - margin: 4px 0; + margin: 0.4rem 0; } .page-footer { @@ -203,7 +203,7 @@ a:hover { border-radius: 7px; display: flex; flex-direction: column; - margin-bottom: 4px; + margin-bottom: 0.5rem; padding: 5px; } @@ -215,14 +215,14 @@ a:hover { .forabg { border-radius: 7px; clear: both; - margin-bottom: 4px; + margin-bottom: 0.5rem; padding: 5px; } .forumbg { border-radius: 7px; clear: both; - margin-bottom: 4px; + margin-bottom: 0.5rem; padding: 5px; } From 736ef320ed0af60dd7a9cfd96a108f382c80e68c Mon Sep 17 00:00:00 2001 From: phpBB TR <166284197+phpbbtr@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:38:58 +0300 Subject: [PATCH 0608/1214] [ticket/17417] Show display options even without search results PHPBB-17417 --- phpBB/styles/prosilver/template/search_results.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index f9ea6d7d5e6..01cf17a7468 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -226,7 +226,7 @@

    {searchresults.POST_SUBJECT}

    - +
    From d2c402f038904df52e663ca22fd11d2bc4cdefb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1t=C3=A9=20Bartus?= Date: Fri, 22 Sep 2023 09:35:54 +0100 Subject: [PATCH 0609/1214] [ticket/15851] Automatic update downloader PHPBB3-15851 --- phpBB/composer.json | 1 + phpBB/config/default/container/parameters.yml | 2 + phpBB/config/default/container/services.yml | 1 + .../default/container/services_updater.yml | 14 ++ phpBB/includes/acp/acp_update.php | 20 +++ phpBB/language/en/install.php | 7 + .../task/check_server_environment.php | 2 +- phpBB/phpbb/update/controller.php | 137 ++++++++++++++ phpBB/phpbb/update/get_updates.php | 169 ++++++++++++++++++ 9 files changed, 352 insertions(+), 1 deletion(-) create mode 100644 phpBB/config/default/container/services_updater.yml create mode 100644 phpBB/phpbb/update/controller.php create mode 100644 phpBB/phpbb/update/get_updates.php diff --git a/phpBB/composer.json b/phpBB/composer.json index c77ab77819c..7430017299e 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -29,6 +29,7 @@ "php": "^8.1", "ext-pdo": "*", "ext-zlib": "*", + "ext-sodium": "*", "bantu/ini-get-wrapper": "~1.0", "carlos-mg89/oauth": "^0.8.15", "chita/topological_sort": "^3.0", diff --git a/phpBB/config/default/container/parameters.yml b/phpBB/config/default/container/parameters.yml index 8fcb4019146..ba9b7aff18d 100644 --- a/phpBB/config/default/container/parameters.yml +++ b/phpBB/config/default/container/parameters.yml @@ -20,3 +20,5 @@ parameters: - passwords.driver.bcrypt - passwords.driver.salted_md5 - passwords.driver.phpass + + public_key: 'auJX0pGetfYatE7t/rX5hAkCLZv9s78TwKkLfR3YGuQ=' diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index c09f21b5c6a..ecf8f3109e7 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -37,6 +37,7 @@ imports: - { resource: services_twig.yml } - { resource: services_twig_extensions.yml } - { resource: services_ucp.yml } + - { resource: services_updater.yml } - { resource: services_user.yml } - { resource: tables.yml } diff --git a/phpBB/config/default/container/services_updater.yml b/phpBB/config/default/container/services_updater.yml new file mode 100644 index 00000000000..0db8edf0144 --- /dev/null +++ b/phpBB/config/default/container/services_updater.yml @@ -0,0 +1,14 @@ +services: + updater.get_updates: + class: phpbb\update\get_updates + arguments: + - '@filesystem' + - '%public_key%' + - '%core.root_path%' + + updater.controller: + class: phpbb\update\controller + arguments: + - '@filesystem' + - '@updater.get_updates' + - '%core.root_path%' diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index fa3afa6ce3e..0c542cad06e 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -38,12 +38,32 @@ function main($id, $mode) try { $recheck = $request->variable('versioncheck_force', false); + $do_update = $request->variable('do_update', false); + $updates_available = $version_helper->get_update_on_branch($recheck); $upgrades_available = $version_helper->get_suggested_updates(); + $branch = ''; if (!empty($upgrades_available)) { + $branch = array_key_last($upgrades_available); $upgrades_available = array_pop($upgrades_available); } + + if ($do_update && !empty($updates_available)) + { + $updater = $phpbb_container->get('updater.controller'); + $current_version = $config['version']; + $new_version = $upgrades_available['current']; + $download_url = 'https://download.phpbb.com/pub/release/'; + $download_url .= $branch . '/' . $new_version . '/'; + $download_url .= 'phpBB-' . $current_version . '_to_' . $new_version . '.zip'; + $data = $updater->handle( + $download_url + ); + + $response = new \phpbb\json_response(); + $response->send($data); + } } catch (\RuntimeException $e) { diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 50ec74f933d..f355d1427a9 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -221,6 +221,13 @@

    We noticed that the last update of your phpBB installation hasn’t been completed. Visit the database updater, ensure Update database only is selected and click on Submit. Don\'t forget to delete the "install"-directory after you have updated the database successfully.

    ', + // Auto update + 'COULD_NOT_DOWNLOAD_UPDATE_PACKAGE' => 'Failed to download the update package.', + 'COULD_NOT_DOWNLOAD_UPDATE_SIGNATURE' => 'Failed to download the update package signature.', + 'UPDATE_SIGNATURE_INVALID' => 'The update package is corrupted.', + 'COULD_NOT_EXTRACT_UPDATE' => 'Could not extract files from the update package.', + 'COULD_NOT_WRITE_UPDATE_FILES' => 'Could not copy files from the update package.', + // // Server data // diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php index bb43ed4b2f6..9ae953ee8ea 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php +++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php @@ -96,7 +96,7 @@ protected function set_test_passed($is_passed) */ protected function check_php_version() { - if (version_compare(PHP_VERSION, '7.2.0', '<')) + if (version_compare(PHP_VERSION, '8.1.0', '<')) { $this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN'); diff --git a/phpBB/phpbb/update/controller.php b/phpBB/phpbb/update/controller.php new file mode 100644 index 00000000000..5253f2b3d39 --- /dev/null +++ b/phpBB/phpbb/update/controller.php @@ -0,0 +1,137 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\update; + +use phpbb\filesystem\filesystem_interface; +use phpbb\language\language; + +class controller +{ + /** @var filesystem_interface Filesystem manager */ + private filesystem_interface $filesystem; + + /** @var get_updates Updater class */ + private get_updates $updater; + + /** @var language Translation handler */ + private language $language; + + /** @var string phpBB root path */ + private string $phpbb_root_path; + + /** + * Constructor. + * + * @param filesystem_interface $filesystem + * @param get_updates $updater + * @param language $language + * @param string $phpbb_root_path + */ + public function __construct( + filesystem_interface $filesystem, + get_updates $updater, + language $language, + string $phpbb_root_path) + { + $this->filesystem = $filesystem; + $this->language = $language; + $this->updater = $updater; + $this->phpbb_root_path = $phpbb_root_path; + } + + /** + * Handle requests. + * + * @param string $download The download URL. + * + * @return string[] Unencoded json response. + */ + public function handle(string $download): array + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $status = ['status' => 'continue']; + if (!file_exists($update_path)) + { + $result = $this->updater->download($download, $update_path); + if (!$result) + { + return [ + 'status' => 'error', + 'error' => $this->language->lang('COULD_NOT_DOWNLOAD_UPDATE_PACKAGE') + ]; + } + + return $status; + } + + if (!file_exists($update_path . '.sig')) + { + $result = $this->updater->download($download . '.sig', $update_path . '.sig'); + if (!$result) + { + return [ + 'status' => 'error', + 'error' => $this->language->lang('COULD_NOT_DOWNLOAD_UPDATE_SIGNATURE') + ]; + } + return $status; + } + + if (!is_dir($this->phpbb_root_path . 'store/update')) + { + $result = $this->updater->validate($update_path, $update_path . '.sig'); + if (!$result) + { + return [ + 'status' => 'error', + 'error' => $this->language->lang('UPDATE_SIGNATURE_INVALID') + ]; + } + + $result = $this->updater->extract($update_path, $this->phpbb_root_path . 'store/update'); + if (!$result) + { + return [ + 'status' => 'error', + 'error' => $this->language->lang('COULD_NOT_EXTRACT_UPDATE') + ]; + } + + return $status; + } + + if (!is_dir($this->phpbb_root_path . 'install')) + { + $result = $this->updater->copy($this->phpbb_root_path . 'store/update'); + if (!$result) + { + return [ + 'status' => 'error', + 'error' => $this->language->lang('COULD_NOT_WRITE_UPDATE_FILES') + ]; + } + + return $status; + } + + $this->filesystem->remove([ + $this->phpbb_root_path . 'store/update', + $update_path, + $update_path . '.sig' + ]); + + $status['status'] = 'done'; + return $status; + } +} diff --git a/phpBB/phpbb/update/get_updates.php b/phpBB/phpbb/update/get_updates.php new file mode 100644 index 00000000000..1b65cec2a75 --- /dev/null +++ b/phpBB/phpbb/update/get_updates.php @@ -0,0 +1,169 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\update; + +use GuzzleHttp\Client; +use GuzzleHttp\Exception\GuzzleException; +use phpbb\filesystem\exception\filesystem_exception; +use phpbb\filesystem\filesystem_interface; +use SodiumException; +use ZipArchive; + +class get_updates +{ + /** @var filesystem_interface Filesystem managerr */ + private filesystem_interface $filesystem; + + /** @var Client HTTP client */ + private Client $http_client; + + /** @var string Public key to verify package */ + private string $public_key; + + /** @var string phpBB root path */ + private string $phpbb_root_path; + + /** @var ZipArchive Zip extractor */ + private ZipArchive $zipper; + + /** + * Constructor + * + * @param filesystem_interface $filesystem + * @param string $public_key + * @param string $phpbb_root_path + */ + public function __construct( + filesystem_interface $filesystem, + string $public_key, + string $phpbb_root_path) + { + $this->filesystem = $filesystem; + $this->http_client = new Client(); + $this->public_key = base64_decode($public_key); + $this->phpbb_root_path = $phpbb_root_path; + $this->zipper = new ZipArchive(); + } + + /** + * Download the update package. + * + * @param string $url Download link to the update. + * @param string $storage_path Location for the download. + * + * @return bool Whether the download completed successfully. + */ + public function download(string $url, string $storage_path): bool + { + try + { + $this->http_client->request('GET', $url, [ + 'sink' => $storage_path, + 'allow_redirects' => false + ]); + } + catch (GuzzleException) + { + return false; + } + + return true; + } + + /** + * Validate the downloaded file. + * + * @param string $file_path Path to the download. + * @param string $signature_path The signature file. + * + * @return bool Whether the signature is correct or not. + */ + public function validate(string $file_path, string $signature_path): bool + { + if (file_exists($file_path) === false) + { + return false; + } + + if (file_exists($signature_path) === false) + { + return false; + } + + $raw_signature = file_get_contents($signature_path); + + $hash = hash_file('sha384', $file_path, true); + if ($hash === false) + { + return false; + } + + $signature = base64_decode($raw_signature); + if ($signature === false) + { + return false; + } + + try + { + return sodium_crypto_sign_verify_detached($signature, $hash, $this->public_key); + } + catch (SodiumException) + { + return false; + } + } + + /** + * Extract the downloaded archive. + * + * @param string $zip_file Path to the archive. + * @param string $to Path to where to extract the archive to. + * + * @return bool Whether the extraction completed successfully. + */ + public function extract(string $zip_file, string $to): bool + { + if ($this->zipper->open($zip_file) === false) + { + return false; + } + + $result = $this->zipper->extractTo($to); + $this->zipper->close(); + + return $result; + } + + /** + * Copy the update package to the root folder. + * + * @param string $src_dir Where to copy from. + * + * @return bool Whether the files were copied successfully. + */ + public function copy(string $src_dir): bool + { + try + { + $this->filesystem->mirror($src_dir, $this->phpbb_root_path); + } + catch (filesystem_exception) + { + return false; + } + + return true; + } +} From 1ba58768f36471cb99d0aebeb8444e866ec89ef9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 28 Oct 2024 21:38:37 +0100 Subject: [PATCH 0610/1214] [ticket/15851] Add zip extension to required extensions PHPBB-15851 --- phpBB/composer.json | 1 + phpBB/composer.lock | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 7430017299e..321365c1402 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -28,6 +28,7 @@ "require": { "php": "^8.1", "ext-pdo": "*", + "ext-zip": "*", "ext-zlib": "*", "ext-sodium": "*", "bantu/ini-get-wrapper": "~1.0", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index bf9ac175e95..754690b1e4f 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -10176,7 +10176,9 @@ "platform": { "php": "^8.1", "ext-pdo": "*", - "ext-zlib": "*" + "ext-zip": "*", + "ext-zlib": "*", + "ext-sodium": "*" }, "platform-dev": [], "platform-overrides": { From 573c6c87b20c1c80d5334e7741cc29014db5c7c2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 28 Oct 2024 21:42:29 +0100 Subject: [PATCH 0611/1214] [ticket/15851] Add prefix to parameter for public key PHPBB-15851 --- phpBB/config/default/container/parameters.yml | 2 +- phpBB/config/default/container/services_updater.yml | 2 +- phpBB/phpbb/update/get_updates.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/config/default/container/parameters.yml b/phpBB/config/default/container/parameters.yml index ba9b7aff18d..29502123ed5 100644 --- a/phpBB/config/default/container/parameters.yml +++ b/phpBB/config/default/container/parameters.yml @@ -21,4 +21,4 @@ parameters: - passwords.driver.salted_md5 - passwords.driver.phpass - public_key: 'auJX0pGetfYatE7t/rX5hAkCLZv9s78TwKkLfR3YGuQ=' + packages.public_key: 'auJX0pGetfYatE7t/rX5hAkCLZv9s78TwKkLfR3YGuQ=' diff --git a/phpBB/config/default/container/services_updater.yml b/phpBB/config/default/container/services_updater.yml index 0db8edf0144..918c4de4076 100644 --- a/phpBB/config/default/container/services_updater.yml +++ b/phpBB/config/default/container/services_updater.yml @@ -3,7 +3,7 @@ services: class: phpbb\update\get_updates arguments: - '@filesystem' - - '%public_key%' + - '%packages.public_key%' - '%core.root_path%' updater.controller: diff --git a/phpBB/phpbb/update/get_updates.php b/phpBB/phpbb/update/get_updates.php index 1b65cec2a75..730fe9e903c 100644 --- a/phpBB/phpbb/update/get_updates.php +++ b/phpBB/phpbb/update/get_updates.php @@ -22,7 +22,7 @@ class get_updates { - /** @var filesystem_interface Filesystem managerr */ + /** @var filesystem_interface Filesystem manager */ private filesystem_interface $filesystem; /** @var Client HTTP client */ From dacabf05377800f5f1598cf526a5e1be264e2292 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 28 Oct 2024 22:22:13 +0100 Subject: [PATCH 0612/1214] [ticket/15851] Add sodium extension to windows runner on github actions PHPBB-15851 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3795b00a7e0..d42bcd12f69 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -503,7 +503,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }} coverage: none From 3506883c75eea6edc505d8a985d58ec5ec781285 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 29 Oct 2024 21:23:08 +0100 Subject: [PATCH 0613/1214] [ticket/15851] Use raw values for verifying signature PHPBB-15851 --- phpBB/phpbb/update/get_updates.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/update/get_updates.php b/phpBB/phpbb/update/get_updates.php index 730fe9e903c..d9957971bca 100644 --- a/phpBB/phpbb/update/get_updates.php +++ b/phpBB/phpbb/update/get_updates.php @@ -101,7 +101,7 @@ public function validate(string $file_path, string $signature_path): bool return false; } - $raw_signature = file_get_contents($signature_path); + $signature = file_get_contents($signature_path); $hash = hash_file('sha384', $file_path, true); if ($hash === false) @@ -109,15 +109,21 @@ public function validate(string $file_path, string $signature_path): bool return false; } - $signature = base64_decode($raw_signature); - if ($signature === false) + $raw_signature = base64_decode($signature); + if ($raw_signature === false) + { + return false; + } + + $raw_public_key = base64_decode($this->public_key); + if ($raw_public_key === false) { return false; } try { - return sodium_crypto_sign_verify_detached($signature, $hash, $this->public_key); + return sodium_crypto_sign_verify_detached($raw_signature, $hash, $raw_public_key); } catch (SodiumException) { From 525924b2fc6c756bcf16a10199f9abfea2e36e41 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Oct 2024 20:57:34 +0100 Subject: [PATCH 0614/1214] [ticket/15851] Improve validate checks and change visibility for unit testing PHPBB-15851 --- phpBB/phpbb/update/get_updates.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/phpBB/phpbb/update/get_updates.php b/phpBB/phpbb/update/get_updates.php index d9957971bca..7b79000c6dd 100644 --- a/phpBB/phpbb/update/get_updates.php +++ b/phpBB/phpbb/update/get_updates.php @@ -23,20 +23,20 @@ class get_updates { /** @var filesystem_interface Filesystem manager */ - private filesystem_interface $filesystem; + protected filesystem_interface $filesystem; /** @var Client HTTP client */ - private Client $http_client; + protected Client $http_client; + + /** @var ZipArchive Zip extractor */ + protected ZipArchive $zipper; /** @var string Public key to verify package */ - private string $public_key; + protected string $public_key; /** @var string phpBB root path */ private string $phpbb_root_path; - /** @var ZipArchive Zip extractor */ - private ZipArchive $zipper; - /** * Constructor * @@ -51,9 +51,9 @@ public function __construct( { $this->filesystem = $filesystem; $this->http_client = new Client(); + $this->zipper = new ZipArchive(); $this->public_key = base64_decode($public_key); $this->phpbb_root_path = $phpbb_root_path; - $this->zipper = new ZipArchive(); } /** @@ -91,12 +91,12 @@ public function download(string $url, string $storage_path): bool */ public function validate(string $file_path, string $signature_path): bool { - if (file_exists($file_path) === false) + if (file_exists($file_path) === false || !is_readable($file_path)) { return false; } - if (file_exists($signature_path) === false) + if (file_exists($signature_path) === false || !is_readable($signature_path)) { return false; } @@ -109,13 +109,13 @@ public function validate(string $file_path, string $signature_path): bool return false; } - $raw_signature = base64_decode($signature); + $raw_signature = base64_decode($signature, true); if ($raw_signature === false) { return false; } - $raw_public_key = base64_decode($this->public_key); + $raw_public_key = base64_decode($this->public_key, true); if ($raw_public_key === false) { return false; From feb7d6f34ef46ca2de807ce3433f28fe4eeba02e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Oct 2024 20:58:05 +0100 Subject: [PATCH 0615/1214] [ticket/15851] Add unit tests for get_updates PHPBB-15851 --- tests/update/get_updates_test.php | 310 ++++++++++++++++++++++++++++++ 1 file changed, 310 insertions(+) create mode 100644 tests/update/get_updates_test.php diff --git a/tests/update/get_updates_test.php b/tests/update/get_updates_test.php new file mode 100644 index 00000000000..01b76aa5f46 --- /dev/null +++ b/tests/update/get_updates_test.php @@ -0,0 +1,310 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use GuzzleHttp\Client; +use GuzzleHttp\Exception\ClientException; +use phpbb\filesystem\exception\filesystem_exception; +use phpbb\filesystem\filesystem_interface; +use phpbb\update\get_updates; + +class phpbb_update_get_updates_test extends phpbb_test_case +{ + private $filesystem; + private $http_client; + private $zipper; + private $update; + private $public_key = 'atest_public_keyatest_public_keyatest_public_keyatest_public_key'; + + private $file_path = __DIR__ . '/../tmp/download.zip'; + + private $signature_path = __DIR__ . '/../tmp/signature.sig'; + + private $phpbb_root_path; + + public function setUp(): void + { + global $phpbb_root_path; + + parent::setUp(); + + $this->filesystem = $this->createMock(filesystem_interface::class); + $this->http_client = $this->createMock(Client::class); + $this->zipper = $this->createMock(ZipArchive::class); + $this->phpbb_root_path = $phpbb_root_path; + + // Set up the `get_updates` instance with injected mocks. + $this->update = new get_updates($this->filesystem, base64_encode($this->public_key), $this->phpbb_root_path); + } + + public function tearDown(): void + { + if (file_exists($this->file_path)) + { + unlink($this->file_path); + } + + if (file_exists($this->signature_path)) + { + unlink($this->signature_path); + } + + parent::tearDown(); + } + + public function test_download_success() + { + $this->http_client->expects($this->once()) + ->method('request') + ->with('GET', 'http://example.com/update.zip', [ + 'sink' => '/path/to/storage', + 'allow_redirects' => false + ]) + ->willReturn(true); + + $client_reflection = new \ReflectionProperty($this->update, 'http_client'); + $client_reflection->setValue($this->update, $this->http_client); + + $result = $this->update->download('http://example.com/update.zip', '/path/to/storage'); + $this->assertTrue($result); + } + + public function test_download_failure() + { + $this->http_client->expects($this->once()) + ->method('request') + ->willReturnCallback(function ($method, $url, $options) + { + throw new ClientException('bad client', new \GuzzleHttp\Psr7\Request($method, $url)); + }); + $client_reflection = new \ReflectionProperty($this->update, 'http_client'); + $client_reflection->setValue($this->update, $this->http_client); + + $result = $this->update->download('http://example.com/update.zip', '/path/to/storage'); + $this->assertFalse($result); + } + + public function test_validate_success() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertTrue($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_file_not_exist() + { + $file_path = __DIR__ . '/../tmp/download.zip'; + $signature_path = __DIR__ . '/../tmp/signature.sig'; + + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($file_path, $signature_path)); + } + + public function test_validate_sig_not_exist() + { + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_file_not_accessible() + { + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + chmod($this->file_path, 0000); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + + chmod($this->file_path, 0666); + } + + public function test_validate_sig_not_accessible() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + chmod($this->signature_path, 0000); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + + chmod($this->signature_path, 0666); + } + + public function test_validate_sig_not_base64() + { + $keypair = sodium_crypto_sign_keypair(); + + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + file_put_contents($this->signature_path, 'SGVsbG8gV29ybGQ==='); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_invalid_pub_key() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, '!not!base64'); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_fail() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + + // Recreate keypair for different public key + $keypair = sodium_crypto_sign_keypair(); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_validate_invalid_pub_key_length() + { + $keypair = sodium_crypto_sign_keypair(); + + $secret_key = sodium_crypto_sign_secretkey($keypair); + $public_key = base64_encode(sodium_crypto_sign_publickey($keypair) . 'Foo='); + + file_put_contents($this->file_path, 'test file content'); + + $hash = hash_file('sha384', $this->file_path, true); + file_put_contents($this->signature_path, base64_encode(sodium_crypto_sign_detached($hash, $secret_key))); + + $client_reflection = new \ReflectionProperty($this->update, 'public_key'); + $client_reflection->setValue($this->update, $public_key); + + $this->assertFalse($this->update->validate($this->file_path, $this->signature_path)); + } + + public function test_extract_success() + { + $this->zipper->expects($this->once()) + ->method('open') + ->with('/path/to/zipfile.zip') + ->willReturn(true); + + $this->zipper->expects($this->once()) + ->method('extractTo') + ->with('/path/to/extract') + ->willReturn(true); + + $this->zipper->expects($this->once()) + ->method('close'); + + $zipperReflection = new \ReflectionProperty($this->update, 'zipper'); + $zipperReflection->setValue($this->update, $this->zipper); + + $result = $this->update->extract('/path/to/zipfile.zip', '/path/to/extract'); + $this->assertTrue($result); + } + + public function test_extract_failure() + { + $this->zipper->expects($this->once()) + ->method('open') + ->with('/path/to/zipfile.zip') + ->willReturn(false); + + $zipperReflection = new \ReflectionProperty($this->update, 'zipper'); + $zipperReflection->setValue($this->update, $this->zipper); + + $result = $this->update->extract('/path/to/zipfile.zip', '/path/to/extract'); + $this->assertFalse($result); + } + + public function test_copy_success() + { + $this->filesystem->expects($this->once()) + ->method('mirror') + ->with('/source/dir', $this->phpbb_root_path); + + $result = $this->update->copy('/source/dir'); + $this->assertTrue($result); + } + + public function test_copy_failure() + { + $this->filesystem->expects($this->once()) + ->method('mirror') + ->willThrowException(new filesystem_exception()); + + $result = $this->update->copy('/source/dir'); + $this->assertFalse($result); + } +} From 1157c414109c4e462ba5dcfb5bd5ec5580ba7c34 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 30 Oct 2024 21:30:47 +0100 Subject: [PATCH 0616/1214] [ticket/15851] Skip unreadable file tests on windows PHPBB-15851 --- tests/update/get_updates_test.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/update/get_updates_test.php b/tests/update/get_updates_test.php index 01b76aa5f46..b21a53659d6 100644 --- a/tests/update/get_updates_test.php +++ b/tests/update/get_updates_test.php @@ -142,6 +142,11 @@ public function test_validate_sig_not_exist() public function test_validate_file_not_accessible() { + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') + { + $this->markTestSkipped('Unable to test unreadable files on Windows'); + } + $keypair = sodium_crypto_sign_keypair(); $public_key = base64_encode(sodium_crypto_sign_publickey($keypair)); @@ -160,6 +165,11 @@ public function test_validate_file_not_accessible() public function test_validate_sig_not_accessible() { + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') + { + $this->markTestSkipped('Unable to test unreadable files on Windows'); + } + $keypair = sodium_crypto_sign_keypair(); $secret_key = sodium_crypto_sign_secretkey($keypair); From cc488c8b7d99e504a14d982ca8fa96b8f61af5b8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 2 Dec 2024 20:12:20 +0100 Subject: [PATCH 0617/1214] [ticket/15851] Modify language variables PHPBB-15851 --- phpBB/language/en/install.php | 8 ++++---- phpBB/phpbb/update/controller.php | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index f355d1427a9..9a73b76c421 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -222,11 +222,11 @@

    We noticed that the last update of your phpBB installation hasn’t been completed. Visit the database updater, ensure Update database only is selected and click on Submit. Don\'t forget to delete the "install"-directory after you have updated the database successfully.

    ', // Auto update - 'COULD_NOT_DOWNLOAD_UPDATE_PACKAGE' => 'Failed to download the update package.', - 'COULD_NOT_DOWNLOAD_UPDATE_SIGNATURE' => 'Failed to download the update package signature.', + 'UPDATE_PACKAGE_DOWNLOAD_FAILURE' => 'Failed to download the update package.', + 'UPDATE_SIGNATURE_DOWNLOAD_FAILURE' => 'Failed to download the update package signature.', 'UPDATE_SIGNATURE_INVALID' => 'The update package is corrupted.', - 'COULD_NOT_EXTRACT_UPDATE' => 'Could not extract files from the update package.', - 'COULD_NOT_WRITE_UPDATE_FILES' => 'Could not copy files from the update package.', + 'UPDATE_PACKAGE_EXTRACT_FAILURE' => 'Could not extract files from the update package.', + 'UPDATE_FILES_COPY_FAILURE' => 'Could not copy files from the update package.', // // Server data diff --git a/phpBB/phpbb/update/controller.php b/phpBB/phpbb/update/controller.php index 5253f2b3d39..45d11d2f0c0 100644 --- a/phpBB/phpbb/update/controller.php +++ b/phpBB/phpbb/update/controller.php @@ -68,7 +68,7 @@ public function handle(string $download): array { return [ 'status' => 'error', - 'error' => $this->language->lang('COULD_NOT_DOWNLOAD_UPDATE_PACKAGE') + 'error' => $this->language->lang('UPDATE_PACKAGE_DOWNLOAD_FAILURE') ]; } @@ -82,7 +82,7 @@ public function handle(string $download): array { return [ 'status' => 'error', - 'error' => $this->language->lang('COULD_NOT_DOWNLOAD_UPDATE_SIGNATURE') + 'error' => $this->language->lang('UPDATE_SIGNATURE_DOWNLOAD_FAILURE') ]; } return $status; @@ -104,7 +104,7 @@ public function handle(string $download): array { return [ 'status' => 'error', - 'error' => $this->language->lang('COULD_NOT_EXTRACT_UPDATE') + 'error' => $this->language->lang('UPDATE_PACKAGE_EXTRACT_FAILURE') ]; } @@ -118,7 +118,7 @@ public function handle(string $download): array { return [ 'status' => 'error', - 'error' => $this->language->lang('COULD_NOT_WRITE_UPDATE_FILES') + 'error' => $this->language->lang('UPDATE_FILES_COPY_FAILURE') ]; } From 6eacf68047d24b7cf12a8a50112158e19b318e49 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 4 Dec 2024 21:05:30 +0100 Subject: [PATCH 0618/1214] [ticket/15851] Add controller error_response and tests PHPBB-15851 --- phpBB/phpbb/update/controller.php | 50 ++--- tests/update/controller_test.php | 351 ++++++++++++++++++++++++++++++ 2 files changed, 376 insertions(+), 25 deletions(-) create mode 100644 tests/update/controller_test.php diff --git a/phpBB/phpbb/update/controller.php b/phpBB/phpbb/update/controller.php index 45d11d2f0c0..cdbc53495b9 100644 --- a/phpBB/phpbb/update/controller.php +++ b/phpBB/phpbb/update/controller.php @@ -53,7 +53,7 @@ public function __construct( /** * Handle requests. * - * @param string $download The download URL. + * @param string $download The download URL. * * @return string[] Unencoded json response. */ @@ -61,65 +61,51 @@ public function handle(string $download): array { $update_path = $this->phpbb_root_path . 'store/update.zip'; $status = ['status' => 'continue']; - if (!file_exists($update_path)) + if (!$this->filesystem->exists($update_path)) { $result = $this->updater->download($download, $update_path); if (!$result) { - return [ - 'status' => 'error', - 'error' => $this->language->lang('UPDATE_PACKAGE_DOWNLOAD_FAILURE') - ]; + return $this->error_response('UPDATE_PACKAGE_DOWNLOAD_FAILURE'); } return $status; } - if (!file_exists($update_path . '.sig')) + if (!$this->filesystem->exists($update_path . '.sig')) { $result = $this->updater->download($download . '.sig', $update_path . '.sig'); if (!$result) { - return [ - 'status' => 'error', - 'error' => $this->language->lang('UPDATE_SIGNATURE_DOWNLOAD_FAILURE') - ]; + return $this->error_response('UPDATE_SIGNATURE_DOWNLOAD_FAILURE'); } + return $status; } - if (!is_dir($this->phpbb_root_path . 'store/update')) + if (!$this->filesystem->exists($this->phpbb_root_path . 'store/update') || !is_dir($this->phpbb_root_path . 'store/update')) { $result = $this->updater->validate($update_path, $update_path . '.sig'); if (!$result) { - return [ - 'status' => 'error', - 'error' => $this->language->lang('UPDATE_SIGNATURE_INVALID') - ]; + return $this->error_response('UPDATE_SIGNATURE_INVALID'); } $result = $this->updater->extract($update_path, $this->phpbb_root_path . 'store/update'); if (!$result) { - return [ - 'status' => 'error', - 'error' => $this->language->lang('UPDATE_PACKAGE_EXTRACT_FAILURE') - ]; + return $this->error_response('UPDATE_PACKAGE_EXTRACT_FAILURE'); } return $status; } - if (!is_dir($this->phpbb_root_path . 'install')) + if (!$this->filesystem->exists($this->phpbb_root_path . 'install') || !is_dir($this->phpbb_root_path . 'install')) { $result = $this->updater->copy($this->phpbb_root_path . 'store/update'); if (!$result) { - return [ - 'status' => 'error', - 'error' => $this->language->lang('UPDATE_FILES_COPY_FAILURE') - ]; + return $this->error_response('UPDATE_FILES_COPY_FAILURE'); } return $status; @@ -134,4 +120,18 @@ public function handle(string $download): array $status['status'] = 'done'; return $status; } + + /** + * Create error response + * + * @param string $error_key + * @return array Error response + */ + protected function error_response(string $error_key): array + { + return [ + 'status' => 'error', + 'error' => $this->language->lang($error_key), + ]; + } } diff --git a/tests/update/controller_test.php b/tests/update/controller_test.php new file mode 100644 index 00000000000..bba0186b7f7 --- /dev/null +++ b/tests/update/controller_test.php @@ -0,0 +1,351 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\update\controller; +use phpbb\update\get_updates; +use phpbb\filesystem\filesystem; +use phpbb\language\language; + +class phpbb_update_controller_test extends \phpbb_test_case +{ + private $filesystem; + private $filesystem_mock; + private $updater_mock; + private $language_mock; + private $phpbb_root_path; + + protected function setUp(): void + { + global $phpbb_root_path; + + $this->filesystem = new filesystem(); + $this->filesystem_mock = $this->createMock(filesystem::class); + $this->updater_mock = $this->createMock(get_updates::class); + $this->language_mock = $this->createMock(language::class); + $this->phpbb_root_path = $phpbb_root_path; + } + + protected function tearDown(): void + { + $this->filesystem->remove([ + $this->phpbb_root_path . 'store/update.zip', + $this->phpbb_root_path . 'store/update.zip.sig', + $this->phpbb_root_path . 'store/update', + ]); + } + + public function test_download_fails(): void + { + $this->updater_mock->expects($this->once()) + ->method('download') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_PACKAGE_DOWNLOAD_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_PACKAGE_DOWNLOAD_FAILURE'], $response); + } + + public function test_download_success(): void + { + $this->updater_mock->expects($this->once()) + ->method('download') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_download_signature_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', false], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('download') + ->with('https://example.com/update.zip.sig', $update_path . '.sig') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_SIGNATURE_DOWNLOAD_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_SIGNATURE_DOWNLOAD_FAILURE'], $response); + } + + public function test_download_signature_success(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', false], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('download') + ->with('https://example.com/update.zip.sig', $update_path . '.sig') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_signature_validation_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('validate') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_SIGNATURE_INVALID') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_SIGNATURE_INVALID'], $response); + } + + public function test_extract_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('validate') + ->willReturn(true); + + $this->updater_mock->expects($this->once()) + ->method('extract') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_PACKAGE_EXTRACT_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_PACKAGE_EXTRACT_FAILURE'], $response); + } + + public function test_extract_success(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', false], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('validate') + ->willReturn(true); + + $this->updater_mock->expects($this->once()) + ->method('extract') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_copy_fails(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $this->filesystem->touch($update_path); // Simulate existing update file + $this->filesystem->touch($update_path . '.sig'); // Simulate existing signature file + $this->filesystem->mkdir($this->phpbb_root_path . 'store/update'); + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', true], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('copy') + ->willReturn(false); + + $this->language_mock->expects($this->once()) + ->method('lang') + ->with('UPDATE_FILES_COPY_FAILURE') + ->willReturnArgument(0); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'error', 'error' => 'UPDATE_FILES_COPY_FAILURE'], $response); + } + + public function test_copy_success(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $this->filesystem->touch($update_path); // Simulate existing update file + $this->filesystem->touch($update_path . '.sig'); // Simulate existing signature file + $this->filesystem->mkdir($this->phpbb_root_path . 'store/update'); + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', true], + [$this->phpbb_root_path . 'install', false], + ]); + + $this->updater_mock->expects($this->once()) + ->method('copy') + ->willReturn(true); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'continue'], $response); + } + + public function test_successful_update_process(): void + { + $update_path = $this->phpbb_root_path . 'store/update.zip'; + $signature_path = $update_path . '.sig'; + $update_dir = $this->phpbb_root_path . 'store/update'; + + $this->filesystem->touch($update_path); + $this->filesystem->touch($signature_path); + $this->filesystem->mkdir($update_dir); + + $this->filesystem_mock->expects($this->any()) + ->method('exists') + ->willReturnMap([ + [$update_path, true], + [$update_path . '.sig', true], + [$this->phpbb_root_path . 'store/update', true], + [$this->phpbb_root_path . 'install', true], + ]); + + $this->filesystem_mock->expects($this->once()) + ->method('remove') + ->with([$update_dir, $update_path, $signature_path]); + + $controller = new controller( + $this->filesystem_mock, + $this->updater_mock, + $this->language_mock, + $this->phpbb_root_path + ); + + $response = $controller->handle('https://example.com/update.zip'); + $this->assertEquals(['status' => 'done'], $response); + } +} \ No newline at end of file From 8b1ee790d68f7f40395fcba4558cdad6a31e93c8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 13 Feb 2025 19:58:26 +0100 Subject: [PATCH 0619/1214] [ticket/15851] Fix lock file hash PHPBB-15851 --- phpBB/composer.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 754690b1e4f..8be1f6e4092 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "2ce7bc4e8f61d065ff471afa38f12394", + "content-hash": "96d8bdaa91db532b0a0bf5e1b6c0ec31", "packages": [ { "name": "bantu/ini-get-wrapper", From f5bb065a4d02ac6daca5b48064585aeed11646ff Mon Sep 17 00:00:00 2001 From: Daniel James Date: Tue, 25 Jun 2024 16:36:49 +0100 Subject: [PATCH 0620/1214] [ticket/17326] Add font icon field for custom BBCodes Adds a new field to the custom BBCode add/edit form that allows admins to define a Font Awesome icon to be displayed instead of the BBCodes name on the posting.php editor page. PHPBB-17326 --- phpBB/adm/style/acp_bbcodes.html | 11 ++++ phpBB/adm/style/admin.js | 5 ++ phpBB/includes/acp/acp_bbcodes.php | 16 +++++- phpBB/includes/functions_display.php | 3 +- phpBB/language/en/acp/posting.php | 3 ++ phpBB/language/en/common.php | 1 + .../data/v400/add_bbcode_font_icon.php | 51 +++++++++++++++++++ .../prosilver/template/posting_buttons.html | 6 ++- 8 files changed, 92 insertions(+), 4 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 234ec5a42b7..8bc0b5fdc2f 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -47,6 +47,17 @@

    {L_ACP_BBCODES}

    • +
    + {{ lang('APPEARANCE') }} +
    +

    {{ lang('BBCODE_FONT_ICON_EXPLAIN') }}
    +
    + + {{ Icon('font', BBCODE_FONT_ICON, '', false, '', {'id':'bbcode_icon_preview'}) }} +
    +
    +
    +
    diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index a5c090d8c02..1ff1b02d749 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -277,5 +277,10 @@ function parse_document(container) $('.actions a:has(i.acp-icon)').mouseover(function () { $(this).css("text-decoration", "none"); }); + + // Live update BBCode font icon preview + $('#bbcode_font_icon').on('keyup', function(e) { + $('#bbcode_icon_preview').attr('class', "o-icon o-icon-font fa-fw fas icon fa-" + $(this).val()); + }); }); })(jQuery); diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index a9053540408..66ef3627aba 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -44,12 +44,12 @@ function main($id, $mode) switch ($action) { case 'add': - $bbcode_match = $bbcode_tpl = $bbcode_helpline = ''; + $bbcode_match = $bbcode_tpl = $bbcode_helpline = $bbcode_font_icon = ''; $display_on_posting = 0; break; case 'edit': - $sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline + $sql = 'SELECT bbcode_match, bbcode_tpl, display_on_posting, bbcode_helpline, bbcode_font_icon FROM ' . BBCODES_TABLE . ' WHERE bbcode_id = ' . $bbcode_id; $result = $db->sql_query($sql); @@ -65,6 +65,7 @@ function main($id, $mode) $bbcode_tpl = htmlspecialchars($row['bbcode_tpl'], ENT_COMPAT); $display_on_posting = $row['display_on_posting']; $bbcode_helpline = $row['bbcode_helpline']; + $bbcode_font_icon = $row['bbcode_font_icon']; break; case 'modify': @@ -88,6 +89,7 @@ function main($id, $mode) $bbcode_match = $request->variable('bbcode_match', ''); $bbcode_tpl = html_entity_decode($request->variable('bbcode_tpl', '', true), ENT_COMPAT); $bbcode_helpline = $request->variable('bbcode_helpline', '', true); + $bbcode_font_icon = $request->variable('bbcode_font_icon', ''); break; } @@ -106,6 +108,7 @@ function main($id, $mode) 'BBCODE_MATCH' => $bbcode_match, 'BBCODE_TPL' => $bbcode_tpl, 'BBCODE_HELPLINE' => $bbcode_helpline, + 'BBCODE_FONT_ICON' => $bbcode_font_icon, 'DISPLAY_ON_POSTING' => $display_on_posting, ); @@ -157,6 +160,7 @@ function main($id, $mode) * @var string bbcode_match The bbcode usage string to match * @var string bbcode_tpl The bbcode HTML replacement string * @var string bbcode_helpline The bbcode help line string + * @var string bbcode_font_icon The name of the Font Awesome BBCode icon * @var array hidden_fields Array of hidden fields for use when * submitting form when $warn_unsafe is true * @since 3.1.0-a3 @@ -169,6 +173,7 @@ function main($id, $mode) 'bbcode_match', 'bbcode_tpl', 'bbcode_helpline', + 'bbcode_font_icon', 'hidden_fields', ); extract($phpbb_dispatcher->trigger_event('core.acp_bbcodes_modify_create', compact($vars))); @@ -232,6 +237,11 @@ function main($id, $mode) trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } + if (strlen($bbcode_font_icon) > 50) + { + trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); + } + /** * Replace Emojis and other 4bit UTF-8 chars not allowed by MySQL to UCR/NCR. * Using their Numeric Character Reference's Hexadecimal notation. @@ -244,6 +254,7 @@ function main($id, $mode) 'bbcode_tpl' => $bbcode_tpl, 'display_on_posting' => $display_on_posting, 'bbcode_helpline' => $bbcode_helpline, + 'bbcode_font_icon' => $bbcode_font_icon, 'first_pass_match' => $data['first_pass_match'], 'first_pass_replace' => $data['first_pass_replace'], 'second_pass_match' => $data['second_pass_match'], @@ -328,6 +339,7 @@ function main($id, $mode) 'bbcode_match' => $bbcode_match, 'bbcode_tpl' => htmlspecialchars($bbcode_tpl, ENT_COMPAT), 'bbcode_helpline' => $bbcode_helpline, + 'bbcode_font_icon' => $bbcode_font_icon, 'display_on_posting' => $display_on_posting, ))) , 'confirm_bbcode.html'); diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index 7a4e70f944f..e8f49f03292 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1081,7 +1081,7 @@ function display_custom_bbcodes() $num_predefined_bbcodes = NUM_PREDEFINED_BBCODES; $sql_ary = [ - 'SELECT' => 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline, b.bbcode_match', + 'SELECT' => 'b.bbcode_id, b.bbcode_tag, b.bbcode_helpline, b.bbcode_font_icon, b.bbcode_match', 'FROM' => [BBCODES_TABLE => 'b'], 'WHERE' => 'b.display_on_posting = 1', 'ORDER_BY' => 'b.bbcode_tag', @@ -1124,6 +1124,7 @@ function display_custom_bbcodes() 'BBCODE_TAG' => $row['bbcode_tag'], 'BBCODE_TAG_CLEAN' => str_replace('=', '-', $row['bbcode_tag']), 'BBCODE_HELPLINE' => $row['bbcode_helpline'], + 'BBCODE_FONT_ICON' => $row['bbcode_font_icon'], ]; /** diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index f252864eb66..c219b1a46ab 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -53,6 +53,9 @@ 'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouse over text of the BBCode.', 'BBCODE_HELPLINE_TEXT' => 'Help line text', 'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.', + 'BBCODE_FONT_ICON' => 'BBCode icon', + 'BBCODE_FONT_ICON_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. Click here to view the list of available icons.', + 'BBCODE_FONT_ICON_TOO_LONG' => 'The icon name you have entered is too long.', 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', 'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index d528ef9b2b8..20e7acff91c 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -78,6 +78,7 @@ 'ALL_TOPICS' => 'All Topics', 'ALT_TEXT' => 'Alternative text', 'AND' => 'And', + 'APPEARANCE' => 'Appearance', 'ARE_WATCHING_FORUM' => 'You have subscribed to be notified of new posts in this forum.', 'ARE_WATCHING_TOPIC' => 'You have subscribed to be notified of new posts in this topic.', 'ASCENDING' => 'Ascending', diff --git a/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php new file mode 100644 index 00000000000..1a580dde8c3 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php @@ -0,0 +1,51 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v400; + +class add_bbcode_font_icon extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return $this->db_tools->sql_column_exists($this->table_prefix . 'bbcodes', 'bbcode_font_icon'); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v400\dev' + ]; + } + + public function update_schema() + { + return [ + 'add_columns' => [ + $this->table_prefix . 'bbcodes' => [ + 'bbcode_font_icon' => ['VCHAR:50', ''], + ], + ], + ]; + } + + public function revert_schema() + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'bbcodes' => [ + 'bbcode_font_icon', + ], + ], + ]; + } +} diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index ee98cb57ce8..03824ee7c77 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -97,7 +97,11 @@
    From 1729e3f52b3dcbd7c35cdff6241f38192e997515 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 26 Jun 2024 13:19:00 +0100 Subject: [PATCH 0621/1214] [ticket/17326] Add missing ending tag from template file PHPBB-17326 --- phpBB/styles/prosilver/template/posting_buttons.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 03824ee7c77..85e05a0d491 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -101,7 +101,7 @@ {{ Icon('font', custom_tags.BBCODE_FONT_ICON, '', false, custom_tags.BBCODE_TAG_CLEAN) }} {% else %} {{ custom_tags.BBCODE_TAG }} - {% + {% endif %}
    From c2725b441cf40c7f025bbe745e0180223552e1b6 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 20:57:23 +0100 Subject: [PATCH 0622/1214] [ticket/17326] Change column length of icon and update ACP language PHPBB-17326 --- phpBB/adm/style/acp_bbcodes.html | 2 +- phpBB/includes/acp/acp_bbcodes.php | 13 +++++++------ phpBB/language/en/acp/posting.php | 2 +- .../db/migration/data/v400/add_bbcode_font_icon.php | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index 8bc0b5fdc2f..af957ed372d 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -50,7 +50,7 @@

    {L_ACP_BBCODES}

    {{ lang('APPEARANCE') }}
    -

    {{ lang('BBCODE_FONT_ICON_EXPLAIN') }}
    +

    {L_BBCODE_FONT_ICON_EXPLAIN}
    {{ Icon('font', BBCODE_FONT_ICON, '', false, '', {'id':'bbcode_icon_preview'}) }} diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 66ef3627aba..e28c1f6155c 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -104,12 +104,13 @@ function main($id, $mode) 'U_BACK' => $this->u_action, 'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''), - 'L_BBCODE_USAGE_EXPLAIN'=> sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), - 'BBCODE_MATCH' => $bbcode_match, - 'BBCODE_TPL' => $bbcode_tpl, - 'BBCODE_HELPLINE' => $bbcode_helpline, - 'BBCODE_FONT_ICON' => $bbcode_font_icon, - 'DISPLAY_ON_POSTING' => $display_on_posting, + 'L_BBCODE_USAGE_EXPLAIN' => sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), + 'L_BBCODE_FONT_ICON_EXPLAIN' => sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), + 'BBCODE_MATCH' => $bbcode_match, + 'BBCODE_TPL' => $bbcode_tpl, + 'BBCODE_HELPLINE' => $bbcode_helpline, + 'BBCODE_FONT_ICON' => $bbcode_font_icon, + 'DISPLAY_ON_POSTING' => $display_on_posting, ); $bbcode_tokens = array('TEXT', 'SIMPLETEXT', 'INTTEXT', 'IDENTIFIER', 'NUMBER', 'EMAIL', 'URL', 'LOCAL_URL', 'RELATIVE_URL', 'COLOR'); diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index c219b1a46ab..b03a83956f6 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -54,7 +54,7 @@ 'BBCODE_HELPLINE_TEXT' => 'Help line text', 'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.', 'BBCODE_FONT_ICON' => 'BBCode icon', - 'BBCODE_FONT_ICON_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. Click here to view the list of available icons.', + 'BBCODE_FONT_ICON_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. %1$sClick here%2$s to view the list of available icons. Only solid style icons are supported.', 'BBCODE_FONT_ICON_TOO_LONG' => 'The icon name you have entered is too long.', 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', diff --git a/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php index 1a580dde8c3..183b5d91db9 100644 --- a/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php +++ b/phpBB/phpbb/db/migration/data/v400/add_bbcode_font_icon.php @@ -32,7 +32,7 @@ public function update_schema() return [ 'add_columns' => [ $this->table_prefix . 'bbcodes' => [ - 'bbcode_font_icon' => ['VCHAR:50', ''], + 'bbcode_font_icon' => ['VCHAR:64', ''], ], ], ]; From bb956539a46b53092ff8fd8c0bc61da10a2099a4 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 21:01:09 +0100 Subject: [PATCH 0623/1214] [ticket/17326] Add php preg check on bbcode font icon name PHPBB-17326 --- phpBB/includes/acp/acp_bbcodes.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index e28c1f6155c..d9a4ae98221 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -238,7 +238,7 @@ function main($id, $mode) trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } - if (strlen($bbcode_font_icon) > 50) + if (strlen($bbcode_font_icon) > 64 && preg_match('/^[A-Za-z0-9-]+$/', $bbcode_font_icon)) { trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } From 53d7fff391cc9dc0b1dfa097b431ddadd43f544b Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 12 Aug 2024 21:05:09 +0100 Subject: [PATCH 0624/1214] [ticket/17326] Update regex checks for font icon in php and js files PHPBB-17326 --- phpBB/adm/style/admin.js | 5 ++++- phpBB/includes/acp/acp_bbcodes.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 1ff1b02d749..2ae75db062e 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -280,7 +280,10 @@ function parse_document(container) // Live update BBCode font icon preview $('#bbcode_font_icon').on('keyup', function(e) { - $('#bbcode_icon_preview').attr('class', "o-icon o-icon-font fa-fw fas icon fa-" + $(this).val()); + const iconName = $(this).val(); + if (iconName.match(/^[\w-]+$/)) { + $('#bbcode_icon_preview').attr('class', "o-icon o-icon-font fa-fw fas icon fa-" + $(this).val()); + } }); }); })(jQuery); diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index d9a4ae98221..58d86c940d4 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -238,7 +238,7 @@ function main($id, $mode) trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } - if (strlen($bbcode_font_icon) > 64 && preg_match('/^[A-Za-z0-9-]+$/', $bbcode_font_icon)) + if (strlen($bbcode_font_icon) > 64 && preg_match('/^[\w-]+$/', $bbcode_font_icon)) { trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } From fe3750bfb2a45884a71e91ce3d40f3ff0b13dea3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 30 Aug 2024 21:39:53 +0200 Subject: [PATCH 0625/1214] [ticket/17326] Move HTML to acp_bbcodes.html PHPBB-17326 --- phpBB/adm/style/acp_bbcodes.html | 4 ++-- phpBB/includes/acp/acp_bbcodes.php | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index af957ed372d..cb3480f9467 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -14,7 +14,7 @@

    {L_ACP_BBCODES}

    {L_BBCODE_USAGE} -

    {L_BBCODE_USAGE_EXPLAIN}

    +

    {{ lang('BBCODE_USAGE_EXPLAIN', '', '') }}



    {L_BBCODE_USAGE_EXAMPLE}
    @@ -50,7 +50,7 @@

    {L_ACP_BBCODES}

    {{ lang('APPEARANCE') }}
    -

    {L_BBCODE_FONT_ICON_EXPLAIN}
    +

    {{ lang('BBCODE_FONT_ICON_EXPLAIN', '', '') }}
    {{ Icon('font', BBCODE_FONT_ICON, '', false, '', {'id':'bbcode_icon_preview'}) }} diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 58d86c940d4..ee97631d2e1 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -104,8 +104,6 @@ function main($id, $mode) 'U_BACK' => $this->u_action, 'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''), - 'L_BBCODE_USAGE_EXPLAIN' => sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), - 'L_BBCODE_FONT_ICON_EXPLAIN' => sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), 'BBCODE_MATCH' => $bbcode_match, 'BBCODE_TPL' => $bbcode_tpl, 'BBCODE_HELPLINE' => $bbcode_helpline, From 97728da9be70a90bb7da3786aa9faded1c67eea1 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 1 Sep 2024 16:10:45 +0100 Subject: [PATCH 0626/1214] [ticket/17326] Replace language string for invalid icon names PHPBB-17326 --- phpBB/includes/acp/acp_bbcodes.php | 4 ++-- phpBB/language/en/acp/posting.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index ee97631d2e1..291151ab6f9 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -236,9 +236,9 @@ function main($id, $mode) trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } - if (strlen($bbcode_font_icon) > 64 && preg_match('/^[\w-]+$/', $bbcode_font_icon)) + if (strlen($bbcode_font_icon) > 64 || preg_match('/^[\w-]+$/', $bbcode_font_icon)) { - trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); + trigger_error($user->lang['BBCODE_FONT_ICON_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); } /** diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index b03a83956f6..5ce331388da 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -55,7 +55,7 @@ 'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.', 'BBCODE_FONT_ICON' => 'BBCode icon', 'BBCODE_FONT_ICON_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. %1$sClick here%2$s to view the list of available icons. Only solid style icons are supported.', - 'BBCODE_FONT_ICON_TOO_LONG' => 'The icon name you have entered is too long.', + 'BBCODE_FONT_ICON_INVALID' => 'The icon name you have entered is too long.', 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', 'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.', From 220b655150b5c950a7b69a6e428492c772d40ced Mon Sep 17 00:00:00 2001 From: Daniel James Date: Fri, 7 Feb 2025 17:02:26 +0000 Subject: [PATCH 0627/1214] [ticket/17326] Updated js to use same as pages ext and fixed icon bug PHPBB-17326 --- phpBB/adm/style/acp_bbcodes.html | 2 +- phpBB/adm/style/admin.js | 23 ++++++++++++++++++----- phpBB/includes/acp/acp_bbcodes.php | 2 +- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/phpBB/adm/style/acp_bbcodes.html b/phpBB/adm/style/acp_bbcodes.html index cb3480f9467..aade2f8aac7 100644 --- a/phpBB/adm/style/acp_bbcodes.html +++ b/phpBB/adm/style/acp_bbcodes.html @@ -53,7 +53,7 @@

    {L_ACP_BBCODES}


    {{ lang('BBCODE_FONT_ICON_EXPLAIN', '', '') }}
    - {{ Icon('font', BBCODE_FONT_ICON, '', false, '', {'id':'bbcode_icon_preview'}) }} + {{ Icon('font', ' ', '', false, '', {'id':'bbcode_icon_preview'}) }}
    diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 2ae75db062e..f53329b5a72 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -279,11 +279,24 @@ function parse_document(container) }); // Live update BBCode font icon preview - $('#bbcode_font_icon').on('keyup', function(e) { - const iconName = $(this).val(); - if (iconName.match(/^[\w-]+$/)) { - $('#bbcode_icon_preview').attr('class', "o-icon o-icon-font fa-fw fas icon fa-" + $(this).val()); - } + const updateIconClass = (element, newClass) => { + element.classList.forEach(className => { + if (className.startsWith('fa-') && className !== 'fa-fw') { + element.classList.remove(className); + } + }); + + element.classList.add(`fa-${newClass}`); + }; + + const pageIconFont = document.getElementById('bbcode_font_icon'); + + pageIconFont.addEventListener('keyup', function() { + updateIconClass(this.nextElementSibling, this.value); + }); + + pageIconFont.addEventListener('blur', function() { + updateIconClass(this.nextElementSibling, this.value); }); }); })(jQuery); diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 291151ab6f9..6fb2dfbb9a7 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -103,7 +103,7 @@ function main($id, $mode) 'S_EDIT_BBCODE' => true, 'U_BACK' => $this->u_action, 'U_ACTION' => $this->u_action . '&action=' . (($action == 'add') ? 'create' : 'modify') . (($bbcode_id) ? "&bbcode=$bbcode_id" : ''), - + 'L_BBCODE_USAGE_EXPLAIN' => sprintf($user->lang['BBCODE_USAGE_EXPLAIN'], '', ''), 'BBCODE_MATCH' => $bbcode_match, 'BBCODE_TPL' => $bbcode_tpl, 'BBCODE_HELPLINE' => $bbcode_helpline, From bf15d1ea420ebe7bd69bcd58520d73197ef2d871 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Feb 2025 10:42:47 +0100 Subject: [PATCH 0628/1214] [ticket/17326] Check for existence of font icon element before use PHPBB-17326 --- phpBB/adm/style/admin.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index f53329b5a72..f308bf9c121 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -291,12 +291,14 @@ function parse_document(container) const pageIconFont = document.getElementById('bbcode_font_icon'); - pageIconFont.addEventListener('keyup', function() { - updateIconClass(this.nextElementSibling, this.value); - }); + if (pageIconFont) { + pageIconFont.addEventListener('keyup', function () { + updateIconClass(this.nextElementSibling, this.value); + }); - pageIconFont.addEventListener('blur', function() { - updateIconClass(this.nextElementSibling, this.value); - }); + pageIconFont.addEventListener('blur', function () { + updateIconClass(this.nextElementSibling, this.value); + }); + } }); })(jQuery); From 29c19bb764da89eea691bdd9aeabcfaa13d1cc9a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Feb 2025 10:44:08 +0100 Subject: [PATCH 0629/1214] [ticket/17326] Differentiate between invalid and too long icon name PHPBB-17326 --- phpBB/includes/acp/acp_bbcodes.php | 7 ++++++- phpBB/language/en/acp/posting.php | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 6fb2dfbb9a7..ee3dffd4614 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -236,7 +236,12 @@ function main($id, $mode) trigger_error($user->lang['BBCODE_HELPLINE_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } - if (strlen($bbcode_font_icon) > 64 || preg_match('/^[\w-]+$/', $bbcode_font_icon)) + if (strlen($bbcode_font_icon) > 64) + { + trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); + } + + if (!empty($bbcode_font_icon) && !preg_match('/^[\w-]+$/', $bbcode_font_icon)) { trigger_error($user->lang['BBCODE_FONT_ICON_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); } diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 5ce331388da..6420f9aa199 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -55,8 +55,8 @@ 'BBCODE_HELPLINE_TOO_LONG' => 'The help line you entered is too long.', 'BBCODE_FONT_ICON' => 'BBCode icon', 'BBCODE_FONT_ICON_EXPLAIN' => 'Enter the name of a Font Awesome icon (without the fa prefix) to display instead of the BBCode name appearing on the button. %1$sClick here%2$s to view the list of available icons. Only solid style icons are supported.', - 'BBCODE_FONT_ICON_INVALID' => 'The icon name you have entered is too long.', - + 'BBCODE_FONT_ICON_INVALID' => 'The icon name you have entered is invalid.', + 'BBCODE_FONT_ICON_TOO_LONG' => 'The icon name you have entered is too long.', 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected already exists.', 'BBCODE_INVALID' => 'Your BBCode is constructed in an invalid form.', 'BBCODE_INVALID_TEMPLATE' => 'Your BBCode’s template is invalid.', From 68c4e22886ec239f6d45f3f432df1eabebd8f5fa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Feb 2025 11:09:22 +0100 Subject: [PATCH 0630/1214] [ticket/17326] Extend acp bbcodes test for font icon PHPBB-17326 --- tests/functional/acp_bbcodes_test.php | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tests/functional/acp_bbcodes_test.php b/tests/functional/acp_bbcodes_test.php index bdf79206150..ac73091a79b 100644 --- a/tests/functional/acp_bbcodes_test.php +++ b/tests/functional/acp_bbcodes_test.php @@ -24,8 +24,9 @@ public function test_htmlspecialchars() // Create the BBCode $crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&sid=' . $this->sid . '&mode=bbcodes&action=add'); $form = $crawler->selectButton('Submit')->form(array( - 'bbcode_match' => '[mod="{TEXT1}"]{TEXT2}[/mod]', - 'bbcode_tpl' => '
    {TEXT1}
    {TEXT2}
    ' + 'bbcode_match' => '[mod="{TEXT1}"]{TEXT2}[/mod]', + 'bbcode_tpl' => '
    {TEXT1}
    {TEXT2}
    ', + 'bbcode_font_icon' => 'user', )); self::submit($form); @@ -47,15 +48,16 @@ public function test_htmlspecialchars() /** * @dataProvider get_bbcode_error_tests */ - public function test_bbcode_error($match, $tpl, $error) + public function test_bbcode_error($match, $tpl, $icon, $error) { $this->login(); $this->admin_login(); $crawler = self::request('GET', 'adm/index.php?i=acp_bbcodes&sid=' . $this->sid . '&mode=bbcodes&action=add'); $form = $crawler->selectButton('Submit')->form([ - 'bbcode_match' => $match, - 'bbcode_tpl' => $tpl + 'bbcode_match' => $match, + 'bbcode_tpl' => $tpl, + 'bbcode_font_icon' => $icon, ]); $crawler = self::submit($form); @@ -69,18 +71,33 @@ public function get_bbcode_error_tests() [ 'XXX', '', + '', 'BBCode is constructed in an invalid form' ], [ '[x]{TEXT}[/x]', '{TEXT}', + '', 'unsafe' ], + 'icon name too long' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
    {TEXT1}
    {TEXT2}
    ', + str_repeat('a', 65), + 'is too long', + ], + 'icon name invalid' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
    {TEXT1}
    {TEXT2}
    ', + 'Not a valid icon name', + 'is invalid', + ], ]; } } From 67e2b328163f63af0949b54c023206e6fbab6aa6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Feb 2025 20:21:25 +0100 Subject: [PATCH 0631/1214] [ticket/17326] Ignore invalid class names PHPBB-17326 --- phpBB/adm/style/admin.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index f308bf9c121..3d37b0c331d 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -280,6 +280,12 @@ function parse_document(container) // Live update BBCode font icon preview const updateIconClass = (element, newClass) => { + // Ignore invalid class names + const faIconRegex = /^(?!-)(?!.*--)[a-z0-9-]+(? { if (className.startsWith('fa-') && className !== 'fa-fw') { element.classList.remove(className); From 1e76b0df0e1450c35bab6160b703d32bfb267324 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 15 Feb 2025 20:24:07 +0100 Subject: [PATCH 0632/1214] [ticket/17326] Use same regex in icon name validation in PHP PHPBB-17326 --- phpBB/includes/acp/acp_bbcodes.php | 2 +- tests/functional/acp_bbcodes_test.php | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index ee3dffd4614..723a13d1db0 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -241,7 +241,7 @@ function main($id, $mode) trigger_error($user->lang['BBCODE_FONT_ICON_TOO_LONG'] . adm_back_link($this->u_action), E_USER_WARNING); } - if (!empty($bbcode_font_icon) && !preg_match('/^[\w-]+$/', $bbcode_font_icon)) + if (!empty($bbcode_font_icon) && !preg_match('/^(?!-)(?!.*--)[a-z0-9-]+(?lang['BBCODE_FONT_ICON_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING); } diff --git a/tests/functional/acp_bbcodes_test.php b/tests/functional/acp_bbcodes_test.php index ac73091a79b..dd0d356a58e 100644 --- a/tests/functional/acp_bbcodes_test.php +++ b/tests/functional/acp_bbcodes_test.php @@ -98,6 +98,18 @@ public function get_bbcode_error_tests() 'Not a valid icon name', 'is invalid', ], + 'icon name invalid double dash' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
    {TEXT1}
    {TEXT2}
    ', + 'us--er', + 'is invalid', + ], + 'icon name invalid trailing dash' => [ + '[mod2="{TEXT1}"]{TEXT2}[/mod2]', + '
    {TEXT1}
    {TEXT2}
    ', + 'user-', + 'is invalid', + ], ]; } } From bfdf1729923c72facab81d2499ea72ce039594ad Mon Sep 17 00:00:00 2001 From: Neo-CTC <92761505+Neo-CTC@users.noreply.github.com> Date: Sun, 16 Feb 2025 00:09:45 -0600 Subject: [PATCH 0633/1214] [ticket/17470] Feed enable config not enforced The 'feed_enable' config is never checked before generating the feeds. The effective result is that feeds are always enabled, regardless of the setting. PHPBB-17470 --- phpBB/phpbb/feed/controller/feed.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php index 7e88f18a980..b65e1d9c9bc 100644 --- a/phpBB/phpbb/feed/controller/feed.php +++ b/phpBB/phpbb/feed/controller/feed.php @@ -123,6 +123,12 @@ public function __construct(Environment $twig, symfony_request $request, control $this->template = $twig; $this->language = $language; $this->phpbb_dispatcher = $phpbb_dispatcher; + + // Feeds are disabled, no need to continue + if (!$this->config['feed_enable']) + { + $this->send_unavailable(); + } } /** From 183110789a05d9a3ae8f6739c64c39e9b5c109ff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 16 Feb 2025 09:13:26 +0100 Subject: [PATCH 0634/1214] [ticket/17326] Add changed info for core.acp_bbcodes_modify_create event PHPBB-17326 --- phpBB/includes/acp/acp_bbcodes.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 723a13d1db0..b49d74985f5 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -163,6 +163,7 @@ function main($id, $mode) * @var array hidden_fields Array of hidden fields for use when * submitting form when $warn_unsafe is true * @since 3.1.0-a3 + * @changed 4.0.0-a1 Added bbcode_font_icon */ $vars = array( 'action', From f42c4be939368e0d397b6af9965d8cdedb1107e7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 16 Feb 2025 12:00:36 +0100 Subject: [PATCH 0635/1214] [ticket/17470] Check feed enabled in each handler and add tests PHPBB-17470 --- phpBB/phpbb/feed/controller/feed.php | 38 +++++++++++++++++++++++----- tests/functional/feed_test.php | 23 +++++++++++++++++ 2 files changed, 55 insertions(+), 6 deletions(-) diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php index b65e1d9c9bc..a12e12756de 100644 --- a/phpBB/phpbb/feed/controller/feed.php +++ b/phpBB/phpbb/feed/controller/feed.php @@ -123,12 +123,6 @@ public function __construct(Environment $twig, symfony_request $request, control $this->template = $twig; $this->language = $language; $this->phpbb_dispatcher = $phpbb_dispatcher; - - // Feeds are disabled, no need to continue - if (!$this->config['feed_enable']) - { - $this->send_unavailable(); - } } /** @@ -140,6 +134,8 @@ public function __construct(Environment $twig, symfony_request $request, control */ public function forums() { + $this->check_enabled(); + if (!$this->config['feed_overall_forums']) { $this->send_unavailable(); @@ -157,6 +153,8 @@ public function forums() */ public function news() { + $this->check_enabled(); + // Get at least one news forum $sql = 'SELECT forum_id FROM ' . FORUMS_TABLE . ' @@ -182,6 +180,8 @@ public function news() */ public function topics() { + $this->check_enabled(); + if (!$this->config['feed_topics_new']) { $this->send_unavailable(); @@ -199,6 +199,8 @@ public function topics() */ public function topics_new() { + $this->check_enabled(); + return $this->topics(); } @@ -211,6 +213,8 @@ public function topics_new() */ public function topics_active() { + $this->check_enabled(); + if (!$this->config['feed_topics_active']) { $this->send_unavailable(); @@ -230,6 +234,8 @@ public function topics_active() */ public function forum($forum_id) { + $this->check_enabled(); + if (!$this->config['feed_forum']) { $this->send_unavailable(); @@ -249,6 +255,8 @@ public function forum($forum_id) */ public function topic($topic_id) { + $this->check_enabled(); + if (!$this->config['feed_topic']) { $this->send_unavailable(); @@ -266,6 +274,8 @@ public function topic($topic_id) */ public function overall() { + $this->check_enabled(); + if (!$this->config['feed_overall']) { $this->send_unavailable(); @@ -413,6 +423,22 @@ protected function send_feed_do(feed_interface $feed) return $response; } + /** + * Check if feeds are enabled in the configuration. + * + * @throws http_exception If feeds are disabled. + * + * @return void + */ + protected function check_enabled() + { + // Feeds are disabled, no need to continue + if (!$this->config['feed_enable']) + { + throw new http_exception(404, 'NO_FEED_ENABLED'); + } + } + /** * Throw and exception saying that the feed isn't available * diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index 157aaae9e86..37dea63a66f 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -261,6 +261,29 @@ public function test_create_exclude_topic() $this->data['topics']['Feeds #exclude - Topic #1'] = (int) $post['topic_id']; } + public function test_feeds_disabled() + { + $this->login(); + $this->admin_login(); + + // Disable feeds in ACP + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed"); + $form = $crawler->selectButton('Submit')->form(); + $crawler = self::submit($form, ['config[feed_enable]' => false]); + self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + + // Assert that feeds aren't available + $crawler = self::request('GET', 'app.php/feed/overall', array(), false); + self::assert_response_status_code(404); + $this->assertContainsLang('NO_FEED_ENABLED', $crawler->text()); + + // Enable feeds again in ACP + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed"); + $form = $crawler->selectButton('Submit')->form(); + $crawler = self::submit($form, ['config[feed_enable]' => true]); + self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + } + public function test_feeds_exclude() { $this->load_ids(array( From 77f83306b568f92cbc6d7b59a218b4c60d9ad7a5 Mon Sep 17 00:00:00 2001 From: cabot Date: Sun, 16 Feb 2025 16:08:49 +0100 Subject: [PATCH 0636/1214] [ticket/17471] Fix feed link href for feed icon PHPBB-17471 --- phpBB/styles/prosilver/template/forumlist_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html index 785e02c30a5..40ffee77bc8 100644 --- a/phpBB/styles/prosilver/template/forumlist_body.html +++ b/phpBB/styles/prosilver/template/forumlist_body.html @@ -37,7 +37,7 @@
    From 2fa5da145437eb23363aa4a5e76be3ce57db1ccc Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 19 Feb 2025 21:45:47 +0700 Subject: [PATCH 0637/1214] [ticket/17470] Fix feed functional tests for master Symfony DomCrawler component validates form values and throws InvalidArgumentException for impossible values set. PHPBB-17470 --- tests/functional/feed_test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index 37dea63a66f..ee3c8a1085b 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -269,7 +269,7 @@ public function test_feeds_disabled() // Disable feeds in ACP $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed"); $form = $crawler->selectButton('Submit')->form(); - $crawler = self::submit($form, ['config[feed_enable]' => false]); + $crawler = self::submit($form, ['config[feed_enable]' => 0]); self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); // Assert that feeds aren't available @@ -280,7 +280,7 @@ public function test_feeds_disabled() // Enable feeds again in ACP $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=feed"); $form = $crawler->selectButton('Submit')->form(); - $crawler = self::submit($form, ['config[feed_enable]' => true]); + $crawler = self::submit($form, ['config[feed_enable]' => 1]); self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); } From 8adc853deab024e1fd562a728427c7d667f970ea Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 22 Feb 2025 13:28:43 +0700 Subject: [PATCH 0638/1214] [ticket/17461] Add core events to acp_main PHPBB-17461 --- phpBB/includes/acp/acp_main.php | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index c39e984f736..e284b291466 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -100,6 +100,20 @@ function main($id, $mode) default: $confirm = true; $confirm_lang = 'CONFIRM_OPERATION'; + + /** + * Event to add confirm box for custom ACP quick actions + * + * @event core.acp_main_add_actions_confirm + * @var string id The module ID + * @var string mode The module mode + * @var string action Custom action type name + * @var boolean confirm Do we display the confirm box to run the custom action + * @var string confirm_lang Lang var name to display in confirm box + * @since 3.3.15-RC1 + */ + $vars = ['id', 'mode', 'action', 'confirm', 'confirm_lang']; + extract($phpbb_dispatcher->trigger_event('core.acp_main_add_actions_confirm', compact($vars))); } if ($confirm) @@ -423,6 +437,19 @@ function main($id, $mode) trigger_error('PURGE_SESSIONS_SUCCESS'); } break; + + default: + /** + * Event to add custom ACP quick actions + * + * @event core.acp_main_add_actions + * @var string id The module ID + * @var string mode The module mode + * @var string action Custom action type name + * @since 3.3.15-RC1 + */ + $vars = ['id', 'mode', 'action']; + extract($phpbb_dispatcher->trigger_event('core.acp_main_add_actions', compact($vars))); } } } From 29730e49ce81d6ecbe2922085ecaa714c1bfb178 Mon Sep 17 00:00:00 2001 From: battye Date: Fri, 28 Feb 2025 03:22:08 +0000 Subject: [PATCH 0639/1214] [ticket/17381] Add migration for topic_views to ULINT PHPBB-17381 --- .../data/v33x/topic_views_update.php | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/topic_views_update.php diff --git a/phpBB/phpbb/db/migration/data/v33x/topic_views_update.php b/phpBB/phpbb/db/migration/data/v33x/topic_views_update.php new file mode 100644 index 00000000000..8402d548c45 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/topic_views_update.php @@ -0,0 +1,47 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v33x; + +class topic_views_update extends \phpbb\db\migration\migration +{ + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3314', + ]; + } + + public function update_schema(): array + { + // This extends the topic view count field so we can support much larger values. + return [ + 'change_columns' => [ + $this->table_prefix . 'topics' => [ + 'topic_views' => ['ULINT', 0], + ], + ] + ]; + } + + public function revert_schema(): array + { + return [ + 'change_columns' => [ + $this->table_prefix . 'topics' => [ + 'topic_views' => ['UINT', 0], + ], + ] + ]; + } +} From c3bb5e1bec720abb69fff57b2efa33cf911ec5cc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 28 Feb 2025 20:33:41 +0100 Subject: [PATCH 0640/1214] [ticket/security-283] Ensure text is properly handled for responsiveness SECURITY-283 --- phpBB/styles/prosilver/template/forum_fn.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 009a9de6219..ed273c8da38 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -650,7 +650,7 @@ function parseDocument($container) { html = $children.html(); } - $block.append((first ? '' : '
    ') + html); + $block.append((first ? '' : '
    ') + html); first = false; }); @@ -670,7 +670,7 @@ function parseDocument($container) { // Find all headers, get contents $list.prev('.topiclist').find('li.header dd').not('.mark').each(function() { - headers.push($(this).text()); + headers.push($("
    ").text($(this).text()).html()); headersLength++; }); @@ -707,7 +707,7 @@ function parseDocument($container) { html = headers[i] + ': ' + html + ''; } - $block.append((first ? '' : '
    ') + html); + $block.append((first ? '' : '
    ') + html); first = false; }); @@ -773,7 +773,8 @@ function parseDocument($container) { } if ((text.length && text !== '-') || cell.children().length) { - cell.prepend('' + headers[column] + ''); + const $dfnElement = $("").css('display', 'none').text(headers[column]); + cell.prepend($dfnElement); } else { cell.addClass('empty'); } From 17480d7d073b344792c3a57a613db434f358646b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 09:22:23 +0100 Subject: [PATCH 0641/1214] [ticket/security-283] Unify behavior between adm and prosilver, clean up SECURITY-283 --- phpBB/adm/style/admin.js | 14 +++++----- phpBB/adm/style/ajax.js | 29 +++++++++++++++------ phpBB/styles/prosilver/template/forum_fn.js | 5 ++-- 3 files changed, 31 insertions(+), 17 deletions(-) diff --git a/phpBB/adm/style/admin.js b/phpBB/adm/style/admin.js index 23bd4a116b8..10d2f398e06 100644 --- a/phpBB/adm/style/admin.js +++ b/phpBB/adm/style/admin.js @@ -5,7 +5,7 @@ /** * Parse document block */ -function parse_document(container) +function parse_document(container) { var test = document.createElement('div'), oldBrowser = (typeof test.style.borderRadius == 'undefined'); @@ -90,7 +90,7 @@ function parse_document(container) } }); } - + headersLength = headers.length; // Add header text to each cell as @@ -121,8 +121,8 @@ function parse_document(container) } if ((text.length && text !== '-') || cell.children().length) { - if (headers[column] != '') { - cell.prepend('' + headers[column] + ''); + if (headers[column].length) { + cell.prepend($("").css('display', 'none').text(headers[column])); } } else { @@ -143,7 +143,7 @@ function parse_document(container) */ container.find('table.responsive > tbody').each(function() { var items = $(this).children('tr'); - if (items.length == 0) + if (!items.length) { $(this).parent('table:first').addClass('responsive-hide'); } @@ -157,7 +157,7 @@ function parse_document(container) if ($this.html() == ' ') { $this.addClass('responsive-hide'); } - + }); /** @@ -184,7 +184,7 @@ function parse_document(container) var width = $body.width(), height = $this.height(); - if (arguments.length == 0 && (!responsive || width <= lastWidth) && height <= maxHeight) { + if (!arguments.length && (!responsive || width <= lastWidth) && height <= maxHeight) { return; } diff --git a/phpBB/adm/style/ajax.js b/phpBB/adm/style/ajax.js index d1007d0173c..6d6822df4d3 100644 --- a/phpBB/adm/style/ajax.js +++ b/phpBB/adm/style/ajax.js @@ -235,14 +235,20 @@ function submitPermissions() { if ($alertBoxLink) { // Remove forum_id[] from URL $alertBoxLink.attr('href', $alertBoxLink.attr('href').replace(/(&forum_id\[\]=[0-9]+)/g, '')); - var previousPageForm = '
    '; + const $previousPageForm = $('').attr({ + action: $alertBoxLink.attr('href'), + method: 'post' + }); + $.each(forumIds, function (key, value) { - previousPageForm += ''; + $previousPageForm.append($('').attr({ + type: 'text', + name: 'forum_id[]', + value: value + })); }); - previousPageForm += '
    '; $alertBoxLink.on('click', function (e) { - var $previousPageForm = $(previousPageForm); $('body').append($previousPageForm); e.preventDefault(); $previousPageForm.submit(); @@ -257,12 +263,19 @@ function submitPermissions() { setTimeout(function () { // Create forum to submit using POST. This will prevent // exceeding the maximum length of URLs - var form = '
    '; + const $form = $('').attr({ + action: res.REFRESH_DATA.url.replace(/(&forum_id\[\]=[0-9]+)/g, ''), + method: 'post' + }); + $.each(forumIds, function (key, value) { - form += ''; + $form.append($('').attr({ + type: 'text', + name: 'forum_id[]', + value: value + })); }); - form += '
    '; - $form = $(form); + $('body').append($form); // Hide the alert even if we refresh the page, in case the user diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index ed273c8da38..51478d86419 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -773,8 +773,9 @@ function parseDocument($container) { } if ((text.length && text !== '-') || cell.children().length) { - const $dfnElement = $("").css('display', 'none').text(headers[column]); - cell.prepend($dfnElement); + if (headers[column].length) { + cell.prepend($("").css('display', 'none').text(headers[column])); + } } else { cell.addClass('empty'); } From cedbbb0c769223a679f1af63c0c03b1519035606 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 16:45:36 +0100 Subject: [PATCH 0642/1214] [ticket/17478] Add security policy file PHPBB-17478 --- SECURITY.md | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 SECURITY.md diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000000..09762ad9ac8 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,24 @@ +# Security Policy + +## Supported Versions + +Only phpBB 3.3 is currently supported. The table below lists provides an overview of phpBB versions and their current support state: + +| Version | Supported | Comment | +|---------|--------------------|----------------------------------------------------------------------------------------------------| +| 4.0.x | :x: | Not released yet, still in development | +| 3.3.x | :white_check_mark: | Current stable release | +| 3.2.x | :x: | [End of Life (EoL) in Nov 2020](https://www.phpbb.com/community/viewtopic.php?t=2573411) | +| 3.1.x | :x: | [End of Life (EoL) in December 2017](https://www.phpbb.com/community/viewtopic.php?t=2453376) | +| 3.0.x | :x: | [End of Life (EoL) in November 2015](https://www.phpbb.com/community/viewtopic.php?f=14&t=2302466) | +| < 3.0 | :x: | [End of Life (EoL) in October 2008](https://www.phpbb.com/community/viewtopic.php?t=900655) | + +## Reporting a Vulnerability + +There are multiple ways a potential security vulnerability can be reported: + +- HackerOne: [phpBB | Vulnerability Disclosure Program | HackerOne](https://hackerone.com/phpbb) +- Send an email: [security@phpbb.com](mailto:security@phpbb.com) +- Create a report in the security tracker: [Security Tracker](https://www.phpbb.com/security/) + +Please provide as much detail as possible when reporting a vulnerability. You can expect to receive an update on your report within a few days. If the vulnerability is accepted, we will work on a fix and keep you informed of the progress. If the vulnerability is declined, we will provide an explanation. From be67bfbe632422ca482e529a936e9523ac7cdc8a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 17:04:16 +0100 Subject: [PATCH 0643/1214] [ticket/17478] Remove versions and reword reporting section [skip ci] PHPBB-17478 --- SECURITY.md | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 09762ad9ac8..b62f160225e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -1,24 +1,13 @@ # Security Policy -## Supported Versions - -Only phpBB 3.3 is currently supported. The table below lists provides an overview of phpBB versions and their current support state: - -| Version | Supported | Comment | -|---------|--------------------|----------------------------------------------------------------------------------------------------| -| 4.0.x | :x: | Not released yet, still in development | -| 3.3.x | :white_check_mark: | Current stable release | -| 3.2.x | :x: | [End of Life (EoL) in Nov 2020](https://www.phpbb.com/community/viewtopic.php?t=2573411) | -| 3.1.x | :x: | [End of Life (EoL) in December 2017](https://www.phpbb.com/community/viewtopic.php?t=2453376) | -| 3.0.x | :x: | [End of Life (EoL) in November 2015](https://www.phpbb.com/community/viewtopic.php?f=14&t=2302466) | -| < 3.0 | :x: | [End of Life (EoL) in October 2008](https://www.phpbb.com/community/viewtopic.php?t=900655) | - ## Reporting a Vulnerability +Please do not post potential security vulnerabilities publicly. Instead, report them to the phpBB team. +We take security very seriously and will respond to reports about potential security vulnerabilities as quickly as possible. There are multiple ways a potential security vulnerability can be reported: - HackerOne: [phpBB | Vulnerability Disclosure Program | HackerOne](https://hackerone.com/phpbb) -- Send an email: [security@phpbb.com](mailto:security@phpbb.com) - Create a report in the security tracker: [Security Tracker](https://www.phpbb.com/security/) +- Send an email: [security@phpbb.com](mailto:security@phpbb.com) Please provide as much detail as possible when reporting a vulnerability. You can expect to receive an update on your report within a few days. If the vulnerability is accepted, we will work on a fix and keep you informed of the progress. If the vulnerability is declined, we will provide an explanation. From ae40c6365ec1a5a621bb431519258aa973f70967 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:41:28 +0100 Subject: [PATCH 0644/1214] [prep-release-3.3.15] Update version numbers to 3.3.15-RC1 --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index 3c5dafcf86d..48e58c2217a 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 3734899352d..5502664c827 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.15-dev'); +@define('PHPBB_VERSION', '3.3.15-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 58bb9843701..bcb42920c13 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.14'); +define('PHPBB_VERSION', '3.3.15-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ed73c1d5328..c848e12e8e6 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 24fc7d5388b2a0d772c3d6a2cefd1f0b31482d47 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:41:36 +0100 Subject: [PATCH 0645/1214] [prep-release-3.3.15] Update version numbers to 3.3.15 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 014dc0e3702..7d4ed05bd9f 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.14', + 'phpbb_version' => '3.3.15', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index 1dfc8230b78..cf175b6d25e 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.14 -phpbb_version = 3.3.14 +style_version = 3.3.15 +phpbb_version = 3.3.15 # Defining a different template bitfield # template_bitfield = //g= From d9e4ce6ddef81acd034b3a7eb2212ed478b2537c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:45:21 +0100 Subject: [PATCH 0646/1214] [prep-release-3.3.15] Add migration for 3.3.15-RC1 --- .../phpbb/db/migration/data/v33x/v3315rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3315rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php new file mode 100644 index 00000000000..71ab26c908b --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3315rc1.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3315rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.15-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\topic_views_update', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.15-RC1']], + ]; + } +} From 66650cb0e2cfbb81b119a4019b086e69335339b2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 1 Mar 2025 21:55:15 +0100 Subject: [PATCH 0647/1214] [prep-release-3.3.15] Update changelog for 3.3.15-RC1 --- phpBB/docs/CHANGELOG.html | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4674867ecd8..06cd3c93169 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

    Changelog

    1. Changelog
        +
      • Changes since 3.3.14
      • Changes since 3.3.14-RC1
      • Changes since 3.3.13
      • Changes since 3.3.13-RC1
        • @@ -173,6 +174,32 @@

        Changelog

        +

        Changes since 3.3.14

        +

        Bug

        +
          +
        • [PHPBB-17227] - Member list sorting bug - repeating users on several pages
          • +
        • [PHPBB-17381] - 'topic_views' column overflow blocks access to the topic
          • +
        • [PHPBB-17417] - Day selection not visible when no results
          • +
        • [PHPBB-17422] - Ascending posts pagination
          • +
        • [PHPBB-17436] - PHP fatal error while converting from phpBB 2.0 with Attachment MOD
          • +
        • [PHPBB-17455] - PHP warning on MySQLi connection failure
          • +
        • [PHPBB-17463] - Extra & in unread posts search pagination
          • +
        • [PHPBB-17468] - Reset password feature is not restricted to email
          • +
        • [PHPBB-17470] - Enable feeds setting not enforced
          • +
        +

        Improvement

        +
          +
        • [PHPBB-17429] - Adding event before users have been added to a group
          • +
        • [PHPBB-17431] - Add more vars to memberlist event
          • +
        • [PHPBB-17433] - Unclear instructions in ACP, Server settings
          • +
        • [PHPBB-17443] - Various Guzzle client issues for version checks
          • +
        • [PHPBB-17446] - Add acp_account_activation_edit_add event
          • +
        • [PHPBB-17461] - Add php events for ACP main actions
          • +
        • [PHPBB-17467] - Add TLS v.1.3 support to email messenger connection
          • +
        • [PHPBB-17471] - Forum feed link in forumlist_body does not return the correct URL
          • +
        • [PHPBB-17478] - Add security policy to repository
          • +
        +

        Changes since 3.3.14-RC1

        Improvement

          From bb3d41e193547d20b42d372faed9a3d277449133 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 2 Mar 2025 17:11:26 +0100 Subject: [PATCH 0648/1214] [3.3.x] Update version numbers to 3.3.16-dev --- build/build.xml | 2 +- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/build.xml b/build/build.xml index 48e58c2217a..83a492625fd 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,7 +2,7 @@ - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 5502664c827..89ace2e439e 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.15-RC1'); +@define('PHPBB_VERSION', '3.3.16-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c848e12e8e6..f6938204c7e 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.16-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 7fd634b420b0114071b32f518d4497d7e042de49 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 3 Mar 2025 23:33:58 +0700 Subject: [PATCH 0649/1214] [ticket/17480] Fix PHP fatal error in version check failure PHPBB-17480 --- phpBB/includes/acp/acp_main.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index e284b291466..2d4cb10c734 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -485,7 +485,7 @@ function main($id, $mode) 'UPGRADE_INSTRUCTIONS' => !empty($upgrades_available) ? $user->lang('UPGRADE_INSTRUCTIONS', $upgrades_available['current'], $upgrades_available['announcement']) : false, )); } - catch (\RuntimeException $e) + catch (\phpbb\exception\runtime_exception $e) { $message = call_user_func_array(array($user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $template->assign_vars(array( From d9136469ea6a3833cf1ba7776717ec32b8bafa03 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 4 Mar 2025 01:06:46 +0700 Subject: [PATCH 0650/1214] [ticket/17480] Catch runtime_exception instead of exception_interface Catch runtime_exception instead of exception_interface for extensions version check failures. PHPBB-17480 --- phpBB/includes/acp/acp_extensions.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 277e7bdf487..0c9cdbeff4a 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -12,6 +12,7 @@ */ use phpbb\exception\exception_interface; +use phpbb\exception\runtime_exception; use phpbb\exception\version_check_exception; /** @@ -344,7 +345,7 @@ function main($id, $mode) $this->template->assign_block_vars('updates_available', $updates_available); } - catch (exception_interface $e) + catch (runtime_exception $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); @@ -423,7 +424,7 @@ public function list_enabled_exts() $enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = true; $enabled_extension_meta_data[$name]['U_VERSIONCHECK_FORCE'] = $this->u_action . '&action=details&versioncheck_force=1&ext_name=' . urlencode($md_manager->get_metadata('name')); } - catch (exception_interface $e) + catch (runtime_exception $e) { // Ignore exceptions due to the version check } @@ -433,7 +434,7 @@ public function list_enabled_exts() $enabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false; } } - catch (exception_interface $e) + catch (runtime_exception $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $this->template->assign_block_vars('disabled', array( @@ -501,7 +502,7 @@ public function list_disabled_exts() { $disabled_extension_meta_data[$name]['S_VERSIONCHECK'] = false; } - catch (exception_interface $e) + catch (runtime_exception $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $this->template->assign_block_vars('disabled', array( @@ -572,7 +573,7 @@ public function list_available_exts() { $available_extension_meta_data[$name]['S_VERSIONCHECK'] = false; } - catch (exception_interface $e) + catch (runtime_exception $e) { $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($e->getMessage()), $e->get_parameters())); $this->template->assign_block_vars('not_installed', array( From 9bdb88879da75e31883817f42b2f1f8ea54f3626 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 4 Mar 2025 09:53:19 +0700 Subject: [PATCH 0651/1214] [ticket/17480] Properly catch RuntimeException if no http handler is available PHPBB-17480 --- phpBB/phpbb/file_downloader.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index 0dcb3e58543..3f87c9c5121 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -75,8 +75,15 @@ protected function create_client(string $host, int $port = 443, int $timeout = 6 */ public function get(string $host, string $directory, string $filename, int $port = 443, int $timeout = 6) { - // Initialize Guzzle client - $client = $this->create_client($host, $port, $timeout); + try + { + // Initialize Guzzle client + $client = $this->create_client($host, $port, $timeout); + } + catch (\RuntimeException $exception) + { + throw new runtime_exception($exception->getMessage()); + } // Set default values for error variables $this->error_number = 0; From 1ea59731f047ae281d95854e4b06cf6e85b76a97 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 5 Mar 2025 10:10:29 +0700 Subject: [PATCH 0652/1214] [ticket/17480] Use phpBB error message text instead of thrown by GuzzleHTTP PHPBB-17480 --- phpBB/language/en/common.php | 1 + phpBB/phpbb/file_downloader.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5694bbd5dcf..5cdba377f59 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -357,6 +357,7 @@ 'HIDE_ME' => 'Hide my online status this session', 'HOURS' => 'Hours', 'HOME' => 'Home', + 'HTTP_HANDLER_NOT_FOUND' => 'The operation could not be completed because cURL PHP extension and allow_url_fopen PHP ini setting have been disabled and no other HTTP handler could be found.', 'ICQ' => 'ICQ', 'IF' => 'If', diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index 3f87c9c5121..e2becbfbfa1 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -82,7 +82,7 @@ public function get(string $host, string $directory, string $filename, int $port } catch (\RuntimeException $exception) { - throw new runtime_exception($exception->getMessage()); + throw new runtime_exception('HTTP_HANDLER_NOT_FOUND'); } // Set default values for error variables From 0826a41da86e5ba9ef7e36a30cbf7c811ee7b9b5 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 8 Mar 2025 11:01:47 +0700 Subject: [PATCH 0653/1214] [ticket/17480] Adjust message wording PHPBB-17480 --- phpBB/language/en/common.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5cdba377f59..f5fad1b28e3 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -357,7 +357,7 @@ 'HIDE_ME' => 'Hide my online status this session', 'HOURS' => 'Hours', 'HOME' => 'Home', - 'HTTP_HANDLER_NOT_FOUND' => 'The operation could not be completed because cURL PHP extension and allow_url_fopen PHP ini setting have been disabled and no other HTTP handler could be found.', + 'HTTP_HANDLER_NOT_FOUND' => 'The operation could not be completed because the cURL PHP extension and allow_url_fopen PHP ini setting have been disabled and no other HTTP handler could be found.', 'ICQ' => 'ICQ', 'IF' => 'If', From 14a6322b4fc88b8cd42ee455ab940081de3d7b1d Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 10 Mar 2025 21:24:15 +0700 Subject: [PATCH 0654/1214] [ticket/17475] Fix MSSQL arithmetic overflow error on counting attachments size PHPBB-17475 --- phpBB/includes/acp/acp_attachments.php | 2 +- phpBB/includes/acp/acp_forums.php | 2 +- phpBB/includes/acp/acp_main.php | 2 +- phpBB/includes/functions_convert.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php index 6b7d9f7b44d..5813f719be0 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -1077,7 +1077,7 @@ function main($id, $mode) $attachments_per_page = (int) $config['topics_per_page']; // Get total number or orphans older than 3 hours - $sql = 'SELECT COUNT(attach_id) as num_files, SUM(filesize) as total_size + $sql = 'SELECT COUNT(attach_id) as num_files, SUM(' . $this->db->cast_expr_to_bigint('filesize') . ') as total_size FROM ' . ATTACHMENTS_TABLE . ' WHERE is_orphan = 1 AND filetime < ' . (time() - 3*60*60); diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index ba3901f67a1..57677544fa4 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -2071,7 +2071,7 @@ function delete_forum_content($forum_id) $config->set('num_files', (int) $row['stat'], false); - $sql = 'SELECT SUM(filesize) as stat + $sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat FROM ' . ATTACHMENTS_TABLE; $result = $db->sql_query($sql); $row = $db->sql_fetchrow($result); diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 2d4cb10c734..9ed450ca36d 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -182,7 +182,7 @@ function main($id, $mode) $config->set('num_files', (int) $db->sql_fetchfield('stat'), false); $db->sql_freeresult($result); - $sql = 'SELECT SUM(filesize) as stat + $sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat FROM ' . ATTACHMENTS_TABLE . ' WHERE is_orphan = 0'; $result = $db->sql_query($sql); diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 1b499293d7c..f980ab200d1 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1998,7 +1998,7 @@ function update_dynamic_config() $config->set('num_files', (int) $db->sql_fetchfield('stat'), false); $db->sql_freeresult($result); - $sql = 'SELECT SUM(filesize) as stat + $sql = 'SELECT SUM(' . $db->cast_expr_to_bigint('filesize') . ') as stat FROM ' . ATTACHMENTS_TABLE . ' WHERE is_orphan = 0'; $result = $db->sql_query($sql); From 51465670f6802c20519fd7cafb7ec76b37014b68 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 23 Mar 2025 19:39:07 +0100 Subject: [PATCH 0655/1214] [prep-release-3.3.15] Update version numbers to 3.3.15 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index 48e58c2217a..7d7d9eee64b 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 5502664c827..7b2e8cca221 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.15-RC1'); +@define('PHPBB_VERSION', '3.3.15'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index bcb42920c13..6291bbbad59 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.15-RC1'); +define('PHPBB_VERSION', '3.3.15'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index c848e12e8e6..338af1160a2 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15-RC1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.15'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From fb46aa38b83a68583a093d68bdb7a6889728cb62 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 23 Mar 2025 19:41:47 +0100 Subject: [PATCH 0656/1214] [prep-release-3.3.15] Add migration for 3.3.15 --- phpBB/phpbb/db/migration/data/v33x/v3315.php | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3315.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3315.php b/phpBB/phpbb/db/migration/data/v33x/v3315.php new file mode 100644 index 00000000000..23028602f65 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3315.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3315 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.15', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3315rc1', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.15']], + ]; + } +} From b92ca5d1f808fe9f5b04b32a492abaee2e38544a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 23 Mar 2025 20:20:03 +0100 Subject: [PATCH 0657/1214] [prep-release-3.3.15] Update changelog for 3.3.15 --- phpBB/docs/CHANGELOG.html | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 06cd3c93169..3b4a42bed33 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

          Changelog

          1. Changelog
              +
            • Changes since 3.3.15-RC1
            • Changes since 3.3.14
            • Changes since 3.3.14-RC1
            • Changes since 3.3.13
              • @@ -174,6 +175,16 @@

              Changelog

              +

              Changes since 3.3.15-RC1

              +

              Bug

              +
                +
              • [PHPBB-17480] - PHP fatal error in version check failure
                • +
              +

              Security Issue

              +
                +
              • [SECURITY-283] - Use jQuery to generate HTML from page data
                • +
              +

              Changes since 3.3.14

              Bug

                From fabef37d7150956508e92b0b75bc48750ba4bf0d Mon Sep 17 00:00:00 2001 From: IdfbAn Date: Mon, 31 Mar 2025 20:36:21 +0400 Subject: [PATCH 0658/1214] [ticket/17110] Change "slanderous" to "libellous" in T&C Slander is spoken and libel is written, so "libellous" is more accurate here. PHPBB-17110 --- phpBB/language/en/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 16c2568f4b4..1f52db2901b 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -42,7 +42,7 @@

                Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “GNU General Public License v2” (hereinafter “GPL”) and can be downloaded from www.phpbb.com. The phpBB software only facilitates internet based discussions; phpBB Limited is not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: https://www.phpbb.com/.

                - You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised. + You agree not to post any abusive, obscene, vulgar, libellous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised. ', 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”). From 98a8999283727799375f78cd1572b67a16945b24 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 1 Apr 2025 10:46:29 +0700 Subject: [PATCH 0659/1214] [ticket/17486] Fix SQL error on phpBB v.3.0 to v.3.3 upgrade Ensure v310/bot_update runs after v310/avatars migration which changes user_avatar_type column type from tinyint(2) to varchar(255). PHPBB-17486 --- phpBB/phpbb/db/migration/data/v310/bot_update.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v310/bot_update.php b/phpBB/phpbb/db/migration/data/v310/bot_update.php index 39b16c68f81..73c3785a013 100644 --- a/phpBB/phpbb/db/migration/data/v310/bot_update.php +++ b/phpBB/phpbb/db/migration/data/v310/bot_update.php @@ -17,7 +17,10 @@ class bot_update extends \phpbb\db\migration\migration { static public function depends_on() { - return array('\phpbb\db\migration\data\v310\rc6'); + return array( + '\phpbb\db\migration\data\v310\rc6', + '\phpbb\db\migration\data\v310\avatars', + ); } public function update_data() From 1f1a02d086df4d650feb54d6e6da978096103eb8 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 15:46:14 +0700 Subject: [PATCH 0660/1214] [ticket/17489] Fix messenger queue won't be saved PHPBB-17489 --- phpBB/phpbb/notification/method/messenger_base.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index e4b97b7cacf..7acc608cc25 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -126,16 +126,13 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = ], $notification->get_email_template_variables())); $messenger_method->send(); + + // Save the queue in the messenger method class (has to be called or these messages could be lost) + $messenger_method->save_queue(); } } } - // Save the queue in the messenger method class (has to be called or these messages could be lost) - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->save_queue(); - } - // We're done, empty the queue $this->empty_queue(); } From 7467b567e869f940e2298cae27d71a9c0fe3aa99 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 16:03:33 +0700 Subject: [PATCH 0661/1214] [ticket/17489] Do not always set use_queue flag to true PHPBB-17489 --- phpBB/phpbb/messenger/method/email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 1bad23760c6..adf0951fec2 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -105,7 +105,7 @@ public function init(): void $this->mail_priority = symfony_email::PRIORITY_NORMAL; $this->additional_headers = []; - $this->use_queue = true; + $this->set_use_queue(); unset($this->template, $this->reply_to, $this->from); } From c23504e3c7694c4d40cacb2353b3d2cc256363c1 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 19:16:08 +0700 Subject: [PATCH 0662/1214] [ticket/17489] Fix queue for ucp_resend, add type hints to $messenger_method PHPBB-17489 --- phpBB/includes/acp/acp_email.php | 2 ++ phpBB/includes/acp/acp_inactive.php | 2 ++ phpBB/includes/ucp/ucp_activate.php | 2 ++ phpBB/includes/ucp/ucp_resend.php | 10 ++++------ phpBB/phpbb/message/message.php | 2 ++ phpBB/phpbb/messenger/queue.php | 2 ++ phpBB/phpbb/notification/method/messenger_base.php | 1 + 7 files changed, 15 insertions(+), 6 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 00ce89317cd..1e412d04619 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -227,6 +227,7 @@ function main($id, $mode) $used_lang = $email_list[$i][0]['lang']; $used_method = $email_list[$i][0]['method']; + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { $notify_method = $messenger_method->get_id(); @@ -272,6 +273,7 @@ function main($id, $mode) if ($use_queue) { + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->save_queue(); diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 2436277e15c..641beb4d0e6 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -205,6 +205,7 @@ function main($id, $mode) do { + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) @@ -227,6 +228,7 @@ function main($id, $mode) } while ($row = $db->sql_fetchrow($result)); + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->save_queue(); diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index c9dd3e553e2..55006047218 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -133,6 +133,8 @@ function main($id, $mode) $messenger = $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); + + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 76e748e85d3..259eaf97ef6 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -138,6 +138,7 @@ function main($id, $mode) $messenger_collection_iterator = $messenger->getIterator(); while ($row = $db->sql_fetchrow($result)) { + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); @@ -153,16 +154,13 @@ function main($id, $mode) ]); $messenger_method->send(); + + // Save the queue in the messenger method class (has to be called or these messages could be lost) + $messenger_method->save_queue(); } } } $db->sql_freeresult($result); - - // Save the queue in the messenger method class (has to be called or these messages could be lost) - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->save_queue(); - } } $this->update_activation_expiration(); diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 90b8a1ff5f6..581ba17e46c 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -249,6 +249,8 @@ public function send(\phpbb\di\service_collection $messenger, $contact) { /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $messenger->getIterator(); + + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php index abcc29c1bd7..50384bfd820 100644 --- a/phpBB/phpbb/messenger/queue.php +++ b/phpBB/phpbb/messenger/queue.php @@ -116,6 +116,8 @@ public function process(): void /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger_method_collection->getIterator(); + + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { if (isset($this->queue_data[$messenger_method->get_queue_object_name()])) diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 7acc608cc25..e59176a8a20 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -114,6 +114,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = continue; } + /** @var \phpbb\messenger\method\base $messenger_method */ foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH) From d99c3838dfbcb3acf86db3eb087384863cd89f2b Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 20:57:24 +0700 Subject: [PATCH 0663/1214] [ticket/17489] Ignore Psalm UndefinedMethod issue Psalm fails with UndefinedMethod issue when a method of a child class does not exist in parent/abstract/interface class. Ignore the issue. PHPBB-17489 --- phpBB/includes/acp/acp_email.php | 10 ++++++++-- phpBB/includes/acp/acp_inactive.php | 10 ++++++++-- phpBB/includes/ucp/ucp_activate.php | 5 ++++- phpBB/includes/ucp/ucp_resend.php | 5 ++++- phpBB/phpbb/message/message.php | 5 ++++- phpBB/phpbb/messenger/queue.php | 5 ++++- phpBB/phpbb/notification/method/messenger_base.php | 5 ++++- 7 files changed, 36 insertions(+), 9 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 1e412d04619..591700f66d6 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -227,7 +227,10 @@ function main($id, $mode) $used_lang = $email_list[$i][0]['lang']; $used_method = $email_list[$i][0]['method']; - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { $notify_method = $messenger_method->get_id(); @@ -273,7 +276,10 @@ function main($id, $mode) if ($use_queue) { - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->save_queue(); diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 641beb4d0e6..935df27c14a 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -205,7 +205,10 @@ function main($id, $mode) do { - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) @@ -228,7 +231,10 @@ function main($id, $mode) } while ($row = $db->sql_fetchrow($result)); - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->save_queue(); diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 55006047218..81036c19568 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -134,7 +134,10 @@ function main($id, $mode) $messenger = $phpbb_container->get('messenger.method_collection'); $messenger_collection_iterator = $messenger->getIterator(); - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 259eaf97ef6..4ae14e0ba88 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -138,7 +138,10 @@ function main($id, $mode) $messenger_collection_iterator = $messenger->getIterator(); while ($row = $db->sql_fetchrow($result)) { - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 581ba17e46c..b1d95cf5b83 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -250,7 +250,10 @@ public function send(\phpbb\di\service_collection $messenger, $contact) /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $messenger->getIterator(); - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); diff --git a/phpBB/phpbb/messenger/queue.php b/phpBB/phpbb/messenger/queue.php index 50384bfd820..648dd751820 100644 --- a/phpBB/phpbb/messenger/queue.php +++ b/phpBB/phpbb/messenger/queue.php @@ -117,7 +117,10 @@ public function process(): void /** @psalm-suppress InvalidTemplateParam */ $messenger_collection_iterator = $this->messenger_method_collection->getIterator(); - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { if (isset($this->queue_data[$messenger_method->get_queue_object_name()])) diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index e59176a8a20..165735e56c4 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -114,7 +114,10 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = continue; } - /** @var \phpbb\messenger\method\base $messenger_method */ + /** + * @var \phpbb\messenger\method\messenger_interface $messenger_method + * @psalm-suppress UndefinedMethod + */ foreach ($messenger_collection_iterator as $messenger_method) { if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH) From 67265efc0d1f074b9549075de1382a211d65b7bd Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 10:26:50 +0700 Subject: [PATCH 0664/1214] [ticket/17487] Fix PHP uncaught exception on sending email via board PHPBB-17487 --- phpBB/phpbb/message/message.php | 20 ++++++++++++-------- phpBB/phpbb/messenger/method/email.php | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index b1d95cf5b83..ea6da8419a9 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -263,15 +263,19 @@ public function send(\phpbb\di\service_collection $messenger, $contact) $messenger_method->set_addresses($recipient); $messenger_method->reply_to($this->sender_address); - $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); - $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); - if ($this->sender_id) + if (isset($messenger_method->headers) && $messenger_method->headers instanceof \Symfony\Component\Mime\Header\Headers) { - $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); - } - if ($this->sender_username) - { - $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); + $messenger_method->headers->addHeader('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger_method->headers->addHeader('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + if ($this->sender_id) + { + $messenger_method->headers->addHeader('X-AntiAbuse', 'User_id - ' . $this->sender_id); + } + + if ($this->sender_username) + { + $messenger_method->headers->addHeader('X-AntiAbuse', 'Username - ' . $this->sender_username); + } } $messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT)); diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index adf0951fec2..78059174b32 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -47,7 +47,7 @@ class email extends base protected $from; /** @var Headers */ - protected $headers; + public $headers; /** * @var int From 21314a34a64c1bbf14e149c7602ca8d7d437a881 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 11:41:59 +0700 Subject: [PATCH 0665/1214] [ticket/17487] Add functional test for sending email via board PHPBB-17487 --- tests/functional/memberlist_test.php | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index 3e40ddc528a..5497c240375 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -134,4 +134,29 @@ public function test_group_rank() unlink(__DIR__ . '/../../phpBB/images/ranks/valid.jpg'); } + + public function test_email() + { + $this->login(); + $this->admin_login(); + $this->add_lang(['acp/board', 'acp/common', 'memberlist']); + + $crawler = self::request('GET', "adm/index.php?sid={$this->sid}&i=acp_board&mode=email"); + $form = $crawler->selectButton('Submit')->form([ + 'config[board_email_form]' => 1, + ]); + $crawler = self::submit($form); + $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); + + $crawler = self::request('GET', 'memberlist.php?mode=email&u=2'); + $this->assertStringContainsString($this->lang('SEND_EMAIL_USER', 'admin'), $crawler->filter('.titlespace')->text()); + + $form = $crawler->selectButton($this->lang('SEND_EMAIL'))->form([ + 'subject' => 'Test email form message', + 'message' => 'This is a test email message sent from a member profile email form.', + ]); + $crawler = self::submit($form); + + $this->assertContainsLang('EMAIL_SENT', $crawler->text()); + } } From cebc19f2ed201a11078ca538dc377be868e580c0 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 3 Apr 2025 22:15:37 +0700 Subject: [PATCH 0666/1214] [ticket/17487] Add wrapper method to add headers to interface PHPBB-17487 --- phpBB/phpbb/message/message.php | 8 ++++---- phpBB/phpbb/messenger/method/base.php | 8 ++++++++ phpBB/phpbb/messenger/method/email.php | 20 +++++++++++++------ .../messenger/method/messenger_interface.php | 11 ++++++++++ 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index ea6da8419a9..1248e3b39df 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -265,16 +265,16 @@ public function send(\phpbb\di\service_collection $messenger, $contact) if (isset($messenger_method->headers) && $messenger_method->headers instanceof \Symfony\Component\Mime\Header\Headers) { - $messenger_method->headers->addHeader('X-AntiAbuse', 'Board servername - ' . $this->server_name); - $messenger_method->headers->addHeader('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); if ($this->sender_id) { - $messenger_method->headers->addHeader('X-AntiAbuse', 'User_id - ' . $this->sender_id); + $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); } if ($this->sender_username) { - $messenger_method->headers->addHeader('X-AntiAbuse', 'Username - ' . $this->sender_username); + $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); } } diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 46d676013cf..c0c2a94d0d9 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -481,4 +481,12 @@ protected function set_template_paths(string|array $path_name, string|array $pat $this->setup_template(); $this->template->set_custom_style($path_name, $paths); } + + /** + * {@inheritdoc} + */ + public function header(string $header_name, mixed $header_value): void + { + return; + } } diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 78059174b32..87ad9114c1d 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -47,7 +47,7 @@ class email extends base protected $from; /** @var Headers */ - public $headers; + protected $headers; /** * @var int @@ -242,10 +242,10 @@ public function subject(string $subject = ''): void */ public function anti_abuse_headers(\phpbb\config\config $config, \phpbb\user $user): void { - $this->headers->addHeader('X-AntiAbuse', 'Board servername - ' . $config['server_name']); - $this->headers->addHeader('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); - $this->headers->addHeader('X-AntiAbuse', 'Username - ' . $user->data['username']); - $this->headers->addHeader('X-AntiAbuse', 'User IP - ' . $user->ip); + $this->header('X-AntiAbuse', 'Board servername - ' . $config['server_name']); + $this->header('X-AntiAbuse', 'User_id - ' . $user->data['user_id']); + $this->header('X-AntiAbuse', 'Username - ' . $user->data['username']); + $this->header('X-AntiAbuse', 'User IP - ' . $user->ip); } /** @@ -313,7 +313,7 @@ protected function build_headers(): void foreach ($headers as $header => $value) { - $this->headers->addHeader($header, $value); + $this->header($header, $value); } } @@ -576,4 +576,12 @@ public function send(): bool return true; } + + /** + * {@inheritdoc} + */ + public function header(string $header_name, mixed $header_value): void + { + $this->headers->addHeader($header_name, $header_value); + } } diff --git a/phpBB/phpbb/messenger/method/messenger_interface.php b/phpBB/phpbb/messenger/method/messenger_interface.php index b733f3d3d4d..6d82f89b6f3 100644 --- a/phpBB/phpbb/messenger/method/messenger_interface.php +++ b/phpBB/phpbb/messenger/method/messenger_interface.php @@ -64,5 +64,16 @@ public function send(): bool; * * @return void */ + public function error(string $msg): void; + + /** + * Add message header + * + * @param string $header_name Message header name + * @param mixed $header_value Message header value + * + * @return void + */ + public function header(string $header_name, mixed $header_value): void; } From f9e6385e84e6f8102b347eade20fd9595c545366 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 4 Apr 2025 00:04:45 +0700 Subject: [PATCH 0667/1214] [ticket/17489] Further queue logic adjustments Saving queue is not needed if use_queue flag is set to false as in this case the message should be set immediately in the runtime. PHPBB-17487 PHPBB-17489 --- phpBB/includes/acp/acp_email.php | 13 +------------ phpBB/includes/acp/acp_inactive.php | 10 +--------- phpBB/includes/ucp/ucp_resend.php | 3 --- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 591700f66d6..dfe58eb3187 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -269,23 +269,12 @@ function main($id, $mode) } $errored = !$messenger_method->send() || $errored; + $messenger_method->save_queue(); } } } unset($email_list); - if ($use_queue) - { - /** - * @var \phpbb\messenger\method\messenger_interface $messenger_method - * @psalm-suppress UndefinedMethod - */ - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->save_queue(); - } - } - if ($generate_log_entry) { if (!empty($usernames)) diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 935df27c14a..e1a511852bc 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -223,6 +223,7 @@ function main($id, $mode) ]); $messenger_method->send(); + $messenger_method->save_queue(); } } @@ -231,15 +232,6 @@ function main($id, $mode) } while ($row = $db->sql_fetchrow($result)); - /** - * @var \phpbb\messenger\method\messenger_interface $messenger_method - * @psalm-suppress UndefinedMethod - */ - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->save_queue(); - } - // Add the remind state to the database and increase activation expiration by one day $sql = 'UPDATE ' . USERS_TABLE . ' SET user_reminded = user_reminded + 1, diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 4ae14e0ba88..43e26567e5e 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -157,9 +157,6 @@ function main($id, $mode) ]); $messenger_method->send(); - - // Save the queue in the messenger method class (has to be called or these messages could be lost) - $messenger_method->save_queue(); } } } From 43d34880ac55c737e38d7b532b0558841da7b8fd Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 4 Apr 2025 00:50:15 +0700 Subject: [PATCH 0668/1214] [ticket/17489] Remove unneeded headers check PHPBB-17487 PHPBB-17489 --- phpBB/phpbb/message/message.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 1248e3b39df..900ef103c58 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -263,19 +263,16 @@ public function send(\phpbb\di\service_collection $messenger, $contact) $messenger_method->set_addresses($recipient); $messenger_method->reply_to($this->sender_address); - if (isset($messenger_method->headers) && $messenger_method->headers instanceof \Symfony\Component\Mime\Header\Headers) + $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + if ($this->sender_id) { - $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); - $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); - if ($this->sender_id) - { - $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); - } + $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); + } - if ($this->sender_username) - { - $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); - } + if ($this->sender_username) + { + $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); } $messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT)); From 692c96978a1358fd7cd5efb917f238a233231c0e Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 4 Apr 2025 12:26:08 +0700 Subject: [PATCH 0669/1214] [ticket/17488] Fix PHP error when MySQL PDO driver is not enabled Check pdo_mysql extension for being loaded to use respective \PDO::MYSQL_ATTR_FOUND_ROWS constant. PHPBB-17488 --- phpBB/phpbb/db/doctrine/connection_parameter_factory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php index 4899f916f48..f9008616ca5 100644 --- a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php @@ -164,7 +164,7 @@ private static function enrich_parameters(array $params) : array ], ]; - if ($params['driver'] === 'pdo_mysql') + if ($params['driver'] === 'pdo_mysql' && extension_loaded('pdo_mysql')) { $enrichment_tags['pdo_mysql'][\PDO::MYSQL_ATTR_FOUND_ROWS] = true; } From 2e08d01b5e689d31565239cf09ee61278b19cce5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Apr 2025 14:16:11 +0200 Subject: [PATCH 0670/1214] [ticket/17490] Add unit tests file for email method PHPBB-17490 --- tests/messenger/method_email_test.php | 389 ++++++++++++++++++++++++++ 1 file changed, 389 insertions(+) create mode 100644 tests/messenger/method_email_test.php diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php new file mode 100644 index 00000000000..a053658378b --- /dev/null +++ b/tests/messenger/method_email_test.php @@ -0,0 +1,389 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\language\language; +use phpbb\language\language_file_loader; +use phpbb\messenger\method\email; +use phpbb\messenger\queue; +use phpbb\path_helper; +use phpbb\symfony_request; +use phpbb\template\assets_bag; + +class phpbb_messenger_method_email_test extends \phpbb_test_case +{ + protected config $config; + protected queue $queue; + protected $request; + + public function setUp(): void + { + global $phpbb_root_path, $phpEx; + + $assets_bag = new assets_bag(); + $cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $this->config = new config([]); + $dispatcher = new \phpbb_mock_event_dispatcher(); + $filesystem = new \phpbb\filesystem\filesystem(); + $language = new language(new language_file_loader($phpbb_root_path, $phpEx)); + $this->queue = $this->createMock(queue::class); + $this->request = new phpbb_mock_request(); + $user = new \phpbb\user($language, '\phpbb\datetime'); + $path_helper = new path_helper( + new symfony_request( + new phpbb_mock_request() + ), + $this->request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container = new phpbb_mock_container_builder; + $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig = new \phpbb\template\twig\environment( + $assets_bag, + $this->config, + $filesystem, + $path_helper, + $cache_path, + null, + new \phpbb\template\twig\loader(''), + $dispatcher, + array( + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ) + ); + $twig_lexer = new \phpbb\template\twig\lexer($twig); + $extension_manager = new phpbb_mock_extension_manager( + __DIR__ . '/', + array( + 'vendor2/foo' => array( + 'ext_name' => 'vendor2/foo', + 'ext_active' => '1', + 'ext_path' => 'ext/vendor2/foo/', + ), + ) + ); + $log = $this->createMock(\phpbb\log\log_interface::class); + + $this->method_email = new email( + $assets_bag, + $this->config, + $dispatcher, + $language, + $this->queue, + $path_helper, + $this->request, + $twig_extensions_collection, + $twig_lexer, + $user, + $phpbb_root_path, + $cache_path, + $extension_manager, + $log + ); + } + + public function test_miscellaneous(): void + { + $this->assertEquals(email::NOTIFY_EMAIL, $this->method_email->get_id()); + $this->assertEquals('email', $this->method_email->get_queue_object_name()); + $this->assertFalse($this->method_email->is_enabled()); + $this->config->offsetSet('email_enable', true); + $this->assertTrue($this->method_email->is_enabled()); + } + + public function test_set_dsn_from_config() + { + $config_values = [ + 'smtp_delivery' => true, + 'smtp_host' => 'smtp.example.com', + 'smtp_username' => 'user', + 'smtp_password' => 'pass', + 'smtp_port' => 587, + ]; + foreach ($config_values as $key => $value) + { + $this->config->set($key, $value); + } + + $this->method_email->set_dsn(); + $this->assertEquals('smtp://user:pass@smtp.example.com:587', $this->method_email->get_dsn()); + + $this->config->set('smtp_host', ''); + $this->method_email->set_dsn(); + $this->assertEquals('null://null', $this->method_email->get_dsn()); + } + + public function test_set_dns() + { + $this->assertEquals('', $this->method_email->get_dsn()); + $this->method_email->set_dsn(''); + $this->assertEquals('sendmail://default', $this->method_email->get_dsn()); + + $this->method_email->set_dsn('smtp://user:pass1@smtp.example.com:587'); + $this->assertEquals('smtp://user:pass1@smtp.example.com:587', $this->method_email->get_dsn()); + } + + public function test_set_transport() + { + $this->assertNull($this->method_email->get_transport()); + $this->assertEmpty($this->method_email->get_dsn()); + + $config_values = [ + 'smtp_delivery' => true, + 'smtp_host' => 'smtp.example.com', + 'smtp_username' => 'user', + 'smtp_password' => 'pass', + 'smtp_port' => 587, + 'smtp_verify_peer' => true, + 'smtp_verify_peer_name' => true, + 'smtp_allow_self_signed' => false, + ]; + foreach ($config_values as $key => $value) + { + $this->config->set($key, $value); + } + + $this->method_email->set_transport(); + + // set_dsn() should have been called in set_transport() + $this->assertEquals('smtp://user:pass@smtp.example.com:587', $this->method_email->get_dsn()); + + $transport = $this->method_email->get_transport(); + $this->assertInstanceOf('\Symfony\Component\Mailer\Transport\Smtp\SmtpTransport', $transport); + if (method_exists($transport->getStream(), 'getStreamOptions')) + { + $this->assertEquals([ + 'verify_peer' => true, + 'verify_peer_name' => true, + 'allow_self_signed' => false, + ], $transport->getStream()->getStreamOptions()['ssl'] ?? null); + } + } + + public function test_init() + { + $this->config->set('email_package_size', 100); + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->assertNull($email_property->getValue($this->method_email)); + + $use_queue_property = $email_reflection->getProperty('use_queue'); + $this->assertFalse($use_queue_property->getValue($this->method_email)); + + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + $this->assertTrue($use_queue_property->getValue($this->method_email)); + $this->assertEmpty($email->getTo()); + + $this->method_email->to('foo@bar.com'); + $this->assertNotEmpty($email->getTo()); + + $this->method_email->init(); + + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + $this->assertEmpty($email->getTo()); + } + + public function test_set_addresses() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + $this->method_email->set_addresses([]); + $this->assertEmpty($email->getTo()); + + $this->method_email->set_addresses(['user_email' => 'foo@bar.com']); + $this->assertNotEmpty($email->getTo()); + $this->assertEquals('foo@bar.com', $email->getTo()[0]->getAddress()); + $this->assertEmpty($email->getTo()[0]->getName()); + + $this->method_email->set_addresses(['user_email' => 'bar@foo.com', 'username' => 'Bar Foo']); + + $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); + } + + public function test_to() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getTo()); + $this->method_email->to(''); + $this->assertEmpty($email->getTo()); + + // Valid address + $this->method_email->to('foo@bar.com'); + $this->assertNotEmpty($email->getTo()); + $this->assertEquals('foo@bar.com', $email->getTo()[0]->getAddress()); + $this->assertEmpty($email->getTo()[0]->getName()); + + // Valid address with name + $this->method_email->to('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); + if (DIRECTORY_SEPARATOR == '\\') + { + $this->assertEmpty($email->getTo()[1]->getName()); + } + else + { + $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); + } + } + + public function test_cc() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getCc()); + $this->method_email->cc(''); + $this->assertEmpty($email->getCc()); + + // Valid address + $this->method_email->cc('foo@bar.com'); + $this->assertNotEmpty($email->getCc()); + $this->assertEquals('foo@bar.com', $email->getCc()[0]->getAddress()); + $this->assertEmpty($email->getCc()[0]->getName()); + + // Valid address with name + $this->method_email->cc('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getCc()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getCc()[1]->getName()); + } + + public function test_bcc() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getBcc()); + $this->method_email->bcc(''); + $this->assertEmpty($email->getBcc()); + + // Valid address + $this->method_email->bcc('foo@bar.com'); + $this->assertNotEmpty($email->getBcc()); + $this->assertEquals('foo@bar.com', $email->getBcc()[0]->getAddress()); + $this->assertEmpty($email->getBcc()[0]->getName()); + + // Valid address with name + $this->method_email->bcc('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getBcc()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getBcc()[1]->getName()); + } + + public function test_reply_to() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getReplyTo()); + $this->method_email->reply_to(''); + $this->assertEmpty($email->getReplyTo()); + + // Valid address + $this->method_email->reply_to('foo@bar.com'); + $this->assertNotEmpty($email->getReplyTo()); + $this->assertEquals('foo@bar.com', $email->getReplyTo()[0]->getAddress()); + $this->assertEmpty($email->getReplyTo()[0]->getName()); + + // Valid address with name + $this->method_email->reply_to('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getReplyTo()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getReplyTo()[1]->getName()); + } + + public function test_from() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty address + $this->assertEmpty($email->getFrom()); + $this->method_email->from(''); + $this->assertEmpty($email->getFrom()); + + // Valid address + $this->method_email->from('foo@bar.com'); + $this->assertNotEmpty($email->getFrom()); + $this->assertEquals('foo@bar.com', $email->getFrom()[0]->getAddress()); + $this->assertEmpty($email->getFrom()[0]->getName()); + + // Valid address with name + $this->method_email->from('bar@foo.com', 'Bar Foo'); + $this->assertEquals('bar@foo.com', $email->getFrom()[1]->getAddress()); + $this->assertEquals('Bar Foo', $email->getFrom()[1]->getName()); + } + + public function test_subject() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Empty subject + $this->assertEmpty($email->getSubject()); + $this->method_email->subject(''); + $this->assertEmpty($email->getSubject()); + + // Test subject + $this->method_email->subject('Test email'); + $this->assertNotEmpty($email->getSubject()); + $this->assertEquals('Test email', $email->getSubject()); + + // Overwrite subject + $this->method_email->subject('Reply to test email'); + $this->assertNotEmpty($email->getSubject()); + $this->assertEquals('Reply to test email', $email->getSubject()); + } +} From 930c87e97af0484b7fa5b03faea439370a70fe7f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Apr 2025 14:16:59 +0200 Subject: [PATCH 0671/1214] [ticket/17490] Improve expected types and docblock info PHPBB-17490 --- phpBB/phpbb/messenger/method/email.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 87ad9114c1d..9e972fa8556 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -15,6 +15,7 @@ use Symfony\Component\Mailer\Transport; use Symfony\Component\Mailer\Mailer; +use Symfony\Component\Mailer\Transport\TransportInterface; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email as symfony_email; use Symfony\Component\Mime\Header\Headers; @@ -43,10 +44,10 @@ class email extends base /** @var symfony_email */ protected $email; - /** @var Address */ + /** @var Address From address */ protected $from; - /** @var Headers */ + /** @var Headers Email headers */ protected $headers; /** @@ -124,7 +125,7 @@ public function set_addresses(array $user_row): void { if (!empty($user_row['user_email'])) { - $this->to($user_row['user_email'], $user_row['username'] ?: ''); + $this->to($user_row['user_email'], $user_row['username'] ?? ''); } } @@ -453,9 +454,9 @@ public function process_queue(array &$queue_data): void /** * Get mailer transport object * - * @return \Symfony\Component\Mailer\Transport\TransportInterface Symfony Mailer transport object + * @return ?TransportInterface Symfony Mailer transport object */ - public function get_transport(): \Symfony\Component\Mailer\Transport\TransportInterface + public function get_transport(): ?TransportInterface { return $this->transport; } From 91c325174f44308c6ba46c80e9cdd065a022243f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Apr 2025 14:20:04 +0200 Subject: [PATCH 0672/1214] [ticket/17490] Add type hints to enforce some types PHPBB-17490 --- phpBB/phpbb/messenger/method/email.php | 21 +++++++++++---------- tests/messenger/method_email_test.php | 2 -- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 9e972fa8556..6fb3e20e683 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -15,6 +15,7 @@ use Symfony\Component\Mailer\Transport; use Symfony\Component\Mailer\Mailer; +use Symfony\Component\Mailer\Transport\AbstractTransport; use Symfony\Component\Mailer\Transport\TransportInterface; use Symfony\Component\Mime\Address; use Symfony\Component\Mime\Email as symfony_email; @@ -39,16 +40,16 @@ class email extends base * * Symfony Mailer transport DSN */ - protected $dsn = ''; + protected string $dsn = ''; /** @var symfony_email */ - protected $email; + protected symfony_email $email; /** @var Address From address */ - protected $from; + protected Address $from; /** @var Headers Email headers */ - protected $headers; + protected Headers $headers; /** * @var int @@ -60,16 +61,16 @@ class email extends base * symfony_email::PRIORITY_LOW * symfony_email::PRIORITY_LOWEST */ - protected $mail_priority = symfony_email::PRIORITY_NORMAL; + protected int $mail_priority = symfony_email::PRIORITY_NORMAL; /** @var \phpbb\messenger\queue */ protected $queue; /** @var Address */ - protected $reply_to; + protected Address $reply_to; - /** @var \Symfony\Component\Mailer\Transport\AbstractTransport */ - protected $transport; + /** @var AbstractTransport */ + protected AbstractTransport $transport; /** * {@inheritDoc} @@ -454,9 +455,9 @@ public function process_queue(array &$queue_data): void /** * Get mailer transport object * - * @return ?TransportInterface Symfony Mailer transport object + * @return TransportInterface Symfony Mailer transport object */ - public function get_transport(): ?TransportInterface + public function get_transport(): TransportInterface { return $this->transport; } diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index a053658378b..a1d82560702 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -139,7 +139,6 @@ public function test_set_dns() public function test_set_transport() { - $this->assertNull($this->method_email->get_transport()); $this->assertEmpty($this->method_email->get_dsn()); $config_values = [ @@ -179,7 +178,6 @@ public function test_init() $this->config->set('email_package_size', 100); $email_reflection = new \ReflectionClass($this->method_email); $email_property = $email_reflection->getProperty('email'); - $this->assertNull($email_property->getValue($this->method_email)); $use_queue_property = $email_reflection->getProperty('use_queue'); $this->assertFalse($use_queue_property->getValue($this->method_email)); From 8dbe499e3dfdb03c5f01c7c422961373b3509afd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 6 Apr 2025 21:25:16 +0200 Subject: [PATCH 0673/1214] [ticket/17490] Add extra method to support unit testing mailer Also increased unit test coverage of email method to 100%. PHPBB-17490 --- phpBB/phpbb/messenger/method/email.php | 22 +- tests/messenger/method_email_test.php | 466 +++++++++++++++++++++++-- 2 files changed, 450 insertions(+), 38 deletions(-) diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 6fb3e20e683..3b580b6a69e 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -13,6 +13,8 @@ namespace phpbb\messenger\method; +use Symfony\Component\Mailer\Exception\TransportExceptionInterface; +use Symfony\Component\Mailer\MailerInterface; use Symfony\Component\Mailer\Transport; use Symfony\Component\Mailer\Mailer; use Symfony\Component\Mailer\Transport\AbstractTransport; @@ -275,7 +277,6 @@ public function set_mail_priority(int $priority = symfony_email::PRIORITY_NORMAL */ protected function build_headers(): void { - $board_contact = trim($this->config['board_contact']); $contact_name = html_entity_decode($this->config['board_contact_name'], ENT_COMPAT); @@ -317,7 +318,6 @@ protected function build_headers(): void { $this->header($header, $value); } - } /** @@ -408,7 +408,7 @@ public function process_queue(array &$queue_data): void $package_size = $queue_data[$queue_object_name]['package_size'] ?? 0; $num_items = (!$package_size || $messages_count < $package_size) ? $messages_count : $package_size; - $mailer = new Mailer($this->transport); + $mailer = $this->get_mailer(); for ($i = 0; $i < $num_items; $i++) { @@ -437,7 +437,7 @@ public function process_queue(array &$queue_data): void { $mailer->send($email); } - catch (\Symfony\Component\Mailer\Exception\TransportExceptionInterface $e) + catch (TransportExceptionInterface $e) { $this->error($e->getDebug()); continue; @@ -452,6 +452,16 @@ public function process_queue(array &$queue_data): void } } + /** + * Get mailer object + * + * @return MailerInterface Symfony Mailer object + */ + protected function get_mailer(): MailerInterface + { + return new Mailer($this->transport); + } + /** * Get mailer transport object * @@ -506,7 +516,7 @@ public function send(): bool // Send message ... if (!$this->use_queue) { - $mailer = new Mailer($this->transport); + $mailer = $this->get_mailer(); $subject = $this->subject; $msg = $this->msg; @@ -540,7 +550,7 @@ public function send(): bool { $mailer->send($this->email); } - catch (\Symfony\Component\Mailer\Exception\TransportExceptionInterface $e) + catch (TransportExceptionInterface $e) { $this->error($e->getDebug()); return false; diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index a1d82560702..e0dfae93b59 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -19,45 +19,65 @@ use phpbb\path_helper; use phpbb\symfony_request; use phpbb\template\assets_bag; +use Symfony\Component\Mime\RawMessage; class phpbb_messenger_method_email_test extends \phpbb_test_case { + protected $assets_bag; + protected $cache_path; protected config $config; + protected $dispatcher; + protected $extension_manager; + protected $language; + protected $log; + protected $path_helper; protected queue $queue; protected $request; + protected $twig_extensions_collection; + protected $twig_lexer; + protected $user; public function setUp(): void { - global $phpbb_root_path, $phpEx; - - $assets_bag = new assets_bag(); - $cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; - $this->config = new config([]); - $dispatcher = new \phpbb_mock_event_dispatcher(); - $filesystem = new \phpbb\filesystem\filesystem(); - $language = new language(new language_file_loader($phpbb_root_path, $phpEx)); + global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx; + + $this->assets_bag = new assets_bag(); + $this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $this->config = new config([ + 'force_server_vars' => false, + ]); + $config = $this->config; + $this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->filesystem = new \phpbb\filesystem\filesystem(); + $this->language = new language(new language_file_loader($phpbb_root_path, $phpEx)); $this->queue = $this->createMock(queue::class); $this->request = new phpbb_mock_request(); - $user = new \phpbb\user($language, '\phpbb\datetime'); - $path_helper = new path_helper( - new symfony_request( - new phpbb_mock_request() - ), + $request = $this->request; + $this->symfony_request = new symfony_request(new phpbb_mock_request()); + $symfony_request = $this->symfony_request; + $this->user = new \phpbb\user($this->language, '\phpbb\datetime'); + $user = $this->user; + $user->page['root_script_path'] = 'phpbb/'; + $this->user->host = 'yourdomain.com'; + $this->path_helper = new path_helper( + $this->symfony_request, $this->request, $phpbb_root_path, $phpEx ); $phpbb_container = new phpbb_mock_container_builder; - $twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); $twig = new \phpbb\template\twig\environment( - $assets_bag, + $this->assets_bag, $this->config, - $filesystem, - $path_helper, - $cache_path, + $this->filesystem, + $this->path_helper, + $this->cache_path, null, new \phpbb\template\twig\loader(''), - $dispatcher, + $this->dispatcher, array( 'cache' => false, 'debug' => false, @@ -65,8 +85,8 @@ public function setUp(): void 'autoescape' => false, ) ); - $twig_lexer = new \phpbb\template\twig\lexer($twig); - $extension_manager = new phpbb_mock_extension_manager( + $this->twig_lexer = new \phpbb\template\twig\lexer($twig); + $this->extension_manager = new phpbb_mock_extension_manager( __DIR__ . '/', array( 'vendor2/foo' => array( @@ -76,23 +96,23 @@ public function setUp(): void ), ) ); - $log = $this->createMock(\phpbb\log\log_interface::class); + $this->log = $this->createMock(\phpbb\log\log_interface::class); $this->method_email = new email( - $assets_bag, + $this->assets_bag, $this->config, - $dispatcher, - $language, + $this->dispatcher, + $this->language, $this->queue, - $path_helper, + $this->path_helper, $this->request, - $twig_extensions_collection, - $twig_lexer, - $user, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, $phpbb_root_path, - $cache_path, - $extension_manager, - $log + $this->cache_path, + $this->extension_manager, + $this->log ); } @@ -200,6 +220,17 @@ public function test_init() $this->assertEmpty($email->getTo()); } + public function test_get_mailer() + { + $email_reflection = new \ReflectionClass($this->method_email); + $this->method_email->init(); + $this->method_email->set_transport(); + $mailer_method = $email_reflection->getMethod('get_mailer'); + + $mailer = $mailer_method->invoke($this->method_email); + $this->assertInstanceOf(\Symfony\Component\Mailer\Mailer::class, $mailer); + } + public function test_set_addresses() { $email_reflection = new \ReflectionClass($this->method_email); @@ -384,4 +415,375 @@ public function test_subject() $this->assertNotEmpty($email->getSubject()); $this->assertEquals('Reply to test email', $email->getSubject()); } + + public function test_anti_abuse_headers() + { + $email_reflection = new \ReflectionClass($this->method_email); + $headers_property = $email_reflection->getProperty('headers'); + $this->method_email->init(); + + /** @var \Symfony\Component\Mime\Header\Headers $headers */ + $headers = $headers_property->getValue($this->method_email); + + $this->config->set('server_name', 'yourdomain.com'); + $this->user->data['user_id'] = 2; + $this->user->data['username'] = 'admin'; + $this->user->ip = '127.0.0.1'; + + $this->assertEmpty($headers->toArray()); + $this->method_email->anti_abuse_headers($this->config, $this->user); + + $this->assertEquals( + [ + 'X-AntiAbuse: Board servername - yourdomain.com', + 'X-AntiAbuse: User_id - 2', + 'X-AntiAbuse: Username - admin', + 'X-AntiAbuse: User IP - 127.0.0.1', + ], + $headers->toArray() + ); + } + + public function test_set_mail_priority() + { + $email_reflection = new \ReflectionClass($this->method_email); + $email_property = $email_reflection->getProperty('email'); + $this->method_email->init(); + /** @var \Symfony\Component\Mime\Email $email */ + $email = $email_property->getValue($this->method_email); + $this->assertNotNull($email); + + // Default priority + $this->assertEquals(\Symfony\Component\Mime\Email::PRIORITY_NORMAL, $email->getPriority()); + + // Highest priority + $this->method_email->set_mail_priority(\Symfony\Component\Mime\Email::PRIORITY_HIGHEST); + $this->assertEquals(\Symfony\Component\Mime\Email::PRIORITY_HIGHEST, $email->getPriority()); + } + + public function test_process_queue_not_enabled() + { + $this->method_email->init(); + + $queue_data = [ + 'email' => [ + 'data' => [ + 'message_one', + 'message_two', + ] + ] + ]; + + // Process queue will remove emails if email method is not enabled + $this->method_email->process_queue($queue_data); + $this->assertEmpty($queue_data); + } + + public function test_process_queue() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $sent_emails = 0; + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + if ($mail->toString() === 'throw_exception') + { + throw new \Symfony\Component\Mailer\Exception\TransportException('exception'); + } + + $sent_emails++; + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + if ($event_name === 'core.notification_message_process' && $value_array['email']->toString() == 'message_three') + { + $value_array['break'] = true; + } + + return $value_array; + }); + + $queue_data = [ + 'email' => [ + 'data' => [ + ['email' => new RawMessage('message_one')], + ['email' => new RawMessage('message_two')], + ['email' => new RawMessage('message_three')], + ['email' => new RawMessage('throw_exception')], + ['email' => new RawMessage('message_four')], + ] + ] + ]; + + $this->assertEmpty($errors); + $this->method_email->process_queue($queue_data); + $this->assertEmpty($queue_data); + $this->assertEquals(3, $sent_emails); + + $this->assertEquals(['EMAIL



                '], $errors); + } + + public function test_send_break() + { + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + if ($event_name !== 'core.notification_message_email') + { + return $value_array; + } + + $value_array['break'] = true; + return $value_array; + }); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + + $this->method_email->send(); + } + + public function test_send_no_queue() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $sent_emails = 0; + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + $sent_emails++; + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + return $value_array; + }); + + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + + $this->assertTrue($this->method_email->send()); + $this->assertEquals(1, $sent_emails); + + $this->assertEmpty($errors); + } + + public function test_send_exception() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + throw new \Symfony\Component\Mailer\Exception\TransportException('exception'); + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + return $value_array; + }); + + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + + $this->assertFalse($this->method_email->send()); + + $this->assertEquals(['EMAIL



                '], $errors); + } + + public function test_send_queue() + { + global $phpbb_root_path; + + $this->config->set('email_enable', true); + $this->config->set('email_package_size', 100); + $this->user->data['user_id'] = 2; + $this->user->session_id = 'abcdef'; + + $this->method_email = $this->getMockBuilder($this->method_email::class) + ->setConstructorArgs([$this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->onlyMethods(['get_mailer']) + ->getMock(); + + $mailer_mock = $this->getMockBuilder(\Symfony\Component\Mailer\MailerInterface::class) + ->disableOriginalConstructor() + ->onlyMethods(['send']) + ->getMock(); + $mailer_mock->method('send') + ->willReturnCallback(function(RawMessage $mail) use(&$sent_emails) { + throw new \Symfony\Component\Mailer\Exception\TransportException('exception'); + }); + $this->method_email->method('get_mailer')->willReturn($mailer_mock); + + $this->config->set('board_email', 'admin@yourdomain.com'); + + $this->method_email->init(); + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->dispatcher + ->expects($this->atLeastOnce()) + ->method('trigger_event') + ->willReturnCallback(function($event_name, $value_array) { + return $value_array; + }); + + // Mock queue methods + $this->queue->method('init') + ->willReturnCallback(function(string $object, int $package_size) { + $this->assertEquals('email', $object); + $this->assertEquals($this->config['email_package_size'], $package_size); + }); + $this->queue->method('put') + ->willReturnCallback(function(string $object, array $message_data) { + $this->assertEquals('email', $object); + $this->assertStringContainsString('phpBB is correctly configured to send emails', $message_data['email']->getSubject()); + }); + + $this->method_email->to('foo@bar.com'); + $this->method_email->subject('Test email'); + $this->method_email->template('test', 'en'); + + $this->assertTrue($this->method_email->send()); + + $this->assertEmpty($errors); + } } From d5717b541e1d6c3164edd835273775f71ce121bf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 7 Apr 2025 17:11:31 +0200 Subject: [PATCH 0674/1214] [ticket/17490] Remove name handling for mails on windows PHPBB-17490 --- phpBB/phpbb/messenger/method/email.php | 5 +---- tests/messenger/method_email_test.php | 9 +-------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 3b580b6a69e..7bd92538c2d 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -146,10 +146,7 @@ public function to(string $address, string $realname = ''): void return; } - // If empty sendmail_path on windows, PHP changes the to line - $windows_empty_sendmail_path = !$this->config['smtp_delivery'] && DIRECTORY_SEPARATOR == '\\'; - - $to = new Address($address, $windows_empty_sendmail_path ? '' : trim($realname)); + $to = new Address($address, trim($realname)); $this->email->getTo() ? $this->email->addTo($to) : $this->email->to($to); } diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index e0dfae93b59..432e90939b7 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -277,14 +277,7 @@ public function test_to() // Valid address with name $this->method_email->to('bar@foo.com', 'Bar Foo'); $this->assertEquals('bar@foo.com', $email->getTo()[1]->getAddress()); - if (DIRECTORY_SEPARATOR == '\\') - { - $this->assertEmpty($email->getTo()[1]->getName()); - } - else - { - $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); - } + $this->assertEquals('Bar Foo', $email->getTo()[1]->getName()); } public function test_cc() From e4c8984bf3a26d0833b0295c700dd8aa06959907 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 7 Apr 2025 19:39:07 +0200 Subject: [PATCH 0675/1214] [ticket/17490] Remove not needed returns PHPBB-17490 --- phpBB/phpbb/messenger/method/base.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index c0c2a94d0d9..0fb46b2cb38 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -216,9 +216,9 @@ abstract public function process_queue(array &$queue_data): void; * @param string $template_path Email template path * @param string $template_dir_prefix Email template directory prefix * - * @return bool + * @return void */ - public function template(string $template_file, string $template_lang = '', string $template_path = '', string $template_dir_prefix = ''): bool + public function template(string $template_file, string $template_lang = '', string $template_path = '', string $template_dir_prefix = ''): void { $template_dir_prefix = (!$template_dir_prefix || $template_dir_prefix[0] === '/') ? $template_dir_prefix : '/' . $template_dir_prefix; @@ -290,8 +290,6 @@ public function template(string $template_file, string $template_lang = '', stri $this->template->set_filenames([ 'body' => $template_file . '.txt', ]); - - return true; } /** @@ -487,6 +485,5 @@ protected function set_template_paths(string|array $path_name, string|array $pat */ public function header(string $header_name, mixed $header_value): void { - return; } } From 5bc4c5765e2a64eb92b1128f104691fecc0049ef Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 7 Apr 2025 19:39:23 +0200 Subject: [PATCH 0676/1214] [ticket/17490] Use isset instead of !empty() PHPBB-17490 --- phpBB/phpbb/messenger/method/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index 0fb46b2cb38..c8c7129cafc 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -423,7 +423,7 @@ public function error(string $msg): void */ public function save_queue(): void { - if ($this->use_queue && !empty($this->queue)) + if ($this->use_queue && isset($this->queue)) { $this->queue->save(); } From aa2da5b91676311050f29efbbddb59b8dbda58fa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 7 Apr 2025 19:39:37 +0200 Subject: [PATCH 0677/1214] [ticket/17490] Add missing property declaration in test PHPBB-17490 --- tests/messenger/method_email_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index 432e90939b7..be77da02dec 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -28,6 +28,7 @@ class phpbb_messenger_method_email_test extends \phpbb_test_case protected config $config; protected $dispatcher; protected $extension_manager; + protected email $method_email; protected $language; protected $log; protected $path_helper; From 63203f42f78612e5e833e09296562b5bb4aebfaa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 7 Apr 2025 20:37:52 +0200 Subject: [PATCH 0678/1214] [ticket/17490] Add test coverage for remainder of base test PHPBB-17490 --- tests/messenger/method_base_test.php | 274 ++++++++++++++++++++++++++ tests/messenger/method_email_test.php | 17 +- 2 files changed, 289 insertions(+), 2 deletions(-) create mode 100644 tests/messenger/method_base_test.php diff --git a/tests/messenger/method_base_test.php b/tests/messenger/method_base_test.php new file mode 100644 index 00000000000..38e7a921b17 --- /dev/null +++ b/tests/messenger/method_base_test.php @@ -0,0 +1,274 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\language\language; +use phpbb\language\language_file_loader; +use phpbb\messenger\method\email; +use phpbb\messenger\queue; +use phpbb\path_helper; +use phpbb\symfony_request; +use phpbb\template\assets_bag; + +class phpbb_messenger_method_base_test extends \phpbb_test_case +{ + protected $assets_bag; + protected $cache_path; + protected config $config; + protected $dispatcher; + protected $extension_manager; + protected email $method_email; + protected $method_base; + protected $language; + protected $log; + protected $path_helper; + protected queue $queue; + protected $request; + protected $twig_extensions_collection; + protected $twig_lexer; + protected $user; + + public function setUp(): void + { + global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx; + + $this->assets_bag = new assets_bag(); + $this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $this->config = new config([ + 'force_server_vars' => false, + ]); + $config = $this->config; + $this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->filesystem = new \phpbb\filesystem\filesystem(); + $this->language = new language(new language_file_loader($phpbb_root_path, $phpEx)); + $this->queue = $this->createMock(queue::class); + $this->request = new phpbb_mock_request(); + $request = $this->request; + $this->symfony_request = new symfony_request(new phpbb_mock_request()); + $symfony_request = $this->symfony_request; + $this->user = $this->getMockBuilder('\phpbb\user') + ->setConstructorArgs([$this->language, '\phpbb\datetime']) + ->getMock(); + $user = $this->user; + $user->page['root_script_path'] = 'phpbb/'; + $this->user->host = 'yourdomain.com'; + $this->path_helper = new path_helper( + $this->symfony_request, + $this->request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container = new phpbb_mock_container_builder; + $this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig = new \phpbb\template\twig\environment( + $this->assets_bag, + $this->config, + $this->filesystem, + $this->path_helper, + $this->cache_path, + null, + new \phpbb\template\twig\loader(''), + $this->dispatcher, + array( + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ) + ); + $this->twig_lexer = new \phpbb\template\twig\lexer($twig); + $this->extension_manager = new phpbb_mock_extension_manager( + __DIR__ . '/', + array( + 'vendor2/foo' => array( + 'ext_name' => 'vendor2/foo', + 'ext_active' => '1', + 'ext_path' => 'ext/vendor2/foo/', + ), + ) + ); + $this->log = $this->createMock(\phpbb\log\log_interface::class); + + $this->method_email = new email( + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ); + + $this->method_base = $this->getMockBuilder(\phpbb\messenger\method\base::class) + ->setConstructorArgs([ + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ]) + ->getMockForAbstractClass(); + } + + public function test_header() + { + $this->method_base->header('X-AntiAbuse', 'Board servername - ' . $this->user->host); + $this->assertTrue(true); // No exception should be thrown + } + + public function test_set_use_queue() + { + $use_queue_property = new \ReflectionProperty($this->method_base, 'use_queue'); + $this->method_base->set_use_queue(); + $this->assertTrue($use_queue_property->getValue($this->method_base)); + $this->method_base->set_use_queue(false); + $this->assertFalse($use_queue_property->getValue($this->method_base)); + } + + public function test_error_wout_session() + { + $errors = []; + $this->log->method('add') + ->willReturnCallback(function($mode, $user_id, $log_ip, $log_operation, $log_time = false, $additional_data = []) use (&$errors) { + $errors[] = $additional_data[0]; + }); + + $this->user->data['user_id'] = 2; + $this->user->session_id = ''; + $this->user + ->expects($this->once()) + ->method('session_begin') + ->willReturnCallback(function() { + $this->assertTrue(true); + }); + + $this->method_base->error('Test error message'); + + $this->assertCount(1, $errors); + $this->assertEquals('


                Test error message
                ', $errors[0]); + } + + public function test_save_queue() + { + $this->queue->expects($this->once()) + ->method('save'); + $this->method_base->set_use_queue(false); + $this->method_base->save_queue(); + $this->method_base->set_use_queue(true); + $this->method_base->save_queue(); + } + + public function test_template_no_lang() + { + $template_mock = $this->getMockBuilder(\phpbb\template\template::class) + ->disableOriginalConstructor() + ->getMock(); + $filenames = []; + $template_mock->method('set_filenames') + ->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) { + $filenames = array_merge($filenames, $filename_array); + + return $template_mock; + }); + + $base_reflection = new \ReflectionClass($this->method_base); + $template_reflection = $base_reflection->getProperty('template'); + $template_reflection->setValue($this->method_base, $template_mock); + + $this->config->set('default_lang', 'en'); + $this->method_base->template('test'); + $this->assertEquals(['body' => 'test.txt'], $filenames); + } + + public function test_template_template_path() + { + global $phpbb_root_path; + + $template_mock = $this->getMockBuilder(\phpbb\template\template::class) + ->disableOriginalConstructor() + ->getMock(); + $filenames = []; + $template_mock->method('set_filenames') + ->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) { + $filenames = array_merge($filenames, $filename_array); + + return $template_mock; + }); + $template_mock->method('set_custom_style') + ->willReturnCallback(function($path_name, $paths) use($phpbb_root_path) { + $this->assertEquals([['name' => 'en_email', 'ext_path' => 'language/en/email']], $path_name); + $this->assertEquals([$phpbb_root_path . 'language/en/email'], $paths); + }); + + $base_reflection = new \ReflectionClass($this->method_base); + $template_reflection = $base_reflection->getProperty('template'); + $template_reflection->setValue($this->method_base, $template_mock); + + $this->config->set('default_lang', 'en'); + $this->method_base->template('test', '', $phpbb_root_path . 'language/en/email'); + $this->assertEquals(['body' => 'test.txt'], $filenames); + } + + public function test_template_path_fallback() + { + global $phpbb_root_path; + + $template_mock = $this->getMockBuilder(\phpbb\template\template::class) + ->disableOriginalConstructor() + ->getMock(); + $filenames = []; + $template_mock->method('set_filenames') + ->willReturnCallback(function($filename_array) use (&$filenames, $template_mock) { + $filenames = array_merge($filenames, $filename_array); + + return $template_mock; + }); + $template_mock->method('set_custom_style') + ->willReturnCallback(function($path_name, $paths) use($phpbb_root_path) { + $this->assertEquals([ + ['name' => 'de_email', 'ext_path' => 'language/de/email'], + ['name' => 'en_email', 'ext_path' => 'language/en/email'], + ], $path_name); + $this->assertEquals([ + $phpbb_root_path . 'language/de/email', + $phpbb_root_path . 'language/en/email' + ], $paths); + }); + + $base_reflection = new \ReflectionClass($this->method_base); + $template_reflection = $base_reflection->getProperty('template'); + $template_reflection->setValue($this->method_base, $template_mock); + + $this->config->set('default_lang', 'de'); + $this->method_base->template('test', 'de'); + $this->assertEquals(['body' => 'test.txt'], $filenames); + } +} diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index be77da02dec..c21a883f74f 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -576,11 +576,24 @@ public function test_send_break() $this->method_email->to('foo@bar.com'); $this->method_email->subject('Test email'); $this->method_email->template('test', 'en'); + $this->method_email->assign_block_vars('foo', ['bar' => 'baz']); $this->method_email->send(); } - public function test_send_no_queue() + public function email_template_data(): array + { + return [ + ['test'], + ['admin_send_email'], + ['topic_notify'], + ]; + } + + /** + * @dataProvider email_template_data + */ + public function test_send_no_queue($email_template) { global $phpbb_root_path; @@ -636,7 +649,7 @@ public function test_send_no_queue() $this->method_email->to('foo@bar.com'); $this->method_email->subject('Test email'); - $this->method_email->template('test', 'en'); + $this->method_email->template($email_template, 'en'); $this->assertTrue($this->method_email->send()); $this->assertEquals(1, $sent_emails); From a63d423c8632f4a328d17c744984a05c22d84df7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 8 Apr 2025 22:37:03 +0200 Subject: [PATCH 0679/1214] [ticket/17490] Start implementing unit tests for jabber PHPBB-17490 --- tests/messenger/method_jabber_test.php | 311 +++++++++++++++++++++++++ 1 file changed, 311 insertions(+) create mode 100644 tests/messenger/method_jabber_test.php diff --git a/tests/messenger/method_jabber_test.php b/tests/messenger/method_jabber_test.php new file mode 100644 index 00000000000..d61cd9b1b15 --- /dev/null +++ b/tests/messenger/method_jabber_test.php @@ -0,0 +1,311 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_messenger_method_jabber_test extends \phpbb_test_case +{ + protected $assets_bag; + protected $cache_path; + protected config $config; + protected $dispatcher; + protected $extension_manager; + protected jabber $method_jabber; + protected $method_base; + protected $language; + protected $log; + protected $path_helper; + protected queue $queue; + protected $request; + protected $twig_extensions_collection; + protected $twig_lexer; + protected $user; + + public function setUp(): void + { + global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx; + + $this->assets_bag = new assets_bag(); + $this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; + $this->config = new config([ + 'force_server_vars' => false, + 'jab_username' => 'test', + 'jab_password' => 'password', + 'jab_use_ssl' => false, + 'jab_host' => 'localhost', + 'jab_port' => 5222, + 'jab_verify_peer' => true, + 'jab_verify_peer_name' => true, + 'jab_allow_self_signed' => false, + ]); + $config = $this->config; + $this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->filesystem = new \phpbb\filesystem\filesystem(); + $this->language = new language(new language_file_loader($phpbb_root_path, $phpEx)); + $this->queue = $this->createMock(queue::class); + $this->request = new phpbb_mock_request(); + $request = $this->request; + $this->symfony_request = new symfony_request(new phpbb_mock_request()); + $symfony_request = $this->symfony_request; + $this->user = $this->getMockBuilder('\phpbb\user') + ->setConstructorArgs([$this->language, '\phpbb\datetime']) + ->getMock(); + $user = $this->user; + $user->page['root_script_path'] = 'phpbb/'; + $this->user->host = 'yourdomain.com'; + $this->path_helper = new path_helper( + $this->symfony_request, + $this->request, + $phpbb_root_path, + $phpEx + ); + $phpbb_container = new phpbb_mock_container_builder; + $this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); + $twig = new \phpbb\template\twig\environment( + $this->assets_bag, + $this->config, + $this->filesystem, + $this->path_helper, + $this->cache_path, + null, + new \phpbb\template\twig\loader(''), + $this->dispatcher, + array( + 'cache' => false, + 'debug' => false, + 'auto_reload' => true, + 'autoescape' => false, + ) + ); + $this->twig_lexer = new \phpbb\template\twig\lexer($twig); + $this->extension_manager = new phpbb_mock_extension_manager( + __DIR__ . '/', + array( + 'vendor2/foo' => array( + 'ext_name' => 'vendor2/foo', + 'ext_active' => '1', + 'ext_path' => 'ext/vendor2/foo/', + ), + ) + ); + $this->log = $this->createMock(\phpbb\log\log_interface::class); + + $this->method_jabber = new jabber( + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + $phpbb_root_path, + $this->cache_path, + $this->extension_manager, + $this->log + ); + } + + public function test_miscellaneous() + { + $this->method_jabber->init(); + $this->assertEquals(messenger_interface::NOTIFY_IM, $this->method_jabber->get_id()); + $this->assertEquals('jabber', $this->method_jabber->get_queue_object_name()); + $this->assertFalse($this->method_jabber->is_enabled()); + $this->config->set('jab_enable', true); + $this->assertTrue($this->method_jabber->is_enabled()); + $this->assertEquals(@extension_loaded('openssl'), $this->method_jabber->can_use_ssl()); + } + + public function test_stream_options() + { + $this->method_jabber->init(); + $this->assertEquals($this->method_jabber, $this->method_jabber->stream_options([ + 'allow_self_signed' => true, + ])); + + $stream_options_reflection = new \ReflectionProperty($this->method_jabber, 'stream_options'); + $stream_options = $stream_options_reflection->getValue($this->method_jabber); + $this->assertEquals([ + 'ssl' => [ + 'allow_self_signed' => false, + 'verify_peer' => true, + 'verify_peer_name' => true, + ], + ], $stream_options); + + $this->method_jabber->ssl(true); + + $this->assertEquals($this->method_jabber, $this->method_jabber->stream_options([ + 'allow_self_signed' => true, + ])); + $stream_options = $stream_options_reflection->getValue($this->method_jabber); + $this->assertEquals([ + 'ssl' => [ + 'allow_self_signed' => true, + 'verify_peer' => true, + 'verify_peer_name' => true, + ], + ], $stream_options); + } + + public function test_port_ssl_switch() + { + $port_reflection = new \ReflectionProperty($this->method_jabber, 'port'); + + $this->method_jabber->port(); + $this->assertEquals(5222, $port_reflection->getValue($this->method_jabber)); + + $this->method_jabber->ssl(true) + ->port(); + $this->assertEquals(5223, $port_reflection->getValue($this->method_jabber)); + } + + public function test_username() + { + $jabber_reflection = new \ReflectionClass($this->method_jabber); + $username_reflection = $jabber_reflection->getProperty('username'); + $jid_reflection = $jabber_reflection->getProperty('jid'); + + $this->method_jabber->username('foo@bar'); + $this->assertEquals(['foo', 'bar'], $jid_reflection->getValue($this->method_jabber)); + $this->assertEquals('foo', $username_reflection->getValue($this->method_jabber)); + + $this->method_jabber->username('bar@baz@qux'); + $this->assertEquals(['bar', 'baz@qux'], $jid_reflection->getValue($this->method_jabber)); + $this->assertEquals('bar', $username_reflection->getValue($this->method_jabber)); + } + + public function test_server() + { + $jabber_reflection = new \ReflectionClass($this->method_jabber); + $connect_server_reflection = $jabber_reflection->getProperty('connect_server'); + $server_reflection = $jabber_reflection->getProperty('server'); + + $this->method_jabber->server(); + $this->assertEquals('localhost', $connect_server_reflection->getValue($this->method_jabber)); + $this->assertEquals('localhost', $server_reflection->getValue($this->method_jabber)); + + $this->method_jabber->server('foobar.com'); + $this->assertEquals('foobar.com', $connect_server_reflection->getValue($this->method_jabber)); + $this->assertEquals('foobar.com', $server_reflection->getValue($this->method_jabber)); + + $this->method_jabber->username('foo@bar.com'); + $this->method_jabber->server('foobar.com'); + $this->assertEquals('foobar.com', $connect_server_reflection->getValue($this->method_jabber)); + $this->assertEquals('bar.com', $server_reflection->getValue($this->method_jabber)); + } + + public function test_encrypt_password() + { + $this->method_jabber->init(); + $this->method_jabber->password('password'); + $data = [ + 'realm' => 'example.com', + 'nonce' => '12345', + 'cnonce' => 'abcde', + 'digest-uri' => 'xmpp/example.com', + 'nc' => '00000001', + 'qop' => 'auth', + ]; + + $expected = md5(sprintf( + '%s:%s:%s:%s:%s:%s', + md5(pack('H32', md5('test:example.com:password')) . ':12345:abcde'), + $data['nonce'], + $data['nc'], + $data['cnonce'], + $data['qop'], + md5('AUTHENTICATE:xmpp/example.com') + )); + $this->assertEquals($expected, $this->method_jabber->encrypt_password($data)); + } + + public function test_parse_data() + { + $data = 'key1="value1",key2="value2",key3="value3"'; + $expected = [ + 'key1' => 'value1', + 'key2' => 'value2', + 'key3' => 'value3', + ]; + + $this->assertEquals($expected, $this->method_jabber->parse_data($data)); + } + + public function test_implode_data() + { + $data = [ + 'key1' => 'value1', + 'key2' => 'value2', + 'key3' => 'value3', + ]; + $expected = 'key1="value1",key2="value2",key3="value3"'; + + $this->assertEquals($expected, $this->method_jabber->implode_data($data)); + } + + public function test_xmlize() + { + $xml = 'content'; + $result = $this->method_jabber->xmlize($xml); + + $this->assertArrayHasKey('root', $result); + $this->assertArrayHasKey('child', $result['root'][0]['#']); + $this->assertEquals('content', $result['root'][0]['#']['child'][0]['#']); + $this->assertEquals(['key' => 'value'], $result['root'][0]['#']['child'][0]['@']); + } + + public function test_send_xml() + { + $jabber_mock = $this->getMockBuilder(jabber::class) + ->setConstructorArgs([ + $this->assets_bag, + $this->config, + $this->dispatcher, + $this->language, + $this->queue, + $this->path_helper, + $this->request, + $this->twig_extensions_collection, + $this->twig_lexer, + $this->user, + '', + '', + $this->extension_manager, + $this->log, + ]) + ->onlyMethods(['send_xml']) + ->getMock(); + + $jabber_mock->expects($this->once()) + ->method('send_xml') + ->with('Test') + ->willReturn(true); + + $this->assertTrue($jabber_mock->send_xml('Test')); + } +} From 6fcac2c40f4519a9d4755d1ed211fb4b03252284 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 10 Apr 2025 20:59:30 +0200 Subject: [PATCH 0680/1214] [ticket/17490] Add unit tests for messenger queue PHPBB-17490 --- tests/messenger/queue_test.php | 344 +++++++++++++++++++++++++++++++++ 1 file changed, 344 insertions(+) create mode 100644 tests/messenger/queue_test.php diff --git a/tests/messenger/queue_test.php b/tests/messenger/queue_test.php new file mode 100644 index 00000000000..e99893d5778 --- /dev/null +++ b/tests/messenger/queue_test.php @@ -0,0 +1,344 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use phpbb\config\config; +use phpbb\filesystem\exception\filesystem_exception; +use phpbb\messenger\queue; + +class phpbb_messenger_queue_test extends phpbb_test_case +{ + protected $config; + protected $dispatcher; + protected $service_collection; + + /** @var queue */ + protected $messenger_queue; + + /** + * Set up the test case + */ + protected function setUp(): void + { + $this->config = new config([ + 'last_queue_run' => time() - 30, + 'queue_interval' => 600, + ]); + $this->dispatcher = $this->getMockBuilder('phpbb\event\dispatcher') + ->disableOriginalConstructor() + ->getMock(); + $this->service_collection = $this->getMockBuilder('phpbb\di\service_collection') + ->disableOriginalConstructor() + ->onlyMethods(['getIterator', 'add_service_class']) + ->getMock(); + + $this->cache_file = __DIR__ . '/../tmp/queue_test'; + + if (file_exists($this->cache_file)) + { + @unlink($this->cache_file); + } + + $this->messenger_queue = $this->getMockBuilder('phpbb\messenger\queue') + ->setConstructorArgs([ + $this->config, + $this->dispatcher, + $this->service_collection, + $this->cache_file + ]) + ->addMethods(['get_data']) + ->getMock(); + + $this->messenger_queue->method('get_data') + ->willReturnCallback(function(){ + $data_reflection = new \ReflectionProperty(queue::class, 'data'); + return $data_reflection->getValue($this->messenger_queue); + }); + } + + public function test_init() + { + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->init('jabber', 9); + + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 9, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + } + + public function test_put() + { + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [ + ['data1'], + ], + ], + ], $this->messenger_queue->get_data()); + } + + public function test_process_no_cache_file() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->assertGreaterThan(5, time() - $this->config['last_queue_run']); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->process(); + $this->assertFileDoesNotExist($this->cache_file); + $this->assertLessThan(5, time() - $this->config['last_queue_run']); + } + + public function test_process_no_queue_handling() + { + // First save queue data + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->messenger_queue->init('jabber', 10); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 10, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->config['last_queue_run'] = time() - 1000; + + // Process the queue + $this->messenger_queue->process(); + } + + public function test_process_no_queue_handling_chmod_exception() + { + // First save queue data + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->messenger_queue->init('jabber', 10); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 10, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->config['last_queue_run'] = time() - 1000; + + // Override the filesystem to simulate a chmod failure + $filesystem = $this->getMockBuilder('phpbb\filesystem\filesystem') + ->disableOriginalConstructor() + ->onlyMethods(['phpbb_chmod']) + ->getMock(); + $filesystem->method('phpbb_chmod') + ->will($this->throwException(new filesystem_exception('Chmod failed'))); + $filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem'); + $filesystem_reflection->setAccessible(true); + $filesystem_reflection->setValue($this->messenger_queue, $filesystem); + + // Process the queue + $this->messenger_queue->process(); + } + + public function test_process_complete() + { + // First save queue data + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->messenger_queue->init('jabber', 10); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ], + 'jabber' => [ + 'package_size' => 10, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->config['last_queue_run'] = time() - 1000; + + // Prepare service iterator and messenger methods + $email_method = $this->getMockBuilder('phpbb\messenger\method\email') + ->disableOriginalConstructor() + ->onlyMethods(['get_queue_object_name', 'process_queue']) + ->getMock(); + $email_method->method('get_queue_object_name') + ->willReturn('email'); + $email_method->method('process_queue') + ->willReturnCallback(function(array &$queue_data) { + $this->assertEquals([ + 'package_size' => 5, + 'data' => [ + ['data1'], + ], + ], $queue_data['email']); + unset($queue_data['email']); + }); + $jabber_method = $this->getMockBuilder('phpbb\messenger\method\jabber') + ->disableOriginalConstructor() + ->onlyMethods(['get_queue_object_name', 'process_queue']) + ->getMock(); + $jabber_method->method('get_queue_object_name') + ->willReturn('jabber'); + $jabber_method->method('process_queue') + ->willReturnCallback(function(array &$queue_data) { + $this->assertEquals([ + 'package_size' => 10, + 'data' => [ + ['data2'], + ], + ], $queue_data['jabber']); + unset($queue_data['jabber']); + }); + + $this->service_collection->method('getIterator') + ->willReturn(new \ArrayIterator([ + 'email' => $email_method, + 'jabber' => $jabber_method, + ])); + + // Process the queue + $this->messenger_queue->process(); + $this->assertFileDoesNotExist($this->cache_file); + } + + public function test_save_no_data() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->save(); + $this->assertFileDoesNotExist($this->cache_file); + } + + public function test_save() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + } + + public function test_save_twice() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + $this->messenger_queue->put('jabber', ['data2']); + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data3']); + $this->messenger_queue->save(); + $this->assertEquals([], $this->messenger_queue->get_data()); + } + + public function test_save_chmod_fail() + { + $this->assertFileDoesNotExist($this->cache_file); + $this->messenger_queue->init('email', 5); + $this->assertEquals([ + 'email' => [ + 'package_size' => 5, + 'data' => [], + ] + ], $this->messenger_queue->get_data()); + + $this->messenger_queue->put('email', ['data1']); + + // Override the filesystem to simulate a chmod failure + $filesystem = $this->getMockBuilder('phpbb\filesystem\filesystem') + ->disableOriginalConstructor() + ->onlyMethods(['phpbb_chmod']) + ->getMock(); + $filesystem->method('phpbb_chmod') + ->will($this->throwException(new filesystem_exception('Chmod failed'))); + $filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem'); + $filesystem_reflection->setAccessible(true); + $filesystem_reflection->setValue($this->messenger_queue, $filesystem); + + $this->messenger_queue->save(); + $this->assertFileExists($this->cache_file); + $this->assertEquals([], $this->messenger_queue->get_data()); + } +} From bf2dd2cd75687c3b8ca393ae631b02fc8deee52f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 12 Apr 2025 09:02:14 +0200 Subject: [PATCH 0681/1214] [ticket/17490] Remove not needed isset PHPBB-17490 --- phpBB/phpbb/messenger/method/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index c8c7129cafc..f3db4155cad 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -423,7 +423,7 @@ public function error(string $msg): void */ public function save_queue(): void { - if ($this->use_queue && isset($this->queue)) + if ($this->use_queue) { $this->queue->save(); } From cac3d81e73e4124e5d6e9e8c915d9bf532bb1df0 Mon Sep 17 00:00:00 2001 From: LukeWCS Date: Thu, 10 Apr 2025 18:38:29 +0200 Subject: [PATCH 0682/1214] [ticket/17492] Unintuitive checkbox status inverted for topic subscriptions PHPBB-17492 --- .../styles/prosilver/template/viewtopic_topic_tools.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 272a434f6a2..78dbae2dd46 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -8,13 +8,13 @@
                  - + {% if U_WATCH_TOPIC %}
                • - - {S_WATCH_TOPIC_TITLE} + + {{ S_WATCH_TOPIC_TITLE }}
                  • - + {% endif %}
                • From 8c5e22f4d5ff240e2bac0030792e5b958a5731dc Mon Sep 17 00:00:00 2001 From: LukeWCS Date: Fri, 11 Apr 2025 18:29:22 +0200 Subject: [PATCH 0683/1214] [ticket/17492] Update viewtopic_topic_tools.html Changed compact but icon-specific code to neutral code for easier changing. PHPBB-17492 --- phpBB/styles/prosilver/template/viewtopic_topic_tools.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html index 78dbae2dd46..9ae83b9486f 100644 --- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html +++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html @@ -10,8 +10,8 @@ {% if U_WATCH_TOPIC %}
                • - - {{ S_WATCH_TOPIC_TITLE }} + + {{ S_WATCH_TOPIC_TITLE }}
                  • {% endif %} From 8d0d6c012c0506f5da1b8885b3301f29f0f9861b Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 12 Apr 2025 14:35:40 +0700 Subject: [PATCH 0684/1214] [ticket/17491] Fix caching search results PHPBB-17491 --- phpBB/phpbb/search/base.php | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index e33dfc8f75b..6d60d03986f 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -76,10 +76,16 @@ function obtain_ids($search_key, &$result_count, &$id_ary, &$start, $per_page, $ } } - // If the sort direction differs from the direction in the cache, then reverse the ids array + // If the sort direction differs from the direction in the cache, then recalculate array keys if ($reverse_ids) { - $stored_ids = array_reverse($stored_ids); + $keys = array_keys($stored_ids); + array_walk($keys, function (&$value, $key) use ($result_count) + { + $value = ($value >= 0) ? $result_count - $value - 1 : $value; + } + ); + $stored_ids = array_combine($keys, $stored_ids); } for ($i = $start, $n = $start + $per_page; ($i < $n) && ($i < $result_count); $i++) @@ -130,6 +136,8 @@ function save_ids($search_key, $keywords, $author_ary, $result_count, &$id_ary, } $store_ids = array_slice($id_ary, 0, $length); + $id_range = range($start, $start + $length - 1); + $store_ids = array_combine($id_range, $store_ids); // create a new resultset if there is none for this search_key yet // or add the ids to the existing resultset @@ -164,29 +172,26 @@ function save_ids($search_key, $keywords, $author_ary, $result_count, &$id_ary, $db->sql_query($sql); $store = array(-1 => $result_count, -2 => $sort_dir); - $id_range = range($start, $start + $length - 1); } else { // we use one set of results for both sort directions so we have to calculate the indizes - // for the reversed array and we also have to reverse the ids themselves + // for the reversed array if ($store[-2] != $sort_dir) { - $store_ids = array_reverse($store_ids); - $id_range = range($store[-1] - $start - $length, $store[-1] - $start - 1); - } - else - { - $id_range = range($start, $start + $length - 1); + $keys = array_keys($store_ids); + array_walk($keys, function (&$value, $key) use ($store) { + $value = $store[-1] - $value - 1; + }); + $store_ids = array_combine($keys, $store_ids); } } - $store_ids = array_combine($id_range, $store_ids); - // append the ids if (is_array($store_ids)) { $store += $store_ids; + ksort($store); // if the cache is too big if (count($store) - 2 > 20 * $config['search_block_size']) From f04f07f26524b71f2859470da017224771c18700 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 12 Apr 2025 14:00:31 -0700 Subject: [PATCH 0685/1214] [ticket/17494] Handle boolean attributes in checkbox assertions tests PHPBB-17494 --- tests/test_framework/phpbb_functional_test_case.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 79e76fd1aec..bec0845f0ae 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1236,12 +1236,11 @@ public function assert_filter($crawler, $expr, $msg = null) * @param string $name * @param string $message * - * @return null + * @return void */ public function assert_checkbox_is_checked($crawler, $name, $message = '') { - $this->assertSame( - 'checked', + $this->assertNotNull( $this->assert_find_one_checkbox($crawler, $name)->attr('checked'), $message ?: "Failed asserting that checkbox $name is checked." ); @@ -1255,7 +1254,7 @@ public function assert_checkbox_is_checked($crawler, $name, $message = '') * @param string $name * @param string $message * - * @return null + * @return void */ public function assert_checkbox_is_unchecked($crawler, $name, $message = '') { From 860c2fe6018b77c0f86e2928d959b172708eef0d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 10:26:30 +0200 Subject: [PATCH 0686/1214] [ticket/17493] Start adding migration for removing jabber PHPBB-17493 --- .../db/migration/data/v400/remove_jabber.php | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_jabber.php diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php new file mode 100644 index 00000000000..acf61b26327 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -0,0 +1,83 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_jabber extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + '\phpbb\db\migration\data\v400\add_webpush', + ]; + } + + public function update_schema(): array + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'users' => [ + 'user_jabber', + ], + ] + ]; + } + + public function effectively_installed() + { + return true; + } + + public function revert_schema(): array + { + return [ + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'user_jabber' => ['VCHAR_UNI', ''], + ], + ] + ]; + } + + public function update_data(): array + { + return [ + ['config.remove', ['jab_verify_peer']], + ['config.remove', ['jab_verify_peer_name']], + ['config.remove', ['jab_allow_self_signed']], + ]; + } + + public function revert_data(): array + { + return [ + ['config.add', ['jab_verify_peer', 1]], + ['config.add', ['jab_verify_peer_name', 1]], + ['config.add', ['jab_allow_self_signed', 0]], + ['module.add', [ + 'acp', + 'ACP_CLIENT_COMMUNICATION', + [ + 'module_basename' => 'acp_board', + 'module_langname' => 'ACP_WEBPUSH_SETTINGS', + 'module_mode' => 'webpush', + 'module_auth' => 'acl_a_board', + 'after' => ['settings', 'ACP_JABBER_SETTINGS'], + ], + ]], + ]; + } +} From a5c34234da0004a9a0b059458d7e8b3f0cee6cf1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 12:56:03 +0200 Subject: [PATCH 0687/1214] [ticket/17493] Update migration with module to remove PHPBB-17493 --- .../db/migration/data/v400/remove_jabber.php | 28 +++++++++++++++---- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index acf61b26327..4398b3bd3c7 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -55,15 +55,34 @@ public function revert_schema(): array public function update_data(): array { return [ + ['config.remove', ['jab_enable']], + ['config.remove', ['jab_host']], + ['config.remove', ['jab_package_size']], + ['config.remove', ['jab_password']], + ['config.remove', ['jab_port']], + ['config.remove', ['jab_use_ssl']], + ['config.remove', ['jab_username']], ['config.remove', ['jab_verify_peer']], ['config.remove', ['jab_verify_peer_name']], ['config.remove', ['jab_allow_self_signed']], + ['module.remove', [ + 'acp', + 'ACP_CLIENT_COMMUNICATION', + 'ACP_JABBER_SETTINGS', + ]], ]; } public function revert_data(): array { return [ + ['config.add', ['jab_enable', 0]], + ['config.add', ['jab_host', '']], + ['config.add', ['jab_package_size', 20]], + ['config.add', ['jab_password', '']], + ['config.add', ['jab_port', 5222]], + ['config.add', ['jab_use_ssl', 0]], + ['config.add', ['jab_username', '']], ['config.add', ['jab_verify_peer', 1]], ['config.add', ['jab_verify_peer_name', 1]], ['config.add', ['jab_allow_self_signed', 0]], @@ -71,11 +90,10 @@ public function revert_data(): array 'acp', 'ACP_CLIENT_COMMUNICATION', [ - 'module_basename' => 'acp_board', - 'module_langname' => 'ACP_WEBPUSH_SETTINGS', - 'module_mode' => 'webpush', - 'module_auth' => 'acl_a_board', - 'after' => ['settings', 'ACP_JABBER_SETTINGS'], + 'module_basename' => 'acp_jabber', + 'module_langname' => 'ACP_JABBER_SETTINGS', + 'module_mode' => 'settings', + 'module_auth' => 'acl_a_jabber', ], ]], ]; From 705b5ca57274dfdd679d0882aa69763045b3e1ae Mon Sep 17 00:00:00 2001 From: LukeWCS Date: Sat, 12 Apr 2025 17:33:04 +0200 Subject: [PATCH 0688/1214] [ticket/17492] Unintuitive checkbox status inverted for forum subscriptions PHPBB-17492 --- phpBB/styles/prosilver/template/navbar_footer.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 1c5031e9b9f..8a794251136 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -22,13 +22,13 @@ {% endapply %} - + {% if U_WATCH_FORUM_LINK && !S_IS_BOT %}
                • - - {S_WATCH_FORUM_TITLE} + + {{ S_WATCH_FORUM_TITLE }}
                  • - + {% endif %}
                • {S_TIMEZONE}
                  • From afbc0794d2cee2dbfc24166d50e4320202d4ebe4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 13:02:51 +0200 Subject: [PATCH 0689/1214] [ticket/17493] Remove jabber settings from schema data PHPBB-17493 --- phpBB/install/schemas/schema_data.sql | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 43b8f95fc8e..ad9d5e3e5ab 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -168,16 +168,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_check', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_max', '50'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_time', '21600'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ip_login_limit_use_forwarded', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_allow_self_signed', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_enable', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_host', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_package_size', '20'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_password', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_port', '5222'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_use_ssl', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_username', ''); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_verify_peer', '1'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('jab_verify_peer_name', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_base_dn', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_email', ''); INSERT INTO phpbb_config (config_name, config_value) VALUES ('ldap_password', ''); From 8c6731ffb9527797b0e35c685fc0106441078c19 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 13:13:38 +0200 Subject: [PATCH 0690/1214] [ticket/17493] Remove jabber permission and effectively_installed PHPBB-17493 --- phpBB/phpbb/db/migration/data/v400/remove_jabber.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 4398b3bd3c7..1669e7e0c17 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -36,11 +36,6 @@ public function update_schema(): array ]; } - public function effectively_installed() - { - return true; - } - public function revert_schema(): array { return [ @@ -70,6 +65,7 @@ public function update_data(): array 'ACP_CLIENT_COMMUNICATION', 'ACP_JABBER_SETTINGS', ]], + ['permission.remove', ['a_jabber']], ]; } @@ -96,6 +92,7 @@ public function revert_data(): array 'module_auth' => 'acl_a_jabber', ], ]], + ['permission.add', ['a_jabber', true]], ]; } } From 30178ee443f46110c934b353e7e02d6678c2f851 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 16:16:31 +0200 Subject: [PATCH 0691/1214] [ticket/17493] Start removing jabber from acp PHPBB-17493 --- phpBB/adm/style/acp_jabber.html | 83 ------------ phpBB/adm/style/acp_users_prefs.html | 6 - phpBB/adm/style/acp_users_profile.html | 4 - phpBB/includes/acp/acp_email.php | 6 +- phpBB/includes/acp/acp_inactive.php | 2 +- phpBB/includes/acp/acp_jabber.php | 139 -------------------- phpBB/includes/acp/acp_users.php | 7 - phpBB/includes/acp/info/acp_jabber.php | 34 ----- phpBB/language/en/acp/board.php | 28 ---- phpBB/language/en/acp/common.php | 8 -- phpBB/language/en/acp/permissions_phpbb.php | 1 - 11 files changed, 4 insertions(+), 314 deletions(-) delete mode 100644 phpBB/adm/style/acp_jabber.html delete mode 100644 phpBB/includes/acp/acp_jabber.php delete mode 100644 phpBB/includes/acp/info/acp_jabber.php diff --git a/phpBB/adm/style/acp_jabber.html b/phpBB/adm/style/acp_jabber.html deleted file mode 100644 index 5267062106a..00000000000 --- a/phpBB/adm/style/acp_jabber.html +++ /dev/null @@ -1,83 +0,0 @@ - - - - -

                  {L_ACP_JABBER_SETTINGS}

                  - -

                  {L_ACP_JABBER_SETTINGS_EXPLAIN}

                  - - -
                  -

                  {L_WARNING}

                  -

                  {WARNING_MSG}

                  -
                  - - -
                  - -
                  - {L_ACP_JABBER_SETTINGS} - -

                  {L_JAB_GTALK_NOTE}

                  - -
                  -

                  {L_JAB_ENABLE_EXPLAIN}
                  -
                  -
                  -
                  -
                  -

                  {L_JAB_SERVER_EXPLAIN}
                  -
                  -
                  -
                  -

                  {L_JAB_PORT_EXPLAIN}
                  -
                  -
                  -
                  -

                  {L_JAB_USERNAME_EXPLAIN}
                  -
                  -
                  -
                  -

                  {L_JAB_PASSWORD_EXPLAIN}
                  -
                  -
                  - -
                  -

                  {L_JAB_USE_SSL_EXPLAIN}
                  -
                  -
                  -
                  -
                  -

                  {L_JAB_VERIFY_PEER_EXPLAIN}
                  -
                  -
                  -
                  -
                  -

                  {L_JAB_VERIFY_PEER_NAME_EXPLAIN}
                  -
                  -
                  -
                  -
                  -

                  {L_JAB_ALLOW_SELF_SIGNED_EXPLAIN}
                  -
                  -
                  -
                  - -
                  -

                  {L_JAB_PACKAGE_SIZE_EXPLAIN}
                  -
                  -
                  - -
                  - -
                  - {L_ACP_SUBMIT_CHANGES} -

                  -   - -

                  - {S_FORM_TOKEN} -
                  -
                  - - diff --git a/phpBB/adm/style/acp_users_prefs.html b/phpBB/adm/style/acp_users_prefs.html index d485d1e1132..7dbef95974c 100644 --- a/phpBB/adm/style/acp_users_prefs.html +++ b/phpBB/adm/style/acp_users_prefs.html @@ -29,12 +29,6 @@
    -
    -

    {L_NOTIFY_METHOD_EXPLAIN}
    -
    - -
    -
    diff --git a/phpBB/adm/style/acp_users_profile.html b/phpBB/adm/style/acp_users_profile.html index 9296638ff6e..54f7245f813 100644 --- a/phpBB/adm/style/acp_users_profile.html +++ b/phpBB/adm/style/acp_users_profile.html @@ -3,10 +3,6 @@
    {L_USER_PROFILE} -
    -
    -
    -

    {L_BIRTHDAY_EXPLAIN}
    {L_DAY}{L_COLON} {L_MONTH}{L_COLON} {L_YEAR}{L_COLON}
    diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index dfe58eb3187..dc62e385cd9 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -76,7 +76,7 @@ function main($id, $mode) { // If giving usernames the admin is able to email inactive users too... $sql_ary = array( - 'SELECT' => 'user_id, username, user_email, user_jabber, user_notify_type, user_lang', + 'SELECT' => 'user_id, username, user_email, user_notify_type, user_lang', 'FROM' => array( USERS_TABLE => '', ), @@ -90,7 +90,7 @@ function main($id, $mode) if ($group_id) { $sql_ary = array( - 'SELECT' => 'u.user_id, u.user_email, u.username, u.username_clean, u.user_lang, u.user_jabber, u.user_notify_type', + 'SELECT' => 'u.user_id, u.user_email, u.username, u.username_clean, u.user_lang, u.user_notify_type', 'FROM' => array( USERS_TABLE => 'u', USER_GROUP_TABLE => 'ug', @@ -106,7 +106,7 @@ function main($id, $mode) else { $sql_ary = array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type', + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_email, u.user_lang, u.user_notify_type', 'FROM' => array( USERS_TABLE => 'u', ), diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index e1a511852bc..138e06e5258 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -185,7 +185,7 @@ function main($id, $mode) trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING); } - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type, user_regdate, user_actkey + $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_type, user_regdate, user_actkey FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark) . ' AND user_inactive_reason'; diff --git a/phpBB/includes/acp/acp_jabber.php b/phpBB/includes/acp/acp_jabber.php deleted file mode 100644 index fce1dee1df5..00000000000 --- a/phpBB/includes/acp/acp_jabber.php +++ /dev/null @@ -1,139 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -/** -* @todo Check/enter/update transport info -*/ - -/** -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -class acp_jabber -{ - var $u_action; - - function main($id, $mode) - { - global $db, $user, $template, $phpbb_log, $request; - global $config, $phpbb_container, $phpbb_root_path, $phpEx; - - $jabber = $phpbb_container->get('messenger.method.jabber'); - - $user->add_lang('acp/board'); - - $submit = (isset($_POST['submit'])) ? true : false; - - if ($mode != 'settings') - { - return; - } - - $this->tpl_name = 'acp_jabber'; - $this->page_title = 'ACP_JABBER_SETTINGS'; - - $jab_enable = $request->variable('jab_enable', (bool) $config['jab_enable']); - $jab_host = $request->variable('jab_host', (string) $config['jab_host']); - $jab_port = $request->variable('jab_port', (int) $config['jab_port']); - $jab_username = $request->variable('jab_username', (string) $config['jab_username']); - $jab_password = $request->variable('jab_password', (string) $config['jab_password']); - $jab_package_size = $request->variable('jab_package_size', (int) $config['jab_package_size']); - $jab_use_ssl = $request->variable('jab_use_ssl', (bool) $config['jab_use_ssl']); - $jab_verify_peer = $request->variable('jab_verify_peer', (bool) $config['jab_verify_peer']); - $jab_verify_peer_name = $request->variable('jab_verify_peer_name', (bool) $config['jab_verify_peer_name']); - $jab_allow_self_signed = $request->variable('jab_allow_self_signed', (bool) $config['jab_allow_self_signed']); - - $form_name = 'acp_jabber'; - add_form_key($form_name); - - if ($submit) - { - if (!check_form_key($form_name)) - { - trigger_error($user->lang['FORM_INVALID']. adm_back_link($this->u_action), E_USER_WARNING); - } - - $message = $user->lang['JAB_SETTINGS_CHANGED']; - $log = 'JAB_SETTINGS_CHANGED'; - - // Is this feature enabled? Then try to establish a connection - if ($jabber->is_enabled()) - { - if (!$jabber->connect()) - { - trigger_error($user->lang['ERR_JAB_CONNECT'] . '

    ' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); - } - - // We'll try to authorise using this account - if (!$jabber->login()) - { - trigger_error($user->lang['ERR_JAB_AUTH'] . '

    ' . $jabber->get_log() . adm_back_link($this->u_action), E_USER_WARNING); - } - - $jabber->disconnect(); - } - else - { - // This feature is disabled. - // We update the user table to be sure all users that have IM as notify type are set to both as notify type - // We set this to both because users still have their jabber address entered and may want to receive jabber notifications again once it is re-enabled. - $sql_ary = array( - 'user_notify_type' => $jabber::NOTIFY_BOTH, - ); - - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_notify_type = ' . $jabber::NOTIFY_IM; - $db->sql_query($sql); - } - - $config->set('jab_enable', $jab_enable); - $config->set('jab_host', $jab_host); - $config->set('jab_port', $jab_port); - $config->set('jab_username', $jab_username); - if ($jab_password !== '********') - { - $config->set('jab_password', $jab_password); - } - $config->set('jab_package_size', $jab_package_size); - $config->set('jab_use_ssl', $jab_use_ssl); - $config->set('jab_verify_peer', $jab_verify_peer); - $config->set('jab_verify_peer_name', $jab_verify_peer_name); - $config->set('jab_allow_self_signed', $jab_allow_self_signed); - - $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_' . $log); - trigger_error($message . adm_back_link($this->u_action)); - } - - $template->assign_vars(array( - 'U_ACTION' => $this->u_action, - 'JAB_ENABLE' => $jab_enable, - 'L_JAB_SERVER_EXPLAIN' => sprintf($user->lang['JAB_SERVER_EXPLAIN'], '', ''), - 'JAB_HOST' => $jab_host, - 'JAB_PORT' => ($jab_port) ? $jab_port : '', - 'JAB_USERNAME' => $jab_username, - 'JAB_PASSWORD' => $jab_password !== '' ? '********' : '', - 'JAB_PACKAGE_SIZE' => $jab_package_size, - 'JAB_USE_SSL' => $jab_use_ssl, - 'JAB_VERIFY_PEER' => $jab_verify_peer, - 'JAB_VERIFY_PEER_NAME' => $jab_verify_peer_name, - 'JAB_ALLOW_SELF_SIGNED' => $jab_allow_self_signed, - 'S_CAN_USE_SSL' => $jabber::can_use_ssl(), - 'S_GTALK_NOTE' => (!@function_exists('dns_get_record')) ? true : false, - )); - } -} diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index a954ec09f03..e01eace64e5 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1426,7 +1426,6 @@ function main($id, $mode) $user_row['iso_lang_id'] = $row['lang_id']; $data = array( - 'jabber' => $request->variable('jabber', $user_row['user_jabber'], true), 'bday_day' => 0, 'bday_month' => 0, 'bday_year' => 0, @@ -1458,9 +1457,6 @@ function main($id, $mode) if ($submit) { $error = validate_data($data, array( - 'jabber' => array( - array('string', true, 5, 255), - array('jabber')), 'bday_day' => array('num', true, 1, 31), 'bday_month' => array('num', true, 1, 12), 'bday_year' => array('num', true, 1901, gmdate('Y', time())), @@ -1496,7 +1492,6 @@ function main($id, $mode) if (!count($error)) { $sql_ary = array( - 'user_jabber' => $data['jabber'], 'user_birthday' => $data['user_birthday'], ); @@ -1553,7 +1548,6 @@ function main($id, $mode) unset($now); $template->assign_vars(array( - 'JABBER' => $data['jabber'], 'S_BIRTHDAY_DAY_OPTIONS' => $s_birthday_day_options, 'S_BIRTHDAY_MONTH_OPTIONS' => $s_birthday_month_options, 'S_BIRTHDAY_YEAR_OPTIONS' => $s_birthday_year_options, @@ -1787,7 +1781,6 @@ function main($id, $mode) $user_prefs_data = array( 'S_PREFS' => true, - 'S_JABBER_DISABLED' => ($config['jab_enable'] && $user_row['user_jabber'] && @extension_loaded('xml')) ? false : true, 'VIEW_EMAIL' => $data['viewemail'], 'MASS_EMAIL' => $data['massemail'], diff --git a/phpBB/includes/acp/info/acp_jabber.php b/phpBB/includes/acp/info/acp_jabber.php deleted file mode 100644 index 660299a12d8..00000000000 --- a/phpBB/includes/acp/info/acp_jabber.php +++ /dev/null @@ -1,34 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -class acp_jabber_info -{ - function module() - { - return array( - 'filename' => 'acp_jabber', - 'title' => 'ACP_JABBER_SETTINGS', - 'modes' => array( - 'settings' => array('title' => 'ACP_JABBER_SETTINGS', 'auth' => 'acl_a_jabber', 'cat' => array('ACP_CLIENT_COMMUNICATION')), - ), - ); - } - - function install() - { - } - - function uninstall() - { - } -} diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index e46091c9545..4bdaa127968 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -586,31 +586,3 @@ 'WEBPUSH_DROPDOWN_SUBSCRIBE' => 'Show “Subscribe” button in notification dropdown', 'WEBPUSH_DROPDOWN_SUBSCRIBE_EXPLAIN' => 'Display a “Subscribe” button in the Notification dropdown, allowing users to easily subscribe to push notifications from anywhere in the forum.', ]); - -// Jabber settings -$lang = array_merge($lang, array( - 'ACP_JABBER_SETTINGS_EXPLAIN' => 'Here you can enable and control the use of Jabber for instant messaging and board notifications. Jabber is an open source protocol and therefore available for use by anyone. Some Jabber servers include gateways or transports which allow you to contact users on other networks. Not all servers offer all transports and changes in protocols can prevent transports from operating. Please be sure to enter already registered account details - phpBB will use the details you enter here as is.', - - 'JAB_ALLOW_SELF_SIGNED' => 'Allow self-signed SSL certificates', - 'JAB_ALLOW_SELF_SIGNED_EXPLAIN' => 'Allow connections to Jabber server with self-signed SSL certificate.
    Warning: Allowing self-signed SSL certificates may cause security implications.', - 'JAB_ENABLE' => 'Enable Jabber', - 'JAB_ENABLE_EXPLAIN' => 'Enables use of Jabber messaging and notifications.', - 'JAB_GTALK_NOTE' => 'Please note that GTalk will not work because the dns_get_record function could not be found. This function is not available in PHP4, and is not implemented on Windows platforms. It currently does not work on BSD-based systems, including Mac OS.', - 'JAB_PACKAGE_SIZE' => 'Jabber package size', - 'JAB_PACKAGE_SIZE_EXPLAIN' => 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.', - 'JAB_PASSWORD' => 'Jabber password', - 'JAB_PASSWORD_EXPLAIN' => 'Warning: This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.', - 'JAB_PORT' => 'Jabber port', - 'JAB_PORT_EXPLAIN' => 'Leave blank unless you know it is not port 5222.', - 'JAB_SERVER' => 'Jabber server', - 'JAB_SERVER_EXPLAIN' => 'See %sjabber.org%s for a list of servers.', - 'JAB_SETTINGS_CHANGED' => 'Jabber settings changed successfully.', - 'JAB_USE_SSL' => 'Use SSL to connect', - 'JAB_USE_SSL_EXPLAIN' => 'If enabled a secure connection is tried to be established. The Jabber port will be modified to 5223 if port 5222 is specified.', - 'JAB_USERNAME' => 'Jabber username or JID', - 'JAB_USERNAME_EXPLAIN' => 'Specify a registered username or a valid JID. The username will not be checked for validity. If you only specify a username, then your JID will be the username and the server you specified above. Else, specify a valid JID, for example user@jabber.org.', - 'JAB_VERIFY_PEER' => 'Verify SSL certificate', - 'JAB_VERIFY_PEER_EXPLAIN' => 'Require verification of SSL certificate used by Jabber server.
    Warning: Connecting peers with unverified SSL certificates may cause security implications.', - 'JAB_VERIFY_PEER_NAME' => 'Verify Jabber peer name', - 'JAB_VERIFY_PEER_NAME_EXPLAIN' => 'Require verification of peer name for Jabber servers using SSL / TLS connections.
    Warning: Connecting to unverified peers may cause security implications.', -)); diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 62c08f02262..e2bbef019e9 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -120,8 +120,6 @@ 'ACP_INACTIVE_USERS' => 'Inactive users', 'ACP_INDEX' => 'ACP index', - 'ACP_JABBER_SETTINGS' => 'Jabber settings', - 'ACP_LANGUAGE' => 'Language management', 'ACP_LANGUAGE_PACKS' => 'Language packs', 'ACP_LOAD_SETTINGS' => 'Load settings', @@ -642,7 +640,6 @@ 'LOG_DOWNLOAD_IP' => 'Added IP/hostname to download list
    » %s', 'LOG_DOWNLOAD_REMOVE_IP' => 'Removed IP/hostname from download list
    » %s', - 'LOG_ERROR_JABBER' => 'Jabber error
    » %s', 'LOG_ERROR_EMAIL' => 'Email error
    » %s', 'LOG_ERROR_CAPTCHA' => 'CAPTCHA error
    » %s', @@ -686,11 +683,6 @@ 'LOG_IP_BROWSER_FORWARDED_CHECK' => 'Session IP/browser/X_FORWARDED_FOR check failed
    »User IP “%1$s” checked against session IP “%2$s”, user browser string “%3$s” checked against session browser string “%4$s” and user X_FORWARDED_FOR string “%5$s” checked against session X_FORWARDED_FOR string “%6$s”.', - 'LOG_JAB_CHANGED' => 'Jabber account changed', - 'LOG_JAB_PASSCHG' => 'Jabber password changed', - 'LOG_JAB_REGISTER' => 'Jabber account registered', - 'LOG_JAB_SETTINGS_CHANGED' => 'Jabber settings changed', - 'LOG_LANGUAGE_PACK_DELETED' => 'Deleted language pack
    » %s', 'LOG_LANGUAGE_PACK_INSTALLED' => 'Installed language pack
    » %s', 'LOG_LANGUAGE_PACK_UPDATED' => 'Updated language pack details
    » %s', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 590ccaaf9f5..516e8117684 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -168,7 +168,6 @@ $lang = array_merge($lang, array( 'ACL_A_BOARD' => 'Can alter board settings/check for updates', 'ACL_A_SERVER' => 'Can alter server/communication settings', - 'ACL_A_JABBER' => 'Can alter Jabber settings', 'ACL_A_PHPINFO' => 'Can view php settings', 'ACL_A_FORUM' => 'Can manage forums', From e32ebda982756be1c228b363398e9cdba78df966 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 16:17:25 +0200 Subject: [PATCH 0692/1214] [ticket/17493] Remove memberlist IM page PHPBB-17493 --- phpBB/memberlist.php | 118 +----------------- .../prosilver/template/memberlist_im.html | 46 ------- 2 files changed, 2 insertions(+), 162 deletions(-) delete mode 100644 phpBB/styles/prosilver/template/memberlist_im.html diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 7b502e91c8b..c031b017886 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -373,120 +373,6 @@ ); break; - case 'contact': - - $page_title = $user->lang['IM_USER']; - $template_html = 'memberlist_im.html'; - - if (!$auth->acl_get('u_sendim')) - { - send_status_line(403, 'Forbidden'); - trigger_error('NOT_AUTHORISED'); - } - - $presence_img = ''; - switch ($action) - { - case 'jabber': - $lang = 'JABBER'; - $sql_field = 'user_jabber'; - $s_select = (@extension_loaded('xml') && $config['jab_enable']) ? 'S_SEND_JABBER' : 'S_NO_SEND_JABBER'; - $s_action = append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"); - break; - - default: - trigger_error('NO_MODE', E_USER_ERROR); - break; - } - - // Grab relevant data - $sql = "SELECT user_id, username, user_email, user_lang, $sql_field - FROM " . USERS_TABLE . " - WHERE user_id = $user_id - AND user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ')'; - $result = $db->sql_query($sql); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - if (!$row) - { - trigger_error('NO_USER'); - } - else if (empty($row[$sql_field])) - { - trigger_error('IM_NO_DATA'); - } - - // Post data grab actions - switch ($action) - { - case 'jabber': - add_form_key('memberlist_messaging'); - - if ($submit && @extension_loaded('xml') && $config['jab_enable']) - { - if (check_form_key('memberlist_messaging')) - { - - $subject = sprintf($user->lang['IM_JABBER_SUBJECT'], $user->data['username'], $config['server_name']); - $message = $request->variable('message', '', true); - - if (empty($message)) - { - trigger_error('EMPTY_MESSAGE_IM'); - } - - $jabber = $phpbb_container->get('messenger.method.jabber'); - $jabber->set_use_queue(false); - - $jabber->template('profile_send_im', $row['user_lang']); - $jabber->subject(html_entity_decode($subject, ENT_COMPAT)); - $jabber->set_addresses($row); - - $jabber->assign_vars([ - 'BOARD_CONTACT' => phpbb_get_board_contact($config, $phpEx), - 'FROM_USERNAME' => html_entity_decode($user->data['username'], ENT_COMPAT), - 'TO_USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), - 'MESSAGE' => html_entity_decode($message, ENT_COMPAT), - ]); - - $jabber->send(); - - $s_select = 'S_SENT_JABBER'; - } - else - { - trigger_error('FORM_INVALID'); - } - } - break; - } - - $template->assign_block_vars('navlinks', array( - 'BREADCRUMB_NAME' => $page_title, - 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=$action&u=$user_id"), - )); - - // Send vars to the template - $template->assign_vars(array( - 'IM_CONTACT' => $row[$sql_field], - 'A_IM_CONTACT' => addslashes($row[$sql_field]), - - 'USERNAME' => $row['username'], - 'CONTACT_NAME' => $row[$sql_field], - 'SITENAME' => $config['sitename'], - - 'PRESENCE_IMG' => $presence_img, - - 'L_SEND_IM_EXPLAIN' => $user->lang['IM_' . $lang], - 'L_IM_SENT_JABBER' => sprintf($user->lang['IM_SENT_JABBER'], $row['username']), - - $s_select => true, - 'S_IM_ACTION' => $s_action) - ); - - break; - case 'viewprofile': // Display a profile if ($user_id == ANONYMOUS && !$username) @@ -950,8 +836,8 @@ { // Generate the navlinks based on the selected topic $navlinks_sql_array = [ - 'SELECT' => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, - f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, + 'SELECT' => 'f.parent_id, f.forum_parents, f.left_id, f.right_id, f.forum_type, f.forum_name, + f.forum_id, f.forum_desc, f.forum_desc_uid, f.forum_desc_bitfield, f.forum_desc_options, f.forum_options, t.topic_title', 'FROM' => [ FORUMS_TABLE => 'f', diff --git a/phpBB/styles/prosilver/template/memberlist_im.html b/phpBB/styles/prosilver/template/memberlist_im.html deleted file mode 100644 index f91454aacb7..00000000000 --- a/phpBB/styles/prosilver/template/memberlist_im.html +++ /dev/null @@ -1,46 +0,0 @@ - - -

    {L_SEND_IM}

    - -
    - -
    -
    - -

    {L_SEND_IM_EXPLAIN}

    - - -

    {L_IM_SENT_JABBER}

    - - -
    -
    -
    -
    {USERNAME} [ {IM_CONTACT} ] {PRESENCE_IMG}
    -
    - - -
    -
    -
    -
    -
    -
     
    -
    -
    - -
    -
     
    -
    {L_IM_NO_JABBER}
    -
    - - {S_FORM_TOKEN} -
    - -
    -
    -
    - -{L_CLOSE_WINDOW} - - From a7c7c38bfbfed5b069480c819218359eb1355d14 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 20:48:15 +0200 Subject: [PATCH 0693/1214] [ticket/17493] Remove settings, values, and lang vars for jabber PHPBB-17493 --- phpBB/includes/functions_display.php | 5 ---- phpBB/includes/functions_user.php | 2 +- phpBB/includes/mcp/mcp_reports.php | 2 +- phpBB/includes/ucp/ucp_pm_viewmessage.php | 13 +--------- phpBB/includes/ucp/ucp_prefs.php | 7 ------ phpBB/includes/ucp/ucp_profile.php | 24 +++---------------- phpBB/includes/ucp/ucp_resend.php | 2 +- phpBB/install/convertors/convert_phpbb20.php | 1 - phpBB/install/schemas/schema_data.sql | 3 +-- phpBB/language/en/common.php | 6 ----- phpBB/language/en/memberlist.php | 5 ---- phpBB/language/en/ucp.php | 3 --- .../db/migration/data/v400/remove_jabber.php | 1 + phpBB/phpbb/permissions.php | 1 - phpBB/phpbb/ucp/controller/reset_password.php | 4 ++-- .../prosilver/template/memberlist_search.html | 6 ----- .../prosilver/template/memberlist_view.html | 1 - .../template/ucp_prefs_personal.html | 10 -------- .../template/ucp_profile_profile_info.html | 6 ----- phpBB/viewtopic.php | 9 ------- tests/auth/provider_apache_test.php | 1 - 21 files changed, 11 insertions(+), 101 deletions(-) diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index e8f49f03292..860bb8d89ab 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1681,7 +1681,6 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl 'S_ONLINE' => ($config['load_onlinetrack'] && $online) ? true : false, 'RANK_IMG' => $user_rank_data['img'], 'RANK_IMG_SRC' => $user_rank_data['img_src'], - 'S_JABBER_ENABLED' => ($config['jab_enable']) ? true : false, 'S_WARNINGS' => ($auth->acl_getf_global('m_') || $auth->acl_get('m_warn')) ? true : false, @@ -1690,10 +1689,6 @@ function phpbb_show_profile($data, $user_notes_enabled = false, $warn_user_enabl 'U_WARN' => ($warn_user_enabled && $auth->acl_get('m_warn')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_user&u=' . $user_id) : '', 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $user_id) : '', 'U_EMAIL' => $email, - 'U_JABBER' => ($data['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $user_id) : '', - - 'USER_JABBER' => ($config['jab_enable'] && $auth->acl_get('u_sendim')) ? $data['user_jabber'] : '', - 'USER_JABBER_IMG' => ($config['jab_enable'] && $auth->acl_get('u_sendim') && $data['user_jabber']) ? $user->img('icon_contact_jabber', $data['user_jabber']) : '', 'L_SEND_EMAIL_USER' => $user->lang('SEND_EMAIL_USER', $username), 'L_CONTACT_USER' => $user->lang('CONTACT_USER', $username), diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index e495198a684..563564cf67e 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2730,7 +2730,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna case 'approve': // Make sure we only approve those which are pending ;) - $sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_jabber, u.user_lang + $sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_lang FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug WHERE ug.group_id = ' . $group_id . ' AND ug.user_pending = 1 diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 7843bc1efe5..3325fd6b8da 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -661,7 +661,7 @@ function close_report($report_id_list, $mode, $action, $pm = false) { $post_info = ($pm) ? phpbb_get_pm_data($post_id_list) : phpbb_get_post_data($post_id_list, 'm_report'); - $sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_jabber, u.user_lang, u.user_notify_type + $sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_lang, u.user_notify_type FROM " . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u WHERE ' . $db->sql_in_set('r.report_id', $report_id_list) . ' ' . (($action == 'close') ? 'AND r.report_closed = 0' : '') . ' diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index 060a9941b39..d418e498871 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -201,18 +201,13 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) } } - $u_pm = $u_jabber = ''; + $u_pm = ''; if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($user_info['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) { $u_pm = append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $author_id); } - if ($config['jab_enable'] && $user_info['user_jabber'] && $auth->acl_get('u_sendim')) - { - $u_jabber = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contact&action=jabber&u=' . $author_id); - } - $can_edit_pm = ($message_row['message_time'] > time() - ($config['pm_edit_time'] * 60) || !$config['pm_edit_time']) && $folder_id == PRIVMSGS_OUTBOX && $auth->acl_get('u_pm_edit'); $msg_data = array( @@ -248,7 +243,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'MESSAGE_ID' => $message_row['msg_id'], 'U_PM' => $u_pm, - 'U_JABBER' => $u_jabber, 'U_DELETE' => ($auth->acl_get('u_pm_delete')) ? "$url&mode=compose&action=delete&f=$folder_id&p=" . $message_row['msg_id'] : '', 'U_EMAIL' => $user_info['email'], @@ -358,11 +352,6 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'NAME' => $user->lang['SEND_EMAIL'], 'U_CONTACT' => $user_info['email'], ), - array( - 'ID' => 'jabber', - 'NAME' => $user->lang['JABBER'], - 'U_CONTACT' => $u_jabber, - ), ); foreach ($contact_fields as $field) diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index d08a81b8545..480b4a3d12f 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -54,12 +54,6 @@ function main($id, $mode) 'allowpm' => $request->variable('allowpm', (bool) $user->data['user_allow_pm']), ); - if ($data['notifymethod'] == messenger_interface::NOTIFY_IM && (!$config['jab_enable'] || !$user->data['user_jabber'] || !@extension_loaded('xml'))) - { - // Jabber isnt enabled, or no jabber field filled in. Update the users table to be sure its correct. - $data['notifymethod'] = messenger_interface::NOTIFY_BOTH; - } - /** * Add UCP edit global settings data before they are assigned to the template or submitted * @@ -218,7 +212,6 @@ function main($id, $mode) 'options' => $timezone_select, ], 'S_CAN_HIDE_ONLINE' => (bool) $auth->acl_get('u_hideonline'), - 'S_SELECT_NOTIFY' => (bool) ($config['jab_enable'] && $user->data['user_jabber'] && @extension_loaded('xml')), ]); break; diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 52b007a1fe6..77c1a56e9d3 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -284,9 +284,7 @@ function main($id, $mode) $cp_data = $cp_error = array(); - $data = array( - 'jabber' => $request->variable('jabber', $user->data['user_jabber'], true), - ); + $data = []; if ($config['allow_birthdays']) { @@ -318,11 +316,7 @@ function main($id, $mode) if ($submit) { - $validate_array = array( - 'jabber' => array( - array('string', true, 5, 255), - array('jabber')), - ); + $validate_array = []; if ($config['allow_birthdays']) { @@ -363,18 +357,8 @@ function main($id, $mode) if (!count($error)) { - $data['notify'] = $user->data['user_notify_type']; - - if ($data['notify'] == messenger_interface::NOTIFY_IM && (!$config['jab_enable'] || !$data['jabber'] || !@extension_loaded('xml'))) - { - // User has not filled in a jabber address (Or one of the modules is disabled or jabber is disabled) - // Disable notify by Jabber now for this user. - $data['notify'] = messenger_interface::NOTIFY_EMAIL; - } - $sql_ary = array( - 'user_jabber' => $data['jabber'], - 'user_notify_type' => $data['notify'], + 'user_notify_type' => messenger_interface::NOTIFY_EMAIL, ); if ($config['allow_birthdays']) @@ -446,8 +430,6 @@ function main($id, $mode) $template->assign_vars(array( 'ERROR' => (count($error)) ? implode('
    ', $error) : '', - 'S_JABBER_ENABLED' => $config['jab_enable'], - 'JABBER' => $data['jabber'], )); // Get additional profile fields and assign them to the template block var 'profile_fields' diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 43e26567e5e..d3512865dbf 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -128,7 +128,7 @@ function main($id, $mode) // Grab an array of user_id's with a_user permissions ... these users can activate a user $admin_ary = $auth->acl_get_list(false, 'a_user', false); - $sql = 'SELECT user_id, username, user_email, user_lang, user_jabber, user_notify_type + $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_type FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); $result = $db->sql_query($sql); diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 8750c24dcc7..cff03b712e8 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -923,7 +923,6 @@ array('user_inactive_reason', '', 'phpbb_inactive_reason'), array('user_inactive_time', '', 'phpbb_inactive_time'), - array('user_jabber', '', ''), array('user_rank', 'users.user_rank', 'intval'), array('user_permissions', '', ''), diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index ad9d5e3e5ab..fdae5771909 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -429,7 +429,6 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_group', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupadd', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_groupdel', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_icons', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_jabber', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_language', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_mauth', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('a_modules', 1); @@ -559,7 +558,7 @@ INSERT INTO phpbb_ranks (rank_title, rank_min, rank_special, rank_image) VALUES # -- Roles data # Standard Admin (a_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_jabber', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 1, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option NOT IN ('a_switchperm', 'a_phpinfo', 'a_server', 'a_backup', 'a_styles', 'a_clearlogs', 'a_modules', 'a_language', 'a_email', 'a_bots', 'a_search', 'a_aauth', 'a_roles'); # Forum admin (a_) INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 2, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'a_%' AND auth_option IN ('a_', 'a_authgroups', 'a_authusers', 'a_fauth', 'a_forum', 'a_forumadd', 'a_forumdel', 'a_mauth', 'a_prune', 'a_uauth', 'a_viewauth', 'a_viewlogs'); diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 7b6623e19a1..e9225c62742 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -232,8 +232,6 @@ 'ENTER_USERNAME' => 'Enter username', 'ERR_CHANGING_DIRECTORY' => 'Unable to change directory.', 'ERR_CONNECTING_SERVER' => 'Error connecting to the server.', - 'ERR_JAB_AUTH' => 'Could not authorise on Jabber server.', - 'ERR_JAB_CONNECT' => 'Could not connect to Jabber server.', 'ERR_UNABLE_TO_LOGIN' => 'The specified username or password is incorrect.', 'ERR_UNWATCHING' => 'An error occurred while trying to unsubscribe.', 'ERR_WATCHING' => 'An error occurred while trying to subscribe.', @@ -372,7 +370,6 @@ 'IP' => 'IP', 'IP_BLACKLISTED' => 'Your IP %1$s has been blocked because it is blacklisted. For details please see %2$s.', - 'JABBER' => 'Jabber', 'JOINED' => 'Joined', 'JUMP_PAGE' => 'Enter the page number you wish to go to', 'JUMP_TO' => 'Jump to', @@ -801,7 +798,6 @@ 'TOO_LONG_CONFIRM_CODE' => 'The confirm code you entered is too long.', 'TOO_LONG_DATEFORMAT' => 'The date format you entered is too long.', - 'TOO_LONG_JABBER' => 'The Jabber account name you entered is too long.', 'TOO_LONG_NEW_PASSWORD' => 'The password you entered is too long.', 'TOO_LONG_PASSWORD_CONFIRM' => 'The password confirmation you entered is too long.', 'TOO_LONG_USER_PASSWORD' => 'The password you entered is too long.', @@ -814,7 +810,6 @@ 'TOO_SHORT_CONFIRM_CODE' => 'The confirm code you entered is too short.', 'TOO_SHORT_DATEFORMAT' => 'The date format you entered is too short.', - 'TOO_SHORT_JABBER' => 'The Jabber account name you entered is too short.', 'TOO_SHORT_NEW_PASSWORD' => 'The password you entered is too short.', 'TOO_SHORT_PASSWORD_CONFIRM' => 'The password confirmation you entered is too short.', 'TOO_SHORT_USER_PASSWORD' => 'The password you entered is too short.', @@ -943,7 +938,6 @@ 'WRONG_PASSWORD' => 'You entered an incorrect password.', 'WRONG_DATA_COLOUR' => 'The colour value you entered is invalid.', - 'WRONG_DATA_JABBER' => 'The name you entered is not a valid Jabber account name.', 'WRONG_DATA_LANG' => 'The language you specified is not valid.', 'WRONG_DATA_POST_SD' => 'The post sort direction you specified is not valid.', 'WRONG_DATA_POST_SK' => 'The post sort option you specified is not valid.', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 2e757043bb9..09675d80958 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -78,16 +78,12 @@ 'IM_ADD_CONTACT' => 'Add Contact', 'IM_DOWNLOAD_APP' => 'Download application', - 'IM_JABBER' => 'Please note that users may have selected to not receive unsolicited instant messages.', - 'IM_JABBER_SUBJECT' => 'This is an automated message please do not reply! Message from user %1$s at %2$s.', 'IM_MESSAGE' => 'Your message', 'IM_NAME' => 'Your Name', 'IM_NO_DATA' => 'There is no suitable contact information for this user.', - 'IM_NO_JABBER' => 'Sorry, direct messaging of Jabber users is not supported on this board. You will need a Jabber client installed on your system to contact the recipient above.', 'IM_RECIPIENT' => 'Recipient', 'IM_SEND' => 'Send message', 'IM_SEND_MESSAGE' => 'Send message', - 'IM_SENT_JABBER' => 'Your message to %1$s has been sent successfully.', 'IM_USER' => 'Send an instant message', 'LAST_ACTIVE' => 'Last active', @@ -125,7 +121,6 @@ 'SENDER_NAME' => 'Your name', 'SEND_ICQ_MESSAGE' => 'Send ICQ message', 'SEND_IM' => 'Instant messaging', - 'SEND_JABBER_MESSAGE' => 'Send Jabber message', 'SEND_MESSAGE' => 'Message', 'SEND_YIM_MESSAGE' => 'Send YIM message', 'SORT_EMAIL' => 'Email', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 3d90f15742d..bf5299e7aa1 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -331,7 +331,6 @@ 'NOTIFICATION_GROUP_POSTING' => 'Posting Notifications', 'NOTIFICATION_METHOD_BOARD' => 'Notifications', 'NOTIFICATION_METHOD_EMAIL' => 'Email', - 'NOTIFICATION_METHOD_JABBER' => 'Jabber', 'NOTIFICATION_METHOD_WEBPUSH' => 'Web Push', 'NOTIFICATION_TYPE' => 'Notification type', 'NOTIFICATION_TYPE_BOOKMARK' => 'Someone replies to a topic you have bookmarked', @@ -354,7 +353,6 @@ 'NOTIFY_METHOD_BOTH' => 'Both', 'NOTIFY_METHOD_EMAIL' => 'Email only', 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', - 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Notify me on new private messages', 'NOTIFY_WEBPUSH_ENABLE' => 'Enable receiving Web Push notifications', 'NOTIFY_WEBPUSH_ENABLE_EXPLAIN' => 'Enable receiving browser-based push notifications.
    The notifications can be turned off at any time in your browser settings, by unsubscribing, or by disabling the push notifications below.', @@ -534,7 +532,6 @@ 'UCP_COPPA_BEFORE' => 'Before %s', 'UCP_COPPA_ON_AFTER' => 'On or after %s', 'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.', - 'UCP_JABBER' => 'Jabber address', 'UCP_LOGIN_LINK' => 'Set up an external account association', 'UCP_MAIN' => 'Overview', diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 1669e7e0c17..2a6ed89c21f 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -20,6 +20,7 @@ class remove_jabber extends migration public static function depends_on(): array { return [ + '\phpbb\db\migration\data\v31x\add_jabber_ssl_context_config_options', '\phpbb\db\migration\data\v400\dev', '\phpbb\db\migration\data\v400\add_webpush', ]; diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index 79102f96a80..afbd7109713 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -317,7 +317,6 @@ public function get_permission_lang($permission) // Admin Permissions 'a_board' => array('lang' => 'ACL_A_BOARD', 'cat' => 'settings'), 'a_server' => array('lang' => 'ACL_A_SERVER', 'cat' => 'settings'), - 'a_jabber' => array('lang' => 'ACL_A_JABBER', 'cat' => 'settings'), 'a_phpinfo' => array('lang' => 'ACL_A_PHPINFO', 'cat' => 'settings'), 'a_forum' => array('lang' => 'ACL_A_FORUM', 'cat' => 'forums'), diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 95a2a82b121..d9ec05316c1 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -176,7 +176,7 @@ public function request() } $sql_array = [ - 'SELECT' => 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type,' + 'SELECT' => 'user_id, username, user_permissions, user_email, user_notify_type, user_type,' . ' user_lang, user_inactive_reason, reset_token, reset_token_expiration', 'FROM' => [$this->users_table => 'u'], 'WHERE' => "user_email = '" . $this->db->sql_escape($email) . "'" . @@ -308,7 +308,7 @@ public function reset() add_form_key('ucp_reset_password'); $sql_array = [ - 'SELECT' => 'user_id, username, user_permissions, user_email, user_jabber, user_notify_type, user_type,' + 'SELECT' => 'user_id, username, user_permissions, user_email, user_notify_type, user_type,' . ' user_lang, user_inactive_reason, reset_token, reset_token_expiration', 'FROM' => [$this->users_table => 'u'], 'WHERE' => 'user_id = ' . $user_id, diff --git a/phpBB/styles/prosilver/template/memberlist_search.html b/phpBB/styles/prosilver/template/memberlist_search.html index 3d9e0dec2b7..a5644cc0c06 100644 --- a/phpBB/styles/prosilver/template/memberlist_search.html +++ b/phpBB/styles/prosilver/template/memberlist_search.html @@ -29,12 +29,6 @@

    {L_FIND_USERNAME}

    - - -
    -
    -
    -
    diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 2a69cb08bef..2a6d13847af 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -75,7 +75,6 @@

    {L_CONTACT_USER}

    {L_EMAIL_ADDRESS}{L_COLON}
    {L_SEND_EMAIL_USER}
    {L_PM}{L_COLON}
    {L_SEND_PRIVATE_MESSAGE}
    -
    {L_JABBER}{L_COLON}
    {L_SEND_JABBER_MESSAGE}
    {L_JABBER}{L_COLON}
    {USER_JABBER}
    diff --git a/phpBB/styles/prosilver/template/ucp_prefs_personal.html b/phpBB/styles/prosilver/template/ucp_prefs_personal.html index fe1ea17c746..82d2274c2f5 100644 --- a/phpBB/styles/prosilver/template/ucp_prefs_personal.html +++ b/phpBB/styles/prosilver/template/ucp_prefs_personal.html @@ -40,16 +40,6 @@

    {L_TITLE}

    - -
    -
    -
    - - - -
    -
    -
    diff --git a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html index 0f0acc6f99a..0dd54ee85fa 100644 --- a/phpBB/styles/prosilver/template/ucp_profile_profile_info.html +++ b/phpBB/styles/prosilver/template/ucp_profile_profile_info.html @@ -21,12 +21,6 @@

    {L_TITLE} [ {L_UCP_JABBER}{L_COLON} -
    -

    -
    for="{profile_fields.FIELD_ID}">{profile_fields.LANG_NAME}{L_COLON} * diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 152e7ee52fa..31812042922 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -802,7 +802,6 @@ 'SEARCH_IMG' => $user->img('icon_user_search', 'SEARCH_USER_POSTS'), 'PM_IMG' => $user->img('icon_contact_pm', 'SEND_PRIVATE_MESSAGE'), 'EMAIL_IMG' => $user->img('icon_contact_email', 'SEND_EMAIL'), - 'JABBER_IMG' => $user->img('icon_contact_jabber', 'JABBER') , 'REPORT_IMG' => $user->img('icon_post_report', 'REPORT_POST'), 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED'), 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'), @@ -1423,7 +1422,6 @@ 'rank_image_src' => '', 'pm' => '', 'email' => '', - 'jabber' => '', 'search' => '', 'age' => '', @@ -1493,7 +1491,6 @@ 'contact_user' => $user->lang('CONTACT_USER', get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['username'])), 'online' => false, - 'jabber' => ($config['jab_enable'] && $row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&action=jabber&u=$poster_id") : '', 'search' => ($config['load_search'] && $auth->acl_get('u_search')) ? append_sid("{$phpbb_root_path}search.$phpEx", "author_id=$poster_id&sr=posts") : '', 'author_full' => get_username_string('full', $poster_id, $row['username'], $row['user_colour']), @@ -2068,7 +2065,6 @@ 'U_SEARCH' => $user_cache[$poster_id]['search'], 'U_PM' => $u_pm, 'U_EMAIL' => $user_cache[$poster_id]['email'], - 'U_JABBER' => $user_cache[$poster_id]['jabber'], 'U_APPROVE_ACTION' => append_sid("{$phpbb_root_path}mcp.$phpEx", "i=queue&p={$row['post_id']}&f={$row['forum_id']}&redirect=" . urlencode(str_replace('&', '&', $viewtopic_url . '&p=' . $row['post_id'] . '#p' . $row['post_id']))), 'U_REPORT' => ($auth->acl_get('f_report', $forum_id)) ? $phpbb_container->get('controller.helper')->route('phpbb_report_post_controller', array('id' => $row['post_id'])) : '', @@ -2179,11 +2175,6 @@ 'NAME' => $user->lang['SEND_EMAIL'], 'U_CONTACT' => $user_cache[$poster_id]['email'], ), - array( - 'ID' => 'jabber', - 'NAME' => $user->lang['JABBER'], - 'U_CONTACT' => $user_cache[$poster_id]['jabber'], - ), ); foreach ($contact_fields as $field) diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index bc211b4ed54..3604bbf9cd2 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -165,7 +165,6 @@ public function test_autologin() 'user_sig' => '', 'user_sig_bbcode_uid' => '', 'user_sig_bbcode_bitfield' => '', - 'user_jabber' => '', 'user_actkey' => '', 'user_actkey_expiration' => 0, 'user_newpasswd' => '', From 3128b3fa9b3ceb7d05855bc6624d31aff71b6169 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 13 Apr 2025 21:00:19 +0200 Subject: [PATCH 0694/1214] [ticket/17493] Remove more jabber permissions and elements PHPBB-17493 --- phpBB/develop/add_permissions.php | 13 +- phpBB/includes/functions_user.php | 202 ------------------ phpBB/install/schemas/schema_data.sql | 9 +- phpBB/language/en/acp/permissions_phpbb.php | 1 - phpBB/memberlist.php | 10 - phpBB/phpbb/cron/task/core/queue.php | 2 +- .../db/migration/data/v400/remove_jabber.php | 2 + phpBB/phpbb/message/message.php | 26 +-- phpBB/phpbb/permissions.php | 1 - tests/functions/validate_jabber_test.php | 83 ------- 10 files changed, 26 insertions(+), 323 deletions(-) delete mode 100644 tests/functions/validate_jabber_test.php diff --git a/phpBB/develop/add_permissions.php b/phpBB/develop/add_permissions.php index 6b8913de8c8..1531e67de64 100644 --- a/phpBB/develop/add_permissions.php +++ b/phpBB/develop/add_permissions.php @@ -140,7 +140,6 @@ 'u_sendemail' => array(0, 1), 'u_readpm' => array(0, 1), 'u_sendpm' => array(0, 1), - 'u_sendim' => array(0, 1), 'u_hideonline' => array(0, 1), 'u_viewonline' => array(0, 1), 'u_viewprofile' => array(0, 1), @@ -247,7 +246,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) { if (!isset($group_ids[$ug_id])) { - $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " + $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = '" . strtoupper($ug_id) . "'"; $result = $db->sql_query_limit($sql, 1); $id = (int) $db->sql_fetchfield('group_id', 0, $result); @@ -340,7 +339,7 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) case ACL_NO: if (isset($cur_auth[$forum][$auth_option_id])) { - $sql_ary['delete'][] = "DELETE FROM $table + $sql_ary['delete'][] = "DELETE FROM $table WHERE forum_id = $forum AND auth_option_id = $auth_option_id AND $id_field = $ug_id"; @@ -354,10 +353,10 @@ function mass_auth($ug_type, $forum_id, $ug_id, $acl_list, $setting) } else if ($cur_auth[$forum][$auth_option_id] != $setting) { - $sql_ary['update'][] = "UPDATE " . $table . " - SET auth_setting = $setting - WHERE $id_field = $ug_id - AND forum_id = $forum + $sql_ary['update'][] = "UPDATE " . $table . " + SET auth_setting = $setting + WHERE $id_field = $ug_id + AND forum_id = $forum AND auth_option_id = $auth_option_id"; } } diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 563564cf67e..42c9e7fd5a7 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1514,208 +1514,6 @@ function validate_user_email($email, $allowed_email = false) return false; } -/** -* Validate jabber address -* Taken from the jabber class within flyspray (see author notes) -* -* @author flyspray.org -*/ -function validate_jabber($jid) -{ - if (!$jid) - { - return false; - } - - $separator_pos = strpos($jid, '@'); - - if ($separator_pos === false) - { - return 'WRONG_DATA'; - } - - $username = substr($jid, 0, $separator_pos); - $realm = substr($jid, $separator_pos + 1); - - if (strlen($username) == 0 || strlen($realm) < 3) - { - return 'WRONG_DATA'; - } - - $arr = explode('.', $realm); - - if (count($arr) == 0) - { - return 'WRONG_DATA'; - } - - foreach ($arr as $part) - { - if (substr($part, 0, 1) == '-' || substr($part, -1, 1) == '-') - { - return 'WRONG_DATA'; - } - - if (!preg_match("@^[a-zA-Z0-9-.]+$@", $part)) - { - return 'WRONG_DATA'; - } - } - - $boundary = array(array(0, 127), array(192, 223), array(224, 239), array(240, 247), array(248, 251), array(252, 253)); - - // Prohibited Characters RFC3454 + RFC3920 - $prohibited = array( - // Table C.1.1 - array(0x0020, 0x0020), // SPACE - // Table C.1.2 - array(0x00A0, 0x00A0), // NO-BREAK SPACE - array(0x1680, 0x1680), // OGHAM SPACE MARK - array(0x2000, 0x2001), // EN QUAD - array(0x2001, 0x2001), // EM QUAD - array(0x2002, 0x2002), // EN SPACE - array(0x2003, 0x2003), // EM SPACE - array(0x2004, 0x2004), // THREE-PER-EM SPACE - array(0x2005, 0x2005), // FOUR-PER-EM SPACE - array(0x2006, 0x2006), // SIX-PER-EM SPACE - array(0x2007, 0x2007), // FIGURE SPACE - array(0x2008, 0x2008), // PUNCTUATION SPACE - array(0x2009, 0x2009), // THIN SPACE - array(0x200A, 0x200A), // HAIR SPACE - array(0x200B, 0x200B), // ZERO WIDTH SPACE - array(0x202F, 0x202F), // NARROW NO-BREAK SPACE - array(0x205F, 0x205F), // MEDIUM MATHEMATICAL SPACE - array(0x3000, 0x3000), // IDEOGRAPHIC SPACE - // Table C.2.1 - array(0x0000, 0x001F), // [CONTROL CHARACTERS] - array(0x007F, 0x007F), // DELETE - // Table C.2.2 - array(0x0080, 0x009F), // [CONTROL CHARACTERS] - array(0x06DD, 0x06DD), // ARABIC END OF AYAH - array(0x070F, 0x070F), // SYRIAC ABBREVIATION MARK - array(0x180E, 0x180E), // MONGOLIAN VOWEL SEPARATOR - array(0x200C, 0x200C), // ZERO WIDTH NON-JOINER - array(0x200D, 0x200D), // ZERO WIDTH JOINER - array(0x2028, 0x2028), // LINE SEPARATOR - array(0x2029, 0x2029), // PARAGRAPH SEPARATOR - array(0x2060, 0x2060), // WORD JOINER - array(0x2061, 0x2061), // FUNCTION APPLICATION - array(0x2062, 0x2062), // INVISIBLE TIMES - array(0x2063, 0x2063), // INVISIBLE SEPARATOR - array(0x206A, 0x206F), // [CONTROL CHARACTERS] - array(0xFEFF, 0xFEFF), // ZERO WIDTH NO-BREAK SPACE - array(0xFFF9, 0xFFFC), // [CONTROL CHARACTERS] - array(0x1D173, 0x1D17A), // [MUSICAL CONTROL CHARACTERS] - // Table C.3 - array(0xE000, 0xF8FF), // [PRIVATE USE, PLANE 0] - array(0xF0000, 0xFFFFD), // [PRIVATE USE, PLANE 15] - array(0x100000, 0x10FFFD), // [PRIVATE USE, PLANE 16] - // Table C.4 - array(0xFDD0, 0xFDEF), // [NONCHARACTER CODE POINTS] - array(0xFFFE, 0xFFFF), // [NONCHARACTER CODE POINTS] - array(0x1FFFE, 0x1FFFF), // [NONCHARACTER CODE POINTS] - array(0x2FFFE, 0x2FFFF), // [NONCHARACTER CODE POINTS] - array(0x3FFFE, 0x3FFFF), // [NONCHARACTER CODE POINTS] - array(0x4FFFE, 0x4FFFF), // [NONCHARACTER CODE POINTS] - array(0x5FFFE, 0x5FFFF), // [NONCHARACTER CODE POINTS] - array(0x6FFFE, 0x6FFFF), // [NONCHARACTER CODE POINTS] - array(0x7FFFE, 0x7FFFF), // [NONCHARACTER CODE POINTS] - array(0x8FFFE, 0x8FFFF), // [NONCHARACTER CODE POINTS] - array(0x9FFFE, 0x9FFFF), // [NONCHARACTER CODE POINTS] - array(0xAFFFE, 0xAFFFF), // [NONCHARACTER CODE POINTS] - array(0xBFFFE, 0xBFFFF), // [NONCHARACTER CODE POINTS] - array(0xCFFFE, 0xCFFFF), // [NONCHARACTER CODE POINTS] - array(0xDFFFE, 0xDFFFF), // [NONCHARACTER CODE POINTS] - array(0xEFFFE, 0xEFFFF), // [NONCHARACTER CODE POINTS] - array(0xFFFFE, 0xFFFFF), // [NONCHARACTER CODE POINTS] - array(0x10FFFE, 0x10FFFF), // [NONCHARACTER CODE POINTS] - // Table C.5 - array(0xD800, 0xDFFF), // [SURROGATE CODES] - // Table C.6 - array(0xFFF9, 0xFFF9), // INTERLINEAR ANNOTATION ANCHOR - array(0xFFFA, 0xFFFA), // INTERLINEAR ANNOTATION SEPARATOR - array(0xFFFB, 0xFFFB), // INTERLINEAR ANNOTATION TERMINATOR - array(0xFFFC, 0xFFFC), // OBJECT REPLACEMENT CHARACTER - array(0xFFFD, 0xFFFD), // REPLACEMENT CHARACTER - // Table C.7 - array(0x2FF0, 0x2FFB), // [IDEOGRAPHIC DESCRIPTION CHARACTERS] - // Table C.8 - array(0x0340, 0x0340), // COMBINING GRAVE TONE MARK - array(0x0341, 0x0341), // COMBINING ACUTE TONE MARK - array(0x200E, 0x200E), // LEFT-TO-RIGHT MARK - array(0x200F, 0x200F), // RIGHT-TO-LEFT MARK - array(0x202A, 0x202A), // LEFT-TO-RIGHT EMBEDDING - array(0x202B, 0x202B), // RIGHT-TO-LEFT EMBEDDING - array(0x202C, 0x202C), // POP DIRECTIONAL FORMATTING - array(0x202D, 0x202D), // LEFT-TO-RIGHT OVERRIDE - array(0x202E, 0x202E), // RIGHT-TO-LEFT OVERRIDE - array(0x206A, 0x206A), // INHIBIT SYMMETRIC SWAPPING - array(0x206B, 0x206B), // ACTIVATE SYMMETRIC SWAPPING - array(0x206C, 0x206C), // INHIBIT ARABIC FORM SHAPING - array(0x206D, 0x206D), // ACTIVATE ARABIC FORM SHAPING - array(0x206E, 0x206E), // NATIONAL DIGIT SHAPES - array(0x206F, 0x206F), // NOMINAL DIGIT SHAPES - // Table C.9 - array(0xE0001, 0xE0001), // LANGUAGE TAG - array(0xE0020, 0xE007F), // [TAGGING CHARACTERS] - // RFC3920 - array(0x22, 0x22), // " - array(0x26, 0x26), // & - array(0x27, 0x27), // ' - array(0x2F, 0x2F), // / - array(0x3A, 0x3A), // : - array(0x3C, 0x3C), // < - array(0x3E, 0x3E), // > - array(0x40, 0x40) // @ - ); - - $pos = 0; - $result = true; - - while ($pos < strlen($username)) - { - $len = $uni = 0; - for ($i = 0; $i <= 5; $i++) - { - if (ord($username[$pos]) >= $boundary[$i][0] && ord($username[$pos]) <= $boundary[$i][1]) - { - $len = $i + 1; - $uni = (ord($username[$pos]) - $boundary[$i][0]) * pow(2, $i * 6); - - for ($k = 1; $k < $len; $k++) - { - $uni += (ord($username[$pos + $k]) - 128) * pow(2, ($i - $k) * 6); - } - - break; - } - } - - if ($len == 0) - { - return 'WRONG_DATA'; - } - - foreach ($prohibited as $pval) - { - if ($uni >= $pval[0] && $uni <= $pval[1]) - { - $result = false; - break 2; - } - } - - $pos = $pos + $len; - } - - if (!$result) - { - return 'WRONG_DATA'; - } - - return false; -} - /** * Validate hex colour value * diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index fdae5771909..7f53a3adc42 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -482,7 +482,6 @@ INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_readpm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_savedrafts', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_search', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendemail', 1); -INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendim', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sendpm', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_sig', 1); INSERT INTO phpbb_acl_options (auth_option, is_global) VALUES ('u_viewonline', 1); @@ -528,10 +527,10 @@ INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, INSERT INTO phpbb_forums (forum_name, forum_desc, left_id, right_id, parent_id, forum_type, forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id, forum_last_poster_id, forum_last_poster_name, forum_last_poster_colour, forum_last_post_subject, forum_last_post_time, forum_link, forum_password, forum_image, forum_rules, forum_rules_link, forum_rules_uid, forum_desc_uid, prune_freq, prune_days, prune_viewed, forum_parents, forum_flags) VALUES ('{L_FORUMS_TEST_FORUM_TITLE}', '{L_FORUMS_TEST_FORUM_DESC}', 2, 3, 1, 1, 1, 0, 0, 1, 0, 0, 1, 2, 'Admin', 'AA0000', '{L_TOPICS_TOPIC_TITLE}', 972086460, '', '', '', '', '', '', '', 1, 7, 7, '', 48); # -- Users / Anonymous user -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_actkey_expiration, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', 0, '', 0); +INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_actkey, user_actkey_expiration, user_newpasswd, user_allow_massemail) VALUES (2, 1, 'Anonymous', 'anonymous', 0, '', '', 'en', 1, 0, '', 0, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', 0, '', 0); # -- username: Admin password: admin (change this or remove it once everything is working!) -INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_jabber, user_actkey, user_actkey_expiration, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', '', 0, ''); +INSERT INTO phpbb_users (user_type, group_id, username, username_clean, user_regdate, user_password, user_email, user_lang, user_style, user_rank, user_colour, user_posts, user_permissions, user_ip, user_birthday, user_lastpage, user_last_confirm_key, user_post_sortby_type, user_post_sortby_dir, user_topic_sortby_type, user_topic_sortby_dir, user_avatar, user_sig, user_sig_bbcode_uid, user_actkey, user_actkey_expiration, user_newpasswd) VALUES (3, 5, 'Admin', 'admin', 0, '21232f297a57a5a743894a0e4a801fc3', 'admin@yourdomain.com', 'en', 1, 1, 'AA0000', 1, '', '', '', '', '', 't', 'a', 't', 'd', '', '', '', '', 0, ''); # -- Groups INSERT INTO phpbb_groups (group_name, group_type, group_founder_manage, group_colour, group_legend, group_avatar, group_desc, group_desc_uid, group_max_recipients) VALUES ('GUESTS', 3, 0, '', 0, '', '', '', 5); @@ -576,14 +575,14 @@ INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 6, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_forward'); # Limited Features (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 7, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_masspm', 'u_masspm_group'); # No Private Messages (u_) INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_', 'u_chgavatar', 'u_chgcensors', 'u_chgemail', 'u_chgpasswd', 'u_download', 'u_hideonline', 'u_mention', 'u_sig', 'u_viewprofile'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 8, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_readpm', 'u_sendpm', 'u_masspm', 'u_masspm_group'); # No Avatar (u_) -INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_sendim', 'u_masspm', 'u_masspm_group'); +INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 1 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option NOT IN ('u_attach', 'u_chgavatar', 'u_viewonline', 'u_chggrp', 'u_chgname', 'u_ignoreflood', 'u_pm_attach', 'u_pm_emailpm', 'u_savedrafts', 'u_search', 'u_sendemail', 'u_masspm', 'u_masspm_group'); INSERT INTO phpbb_acl_roles_data (role_id, auth_option_id, auth_setting) SELECT 9, auth_option_id, 0 FROM phpbb_acl_options WHERE auth_option LIKE 'u_%' AND auth_option IN ('u_chgavatar'); # Full Moderator (m_) diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 516e8117684..17361e1a3b4 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -98,7 +98,6 @@ 'ACL_U_PM_IMG' => 'Can use [img] BBCode tag in private messages', 'ACL_U_SENDEMAIL' => 'Can send emails', - 'ACL_U_SENDIM' => 'Can send instant messages', 'ACL_U_IGNOREFLOOD' => 'Can ignore flood limit', 'ACL_U_HIDEONLINE' => 'Can hide online status', 'ACL_U_VIEWONLINE' => 'Can view hidden online users', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index c031b017886..3164ad6a84b 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -669,7 +669,6 @@ 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']), 'L_SEND_EMAIL_USER' => $user->lang('SEND_EMAIL_USER', $member['username']), 'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['EMAIL']), - 'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']), 'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']), 'S_PROFILE_ACTION' => append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group'), @@ -923,12 +922,6 @@ $sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'c' => $user->lang['SORT_JOINED'], 'd' => $user->lang['SORT_POST_COUNT']); $sort_key_sql = array('a' => 'u.username_clean', 'c' => 'u.user_regdate', 'd' => 'u.user_posts'); - if ($config['jab_enable'] && $auth->acl_get('u_sendim')) - { - $sort_key_text['k'] = $user->lang['JABBER']; - $sort_key_sql['k'] = 'u.user_jabber'; - } - if ($auth->acl_get('a_user')) { $sort_key_text['e'] = $user->lang['SORT_EMAIL']; @@ -979,7 +972,6 @@ { $username = $request->variable('username', '', true); $email = strtolower($request->variable('email', '')); - $jabber = $request->variable('jabber', ''); $search_group_id = $request->variable('search_group_id', 0); // when using these, make sure that we actually have values defined in $find_key_match @@ -1019,7 +1011,6 @@ $sql_where .= ($username) ? ' AND u.username_clean ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), utf8_clean_string($username))) : ''; $sql_where .= ($auth->acl_get('a_user') && $email) ? ' AND u.user_email ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), $email)) . ' ' : ''; - $sql_where .= ($jabber) ? ' AND u.user_jabber ' . $db->sql_like_expression(str_replace('*', $db->get_any_char(), $jabber)) . ' ' : ''; $sql_where .= (is_numeric($count) && isset($find_key_match[$count_select])) ? ' AND u.user_posts ' . $find_key_match[$count_select] . ' ' . (int) $count . ' ' : ''; if (isset($find_key_match[$joined_select]) && count($joined) == 3) @@ -1480,7 +1471,6 @@ $template->assign_vars(array( 'USERNAME' => $username, 'EMAIL' => $email, - 'JABBER' => $jabber, 'JOINED' => implode('-', $joined), 'ACTIVE' => implode('-', $active), 'COUNT' => $count, diff --git a/phpBB/phpbb/cron/task/core/queue.php b/phpBB/phpbb/cron/task/core/queue.php index 9395a538de3..7e902f53044 100644 --- a/phpBB/phpbb/cron/task/core/queue.php +++ b/phpBB/phpbb/cron/task/core/queue.php @@ -16,7 +16,7 @@ use phpbb\config\config; /** -* Queue cron task. Sends email and jabber messages queued by other scripts. +* Queue cron task. Sends email queued by other scripts. */ class queue extends \phpbb\cron\task\base { diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 2a6ed89c21f..48d933d6267 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -67,6 +67,7 @@ public function update_data(): array 'ACP_JABBER_SETTINGS', ]], ['permission.remove', ['a_jabber']], + ['permission.remove', ['u_sendim']], ]; } @@ -94,6 +95,7 @@ public function revert_data(): array ], ]], ['permission.add', ['a_jabber', true]], + ['permission.add', ['u_sendim', true]], ]; } } diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 900ef103c58..344c2f1cf29 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -26,27 +26,34 @@ class message /** @var string */ protected $subject = ''; + /** @var string */ protected $body = ''; + /** @var string */ protected $template = ''; + /** @var array */ protected $template_vars = array(); /** @var string */ protected $sender_ip = ''; + /** @var string */ protected $sender_name = ''; + /** @var string */ protected $sender_address = ''; + /** @var string */ protected $sender_lang = ''; + /** @var string|int */ protected $sender_id = ''; + /** @var string */ protected $sender_username = ''; - /** @var string */ - protected $sender_jabber = ''; + /** @var int */ protected $sender_notify_type = messenger_interface::NOTIFY_EMAIL; @@ -120,8 +127,7 @@ public function add_recipient_from_user_row(array $user) $user['user_email'], $user['user_lang'], $user['user_notify_type'], - $user['username'], - $user['user_jabber'] + $user['username'] ); } @@ -133,17 +139,15 @@ public function add_recipient_from_user_row(array $user) * @param string $recipient_lang * @param int $recipient_notify_type Used notification methods (Jabber, Email, ...) * @param string $recipient_username User Name (used for AntiAbuse header) - * @param string $recipient_jabber * @return void */ - public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_notify_type = messenger_interface::NOTIFY_EMAIL, $recipient_username = '', $recipient_jabber = '') + public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_notify_type = messenger_interface::NOTIFY_EMAIL, $recipient_username = '') { $this->recipients[] = array( 'name' => $recipient_name, 'user_email' => $recipient_address, 'lang' => $recipient_lang, 'username' => $recipient_username, - 'user_jabber' => $recipient_jabber, 'notify_type' => $recipient_notify_type, 'to_name' => $recipient_name, ); @@ -163,8 +167,7 @@ public function set_sender_from_user($user) $user->data['user_email'], $user->lang_name, $user->data['user_id'], - $user->data['username'], - $user->data['user_jabber'] + $user->data['username'] ); $this->set_sender_notify_type($user->data['user_notify_type']); @@ -179,10 +182,9 @@ public function set_sender_from_user($user) * @param string $sender_lang * @param int $sender_id User ID * @param string $sender_username User Name (used for AntiAbuse header) - * @param string $sender_jabber * @return void */ - public function set_sender($sender_ip, $sender_name, $sender_address, $sender_lang = '', $sender_id = 0, $sender_username = '', $sender_jabber = '') + public function set_sender($sender_ip, $sender_name, $sender_address, $sender_lang = '', $sender_id = 0, $sender_username = '') { $this->sender_ip = $sender_ip; $this->sender_name = $sender_name; @@ -190,7 +192,6 @@ public function set_sender($sender_ip, $sender_name, $sender_address, $sender_la $this->sender_lang = $sender_lang; $this->sender_id = $sender_id; $this->sender_username = $sender_username; - $this->sender_jabber = $sender_jabber; } /** @@ -225,7 +226,6 @@ public function cc_sender() 'user_email' => $this->sender_address, 'name' => $this->sender_name, 'username' => $this->sender_username, - 'user_jabber' => $this->sender_jabber, 'notify_type' => $this->sender_notify_type, 'to_name' => $this->recipients[0]['to_name'], ); diff --git a/phpBB/phpbb/permissions.php b/phpBB/phpbb/permissions.php index afbd7109713..87fa05c5ff1 100644 --- a/phpBB/phpbb/permissions.php +++ b/phpBB/phpbb/permissions.php @@ -253,7 +253,6 @@ public function get_permission_lang($permission) 'u_pm_img' => array('lang' => 'ACL_U_PM_IMG', 'cat' => 'pm'), 'u_sendemail' => array('lang' => 'ACL_U_SENDEMAIL', 'cat' => 'misc'), - 'u_sendim' => array('lang' => 'ACL_U_SENDIM', 'cat' => 'misc'), 'u_ignoreflood' => array('lang' => 'ACL_U_IGNOREFLOOD', 'cat' => 'misc'), 'u_hideonline' => array('lang' => 'ACL_U_HIDEONLINE', 'cat' => 'misc'), 'u_viewonline' => array('lang' => 'ACL_U_VIEWONLINE', 'cat' => 'misc'), diff --git a/tests/functions/validate_jabber_test.php b/tests/functions/validate_jabber_test.php deleted file mode 100644 index 92cf5062d5c..00000000000 --- a/tests/functions/validate_jabber_test.php +++ /dev/null @@ -1,83 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -require_once __DIR__ . '/../../phpBB/includes/functions_user.php'; -require_once __DIR__ . '/validate_data_helper.php'; - -class phpbb_functions_validate_jabber_test extends phpbb_test_case -{ - protected $helper; - - protected function setUp(): void - { - parent::setUp(); - - $this->helper = new phpbb_functions_validate_data_helper($this); - } - - public function test_validate_jabber() - { - $this->helper->assert_valid_data(array( - 'empty' => array( - array(), - '', - array('jabber'), - ), - 'no_seperator' => array( - array('WRONG_DATA'), - 'testjabber.ccc', - array('jabber'), - ), - 'no_user' => array( - array('WRONG_DATA'), - '@jabber.ccc', - array('jabber'), - ), - 'no_realm' => array( - array('WRONG_DATA'), - 'user@', - array('jabber'), - ), - 'dot_realm' => array( - array('WRONG_DATA'), - 'user@.....', - array('jabber'), - ), - '-realm' => array( - array('WRONG_DATA'), - 'user@-jabber.ccc', - array('jabber'), - ), - 'realm-' => array( - array('WRONG_DATA'), - 'user@jabber.ccc-', - array('jabber'), - ), - 'correct' => array( - array(), - 'user@jabber.09A-z.org', - array('jabber'), - ), - 'prohibited' => array( - array('WRONG_DATA'), - 'u@ser@jabber.ccc.org', - array('jabber'), - ), - 'prohibited_char' => array( - array('WRONG_DATA'), - 'uer@jabber.ccc.org', - array('jabber'), - ), - )); - } -} From ef47c691554f0592dfb65dca2844ad251cb1fbc5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 14 Apr 2025 20:27:03 +0200 Subject: [PATCH 0695/1214] [ticket/17493] Remove notification method jabber PHPBB-17493 --- .../container/services_notification.yml | 13 --- phpBB/includes/acp/acp_email.php | 54 +++------ phpBB/memberlist.php | 5 +- .../db/migration/data/v400/remove_jabber.php | 9 ++ phpBB/phpbb/notification/method/jabber.php | 104 ------------------ 5 files changed, 28 insertions(+), 157 deletions(-) delete mode 100644 phpBB/phpbb/notification/method/jabber.php diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index 0ac9dc6a885..ccf16223cf9 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -233,19 +233,6 @@ services: tags: - { name: notification.method } - notification.method.jabber: - class: phpbb\notification\method\jabber - shared: false - arguments: - - '@user_loader' - - '@user' - - '@config' - - '%core.root_path%' - - '%core.php_ext%' - - '@messenger.method_collection' - tags: - - { name: notification.method } - notification.method.webpush: class: phpbb\notification\method\webpush shared: false diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index dc62e385cd9..8dbdbf409dc 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -76,13 +76,13 @@ function main($id, $mode) { // If giving usernames the admin is able to email inactive users too... $sql_ary = array( - 'SELECT' => 'user_id, username, user_email, user_notify_type, user_lang', + 'SELECT' => 'user_id, username, user_email, user_lang', 'FROM' => array( USERS_TABLE => '', ), 'WHERE' => $db->sql_in_set('username_clean', array_map('utf8_clean_string', $usernames)) . ' AND user_allow_massemail = 1', - 'ORDER_BY' => 'user_lang, user_notify_type', + 'ORDER_BY' => 'user_lang', ); } else @@ -90,7 +90,7 @@ function main($id, $mode) if ($group_id) { $sql_ary = array( - 'SELECT' => 'u.user_id, u.user_email, u.username, u.username_clean, u.user_lang, u.user_notify_type', + 'SELECT' => 'u.user_id, u.user_email, u.username, u.username_clean, u.user_lang', 'FROM' => array( USERS_TABLE => 'u', USER_GROUP_TABLE => 'ug', @@ -100,19 +100,19 @@ function main($id, $mode) AND u.user_id = ug.user_id AND u.user_allow_massemail = 1 AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')', - 'ORDER_BY' => 'u.user_lang, u.user_notify_type', + 'ORDER_BY' => 'u.user_lang', ); } else { $sql_ary = array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_email, u.user_lang, u.user_notify_type', + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_email, u.user_lang', 'FROM' => array( USERS_TABLE => 'u', ), 'WHERE' => 'u.user_allow_massemail = 1 AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')', - 'ORDER_BY' => 'u.user_lang, u.user_notify_type', + 'ORDER_BY' => 'u.user_lang', ); } } @@ -154,15 +154,12 @@ function main($id, $mode) $max_chunk_size = (int) $config['email_max_chunk_size']; $email_list = array(); $old_lang = $rows[0]['user_lang']; - $old_notify_type = $rows[0]['user_notify_type']; foreach ($rows as $row) { - if (($row['user_notify_type'] == messenger_interface::NOTIFY_EMAIL && $row['user_email']) || - ($row['user_notify_type'] == messenger_interface::NOTIFY_IM && $row['user_jabber']) || - ($row['user_notify_type'] == messenger_interface::NOTIFY_BOTH && ($row['user_email'] || $row['user_jabber']))) + if ($row['user_email']) { - if ($i == $max_chunk_size || $row['user_lang'] != $old_lang || $row['user_notify_type'] != $old_notify_type) + if ($i == $max_chunk_size || $row['user_lang'] != $old_lang) { $i = 0; @@ -172,14 +169,11 @@ function main($id, $mode) } $old_lang = $row['user_lang']; - $old_notify_type = $row['user_notify_type']; } $email_list[$j][$i]['lang'] = $row['user_lang']; - $email_list[$j][$i]['method'] = $row['user_notify_type']; $email_list[$j][$i]['email'] = $row['user_email']; $email_list[$j][$i]['name'] = $row['username']; - $email_list[$j][$i]['jabber'] = $row['user_jabber']; $i++; } } @@ -225,7 +219,6 @@ function main($id, $mode) for ($i = 0, $size = count($email_list); $i < $size; $i++) { $used_lang = $email_list[$i][0]['lang']; - $used_method = $email_list[$i][0]['method']; /** * @var \phpbb\messenger\method\messenger_interface $messenger_method @@ -234,40 +227,29 @@ function main($id, $mode) foreach ($messenger_collection_iterator as $messenger_method) { $notify_method = $messenger_method->get_id(); - if ($notify_method == $used_method || $used_method == messenger_interface::NOTIFY_BOTH) + if ($notify_method == messenger_interface::NOTIFY_EMAIL) { $messenger_method->set_use_queue($use_queue); $messenger_method->template($email_template, $used_lang); $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); $messenger_method->assign_vars($template_data); - if ($notify_method == messenger_interface::NOTIFY_EMAIL) + for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) { - for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + $email_row = $email_list[$i][$j]; + if (count($email_list[$i]) == 1) { - $email_row = $email_list[$i][$j]; - if (count($email_list[$i]) == 1) - { - $messenger_method->to($email_row['email'], $email_row['name']); - } - else - { - $messenger_method->bcc($email_row['email'], $email_row['name']); - } + $messenger_method->to($email_row['email'], $email_row['name']); } - - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->set_mail_priority($priority); - } - else if ($notify_method == messenger_interface::NOTIFY_IM) - { - for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + else { - $email_row = $email_list[$i][$j]; - $messenger_method->to($email_row['jabber'], $email_row['name']); + $messenger_method->bcc($email_row['email'], $email_row['name']); } } + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->set_mail_priority($priority); + $errored = !$messenger_method->send() || $errored; $messenger_method->save_queue(); } diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 3164ad6a84b..e392463b4f7 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -963,7 +963,7 @@ $select_single = $request->variable('select_single', false); // Search URL parameters, if any of these are in the URL we do a search - $search_params = array('username', 'email', 'jabber', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip'); + $search_params = array('username', 'email', 'search_group_id', 'joined_select', 'active_select', 'count_select', 'joined', 'active', 'count', 'ip'); // We validate form and field here, only id/class allowed $form = (!preg_match('/^[a-z0-9_-]+$/i', $form)) ? '' : $form; @@ -1316,7 +1316,6 @@ 'select_single' => array('select_single', $select_single), 'username' => array('username', '', true), 'email' => array('email', ''), - 'jabber' => array('jabber', ''), 'search_group_id' => array('search_group_id', 0), 'joined_select' => array('joined_select', 'lt'), 'active_select' => array('active_select', 'lt'), @@ -1478,7 +1477,6 @@ 'S_IP_SEARCH_ALLOWED' => ($auth->acl_getf_global('m_info')) ? true : false, 'S_EMAIL_SEARCH_ALLOWED'=> ($auth->acl_get('a_user')) ? true : false, - 'S_JABBER_ENABLED' => $config['jab_enable'], 'S_IN_SEARCH_POPUP' => ($form && $field) ? true : false, 'S_SEARCH_USER' => ($mode == 'searchuser' || ($mode == '' && $submit)), 'S_FORM_NAME' => $form, @@ -1706,7 +1704,6 @@ 'PROFILE_IMG' => $user->img('icon_user_profile', $user->lang['PROFILE']), 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']), 'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['EMAIL']), - 'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']), 'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']), 'U_FIND_MEMBER' => ($config['load_search'] || $auth->acl_get('a_')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=searchuser' . (($start) ? "&start=$start" : '') . (!empty($params) ? '&' . implode('&', $params) : '')) : '', diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 48d933d6267..994f8c0167c 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -20,6 +20,7 @@ class remove_jabber extends migration public static function depends_on(): array { return [ + '\phpbb\db\migration\data\v310\notifications_use_full_name', '\phpbb\db\migration\data\v31x\add_jabber_ssl_context_config_options', '\phpbb\db\migration\data\v400\dev', '\phpbb\db\migration\data\v400\add_webpush', @@ -68,6 +69,7 @@ public function update_data(): array ]], ['permission.remove', ['a_jabber']], ['permission.remove', ['u_sendim']], + ['custom', [[$this, 'remove_from_user_notifcations']]], ]; } @@ -98,4 +100,11 @@ public function revert_data(): array ['permission.add', ['u_sendim', true]], ]; } + + public function remove_from_user_notifcations() + { + $sql = 'DELETE FROM ' . $this->table_prefix . 'user_notifications + WHERE notification_method = ' . $this->db->sql_escape('notification.method.jabber'); + $this->db->sql_query($sql); + } } diff --git a/phpBB/phpbb/notification/method/jabber.php b/phpBB/phpbb/notification/method/jabber.php deleted file mode 100644 index e3482f98be0..00000000000 --- a/phpBB/phpbb/notification/method/jabber.php +++ /dev/null @@ -1,104 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\notification\method; - -use phpbb\notification\type\type_interface; -use phpbb\user; -use phpbb\user_loader; -use phpbb\config\config; -use phpbb\di\service_collection; -use phpbb\messenger\method\messenger_interface; - -/** -* Jabber notification method class -* This class handles sending Jabber messages for notifications -*/ - -class jabber extends \phpbb\notification\method\messenger_base -{ - /** @var user */ - protected $user; - - /** @var config */ - protected $config; - - /** @var service_collection */ - protected $messenger; - - /** - * Notification Method jabber Constructor - * - * @param user_loader $user_loader - * @param user $user - * @param config $config - * @param string $phpbb_root_path - * @param string $php_ext - * @param service_collection $messenger - */ - public function __construct(user_loader $user_loader, user $user, config $config, $phpbb_root_path, $php_ext, service_collection $messenger) - { - parent::__construct($messenger, $user_loader, $phpbb_root_path, $php_ext); - - $this->user = $user; - $this->config = $config; - } - - /** - * Get notification method name - * - * @return string - */ - public function get_type() - { - return 'notification.method.jabber'; - } - - /** - * Is this method available for the user? - * This is checked on the notifications options - * - * @param type_interface|null $notification_type An optional instance of a notification type. If provided, this - * method additionally checks if the type provides an email template. - * @return bool - */ - public function is_available(type_interface $notification_type = null) - { - return parent::is_available($notification_type) && $this->global_available() && !empty($this->user->data['user_jabber']); - } - - /** - * Is this method available at all? - * This is checked before notifications are sent - */ - public function global_available() - { - return !( - empty($this->config['jab_enable']) || - empty($this->config['jab_host']) || - empty($this->config['jab_username']) || - empty($this->config['jab_password']) || - !@extension_loaded('xml') - ); - } - - public function notify() - { - if (!$this->global_available()) - { - return; - } - - $this->notify_using_messenger(messenger_interface::NOTIFY_IM, 'short/'); - } -} From 610fa67928a0ada7afbff728bddd1fc5b3fb7cae Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 14 Apr 2025 20:33:13 +0200 Subject: [PATCH 0696/1214] [ticket/17493] Remove jabber as messenger method PHPBB-17493 --- .../default/container/services_messenger.yml | 9 - phpBB/phpbb/message/user_form.php | 2 +- phpBB/phpbb/messenger/method/jabber.php | 1236 ----------------- tests/messenger/method_jabber_test.php | 311 ----- tests/messenger/queue_test.php | 17 - tests/notification/base.php | 1 - .../notification_method_email_test.php | 1 - tests/notification/submit_post_base.php | 1 - 8 files changed, 1 insertion(+), 1577 deletions(-) delete mode 100644 phpBB/phpbb/messenger/method/jabber.php delete mode 100644 tests/messenger/method_jabber_test.php diff --git a/phpBB/config/default/container/services_messenger.yml b/phpBB/config/default/container/services_messenger.yml index 8645d2f17cc..14bdf18df25 100644 --- a/phpBB/config/default/container/services_messenger.yml +++ b/phpBB/config/default/container/services_messenger.yml @@ -38,15 +38,6 @@ services: tags: - { name: messenger.method } - messenger.method.jabber: - class: phpbb\messenger\method\jabber - shared: false - parent: messenger.method.base - calls: - - [init, []] - tags: - - { name: messenger.method } - messenger.queue: class: phpbb\messenger\queue shared: false diff --git a/phpBB/phpbb/message/user_form.php b/phpBB/phpbb/message/user_form.php index 46a012297df..f52eabc7e9a 100644 --- a/phpBB/phpbb/message/user_form.php +++ b/phpBB/phpbb/message/user_form.php @@ -34,7 +34,7 @@ class user_form extends form */ protected function get_user_row($user_id) { - $sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang, user_jabber, user_notify_type + $sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang, user_notify_type FROM ' . USERS_TABLE . ' WHERE user_id = ' . (int) $user_id . ' AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; diff --git a/phpBB/phpbb/messenger/method/jabber.php b/phpBB/phpbb/messenger/method/jabber.php deleted file mode 100644 index a4a2c07f616..00000000000 --- a/phpBB/phpbb/messenger/method/jabber.php +++ /dev/null @@ -1,1236 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\messenger\method; - -/** - * - * Based on Jabber class from Flyspray project - * - * @version class.jabber2.php 1595 2008-09-19 (0.9.9) - * @copyright 2006 Flyspray.org - * @author Florian Schmitz (floele) - * - * Slightly modified by Acyd Burn (2006) - * Refactored to a service (2024) - */ -class jabber extends base -{ - /** @var string */ - protected $connect_server; - - /** @var resource|null */ - protected $connection = null; - - /** @var bool */ - protected $enable_logging = true; - - /** @var array */ - protected $features = []; - - /** @var array */ - protected $jid = []; - - /** @var array */ - protected $log_array = []; - - /** @var string */ - protected $password; - - /** @var int */ - protected $port; - - /** @var string */ - protected $resource = 'functions_jabber.phpbb.php'; - - /** @var string */ - protected $server; - - /** @var array */ - protected $session = []; - - /** @var array */ - protected $stream_options = []; - - /** @var int */ - protected $timeout = 10; - - /** @var array */ - protected $to = []; - - /** @var bool */ - protected $use_ssl = false; - - /** @var string */ - protected $username; - - /** @var string Stream close handshake */ - private const STREAM_CLOSE_HANDSHAKE = ''; - - /** - * Set initial parameter values - * To init correctly, username() call should go before server() - * and ssl() call should go before port() and stream_options() calls. - * - * Example: - * $this->username($username) - * ->password($password) - * ->ssl($use_ssl) - * ->server($server) - * ->port($port) - * ->stream_options( - * 'verify_peer' => true, - * 'verify_peer_name' => true, - * 'allow_self_signed' => false, - * ); - * - * @return void - */ - public function init(): void - { - $this->username($this->config['jab_username']) - ->password($this->config['jab_password']) - ->ssl((bool) $this->config['jab_use_ssl']) - ->server($this->config['jab_host']) - ->port($this->config['jab_port']) - ->stream_options['ssl'] = [ - 'verify_peer' => $this->config['jab_verify_peer'], - 'verify_peer_name' => $this->config['jab_verify_peer_name'], - 'allow_self_signed' => $this->config['jab_allow_self_signed'], - ]; - } - - /** - * {@inheritDoc} - */ - public function get_id(): int - { - return self::NOTIFY_IM; - } - - /** - * {@inheritDoc} - */ - public function get_queue_object_name(): string - { - return 'jabber'; - } - - /** - * {@inheritDoc} - */ - public function is_enabled(): bool - { - return - !empty($this->config['jab_enable']) && - !empty($this->config['jab_host']) && - !empty($this->config['jab_username']) && - !empty($this->config['jab_password']); - } - - /** - * Set ssl context options - * See http://php.net/manual/en/context.ssl.php - * - * @param array $options SSL context options array - * @return self - */ - public function stream_options(array $options = []): self - { - if ($this->use_ssl) - { - // Change default stream options if needed - $this->stream_options['ssl'] = array_merge($this->stream_options['ssl'], $options); - } - - return $this; - } - - /** - * Set password to connect to server - * - * @param string $password Password to connect to server - * @return self - */ - public function password(string $password = ''): self - { - $this->password = html_entity_decode($password, ENT_COMPAT); - - return $this; - } - - /** - * Set use of ssl to connect to server - * - * @param bool $use_ssl Flag indicating use of ssl to connect to server - * @return self - */ - public function ssl(bool $use_ssl = false): self - { - $this->use_ssl = $use_ssl && self::can_use_ssl(); - - return $this; - } - - /** - * Set port to connect to server - * use_ssl flag should be set first - * - * @param int $port Port to connect to server - * @return self - */ - public function port(int $port = 5222): self - { - $this->port = ($port > 0) ? $port : 5222; - - // Change port if we use SSL - if ($this->port == 5222 && $this->use_ssl) - { - $this->port = 5223; - } - - return $this; - } - - /** - * Set username to connect to server - * - * @param string $username Username to connect to server - * @return self - */ - public function username(string $username = ''): self - { - if (str_contains($username, '@')) - { - $this->jid = explode('@', $username, 2); - $this->username = $this->jid[0]; - } - else - { - $this->username = $username; - } - - return $this; - } - - /** - * Set server to connect - * Username should be set first - * - * @param string $server Server to connect - * @return self - */ - public function server(string $server = ''): self - { - $this->connect_server = $server ?: 'localhost'; - $this->server = $this->jid[1] ?? $this->connect_server; - - return $this; - } - - /** - * Check if it's possible to use the SSL functionality - * - * @return bool - */ - public static function can_use_ssl(): bool - { - return @extension_loaded('openssl'); - } - - /** - * Check if it's possible to use TLS functionality - * - * @return bool - */ - public static function can_use_tls(): bool - { - if (!@extension_loaded('openssl') || !function_exists('stream_socket_enable_crypto') || !function_exists('stream_get_meta_data') || !function_exists('stream_set_blocking') || !function_exists('stream_get_wrappers')) - { - return false; - } - - /** - * Make sure the encryption stream is supported - * Also seem to work without the crypto stream if correctly compiled - - $streams = stream_get_wrappers(); - - if (!in_array('streams.crypto', $streams)) - { - return false; - } - */ - - return true; - } - - /** - * Sets the resource which is used. No validation is done here, only escaping - * - * @param string $name - * @return void - */ - public function set_resource(string $name): void - { - $this->resource = $name; - } - - /** - * Connect to the server - * - * @return bool - */ - public function connect(): bool - { -/* if (!$this->check_jid($this->username . '@' . $this->server)) - { - $this->add_to_log('Error: Jabber ID is not valid: ' . $this->username . '@' . $this->server); - return false; - }*/ - - $this->session['ssl'] = $this->use_ssl; - - if ($this->open_socket($this->connect_server, $this->port)) - { - $this->send_xml("\n"); - $this->send_xml("\n"); - } - else - { - $this->add_to_log('Error: connect() #2'); - return false; - } - - // Now we listen what the server has to say...and give appropriate responses - $this->response($this->listen()); - return true; - } - - /** - * Disconnect from the server - * - * @return bool - */ - public function disconnect(): bool - { - if ($this->connected()) - { - // disconnect gracefully - if (isset($this->session['sent_presence'])) - { - $this->send_presence('offline', '', true); - } - - $this->send(self::STREAM_CLOSE_HANDSHAKE); - // Check stream close handshake reply - $stream_close_reply = $this->listen(); - - if ($stream_close_reply != self::STREAM_CLOSE_HANDSHAKE) - { - $this->add_to_log("Error: Unexpected stream close handshake reply ”{$stream_close_reply}”"); - } - - $this->session = []; - /** @psalm-suppress InvalidPropertyAssignmentValue */ - return fclose($this->connection); - } - - return false; - } - - /** - * Check if it's still connected to the server - * - * @return bool - */ - public function connected(): bool - { - return is_resource($this->connection) && !feof($this->connection); - } - - /** - * Initiates login (using data from contructor, after calling connect()) - * - * @return bool - */ - public function login(): bool - { - if (empty($this->features)) - { - $this->add_to_log('Error: No feature information from server available.'); - return false; - } - - return $this->response($this->features); - } - - /** - * {@inheritDoc} - */ - public function set_addresses(array $user_row): void - { - if (isset($user_row['user_jabber']) && $user_row['user_jabber']) - { - $this->to($user_row['user_jabber'], (isset($user_row['username']) ? $user_row['username'] : '')); - } - } - - /** - * Sets jabber contact to send message to - * - * @param string $address Jabber "To" recipient address - * @param string $realname Jabber "To" recipient name - * @return void - */ - public function to(string $address, string $realname = ''): void - { - // IM-Addresses could be empty - if (!trim($address)) - { - return; - } - - $pos = !empty($this->to) ? count($this->to) : 0; - $this->to[$pos]['uid'] = trim($address); - $this->to[$pos]['name'] = trim($realname); - } - - /** - * Resets all the data (address, template file, etc) to default - */ - public function reset(): void - { - $this->subject = $this->msg = ''; - $this->additional_headers = $this->to = []; - $this->use_queue = true; - unset($this->template); - } - - /** - * {@inheritDoc} - */ - public function set_use_queue(bool $use_queue = true): void - { - $this->use_queue = !$this->config['jab_package_size'] ? false : $use_queue; - } - - /** - * {@inheritDoc} - */ - public function process_queue(array &$queue_data): void - { - $queue_object_name = $this->get_queue_object_name(); - $messages_count = count($queue_data[$queue_object_name]['data']); - - if (!$this->is_enabled() || !$messages_count) - { - unset($queue_data[$queue_object_name]); - return; - } - - @set_time_limit(0); - - $package_size = $queue_data[$queue_object_name]['package_size'] ?? 0; - $num_items = (!$package_size || $messages_count < $package_size) ? $messages_count : $package_size; - - for ($i = 0; $i < $num_items; $i++) - { - // Make variables available... - extract(array_shift($queue_data[$queue_object_name]['data'])); - - if (!$this->connect()) - { - $this->error($this->user->lang['ERR_JAB_CONNECT'] . '
    ' . $this->get_log()); - return; - } - - if (!$this->login()) - { - $this->error($this->user->lang['ERR_JAB_AUTH'] . '
    ' . $this->get_log()); - return; - } - - foreach ($addresses as $address) - { - if ($this->send_message($address, $msg, $subject) === false) - { - $this->error($this->get_log()); - continue; - } - } - } - - // No more data for this object? Unset it - if (!count($queue_data[$queue_object_name]['data'])) - { - unset($queue_data[$queue_object_name]); - } - - $this->disconnect(); - } - - /** - * {@inheritDoc} - */ - public function send(): bool - { - $this->prepare_message(); - - if (empty($this->to)) - { - $this->add_to_log('Error: Could not send, recepient addresses undefined.'); - return false; - } - - $addresses = []; - foreach ($this->to as $uid_ary) - { - $addresses[] = $uid_ary['uid']; - } - $addresses = array_unique($addresses); - - if (!$this->use_queue) - { - if (!$this->connect()) - { - $this->error($this->user->lang['ERR_JAB_CONNECT'] . '
    ' . $this->get_log()); - return false; - } - - if (!$this->login()) - { - $this->error($this->user->lang['ERR_JAB_AUTH'] . '
    ' . $this->get_log()); - return false; - } - - foreach ($addresses as $address) - { - if ($this->send_message($address, $this->msg, $this->subject) === false) - { - $this->error($this->get_log()); - continue; - } - } - - $this->disconnect(); - } - else - { - $this->queue->init('jabber', $this->config['jab_package_size']); - $this->queue->put('jabber', [ - 'addresses' => $addresses, - 'subject' => $this->subject, - 'msg' => $this->msg, - ]); - } - unset($addresses); - - $this->reset(); - - return true; - } - - /** - * Send data to the Jabber server - * - * @param string $xml - * @return int|bool - */ - public function send_xml(string $xml): int|bool - { - if ($this->connected()) - { - $xml = trim($xml); - return fwrite($this->connection, $xml); - } - else - { - $this->add_to_log('Error: Could not send, connection lost (flood?).'); - return false; - } - } - - /** - * Open socket - * - * @param string $server Host to connect to - * @param int $port Port number - * - * @return bool - */ - public function open_socket(string $server, int $port): bool - { - if (@function_exists('dns_get_record')) - { - $record = @dns_get_record("_xmpp-client._tcp.$server", DNS_SRV); - if (!empty($record) && !empty($record[0]['target'])) - { - $server = $record[0]['target']; - } - } - - $remote_socket = $this->use_ssl ? 'ssl://' . $server . ':' . $port : $server . ':' . $port; - $socket_context = stream_context_create($this->stream_options); - - if ($this->connection = @stream_socket_client($remote_socket, $errorno, $errorstr, $this->timeout, STREAM_CLIENT_CONNECT, $socket_context)) - { - stream_set_blocking($this->connection, 0); - stream_set_timeout($this->connection, 60); - - return true; - } - - // Apparently an error occurred... - $this->add_to_log('Error: open_socket() - ' . $errorstr); - return false; - } - - /** - * Get connection log - * - * @return string - */ - public function get_log(): string - { - if ($this->enable_logging && count($this->log_array)) - { - return implode("

    ", $this->log_array); - } - - return ''; - } - - /** - * Add information to log - * - * @param string $string Log entry - * @return void - */ - protected function add_to_log(string $string): void - { - if ($this->enable_logging) - { - $this->log_array[] = utf8_htmlspecialchars($string); - } - } - - /** - * Listens to the connection until it gets data or the timeout is reached. - * Thus, it should only be called if data is expected to be received. - * - * @param int $timeout Connection timeout - * @param bool $wait Flag indicating if it should wait for the responce until timeout - * @return bool|array Either false for timeout or an array with the received data - */ - public function listen(int $timeout = 10, bool $wait = false): bool|array - { - if (!$this->connected()) - { - return false; - } - - // Wait for a response until timeout is reached - $start = time(); - $data = ''; - - do - { - $read = trim(fread($this->connection, 4096)); - $data .= $read; - } - while (time() <= $start + $timeout && !feof($this->connection) && ($wait || $data == '' || $read != '' || (substr(rtrim($data), -1) != '>'))); - - if ($data != '') - { - return $this->xmlize($data); - } - else - { - $this->add_to_log('Timeout, no response from server.'); - return false; - } - } - - /** - * Initiates account registration (based on data used for constructor) - * - * @return bool|null - */ - public function register(): bool|null - { - if (!isset($this->session['id']) || isset($this->session['jid'])) - { - $this->add_to_log('Error: Cannot initiate registration.'); - return false; - } - - $this->send_xml(""); - return $this->response($this->listen()); - } - - /** - * Sets account presence. No additional info required (default is "online" status) - * - * @param string $message Account status (online, offline) - * @param string $type Status type (dnd, away, chat, xa or nothing) - * @param bool $unavailable Set to true to make unavailable status - * @return int|bool - */ - function send_presence(string $message = '', string $type = '', bool $unavailable = false): int|bool - { - if (!isset($this->session['jid'])) - { - $this->add_to_log('ERROR: send_presence() - Cannot set presence at this point, no jid given.'); - return false; - } - - $type = strtolower($type); - $type = (in_array($type, array('dnd', 'away', 'chat', 'xa'))) ? ''. $type .'' : ''; - - $unavailable = ($unavailable) ? " type='unavailable'" : ''; - $message = ($message) ? '' . utf8_htmlspecialchars($message) .'' : ''; - - $this->session['sent_presence'] = !$unavailable; - - return $this->send_xml("" . $type . $message . ''); - } - - /** - * This handles all the different XML elements - * - * @param array $xml - * @return bool - */ - function response(array $xml): bool - { - if (!count($xml)) - { - return false; - } - - // did we get multiple elements? do one after another - // array('message' => ..., 'presence' => ...) - if (count($xml) > 1) - { - foreach ($xml as $key => $value) - { - $this->response(array($key => $value)); - } - return true; - } - else if (is_array(reset($xml)) && count(reset($xml)) > 1) - { - // or even multiple elements of the same type? - // array('message' => array(0 => ..., 1 => ...)) - foreach (reset($xml) as $value) - { - $this->response(array(key($xml) => array(0 => $value))); - } - return true; - } - - switch (key($xml)) - { - case 'stream:stream': - // Connection initialised (or after authentication). Not much to do here... - - if (isset($xml['stream:stream'][0]['#']['stream:features'])) - { - // we already got all info we need - $this->features = $xml['stream:stream'][0]['#']; - } - else - { - $this->features = $this->listen(); - } - - $second_time = isset($this->session['id']); - $this->session['id'] = isset($xml['stream:stream'][0]['@']['id']) ? $xml['stream:stream'][0]['@']['id'] : ''; - - if ($second_time) - { - // If we are here for the second time after TLS, we need to continue logging in - return $this->login(); - } - - // go on with authentication? - if (isset($this->features['stream:features'][0]['#']['bind']) || !empty($this->session['tls'])) - { - return $this->response($this->features); - } - return false; - break; - - case 'stream:features': - // Resource binding after successful authentication - if (isset($this->session['authenticated'])) - { - // session required? - $this->session['sess_required'] = isset($xml['stream:features'][0]['#']['session']); - - $this->send_xml(" - - " . utf8_htmlspecialchars($this->resource) . ' - - '); - return $this->response($this->listen()); - } - - // Let's use TLS if SSL is not enabled and we can actually use it - if (!$this->session['ssl'] && self::can_use_tls() && self::can_use_ssl() && isset($xml['stream:features'][0]['#']['starttls'])) - { - $this->add_to_log('Switching to TLS.'); - $this->send_xml("\n"); - return $this->response($this->listen()); - } - - // Does the server support SASL authentication? - - // I hope so, because we do (and no other method). - if (isset($xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns']) && $xml['stream:features'][0]['#']['mechanisms'][0]['@']['xmlns'] == 'urn:ietf:params:xml:ns:xmpp-sasl') - { - // Now decide on method - $methods = array(); - - foreach ($xml['stream:features'][0]['#']['mechanisms'][0]['#']['mechanism'] as $value) - { - $methods[] = $value['#']; - } - - // we prefer DIGEST-MD5 - // we don't want to use plain authentication (neither does the server usually) if no encryption is in place - - // http://www.xmpp.org/extensions/attic/jep-0078-1.7.html - // The plaintext mechanism SHOULD NOT be used unless the underlying stream is encrypted (using SSL or TLS) - // and the client has verified that the server certificate is signed by a trusted certificate authority. - - if (in_array('DIGEST-MD5', $methods)) - { - $this->send_xml(""); - } - else if (in_array('PLAIN', $methods) && ($this->session['ssl'] || !empty($this->session['tls']))) - { - // http://www.ietf.org/rfc/rfc4616.txt (PLAIN SASL Mechanism) - $this->send_xml("" - . base64_encode($this->username . '@' . $this->server . chr(0) . $this->username . chr(0) . $this->password) . - ''); - } - else if (in_array('ANONYMOUS', $methods)) - { - $this->send_xml(""); - } - else - { - // not good... - $this->add_to_log('Error: No authentication method supported.'); - $this->disconnect(); - return false; - } - - return $this->response($this->listen()); - } - else - { - // ok, this is it. bye. - $this->add_to_log('Error: Server does not offer SASL authentication.'); - $this->disconnect(); - return false; - } - break; - - case 'challenge': - // continue with authentication...a challenge literally -_- - $decoded = base64_decode($xml['challenge'][0]['#']); - $decoded = $this->parse_data($decoded); - - if (!isset($decoded['digest-uri'])) - { - $decoded['digest-uri'] = 'xmpp/'. $this->server; - } - - // better generate a cnonce, maybe it's needed - $decoded['cnonce'] = base64_encode(md5(uniqid(mt_rand(), true))); - - // second challenge? - if (isset($decoded['rspauth'])) - { - $this->send_xml(""); - } - else - { - // Make sure we only use 'auth' for qop (relevant for $this->encrypt_password()) - // If the is choking up on the changed parameter we may need to adjust encrypt_password() directly - if (isset($decoded['qop']) && $decoded['qop'] != 'auth' && strpos($decoded['qop'], 'auth') !== false) - { - $decoded['qop'] = 'auth'; - } - - $response = array( - 'username' => $this->username, - 'response' => $this->encrypt_password(array_merge($decoded, array('nc' => '00000001'))), - 'charset' => 'utf-8', - 'nc' => '00000001', - 'qop' => 'auth', // only auth being supported - ); - - foreach (array('nonce', 'digest-uri', 'realm', 'cnonce') as $key) - { - if (isset($decoded[$key])) - { - $response[$key] = $decoded[$key]; - } - } - - $this->send_xml("" . base64_encode($this->implode_data($response)) . ''); - } - - return $this->response($this->listen()); - break; - - case 'failure': - $this->add_to_log('Error: Server sent "failure".'); - $this->disconnect(); - return false; - break; - - case 'proceed': - // continue switching to TLS - $meta = stream_get_meta_data($this->connection); - stream_set_blocking($this->connection, 1); - - if (!stream_socket_enable_crypto($this->connection, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) - { - $this->add_to_log('Error: TLS mode change failed.'); - return false; - } - - stream_set_blocking($this->connection, $meta['blocked']); - $this->session['tls'] = true; - - // new stream - $this->send_xml("\n"); - $this->send_xml("\n"); - - return $this->response($this->listen()); - break; - - case 'success': - // Yay, authentication successful. - $this->send_xml("\n"); - $this->session['authenticated'] = true; - - // we have to wait for another response - return $this->response($this->listen()); - break; - - case 'iq': - // we are not interested in IQs we did not expect - if (!isset($xml['iq'][0]['@']['id'])) - { - return false; - } - - // multiple possibilities here - switch ($xml['iq'][0]['@']['id']) - { - case 'bind_1': - $this->session['jid'] = $xml['iq'][0]['#']['bind'][0]['#']['jid'][0]['#']; - - // and (maybe) yet another request to be able to send messages *finally* - if ($this->session['sess_required']) - { - $this->send_xml(" - - "); - return $this->response($this->listen()); - } - - return true; - break; - - case 'sess_1': - return true; - break; - - case 'reg_1': - $this->send_xml(" - - " . utf8_htmlspecialchars($this->username) . " - " . utf8_htmlspecialchars($this->password) . " - - "); - return $this->response($this->listen()); - break; - - case 'reg_2': - // registration end - if (isset($xml['iq'][0]['#']['error'])) - { - $this->add_to_log('Warning: Registration failed.'); - return false; - } - return true; - break; - - case 'unreg_1': - return true; - break; - - default: - $this->add_to_log('Notice: Received unexpected IQ.'); - return false; - break; - } - break; - - case 'message': - // we are only interested in content... - if (!isset($xml['message'][0]['#']['body'])) - { - return false; - } - - $message['body'] = $xml['message'][0]['#']['body'][0]['#']; - $message['from'] = $xml['message'][0]['@']['from']; - - if (isset($xml['message'][0]['#']['subject'])) - { - $message['subject'] = $xml['message'][0]['#']['subject'][0]['#']; - } - $this->session['messages'][] = $message; - return true; - break; - - default: - // hm...don't know this response - $this->add_to_log('Notice: Unknown server response'); - return false; - break; - } - } - - /** - * Send Jabber message - * - * @param string $to Recepient usermane - * @param string $text Message text - * @param string $subject Message subject - * @param string $type Message type - * - * @return int|bool - */ - public function send_message(string $to, string $text, string $subject = '', string $type = 'normal'): int|bool - { - if (!isset($this->session['jid'])) - { - return false; - } - - if (!in_array($type, array('chat', 'normal', 'error', 'groupchat', 'headline'))) - { - $type = 'normal'; - } - - return $this->send_xml(" - " . utf8_htmlspecialchars($subject) . " - " . utf8_htmlspecialchars($text) . " - " - ); - } - - /** - * Encrypts a password as in RFC 2831 - * - * @param array $data Needs data from the client-server connection - * @return string - */ - public function encrypt_password(array $data): string - { - // let's me think about again... - foreach (array('realm', 'cnonce', 'digest-uri') as $key) - { - if (!isset($data[$key])) - { - $data[$key] = ''; - } - } - - $pack = md5($this->username . ':' . $data['realm'] . ':' . $this->password); - - if (isset($data['authzid'])) - { - $a1 = pack('H32', $pack) . sprintf(':%s:%s:%s', $data['nonce'], $data['cnonce'], $data['authzid']); - } - else - { - $a1 = pack('H32', $pack) . sprintf(':%s:%s', $data['nonce'], $data['cnonce']); - } - - // should be: qop = auth - $a2 = 'AUTHENTICATE:'. $data['digest-uri']; - - return md5(sprintf('%s:%s:%s:%s:%s:%s', md5($a1), $data['nonce'], $data['nc'], $data['cnonce'], $data['qop'], md5($a2))); - } - - /** - * Parse data string like a="b",c="d",... or like a="a, b", c, d="e", f=g,... - * - * @param string $data - * @return array a => b ... - */ - public function parse_data(string $data): array - { - $data = explode(',', $data); - $pairs = array(); - $key = false; - - foreach ($data as $pair) - { - $dd = strpos($pair, '='); - - if ($dd) - { - $key = trim(substr($pair, 0, $dd)); - $pairs[$key] = trim(trim(substr($pair, $dd + 1)), '"'); - } - else if (strpos(strrev(trim($pair)), '"') === 0 && $key) - { - // We are actually having something left from "a, b" values, add it to the last one we handled. - $pairs[$key] .= ',' . trim(trim($pair), '"'); - continue; - } - } - - return $pairs; - } - - /** - * The opposite of jabber::parse_data() - * - * @param array $data Data array - * @return string - */ - public function implode_data(array $data): string - { - $return = array(); - foreach ($data as $key => $value) - { - $return[] = $key . '="' . $value . '"'; - } - return implode(',', $return); - } - - /** - * xmlize() - * @author Hans Anderson - * @copyright Hans Anderson / http://www.hansanderson.com/php/xml/ - * - * @param string $data Data string - * @param string|int|bool $skip_white New XML parser option value - * @param string $encoding Encoding value - * @return array - */ - function xmlize(string $data, string|int|bool $skip_white = 1, string $encoding = 'UTF-8'): array - { - $data = trim($data); - - if (substr($data, 0, 5) != ''. $data . ''; - } - - $vals = $index = $array = array(); - $parser = xml_parser_create($encoding); - xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); - xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, $skip_white); - xml_parse_into_struct($parser, $data, $vals, $index); - xml_parser_free($parser); - - $i = 0; - $tagname = $vals[$i]['tag']; - - $array[$tagname][0]['@'] = (isset($vals[$i]['attributes'])) ? $vals[$i]['attributes'] : array(); - $array[$tagname][0]['#'] = $this->_xml_depth($vals, $i); - - if (substr($data, 0, 5) != '_xml_depth($vals, $i); - - break; - - case 'cdata': - array_push($children, $vals[$i]['value']); - break; - - case 'complete': - - $tagname = $vals[$i]['tag']; - $size = (isset($children[$tagname])) ? count($children[$tagname]) : 0; - $children[$tagname][$size]['#'] = (isset($vals[$i]['value'])) ? $vals[$i]['value'] : array(); - - if (isset($vals[$i]['attributes'])) - { - $children[$tagname][$size]['@'] = $vals[$i]['attributes']; - } - - break; - - case 'close': - return $children; - break; - } - } - - return $children; - } -} diff --git a/tests/messenger/method_jabber_test.php b/tests/messenger/method_jabber_test.php deleted file mode 100644 index d61cd9b1b15..00000000000 --- a/tests/messenger/method_jabber_test.php +++ /dev/null @@ -1,311 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -class phpbb_messenger_method_jabber_test extends \phpbb_test_case -{ - protected $assets_bag; - protected $cache_path; - protected config $config; - protected $dispatcher; - protected $extension_manager; - protected jabber $method_jabber; - protected $method_base; - protected $language; - protected $log; - protected $path_helper; - protected queue $queue; - protected $request; - protected $twig_extensions_collection; - protected $twig_lexer; - protected $user; - - public function setUp(): void - { - global $config, $request, $symfony_request, $user, $phpbb_root_path, $phpEx; - - $this->assets_bag = new assets_bag(); - $this->cache_path = $phpbb_root_path . 'cache/' . PHPBB_ENVIRONMENT . '/twig'; - $this->config = new config([ - 'force_server_vars' => false, - 'jab_username' => 'test', - 'jab_password' => 'password', - 'jab_use_ssl' => false, - 'jab_host' => 'localhost', - 'jab_port' => 5222, - 'jab_verify_peer' => true, - 'jab_verify_peer_name' => true, - 'jab_allow_self_signed' => false, - ]); - $config = $this->config; - $this->dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher') - ->disableOriginalConstructor() - ->getMock(); - $this->filesystem = new \phpbb\filesystem\filesystem(); - $this->language = new language(new language_file_loader($phpbb_root_path, $phpEx)); - $this->queue = $this->createMock(queue::class); - $this->request = new phpbb_mock_request(); - $request = $this->request; - $this->symfony_request = new symfony_request(new phpbb_mock_request()); - $symfony_request = $this->symfony_request; - $this->user = $this->getMockBuilder('\phpbb\user') - ->setConstructorArgs([$this->language, '\phpbb\datetime']) - ->getMock(); - $user = $this->user; - $user->page['root_script_path'] = 'phpbb/'; - $this->user->host = 'yourdomain.com'; - $this->path_helper = new path_helper( - $this->symfony_request, - $this->request, - $phpbb_root_path, - $phpEx - ); - $phpbb_container = new phpbb_mock_container_builder; - $this->twig_extensions_collection = new \phpbb\di\service_collection($phpbb_container); - $twig = new \phpbb\template\twig\environment( - $this->assets_bag, - $this->config, - $this->filesystem, - $this->path_helper, - $this->cache_path, - null, - new \phpbb\template\twig\loader(''), - $this->dispatcher, - array( - 'cache' => false, - 'debug' => false, - 'auto_reload' => true, - 'autoescape' => false, - ) - ); - $this->twig_lexer = new \phpbb\template\twig\lexer($twig); - $this->extension_manager = new phpbb_mock_extension_manager( - __DIR__ . '/', - array( - 'vendor2/foo' => array( - 'ext_name' => 'vendor2/foo', - 'ext_active' => '1', - 'ext_path' => 'ext/vendor2/foo/', - ), - ) - ); - $this->log = $this->createMock(\phpbb\log\log_interface::class); - - $this->method_jabber = new jabber( - $this->assets_bag, - $this->config, - $this->dispatcher, - $this->language, - $this->queue, - $this->path_helper, - $this->request, - $this->twig_extensions_collection, - $this->twig_lexer, - $this->user, - $phpbb_root_path, - $this->cache_path, - $this->extension_manager, - $this->log - ); - } - - public function test_miscellaneous() - { - $this->method_jabber->init(); - $this->assertEquals(messenger_interface::NOTIFY_IM, $this->method_jabber->get_id()); - $this->assertEquals('jabber', $this->method_jabber->get_queue_object_name()); - $this->assertFalse($this->method_jabber->is_enabled()); - $this->config->set('jab_enable', true); - $this->assertTrue($this->method_jabber->is_enabled()); - $this->assertEquals(@extension_loaded('openssl'), $this->method_jabber->can_use_ssl()); - } - - public function test_stream_options() - { - $this->method_jabber->init(); - $this->assertEquals($this->method_jabber, $this->method_jabber->stream_options([ - 'allow_self_signed' => true, - ])); - - $stream_options_reflection = new \ReflectionProperty($this->method_jabber, 'stream_options'); - $stream_options = $stream_options_reflection->getValue($this->method_jabber); - $this->assertEquals([ - 'ssl' => [ - 'allow_self_signed' => false, - 'verify_peer' => true, - 'verify_peer_name' => true, - ], - ], $stream_options); - - $this->method_jabber->ssl(true); - - $this->assertEquals($this->method_jabber, $this->method_jabber->stream_options([ - 'allow_self_signed' => true, - ])); - $stream_options = $stream_options_reflection->getValue($this->method_jabber); - $this->assertEquals([ - 'ssl' => [ - 'allow_self_signed' => true, - 'verify_peer' => true, - 'verify_peer_name' => true, - ], - ], $stream_options); - } - - public function test_port_ssl_switch() - { - $port_reflection = new \ReflectionProperty($this->method_jabber, 'port'); - - $this->method_jabber->port(); - $this->assertEquals(5222, $port_reflection->getValue($this->method_jabber)); - - $this->method_jabber->ssl(true) - ->port(); - $this->assertEquals(5223, $port_reflection->getValue($this->method_jabber)); - } - - public function test_username() - { - $jabber_reflection = new \ReflectionClass($this->method_jabber); - $username_reflection = $jabber_reflection->getProperty('username'); - $jid_reflection = $jabber_reflection->getProperty('jid'); - - $this->method_jabber->username('foo@bar'); - $this->assertEquals(['foo', 'bar'], $jid_reflection->getValue($this->method_jabber)); - $this->assertEquals('foo', $username_reflection->getValue($this->method_jabber)); - - $this->method_jabber->username('bar@baz@qux'); - $this->assertEquals(['bar', 'baz@qux'], $jid_reflection->getValue($this->method_jabber)); - $this->assertEquals('bar', $username_reflection->getValue($this->method_jabber)); - } - - public function test_server() - { - $jabber_reflection = new \ReflectionClass($this->method_jabber); - $connect_server_reflection = $jabber_reflection->getProperty('connect_server'); - $server_reflection = $jabber_reflection->getProperty('server'); - - $this->method_jabber->server(); - $this->assertEquals('localhost', $connect_server_reflection->getValue($this->method_jabber)); - $this->assertEquals('localhost', $server_reflection->getValue($this->method_jabber)); - - $this->method_jabber->server('foobar.com'); - $this->assertEquals('foobar.com', $connect_server_reflection->getValue($this->method_jabber)); - $this->assertEquals('foobar.com', $server_reflection->getValue($this->method_jabber)); - - $this->method_jabber->username('foo@bar.com'); - $this->method_jabber->server('foobar.com'); - $this->assertEquals('foobar.com', $connect_server_reflection->getValue($this->method_jabber)); - $this->assertEquals('bar.com', $server_reflection->getValue($this->method_jabber)); - } - - public function test_encrypt_password() - { - $this->method_jabber->init(); - $this->method_jabber->password('password'); - $data = [ - 'realm' => 'example.com', - 'nonce' => '12345', - 'cnonce' => 'abcde', - 'digest-uri' => 'xmpp/example.com', - 'nc' => '00000001', - 'qop' => 'auth', - ]; - - $expected = md5(sprintf( - '%s:%s:%s:%s:%s:%s', - md5(pack('H32', md5('test:example.com:password')) . ':12345:abcde'), - $data['nonce'], - $data['nc'], - $data['cnonce'], - $data['qop'], - md5('AUTHENTICATE:xmpp/example.com') - )); - $this->assertEquals($expected, $this->method_jabber->encrypt_password($data)); - } - - public function test_parse_data() - { - $data = 'key1="value1",key2="value2",key3="value3"'; - $expected = [ - 'key1' => 'value1', - 'key2' => 'value2', - 'key3' => 'value3', - ]; - - $this->assertEquals($expected, $this->method_jabber->parse_data($data)); - } - - public function test_implode_data() - { - $data = [ - 'key1' => 'value1', - 'key2' => 'value2', - 'key3' => 'value3', - ]; - $expected = 'key1="value1",key2="value2",key3="value3"'; - - $this->assertEquals($expected, $this->method_jabber->implode_data($data)); - } - - public function test_xmlize() - { - $xml = 'content'; - $result = $this->method_jabber->xmlize($xml); - - $this->assertArrayHasKey('root', $result); - $this->assertArrayHasKey('child', $result['root'][0]['#']); - $this->assertEquals('content', $result['root'][0]['#']['child'][0]['#']); - $this->assertEquals(['key' => 'value'], $result['root'][0]['#']['child'][0]['@']); - } - - public function test_send_xml() - { - $jabber_mock = $this->getMockBuilder(jabber::class) - ->setConstructorArgs([ - $this->assets_bag, - $this->config, - $this->dispatcher, - $this->language, - $this->queue, - $this->path_helper, - $this->request, - $this->twig_extensions_collection, - $this->twig_lexer, - $this->user, - '', - '', - $this->extension_manager, - $this->log, - ]) - ->onlyMethods(['send_xml']) - ->getMock(); - - $jabber_mock->expects($this->once()) - ->method('send_xml') - ->with('Test') - ->willReturn(true); - - $this->assertTrue($jabber_mock->send_xml('Test')); - } -} diff --git a/tests/messenger/queue_test.php b/tests/messenger/queue_test.php index e99893d5778..cb058cdc751 100644 --- a/tests/messenger/queue_test.php +++ b/tests/messenger/queue_test.php @@ -239,27 +239,10 @@ public function test_process_complete() ], $queue_data['email']); unset($queue_data['email']); }); - $jabber_method = $this->getMockBuilder('phpbb\messenger\method\jabber') - ->disableOriginalConstructor() - ->onlyMethods(['get_queue_object_name', 'process_queue']) - ->getMock(); - $jabber_method->method('get_queue_object_name') - ->willReturn('jabber'); - $jabber_method->method('process_queue') - ->willReturnCallback(function(array &$queue_data) { - $this->assertEquals([ - 'package_size' => 10, - 'data' => [ - ['data2'], - ], - ], $queue_data['jabber']); - unset($queue_data['jabber']); - }); $this->service_collection->method('getIterator') ->willReturn(new \ArrayIterator([ 'email' => $email_method, - 'jabber' => $jabber_method, ])); // Process the queue diff --git a/tests/notification/base.php b/tests/notification/base.php index 07fef3a1c5e..ec6319c420d 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -148,7 +148,6 @@ protected function setUp(): void $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); $messenger_method_collection->add('messenger.method.email'); - $messenger_method_collection->add('messenger.method.jabber'); $phpbb_container->set('messenger.method_collection', $messenger_method_collection); $phpbb_container->compile(); diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 15811cc9680..6400c8bb1d0 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -107,7 +107,6 @@ protected function setUp(): void $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); $messenger_method_collection->add('messenger.method.email'); - $messenger_method_collection->add('messenger.method.jabber'); $phpbb_container->set('messenger.method_collection', $messenger_method_collection); $this->notification_method_email = $this->getMockBuilder('\phpbb\notification\method\email') diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 57b12425091..08505667d7a 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -161,7 +161,6 @@ protected function setUp(): void $messenger_method_collection = new \phpbb\di\service_collection($phpbb_container); $messenger_method_collection->add('messenger.method.email'); - $messenger_method_collection->add('messenger.method.jabber'); $phpbb_container->set('messenger.method_collection', $messenger_method_collection); $phpbb_container->addCompilerPass(new phpbb\di\pass\markpublic_pass()); From bb26658a00c0de83f26a1a7e443f6919c862ac34 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 14 Apr 2025 21:39:06 +0200 Subject: [PATCH 0697/1214] [ticket/17493] Remove jabber data in queue test PHPBB-17493 --- tests/messenger/queue_test.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/messenger/queue_test.php b/tests/messenger/queue_test.php index cb058cdc751..3f87de91fc2 100644 --- a/tests/messenger/queue_test.php +++ b/tests/messenger/queue_test.php @@ -202,20 +202,14 @@ public function test_process_complete() // First save queue data $this->assertFileDoesNotExist($this->cache_file); $this->messenger_queue->init('email', 5); - $this->messenger_queue->init('jabber', 10); $this->assertEquals([ 'email' => [ 'package_size' => 5, 'data' => [], ], - 'jabber' => [ - 'package_size' => 10, - 'data' => [], - ] ], $this->messenger_queue->get_data()); $this->messenger_queue->put('email', ['data1']); - $this->messenger_queue->put('jabber', ['data2']); $this->messenger_queue->save(); $this->assertFileExists($this->cache_file); $this->assertEquals([], $this->messenger_queue->get_data()); From dd53db16259b17aaeb5fe9bd59e49299fbfb274e Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 15 Apr 2025 20:40:21 +0700 Subject: [PATCH 0698/1214] [ticket/17498] Move to Ubuntu 22.04 runner images for SQLite and MSSQL tests PHPBB-17498 --- .github/workflows/tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 32d84776717..e3d8ea86430 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -351,24 +351,24 @@ jobs: # Other database types, namely sqlite3 and mssql other-tests: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: matrix: include: - php: '7.2' db: "sqlite3" - - php: '7.2' - db: "mcr.microsoft.com/mssql/server:2017-latest" - db_alias: 'MSSQL 2017' - php: '7.2' db: "mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04" db_alias: 'MSSQL 2019' + - php: '7.2' + db: "mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04" + db_alias: 'MSSQL 2022' name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} services: mssql: - image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2017-latest' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2017-latest' || matrix.db }} + image: ${{ matrix.db != 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' && matrix.db != 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' && 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' || matrix.db }} env: SA_PASSWORD: "Pssw0rd_12" ACCEPT_EULA: "y" @@ -400,7 +400,7 @@ jobs: env: MATRIX_DB: ${{ matrix.db }} run: | - if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2017-latest' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] + if [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2022-CU13-ubuntu-22.04' ] || [ $MATRIX_DB == 'mcr.microsoft.com/mssql/server:2019-CU27-ubuntu-20.04' ] then db='mssql' else From da32d51a8161245ce892ca3f45456b1449b246b4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 18 Apr 2025 17:07:42 +0200 Subject: [PATCH 0699/1214] [ticket/17493] Remove remnants of user_notify_type PHPBB-17493 --- phpBB/includes/acp/acp_email.php | 40 ++++----- phpBB/includes/acp/acp_inactive.php | 27 +++--- phpBB/includes/acp/acp_users.php | 2 - phpBB/includes/functions_user.php | 3 +- phpBB/includes/mcp/mcp_reports.php | 2 +- phpBB/includes/ucp/ucp_activate.php | 23 +++-- phpBB/includes/ucp/ucp_prefs.php | 2 - phpBB/includes/ucp/ucp_profile.php | 20 +++-- phpBB/includes/ucp/ucp_resend.php | 25 +++--- .../db/migration/data/v400/remove_jabber.php | 15 ++-- .../data/v400/remove_notify_type.php | 64 ++++++++++++++ phpBB/phpbb/message/admin_form.php | 1 - phpBB/phpbb/message/message.php | 83 +++++++------------ phpBB/phpbb/message/topic_form.php | 1 - phpBB/phpbb/message/user_form.php | 2 +- phpBB/phpbb/ucp/controller/reset_password.php | 4 +- tests/auth/provider_apache_test.php | 1 - tests/functional/user_password_reset_test.php | 2 +- tests/notification/convert_test.php | 22 ++++- tests/notification/fixtures/convert.xml | 7 -- 20 files changed, 192 insertions(+), 154 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_notify_type.php diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 8dbdbf409dc..5156676881a 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -226,33 +226,29 @@ function main($id, $mode) */ foreach ($messenger_collection_iterator as $messenger_method) { - $notify_method = $messenger_method->get_id(); - if ($notify_method == messenger_interface::NOTIFY_EMAIL) - { - $messenger_method->set_use_queue($use_queue); - $messenger_method->template($email_template, $used_lang); - $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); - $messenger_method->assign_vars($template_data); + $messenger_method->set_use_queue($use_queue); + $messenger_method->template($email_template, $used_lang); + $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); + $messenger_method->assign_vars($template_data); - for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + { + $email_row = $email_list[$i][$j]; + if (count($email_list[$i]) == 1) + { + $messenger_method->to($email_row['email'], $email_row['name']); + } + else { - $email_row = $email_list[$i][$j]; - if (count($email_list[$i]) == 1) - { - $messenger_method->to($email_row['email'], $email_row['name']); - } - else - { - $messenger_method->bcc($email_row['email'], $email_row['name']); - } + $messenger_method->bcc($email_row['email'], $email_row['name']); } + } - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->set_mail_priority($priority); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->set_mail_priority($priority); - $errored = !$messenger_method->send() || $errored; - $messenger_method->save_queue(); - } + $errored = !$messenger_method->send() || $errored; + $messenger_method->save_queue(); } } unset($email_list); diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index 138e06e5258..b4b39cbdf9b 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -185,7 +185,7 @@ function main($id, $mode) trigger_error($user->lang['EMAIL_DISABLED'] . adm_back_link($this->u_action), E_USER_WARNING); } - $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_type, user_regdate, user_actkey + $sql = 'SELECT user_id, username, user_email, user_lang, user_regdate, user_actkey FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $mark) . ' AND user_inactive_reason'; @@ -211,20 +211,17 @@ function main($id, $mode) */ foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) - { - $messenger_method->template('user_remind_inactive', $row['user_lang']); - $messenger_method->set_addresses($row); - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->assign_vars([ - 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), - 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'], - ]); - - $messenger_method->send(); - $messenger_method->save_queue(); - } + $messenger_method->template('user_remind_inactive', $row['user_lang']); + $messenger_method->set_addresses($row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), + 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), + 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'], + ]); + + $messenger_method->send(); + $messenger_method->save_queue(); } $usernames[] = $row['username']; diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index e01eace64e5..42d0338ba25 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1577,7 +1577,6 @@ function main($id, $mode) 'viewemail' => $request->variable('viewemail', $user_row['user_allow_viewemail']), 'massemail' => $request->variable('massemail', $user_row['user_allow_massemail']), 'hideonline' => $request->variable('hideonline', !$user_row['user_allow_viewonline']), - 'notifymethod' => $request->variable('notifymethod', $user_row['user_notify_type']), 'notifypm' => $request->variable('notifypm', $user_row['user_notify_pm']), 'allowpm' => $request->variable('allowpm', $user_row['user_allow_pm']), @@ -1648,7 +1647,6 @@ function main($id, $mode) 'user_allow_viewemail' => $data['viewemail'], 'user_allow_massemail' => $data['massemail'], 'user_allow_viewonline' => !$data['hideonline'], - 'user_notify_type' => $data['notifymethod'], 'user_notify_pm' => $data['notifypm'], 'user_dateformat' => $data['dateformat'], diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 42c9e7fd5a7..a408f695aa2 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -246,7 +246,6 @@ function user_add($user_row, $cp_data = false, $notifications_data = null) 'user_notify' => 0, 'user_notify_pm' => 1, - 'user_notify_type' => messenger_interface::NOTIFY_EMAIL, 'user_allow_pm' => 1, 'user_allow_viewonline' => 1, 'user_allow_viewemail' => 1, @@ -2528,7 +2527,7 @@ function group_user_attributes($action, $group_id, $user_id_ary = false, $userna case 'approve': // Make sure we only approve those which are pending ;) - $sql = 'SELECT u.user_id, u.user_email, u.username, u.username_clean, u.user_notify_type, u.user_lang + $sql = 'SELECT u.user_id FROM ' . USERS_TABLE . ' u, ' . USER_GROUP_TABLE . ' ug WHERE ug.group_id = ' . $group_id . ' AND ug.user_pending = 1 diff --git a/phpBB/includes/mcp/mcp_reports.php b/phpBB/includes/mcp/mcp_reports.php index 3325fd6b8da..ee9be079aeb 100644 --- a/phpBB/includes/mcp/mcp_reports.php +++ b/phpBB/includes/mcp/mcp_reports.php @@ -661,7 +661,7 @@ function close_report($report_id_list, $mode, $action, $pm = false) { $post_info = ($pm) ? phpbb_get_pm_data($post_id_list) : phpbb_get_post_data($post_id_list, 'm_report'); - $sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_lang, u.user_notify_type + $sql = "SELECT r.report_id, r.$id_column, r.report_closed, r.user_id, r.user_notify, u.username, u.username_clean, u.user_email, u.user_lang FROM " . REPORTS_TABLE . ' r, ' . USERS_TABLE . ' u WHERE ' . $db->sql_in_set('r.report_id', $report_id_list) . ' ' . (($action == 'close') ? 'AND r.report_closed = 0' : '') . ' diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 81036c19568..50ccdfa7e6a 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -35,7 +35,7 @@ function main($id, $mode) $user_id = $request->variable('u', 0); $key = $request->variable('k', ''); - $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason + $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_actkey, user_inactive_reason FROM ' . USERS_TABLE . " WHERE user_id = $user_id"; $result = $db->sql_query($sql); @@ -140,18 +140,15 @@ function main($id, $mode) */ foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $user_row['user_notify_type'] || $user_row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) - { - $messenger_method->set_use_queue(false); - $messenger_method->template('admin_welcome_activated', $user_row['user_lang']); - $messenger_method->set_addresses($user_row); - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->assign_vars([ - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - ]); - - $messenger_method->send(); - } + $messenger_method->set_use_queue(false); + $messenger_method->template('admin_welcome_activated', $user_row['user_lang']); + $messenger_method->set_addresses($user_row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + ]); + + $messenger_method->send(); } $message = 'ACCOUNT_ACTIVE_ADMIN'; diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 480b4a3d12f..86440cd7144 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -42,7 +42,6 @@ function main($id, $mode) case 'personal': add_form_key('ucp_prefs_personal'); $data = array( - 'notifymethod' => $request->variable('notifymethod', $user->data['user_notify_type']), 'dateformat' => $request->variable('dateformat', $user->data['user_dateformat'], true), 'lang' => basename($request->variable('lang', $user->data['user_lang'])), 'user_style' => $request->variable('user_style', (int) $user->data['user_style']), @@ -99,7 +98,6 @@ function main($id, $mode) 'user_allow_viewemail' => $data['viewemail'], 'user_allow_massemail' => $data['massemail'], 'user_allow_viewonline' => ($auth->acl_get('u_hideonline')) ? !$data['hideonline'] : $user->data['user_allow_viewonline'], - 'user_notify_type' => $data['notifymethod'], 'user_options' => $user->data['user_options'], 'user_dateformat' => $data['dateformat'], diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 77c1a56e9d3..a5a1fe3d709 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -357,9 +357,7 @@ function main($id, $mode) if (!count($error)) { - $sql_ary = array( - 'user_notify_type' => messenger_interface::NOTIFY_EMAIL, - ); + $sql_ary = []; if ($config['allow_birthdays']) { @@ -378,13 +376,17 @@ function main($id, $mode) $vars = array('cp_data', 'data', 'sql_ary'); extract($phpbb_dispatcher->trigger_event('core.ucp_profile_info_modify_sql_ary', compact($vars))); - $sql = 'UPDATE ' . USERS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' - WHERE user_id = ' . $user->data['user_id']; - $db->sql_query($sql); + // Skip query if no data to update + if (count($sql_ary)) + { + $sql = 'UPDATE ' . USERS_TABLE . ' + SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' + WHERE user_id = ' . $user->data['user_id']; + $db->sql_query($sql); - // Update Custom Fields - $cp->update_profile_field_data($user->data['user_id'], $cp_data); + // Update Custom Fields + $cp->update_profile_field_data($user->data['user_id'], $cp_data); + } meta_refresh(3, $this->u_action); $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '    ', ''); diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index d3512865dbf..023ea80852d 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -128,7 +128,7 @@ function main($id, $mode) // Grab an array of user_id's with a_user permissions ... these users can activate a user $admin_ary = $auth->acl_get_list(false, 'a_user', false); - $sql = 'SELECT user_id, username, user_email, user_lang, user_notify_type + $sql = 'SELECT user_id, username, user_email, user_lang FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); $result = $db->sql_query($sql); @@ -145,19 +145,16 @@ function main($id, $mode) foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); - if ($messenger_method->get_id() == $row['user_notify_type'] || $row['user_notify_type'] == $messenger_method::NOTIFY_BOTH) - { - $messenger_method->template('admin_activate', $row['user_lang']); - $messenger_method->set_addresses($row); - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->assign_vars([ - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_USER_DETAILS' => $board_url . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", - 'U_ACTIVATE' => $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", - ]); - - $messenger_method->send(); - } + $messenger_method->template('admin_activate', $row['user_lang']); + $messenger_method->set_addresses($row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + 'U_USER_DETAILS' => $board_url . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", + 'U_ACTIVATE' => $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", + ]); + + $messenger_method->send(); } } $db->sql_freeresult($result); diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 994f8c0167c..c297ef0a8a4 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -69,7 +69,7 @@ public function update_data(): array ]], ['permission.remove', ['a_jabber']], ['permission.remove', ['u_sendim']], - ['custom', [[$this, 'remove_from_user_notifcations']]], + ['custom', [[$this, 'move_jabber_to_email_notifications']]], ]; } @@ -101,10 +101,15 @@ public function revert_data(): array ]; } - public function remove_from_user_notifcations() + public function move_jabber_to_email_notifications(int $start = 0) { - $sql = 'DELETE FROM ' . $this->table_prefix . 'user_notifications - WHERE notification_method = ' . $this->db->sql_escape('notification.method.jabber'); - $this->db->sql_query($sql); + $limit = 1000; + + $sql = 'UPDATE ' . $this->tables['user_notifications'] . ' + SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . " + WHERE method = 'notification.method.jabber'"; + $this->db->sql_query_limit($sql, $limit, $start); + + return $this->db->sql_affectedrows() < $limit ? true : $start + $limit; } } diff --git a/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php b/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php new file mode 100644 index 00000000000..a4b3cce8edb --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php @@ -0,0 +1,64 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_notify_type extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\remove_jabber', + '\phpbb\db\migration\data\v400\dev', + '\phpbb\db\migration\data\v30x\release_3_0_0', + ]; + } + + public function update_schema(): array + { + return [ + 'drop_columns' => [ + $this->table_prefix . 'users' => [ + 'user_notify_type', + ], + ] + ]; + } + + public function revert_schema(): array + { + return [ + 'add_columns' => [ + $this->table_prefix . 'users' => [ + 'user_notify_type' => ['TINT:4', 0], + ], + ] + ]; + } + + public function update_data() + { + return [ + ['custom', [[$this, 'remove_jabber_user_notifications']]], + ]; + } + + protected function remove_jabber_user_notifications(): void + { + $sql = 'DELETE FROM ' . $this->tables['user_notifications'] . " + WHERE method = 'notification.method.jabber'"; + $this->db->sql_query($sql); + } +} diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index 72beaa38a68..e6e64210d86 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -157,7 +157,6 @@ public function submit(\phpbb\di\service_collection $messenger) } $this->message->set_sender($this->user->ip, $this->sender_name, $this->sender_address, $this->user->lang_name); - $this->message->set_sender_notify_type(messenger_interface::NOTIFY_EMAIL); } $this->message->set_template('contact_admin'); diff --git a/phpBB/phpbb/message/message.php b/phpBB/phpbb/message/message.php index 344c2f1cf29..9eae8719a47 100644 --- a/phpBB/phpbb/message/message.php +++ b/phpBB/phpbb/message/message.php @@ -54,9 +54,6 @@ class message /** @var string */ protected $sender_username = ''; - /** @var int */ - protected $sender_notify_type = messenger_interface::NOTIFY_EMAIL; - /** @var array */ protected $recipients; @@ -126,7 +123,6 @@ public function add_recipient_from_user_row(array $user) $user['username'], $user['user_email'], $user['user_lang'], - $user['user_notify_type'], $user['username'] ); } @@ -137,18 +133,16 @@ public function add_recipient_from_user_row(array $user) * @param string $recipient_name Displayed sender name * @param string $recipient_address Email address * @param string $recipient_lang - * @param int $recipient_notify_type Used notification methods (Jabber, Email, ...) * @param string $recipient_username User Name (used for AntiAbuse header) * @return void */ - public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_notify_type = messenger_interface::NOTIFY_EMAIL, $recipient_username = '') + public function add_recipient($recipient_name, $recipient_address, $recipient_lang, $recipient_username = '') { $this->recipients[] = array( 'name' => $recipient_name, 'user_email' => $recipient_address, 'lang' => $recipient_lang, 'username' => $recipient_username, - 'notify_type' => $recipient_notify_type, 'to_name' => $recipient_name, ); } @@ -169,8 +163,6 @@ public function set_sender_from_user($user) $user->data['user_id'], $user->data['username'] ); - - $this->set_sender_notify_type($user->data['user_notify_type']); } /** @@ -194,17 +186,6 @@ public function set_sender($sender_ip, $sender_name, $sender_address, $sender_la $this->sender_username = $sender_username; } - /** - * Which notification type should be used? Jabber, Email, ...? - * - * @param int $sender_notify_type - * @return void - */ - public function set_sender_notify_type($sender_notify_type) - { - $this->sender_notify_type = $sender_notify_type; - } - /** * Ok, now the same email if CC specified, but without exposing the user's email address * @@ -226,7 +207,6 @@ public function cc_sender() 'user_email' => $this->sender_address, 'name' => $this->sender_name, 'username' => $this->sender_username, - 'notify_type' => $this->sender_notify_type, 'to_name' => $this->recipients[0]['to_name'], ); } @@ -257,40 +237,37 @@ public function send(\phpbb\di\service_collection $messenger, $contact) foreach ($messenger_collection_iterator as $messenger_method) { $messenger_method->set_use_queue(false); - if ($messenger_method->get_id() == $recipient['notify_type'] || $recipient['notify_type'] == $messenger_method::NOTIFY_BOTH) + $messenger_method->template($this->template, $recipient['lang']); + $messenger_method->set_addresses($recipient); + $messenger_method->reply_to($this->sender_address); + + $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); + $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); + if ($this->sender_id) { - $messenger_method->template($this->template, $recipient['lang']); - $messenger_method->set_addresses($recipient); - $messenger_method->reply_to($this->sender_address); - - $messenger_method->header('X-AntiAbuse', 'Board servername - ' . $this->server_name); - $messenger_method->header('X-AntiAbuse', 'User IP - ' . $this->sender_ip); - if ($this->sender_id) - { - $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); - } - - if ($this->sender_username) - { - $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); - } - - $messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT)); - - $messenger_method->assign_vars([ - 'BOARD_CONTACT' => $contact, - 'TO_USERNAME' => html_entity_decode($recipient['to_name'], ENT_COMPAT), - 'FROM_USERNAME' => html_entity_decode($this->sender_name, ENT_COMPAT), - 'MESSAGE' => html_entity_decode($this->body, ENT_COMPAT), - ]); - - if (count($this->template_vars)) - { - $messenger_method->assign_vars($this->template_vars); - } - - $messenger_method->send(); + $messenger_method->header('X-AntiAbuse', 'User_id - ' . $this->sender_id); } + + if ($this->sender_username) + { + $messenger_method->header('X-AntiAbuse', 'Username - ' . $this->sender_username); + } + + $messenger_method->subject(html_entity_decode($this->subject, ENT_COMPAT)); + + $messenger_method->assign_vars([ + 'BOARD_CONTACT' => $contact, + 'TO_USERNAME' => html_entity_decode($recipient['to_name'], ENT_COMPAT), + 'FROM_USERNAME' => html_entity_decode($this->sender_name, ENT_COMPAT), + 'MESSAGE' => html_entity_decode($this->body, ENT_COMPAT), + ]); + + if (count($this->template_vars)) + { + $messenger_method->assign_vars($this->template_vars); + } + + $messenger_method->send(); } } } diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php index dd73a67ab2c..8141a66b621 100644 --- a/phpBB/phpbb/message/topic_form.php +++ b/phpBB/phpbb/message/topic_form.php @@ -134,7 +134,6 @@ public function submit(\phpbb\di\service_collection $messenger) $this->recipient_lang, messenger_interface::NOTIFY_EMAIL ); - $this->message->set_sender_notify_type(messenger_interface::NOTIFY_EMAIL); parent::submit($messenger); } diff --git a/phpBB/phpbb/message/user_form.php b/phpBB/phpbb/message/user_form.php index f52eabc7e9a..69189a81f11 100644 --- a/phpBB/phpbb/message/user_form.php +++ b/phpBB/phpbb/message/user_form.php @@ -34,7 +34,7 @@ class user_form extends form */ protected function get_user_row($user_id) { - $sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang, user_notify_type + $sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang FROM ' . USERS_TABLE . ' WHERE user_id = ' . (int) $user_id . ' AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index d9ec05316c1..790e00138c1 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -176,7 +176,7 @@ public function request() } $sql_array = [ - 'SELECT' => 'user_id, username, user_permissions, user_email, user_notify_type, user_type,' + 'SELECT' => 'user_id, username, user_permissions, user_email, user_type,' . ' user_lang, user_inactive_reason, reset_token, reset_token_expiration', 'FROM' => [$this->users_table => 'u'], 'WHERE' => "user_email = '" . $this->db->sql_escape($email) . "'" . @@ -308,7 +308,7 @@ public function reset() add_form_key('ucp_reset_password'); $sql_array = [ - 'SELECT' => 'user_id, username, user_permissions, user_email, user_notify_type, user_type,' + 'SELECT' => 'user_id, username, user_permissions, user_email, user_type,' . ' user_lang, user_inactive_reason, reset_token, reset_token_expiration', 'FROM' => [$this->users_table => 'u'], 'WHERE' => 'user_id = ' . $user_id, diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index 3604bbf9cd2..2fcb5b84845 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -152,7 +152,6 @@ public function test_autologin() 'user_post_sortby_dir' => 'a', 'user_notify' => 0, 'user_notify_pm' => 1, - 'user_notify_type' => 0, 'user_allow_pm' => 1, 'user_allow_viewonline' => 1, 'user_allow_viewemail' => 1, diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php index 7e15aca56f9..cf0f9038179 100644 --- a/tests/functional/user_password_reset_test.php +++ b/tests/functional/user_password_reset_test.php @@ -263,7 +263,7 @@ public function test_resendActivation() protected function get_user_data($username) { $db = $this->get_db(); - $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_notify_type, user_actkey, user_inactive_reason, reset_token, reset_token_expiration + $sql = 'SELECT user_id, username, user_type, user_email, user_newpasswd, user_lang, user_actkey, user_inactive_reason, reset_token, reset_token_expiration FROM ' . USERS_TABLE . " WHERE username = '" . $db->sql_escape($username) . "'"; $result = $db->sql_query($sql); diff --git a/tests/notification/convert_test.php b/tests/notification/convert_test.php index 0def0be5edd..6c1f7b496e9 100644 --- a/tests/notification/convert_test.php +++ b/tests/notification/convert_test.php @@ -30,15 +30,33 @@ protected function setUp(): void $this->db = $this->new_dbal(); $this->doctrine_db = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); + $db_tools = $factory->get($this->doctrine_db); + $core_tables = self::get_core_tables(); + + // Add user_notify_type column for testing this migration and set type + $db_tools->sql_column_add($core_tables['users'], 'user_notify_type', ['TINT:4', 0]); + $user_notify_type_map = [ + 1 => 0, + 2 => 0, + 3 => 1, + 4 => 1, + 5 => 2, + 6 => 2, + ]; + + foreach ($user_notify_type_map as $user_id => $notify_type) + { + $this->db->sql_query('UPDATE ' . $core_tables['users'] . ' SET user_notify_type = ' . (int) $notify_type . ' WHERE user_id = ' . (int) $user_id); + } $this->migration = new \phpbb\db\migration\data\v310\notification_options_reconvert( new \phpbb\config\config(array()), $this->db, - $factory->get($this->doctrine_db), + $db_tools, $phpbb_root_path, $phpEx, 'phpbb_', - self::get_core_tables() + $core_tables ); } diff --git a/tests/notification/fixtures/convert.xml b/tests/notification/fixtures/convert.xml index c9d8fafa973..9b357504d16 100644 --- a/tests/notification/fixtures/convert.xml +++ b/tests/notification/fixtures/convert.xml @@ -4,7 +4,6 @@ user_id username username_clean - user_notify_type user_notify_pm user_permissions user_sig @@ -13,7 +12,6 @@ 1 1 0 - 0 @@ -21,7 +19,6 @@ 2 2 2 - 0 1 @@ -30,7 +27,6 @@ 3 3 3 - 1 0 @@ -40,7 +36,6 @@ 4 4 1 - 1 @@ -48,7 +43,6 @@ 5 5 5 - 2 0 @@ -57,7 +51,6 @@ 6 6 6 - 2 1 From d985c8be60031435fb804157ff6a720d688e59b5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 18 Apr 2025 17:20:25 +0200 Subject: [PATCH 0700/1214] [ticket/17493] Remove unused notify type in add_recipient PHPBB-17493 --- phpBB/phpbb/message/admin_form.php | 3 +-- phpBB/phpbb/message/topic_form.php | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index e6e64210d86..ac03558f74d 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -165,8 +165,7 @@ public function submit(\phpbb\di\service_collection $messenger) $this->message->add_recipient( $this->user->lang['ADMINISTRATOR'], $this->config['board_contact'], - $this->config['default_lang'], - messenger_interface::NOTIFY_EMAIL + $this->config['default_lang'] ); $this->message->set_template_vars(array( diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php index 8141a66b621..8386eff89ae 100644 --- a/phpBB/phpbb/message/topic_form.php +++ b/phpBB/phpbb/message/topic_form.php @@ -131,8 +131,7 @@ public function submit(\phpbb\di\service_collection $messenger) $this->message->add_recipient( $this->recipient_name, $this->recipient_address, - $this->recipient_lang, - messenger_interface::NOTIFY_EMAIL + $this->recipient_lang ); parent::submit($messenger); From 5ab0446eb188be36b9bc0796d8a3a7252d3b1565 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 18 Apr 2025 19:49:57 +0200 Subject: [PATCH 0701/1214] [ticket/17493] Remove unused use statements PHPBB-17493 --- phpBB/phpbb/message/admin_form.php | 2 -- phpBB/phpbb/message/topic_form.php | 2 -- 2 files changed, 4 deletions(-) diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index ac03558f74d..30c863bb7ff 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -13,8 +13,6 @@ namespace phpbb\message; -use phpbb\messenger\method\messenger_interface; - /** * Class admin_form * Displays a message to the user and allows him to send an email diff --git a/phpBB/phpbb/message/topic_form.php b/phpBB/phpbb/message/topic_form.php index 8386eff89ae..15a4f30ac20 100644 --- a/phpBB/phpbb/message/topic_form.php +++ b/phpBB/phpbb/message/topic_form.php @@ -13,8 +13,6 @@ namespace phpbb\message; -use phpbb\messenger\method\messenger_interface; - /** * Class topic_form * Form used to send topics as notification emails From 27550ce59b8a66a6f1a988b8471711b630eaf745 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Apr 2025 07:55:28 +0200 Subject: [PATCH 0702/1214] [ticket/17493] Remove not needed function in migration and fix type hinting PHPBB-17493 --- .../phpbb/db/migration/data/v400/remove_jabber.php | 2 +- .../db/migration/data/v400/remove_notify_type.php | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index c297ef0a8a4..5ff6b1e9b54 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -101,7 +101,7 @@ public function revert_data(): array ]; } - public function move_jabber_to_email_notifications(int $start = 0) + public function move_jabber_to_email_notifications(?int $start = 0) { $limit = 1000; diff --git a/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php b/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php index a4b3cce8edb..7ed606cd804 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_notify_type.php @@ -47,18 +47,4 @@ public function revert_schema(): array ] ]; } - - public function update_data() - { - return [ - ['custom', [[$this, 'remove_jabber_user_notifications']]], - ]; - } - - protected function remove_jabber_user_notifications(): void - { - $sql = 'DELETE FROM ' . $this->tables['user_notifications'] . " - WHERE method = 'notification.method.jabber'"; - $this->db->sql_query($sql); - } } From 54d8a49e7000dc57f28ee99cd37d35a0271b4a45 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Apr 2025 07:58:53 +0200 Subject: [PATCH 0703/1214] [ticket/17493] Improve handling of nullable start parameter PHPBB-17493 --- phpBB/phpbb/db/migration/data/v400/remove_jabber.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 5ff6b1e9b54..b82fdfc8dbf 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -101,14 +101,14 @@ public function revert_data(): array ]; } - public function move_jabber_to_email_notifications(?int $start = 0) + public function move_jabber_to_email_notifications(?int $start) { $limit = 1000; $sql = 'UPDATE ' . $this->tables['user_notifications'] . ' SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . " WHERE method = 'notification.method.jabber'"; - $this->db->sql_query_limit($sql, $limit, $start); + $this->db->sql_query_limit($sql, $limit, $start ?: 0); return $this->db->sql_affectedrows() < $limit ? true : $start + $limit; } From 52f04a3c2c4ae255633e23edb95f97b42d7eb5a8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 20 Apr 2025 08:53:14 +0200 Subject: [PATCH 0704/1214] [ticket/17493] Remove "short" email templates as they were jabber only PHPBB-17493 --- phpBB/language/en/email/short/bookmark.txt | 13 ------------- phpBB/language/en/email/short/newtopic_notify.txt | 11 ----------- phpBB/language/en/email/short/post_approved.txt | 13 ------------- phpBB/language/en/email/short/post_disapproved.txt | 11 ----------- phpBB/language/en/email/short/post_in_queue.txt | 13 ------------- phpBB/language/en/email/short/privmsg_notify.txt | 13 ------------- phpBB/language/en/email/short/quote.txt | 13 ------------- phpBB/language/en/email/short/report_pm.txt | 10 ---------- phpBB/language/en/email/short/report_post.txt | 13 ------------- phpBB/language/en/email/short/topic_approved.txt | 10 ---------- phpBB/language/en/email/short/topic_disapproved.txt | 11 ----------- phpBB/language/en/email/short/topic_in_queue.txt | 13 ------------- phpBB/language/en/email/short/topic_notify.txt | 13 ------------- 13 files changed, 157 deletions(-) delete mode 100644 phpBB/language/en/email/short/bookmark.txt delete mode 100644 phpBB/language/en/email/short/newtopic_notify.txt delete mode 100644 phpBB/language/en/email/short/post_approved.txt delete mode 100644 phpBB/language/en/email/short/post_disapproved.txt delete mode 100644 phpBB/language/en/email/short/post_in_queue.txt delete mode 100644 phpBB/language/en/email/short/privmsg_notify.txt delete mode 100644 phpBB/language/en/email/short/quote.txt delete mode 100644 phpBB/language/en/email/short/report_pm.txt delete mode 100644 phpBB/language/en/email/short/report_post.txt delete mode 100644 phpBB/language/en/email/short/topic_approved.txt delete mode 100644 phpBB/language/en/email/short/topic_disapproved.txt delete mode 100644 phpBB/language/en/email/short/topic_in_queue.txt delete mode 100644 phpBB/language/en/email/short/topic_notify.txt diff --git a/phpBB/language/en/email/short/bookmark.txt b/phpBB/language/en/email/short/bookmark.txt deleted file mode 100644 index 963b644415d..00000000000 --- a/phpBB/language/en/email/short/bookmark.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Reply in "{TOPIC_TITLE}" - -Hello {USERNAME}, - -Your bookmarked topic "{TOPIC_TITLE}" received a new reply since your last visit to "{SITENAME}". No more notifications will be sent until you visit the topic. - -If you want to view the newest post made since your last visit, click the following link: -{U_NEWEST_POST} - -If you no longer wish to receive updates about replies to bookmarks, please update your notification settings here: -{U_NOTIFICATION_SETTINGS} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/newtopic_notify.txt b/phpBB/language/en/email/short/newtopic_notify.txt deleted file mode 100644 index e8f8c25b9e1..00000000000 --- a/phpBB/language/en/email/short/newtopic_notify.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: New topic in "{FORUM_NAME}" - -Hello {USERNAME}, - -The forum "{FORUM_NAME}" received a new topic "{TOPIC_TITLE}" by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more notifications will be sent until you visit the forum. -{U_FORUM} - -If you no longer wish to watch this forum click the following link: -{U_STOP_WATCHING_FORUM} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_approved.txt b/phpBB/language/en/email/short/post_approved.txt deleted file mode 100644 index 87e8acebb62..00000000000 --- a/phpBB/language/en/email/short/post_approved.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Post approved - "{POST_SUBJECT}" - -Hello {USERNAME}, - -Your post "{POST_SUBJECT}" at "{SITENAME}" was approved by a moderator or administrator. - -If you want to view the post, click the following link: -{U_VIEW_POST} - -If you want to view the topic, click the following link: -{U_VIEW_TOPIC} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_disapproved.txt b/phpBB/language/en/email/short/post_disapproved.txt deleted file mode 100644 index 11a0564cb83..00000000000 --- a/phpBB/language/en/email/short/post_disapproved.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: Post disapproved - "{POST_SUBJECT}" - -Hello {USERNAME}, - -Your post "{POST_SUBJECT}" at "{SITENAME}" was disapproved by a moderator or administrator. - -The following reason was given for the disapproval: - -{REASON} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/post_in_queue.txt b/phpBB/language/en/email/short/post_in_queue.txt deleted file mode 100644 index 8ccbc8e9bbc..00000000000 --- a/phpBB/language/en/email/short/post_in_queue.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Post needs approval - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -The post "{POST_SUBJECT}" at "{SITENAME}" needs approval. - -If you want to view the post, click the following link: -{U_VIEW_POST} - -If you want to view the topic, click the following link: -{U_TOPIC} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/privmsg_notify.txt b/phpBB/language/en/email/short/privmsg_notify.txt deleted file mode 100644 index 0c579fa51cb..00000000000 --- a/phpBB/language/en/email/short/privmsg_notify.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: New private message - -Hello {USERNAME}, - -A new private message from "{AUTHOR_NAME}" to your account on "{SITENAME}" with the following subject has arrived: -{SUBJECT} - -You can view your new message by clicking on the following link: -{U_VIEW_MESSAGE} - -You have requested that you be notified on this event, remember that you can always choose not to be notified of new messages by changing the appropriate setting in your profile. - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/quote.txt b/phpBB/language/en/email/short/quote.txt deleted file mode 100644 index 871f4710371..00000000000 --- a/phpBB/language/en/email/short/quote.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Quoted in "{TOPIC_TITLE}" - -Hello {USERNAME}, - -"{AUTHOR_NAME}" quoted you in the topic "{TOPIC_TITLE}" at "{SITENAME}". - -If you want to view the quoted post, click the following link: -{U_VIEW_POST} - -If you no longer wish to receive updates about replies quoting you, please update your notification settings here: -{U_NOTIFICATION_SETTINGS} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/report_pm.txt b/phpBB/language/en/email/short/report_pm.txt deleted file mode 100644 index 771646046b5..00000000000 --- a/phpBB/language/en/email/short/report_pm.txt +++ /dev/null @@ -1,10 +0,0 @@ -Subject: Private Message report - "{SUBJECT}" - -Hello {USERNAME}, - -A Private Message titled "{SUBJECT}" by "{AUTHOR_NAME}" at "{SITENAME}" was reported. - -If you want to view the report, click the following link: -{U_VIEW_REPORT} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/report_post.txt b/phpBB/language/en/email/short/report_post.txt deleted file mode 100644 index 1e50af16151..00000000000 --- a/phpBB/language/en/email/short/report_post.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Post report - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -The post "{POST_SUBJECT}" at "{SITENAME}" was reported. - -If you want to view the report, click the following link: -{U_VIEW_REPORT} - -If you want to view the post, click the following link: -{U_VIEW_POST} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_approved.txt b/phpBB/language/en/email/short/topic_approved.txt deleted file mode 100644 index 132a15ea246..00000000000 --- a/phpBB/language/en/email/short/topic_approved.txt +++ /dev/null @@ -1,10 +0,0 @@ -Subject: Topic approved - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -Your topic "{TOPIC_TITLE}" at "{SITENAME}" was approved by a moderator or administrator. - -If you want to view the topic, click the following link: -{U_VIEW_TOPIC} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_disapproved.txt b/phpBB/language/en/email/short/topic_disapproved.txt deleted file mode 100644 index dfb0f292283..00000000000 --- a/phpBB/language/en/email/short/topic_disapproved.txt +++ /dev/null @@ -1,11 +0,0 @@ -Subject: Topic disapproved - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -Your topic "{TOPIC_TITLE}" at "{SITENAME}" was disapproved by a moderator or administrator. - -The following reason was given for the disapproval: - -{REASON} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_in_queue.txt b/phpBB/language/en/email/short/topic_in_queue.txt deleted file mode 100644 index f4ed7b2ace0..00000000000 --- a/phpBB/language/en/email/short/topic_in_queue.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Topic needs approval - "{TOPIC_TITLE}" - -Hello {USERNAME}, - -The topic "{TOPIC_TITLE}" at "{SITENAME}" needs approval. - -If you want to view the topic, click the following link: -{U_VIEW_TOPIC} - -If you want to view the forum, click the following link: -{U_FORUM} - -{EMAIL_SIG} diff --git a/phpBB/language/en/email/short/topic_notify.txt b/phpBB/language/en/email/short/topic_notify.txt deleted file mode 100644 index d92b342f33c..00000000000 --- a/phpBB/language/en/email/short/topic_notify.txt +++ /dev/null @@ -1,13 +0,0 @@ -Subject: Reply in "{TOPIC_TITLE}" - -Hello {USERNAME}, - -The topic "{TOPIC_TITLE}" received a new reply by {AUTHOR_NAME} since your last visit to "{SITENAME}". No more emails will be sent until you visit the topic. - -If you want to view the newest post made since your last visit, click the following link: -{U_NEWEST_POST} - -If you no longer wish to watch this topic click the following link: -{U_STOP_WATCHING_TOPIC} - -{EMAIL_SIG} From bde52e28f8765a73265b1ff76bce1c117a73c442 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 11:44:49 +0200 Subject: [PATCH 0705/1214] [ticket/17493] Move cpf update outside if PHPBB-17493 --- phpBB/includes/ucp/ucp_profile.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index a5a1fe3d709..93f98d613f2 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -383,11 +383,11 @@ function main($id, $mode) SET ' . $db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $user->data['user_id']; $db->sql_query($sql); - - // Update Custom Fields - $cp->update_profile_field_data($user->data['user_id'], $cp_data); } + // Always update custom fields + $cp->update_profile_field_data($user->data['user_id'], $cp_data); + meta_refresh(3, $this->u_action); $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); trigger_error($message); From 3caab55e819772bfad43960901a3898f10405c4b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 15:16:41 +0200 Subject: [PATCH 0706/1214] [ticket/17493] Remove remnants of notify type PHPBB-17493 --- phpBB/includes/acp/acp_users.php | 3 --- phpBB/includes/constants.php | 8 -------- phpBB/includes/ucp/ucp_prefs.php | 3 --- phpBB/install/convertors/convert_phpbb20.php | 1 - .../data/v310/notification_options_reconvert.php | 8 ++++++-- phpBB/phpbb/messenger/method/email.php | 8 -------- .../messenger/method/messenger_interface.php | 16 ---------------- phpBB/phpbb/notification/method/email.php | 2 +- .../phpbb/notification/method/messenger_base.php | 6 +++--- tests/messenger/method_email_test.php | 1 - 10 files changed, 10 insertions(+), 46 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 42d0338ba25..6abf55ebc8a 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1784,9 +1784,6 @@ function main($id, $mode) 'MASS_EMAIL' => $data['massemail'], 'ALLOW_PM' => $data['allowpm'], 'HIDE_ONLINE' => $data['hideonline'], - 'NOTIFY_EMAIL' => ($data['notifymethod'] == messenger_interface::NOTIFY_EMAIL) ? true : false, - 'NOTIFY_IM' => ($data['notifymethod'] == messenger_interface::NOTIFY_IM) ? true : false, - 'NOTIFY_BOTH' => ($data['notifymethod'] == messenger_interface::NOTIFY_BOTH) ? true : false, 'NOTIFY_PM' => $data['notifypm'], 'BBCODE' => $data['bbcode'], 'SMILIES' => $data['smilies'], diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index e9890d27e1d..e8b77ab2ce9 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -119,14 +119,6 @@ define('POST_ANNOUNCE', 2); define('POST_GLOBAL', 3); -// Notify methods -/** @deprecated 4.0.0-a1 Replaced by \phpbb\messenger\method\messenger_interface::NOTIFY_EMAIL, to be removed in 5.0.0-a1 */ -define('NOTIFY_EMAIL', 0); -/** @deprecated 4.0.0-a1 Replaced by \phpbb\messenger\method\messenger_interface::NOTIFY_IM, to be removed in 5.0.0-a1 */ -define('NOTIFY_IM', 1); -/** @deprecated 4.0.0-a1 Replaced by \phpbb\messenger\method\messenger_interface::NOTIFY_BOTH, to be removed in 5.0.0-a1 */ -define('NOTIFY_BOTH', 2); - // Notify status define('NOTIFY_YES', 0); define('NOTIFY_NO', 1); diff --git a/phpBB/includes/ucp/ucp_prefs.php b/phpBB/includes/ucp/ucp_prefs.php index 86440cd7144..a5794870b72 100644 --- a/phpBB/includes/ucp/ucp_prefs.php +++ b/phpBB/includes/ucp/ucp_prefs.php @@ -176,9 +176,6 @@ function main($id, $mode) $template->assign_vars([ 'ERROR' => (count($error)) ? implode('
    ', $error) : '', - 'S_NOTIFY_EMAIL' => ($data['notifymethod'] == messenger_interface::NOTIFY_EMAIL) ? true : false, - 'S_NOTIFY_IM' => ($data['notifymethod'] == messenger_interface::NOTIFY_IM) ? true : false, - 'S_NOTIFY_BOTH' => ($data['notifymethod'] == messenger_interface::NOTIFY_BOTH) ? true : false, 'S_VIEW_EMAIL' => $data['viewemail'], 'S_MASS_EMAIL' => $data['massemail'], 'S_ALLOW_PM' => $data['allowpm'], diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index cff03b712e8..db5a38db1f9 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -937,7 +937,6 @@ array('user_emailtime', 'users.user_emailtime', 'null_to_zero'), array('user_notify', 'users.user_notify', 'intval'), array('user_notify_pm', 'users.user_notify_pm', 'intval'), - array('user_notify_type', $messenger_method::NOTIFY_EMAIL, ''), array('user_allow_pm', 'users.user_allow_pm', 'intval'), array('user_allow_viewonline', 'users.user_allow_viewonline', 'intval'), array('user_allow_viewemail', 'users.user_viewemail', 'intval'), diff --git a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php index 7f58076a8d0..f2879f4d719 100644 --- a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php +++ b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php @@ -17,6 +17,10 @@ class notification_options_reconvert extends \phpbb\db\migration\migration { + protected const NOTIFY_EMAIL = 0; + protected const NOTIFY_IM = 1; + protected const NOTIFY_BOTH = 2; + public static function depends_on() { return array('\phpbb\db\migration\data\v310\notifications_schema_fix'); @@ -69,12 +73,12 @@ public function perform_conversion(\phpbb\db\sql_insert_buffer $insert_buffer, $ // In-board notification $notification_methods[] = ''; - if ($row['user_notify_type'] == messenger_interface::NOTIFY_EMAIL || $row['user_notify_type'] == messenger_interface::NOTIFY_BOTH) + if ($row['user_notify_type'] == self::NOTIFY_EMAIL || $row['user_notify_type'] == self::NOTIFY_BOTH) { $notification_methods[] = 'email'; } - if ($row['user_notify_type'] == messenger_interface::NOTIFY_IM || $row['user_notify_type'] == messenger_interface::NOTIFY_BOTH) + if ($row['user_notify_type'] == self::NOTIFY_IM || $row['user_notify_type'] == self::NOTIFY_BOTH) { $notification_methods[] = 'jabber'; } diff --git a/phpBB/phpbb/messenger/method/email.php b/phpBB/phpbb/messenger/method/email.php index 7bd92538c2d..b601fca232e 100644 --- a/phpBB/phpbb/messenger/method/email.php +++ b/phpBB/phpbb/messenger/method/email.php @@ -74,14 +74,6 @@ class email extends base /** @var AbstractTransport */ protected AbstractTransport $transport; - /** - * {@inheritDoc} - */ - public function get_id(): int - { - return self::NOTIFY_EMAIL; - } - /** * {@inheritDoc} */ diff --git a/phpBB/phpbb/messenger/method/messenger_interface.php b/phpBB/phpbb/messenger/method/messenger_interface.php index 6d82f89b6f3..d9eb247f770 100644 --- a/phpBB/phpbb/messenger/method/messenger_interface.php +++ b/phpBB/phpbb/messenger/method/messenger_interface.php @@ -18,22 +18,6 @@ */ interface messenger_interface { - /** @var int Email notify method used */ - public const NOTIFY_EMAIL = 0; - - /** @var int Instant messaging (Jabber) notify method used */ - public const NOTIFY_IM = 1; - - /** @var int Both notify methods used */ - public const NOTIFY_BOTH = 2; - - /** - * Get messenger method id - * - * @return int - */ - public function get_id(): int; - /** * Check if the messenger method is enabled * diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index 8a2fff1bb95..8ef86f4599e 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -136,7 +136,7 @@ public function notify() $insert_buffer->flush(); - $this->notify_using_messenger(messenger_interface::NOTIFY_EMAIL); + $this->notify_using_messenger('messenger.method.email'); } /** diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index 165735e56c4..616199519c6 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -67,12 +67,12 @@ public function is_available(type_interface $notification_type = null) /** * Notify using phpBB messenger * - * @param int $notify_method Notify method for messenger (e.g. \phpbb\messenger\method\messenger_interface::NOTIFY_IM) + * @param string $notify_method Notify method service for messenger (e.g. 'messenger.method.email'), empty string for all available methods * @param string $template_dir_prefix Base directory to prepend to the email template name * * @return void */ - protected function notify_using_messenger($notify_method, $template_dir_prefix = '') + protected function notify_using_messenger(string $notify_method, string $template_dir_prefix = ''): void { if (empty($this->queue)) { @@ -120,7 +120,7 @@ protected function notify_using_messenger($notify_method, $template_dir_prefix = */ foreach ($messenger_collection_iterator as $messenger_method) { - if ($messenger_method->get_id() == $notify_method || $notify_method == $messenger_method::NOTIFY_BOTH) + if (empty($notify_method) || $messenger_collection_iterator->key() == $notify_method) { $messenger_method->template($notification->get_email_template(), $user['user_lang'], '', $template_dir_prefix); $messenger_method->set_addresses($user); diff --git a/tests/messenger/method_email_test.php b/tests/messenger/method_email_test.php index c21a883f74f..fe5c24808c5 100644 --- a/tests/messenger/method_email_test.php +++ b/tests/messenger/method_email_test.php @@ -119,7 +119,6 @@ public function setUp(): void public function test_miscellaneous(): void { - $this->assertEquals(email::NOTIFY_EMAIL, $this->method_email->get_id()); $this->assertEquals('email', $this->method_email->get_queue_object_name()); $this->assertFalse($this->method_email->is_enabled()); $this->config->offsetSet('email_enable', true); From 3125f3e1d368a424ea6931aea352364d8e819a5c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 15:24:07 +0200 Subject: [PATCH 0707/1214] [ticket/17493] Remove unused methods and use statements PHPBB-17493 --- .../migration/data/v310/notification_options_reconvert.php | 2 -- phpBB/phpbb/messenger/method/base.php | 5 ----- phpBB/phpbb/notification/method/email.php | 3 +-- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php index f2879f4d719..c0b02bc496d 100644 --- a/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php +++ b/phpBB/phpbb/db/migration/data/v310/notification_options_reconvert.php @@ -13,8 +13,6 @@ namespace phpbb\db\migration\data\v310; -use phpbb\messenger\method\messenger_interface; - class notification_options_reconvert extends \phpbb\db\migration\migration { protected const NOTIFY_EMAIL = 0; diff --git a/phpBB/phpbb/messenger/method/base.php b/phpBB/phpbb/messenger/method/base.php index f3db4155cad..17213c6b3de 100644 --- a/phpBB/phpbb/messenger/method/base.php +++ b/phpBB/phpbb/messenger/method/base.php @@ -141,11 +141,6 @@ public function __construct( $this->set_use_queue(); } - /** - * {@inheritdoc} - */ - abstract public function get_id(): int; - /** * {@inheritdoc} */ diff --git a/phpBB/phpbb/notification/method/email.php b/phpBB/phpbb/notification/method/email.php index 8ef86f4599e..07ce0b4f063 100644 --- a/phpBB/phpbb/notification/method/email.php +++ b/phpBB/phpbb/notification/method/email.php @@ -19,14 +19,13 @@ use phpbb\config\config; use phpbb\db\driver\driver_interface; use phpbb\di\service_collection; -use phpbb\messenger\method\messenger_interface; /** * Email notification method class * This class handles sending emails for notifications */ -class email extends \phpbb\notification\method\messenger_base +class email extends messenger_base { /** @var user */ protected $user; From 75a24ae4845ce3d60460afc7082dd1bbb12626f0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 15:42:59 +0200 Subject: [PATCH 0708/1214] [ticket/17493] Explicitly use email in acp/ucp modules PHPBB-17493 --- phpBB/includes/acp/acp_email.php | 51 +++++++++++++---------------- phpBB/includes/acp/acp_inactive.php | 36 +++++++++----------- phpBB/includes/ucp/ucp_activate.php | 33 ++++++++----------- phpBB/includes/ucp/ucp_resend.php | 37 +++++++++------------ 4 files changed, 68 insertions(+), 89 deletions(-) diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php index 5156676881a..2d1b4b72dd2 100644 --- a/phpBB/includes/acp/acp_email.php +++ b/phpBB/includes/acp/acp_email.php @@ -213,43 +213,38 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.acp_email_send_before', compact($vars))); - /** @var \phpbb\di\service_collection */ - $messenger = $phpbb_container->get('messenger.method_collection'); - $messenger_collection_iterator = $messenger->getIterator(); + /** @var \phpbb\di\service_collection $messenger_collection */ + $messenger_collection = $phpbb_container->get('messenger.method_collection'); + /** @var \phpbb\messenger\method\messenger_interface $messenger_method */ + $messenger_method = $messenger_collection->offsetGet('messenger.method.email'); + for ($i = 0, $size = count($email_list); $i < $size; $i++) { $used_lang = $email_list[$i][0]['lang']; - /** - * @var \phpbb\messenger\method\messenger_interface $messenger_method - * @psalm-suppress UndefinedMethod - */ - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->set_use_queue($use_queue); - $messenger_method->template($email_template, $used_lang); - $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); - $messenger_method->assign_vars($template_data); + $messenger_method->set_use_queue($use_queue); + $messenger_method->template($email_template, $used_lang); + $messenger_method->subject(html_entity_decode($subject, ENT_COMPAT)); + $messenger_method->assign_vars($template_data); - for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + for ($j = 0, $list_size = count($email_list[$i]); $j < $list_size; $j++) + { + $email_row = $email_list[$i][$j]; + if (count($email_list[$i]) == 1) { - $email_row = $email_list[$i][$j]; - if (count($email_list[$i]) == 1) - { - $messenger_method->to($email_row['email'], $email_row['name']); - } - else - { - $messenger_method->bcc($email_row['email'], $email_row['name']); - } + $messenger_method->to($email_row['email'], $email_row['name']); + } + else + { + $messenger_method->bcc($email_row['email'], $email_row['name']); } + } - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->set_mail_priority($priority); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->set_mail_priority($priority); - $errored = !$messenger_method->send() || $errored; - $messenger_method->save_queue(); - } + $errored = !$messenger_method->send() || $errored; + $messenger_method->save_queue(); } unset($email_list); diff --git a/phpBB/includes/acp/acp_inactive.php b/phpBB/includes/acp/acp_inactive.php index b4b39cbdf9b..35bbdf4e852 100644 --- a/phpBB/includes/acp/acp_inactive.php +++ b/phpBB/includes/acp/acp_inactive.php @@ -194,9 +194,10 @@ function main($id, $mode) $result = $db->sql_query($sql); - /** @var \phpbb\di\service_collection */ - $messenger = $phpbb_container->get('messenger.method_collection'); - $messenger_collection_iterator = $messenger->getIterator(); + /** @var \phpbb\di\service_collection $messenger_collection */ + $messenger_collection = $phpbb_container->get('messenger.method_collection'); + /** @var \phpbb\messenger\method\messenger_interface $messenger_method */ + $messenger_method = $messenger_collection->offsetGet('messenger.method.email'); if ($row = $db->sql_fetchrow($result)) { @@ -205,24 +206,17 @@ function main($id, $mode) do { - /** - * @var \phpbb\messenger\method\messenger_interface $messenger_method - * @psalm-suppress UndefinedMethod - */ - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->template('user_remind_inactive', $row['user_lang']); - $messenger_method->set_addresses($row); - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->assign_vars([ - 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), - 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), - 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'], - ]); - - $messenger_method->send(); - $messenger_method->save_queue(); - } + $messenger_method->template('user_remind_inactive', $row['user_lang']); + $messenger_method->set_addresses($row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($row['username'], ENT_COMPAT), + 'REGISTER_DATE' => $user->format_date($row['user_regdate'], false, true), + 'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&u=" . $row['user_id'] . '&k=' . $row['user_actkey'], + ]); + + $messenger_method->send(); + $messenger_method->save_queue(); $usernames[] = $row['username']; $user_ids[] = (int) $row['user_id']; diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 50ccdfa7e6a..5351e7c5182 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -131,25 +131,20 @@ function main($id, $mode) $phpbb_notifications = $phpbb_container->get('notification_manager'); $phpbb_notifications->delete_notifications('notification.type.admin_activate_user', $user_row['user_id']); - $messenger = $phpbb_container->get('messenger.method_collection'); - $messenger_collection_iterator = $messenger->getIterator(); - - /** - * @var \phpbb\messenger\method\messenger_interface $messenger_method - * @psalm-suppress UndefinedMethod - */ - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->set_use_queue(false); - $messenger_method->template('admin_welcome_activated', $user_row['user_lang']); - $messenger_method->set_addresses($user_row); - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->assign_vars([ - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - ]); - - $messenger_method->send(); - } + /** @var \phpbb\di\service_collection $messenger_collection */ + $messenger_collection = $phpbb_container->get('messenger.method_collection'); + /** @var \phpbb\messenger\method\messenger_interface $messenger_method */ + $messenger_method = $messenger_collection->offsetGet('messenger.method.email'); + + $messenger_method->set_use_queue(false); + $messenger_method->template('admin_welcome_activated', $user_row['user_lang']); + $messenger_method->set_addresses($user_row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + ]); + + $messenger_method->send(); $message = 'ACCOUNT_ACTIVE_ADMIN'; } diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index 023ea80852d..c2debbbe27b 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -133,29 +133,24 @@ function main($id, $mode) WHERE ' . $db->sql_in_set('user_id', $admin_ary[0]['a_user']); $result = $db->sql_query($sql); - /** @var \phpbb\di\service_collection */ - $messenger = $phpbb_container->get('messenger.method_collection'); - $messenger_collection_iterator = $messenger->getIterator(); + /** @var \phpbb\di\service_collection $messenger_collection */ + $messenger_collection = $phpbb_container->get('messenger.method_collection'); + /** @var \phpbb\messenger\method\messenger_interface $messenger_method */ + $messenger_method = $messenger_collection->offsetGet('messenger.method.email'); + while ($row = $db->sql_fetchrow($result)) { - /** - * @var \phpbb\messenger\method\messenger_interface $messenger_method - * @psalm-suppress UndefinedMethod - */ - foreach ($messenger_collection_iterator as $messenger_method) - { - $messenger_method->set_use_queue(false); - $messenger_method->template('admin_activate', $row['user_lang']); - $messenger_method->set_addresses($row); - $messenger_method->anti_abuse_headers($config, $user); - $messenger_method->assign_vars([ - 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), - 'U_USER_DETAILS' => $board_url . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", - 'U_ACTIVATE' => $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", - ]); - - $messenger_method->send(); - } + $messenger_method->set_use_queue(false); + $messenger_method->template('admin_activate', $row['user_lang']); + $messenger_method->set_addresses($row); + $messenger_method->anti_abuse_headers($config, $user); + $messenger_method->assign_vars([ + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT), + 'U_USER_DETAILS' => $board_url . "/memberlist.$phpEx?mode=viewprofile&u={$user_row['user_id']}", + 'U_ACTIVATE' => $board_url . "/ucp.$phpEx?mode=activate&u={$user_row['user_id']}&k={$user_row['user_actkey']}", + ]); + + $messenger_method->send(); } $db->sql_freeresult($result); } From c0504c2e01eb0dab322c1ed5f7ff0f78970f5539 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 3 Mar 2025 21:29:38 +0100 Subject: [PATCH 0709/1214] [ticket/17481] Make build package directory version independent PHPBB-17481 --- build/build.xml | 14 +++++++------- build/build_changelog.php | 2 +- build/build_helper.php | 2 +- build/compare.sh | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build/build.xml b/build/build.xml index 40709ccfde9..79e43a08543 100644 --- a/build/build.xml +++ b/build/build.xml @@ -166,32 +166,32 @@ - + - + - + - - + + save/phpbb-${prevversion}_to_${newversion}_language.patch" /> save/phpbb-${prevversion}_to_${newversion}_prosilver.patch" /> package_infos = array( - 'package_name' => 'phpBB3', + 'package_name' => 'phpBB', 'name_prefix' => 'phpbb', 'simple_name' => 'release-' . $_latest, 'new_version_number' => $_latest, diff --git a/build/compare.sh b/build/compare.sh index df442fd4c79..9d01028aa96 100755 --- a/build/compare.sh +++ b/build/compare.sh @@ -19,9 +19,9 @@ do $command "$1.$ext" - for file in `find phpBB3 -name '.svn' -prune -o -type f -print` + for file in `find phpBB -name '.svn' -prune -o -type f -print` do - orig_file="${file/#phpBB3/$orig_dir}" + orig_file="${file/#phpBB/$orig_dir}" diff_result=`diff $orig_file $file` if [ -n "$diff_result" ] @@ -31,7 +31,7 @@ do fi done - rm -rf phpBB3 + rm -rf phpBB done cd .. From 2bbc013d8336587bbcdbb47c77509ab6396dd7a1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 15:47:24 +0200 Subject: [PATCH 0710/1214] [ticket/17481] Stop creating update packages for all except last 3.1 and 3.2 PHPBB-17481 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 79e43a08543..57868251bc0 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + From 7f3b37560e925f3d10bda67433bbcc8d36de628c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 14 Nov 2024 21:01:48 +0100 Subject: [PATCH 0711/1214] [ticket/17501] Move navbar above header and breadcrumbs below PHPBB-17501 --- .../prosilver/template/navbar_header.html | 63 ------------------- .../prosilver/template/overall_header.html | 8 ++- 2 files changed, 6 insertions(+), 65 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 702a0187653..7d6ee666eca 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -203,68 +203,5 @@ {% endif %} - - - diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 949d3fb1af3..c35f0ab3789 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -79,7 +79,11 @@
    + + - -
    + {% include 'breadcrumbs.html' %} + From 6fd9a78872e9e4f5c8345c629f4a0a3d08ee3d2a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 14 Nov 2024 21:03:01 +0100 Subject: [PATCH 0712/1214] [ticket/17501] Adjust CSS for moved navbar & breadcrumbs PHPBB-17501 --- .../prosilver/template/breadcrumbs.html | 53 +++++++++++++++++++ phpBB/styles/prosilver/theme/colours.css | 25 +++++++-- phpBB/styles/prosilver/theme/common.css | 22 ++++++-- 3 files changed, 91 insertions(+), 9 deletions(-) create mode 100644 phpBB/styles/prosilver/template/breadcrumbs.html diff --git a/phpBB/styles/prosilver/template/breadcrumbs.html b/phpBB/styles/prosilver/template/breadcrumbs.html new file mode 100644 index 00000000000..f71f6e73ff2 --- /dev/null +++ b/phpBB/styles/prosilver/template/breadcrumbs.html @@ -0,0 +1,53 @@ + diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index c642adb22ce..e14a133f5dc 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -99,18 +99,19 @@ th a:hover { } /* round cornered boxes and backgrounds */ -.headerbar { - color: #ffffff; +.headerbar, +.headerbar h1 { + color: #eaf8ff; } .headerbar, .forumbg { - background-color: #13a4ec; + background-color: #4688ce; background-repeat: repeat-x; } .forabg { - background-color: #13a4ec; + background-color: #4688ce; background-repeat: repeat-x; } @@ -118,6 +119,18 @@ th a:hover { background-color: #c9dee8; } +.headerbar .navbar a { + color: #eaf8ff; +} + +.headerbar .navbar .dropdown a { + color: #0f4d8a; +} + +.header-profile { + text-shadow: 0 0 var(--ps-font-tiny) #eaf8ff; +} + .panel { background-color: #f0f3f5; color: #29303d; @@ -814,6 +827,10 @@ dd.profile-warnings { /* icon images */ .site_logo { background-image: url("./images/site_logo.svg"); } +.c-hero-logo-img g { + fill: #eaf8ff; +} + /* colours and backgrounds for cp.css */ /* main cp box */ diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e8f32465e25..46edea7c045 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -17,7 +17,7 @@ body { line-height: normal; word-wrap: break-word; margin: 0; - padding: 12px 0; + padding: 0 0 12px; -webkit-print-color-adjust: exact; } @@ -151,12 +151,13 @@ a:hover { /* Main blocks ---------------------------------------- */ .wrap { - border: 1px solid transparent; - border-radius: 8px; + border: solid transparent; + border-width: 0 1px 1px; + border-radius: 0 0 8px 8px; min-width: 625px; max-width: 1152px; margin: 0 auto; - padding: 15px; + padding: 0 15px 15px; } .page-body { @@ -200,7 +201,9 @@ a:hover { /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - border-radius: 7px; + background-image: url('images/lighter2.png'); + border-radius: 0 0 7px 7px; + background-size: cover; display: flex; flex-direction: column; margin-bottom: 0.5rem; @@ -212,6 +215,11 @@ a:hover { padding: 3px 10px; } +.headerbar .navbar { + background: none; + padding: calc(var(--ps-line-height) * 0.25) 5px calc(var(--ps-line-height) * 0.5); +} + .forabg { border-radius: 7px; clear: both; @@ -340,6 +348,10 @@ ul.linklist .dropdown-up .dropdown { bottom: 18px; } +ul.nav-breadcrumbs { + margin: var(--ps-line-height) 0; +} + /* Bulletin icons for list items ---------------------------------------- */ ul.linklist.bulletin > li:before { From 81c49aa6a526844f074b46d2b42cea453796e5c3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:18:40 +0200 Subject: [PATCH 0713/1214] [ticket/17501] Remove max width from subforums PHPBB-17501 --- phpBB/styles/prosilver/theme/responsive.css | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 80e605df625..ce5462455e0 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -328,7 +328,6 @@ vertical-align: bottom; text-overflow: ellipsis; overflow: hidden; - max-width: 100px; } /* Pagination From b666bc9e0a3b6848d3d8b7bf156b6495bd9efedf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:33:36 +0200 Subject: [PATCH 0714/1214] [ticket/17501] Add to top button to viewtopic and add missing title in FAQ PHPBB-17501 --- phpBB/styles/prosilver/template/faq_body.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 9 ++++++--- phpBB/styles/prosilver/theme/content.css | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 542e894c61e..2a1c2dfd925 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -44,7 +44,7 @@

    {faq_block.BLOCK_TITLE}

    - + {{ Icon('font', 'chevron-up', '', false) }}
    diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 2031fa64dd6..70bc764e06f 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -423,9 +423,6 @@

    - - {{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'fas c-top-icon') }} -
    @@ -496,6 +493,12 @@

    +
    + + {{ Icon('font', 'chevron-up', '', false) }} + +
    + diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 7101aeee462..07a4ddb325d 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -465,7 +465,7 @@ p.author { clear: left; overflow: hidden; width: 100%; - margin-top: calc(var(--ps-font-small) * 1.4); + margin: calc(var(--ps-font-small) * 1.4) 0; padding-top: 2px; } From 3a553f07bccc1805cadab30aed628bb65a91b739 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:36:04 +0200 Subject: [PATCH 0715/1214] [ticket/17501] Remove unused CSS properties PHPBB-17501 --- phpBB/styles/prosilver/theme/common.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 46edea7c045..909727132ec 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -201,9 +201,7 @@ a:hover { /* Round cornered boxes and backgrounds ---------------------------------------- */ .headerbar { - background-image: url('images/lighter2.png'); border-radius: 0 0 7px 7px; - background-size: cover; display: flex; flex-direction: column; margin-bottom: 0.5rem; From 3801eb094633f20a0b546765a47d3f65b081d270 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 21 Apr 2025 20:38:59 +0200 Subject: [PATCH 0716/1214] [ticket/17501] Remove not needed parentheses PHPBB-17501 --- phpBB/styles/prosilver/template/overall_header.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index c35f0ab3789..e12a1294bd1 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -68,7 +68,7 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE %} - {% include('ucp_notifications_webpush.html') %} + {% include 'ucp_notifications_webpush.html' %} {% endif %} @@ -83,7 +83,7 @@
    diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index e9d04905bca..c02cc4879ac 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -158,14 +158,14 @@

    {L_LOGIN_LOGOUT}
    style="background-image: url('{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}'); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - + {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}{% endif %}
    - + {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %} {NEW_POST} - + {% endif %} {topicrow.TOPIC_TITLE}{topicrow.TOPIC_TITLE} diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 300d57d0c72..01910394002 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -384,7 +384,12 @@ // Display active topics? $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; -$s_search_hidden_fields = array('fid' => array($forum_id)); +// Send the forum id and send a parameter to make it clear it's a quick search +$s_search_hidden_fields = [ + 'fid' => [$forum_id], + 'viewforum' => $forum_id, +]; + if ($_SID) { $s_search_hidden_fields['sid'] = $_SID; @@ -1017,7 +1022,7 @@ 'S_TOPIC_MOVED' => ($row['topic_status'] == ITEM_MOVED) ? true : false, 'U_NEWEST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", $view_topic_url_params . '&view=unread') . '#unread' : false, - 'U_LAST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false, + 'U_LAST_POST' => $auth->acl_get('f_read', $forum_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $row['topic_last_post_id']) . '#p' . $row['topic_last_post_id'] : false, 'U_LAST_POST_AUTHOR' => get_username_string('profile', $row['topic_last_poster_id'], $row['topic_last_poster_name'], $row['topic_last_poster_colour']), 'U_TOPIC_AUTHOR' => get_username_string('profile', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']), 'U_VIEW_TOPIC' => $view_topic_url, From 078cd300fc32f362b957e03b2aea33059ee61f3e Mon Sep 17 00:00:00 2001 From: battye Date: Thu, 17 Jul 2025 15:45:56 +0000 Subject: [PATCH 0853/1214] [ticket/17157] Optimise the quick search code PHPBB-17157 --- phpBB/search.php | 32 +++++--------------------------- phpBB/viewforum.php | 10 ++++++++-- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index 3e052040434..59ed6a646b8 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -247,29 +247,12 @@ $ex_fid_ary = array_unique(array_merge(array_keys($auth->acl_getf('!f_read', true)), array_keys($auth->acl_getf('!f_search', true)))); } - // There are two exceptional scenarios we want to consider if there are any forums where an read forum = no, can read topics = yes - // In these cases, the user should see the topic title in the search results but not the link to the topic (or any posts) because - // they don't have the permissions for that. - $show_topic_title_only = false; - - // Firstly, is someone doing a quick search from the viewforum page? If so, force it to be a topic-only search for that one forum - // We know if this is the case due to the presence of this request var - $forum_quick_search = $request->variable('viewforum', 0); - if ($forum_quick_search && $auth->acl_get('f_list_topics', $forum_quick_search) && !$auth->acl_get('f_read', $forum_quick_search)) + // Consider if there are any forums where can read forum = no, can read topics = yes + // In these cases, the user should see the topic title in the search results but not the link to the topic (or any posts) because they don't have the permissions + if ($request->variable('sr', '') == 'topics' && $search_fields == 'titleonly') { - $show_topic_title_only = true; - } - - // Secondly, is someone doing a topic search from the main search page? If so, we will strip the topic links while still showing the name - else if ($request->variable('sr', '') == 'topics' && $search_fields == 'titleonly') - { - // We will allow the 'can read topics = yes' forums back in to the search - $show_topic_title_only = true; - } - - if ($show_topic_title_only) - { - // Remove from $ex_fid_ary any of the 'can read topics' forums (meaning they will not be excluded from the search) + // The user could get here from a quick search through the viewforum page, or by doing a main search displayed by topics and searching only the topic titles. + // Allow the 'can read topics = yes' forums back in to the search by removing from $ex_fid_ary any of the 'can read topics' forums $ex_fid_ary = array_diff($ex_fid_ary, array_keys($auth->acl_getf('f_list_topics', true))); } @@ -375,11 +358,6 @@ $show_results = ($show_results == 'posts') ? 'posts' : 'topics'; } - if ($show_topic_title_only) - { - $show_results = 'topics'; - } - // define some variables needed for retrieving post_id/topic_id information $sort_by_sql = [ 'a' => 'u.username_clean', diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 01910394002..24bb5a99bbb 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -384,12 +384,18 @@ // Display active topics? $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; -// Send the forum id and send a parameter to make it clear it's a quick search +// Send the forum id... and maybe some other fields, depending on permissions $s_search_hidden_fields = [ 'fid' => [$forum_id], - 'viewforum' => $forum_id, ]; +if ($auth->acl_get('f_list_topics', $forum_id) && !$auth->acl_get('f_read', $forum_id)) +{ + // If the user has list access but not read access, then force the search to only be a topic title search + $s_search_hidden_fields['sr'] = 'topics'; + $s_search_hidden_fields['sf'] = 'titleonly'; +} + if ($_SID) { $s_search_hidden_fields['sid'] = $_SID; From e0e457b03bc4db38436be6fe375b20ce8c3dbef7 Mon Sep 17 00:00:00 2001 From: battye Date: Fri, 18 Jul 2025 06:35:52 +0000 Subject: [PATCH 0854/1214] [ticket/17157] Whitespace and minor edits PHPBB-17157 --- phpBB/search.php | 2 +- phpBB/styles/prosilver/template/search_results.html | 4 ++-- phpBB/styles/prosilver/template/viewforum_body.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index 59ed6a646b8..e136096b601 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -247,7 +247,7 @@ $ex_fid_ary = array_unique(array_merge(array_keys($auth->acl_getf('!f_read', true)), array_keys($auth->acl_getf('!f_search', true)))); } - // Consider if there are any forums where can read forum = no, can read topics = yes + // Consider if there are any forums where can read forum = no, can read topics = yes // In these cases, the user should see the topic title in the search results but not the link to the topic (or any posts) because they don't have the permissions if ($request->variable('sr', '') == 'topics' && $search_fields == 'titleonly') { diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 8f664201bbb..4c4c6aaa1cb 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -80,7 +80,7 @@

    {SEARCH_TITLE} bg1 bg2">
    style="background-image: url({T_ICONS_PATH}{searchresults.TOPIC_ICON_IMG}); background-repeat: no-repeat;" title="{searchresults.TOPIC_FOLDER_IMG_ALT}"> - {% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}{% endif %} + {% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %}{% endif %}
    {% if searchresults.U_NEWEST_POST and searchresults.S_UNREAD_TOPIC and not S_IS_BOT %} @@ -88,7 +88,7 @@

    {SEARCH_TITLE} {L_TOPIC_UNAPPROVED} diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index c02cc4879ac..49aad65572e 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -158,7 +158,7 @@

    {L_LOGIN_LOGOUT}
    style="background-image: url('{T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}'); background-repeat: no-repeat;" title="{topicrow.TOPIC_FOLDER_IMG_ALT}"> - {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}{% endif %} + {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %}{% endif %}
    {% if topicrow.U_NEWEST_POST and topicrow.S_UNREAD_TOPIC and not S_IS_BOT %} From 69fa84b41b1cf209c7faccb4ba35096329e8cb3b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 18 Jul 2025 08:55:06 -0700 Subject: [PATCH 0855/1214] [ticket/17535] Update test fix PHPBB-17535 Signed-off-by: Matt Friedman --- tests/help/manager_test.php | 58 +++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/tests/help/manager_test.php b/tests/help/manager_test.php index 36b3fa4143c..428e0e5201b 100644 --- a/tests/help/manager_test.php +++ b/tests/help/manager_test.php @@ -80,18 +80,22 @@ public function test_add_block($block_name, $switch, $questions, $switch_expecte ->method('lang') ->willReturnCallback(fn(string $arg) => strtoupper($arg)); - $matcher = $this->exactly(count($questions) + 1); - $this->template->expects($matcher) + $expected_calls = [ + ['faq_block', [ + 'BLOCK_TITLE' => strtoupper($block_name), + 'SWITCH_COLUMN' => $switch_expected, + ]], + ...$template_call_args + ]; + + $this->template->expects($this->exactly(count($questions) + 1)) ->method('assign_block_vars') - ->willReturnCallback(function ($arg1, $arg2) use ($matcher, $block_name, $switch_expected, $template_call_args) { - $callNr = $matcher->numberOfInvocations(); - match (true) { - $callNr == 1 => $this->assertEquals([$arg1, $arg2], ['faq_block', [ - 'BLOCK_TITLE' => strtoupper($block_name), - 'SWITCH_COLUMN' => $switch_expected, - ]]), - $callNr > 1 => $this->assertEquals([$arg1, $arg2], $template_call_args[$callNr - 2]), - };}); + ->willReturnCallback(function($blockName, $blockVars) use (&$expected_calls) { + static $call = 0; + $this->assertEquals($expected_calls[$call][0], $blockName); + $this->assertEquals($expected_calls[$call][1], $blockVars); + $call++; + }); $this->manager->add_block($block_name, $switch, $questions); @@ -137,21 +141,25 @@ public function test_add_block_double_switch() ->method('lang') ->willReturnCallback(fn(string $arg) => strtoupper($arg)); - $matcher = $this->exactly(2); - $this->template->expects($matcher) + $expected_calls = [ + ['faq_block', [ + 'BLOCK_TITLE' => strtoupper($block_name[0]), + 'SWITCH_COLUMN' => $switch_expected[0], + ]], + ['faq_block', [ + 'BLOCK_TITLE' => strtoupper($block_name[1]), + 'SWITCH_COLUMN' => $switch_expected[1], + ]] + ]; + + $this->template->expects($this->exactly(count($expected_calls))) ->method('assign_block_vars') - ->willReturnCallback(function ($arg1, $arg2) use ($matcher, $block_name, $switch_expected) { - $callNr = $matcher->numberOfInvocations(); - match (true) { - $callNr == 1 => $this->assertEquals([$arg1, $arg2], ['faq_block', [ - 'BLOCK_TITLE' => strtoupper($block_name[0]), - 'SWITCH_COLUMN' => $switch_expected[0], - ]]), - $callNr == 2 => $this->assertEquals([$arg1, $arg2], ['faq_block', [ - 'BLOCK_TITLE' => strtoupper($block_name[1]), - 'SWITCH_COLUMN' => $switch_expected[1], - ]]), - };}); + ->willReturnCallback(function($blockName, $blockVars) use (&$expected_calls) { + static $call = 0; + $this->assertEquals($expected_calls[$call][0], $blockName); + $this->assertEquals($expected_calls[$call][1], $blockVars); + $call++; + }); $this->manager->add_block($block_name[0], true); $this->assertTrue($this->manager->switched_column()); From 788e408ceb54428ed27f131e8ccb6558d3a76438 Mon Sep 17 00:00:00 2001 From: rxu Date: Fri, 18 Jul 2025 23:11:41 +0700 Subject: [PATCH 0856/1214] [ticket/17535] Fix global var names duplication PHPBB-17535 --- tests/bbcode/parser_test.php | 2 +- tests/bbcode/url_bbcode_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/bbcode/parser_test.php b/tests/bbcode/parser_test.php index 0b91742bd8b..1786fabc5fc 100644 --- a/tests/bbcode/parser_test.php +++ b/tests/bbcode/parser_test.php @@ -249,7 +249,7 @@ public function test_bbcode_firstpass($description, $message, $expected, $incomp $this->markTestIncomplete($incomplete); } - global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx, $request, $symfony_request; + global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx; $phpEx = 'php'; $config = new \phpbb\config\config([ 'max_post_font_size' => 0, diff --git a/tests/bbcode/url_bbcode_test.php b/tests/bbcode/url_bbcode_test.php index 727648fb063..5f42f1d4bb4 100644 --- a/tests/bbcode/url_bbcode_test.php +++ b/tests/bbcode/url_bbcode_test.php @@ -52,7 +52,7 @@ public static function url_bbcode_test_data() */ public function test_url($description, $message, $expected) { - global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx, $request, $symfony_request; + global $user, $request, $symfony_request, $phpbb_dispatcher, $config, $phpEx; $phpEx = 'php'; $config = new \phpbb\config\config([ 'max_post_font_size' => 0, From 980b6e6f9e4e592a1396e0934363b9d3bfe02446 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 14 Jul 2025 00:38:54 +0700 Subject: [PATCH 0857/1214] [ticket/17530] Use Doctrine driver middleware instead of 'platform' parameter PHPBB-17530 --- .../db/doctrine/case_insensitive_string.php | 6 +- .../phpbb/db/doctrine/connection_factory.php | 19 ++- .../doctrine/connection_parameter_factory.php | 31 +---- phpBB/phpbb/db/doctrine/oci8/connection.php | 99 ---------------- phpBB/phpbb/db/doctrine/oci8/driver.php | 65 ----------- phpBB/phpbb/db/doctrine/oci8/result.php | 109 ------------------ phpBB/phpbb/db/doctrine/oci8/statement.php | 58 ---------- .../middleware/mysql/phpbb_mysql_driver.php | 31 +++++ .../mysql/phpbb_mysql_middleware.php | 28 +++++ .../mysql/phpbb_mysql_platform.php} | 4 +- .../middleware/oracle/phpbb_oracle_driver.php | 41 +++++++ .../oracle/phpbb_oracle_middleware.php | 28 +++++ .../oracle/phpbb_oracle_platform.php} | 4 +- .../oracle/phpbb_oracle_schema_manager.php} | 4 +- .../postgresql/phpbb_postgresql_driver.php | 31 +++++ .../phpbb_postgresql_middleware.php | 28 +++++ .../postgresql/phpbb_postgresql_platform.php} | 4 +- .../middleware/sqlsrv/phpbb_sqlsrv_driver.php | 31 +++++ .../sqlsrv/phpbb_sqlsrv_middleware.php | 28 +++++ .../sqlsrv/phpbb_sqlsrv_platform.php} | 4 +- 20 files changed, 283 insertions(+), 370 deletions(-) delete mode 100644 phpBB/phpbb/db/doctrine/oci8/connection.php delete mode 100644 phpBB/phpbb/db/doctrine/oci8/driver.php delete mode 100644 phpBB/phpbb/db/doctrine/oci8/result.php delete mode 100644 phpBB/phpbb/db/doctrine/oci8/statement.php create mode 100644 phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php create mode 100644 phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php rename phpBB/phpbb/db/{doctrine/mysql_platform.php => middleware/mysql/phpbb_mysql_platform.php} (93%) create mode 100644 phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php create mode 100644 phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php rename phpBB/phpbb/db/{doctrine/oracle_platform.php => middleware/oracle/phpbb_oracle_platform.php} (98%) rename phpBB/phpbb/db/{doctrine/oci8/schema_manager.php => middleware/oracle/phpbb_oracle_schema_manager.php} (90%) create mode 100644 phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php create mode 100644 phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php rename phpBB/phpbb/db/{doctrine/postgresql_platform.php => middleware/postgresql/phpbb_postgresql_platform.php} (97%) create mode 100644 phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php create mode 100644 phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php rename phpBB/phpbb/db/{doctrine/sqlsrv_platform.php => middleware/sqlsrv/phpbb_sqlsrv_platform.php} (97%) diff --git a/phpBB/phpbb/db/doctrine/case_insensitive_string.php b/phpBB/phpbb/db/doctrine/case_insensitive_string.php index 484308fc063..a8ac6e76057 100644 --- a/phpBB/phpbb/db/doctrine/case_insensitive_string.php +++ b/phpBB/phpbb/db/doctrine/case_insensitive_string.php @@ -15,6 +15,8 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\Type; +use phpbb\db\middleware\postgresql\phpbb_postgresql_platform; +use phpbb\db\middleware\oracle\phpbb_oracle_platform; /** * Case-insensitive string type (only supported by Postgres). @@ -28,7 +30,7 @@ class case_insensitive_string extends Type */ public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - if ($platform instanceof postgresql_platform) + if ($platform instanceof phpbb_postgresql_platform) { return 'varchar_ci'; } @@ -37,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st // we used 3 times larger capacity for strings on oracle for unicode strings // as on other platforms. This is not the case with varchar_ci, which uses // the same length as other platforms. - if ($platform instanceof oracle_platform) + if ($platform instanceof phpbb_oracle_platform) { return $platform->getAsciiStringTypeDeclarationSQL($column); } diff --git a/phpBB/phpbb/db/doctrine/connection_factory.php b/phpBB/phpbb/db/doctrine/connection_factory.php index fb24994b3dd..5ae5107da4e 100644 --- a/phpBB/phpbb/db/doctrine/connection_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_factory.php @@ -13,12 +13,17 @@ namespace phpbb\db\doctrine; +use Doctrine\DBAL\Configuration; use Doctrine\DBAL\Connection; use Doctrine\DBAL\DriverManager; use Doctrine\DBAL\Exception; use Doctrine\DBAL\Types\Type; use InvalidArgumentException; use phpbb\config_php_file; +use phpbb\db\middleware\mysql\phpbb_mysql_middleware; +use phpbb\db\middleware\oracle\phpbb_oracle_middleware; +use phpbb\db\middleware\postgresql\phpbb_postgresql_middleware; +use phpbb\db\middleware\sqlsrv\phpbb_sqlsrv_middleware; use phpbb\exception\runtime_exception; /** @@ -94,9 +99,21 @@ public static function get_connection_from_params( $port ); + $middleware = match($driver) + { + 'pdo_mysql', 'mysqli' => [new phpbb_mysql_middleware()], + 'pdo_oci', 'oci8' => [new phpbb_oracle_middleware()], + 'pdo_pgsql', 'pgsql' => [new phpbb_postgresql_middleware()], + 'pdo_sqlsrv', 'sqlsrv' => [new phpbb_sqlsrv_middleware()], + default => [], + }; + try { - $connection = DriverManager::getConnection($params); + $connection_config = new Configuration(); + $connection_config->setMiddlewares($middleware); + + $connection = DriverManager::getConnection($params, $connection_config); if (!Type::hasType(case_insensitive_string::CASE_INSENSITIVE_STRING)) { Type::addType(case_insensitive_string::CASE_INSENSITIVE_STRING, case_insensitive_string::class); diff --git a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php index 90e41061fc9..6e59c4a61e1 100644 --- a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php @@ -14,7 +14,6 @@ namespace phpbb\db\doctrine; use InvalidArgumentException; -use phpbb\db\doctrine\oci8\driver as oci8_driver; /** * Helper class to generate Doctrine DBAL configuration. @@ -146,37 +145,17 @@ private static function build_sqlite_parameters(array $params, string $path, str */ private static function enrich_parameters(array $params) : array { - $enrichment_tags = [ - 'pdo_mysql' => [ - 'charset' => 'UTF8', - 'platform' => new mysql_platform(), - ], - 'oci8' => [ - 'charset' => 'UTF8', - 'platform' => new oracle_platform(), - 'driverClass' => oci8_driver::class, - ], - 'pdo_pgsql' => [ - 'charset' => 'UTF8', - 'platform' => new postgresql_platform(), - ], - 'pdo_sqlsrv' => [ - 'platform' => new sqlsrv_platform(), - ], - ]; - - if ($params['driver'] === 'pdo_mysql' && extension_loaded('pdo_mysql')) + if (in_array($params['driver'], ['mysqli', 'pdo_mysql', 'pgsql', 'pdo_pgsql', 'oci8', 'pdo_oci'])) { - $enrichment_tags['pdo_mysql'][\PDO::MYSQL_ATTR_FOUND_ROWS] = true; + $params['charset'] = 'UTF8'; } - $driver = $params['driver']; - if (!array_key_exists($driver, $enrichment_tags)) + if ($params['driver'] === 'pdo_mysql' && extension_loaded('pdo_mysql')) { - return $params; + $params[\PDO::MYSQL_ATTR_FOUND_ROWS] = true; } - return array_merge($params, $enrichment_tags[$driver]); + return $params; } /* diff --git a/phpBB/phpbb/db/doctrine/oci8/connection.php b/phpBB/phpbb/db/doctrine/oci8/connection.php deleted file mode 100644 index 34ed744e9db..00000000000 --- a/phpBB/phpbb/db/doctrine/oci8/connection.php +++ /dev/null @@ -1,99 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\doctrine\oci8; - -use Doctrine\DBAL\Driver\Connection as DriverConnection; -use Doctrine\DBAL\Driver\Result as DriverResult; -use Doctrine\DBAL\Driver\Statement as DriverStatement; -use Doctrine\DBAL\ParameterType; - -class connection implements DriverConnection -{ - /** - * @var DriverConnection - */ - private $wrapped; - - /** - * @param DriverConnection $wrapped - */ - public function __construct(DriverConnection $wrapped) - { - $this->wrapped = $wrapped; - } - - /** - * {@inheritDoc} - */ - public function prepare(string $sql): DriverStatement - { - return new statement($this->wrapped->prepare($sql)); - } - - /** - * {@inheritDoc} - */ - public function query(string $sql): DriverResult - { - return new result($this->wrapped->query($sql)); - } - - /** - * {@inheritDoc} - */ - public function quote($value, $type = ParameterType::STRING) - { - return $this->wrapped->quote($value, $type); - } - - /** - * {@inheritDoc} - */ - public function exec(string $sql): int - { - return $this->wrapped->exec($sql); - } - - /** - * {@inheritDoc} - */ - public function lastInsertId($name = null) - { - return $this->wrapped->lastInsertId($name); - } - - /** - * {@inheritDoc} - */ - public function beginTransaction(): bool - { - return $this->wrapped->beginTransaction(); - } - - /** - * {@inheritDoc} - */ - public function commit(): bool - { - return $this->wrapped->commit(); - } - - /** - * {@inheritDoc} - */ - public function rollBack(): bool - { - return $this->wrapped->rollBack(); - } -} diff --git a/phpBB/phpbb/db/doctrine/oci8/driver.php b/phpBB/phpbb/db/doctrine/oci8/driver.php deleted file mode 100644 index 9a2c67aee05..00000000000 --- a/phpBB/phpbb/db/doctrine/oci8/driver.php +++ /dev/null @@ -1,65 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\doctrine\oci8; - -use Doctrine\DBAL\Connection as DoctrineConnection; -use Doctrine\DBAL\Driver\API\ExceptionConverter; -use Doctrine\DBAL\Platforms\AbstractPlatform; -use Doctrine\DBAL\Driver as DoctrineDriver; -use Doctrine\DBAL\Driver\OCI8\Driver as OCI8Driver; - -class driver implements DoctrineDriver -{ - /** - * @var DoctrineDriver - */ - private $wrapped; - - public function __construct() - { - $this->wrapped = new OCI8Driver(); - } - - /** - * {@inheritDoc} - */ - public function connect(array $params) - { - return new connection($this->wrapped->connect($params)); - } - - /** - * {@inheritDoc} - */ - public function getDatabasePlatform() - { - return $this->wrapped->getDatabasePlatform(); - } - - /** - * {@inheritDoc} - */ - public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $platform) - { - return new schema_manager($conn, $platform); - } - - /** - * {@inheritDoc} - */ - public function getExceptionConverter(): ExceptionConverter - { - return $this->wrapped->getExceptionConverter(); - } -} diff --git a/phpBB/phpbb/db/doctrine/oci8/result.php b/phpBB/phpbb/db/doctrine/oci8/result.php deleted file mode 100644 index 1ab10854279..00000000000 --- a/phpBB/phpbb/db/doctrine/oci8/result.php +++ /dev/null @@ -1,109 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\doctrine\oci8; - -use Doctrine\DBAL\Driver\Result as DriverResult; - -class result implements DriverResult -{ - /** - * @var DriverResult - */ - private $wrapped; - - /** - * @param DriverResult $wrapped - */ - public function __construct(DriverResult $wrapped) - { - $this->wrapped = $wrapped; - } - - /** - * {@inheritDoc} - */ - public function fetchNumeric() - { - return $this->wrapped->fetchNumeric(); - } - - /** - * {@inheritDoc} - */ - public function fetchAssociative() - { - return array_change_key_case($this->wrapped->fetchAssociative(), CASE_LOWER); - } - - /** - * {@inheritDoc} - */ - public function fetchOne() - { - return $this->wrapped->fetchOne(); - } - - /** - * {@inheritDoc} - */ - public function fetchAllNumeric(): array - { - return $this->wrapped->fetchAllNumeric(); - } - - /** - * {@inheritDoc} - */ - public function fetchAllAssociative(): array - { - $rows = []; - foreach ($this->wrapped->fetchAllAssociative() as $row) - { - $rows[] = array_change_key_case($row, CASE_LOWER); - } - return $rows; - } - - /** - * {@inheritDoc} - */ - public function fetchFirstColumn(): array - { - return $this->wrapped->fetchFirstColumn(); - } - - /** - * {@inheritDoc} - */ - public function rowCount(): int - { - return $this->wrapped->rowCount(); - } - - /** - * {@inheritDoc} - */ - public function columnCount(): int - { - return $this->wrapped->columnCount(); - } - - /** - * {@inheritDoc} - */ - public function free(): void - { - $this->wrapped->free(); - } -} diff --git a/phpBB/phpbb/db/doctrine/oci8/statement.php b/phpBB/phpbb/db/doctrine/oci8/statement.php deleted file mode 100644 index bca22473c4c..00000000000 --- a/phpBB/phpbb/db/doctrine/oci8/statement.php +++ /dev/null @@ -1,58 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\db\doctrine\oci8; - -use Doctrine\DBAL\Driver\Result as DriverResult; -use Doctrine\DBAL\Driver\Statement as DriverStatement; -use Doctrine\DBAL\ParameterType; - -class statement implements DriverStatement -{ - /** - * @var DriverStatement - */ - private $wrapped; - - /** - * @param DriverStatement $wrapped - */ - public function __construct(DriverStatement $wrapped) - { - $this->wrapped = $wrapped; - } - - /** - * {@inheritDoc} - */ - public function bindValue($param, $value, $type = ParameterType::STRING): bool - { - return $this->wrapped->bindValue($param, $value, $type); - } - - /** - * {@inheritDoc} - */ - public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool - { - return $this->wrapped->bindParam($param, $variable, $type, $length); - } - - /** - * {@inheritDoc} - */ - public function execute($params = null): DriverResult - { - return new result($this->wrapped->execute($params)); - } -} diff --git a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php b/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php new file mode 100644 index 00000000000..651a9797652 --- /dev/null +++ b/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\mysql; + +use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware; + +/** + * MySQL Doctrine driver middleware. + * Makes use of phpBB's MySQL specific platform. + */ +class phpbb_mysql_driver extends AbstractDriverMiddleware +{ + /** + * {@inheritDoc} + */ + public function createDatabasePlatformForVersion($version) + { + return new phpbb_mysql_platform(); + } +} diff --git a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php b/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php new file mode 100644 index 00000000000..5e79142a9e4 --- /dev/null +++ b/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php @@ -0,0 +1,28 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\mysql; + +use Doctrine\DBAL\Driver; + +/** + * MySQL Doctrine middleware. + * Makes use of phpBB's MySQL specific platform. + */ +class phpbb_mysql_middleware implements Driver\Middleware +{ + public function wrap(Driver $driver): Driver + { + return new phpbb_mysql_driver($driver); + } +} diff --git a/phpBB/phpbb/db/doctrine/mysql_platform.php b/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_platform.php similarity index 93% rename from phpBB/phpbb/db/doctrine/mysql_platform.php rename to phpBB/phpbb/db/middleware/mysql/phpbb_mysql_platform.php index 8a2090b6d90..a64430613d6 100644 --- a/phpBB/phpbb/db/doctrine/mysql_platform.php +++ b/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_platform.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\db\doctrine; +namespace phpbb\db\middleware\mysql; use Doctrine\DBAL\Platforms\AbstractMySQLPlatform; use Doctrine\DBAL\Schema\TableDiff; @@ -23,7 +23,7 @@ * If it's indexed as primary key, it should be declared as NOT NULL * because MySQL primary key columns cannot be NULL. */ -class mysql_platform extends AbstractMySQLPlatform +class phpbb_mysql_platform extends AbstractMySQLPlatform { /** * {@inheritDoc} diff --git a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php new file mode 100644 index 00000000000..fc341a2243f --- /dev/null +++ b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php @@ -0,0 +1,41 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\oracle; + +use Doctrine\DBAL\Connection as DoctrineConnection; +use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware; +use Doctrine\DBAL\Platforms\AbstractPlatform; + +/** + * Oracle Doctrine driver middleware. + * Makes use of phpBB's Oracle specific platform. + */ +class phpbb_oracle_driver extends AbstractDriverMiddleware +{ + /** + * {@inheritDoc} + */ + public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $platform) + { + return new phpbb_oracle_schema_manager($conn, $platform); + } + + /** + * {@inheritDoc} + */ + public function createDatabasePlatformForVersion($version) + { + return new phpbb_oracle_platform(); + } +} diff --git a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php new file mode 100644 index 00000000000..be35ce963a8 --- /dev/null +++ b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php @@ -0,0 +1,28 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\oracle; + +use Doctrine\DBAL\Driver; + +/** + * Oracle Doctrine middleware. + * Makes use of phpBB's Oracle specific platform. + */ +class phpbb_oracle_middleware implements Driver\Middleware +{ + public function wrap(Driver $driver): Driver + { + return new phpbb_oracle_driver($driver); + } +} diff --git a/phpBB/phpbb/db/doctrine/oracle_platform.php b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_platform.php similarity index 98% rename from phpBB/phpbb/db/doctrine/oracle_platform.php rename to phpBB/phpbb/db/middleware/oracle/phpbb_oracle_platform.php index 7c011e6e775..efafcd768d6 100644 --- a/phpBB/phpbb/db/doctrine/oracle_platform.php +++ b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_platform.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\db\doctrine; +namespace phpbb\db\middleware\oracle; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Schema\Identifier; @@ -21,7 +21,7 @@ /** * Oracle specific schema restrictions for BC. */ -class oracle_platform extends OraclePlatform +class phpbb_oracle_platform extends OraclePlatform { /** * {@inheritDoc} diff --git a/phpBB/phpbb/db/doctrine/oci8/schema_manager.php b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_schema_manager.php similarity index 90% rename from phpBB/phpbb/db/doctrine/oci8/schema_manager.php rename to phpBB/phpbb/db/middleware/oracle/phpbb_oracle_schema_manager.php index c0b2caea1d8..078630eb8ae 100644 --- a/phpBB/phpbb/db/doctrine/oci8/schema_manager.php +++ b/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_schema_manager.php @@ -11,14 +11,14 @@ * */ -namespace phpbb\db\doctrine\oci8; +namespace phpbb\db\middleware\oracle; use Doctrine\DBAL\Platforms\OraclePlatform; use Doctrine\DBAL\Schema\AbstractSchemaManager; use Doctrine\DBAL\Schema\OracleSchemaManager; use Doctrine\DBAL\Schema\Table; -class schema_manager extends OracleSchemaManager +class phpbb_oracle_schema_manager extends OracleSchemaManager { /** * {@inheritdoc} diff --git a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php b/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php new file mode 100644 index 00000000000..9464825c784 --- /dev/null +++ b/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\postgresql; + +use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware; + +/** + * PostgreSQL Doctrine driver middleware. + * Makes use of phpBB's PostgreSQL specific platform. + */ +class phpbb_postgresql_driver extends AbstractDriverMiddleware +{ + /** + * {@inheritDoc} + */ + public function createDatabasePlatformForVersion($version) + { + return new phpbb_postgresql_platform(); + } +} diff --git a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php b/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php new file mode 100644 index 00000000000..31d3fbcb209 --- /dev/null +++ b/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php @@ -0,0 +1,28 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\postgresql; + +use Doctrine\DBAL\Driver; + +/** + * PostgreSQL Doctrine middleware. + * Makes use of phpBB's PostgreSQL specific platform. + */ +class phpbb_postgresql_middleware implements Driver\Middleware +{ + public function wrap(Driver $driver): Driver + { + return new phpbb_postgresql_driver($driver); + } +} diff --git a/phpBB/phpbb/db/doctrine/postgresql_platform.php b/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_platform.php similarity index 97% rename from phpBB/phpbb/db/doctrine/postgresql_platform.php rename to phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_platform.php index d67b2439b2e..7ed3508ba09 100644 --- a/phpBB/phpbb/db/doctrine/postgresql_platform.php +++ b/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_platform.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\db\doctrine; +namespace phpbb\db\middleware\postgresql; use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Platforms\PostgreSQLPlatform; @@ -31,7 +31,7 @@ * to stay compatible with the existing DB we have to change its * naming and not ours. */ -class postgresql_platform extends PostgreSQLPlatform +class phpbb_postgresql_platform extends PostgreSQLPlatform { /** * {@inheritdoc} diff --git a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php b/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php new file mode 100644 index 00000000000..ba7ec877f64 --- /dev/null +++ b/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php @@ -0,0 +1,31 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\sqlsrv; + +use Doctrine\DBAL\Driver\Middleware\AbstractDriverMiddleware; + +/** + * Microsoft SQL server Doctrine driver middleware. + * Makes use of phpBB's SQL Server specific platform. + */ +class phpbb_sqlsrv_driver extends AbstractDriverMiddleware +{ + /** + * {@inheritDoc} + */ + public function createDatabasePlatformForVersion($version) + { + return new phpbb_sqlsrv_platform(); + } +} diff --git a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php b/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php new file mode 100644 index 00000000000..a5603fd422b --- /dev/null +++ b/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php @@ -0,0 +1,28 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\middleware\sqlsrv; + +use Doctrine\DBAL\Driver; + +/** + * Microsoft SQL server Doctrine middleware. + * Makes use of phpBB's SQL Server specific platform. + */ +class phpbb_sqlsrv_middleware implements Driver\Middleware +{ + public function wrap(Driver $driver): Driver + { + return new phpbb_sqlsrv_driver($driver); + } +} diff --git a/phpBB/phpbb/db/doctrine/sqlsrv_platform.php b/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_platform.php similarity index 97% rename from phpBB/phpbb/db/doctrine/sqlsrv_platform.php rename to phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_platform.php index ca2a9dd7e64..896cb72643a 100644 --- a/phpBB/phpbb/db/doctrine/sqlsrv_platform.php +++ b/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_platform.php @@ -11,7 +11,7 @@ * */ -namespace phpbb\db\doctrine; +namespace phpbb\db\middleware\sqlsrv; use Doctrine\DBAL\Platforms\SQLServerPlatform; use Doctrine\DBAL\Schema\Identifier; @@ -20,7 +20,7 @@ /** * SQLServer specific schema restrictions for BC. */ -class sqlsrv_platform extends SQLServerPlatform +class phpbb_sqlsrv_platform extends SQLServerPlatform { /** * {@inheritDoc} From 86195ac0f9d287b0f08843435f0d97aba25981b6 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 19 Jul 2025 15:17:18 +0700 Subject: [PATCH 0858/1214] [ticket/17530] Better classes naming PHPBB-17530 --- .../db/doctrine/case_insensitive_string.php | 8 ++++---- phpBB/phpbb/db/doctrine/connection_factory.php | 16 ++++++++-------- .../db/doctrine/connection_parameter_factory.php | 8 +++----- .../mysql/{phpbb_mysql_driver.php => driver.php} | 4 ++-- ...phpbb_mysql_middleware.php => middleware.php} | 5 +++-- .../{phpbb_mysql_platform.php => platform.php} | 2 +- .../{phpbb_oracle_driver.php => driver.php} | 6 +++--- ...hpbb_oracle_middleware.php => middleware.php} | 5 +++-- .../{phpbb_oracle_platform.php => platform.php} | 2 +- ...cle_schema_manager.php => schema_manager.php} | 2 +- .../{phpbb_postgresql_driver.php => driver.php} | 4 ++-- ..._postgresql_middleware.php => middleware.php} | 5 +++-- ...hpbb_postgresql_platform.php => platform.php} | 2 +- .../{phpbb_sqlsrv_driver.php => driver.php} | 4 ++-- ...hpbb_sqlsrv_middleware.php => middleware.php} | 5 +++-- .../{phpbb_sqlsrv_platform.php => platform.php} | 2 +- 16 files changed, 41 insertions(+), 39 deletions(-) rename phpBB/phpbb/db/middleware/mysql/{phpbb_mysql_driver.php => driver.php} (85%) rename phpBB/phpbb/db/middleware/mysql/{phpbb_mysql_middleware.php => middleware.php} (78%) rename phpBB/phpbb/db/middleware/mysql/{phpbb_mysql_platform.php => platform.php} (95%) rename phpBB/phpbb/db/middleware/oracle/{phpbb_oracle_driver.php => driver.php} (83%) rename phpBB/phpbb/db/middleware/oracle/{phpbb_oracle_middleware.php => middleware.php} (78%) rename phpBB/phpbb/db/middleware/oracle/{phpbb_oracle_platform.php => platform.php} (98%) rename phpBB/phpbb/db/middleware/oracle/{phpbb_oracle_schema_manager.php => schema_manager.php} (94%) rename phpBB/phpbb/db/middleware/postgresql/{phpbb_postgresql_driver.php => driver.php} (85%) rename phpBB/phpbb/db/middleware/postgresql/{phpbb_postgresql_middleware.php => middleware.php} (77%) rename phpBB/phpbb/db/middleware/postgresql/{phpbb_postgresql_platform.php => platform.php} (98%) rename phpBB/phpbb/db/middleware/sqlsrv/{phpbb_sqlsrv_driver.php => driver.php} (86%) rename phpBB/phpbb/db/middleware/sqlsrv/{phpbb_sqlsrv_middleware.php => middleware.php} (78%) rename phpBB/phpbb/db/middleware/sqlsrv/{phpbb_sqlsrv_platform.php => platform.php} (98%) diff --git a/phpBB/phpbb/db/doctrine/case_insensitive_string.php b/phpBB/phpbb/db/doctrine/case_insensitive_string.php index a8ac6e76057..e7b62f86491 100644 --- a/phpBB/phpbb/db/doctrine/case_insensitive_string.php +++ b/phpBB/phpbb/db/doctrine/case_insensitive_string.php @@ -15,8 +15,8 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; use Doctrine\DBAL\Types\Type; -use phpbb\db\middleware\postgresql\phpbb_postgresql_platform; -use phpbb\db\middleware\oracle\phpbb_oracle_platform; +use phpbb\db\middleware\oracle\platform as oracle_platform; +use phpbb\db\middleware\postgresql\platform as postgresql_platform; /** * Case-insensitive string type (only supported by Postgres). @@ -30,7 +30,7 @@ class case_insensitive_string extends Type */ public function getSQLDeclaration(array $column, AbstractPlatform $platform): string { - if ($platform instanceof phpbb_postgresql_platform) + if ($platform instanceof postgresql_platform) { return 'varchar_ci'; } @@ -39,7 +39,7 @@ public function getSQLDeclaration(array $column, AbstractPlatform $platform): st // we used 3 times larger capacity for strings on oracle for unicode strings // as on other platforms. This is not the case with varchar_ci, which uses // the same length as other platforms. - if ($platform instanceof phpbb_oracle_platform) + if ($platform instanceof oracle_platform) { return $platform->getAsciiStringTypeDeclarationSQL($column); } diff --git a/phpBB/phpbb/db/doctrine/connection_factory.php b/phpBB/phpbb/db/doctrine/connection_factory.php index 5ae5107da4e..15a0a6416e3 100644 --- a/phpBB/phpbb/db/doctrine/connection_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_factory.php @@ -20,10 +20,10 @@ use Doctrine\DBAL\Types\Type; use InvalidArgumentException; use phpbb\config_php_file; -use phpbb\db\middleware\mysql\phpbb_mysql_middleware; -use phpbb\db\middleware\oracle\phpbb_oracle_middleware; -use phpbb\db\middleware\postgresql\phpbb_postgresql_middleware; -use phpbb\db\middleware\sqlsrv\phpbb_sqlsrv_middleware; +use phpbb\db\middleware\mysql\middleware as mysql_middleware; +use phpbb\db\middleware\oracle\middleware as oracle_middleware; +use phpbb\db\middleware\postgresql\middleware as postgresql_middleware; +use phpbb\db\middleware\sqlsrv\middleware as sqlsrv_middleware; use phpbb\exception\runtime_exception; /** @@ -101,10 +101,10 @@ public static function get_connection_from_params( $middleware = match($driver) { - 'pdo_mysql', 'mysqli' => [new phpbb_mysql_middleware()], - 'pdo_oci', 'oci8' => [new phpbb_oracle_middleware()], - 'pdo_pgsql', 'pgsql' => [new phpbb_postgresql_middleware()], - 'pdo_sqlsrv', 'sqlsrv' => [new phpbb_sqlsrv_middleware()], + 'pdo_mysql', 'mysqli' => [new mysql_middleware()], + 'pdo_oci', 'oci8' => [new oracle_middleware()], + 'pdo_pgsql', 'pgsql' => [new postgresql_middleware()], + 'pdo_sqlsrv', 'sqlsrv' => [new sqlsrv_middleware()], default => [], }; diff --git a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php index 6e59c4a61e1..ea5a929ba75 100644 --- a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php @@ -13,8 +13,6 @@ namespace phpbb\db\doctrine; -use InvalidArgumentException; - /** * Helper class to generate Doctrine DBAL configuration. */ @@ -32,7 +30,7 @@ class connection_parameter_factory * * @return array Doctrine DBAL connection parameters. * - * @throws InvalidArgumentException If a required parameter is empty or null. + * @throws \InvalidArgumentException If a required parameter is empty or null. */ public static function get_configuration( string $driver, @@ -68,7 +66,7 @@ public static function get_configuration( * * @return array Doctrine's DBAL configuration for SQLite. * - * @throws InvalidArgumentException If a required parameter is empty or null. + * @throws \InvalidArgumentException If a required parameter is empty or null. */ private static function build_connection_parameters( array $params, @@ -87,7 +85,7 @@ private static function build_connection_parameters( if (empty($user) || empty($name)) { - throw new InvalidArgumentException('Required database parameter is not set.'); + throw new \InvalidArgumentException('Required database parameter is not set.'); } $params = array_merge($params, [ diff --git a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php b/phpBB/phpbb/db/middleware/mysql/driver.php similarity index 85% rename from phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php rename to phpBB/phpbb/db/middleware/mysql/driver.php index 651a9797652..306cadb72de 100644 --- a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_driver.php +++ b/phpBB/phpbb/db/middleware/mysql/driver.php @@ -19,13 +19,13 @@ * MySQL Doctrine driver middleware. * Makes use of phpBB's MySQL specific platform. */ -class phpbb_mysql_driver extends AbstractDriverMiddleware +class driver extends AbstractDriverMiddleware { /** * {@inheritDoc} */ public function createDatabasePlatformForVersion($version) { - return new phpbb_mysql_platform(); + return new platform(); } } diff --git a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php b/phpBB/phpbb/db/middleware/mysql/middleware.php similarity index 78% rename from phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php rename to phpBB/phpbb/db/middleware/mysql/middleware.php index 5e79142a9e4..793512cfffe 100644 --- a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_middleware.php +++ b/phpBB/phpbb/db/middleware/mysql/middleware.php @@ -14,15 +14,16 @@ namespace phpbb\db\middleware\mysql; use Doctrine\DBAL\Driver; +use phpbb\db\middleware\mysql\driver as mysql_driver; /** * MySQL Doctrine middleware. * Makes use of phpBB's MySQL specific platform. */ -class phpbb_mysql_middleware implements Driver\Middleware +class middleware implements Driver\Middleware { public function wrap(Driver $driver): Driver { - return new phpbb_mysql_driver($driver); + return new mysql_driver($driver); } } diff --git a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_platform.php b/phpBB/phpbb/db/middleware/mysql/platform.php similarity index 95% rename from phpBB/phpbb/db/middleware/mysql/phpbb_mysql_platform.php rename to phpBB/phpbb/db/middleware/mysql/platform.php index a64430613d6..ed4cbdb1bbf 100644 --- a/phpBB/phpbb/db/middleware/mysql/phpbb_mysql_platform.php +++ b/phpBB/phpbb/db/middleware/mysql/platform.php @@ -23,7 +23,7 @@ * If it's indexed as primary key, it should be declared as NOT NULL * because MySQL primary key columns cannot be NULL. */ -class phpbb_mysql_platform extends AbstractMySQLPlatform +class platform extends AbstractMySQLPlatform { /** * {@inheritDoc} diff --git a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php b/phpBB/phpbb/db/middleware/oracle/driver.php similarity index 83% rename from phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php rename to phpBB/phpbb/db/middleware/oracle/driver.php index fc341a2243f..bb4172bfe05 100644 --- a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_driver.php +++ b/phpBB/phpbb/db/middleware/oracle/driver.php @@ -21,14 +21,14 @@ * Oracle Doctrine driver middleware. * Makes use of phpBB's Oracle specific platform. */ -class phpbb_oracle_driver extends AbstractDriverMiddleware +class driver extends AbstractDriverMiddleware { /** * {@inheritDoc} */ public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $platform) { - return new phpbb_oracle_schema_manager($conn, $platform); + return new schema_manager($conn, $platform); } /** @@ -36,6 +36,6 @@ public function getSchemaManager(DoctrineConnection $conn, AbstractPlatform $pla */ public function createDatabasePlatformForVersion($version) { - return new phpbb_oracle_platform(); + return new platform(); } } diff --git a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php b/phpBB/phpbb/db/middleware/oracle/middleware.php similarity index 78% rename from phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php rename to phpBB/phpbb/db/middleware/oracle/middleware.php index be35ce963a8..c54ca4d81d7 100644 --- a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_middleware.php +++ b/phpBB/phpbb/db/middleware/oracle/middleware.php @@ -14,15 +14,16 @@ namespace phpbb\db\middleware\oracle; use Doctrine\DBAL\Driver; +use phpbb\db\middleware\oracle\driver as oracle_driver; /** * Oracle Doctrine middleware. * Makes use of phpBB's Oracle specific platform. */ -class phpbb_oracle_middleware implements Driver\Middleware +class middleware implements Driver\Middleware { public function wrap(Driver $driver): Driver { - return new phpbb_oracle_driver($driver); + return new oracle_driver($driver); } } diff --git a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_platform.php b/phpBB/phpbb/db/middleware/oracle/platform.php similarity index 98% rename from phpBB/phpbb/db/middleware/oracle/phpbb_oracle_platform.php rename to phpBB/phpbb/db/middleware/oracle/platform.php index efafcd768d6..8604f50fb19 100644 --- a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_platform.php +++ b/phpBB/phpbb/db/middleware/oracle/platform.php @@ -21,7 +21,7 @@ /** * Oracle specific schema restrictions for BC. */ -class phpbb_oracle_platform extends OraclePlatform +class platform extends OraclePlatform { /** * {@inheritDoc} diff --git a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_schema_manager.php b/phpBB/phpbb/db/middleware/oracle/schema_manager.php similarity index 94% rename from phpBB/phpbb/db/middleware/oracle/phpbb_oracle_schema_manager.php rename to phpBB/phpbb/db/middleware/oracle/schema_manager.php index 078630eb8ae..2ec1c08df0f 100644 --- a/phpBB/phpbb/db/middleware/oracle/phpbb_oracle_schema_manager.php +++ b/phpBB/phpbb/db/middleware/oracle/schema_manager.php @@ -18,7 +18,7 @@ use Doctrine\DBAL\Schema\OracleSchemaManager; use Doctrine\DBAL\Schema\Table; -class phpbb_oracle_schema_manager extends OracleSchemaManager +class schema_manager extends OracleSchemaManager { /** * {@inheritdoc} diff --git a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php b/phpBB/phpbb/db/middleware/postgresql/driver.php similarity index 85% rename from phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php rename to phpBB/phpbb/db/middleware/postgresql/driver.php index 9464825c784..35a2de28be5 100644 --- a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_driver.php +++ b/phpBB/phpbb/db/middleware/postgresql/driver.php @@ -19,13 +19,13 @@ * PostgreSQL Doctrine driver middleware. * Makes use of phpBB's PostgreSQL specific platform. */ -class phpbb_postgresql_driver extends AbstractDriverMiddleware +class driver extends AbstractDriverMiddleware { /** * {@inheritDoc} */ public function createDatabasePlatformForVersion($version) { - return new phpbb_postgresql_platform(); + return new platform(); } } diff --git a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php b/phpBB/phpbb/db/middleware/postgresql/middleware.php similarity index 77% rename from phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php rename to phpBB/phpbb/db/middleware/postgresql/middleware.php index 31d3fbcb209..defdcea6eb5 100644 --- a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_middleware.php +++ b/phpBB/phpbb/db/middleware/postgresql/middleware.php @@ -14,15 +14,16 @@ namespace phpbb\db\middleware\postgresql; use Doctrine\DBAL\Driver; +use phpbb\db\middleware\postgresql\driver as postgresql_driver; /** * PostgreSQL Doctrine middleware. * Makes use of phpBB's PostgreSQL specific platform. */ -class phpbb_postgresql_middleware implements Driver\Middleware +class middleware implements Driver\Middleware { public function wrap(Driver $driver): Driver { - return new phpbb_postgresql_driver($driver); + return new postgresql_driver($driver); } } diff --git a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_platform.php b/phpBB/phpbb/db/middleware/postgresql/platform.php similarity index 98% rename from phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_platform.php rename to phpBB/phpbb/db/middleware/postgresql/platform.php index 7ed3508ba09..e5e7a9a1c6f 100644 --- a/phpBB/phpbb/db/middleware/postgresql/phpbb_postgresql_platform.php +++ b/phpBB/phpbb/db/middleware/postgresql/platform.php @@ -31,7 +31,7 @@ * to stay compatible with the existing DB we have to change its * naming and not ours. */ -class phpbb_postgresql_platform extends PostgreSQLPlatform +class platform extends PostgreSQLPlatform { /** * {@inheritdoc} diff --git a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php b/phpBB/phpbb/db/middleware/sqlsrv/driver.php similarity index 86% rename from phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php rename to phpBB/phpbb/db/middleware/sqlsrv/driver.php index ba7ec877f64..4fbd9e33f0b 100644 --- a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_driver.php +++ b/phpBB/phpbb/db/middleware/sqlsrv/driver.php @@ -19,13 +19,13 @@ * Microsoft SQL server Doctrine driver middleware. * Makes use of phpBB's SQL Server specific platform. */ -class phpbb_sqlsrv_driver extends AbstractDriverMiddleware +class driver extends AbstractDriverMiddleware { /** * {@inheritDoc} */ public function createDatabasePlatformForVersion($version) { - return new phpbb_sqlsrv_platform(); + return new platform(); } } diff --git a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php b/phpBB/phpbb/db/middleware/sqlsrv/middleware.php similarity index 78% rename from phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php rename to phpBB/phpbb/db/middleware/sqlsrv/middleware.php index a5603fd422b..03814e8cfa0 100644 --- a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_middleware.php +++ b/phpBB/phpbb/db/middleware/sqlsrv/middleware.php @@ -14,15 +14,16 @@ namespace phpbb\db\middleware\sqlsrv; use Doctrine\DBAL\Driver; +use phpbb\db\middleware\sqlsrv\driver as sqlsrv_driver; /** * Microsoft SQL server Doctrine middleware. * Makes use of phpBB's SQL Server specific platform. */ -class phpbb_sqlsrv_middleware implements Driver\Middleware +class middleware implements Driver\Middleware { public function wrap(Driver $driver): Driver { - return new phpbb_sqlsrv_driver($driver); + return new sqlsrv_driver($driver); } } diff --git a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_platform.php b/phpBB/phpbb/db/middleware/sqlsrv/platform.php similarity index 98% rename from phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_platform.php rename to phpBB/phpbb/db/middleware/sqlsrv/platform.php index 896cb72643a..a7a58e3dda6 100644 --- a/phpBB/phpbb/db/middleware/sqlsrv/phpbb_sqlsrv_platform.php +++ b/phpBB/phpbb/db/middleware/sqlsrv/platform.php @@ -20,7 +20,7 @@ /** * SQLServer specific schema restrictions for BC. */ -class phpbb_sqlsrv_platform extends SQLServerPlatform +class platform extends SQLServerPlatform { /** * {@inheritDoc} From 1633288447de76c0429391dc03772b5112c199f9 Mon Sep 17 00:00:00 2001 From: battye Date: Sun, 20 Jul 2025 04:38:51 +0000 Subject: [PATCH 0859/1214] [ticket/17034] Fix min posts rank validation PHPBB-17034 --- phpBB/adm/style/acp_ranks.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/adm/style/acp_ranks.html b/phpBB/adm/style/acp_ranks.html index aac5de6fe7c..aa31db497aa 100644 --- a/phpBB/adm/style/acp_ranks.html +++ b/phpBB/adm/style/acp_ranks.html @@ -44,7 +44,7 @@

    {L_ACP_MANAGE_RANKS}

    style="display: none;">
    -
    +
    From 7056bcba9130394306cf6bb6ab7bf4efa64a1345 Mon Sep 17 00:00:00 2001 From: rxu Date: Mon, 28 Jul 2025 22:51:14 +0700 Subject: [PATCH 0860/1214] [ticket/17535] Address code review comments PHPBB-17535 --- phpBB/phpbb/cache/driver/base.php | 46 +++++++++---------- phpBB/phpbb/cache/driver/memory.php | 13 +----- tests/auth/provider_apache_test.php | 8 ++-- tests/dbal/connect_test.php | 2 +- tests/functional/extension_acp_test.php | 1 - tests/text_processing/message_parser_test.php | 2 +- 6 files changed, 30 insertions(+), 42 deletions(-) diff --git a/phpBB/phpbb/cache/driver/base.php b/phpBB/phpbb/cache/driver/base.php index a93e6ce08c0..9dfc28b3f65 100644 --- a/phpBB/phpbb/cache/driver/base.php +++ b/phpBB/phpbb/cache/driver/base.php @@ -31,33 +31,33 @@ function purge() try { $iterator = new \DirectoryIterator($this->cache_dir); - } - catch (\Exception $e) - { - return; - } - foreach ($iterator as $fileInfo) - { - if ($fileInfo->isDot()) + foreach ($iterator as $fileInfo) { - continue; - } - $filename = $fileInfo->getFilename(); - if ($fileInfo->isDir()) - { - $this->remove_dir($fileInfo->getPathname()); - } - else if (strpos($filename, 'container_') === 0 || - strpos($filename, 'autoload_') === 0 || - strpos($filename, 'url_matcher') === 0 || - strpos($filename, 'url_generator') === 0 || - strpos($filename, 'sql_') === 0 || - strpos($filename, 'data_') === 0) - { - $this->remove_file($fileInfo->getPathname()); + if ($fileInfo->isDot()) + { + continue; + } + $filename = $fileInfo->getFilename(); + if ($fileInfo->isDir()) + { + $this->remove_dir($fileInfo->getPathname()); + } + else if (strpos($filename, 'container_') === 0 || + strpos($filename, 'autoload_') === 0 || + strpos($filename, 'url_matcher') === 0 || + strpos($filename, 'url_generator') === 0 || + strpos($filename, 'sql_') === 0 || + strpos($filename, 'data_') === 0) + { + $this->remove_file($fileInfo->getPathname()); + } } } + catch (\Exception $e) + { + // Do not return, to purge vars cached in memory + } unset($this->vars); unset($this->sql_rowset); diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index 4ccd0607cd6..feee5888608 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -50,18 +50,7 @@ function __construct() */ function purge() { - unset($this->vars); - unset($this->sql_rowset); - unset($this->sql_row_pointer); - - if (function_exists('opcache_reset')) - { - @opcache_reset(); - } - - $this->vars = []; - $this->sql_rowset = []; - $this->sql_row_pointer = []; + parent::purge(); $this->is_modified = true; diff --git a/tests/auth/provider_apache_test.php b/tests/auth/provider_apache_test.php index f291751575d..2094205bfe1 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -74,10 +74,10 @@ public function test_login() ->will($this->returnValue(true)); $this->request->expects($this->exactly(2)) ->method('server') - ->willReturnCallback(fn(string $arg) => match(true) { - $arg === 'PHP_AUTH_USER' => 'foobar', - $arg === 'PHP_AUTH_PW' => 'example', - }); + ->willReturnMap([ + ['PHP_AUTH_USER', 'foobar'], + ['PHP_AUTH_PW', 'example'] + ]); $expected = array( 'status' => LOGIN_SUCCESS, diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php index d1ec75470a3..7220a60bf75 100644 --- a/tests/dbal/connect_test.php +++ b/tests/dbal/connect_test.php @@ -35,7 +35,7 @@ public function test_failing_connect() if ($db->get_sql_layer() === 'mysqli') { - $this->setExpectedTriggerError(E_WARNING); + $this->setExpectedTriggerError(E_WARNING); } else if ($db->get_sql_layer() !== 'sqlite3') { diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index bcc299fae51..30dcaa89c70 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -255,7 +255,6 @@ public function test_extensions_catalog() $form = $crawler->selectButton('Submit')->form(); $form['minimum_stability']->select('dev'); - $form['enable_packagist']->select('1'); $form['repositories'] = 'https://satis.phpbb.com/'; $crawler = self::submit($form); $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); diff --git a/tests/text_processing/message_parser_test.php b/tests/text_processing/message_parser_test.php index ca301b9b3e8..35dcb4b5666 100644 --- a/tests/text_processing/message_parser_test.php +++ b/tests/text_processing/message_parser_test.php @@ -61,7 +61,7 @@ protected function prepare_s9e_services($setup = null) $user->style = array('style_id' => 1); $user->expects($this->any()) - -> method('__get')->with('lang')->willReturn([ + ->method('__get')->with('lang')->willReturn([ 'NO_POLL_TITLE' => 'You have to enter a poll title.', 'POLL_TITLE_TOO_LONG' => 'The poll title must contain fewer than 100 characters.', 'POLL_TITLE_COMP_TOO_LONG' => 'The parsed size of your poll title is too large, consider removing BBCodes or smilies.', From e794dd4a87408ca08d6410105b2df868f95a0b40 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 30 Jul 2025 09:05:38 +0700 Subject: [PATCH 0861/1214] [ticket/17535] Remove redundant empty lines PHPBB-17535 --- tests/dbal/connect_test.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/dbal/connect_test.php b/tests/dbal/connect_test.php index 7220a60bf75..5216312d091 100644 --- a/tests/dbal/connect_test.php +++ b/tests/dbal/connect_test.php @@ -31,8 +31,6 @@ public function test_failing_connect() // Failure to connect results in a trigger_error call in dbal. // phpunit converts triggered errors to exceptions. // In particular there should be no fatals here. - - if ($db->get_sql_layer() === 'mysqli') { $this->setExpectedTriggerError(E_WARNING); From bfc60efeb519a66acfd788ee38a44867e577c857 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 31 Aug 2025 22:00:51 +0200 Subject: [PATCH 0862/1214] [ticket/17537] Cache extensions paths as metadata for ConfigCache This should help with checking whether the ConfigCache is still fresh. PHPBB-17537 --- phpBB/phpbb/di/container_builder.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 59595a9c603..087dbf9649e 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -458,6 +458,7 @@ protected function load_extensions() } $extensions = $ext_container->get('ext.manager')->all_enabled(); + $resources = []; // Load each extension found $autoloaders = 'container_extensions[] = new $extension_class($ext_name, $path); + if (is_dir($path)) + { + $resources[] = new \Symfony\Component\Config\Resource\DirectoryResource($path); + } + // Load extension autoloader $filename = $path . 'vendor/autoload.php'; if (file_exists($filename)) @@ -489,7 +495,7 @@ protected function load_extensions() } $configCache = new ConfigCache($this->get_autoload_filename(), false); - $configCache->write($autoloaders); + $configCache->write($autoloaders, $resources); require($this->get_autoload_filename()); } From 7ce82d6b4cd1b3bb9a233826ae17596d7fbb2f2f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 7 Sep 2025 13:05:25 -0700 Subject: [PATCH 0863/1214] [ticket/17538] Proof-read and improve language of TOS and Privacy Policy Proof-read and improve language of TOS and Privacy Policy. PHPBB-17538 --- phpBB/language/en/ucp.php | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 1f52db2901b..368f1f2b594 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -38,22 +38,26 @@ // Privacy policy and T&C $lang = array_merge($lang, array( - 'TERMS_OF_USE_CONTENT' => 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all of the following terms then please do not access and/or use “%1$s”. We may change these at any time and we’ll do our utmost in informing you, though it would be prudent to review this regularly yourself as your continued usage of “%1$s” after changes mean you agree to be legally bound by these terms as they are updated and/or amended. + 'TERMS_OF_USE_CONTENT' => 'By accessing “%1$s” (hereinafter “we,” “us,” “our,” “%1$s,” “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all the following terms, please do not access or use “%1$s.” We may change these terms at any time and will make every effort to inform you of such changes. However, it is your responsibility to review this document regularly, as your continued use of “%1$s” after changes are made constitutes your agreement to be legally bound by the updated and/or amended terms.

    - Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) which is a bulletin board solution released under the “GNU General Public License v2” (hereinafter “GPL”) and can be downloaded from www.phpbb.com. The phpBB software only facilitates internet based discussions; phpBB Limited is not responsible for what we allow and/or disallow as permissible content and/or conduct. For further information about phpBB, please see: https://www.phpbb.com/. + Our forums are powered by phpBB (hereinafter “they,” “them,” “their,” “phpBB software,” “www.phpbb.com,” “phpBB Limited,” “phpBB Teams”), a bulletin board solution released under the “GNU General Public License v2” (hereinafter “GPL”), which can be downloaded from www.phpbb.com. The phpBB software only facilitates internet-based discussions; phpBB Limited is not responsible for the content or conduct permitted or disallowed on this site. For further information about phpBB, please see: https://www.phpbb.com/.

    - You agree not to post any abusive, obscene, vulgar, libellous, hateful, threatening, sexually-orientated or any other material that may violate any laws be it of your country, the country where “%1$s” is hosted or International Law. Doing so may lead to you being immediately and permanently banned, with notification of your Internet Service Provider if deemed required by us. The IP address of all posts are recorded to aid in enforcing these conditions. You agree that “%1$s” have the right to remove, edit, move or close any topic at any time should we see fit. As a user you agree to any information you have entered to being stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to the data being compromised. + You agree not to post any abusive, obscene, vulgar, libellous, hateful, threatening, sexually oriented, or otherwise unlawful material, whether under the laws of your country, the country in which “%1$s” is hosted, or under international law. Doing so may result in your immediate and permanent ban, with notification of your Internet Service Provider if deemed necessary by us. The IP address of all posts is recorded to aid in enforcing these conditions. +

    + You agree that “%1$s” reserves the right to remove, edit, move, or close any topic at any time, at our sole discretion. As a user, you agree that any information you enter may be stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to data being compromised. ', - 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s” along with its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use any information collected during any session of usage by you (hereinafter “your information”). + 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s” and its affiliated companies (hereinafter “we,” “us,” “our,” “%1$s,” “%2$s”) and phpBB (hereinafter “they,” “them,” “their,” “phpBB software,” “www.phpbb.com,” “phpBB Limited,” “phpBB Teams”) use information collected during your use of this site (hereinafter “your information”). +

    + Your information is collected in two ways. When you browse “%1$s,” the phpBB software will create several cookies. Cookies are small text files stored in your web browser’s temporary files. The first two cookies contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), both automatically assigned by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s.” It stores information about which topics you have read, thereby improving your user experience.

    - Your information is collected via two ways. Firstly, by browsing “%1$s” will cause the phpBB software to create a number of cookies, which are small text files that are downloaded on to your computer’s web browser temporary files. The first two cookies just contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), automatically assigned to you by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s” and is used to store which topics have been read, thereby improving your user experience. + We may also create cookies external to the phpBB software while you are browsing “%1$s.” These fall outside the scope of this document, which only covers cookies created by the phpBB software.

    - We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”). + The second way we collect information is through what you submit to us. This includes but is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”), posts you submit after registering and while logged in (hereinafter “your posts”).

    - Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your email address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software. + Your account will contain at a minimum: a unique username (hereinafter “your username”), a personal password used to log in (hereinafter “your password”), a valid email address (hereinafter “your email”). Your account information on “%1$s” is protected by the data-protection laws applicable in the country that hosts us. Any information beyond your username, password, and email address that is requested during registration may be mandatory or optional, at the discretion of “%1$s.” In all cases, you may choose what information in your account is publicly displayed. You may also opt in or out of automatically generated emails from the phpBB software.

    - Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account. + Your password is stored as a one-way hash to ensure security. However, we recommend that you do not reuse the same password across multiple websites. Your password is the key to your account on “%1$s,” so please keep it secure. Under no circumstances will anyone affiliated with “%1$s,” phpBB, or any third party legitimately ask for your password. If you forget your password, you can use the “I forgot my password” feature provided by the phpBB software. This process requires you to submit your username and email address, after which the phpBB software will generate a new password for you to regain access to your account. ', )); From 8a84f2c543736eec3482037cebe5e961c0b2df6a Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 9 Sep 2025 08:31:11 -0700 Subject: [PATCH 0864/1214] [ticket/17538] Use British English comma placements PHPBB-17538 --- phpBB/language/en/ucp.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 368f1f2b594..61f29136276 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -38,26 +38,26 @@ // Privacy policy and T&C $lang = array_merge($lang, array( - 'TERMS_OF_USE_CONTENT' => 'By accessing “%1$s” (hereinafter “we,” “us,” “our,” “%1$s,” “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all the following terms, please do not access or use “%1$s.” We may change these terms at any time and will make every effort to inform you of such changes. However, it is your responsibility to review this document regularly, as your continued use of “%1$s” after changes are made constitutes your agreement to be legally bound by the updated and/or amended terms. + 'TERMS_OF_USE_CONTENT' => 'By accessing “%1$s” (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”), you agree to be legally bound by the following terms. If you do not agree to be legally bound by all the following terms, please do not access or use “%1$s”. We may change these terms at any time and will make every effort to inform you of such changes. However, it is your responsibility to review this document regularly, as your continued use of “%1$s” after changes are made constitutes your agreement to be legally bound by the updated and/or amended terms.

    - Our forums are powered by phpBB (hereinafter “they,” “them,” “their,” “phpBB software,” “www.phpbb.com,” “phpBB Limited,” “phpBB Teams”), a bulletin board solution released under the “GNU General Public License v2” (hereinafter “GPL”), which can be downloaded from www.phpbb.com. The phpBB software only facilitates internet-based discussions; phpBB Limited is not responsible for the content or conduct permitted or disallowed on this site. For further information about phpBB, please see: https://www.phpbb.com/. + Our forums are powered by phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”), a bulletin board solution released under the “GNU General Public License v2” (hereinafter “GPL”), which can be downloaded from www.phpbb.com. The phpBB software only facilitates internet-based discussions; phpBB Limited is not responsible for the content or conduct permitted or disallowed on this site. For further information about phpBB, please see: https://www.phpbb.com/.

    You agree not to post any abusive, obscene, vulgar, libellous, hateful, threatening, sexually oriented, or otherwise unlawful material, whether under the laws of your country, the country in which “%1$s” is hosted, or under international law. Doing so may result in your immediate and permanent ban, with notification of your Internet Service Provider if deemed necessary by us. The IP address of all posts is recorded to aid in enforcing these conditions.

    You agree that “%1$s” reserves the right to remove, edit, move, or close any topic at any time, at our sole discretion. As a user, you agree that any information you enter may be stored in a database. While this information will not be disclosed to any third party without your consent, neither “%1$s” nor phpBB shall be held responsible for any hacking attempt that may lead to data being compromised. ', - 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s” and its affiliated companies (hereinafter “we,” “us,” “our,” “%1$s,” “%2$s”) and phpBB (hereinafter “they,” “them,” “their,” “phpBB software,” “www.phpbb.com,” “phpBB Limited,” “phpBB Teams”) use information collected during your use of this site (hereinafter “your information”). + 'PRIVACY_POLICY' => 'This policy explains in detail how “%1$s” and its affiliated companies (hereinafter “we”, “us”, “our”, “%1$s”, “%2$s”) and phpBB (hereinafter “they”, “them”, “their”, “phpBB software”, “www.phpbb.com”, “phpBB Limited”, “phpBB Teams”) use information collected during your use of this site (hereinafter “your information”).

    - Your information is collected in two ways. When you browse “%1$s,” the phpBB software will create several cookies. Cookies are small text files stored in your web browser’s temporary files. The first two cookies contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), both automatically assigned by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s.” It stores information about which topics you have read, thereby improving your user experience. + Your information is collected in two ways. When you browse “%1$s”, the phpBB software will create several cookies. Cookies are small text files stored in your web browser’s temporary files. The first two cookies contain a user identifier (hereinafter “user-id”) and an anonymous session identifier (hereinafter “session-id”), both automatically assigned by the phpBB software. A third cookie will be created once you have browsed topics within “%1$s”. It stores information about which topics you have read, thereby improving your user experience.

    - We may also create cookies external to the phpBB software while you are browsing “%1$s.” These fall outside the scope of this document, which only covers cookies created by the phpBB software. + We may also create cookies external to the phpBB software while you are browsing “%1$s”. These fall outside the scope of this document, which only covers cookies created by the phpBB software.

    The second way we collect information is through what you submit to us. This includes but is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”), posts you submit after registering and while logged in (hereinafter “your posts”).

    - Your account will contain at a minimum: a unique username (hereinafter “your username”), a personal password used to log in (hereinafter “your password”), a valid email address (hereinafter “your email”). Your account information on “%1$s” is protected by the data-protection laws applicable in the country that hosts us. Any information beyond your username, password, and email address that is requested during registration may be mandatory or optional, at the discretion of “%1$s.” In all cases, you may choose what information in your account is publicly displayed. You may also opt in or out of automatically generated emails from the phpBB software. + Your account will contain at a minimum: a unique username (hereinafter “your username”), a personal password used to log in (hereinafter “your password”), a valid email address (hereinafter “your email”). Your account information on “%1$s” is protected by the data-protection laws applicable in the country that hosts us. Any information beyond your username, password, and email address that is requested during registration may be mandatory or optional, at the discretion of “%1$s”. In all cases, you may choose what information in your account is publicly displayed. You may also opt in or out of automatically generated emails from the phpBB software.

    - Your password is stored as a one-way hash to ensure security. However, we recommend that you do not reuse the same password across multiple websites. Your password is the key to your account on “%1$s,” so please keep it secure. Under no circumstances will anyone affiliated with “%1$s,” phpBB, or any third party legitimately ask for your password. If you forget your password, you can use the “I forgot my password” feature provided by the phpBB software. This process requires you to submit your username and email address, after which the phpBB software will generate a new password for you to regain access to your account. + Your password is stored as a one-way hash to ensure security. However, we recommend that you do not reuse the same password across multiple websites. Your password is the key to your account on “%1$s”, so please keep it secure. Under no circumstances will anyone affiliated with “%1$s”, phpBB, or any third party legitimately ask for your password. If you forget your password, you can use the “I forgot my password” feature provided by the phpBB software. This process requires you to submit your username and email address, after which the phpBB software will generate a new password for you to regain access to your account. ', )); From d6d0f755ff65c5377402b12b6032486c170ce155 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 11 Sep 2025 20:34:29 +0200 Subject: [PATCH 0865/1214] [ticket/17540] Use windows 2025 runners and limit to single PHP version PHPBB-17540 --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 72bd7d6d42b..79dcc272770 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -495,11 +495,11 @@ jobs: # Test with IIS & PostgreSQL on Windows windows-tests: - runs-on: windows-latest + runs-on: windows-2025 strategy: matrix: type: ['unit', 'functional'] - php: ['8.1', '8.2', '8.3'] + php: ['8.4'] db: ['postgres'] name: Windows - ${{ matrix.type }} - PHP ${{ matrix.php }} - ${{ matrix.db }} From c5758e7ac4875065a8cbe4022e7d08a853904431 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 11 Sep 2025 11:29:41 -0700 Subject: [PATCH 0866/1214] [ticket/17451] Prevent web push service worker from updating user activity PHPBB-17451 --- phpBB/phpbb/session.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 5a1c2e872f3..579040d703e 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -1715,7 +1715,7 @@ public function update_user_lastvisit() { global $db; - if (isset($this->data['session_time'], $this->data['user_id'])) + if (isset($this->data['session_time'], $this->data['user_id']) && !$this->is_push_notification_request()) { $sql = 'UPDATE ' . USERS_TABLE . ' SET user_lastvisit = ' . (int) $this->data['session_time'] . ', @@ -1734,7 +1734,7 @@ public function update_last_active_time() { global $db; - if (isset($this->time_now, $this->data['user_id'])) + if (isset($this->time_now, $this->data['user_id']) && !$this->is_push_notification_request()) { $sql = 'UPDATE ' . USERS_TABLE . ' SET user_last_active = ' . $this->time_now . ' @@ -1742,4 +1742,16 @@ public function update_last_active_time() $db->sql_query($sql); } } + + /** + * Determine if the request is an Ajax request from the web push service worker + * + * @return bool True if the request is an Ajax request and the page URL contains '/push/notification', otherwise false + */ + protected function is_push_notification_request(): bool + { + global $request; + + return $request->is_ajax() && str_contains($this->page['page'], '/push/notification'); + } } From e482a6e74b14628cb1c4a7ee9adc324dd2fc0a33 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 13 Sep 2025 08:59:19 +0200 Subject: [PATCH 0867/1214] [ticket/17540] Default initialize rename_index array PHPBB-17540 --- .../db/migration/data/v400/rename_duplicated_index_names.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php b/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php index 805d68ff757..f2d8107a9b3 100644 --- a/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php +++ b/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php @@ -27,7 +27,7 @@ class rename_duplicated_index_names extends migration /** * @var array */ - protected static $rename_index; + protected static $rename_index = []; public static function depends_on() { From 949423abd99b4b522ee4d0454cf4f6688107114b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 13 Sep 2025 09:57:45 +0200 Subject: [PATCH 0868/1214] [ticket/17540] Update composer installers to version 2.3.0 PHPBB-17540 --- phpBB/composer.json | 2 +- phpBB/composer.lock | 45 ++++++++++++++++++++------------------------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 7dfe52b3220..8ff7e38d25d 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -34,7 +34,7 @@ "bantu/ini-get-wrapper": "~1.0", "carlos-mg89/oauth": "^0.8.15", "composer/composer": "^2.0", - "composer/installers": "^1.9", + "composer/installers": "^2.3", "composer/package-versions-deprecated": "^1.11", "doctrine/dbal": "^3.9", "google/recaptcha": "~1.1", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index eed819db811..f9090155f53 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "9f600f681e6bb2efaa5a7c6a445e09bf", + "content-hash": "43fe1ef1a33684f75d832b93f7ac764c", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -436,39 +436,37 @@ }, { "name": "composer/installers", - "version": "v1.12.0", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/composer/installers.git", - "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19" + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/installers/zipball/d20a64ed3c94748397ff5973488761b22f6d3f19", - "reference": "d20a64ed3c94748397ff5973488761b22f6d3f19", + "url": "https://api.github.com/repos/composer/installers/zipball/12fb2dfe5e16183de69e784a7b84046c43d97e8e", + "reference": "12fb2dfe5e16183de69e784a7b84046c43d97e8e", "shasum": "" }, "require": { - "composer-plugin-api": "^1.0 || ^2.0" - }, - "replace": { - "roundcube/plugin-installer": "*", - "shama/baton": "*" + "composer-plugin-api": "^1.0 || ^2.0", + "php": "^7.2 || ^8.0" }, "require-dev": { - "composer/composer": "1.6.* || ^2.0", - "composer/semver": "^1 || ^3", - "phpstan/phpstan": "^0.12.55", - "phpstan/phpstan-phpunit": "^0.12.16", - "symfony/phpunit-bridge": "^4.2 || ^5", - "symfony/process": "^2.3" + "composer/composer": "^1.10.27 || ^2.7", + "composer/semver": "^1.7.2 || ^3.4.0", + "phpstan/phpstan": "^1.11", + "phpstan/phpstan-phpunit": "^1", + "symfony/phpunit-bridge": "^7.1.1", + "symfony/process": "^5 || ^6 || ^7" }, "type": "composer-plugin", "extra": { "class": "Composer\\Installers\\Plugin", "branch-alias": { - "dev-main": "1.x-dev" - } + "dev-main": "2.x-dev" + }, + "plugin-modifies-install-path": true }, "autoload": { "psr-4": { @@ -489,7 +487,6 @@ "description": "A multi-framework Composer library installer", "homepage": "https://composer.github.io/installers/", "keywords": [ - "Craft", "Dolibarr", "Eliasis", "Hurad", @@ -510,7 +507,6 @@ "Whmcs", "WolfCMS", "agl", - "aimeos", "annotatecms", "attogram", "bitrix", @@ -519,6 +515,7 @@ "cockpit", "codeigniter", "concrete5", + "concreteCMS", "croogo", "dokuwiki", "drupal", @@ -529,7 +526,6 @@ "grav", "installer", "itop", - "joomla", "known", "kohana", "laravel", @@ -538,6 +534,7 @@ "magento", "majima", "mako", + "matomo", "mediawiki", "miaoxing", "modulework", @@ -557,9 +554,7 @@ "silverstripe", "sydes", "sylius", - "symfony", "tastyigniter", - "typo3", "wordpress", "yawik", "zend", @@ -567,7 +562,7 @@ ], "support": { "issues": "https://github.com/composer/installers/issues", - "source": "https://github.com/composer/installers/tree/v1.12.0" + "source": "https://github.com/composer/installers/tree/v2.3.0" }, "funding": [ { @@ -583,7 +578,7 @@ "type": "tidelift" } ], - "time": "2021-09-13T08:19:44+00:00" + "time": "2024-06-24T20:46:46+00:00" }, { "name": "composer/metadata-minifier", From 07772c910545a3945a3a7179b71aaa73b1141f46 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 13 Sep 2025 20:21:28 +0200 Subject: [PATCH 0869/1214] [ticket/17540] Use VigLink in extensions ACP test PHPBB-17540 --- tests/functional/extension_acp_test.php | 62 ++++++++----------------- 1 file changed, 20 insertions(+), 42 deletions(-) diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 30dcaa89c70..8f76a91b957 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -300,41 +300,33 @@ function ($node, $i) use ($extension_name) $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&start=' . $i * 20 . '&mode=catalog&sid=' . $this->sid); } - $extension_filter($crawler, 'Scroll Page', $scrollpage_install_link); - $extension_filter($crawler, 'Scroll To Top', $scrolltotop_install_link); + $extension_filter($crawler, 'VigLink', $viglink_install_link); } - if (!isset($scrolltotop_install_link) || !isset($scrollpage_install_link)) + if (!isset($viglink_install_link)) { $this->fail('Failed acquiring install links for test extensions'); } - // Attempt to install vse/scrollpage extension - $crawler = self::$client->click($scrollpage_install_link); + // Attempt to install phpbb/viglink extension + $crawler = self::$client->click($viglink_install_link); $this->assertContainsLang('EXTENSIONS_INSTALLED', $crawler->filter('.successbox > p')->text()); // Assert there's console log output - $this->assertStringContainsString('Locking vse/scrollpage', $crawler->filter('.console-output > pre')->text()); - - // Attempt to install vse/scrolltotop extension - $crawler = self::$client->click($scrolltotop_install_link); - $this->assertContainsLang('EXTENSIONS_INSTALLED', $crawler->filter('.successbox > p')->text()); - // Assert there's console log output - $this->assertStringContainsString('Locking vse/scrolltotop', $crawler->filter('.console-output > pre')->text()); + $this->assertStringContainsString('Locking phpbb/viglink', $crawler->filter('.console-output > pre')->text()); // Ensure installed extension appears in available extensions list $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); - $this->assertStringContainsString('Scroll To Top', $crawler->filter('strong[title="vse/scrolltotop"]')->text()); - $this->assertStringContainsString('Scroll Page', $crawler->filter('strong[title="vse/scrollpage"]')->text()); + $this->assertStringContainsString('VigLink', $crawler->filter('strong[title="phpbb/viglink"]')->text()); } public function test_extensions_catalog_updating_extension() { - // Enable 'Scroll Page' extension installed earlier + // Enable 'VigLink' extension installed earlier $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); $extension_enable_link = $crawler->filter('tr')->reduce( function ($node, $i) { - return (bool) (strpos($node->text(), 'Scroll Page') !== false); + return (bool) (strpos($node->text(), 'VigLink') !== false); } )->selectLink($this->lang('EXTENSION_ENABLE'))->link(); $crawler = self::$client->click($extension_enable_link); @@ -342,22 +334,22 @@ function ($node, $i) $crawler = self::submit($form); $this->assertContainsLang('EXTENSION_ENABLE_SUCCESS', $crawler->filter('.successbox')->text()); - // Update 'Scroll Page' enabled extension + // Update 'VigLink' enabled extension $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); - $scrollpage_update_link = $crawler->filter('tr')->reduce( + $viglink_update_link = $crawler->filter('tr')->reduce( function ($node, $i) { - return (bool) (strpos($node->text(), 'Scroll Page') !== false); + return (bool) (strpos($node->text(), 'VigLink') !== false); } )->selectLink($this->lang('EXTENSION_UPDATE'))->link(); - $crawler = self::$client->click($scrollpage_update_link); + $crawler = self::$client->click($viglink_update_link); $this->assertContainsLang('EXTENSIONS_UPDATED', $crawler->filter('.successbox > p')->text()); // Assert there's console log output $this->assertStringContainsString('Updating packages', $crawler->filter('.console-output > pre')->text()); // Ensure installed extension still appears in available extensions list $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); - $this->assertStringContainsString('Scroll Page', $crawler->filter('strong[title="vse/scrollpage"]')->text()); + $this->assertStringContainsString('VigLink', $crawler->filter('strong[title="phpbb/viglink"]')->text()); } public function test_extensions_catalog_removing_extension() @@ -365,36 +357,22 @@ public function test_extensions_catalog_removing_extension() $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); // Check if both enabled and disabled extensions have 'Remove' action available - $scrollpage_remove_link = $crawler->filter('tr')->reduce( - function ($node, $i) - { - return (bool) (strpos($node->text(), 'Scroll Page') !== false); - } - )->selectLink($this->lang('EXTENSION_REMOVE'))->link(); - - $scrolltotop_remove_link = $crawler->filter('tr')->reduce( + $viglink_remove_link = $crawler->filter('tr')->reduce( function ($node, $i) { - return (bool) (strpos($node->text(), 'Scroll To Top') !== false); + return (bool) (strpos($node->text(), 'VigLink') !== false); } )->selectLink($this->lang('EXTENSION_REMOVE'))->link(); // Test extensions removal - // Remove 'Scroll Page' enabled extension - $crawler = self::$client->click($scrollpage_remove_link); - $this->assertContainsLang('EXTENSIONS_REMOVED', $crawler->filter('.successbox > p')->text()); - // Assert there's console log output - $this->assertStringContainsString('Removing vse/scrollpage', $crawler->filter('.console-output > pre')->text()); - - // Remove 'Scroll To Top' disabled extension - $crawler = self::$client->click($scrolltotop_remove_link); + // Remove 'VigLink' enabled extension + $crawler = self::$client->click($viglink_remove_link); $this->assertContainsLang('EXTENSIONS_REMOVED', $crawler->filter('.successbox > p')->text()); // Assert there's console log output - $this->assertStringContainsString('Removing vse/scrolltotop', $crawler->filter('.console-output > pre')->text()); + $this->assertStringContainsString('Removing phpbb/viglink', $crawler->filter('.console-output > pre')->text()); // Ensure removed extensions do not appear in available extensions list - $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); - $this->assertStringNotContainsString('Scroll Page', $this->get_content()); - $this->assertStringNotContainsString('Scroll To Top', $this->get_content()); + self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); + $this->assertStringNotContainsString('VigLink', $this->get_content()); } } From 1af2f922b514c7a62f11ec25ccafe7d7a7fcb685 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 13 Sep 2025 14:03:32 -0700 Subject: [PATCH 0870/1214] [ticket/17541] Avoid variable naming conflicts in loop PHPBB-17541 --- phpBB/phpbb/composer/installer.php | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 2e7ab9a6145..d848c8b9afc 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -390,22 +390,22 @@ protected function do_get_available_packages($type) } } - foreach ($compatible_packages as $name => $versions) + foreach ($compatible_packages as $package_name => $package_versions) { // Determine the highest version of the package /** @var CompletePackage|CompleteAliasPackage $highest_version */ $highest_version = null; // Sort the versions array in descending order - usort($versions, function ($a, $b) + usort($package_versions, function ($a, $b) { return version_compare($b->getVersion(), $a->getVersion()); }); // The first element in the sorted array is the highest version - if (!empty($versions)) + if (!empty($package_versions)) { - $highest_version = $versions[0]; + $highest_version = $package_versions[0]; // If highest version is a non-numeric dev branch, it's an instance of CompleteAliasPackage, // so we need to get the package being aliased in order to show the true non-numeric version. @@ -416,23 +416,23 @@ protected function do_get_available_packages($type) } // Generates the entry - $available[$name] = []; - $available[$name]['name'] = $highest_version->getPrettyName(); - $available[$name]['display_name'] = $highest_version->getExtra()['display-name']; - $available[$name]['composer_name'] = $highest_version->getName(); - $available[$name]['version'] = $highest_version->getPrettyVersion(); + $available[$package_name] = []; + $available[$package_name]['name'] = $highest_version->getPrettyName(); + $available[$package_name]['display_name'] = $highest_version->getExtra()['display-name']; + $available[$package_name]['composer_name'] = $highest_version->getName(); + $available[$package_name]['version'] = $highest_version->getPrettyVersion(); if ($highest_version instanceof CompletePackage) { - $available[$name]['description'] = $highest_version->getDescription(); - $available[$name]['url'] = $highest_version->getHomepage(); - $available[$name]['authors'] = $highest_version->getAuthors(); + $available[$package_name]['description'] = $highest_version->getDescription(); + $available[$package_name]['url'] = $highest_version->getHomepage(); + $available[$package_name]['authors'] = $highest_version->getAuthors(); } else { - $available[$name]['description'] = ''; - $available[$name]['url'] = ''; - $available[$name]['authors'] = []; + $available[$package_name]['description'] = ''; + $available[$package_name]['url'] = ''; + $available[$package_name]['authors'] = []; } } From 30b69b6403476a4b7731d5947a2a95357d5288fe Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 13 Sep 2025 21:39:27 -0700 Subject: [PATCH 0871/1214] [ticket/17541] Ensure highest compat. ver. ext is installed PHPBB-17541 --- phpBB/phpbb/composer/installer.php | 141 +++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index d848c8b9afc..993519dd5e2 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -587,8 +587,149 @@ protected function generate_ext_json_file(array $packages) $lockFile->write([]); } + // First pass write: base file with requested packages as provided $json_file->write($ext_json_data); $this->ext_json_file_backup = $ext_json_file_backup; + + // Second pass: resolve and pin the highest compatible versions for unconstrained requested packages + try + { + // Build a list of requested packages without explicit constraints + $unconstrained = []; + foreach ($packages as $name => $constraint) + { + // The $packages array can be either ['vendor/package' => '^1.2'] or ['vendor/package'] (numeric keys). + if (is_int($name)) + { + // Numeric key means just a name + $pkgName = $constraint; + $unconstrained[$pkgName] = true; + } + else + { + // If constraint is empty or '*' treat as unconstrained + if ($constraint === '' || $constraint === '*' || $constraint === null) + { + $unconstrained[$name] = true; + } + } + } + + if (!empty($unconstrained)) + { + // Load composer on the just-written file so repositories and core constraints are available + $extComposer = $this->get_composer($this->get_composer_ext_json_filename()); + + /** @var ConstraintInterface $core_constraint */ + $core_constraint = $extComposer->getPackage()->getRequires()['phpbb/phpbb']->getConstraint(); + $core_stability = $extComposer->getPackage()->getMinimumStability(); + + // Resolve highest compatible versions for each unconstrained package + $pins = $this->resolve_highest_versions(array_keys($unconstrained), $extComposer, $core_constraint, $core_stability); + + if (!empty($pins)) + { + // Merge pins into require section, overwriting unconstrained entries + foreach ($pins as $pkg => $version) + { + $ext_json_data['require'][$pkg] = $version; + } + + // Rewrite composer-ext.json with pinned versions + $json_file->write($ext_json_data); + } + } + } + catch (\Exception $e) + { + // If resolution fails for any reason, keep the first-pass file intact (Composer will still resolve). + // Intentionally swallow to avoid breaking installation flow. + } + } + + /** + * Resolve the highest compatible versions for the given package names + * based on repositories and phpBB/PHP constraints from the provided Composer instance. + * + * @param array $packageNames list of package names to resolve + * @param Composer|PartialComposer $composer Composer instance configured with repositories + * @param ConstraintInterface $core_constraint phpBB version constraint + * @param string $core_stability minimum stability + * @return array [packageName => prettyVersion] + */ + private function resolve_highest_versions(array $packageNames, $composer, ConstraintInterface $core_constraint, $core_stability): array + { + $io = new NullIO(); + + $compatible_packages = []; + $repositories = $composer->getRepositoryManager()->getRepositories(); + + foreach ($repositories as $repository) + { + try + { + if ($repository instanceof ComposerRepository) + { + foreach ($packageNames as $name) + { + $versions = $repository->findPackages($name); + if (!empty($versions)) + { + $compatible_packages = $this->get_compatible_versions($compatible_packages, $core_constraint, $core_stability, $name, $versions); + } + } + } + else + { + // Preload and filter by name for non-composer repositories + $byName = []; + foreach ($repository->getPackages() as $pkg) + { + $n = $pkg->getName(); + if (in_array($n, $packageNames, true)) + { + $byName[$n][] = $pkg; + } + } + + foreach ($byName as $name => $versions) + { + $compatible_packages = $this->get_compatible_versions($compatible_packages, $core_constraint, $core_stability, $name, $versions); + } + } + } + catch (\Exception $e) + { + continue; + } + } + + $pins = []; + foreach ($packageNames as $name) + { + if (empty($compatible_packages[$name])) + { + continue; + } + + $package_versions = $compatible_packages[$name]; + + // Sort descending by normalized version + usort($package_versions, function ($a, $b) { + return version_compare($b->getVersion(), $a->getVersion()); + }); + + $highest = $package_versions[0]; + if ($highest instanceof CompleteAliasPackage) + { + $highest = $highest->getAliasOf(); + } + + // Pin to the resolved highest compatible version using its pretty version + $pins[$name] = $highest->getPrettyVersion(); + } + + return $pins; } /** From 17670ed48f84e66650212233d6925e45e06ebc8f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Sep 2025 14:12:26 +0200 Subject: [PATCH 0872/1214] [ticket/17540] Change handling of rename_index array PHPBB-17540 --- .../db/migration/data/v400/rename_duplicated_index_names.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php b/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php index f2d8107a9b3..3df6feee19e 100644 --- a/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php +++ b/phpBB/phpbb/db/migration/data/v400/rename_duplicated_index_names.php @@ -27,7 +27,7 @@ class rename_duplicated_index_names extends migration /** * @var array */ - protected static $rename_index = []; + protected static $rename_index; public static function depends_on() { @@ -72,7 +72,7 @@ public function update_schema() } return [ - 'rename_index' => self::$rename_index, + 'rename_index' => self::$rename_index ?? [], ]; } From 5b4afdfedc409a38d6dc072b1a8c1f134089799c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Sep 2025 14:13:28 +0200 Subject: [PATCH 0873/1214] [ticket/17540] Use standard John Doe token PHPBB-17540 --- tests/functions/fixtures/user_delete.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functions/fixtures/user_delete.xml b/tests/functions/fixtures/user_delete.xml index 4c4479d29bd..65df5616be5 100644 --- a/tests/functions/fixtures/user_delete.xml +++ b/tests/functions/fixtures/user_delete.xml @@ -40,7 +40,7 @@ 2 897a897b797c8789997d7979879 auth.provider.oauth.service.google - {"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJSUzI1NiIsImupZCI6IjE0YuRjNzc2MDQwYjUyNDZmNTI5OWFkZDVlMmQ1NWNOPTdjMDdlZTAifQ.eyJpc3MiOiJhY2NvdW90cy5nb78nbGUuY29tIiwic3ViIjoiMTExMDMwNwerNjM4MTM5NTQwMTM1IiwiYXpwIjoiOTk3MzUwMTY0NzE0LWhwOXJrYjZpcjM4MW80YjV1NjRpaGtmM29zMnRvbWxhLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwiZW1haWwiOiJtYXJjLmFsZXhhbmRlci4zN0BnbWFpbC5jb20iLCJhdF9oYXNoIjoiWHk2b1JabnVZUWRfRTZDeDV0RkItdyIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJhdWQiOiI5OTczNTAxNjQ3MTQtaHA5cmtiNmlyMzgxbzRiNXU2NGloa2Yzb3MydG9tbGEuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJpYXQiOjE0Mjk5NTYwNzEsImV4cCI6MTQyOTk1OTY3MX0.C5gfSzjqwlRRvVMuTP6jfWIuEHMXn55oYHsSA3eh97n2BZL0TZHhUm4K206Fgucd6ufAphan4l0J7y6tMAHLZPr-kk6KDINxWnPG-up99reblGutay0lRYjMCcrhJAOql8EI1bi84GyliZFYHL67pE0ZtSf-CMb1CeH18TFe-Fk"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"} + {"accessToken":"ya29.YPHwCWVkrvwu1kgbYKiDNYaQ451ZuHy9OEQAGVME8if-WBzR-v7a9ftxbx41kaL)5VLEXB-6qJEvri","endOfLife":1429959670,"extraParams":{"token_type":"Bearer","id_token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.KMUFsIDTnFmyG3nMiGM6H9FNFUROf3wh7SmqJp-QV30"},"refreshToken":null,"token_class":"OAuth\\\\OAuth2\\\\Token\\\\StdOAuth2Token"} From cd40a0594e9fcb009f7dd6dd4873be06b805f58d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Sep 2025 15:29:12 +0200 Subject: [PATCH 0874/1214] [ticket/17540] Fix some small warnings PHPBB-17540 --- tests/console/thumbnail_test.php | 20 +++++++++++++++----- tests/lint_test.php | 8 ++++---- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/tests/console/thumbnail_test.php b/tests/console/thumbnail_test.php index aa5e72bb824..68d46517572 100644 --- a/tests/console/thumbnail_test.php +++ b/tests/console/thumbnail_test.php @@ -97,11 +97,21 @@ protected function tearDown(): void { parent::tearDown(); - unlink($this->phpbb_root_path . 'files/test_png_1'); - unlink($this->phpbb_root_path . 'files/test_png_2'); - unlink($this->phpbb_root_path . 'files/test_txt'); - unlink($this->phpbb_root_path . 'files/thumb_test_png_1'); - unlink($this->phpbb_root_path . 'files/thumb_test_png_2'); + $delete_files = [ + $this->phpbb_root_path . 'files/test_png_1', + $this->phpbb_root_path . 'files/test_png_2', + $this->phpbb_root_path . 'files/test_txt', + $this->phpbb_root_path . 'files/thumb_test_png_1', + $this->phpbb_root_path . 'files/thumb_test_png_2' + ]; + + foreach ($delete_files as $file) + { + if (file_exists($file)) + { + unlink($file); + } + } } public function test_thumbnails() diff --git a/tests/lint_test.php b/tests/lint_test.php index 55fc3941704..e7904f9c837 100644 --- a/tests/lint_test.php +++ b/tests/lint_test.php @@ -52,12 +52,12 @@ public function test_lint($path) $this->assertEquals(0, $status, "PHP lint failed for $path:\n$output"); } - public function lint_data() + public static function lint_data(): array { - return $this->check(__DIR__ . '/..'); + return self::check(__DIR__ . '/..'); } - protected function check($root) + protected static function check($root): array { $files = array(); $dh = opendir($root); @@ -92,7 +92,7 @@ protected function check($root) __DIR__ . '/../node_modules', ))) { - $files = array_merge($files, $this->check($path)); + $files = array_merge($files, self::check($path)); } else if (substr($filename, strlen($filename)-4) == '.php') { From 1590efe52ef35e4ad71190315208f23b186244cc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Sep 2025 18:49:17 +0200 Subject: [PATCH 0875/1214] [ticket/17540] Try tests against PHP 8.5 PHPBB-17540 --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 79dcc272770..4a021cd1b44 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -145,6 +145,10 @@ jobs: db: "mysql:8.0" - php: '8.4' db: "mariadb:10.3" + - php: '8.5' + db: "mysql:8.0" + - php: '8.5' + db: "mariadb:10.3" name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }} @@ -286,6 +290,8 @@ jobs: db: "postgres:9.5" - php: '8.4' db: "postgres:9.5" + - php: '8.5' + db: "postgres:9.5" name: PHP ${{ matrix.php }} - ${{ matrix.db }} From 20aa99937b880c183732016f4790dfec4f5e7b89 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 10 Jun 2025 10:16:02 +0700 Subject: [PATCH 0876/1214] [ticket/17524] Add possibility to use index key length in migrations PHPBB-17524 --- phpBB/phpbb/db/tools/doctrine.php | 50 ++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 14 deletions(-) diff --git a/phpBB/phpbb/db/tools/doctrine.php b/phpBB/phpbb/db/tools/doctrine.php index 87628d440ea..ae734c41a5e 100644 --- a/phpBB/phpbb/db/tools/doctrine.php +++ b/phpBB/phpbb/db/tools/doctrine.php @@ -655,24 +655,16 @@ protected function schema_create_table(Schema $schema, string $table_name, array $columns = (is_array($key_data[1])) ? $key_data[1] : [$key_data[1]]; $key_name = !str_starts_with($key_name, $short_table_name) ? self::add_prefix($key_name, $short_table_name) : $key_name; - // Supports key columns defined with there length - $columns = array_map(function (string $column) - { - if (strpos($column, ':') !== false) - { - $parts = explode(':', $column, 2); - return $parts[0]; - } - return $column; - }, $columns); + $options = []; + $this->schema_get_index_key_data($columns, $options); if ($key_data[0] === 'UNIQUE') { - $table->addUniqueIndex($columns, $key_name); + $table->addUniqueIndex($columns, $key_name, $options); } else { - $table->addIndex($columns, $key_name); + $table->addIndex($columns, $key_name, [], $options); } } } @@ -869,7 +861,10 @@ protected function schema_create_index(Schema $schema, string $table_name, strin return; } - $table->addIndex($columns, $index_name); + $options = []; + $this->schema_get_index_key_data($columns, $options); + + $table->addIndex($columns, $index_name, [], $options); } /** @@ -925,7 +920,10 @@ protected function schema_create_unique_index(Schema $schema, string $table_name return; } - $table->addUniqueIndex($columns, $index_name); + $options = []; + $this->schema_get_index_key_data($columns, $options); + + $table->addUniqueIndex($columns, $index_name, $options); } /** @@ -974,6 +972,30 @@ protected function schema_create_primary_key(Schema $schema, string $table_name, $table->setPrimaryKey($columns); } + /** + * Checks if index data contains key length + * and put it into $options['lengths'] array. + * Handles key length in formats of 'keyname:123' or 'keyname(123)' + * + * @param array $columns + * @param array $options + */ + protected function schema_get_index_key_data(array &$columns, array &$options): void + { + if (!empty($columns)) + { + $columns = array_map(function (string $column) use (&$options) + { + if (preg_match('/^([a-zA-Z0-9_]+)(?:(?:\:|\()([0-9]{1,3})\)?)?$/', $column, $parts)) + { + $options['lengths'][] = $parts[2] ?? null; + return $parts[1]; + } + return $column; + }, $columns); + } + } + /** * Recreate an index of a table * From 73cb930dcd3b92e1fd6ce586777e9024491a8a72 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 10 Jun 2025 11:31:48 +0700 Subject: [PATCH 0877/1214] [ticket/17524] Add index data getter to db tools PHPBB-17524 --- phpBB/phpbb/db/tools/doctrine.php | 40 +++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/tools/doctrine.php b/phpBB/phpbb/db/tools/doctrine.php index ae734c41a5e..f26bcf92089 100644 --- a/phpBB/phpbb/db/tools/doctrine.php +++ b/phpBB/phpbb/db/tools/doctrine.php @@ -405,6 +405,42 @@ public static function remove_prefix(string $name, string $prefix = ''): string return $prefix && str_starts_with($name, $prefix) ? substr($name, strlen($prefix)) : $name; } + /** + * Returns an array of the table index names and relevant data in format + * [ + * [$index_name] = [ + * 'columns' => (array) $index_columns, + * 'flags' => (array) $index_flags, + * 'options' => (array) $index_options, + * 'is_primary'=> (bool) $isPrimary, + * 'is_unique' => (bool) $isUnique, + * 'is_simple' => (bool) $isSimple, + * ] + * + * @param string $table_name + * + * @return array + */ + public function sql_get_table_index_data(string $table_name): array + { + $schema = $this->get_schema(); + $table = $schema->getTable($table_name); + $indexes = []; + foreach ($table->getIndexes() as $index) + { + $indexes[$index->getName()] = [ + 'columns' => array_map('strtolower', $index->getUnquotedColumns()), + 'flags' => $index->getFlags(), + 'options' => $index->getOptions(), + 'is_primary'=> $index->isPrimary(), + 'is_unique' => $index->isUnique(), + 'is_simple' => $index->isSimpleIndex(), + ]; + } + + return $indexes; + } + /** * Returns an array of indices for either unique and primary keys, or simple indices. * @@ -992,8 +1028,8 @@ protected function schema_get_index_key_data(array &$columns, array &$options): return $parts[1]; } return $column; - }, $columns); - } + }, $columns); + } } /** From 1adb04179611ec85f8eb13db3ba0dffdadc8015c Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 10 Jun 2025 13:55:48 +0700 Subject: [PATCH 0878/1214] [ticket/17524] Add index migrator tests PHPBB-17524 --- tests/dbal/migration/schema.php | 20 ++++++++++---- tests/dbal/migrator_test.php | 48 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/tests/dbal/migration/schema.php b/tests/dbal/migration/schema.php index 38663bcc16b..d91ed6a3160 100644 --- a/tests/dbal/migration/schema.php +++ b/tests/dbal/migration/schema.php @@ -22,12 +22,22 @@ function update_schema() ), ), 'add_tables' => array( - $this->table_prefix . 'foobar' => array( - 'COLUMNS' => array( - 'module_id' => array('UINT:3', NULL, 'auto_increment'), - ), + $this->table_prefix . 'foobar' => [ + 'COLUMNS' => [ + 'module_id' => ['UINT:3', NULL, 'auto_increment'], + 'user_id' => ['ULINT', 0], + 'endpoint' => ['TEXT', ''], + 'expiration_time' => ['TIMESTAMP', 0], + 'p256dh' => ['VCHAR', ''], + 'auth' => ['VCHAR:100', ''], + ], 'PRIMARY_KEY' => 'module_id', - ), + 'KEYS' => [ + 'i_simple' => ['INDEX', ['user_id', 'endpoint:191']], + 'i_uniq' => ['UNIQUE', ['expiration_time', 'p256dh(100)']], + 'i_auth' => ['INDEX', 'auth'], + ], + ], ), ); } diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 284c52a07cc..89517f5dbea 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -413,6 +413,54 @@ public function test_schema() $this->assertTrue($this->db_tools->sql_column_exists('phpbb_config', 'test_column1')); $this->assertTrue($this->db_tools->sql_table_exists('phpbb_foobar')); + $index_data_row = $this->db_tools->sql_get_table_index_data('phpbb_foobar'); + $is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Index length only applies to MySQL indexes + $is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']); // MSSQL primary index key has 'clustered' flag + foreach ($index_data_row as $index_name => $index_data) + { + switch ($index_name) + { + case 'i_simple': + $this->assertEquals(['user_id', 'endpoint'], $index_data['columns']); + $this->assertEmpty($index_data['flags']); + $this->assertFalse($index_data['is_primary']); + $this->assertFalse($index_data['is_unique']); + $this->assertTrue($index_data['is_simple']); + $this->assertEquals(2, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + $this->assertEquals($is_mysql ? 191 : null, $index_data['options']['lengths'][1]); + break; + case 'i_uniq': + $this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']); + $this->assertEmpty($index_data['flags']); + $this->assertFalse($index_data['is_primary']); + $this->assertTrue($index_data['is_unique']); + $this->assertFalse($index_data['is_simple']); + $this->assertEquals(2, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + $this->assertEquals($is_mysql ? 100 : null, $index_data['options']['lengths'][1]); + break; + case 'i_auth': + $this->assertEquals(['auth'], $index_data['columns']); + $this->assertEmpty($index_data['flags']); + $this->assertFalse($index_data['is_primary']); + $this->assertFalse($index_data['is_unique']); + $this->assertTrue($index_data['is_simple']); + $this->assertEquals(1, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + break; + default: // Primary key + $this->assertEquals(['module_id'], $index_data['columns']); + $this->assertEquals($is_mssql ? ['clustered'] : [], $index_data['flags']); + $this->assertTrue($index_data['is_primary']); + $this->assertTrue($index_data['is_unique']); + $this->assertFalse($index_data['is_simple']); + $this->assertEquals(1, count($index_data['options']['lengths'])); + $this->assertEmpty($index_data['options']['lengths'][0]); + break; + } + } + while ($this->migrator->migration_state('phpbb_dbal_migration_schema')) { $this->migrator->revert('phpbb_dbal_migration_schema'); From e6ffd0c7246aea0b6630f2b153355ccc1214ad09 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 11 Jun 2025 21:04:56 +0700 Subject: [PATCH 0879/1214] [ticket/17524] Add test assertions PHPBB-17524 --- tests/dbal/migrator_test.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 89517f5dbea..49620c703ab 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -414,7 +414,12 @@ public function test_schema() $this->assertTrue($this->db_tools->sql_table_exists('phpbb_foobar')); $index_data_row = $this->db_tools->sql_get_table_index_data('phpbb_foobar'); - $is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Index length only applies to MySQL indexes + $this->assertEquals(4, count($index_data_row)); + $this->assertTrue(isset($index_data_row['i_simple'])); + $this->assertTrue(isset($index_data_row['i_uniq'])); + $this->assertTrue(isset($index_data_row['i_auth'])); + + $is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Key 'lengths' option only applies to MySQL indexes $is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']); // MSSQL primary index key has 'clustered' flag foreach ($index_data_row as $index_name => $index_data) { From c3022e718a6259b8cd11aca2a2fe4b7e60424d3b Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 12 Jun 2025 01:16:25 +0700 Subject: [PATCH 0880/1214] [ticket/17524] Try not to hit MSSQL index key length limitations 900 bytes for a clustered index. 1,700 bytes for a nonclustered index. For SQL Server 2014 (12.x) and earlier, all versions supported 900 bytes for all index types. PHPBB-17524 --- tests/dbal/migration/schema.php | 4 ++-- tests/dbal/migrator_test.php | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/dbal/migration/schema.php b/tests/dbal/migration/schema.php index d91ed6a3160..04c20c46cb5 100644 --- a/tests/dbal/migration/schema.php +++ b/tests/dbal/migration/schema.php @@ -26,9 +26,9 @@ function update_schema() 'COLUMNS' => [ 'module_id' => ['UINT:3', NULL, 'auto_increment'], 'user_id' => ['ULINT', 0], - 'endpoint' => ['TEXT', ''], + 'endpoint' => ['VCHAR:220', ''], 'expiration_time' => ['TIMESTAMP', 0], - 'p256dh' => ['VCHAR', ''], + 'p256dh' => ['VCHAR:200', ''], 'auth' => ['VCHAR:100', ''], ], 'PRIMARY_KEY' => 'module_id', diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index 49620c703ab..d72abd6b9f3 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -420,14 +420,16 @@ public function test_schema() $this->assertTrue(isset($index_data_row['i_auth'])); $is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Key 'lengths' option only applies to MySQL indexes - $is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']); // MSSQL primary index key has 'clustered' flag + // MSSQL primary index key has 'clustered' flag, 'nonclustered' otherwise + // See https://learn.microsoft.com/en-us/sql/relational-databases/indexes/clustered-and-nonclustered-indexes-described?view=sql-server-ver17#indexes-and-constraints + $is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']); foreach ($index_data_row as $index_name => $index_data) { switch ($index_name) { case 'i_simple': $this->assertEquals(['user_id', 'endpoint'], $index_data['columns']); - $this->assertEmpty($index_data['flags']); + $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); $this->assertFalse($index_data['is_primary']); $this->assertFalse($index_data['is_unique']); $this->assertTrue($index_data['is_simple']); @@ -437,7 +439,7 @@ public function test_schema() break; case 'i_uniq': $this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']); - $this->assertEmpty($index_data['flags']); + $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); $this->assertFalse($index_data['is_primary']); $this->assertTrue($index_data['is_unique']); $this->assertFalse($index_data['is_simple']); @@ -447,7 +449,7 @@ public function test_schema() break; case 'i_auth': $this->assertEquals(['auth'], $index_data['columns']); - $this->assertEmpty($index_data['flags']); + $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); $this->assertFalse($index_data['is_primary']); $this->assertFalse($index_data['is_unique']); $this->assertTrue($index_data['is_simple']); From 29c3a71019591438dfb6f37add3422aa61bddbec Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 6 Jul 2025 09:00:39 +0700 Subject: [PATCH 0881/1214] [ticket/17524] Fix tests PHPBB-17524 --- tests/dbal/migrator_test.php | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/tests/dbal/migrator_test.php b/tests/dbal/migrator_test.php index d72abd6b9f3..89e158541a9 100644 --- a/tests/dbal/migrator_test.php +++ b/tests/dbal/migrator_test.php @@ -47,6 +47,9 @@ class phpbb_dbal_migrator_test extends phpbb_database_test_case /** @var \phpbb\extension\manager */ protected $extension_manager; + /** @var string */ + protected $table_prefix; + public function getDataSet() { return $this->createXMLDataSet(__DIR__.'/fixtures/migrator.xml'); @@ -58,11 +61,12 @@ protected function setUp(): void parent::setUp(); + $this->table_prefix = $table_prefix; $this->db = $this->new_dbal(); $this->doctrine_db = $this->new_doctrine_dbal(); $factory = new \phpbb\db\tools\factory(); $this->db_tools = $factory->get($this->doctrine_db); - $this->db_tools->set_table_prefix($table_prefix); + $this->db_tools->set_table_prefix($this->table_prefix); $this->config = new \phpbb\config\db($this->db, new phpbb_mock_cache, 'phpbb_config'); @@ -413,21 +417,24 @@ public function test_schema() $this->assertTrue($this->db_tools->sql_column_exists('phpbb_config', 'test_column1')); $this->assertTrue($this->db_tools->sql_table_exists('phpbb_foobar')); + $short_table_name = \phpbb\db\doctrine\table_helper::generate_shortname('foobar'); $index_data_row = $this->db_tools->sql_get_table_index_data('phpbb_foobar'); $this->assertEquals(4, count($index_data_row)); - $this->assertTrue(isset($index_data_row['i_simple'])); - $this->assertTrue(isset($index_data_row['i_uniq'])); - $this->assertTrue(isset($index_data_row['i_auth'])); + $this->assertTrue(isset($index_data_row[$short_table_name . '_i_simple'])); + $this->assertTrue(isset($index_data_row[$short_table_name . '_i_uniq'])); + $this->assertTrue(isset($index_data_row[$short_table_name . '_i_auth'])); $is_mysql = $this->db->get_sql_layer() === 'mysqli'; // Key 'lengths' option only applies to MySQL indexes + // MSSQL primary index key has 'clustered' flag, 'nonclustered' otherwise // See https://learn.microsoft.com/en-us/sql/relational-databases/indexes/clustered-and-nonclustered-indexes-described?view=sql-server-ver17#indexes-and-constraints $is_mssql = in_array($this->db->get_sql_layer(), ['mssqlnative', 'mssql_odbc']); + foreach ($index_data_row as $index_name => $index_data) { switch ($index_name) { - case 'i_simple': + case $short_table_name . '_i_simple': $this->assertEquals(['user_id', 'endpoint'], $index_data['columns']); $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); $this->assertFalse($index_data['is_primary']); @@ -437,7 +444,7 @@ public function test_schema() $this->assertEmpty($index_data['options']['lengths'][0]); $this->assertEquals($is_mysql ? 191 : null, $index_data['options']['lengths'][1]); break; - case 'i_uniq': + case $short_table_name . '_i_uniq': $this->assertEquals(['expiration_time', 'p256dh'], $index_data['columns']); $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); $this->assertFalse($index_data['is_primary']); @@ -447,7 +454,7 @@ public function test_schema() $this->assertEmpty($index_data['options']['lengths'][0]); $this->assertEquals($is_mysql ? 100 : null, $index_data['options']['lengths'][1]); break; - case 'i_auth': + case $short_table_name . '_i_auth': $this->assertEquals(['auth'], $index_data['columns']); $this->assertEquals($is_mssql ? ['nonclustered'] : [], $index_data['flags']); $this->assertFalse($index_data['is_primary']); From 07d75791be0b5440e83ad4bf9f6b00beac505a77 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 15 Sep 2025 17:49:32 -0700 Subject: [PATCH 0882/1214] [ticket/17542] Mock event dispatcher override early exits PHPBB-17542 --- tests/mock/event_dispatcher.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php index fa8b4a10363..654a08d7f16 100644 --- a/tests/mock/event_dispatcher.php +++ b/tests/mock/event_dispatcher.php @@ -22,8 +22,20 @@ public function __construct() { } - public function trigger_event($eventName, $data = array()) + public function trigger_event($eventName, $data = array()): array { - return array(); + // Ensure tests never hard-exit when phpBB calls exit_handler() + if ($eventName === 'core.exit_handler') + { + // Set the override flag so exit_handler() returns instead of exit; + if (is_array($data)) + { + $data['exit_handler_override'] = true; + } + return (array) $data; + } + + // Default behaviour of the mock: return the input data unchanged + return (array) $data; } } From 5336d51f54077e480fa55712d2beef353e1779cf Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 16 Sep 2025 22:12:22 +0700 Subject: [PATCH 0883/1214] [ticket/17543] Update composer and dependencies Update composer.phar and dependencies for better support of upcoming PHP 8.5. PHPBB-17543 --- composer.phar | Bin 3114082 -> 3124368 bytes phpBB/composer.lock | 1155 ++++++++++++++++++++++--------------------- 2 files changed, 603 insertions(+), 552 deletions(-) diff --git a/composer.phar b/composer.phar index 7a3bef9dffd8d0fe6e29b47fd521e51891cc0312..ee830d113df2a40cd7fcbd49966711d4aa4276bb 100755 GIT binary patch delta 28500 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.2,<2.4" - }, - "require-dev": { - "cache/integration-tests": "dev-master", - "doctrine/coding-standard": "^9", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "psr/cache": "^1.0 || ^2.0 || ^3.0", - "symfony/cache": "^4.4 || ^5.4 || ^6", - "symfony/var-exporter": "^4.4 || ^5.4 || ^6" - }, - "type": "library", - "autoload": { - "psr-4": { - "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "PHP Doctrine Cache library is a popular cache implementation that supports many different drivers such as redis, memcache, apc, mongodb and others.", - "homepage": "https://www.doctrine-project.org/projects/cache.html", - "keywords": [ - "abstraction", - "apcu", - "cache", - "caching", - "couchdb", - "memcached", - "php", - "redis", - "xcache" - ], - "support": { - "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/2.2.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", - "type": "tidelift" - } - ], - "time": "2022-05-20T20:07:39+00:00" - }, { "name": "doctrine/dbal", - "version": "3.9.4", + "version": "3.10.2", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "ec16c82f20be1a7224e65ac67144a29199f87959" + "reference": "c6c16cf787eaba3112203dfcd715fa2059c62282" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959", - "reference": "ec16c82f20be1a7224e65ac67144a29199f87959", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/c6c16cf787eaba3112203dfcd715fa2059c62282", + "reference": "c6c16cf787eaba3112203dfcd715fa2059c62282", "shasum": "" }, "require": { "composer-runtime-api": "^2", - "doctrine/cache": "^1.11|^2.0", "doctrine/deprecations": "^0.5.3|^1", "doctrine/event-manager": "^1|^2", "php": "^7.4 || ^8.0", "psr/cache": "^1|^2|^3", "psr/log": "^1|^2|^3" }, + "conflict": { + "doctrine/cache": "< 1.11" + }, "require-dev": { - "doctrine/coding-standard": "12.0.0", + "doctrine/cache": "^1.11|^2.0", + "doctrine/coding-standard": "13.0.1", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "2.1.1", + "phpstan/phpstan": "2.1.22", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "9.6.22", - "slevomat/coding-standard": "8.13.1", - "squizlabs/php_codesniffer": "3.10.2", + "phpunit/phpunit": "9.6.23", + "slevomat/coding-standard": "8.16.2", + "squizlabs/php_codesniffer": "3.13.1", "symfony/cache": "^5.4|^6.0|^7.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0" }, @@ -1214,7 +1108,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.9.4" + "source": "https://github.com/doctrine/dbal/tree/3.10.2" }, "funding": [ { @@ -1230,7 +1124,7 @@ "type": "tidelift" } ], - "time": "2025-01-16T08:28:55+00:00" + "time": "2025-09-04T23:51:27+00:00" }, { "name": "doctrine/deprecations", @@ -1282,30 +1176,29 @@ }, { "name": "doctrine/event-manager", - "version": "1.2.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520" + "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/95aa4cb529f1e96576f3fda9f5705ada4056a520", - "reference": "95aa4cb529f1e96576f3fda9f5705ada4056a520", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e", + "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e", "shasum": "" }, "require": { - "doctrine/deprecations": "^0.5.3 || ^1", - "php": "^7.1 || ^8.0" + "php": "^8.1" }, "conflict": { "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^10", - "phpstan/phpstan": "~1.4.10 || ^1.8.8", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5", - "vimeo/psalm": "^4.24" + "doctrine/coding-standard": "^12", + "phpstan/phpstan": "^1.8.8", + "phpunit/phpunit": "^10.5", + "vimeo/psalm": "^5.24" }, "type": "library", "autoload": { @@ -1354,7 +1247,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.2.0" + "source": "https://github.com/doctrine/event-manager/tree/2.0.1" }, "funding": [ { @@ -1370,7 +1263,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T20:51:15+00:00" + "time": "2024-05-22T20:47:39+00:00" }, { "name": "doctrine/lexer", @@ -1600,16 +1493,16 @@ }, { "name": "google/recaptcha", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/google/recaptcha.git", - "reference": "d59a801e98a4e9174814a6d71bbc268dff1202df" + "reference": "56522c261d2e8c58ba416c90f81a4cd9f2ed89b9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/google/recaptcha/zipball/d59a801e98a4e9174814a6d71bbc268dff1202df", - "reference": "d59a801e98a4e9174814a6d71bbc268dff1202df", + "url": "https://api.github.com/repos/google/recaptcha/zipball/56522c261d2e8c58ba416c90f81a4cd9f2ed89b9", + "reference": "56522c261d2e8c58ba416c90f81a4cd9f2ed89b9", "shasum": "" }, "require": { @@ -1648,26 +1541,26 @@ "issues": "https://github.com/google/recaptcha/issues", "source": "https://github.com/google/recaptcha" }, - "time": "2023-02-18T17:41:46+00:00" + "time": "2025-06-26T22:21:57+00:00" }, { "name": "guzzlehttp/guzzle", - "version": "7.9.3", + "version": "7.10.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77" + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", - "reference": "7b2f29fe81dc4da0ca0ea7d42107a0845946ea77", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", + "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5.3 || ^2.0.3", - "guzzlehttp/psr7": "^2.7.0", + "guzzlehttp/promises": "^2.3", + "guzzlehttp/psr7": "^2.8", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", "symfony/deprecation-contracts": "^2.2 || ^3.0" @@ -1758,7 +1651,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.9.3" + "source": "https://github.com/guzzle/guzzle/tree/7.10.0" }, "funding": [ { @@ -1774,20 +1667,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T13:37:11+00:00" + "time": "2025-08-23T22:36:01+00:00" }, { "name": "guzzlehttp/promises", - "version": "2.2.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c" + "reference": "481557b130ef3790cf82b713667b43030dc9c957" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/7c69f28996b0a6920945dd20b3857e499d9ca96c", - "reference": "7c69f28996b0a6920945dd20b3857e499d9ca96c", + "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957", + "reference": "481557b130ef3790cf82b713667b43030dc9c957", "shasum": "" }, "require": { @@ -1795,7 +1688,7 @@ }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "type": "library", "extra": { @@ -1841,7 +1734,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.2.0" + "source": "https://github.com/guzzle/promises/tree/2.3.0" }, "funding": [ { @@ -1857,20 +1750,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T13:27:01+00:00" + "time": "2025-08-22T14:34:08+00:00" }, { "name": "guzzlehttp/psr7", - "version": "2.7.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { @@ -1886,7 +1779,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -1957,7 +1850,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.1" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -1973,20 +1866,20 @@ "type": "tidelift" } ], - "time": "2025-03-27T12:30:47+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "justinrainbow/json-schema", - "version": "6.4.1", + "version": "6.5.2", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "35d262c94959571e8736db1e5c9bc36ab94ae900" + "reference": "ac0d369c09653cf7af561f6d91a705bc617a87b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/35d262c94959571e8736db1e5c9bc36ab94ae900", - "reference": "35d262c94959571e8736db1e5c9bc36ab94ae900", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/ac0d369c09653cf7af561f6d91a705bc617a87b8", + "reference": "ac0d369c09653cf7af561f6d91a705bc617a87b8", "shasum": "" }, "require": { @@ -1996,7 +1889,7 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "3.3.0", - "json-schema/json-schema-test-suite": "1.2.0", + "json-schema/json-schema-test-suite": "^23.2", "marc-mabe/php-enum-phpstan": "^2.0", "phpspec/prophecy": "^1.19", "phpstan/phpstan": "^1.12", @@ -2046,9 +1939,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.4.1" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.5.2" }, - "time": "2025-04-04T13:08:07+00:00" + "time": "2025-09-09T09:42:27+00:00" }, { "name": "laminas/laminas-code", @@ -2115,16 +2008,16 @@ }, { "name": "marc-mabe/php-enum", - "version": "v4.7.1", + "version": "v4.7.2", "source": { "type": "git", "url": "https://github.com/marc-mabe/php-enum.git", - "reference": "7159809e5cfa041dca28e61f7f7ae58063aae8ed" + "reference": "bb426fcdd65c60fb3638ef741e8782508fda7eef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marc-mabe/php-enum/zipball/7159809e5cfa041dca28e61f7f7ae58063aae8ed", - "reference": "7159809e5cfa041dca28e61f7f7ae58063aae8ed", + "url": "https://api.github.com/repos/marc-mabe/php-enum/zipball/bb426fcdd65c60fb3638ef741e8782508fda7eef", + "reference": "bb426fcdd65c60fb3638ef741e8782508fda7eef", "shasum": "" }, "require": { @@ -2182,9 +2075,9 @@ ], "support": { "issues": "https://github.com/marc-mabe/php-enum/issues", - "source": "https://github.com/marc-mabe/php-enum/tree/v4.7.1" + "source": "https://github.com/marc-mabe/php-enum/tree/v4.7.2" }, - "time": "2024-11-28T04:54:44+00:00" + "time": "2025-09-14T11:18:39+00:00" }, { "name": "marc1706/fast-image-size", @@ -2927,23 +2820,23 @@ }, { "name": "react/promise", - "version": "v3.2.0", + "version": "v3.3.0", "source": { "type": "git", "url": "https://github.com/reactphp/promise.git", - "reference": "8a164643313c71354582dc850b42b33fa12a4b63" + "reference": "23444f53a813a3296c1368bb104793ce8d88f04a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/reactphp/promise/zipball/8a164643313c71354582dc850b42b33fa12a4b63", - "reference": "8a164643313c71354582dc850b42b33fa12a4b63", + "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a", + "reference": "23444f53a813a3296c1368bb104793ce8d88f04a", "shasum": "" }, "require": { "php": ">=7.1.0" }, "require-dev": { - "phpstan/phpstan": "1.10.39 || 1.4.10", + "phpstan/phpstan": "1.12.28 || 1.4.10", "phpunit/phpunit": "^9.6 || ^7.5" }, "type": "library", @@ -2988,7 +2881,7 @@ ], "support": { "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v3.2.0" + "source": "https://github.com/reactphp/promise/tree/v3.3.0" }, "funding": [ { @@ -2996,7 +2889,7 @@ "type": "open_collective" } ], - "time": "2024-05-24T10:39:05+00:00" + "time": "2025-08-19T18:57:03+00:00" }, { "name": "s9e/regexp-builder", @@ -3088,16 +2981,16 @@ }, { "name": "s9e/text-formatter", - "version": "2.18.0", + "version": "2.19.0", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "4970711f25d94306b4835b723b9cc5010170ea37" + "reference": "d65a4f61cbe494937afb3150dc73b6e757d400d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/4970711f25d94306b4835b723b9cc5010170ea37", - "reference": "4970711f25d94306b4835b723b9cc5010170ea37", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/d65a4f61cbe494937afb3150dc73b6e757d400d3", + "reference": "d65a4f61cbe494937afb3150dc73b6e757d400d3", "shasum": "" }, "require": { @@ -3125,7 +3018,7 @@ }, "type": "library", "extra": { - "version": "2.18.0" + "version": "2.19.0" }, "autoload": { "psr-4": { @@ -3157,9 +3050,9 @@ ], "support": { "issues": "https://github.com/s9e/TextFormatter/issues", - "source": "https://github.com/s9e/TextFormatter/tree/2.18.0" + "source": "https://github.com/s9e/TextFormatter/tree/2.19.0" }, - "time": "2024-07-24T14:50:52+00:00" + "time": "2025-04-26T09:27:34+00:00" }, { "name": "seld/jsonlint", @@ -3401,20 +3294,20 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.2.2", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "5ac374c3e295c8b917208ff41b4d30f76668478c" + "reference": "eced5b5ce70518b983ff2be486e902bbd15135ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/5ac374c3e295c8b917208ff41b4d30f76668478c", - "reference": "5ac374c3e295c8b917208ff41b4d30f76668478c", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/eced5b5ce70518b983ff2be486e902bbd15135ae", + "reference": "eced5b5ce70518b983ff2be486e902bbd15135ae", "shasum": "" }, "require": { - "brick/math": "^0.10|^0.11|^0.12", + "brick/math": "^0.10|^0.11|^0.12|^0.13", "ext-mbstring": "*", "php": ">=8.1" }, @@ -3429,7 +3322,7 @@ "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", "phpstan/phpstan-phpunit": "^1.1|^2.0", "phpstan/phpstan-strict-rules": "^1.3|^2.0", - "phpunit/phpunit": "^10.1|^11.0", + "phpunit/phpunit": "^10.1|^11.0|^12.0", "rector/rector": "^1.0|^2.0", "roave/security-advisories": "dev-latest", "symfony/string": "^6.4|^7.0", @@ -3494,7 +3387,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.2.2" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.3.0" }, "funding": [ { @@ -3506,20 +3399,20 @@ "type": "patreon" } ], - "time": "2025-01-03T09:35:48+00:00" + "time": "2025-06-13T08:35:04+00:00" }, { "name": "symfony/config", - "version": "v6.4.14", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "4e55e7e4ffddd343671ea972216d4509f46c22ef" + "reference": "80e2cf005cf17138c97193be0434cdcfd1b2212e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/4e55e7e4ffddd343671ea972216d4509f46c22ef", - "reference": "4e55e7e4ffddd343671ea972216d4509f46c22ef", + "url": "https://api.github.com/repos/symfony/config/zipball/80e2cf005cf17138c97193be0434cdcfd1b2212e", + "reference": "80e2cf005cf17138c97193be0434cdcfd1b2212e", "shasum": "" }, "require": { @@ -3565,7 +3458,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v6.4.14" + "source": "https://github.com/symfony/config/tree/v6.4.24" }, "funding": [ { @@ -3576,25 +3469,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-04T11:33:53+00:00" + "time": "2025-07-26T13:50:30+00:00" }, { "name": "symfony/console", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36" + "reference": "273fd29ff30ba0a88ca5fb83f7cf1ab69306adae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/2e4af9c952617cc3f9559ff706aee420a8464c36", - "reference": "2e4af9c952617cc3f9559ff706aee420a8464c36", + "url": "https://api.github.com/repos/symfony/console/zipball/273fd29ff30ba0a88ca5fb83f7cf1ab69306adae", + "reference": "273fd29ff30ba0a88ca5fb83f7cf1ab69306adae", "shasum": "" }, "require": { @@ -3659,7 +3556,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v6.4.20" + "source": "https://github.com/symfony/console/tree/v6.4.25" }, "funding": [ { @@ -3670,25 +3567,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-03T17:16:38+00:00" + "time": "2025-08-22T10:21:53+00:00" }, { "name": "symfony/dependency-injection", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "c49796a9184a532843e78e50df9e55708b92543a" + "reference": "900da8a42eceeb4a13a0ec34caa7db49328daff3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/c49796a9184a532843e78e50df9e55708b92543a", - "reference": "c49796a9184a532843e78e50df9e55708b92543a", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/900da8a42eceeb4a13a0ec34caa7db49328daff3", + "reference": "900da8a42eceeb4a13a0ec34caa7db49328daff3", "shasum": "" }, "require": { @@ -3740,7 +3641,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v6.4.20" + "source": "https://github.com/symfony/dependency-injection/tree/v6.4.25" }, "funding": [ { @@ -3751,25 +3652,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-13T09:55:08+00:00" + "time": "2025-08-13T09:41:44+00:00" }, { "name": "symfony/deprecation-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6" + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", - "reference": "74c71c939a79f7d5bf3c1ce9f5ea37ba0114c6f6", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62", + "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62", "shasum": "" }, "require": { @@ -3782,7 +3687,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -3807,7 +3712,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0" }, "funding": [ { @@ -3823,20 +3728,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/error-handler", - "version": "v6.4.20", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "aa3bcf4f7674719df078e61cc8062e5b7f752031" + "reference": "30fd0b3cf0e972e82636038ce4db0e4fe777112c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/aa3bcf4f7674719df078e61cc8062e5b7f752031", - "reference": "aa3bcf4f7674719df078e61cc8062e5b7f752031", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/30fd0b3cf0e972e82636038ce4db0e4fe777112c", + "reference": "30fd0b3cf0e972e82636038ce4db0e4fe777112c", "shasum": "" }, "require": { @@ -3882,7 +3787,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v6.4.20" + "source": "https://github.com/symfony/error-handler/tree/v6.4.24" }, "funding": [ { @@ -3893,25 +3798,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-01T13:00:38+00:00" + "time": "2025-07-24T08:25:04+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v6.4.13", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e" + "reference": "b0cf3162020603587363f0551cd3be43958611ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", - "reference": "0ffc48080ab3e9132ea74ef4e09d8dcf26bf897e", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b0cf3162020603587363f0551cd3be43958611ff", + "reference": "b0cf3162020603587363f0551cd3be43958611ff", "shasum": "" }, "require": { @@ -3962,7 +3871,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.13" + "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.25" }, "funding": [ { @@ -3973,25 +3882,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-08-13T09:41:44+00:00" }, { "name": "symfony/event-dispatcher-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher-contracts.git", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f" + "reference": "59eb412e93815df44f05f342958efa9f46b1e586" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/7642f5e970b672283b7823222ae8ef8bbc160b9f", - "reference": "7642f5e970b672283b7823222ae8ef8bbc160b9f", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586", + "reference": "59eb412e93815df44f05f342958efa9f46b1e586", "shasum": "" }, "require": { @@ -4005,7 +3918,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -4038,7 +3951,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0" }, "funding": [ { @@ -4054,20 +3967,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-25T14:21:43+00:00" }, { "name": "symfony/filesystem", - "version": "v6.4.13", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3" + "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/4856c9cf585d5a0313d8d35afd681a526f038dd3", - "reference": "4856c9cf585d5a0313d8d35afd681a526f038dd3", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/75ae2edb7cdcc0c53766c30b0a2512b8df574bd8", + "reference": "75ae2edb7cdcc0c53766c30b0a2512b8df574bd8", "shasum": "" }, "require": { @@ -4104,7 +4017,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v6.4.13" + "source": "https://github.com/symfony/filesystem/tree/v6.4.24" }, "funding": [ { @@ -4115,25 +4028,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-10-25T15:07:50+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/finder", - "version": "v6.4.17", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7" + "reference": "73089124388c8510efb8d2d1689285d285937b08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", - "reference": "1d0e8266248c5d9ab6a87e3789e6dc482af3c9c7", + "url": "https://api.github.com/repos/symfony/finder/zipball/73089124388c8510efb8d2d1689285d285937b08", + "reference": "73089124388c8510efb8d2d1689285d285937b08", "shasum": "" }, "require": { @@ -4168,7 +4085,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v6.4.17" + "source": "https://github.com/symfony/finder/tree/v6.4.24" }, "funding": [ { @@ -4179,25 +4096,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-12-29T13:51:37+00:00" + "time": "2025-07-15T12:02:45+00:00" }, { "name": "symfony/http-client", - "version": "v6.4.19", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "3294a433fc9d12ae58128174896b5b1822c28dad" + "reference": "b8e9dce2d8acba3c32af467bb58e0c3656886181" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/3294a433fc9d12ae58128174896b5b1822c28dad", - "reference": "3294a433fc9d12ae58128174896b5b1822c28dad", + "url": "https://api.github.com/repos/symfony/http-client/zipball/b8e9dce2d8acba3c32af467bb58e0c3656886181", + "reference": "b8e9dce2d8acba3c32af467bb58e0c3656886181", "shasum": "" }, "require": { @@ -4205,6 +4126,7 @@ "psr/log": "^1|^2|^3", "symfony/deprecation-contracts": "^2.5|^3", "symfony/http-client-contracts": "~3.4.4|^3.5.2", + "symfony/polyfill-php83": "^1.29", "symfony/service-contracts": "^2.5|^3" }, "conflict": { @@ -4261,7 +4183,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v6.4.19" + "source": "https://github.com/symfony/http-client/tree/v6.4.25" }, "funding": [ { @@ -4272,25 +4194,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-13T09:55:13+00:00" + "time": "2025-08-27T07:01:16+00:00" }, { "name": "symfony/http-client-contracts", - "version": "v3.5.2", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client-contracts.git", - "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645" + "reference": "75d7043853a42837e68111812f4d964b01e5101c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ee8d807ab20fcb51267fdace50fbe3494c31e645", - "reference": "ee8d807ab20fcb51267fdace50fbe3494c31e645", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/75d7043853a42837e68111812f4d964b01e5101c", + "reference": "75d7043853a42837e68111812f4d964b01e5101c", "shasum": "" }, "require": { @@ -4303,7 +4229,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -4339,7 +4265,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v3.5.2" + "source": "https://github.com/symfony/http-client-contracts/tree/v3.6.0" }, "funding": [ { @@ -4355,20 +4281,20 @@ "type": "tidelift" } ], - "time": "2024-12-07T08:49:48+00:00" + "time": "2025-04-29T11:18:49+00:00" }, { "name": "symfony/http-foundation", - "version": "v6.4.18", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "d0492d6217e5ab48f51fca76f64cf8e78919d0db" + "reference": "6bc974c0035b643aa497c58d46d9e25185e4b272" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/d0492d6217e5ab48f51fca76f64cf8e78919d0db", - "reference": "d0492d6217e5ab48f51fca76f64cf8e78919d0db", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6bc974c0035b643aa497c58d46d9e25185e4b272", + "reference": "6bc974c0035b643aa497c58d46d9e25185e4b272", "shasum": "" }, "require": { @@ -4416,7 +4342,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v6.4.18" + "source": "https://github.com/symfony/http-foundation/tree/v6.4.25" }, "funding": [ { @@ -4427,25 +4353,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-09T15:48:56+00:00" + "time": "2025-08-20T06:48:20+00:00" }, { "name": "symfony/http-kernel", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "6be6db31bc74693ce5516e1fd5e5ff1171005e37" + "reference": "a0ee3cea5cabf4ed960fd2ef57668ceeacdb6e15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/6be6db31bc74693ce5516e1fd5e5ff1171005e37", - "reference": "6be6db31bc74693ce5516e1fd5e5ff1171005e37", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a0ee3cea5cabf4ed960fd2ef57668ceeacdb6e15", + "reference": "a0ee3cea5cabf4ed960fd2ef57668ceeacdb6e15", "shasum": "" }, "require": { @@ -4530,7 +4460,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v6.4.20" + "source": "https://github.com/symfony/http-kernel/tree/v6.4.25" }, "funding": [ { @@ -4541,25 +4471,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-28T13:27:10+00:00" + "time": "2025-08-29T07:55:45+00:00" }, { "name": "symfony/mailer", - "version": "v6.4.18", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "e93a6ae2767d7f7578c2b7961d9d8e27580b2b11" + "reference": "628b43b45a3e6b15c8a633fb22df547ed9b492a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/e93a6ae2767d7f7578c2b7961d9d8e27580b2b11", - "reference": "e93a6ae2767d7f7578c2b7961d9d8e27580b2b11", + "url": "https://api.github.com/repos/symfony/mailer/zipball/628b43b45a3e6b15c8a633fb22df547ed9b492a2", + "reference": "628b43b45a3e6b15c8a633fb22df547ed9b492a2", "shasum": "" }, "require": { @@ -4610,7 +4544,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v6.4.18" + "source": "https://github.com/symfony/mailer/tree/v6.4.25" }, "funding": [ { @@ -4621,25 +4555,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-24T15:27:15+00:00" + "time": "2025-08-13T09:41:44+00:00" }, { "name": "symfony/mime", - "version": "v6.4.19", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "ac537b6c55ccc2c749f3c979edfa9ec14aaed4f3" + "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/ac537b6c55ccc2c749f3c979edfa9ec14aaed4f3", - "reference": "ac537b6c55ccc2c749f3c979edfa9ec14aaed4f3", + "url": "https://api.github.com/repos/symfony/mime/zipball/664d5e844a2de5e11c8255d0aef6bc15a9660ac7", + "reference": "664d5e844a2de5e11c8255d0aef6bc15a9660ac7", "shasum": "" }, "require": { @@ -4695,7 +4633,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v6.4.19" + "source": "https://github.com/symfony/mime/tree/v6.4.24" }, "funding": [ { @@ -4706,16 +4644,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-17T21:23:52+00:00" + "time": "2025-07-15T12:02:45+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -4774,7 +4716,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -4785,6 +4727,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -4794,16 +4740,16 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe" + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", - "reference": "b9123926e3b7bc2f98c02ad54f6a4b02b91a8abe", + "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70", + "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70", "shasum": "" }, "require": { @@ -4852,7 +4798,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0" }, "funding": [ { @@ -4863,25 +4809,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-06-27T09:58:17+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773" + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/c36586dcf89a12315939e00ec9b4474adcb1d773", - "reference": "c36586dcf89a12315939e00ec9b4474adcb1d773", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3", + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3", "shasum": "" }, "require": { @@ -4935,7 +4885,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0" }, "funding": [ { @@ -4946,16 +4896,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-09-10T14:38:51+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -5016,7 +4970,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -5027,6 +4981,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -5036,19 +4994,20 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/85181ba99b2345b0ef10ce42ecac37612d9fd341", - "reference": "85181ba99b2345b0ef10ce42ecac37612d9fd341", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { + "ext-iconv": "*", "php": ">=7.2" }, "provide": { @@ -5096,7 +5055,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -5107,16 +5066,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2024-12-23T08:48:59+00:00" }, { "name": "symfony/polyfill-php73", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -5172,7 +5135,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.33.0" }, "funding": [ { @@ -5183,6 +5146,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -5192,16 +5159,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8" + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", - "reference": "60328e362d4c2c802a54fcbf04f9d3fb892b4cf8", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608", + "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608", "shasum": "" }, "require": { @@ -5252,7 +5219,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0" }, "funding": [ { @@ -5263,16 +5230,20 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-01-02T08:10:11+00:00" }, { "name": "symfony/polyfill-php81", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php81.git", @@ -5328,7 +5299,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php81/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0" }, "funding": [ { @@ -5339,6 +5310,10 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" @@ -5348,16 +5323,16 @@ }, { "name": "symfony/polyfill-php83", - "version": "v1.31.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php83.git", - "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491" + "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/2fb86d65e2d424369ad2905e83b236a8805ba491", - "reference": "2fb86d65e2d424369ad2905e83b236a8805ba491", + "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5", + "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5", "shasum": "" }, "require": { @@ -5404,7 +5379,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php83/tree/v1.31.0" + "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0" }, "funding": [ { @@ -5415,25 +5390,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-09T11:45:10+00:00" + "time": "2025-07-08T02:45:35+00:00" }, { "name": "symfony/process", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20" + "reference": "6be2f0c9ab3428587c07bed03aa9e3d1b823c6c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/e2a61c16af36c9a07e5c9906498b73e091949a20", - "reference": "e2a61c16af36c9a07e5c9906498b73e091949a20", + "url": "https://api.github.com/repos/symfony/process/zipball/6be2f0c9ab3428587c07bed03aa9e3d1b823c6c8", + "reference": "6be2f0c9ab3428587c07bed03aa9e3d1b823c6c8", "shasum": "" }, "require": { @@ -5465,7 +5444,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v6.4.20" + "source": "https://github.com/symfony/process/tree/v6.4.25" }, "funding": [ { @@ -5476,25 +5455,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-10T17:11:00+00:00" + "time": "2025-08-14T06:23:17+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v6.4.13", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "8932b572e147e80fb498045c580eb14215197529" + "reference": "2a14a1539f2854a8adb73319abf8923b1d7a6589" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/8932b572e147e80fb498045c580eb14215197529", - "reference": "8932b572e147e80fb498045c580eb14215197529", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/2a14a1539f2854a8adb73319abf8923b1d7a6589", + "reference": "2a14a1539f2854a8adb73319abf8923b1d7a6589", "shasum": "" }, "require": { @@ -5532,7 +5515,7 @@ "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.13" + "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.24" }, "funding": [ { @@ -5543,25 +5526,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-07-14T16:38:25+00:00" }, { "name": "symfony/routing", - "version": "v6.4.18", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "e9bfc94953019089acdfb9be51c1b9142c4afa68" + "reference": "e4f94e625c8e6f910aa004a0042f7b2d398278f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/e9bfc94953019089acdfb9be51c1b9142c4afa68", - "reference": "e9bfc94953019089acdfb9be51c1b9142c4afa68", + "url": "https://api.github.com/repos/symfony/routing/zipball/e4f94e625c8e6f910aa004a0042f7b2d398278f5", + "reference": "e4f94e625c8e6f910aa004a0042f7b2d398278f5", "shasum": "" }, "require": { @@ -5615,7 +5602,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v6.4.18" + "source": "https://github.com/symfony/routing/tree/v6.4.24" }, "funding": [ { @@ -5626,25 +5613,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-09T08:51:02+00:00" + "time": "2025-07-15T08:46:37+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0" + "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/e53260aabf78fb3d63f8d79d69ece59f80d5eda0", - "reference": "e53260aabf78fb3d63f8d79d69ece59f80d5eda0", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4", + "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4", "shasum": "" }, "require": { @@ -5662,7 +5653,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -5698,7 +5689,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/service-contracts/tree/v3.6.0" }, "funding": [ { @@ -5714,20 +5705,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-04-25T09:37:31+00:00" }, { "name": "symfony/string", - "version": "v6.4.15", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f" + "reference": "7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", - "reference": "73a5e66ea2e1677c98d4449177c5a9cf9d8b4c6f", + "url": "https://api.github.com/repos/symfony/string/zipball/7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1", + "reference": "7cdec7edfaf2cdd9c18901e35bcf9653d6209ff1", "shasum": "" }, "require": { @@ -5784,7 +5775,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.4.15" + "source": "https://github.com/symfony/string/tree/v6.4.25" }, "funding": [ { @@ -5795,25 +5786,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-11-13T13:31:12+00:00" + "time": "2025-08-22T12:33:20+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "4667ff3bd513750603a09c8dedbea942487fb07c" + "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/4667ff3bd513750603a09c8dedbea942487fb07c", - "reference": "4667ff3bd513750603a09c8dedbea942487fb07c", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d", + "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d", "shasum": "" }, "require": { @@ -5826,7 +5821,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -5862,7 +5857,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0" }, "funding": [ { @@ -5878,20 +5873,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2024-09-27T08:32:26+00:00" }, { "name": "symfony/twig-bridge", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "bb423dfaa51b6d88b1d64197ae695a0c8ac73778" + "reference": "9d13e87591c9de3221c8d6f23cd9a2b5958607bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/bb423dfaa51b6d88b1d64197ae695a0c8ac73778", - "reference": "bb423dfaa51b6d88b1d64197ae695a0c8ac73778", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/9d13e87591c9de3221c8d6f23cd9a2b5958607bf", + "reference": "9d13e87591c9de3221c8d6f23cd9a2b5958607bf", "shasum": "" }, "require": { @@ -5971,7 +5966,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v6.4.20" + "source": "https://github.com/symfony/twig-bridge/tree/v6.4.25" }, "funding": [ { @@ -5982,25 +5977,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-28T13:08:36+00:00" + "time": "2025-08-13T09:41:44+00:00" }, { "name": "symfony/var-dumper", - "version": "v6.4.18", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "4ad10cf8b020e77ba665305bb7804389884b4837" + "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/4ad10cf8b020e77ba665305bb7804389884b4837", - "reference": "4ad10cf8b020e77ba665305bb7804389884b4837", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/c6cd92486e9fc32506370822c57bc02353a5a92c", + "reference": "c6cd92486e9fc32506370822c57bc02353a5a92c", "shasum": "" }, "require": { @@ -6012,7 +6011,6 @@ "symfony/console": "<5.4" }, "require-dev": { - "ext-iconv": "*", "symfony/console": "^5.4|^6.0|^7.0", "symfony/error-handler": "^6.3|^7.0", "symfony/http-kernel": "^5.4|^6.0|^7.0", @@ -6056,7 +6054,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v6.4.18" + "source": "https://github.com/symfony/var-dumper/tree/v6.4.25" }, "funding": [ { @@ -6067,25 +6065,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-01-17T11:26:11+00:00" + "time": "2025-08-13T09:41:44+00:00" }, { "name": "symfony/var-exporter", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "998df255e9e6a15a36ae35e9c6cd818c17cf92a2" + "reference": "4ff50a1b7c75d1d596aca50899d0c8c7e3de8358" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/998df255e9e6a15a36ae35e9c6cd818c17cf92a2", - "reference": "998df255e9e6a15a36ae35e9c6cd818c17cf92a2", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/4ff50a1b7c75d1d596aca50899d0c8c7e3de8358", + "reference": "4ff50a1b7c75d1d596aca50899d0c8c7e3de8358", "shasum": "" }, "require": { @@ -6133,7 +6135,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v6.4.20" + "source": "https://github.com/symfony/var-exporter/tree/v6.4.25" }, "funding": [ { @@ -6144,25 +6146,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-13T09:55:08+00:00" + "time": "2025-08-18T13:06:32+00:00" }, { "name": "symfony/yaml", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "28ee818fce4a73ac1474346b94e4b966f665c53f" + "reference": "e54b060bc9c3dc3d4258bf0d165d0064e755f565" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/28ee818fce4a73ac1474346b94e4b966f665c53f", - "reference": "28ee818fce4a73ac1474346b94e4b966f665c53f", + "url": "https://api.github.com/repos/symfony/yaml/zipball/e54b060bc9c3dc3d4258bf0d165d0064e755f565", + "reference": "e54b060bc9c3dc3d4258bf0d165d0064e755f565", "shasum": "" }, "require": { @@ -6205,7 +6211,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v6.4.20" + "source": "https://github.com/symfony/yaml/tree/v6.4.25" }, "funding": [ { @@ -6216,25 +6222,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-27T20:15:30+00:00" + "time": "2025-08-26T16:59:00+00:00" }, { "name": "twig/twig", - "version": "v3.20.0", + "version": "v3.21.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3468920399451a384bef53cf7996965f7cd40183" + "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3468920399451a384bef53cf7996965f7cd40183", - "reference": "3468920399451a384bef53cf7996965f7cd40183", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/285123877d4dd97dd7c11842ac5fb7e86e60d81d", + "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d", "shasum": "" }, "require": { @@ -6288,7 +6298,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.20.0" + "source": "https://github.com/twigphp/Twig/tree/v3.21.1" }, "funding": [ { @@ -6300,11 +6310,11 @@ "type": "tidelift" } ], - "time": "2025-02-13T08:34:43+00:00" + "time": "2025-05-03T07:21:55+00:00" }, { "name": "web-token/jwt-key-mgmt", - "version": "3.4.6", + "version": "3.4.8", "source": { "type": "git", "url": "https://github.com/web-token/jwt-key-mgmt.git", @@ -6359,7 +6369,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.4.6" + "source": "https://github.com/web-token/jwt-key-mgmt/tree/3.4.8" }, "funding": [ { @@ -6372,16 +6382,16 @@ }, { "name": "web-token/jwt-library", - "version": "3.4.7", + "version": "3.4.8", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", - "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28" + "reference": "92445671cc788fa5f639898a67c06f9fd0bf491f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-library/zipball/1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28", - "reference": "1a25c8ced3e2b3c31d32dcfad215cbd8cb812f28", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/92445671cc788fa5f639898a67c06f9fd0bf491f", + "reference": "92445671cc788fa5f639898a67c06f9fd0bf491f", "shasum": "" }, "require": { @@ -6391,7 +6401,7 @@ "paragonie/constant_time_encoding": "^2.6|^3.0", "paragonie/sodium_compat": "^1.20|^2.0", "php": ">=8.1", - "psr/cache": "^3.0", + "psr/cache": "^2.0|^3.0", "psr/clock": "^1.0", "psr/http-client": "^1.0", "psr/http-factory": "^1.0", @@ -6454,7 +6464,7 @@ ], "support": { "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/3.4.7" + "source": "https://github.com/web-token/jwt-library/tree/3.4.8" }, "funding": [ { @@ -6466,11 +6476,11 @@ "type": "patreon" } ], - "time": "2024-07-02T16:35:11+00:00" + "time": "2025-05-07T09:11:18+00:00" }, { "name": "web-token/jwt-signature", - "version": "3.4.6", + "version": "3.4.8", "source": { "type": "git", "url": "https://github.com/web-token/jwt-signature.git", @@ -6522,7 +6532,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-signature/tree/3.4.6" + "source": "https://github.com/web-token/jwt-signature/tree/3.4.8" }, "funding": [ { @@ -6535,7 +6545,7 @@ }, { "name": "web-token/jwt-signature-algorithm-ecdsa", - "version": "3.4.6", + "version": "3.4.8", "source": { "type": "git", "url": "https://github.com/web-token/jwt-signature-algorithm-ecdsa.git", @@ -6588,7 +6598,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.4.6" + "source": "https://github.com/web-token/jwt-signature-algorithm-ecdsa/tree/3.4.8" }, "funding": [ { @@ -6601,7 +6611,7 @@ }, { "name": "web-token/jwt-util-ecc", - "version": "3.4.6", + "version": "3.4.8", "source": { "type": "git", "url": "https://github.com/web-token/jwt-util-ecc.git", @@ -6654,7 +6664,7 @@ "symfony" ], "support": { - "source": "https://github.com/web-token/jwt-util-ecc/tree/3.4.6" + "source": "https://github.com/web-token/jwt-util-ecc/tree/3.4.8" }, "funding": [ { @@ -6669,16 +6679,16 @@ "packages-dev": [ { "name": "amphp/amp", - "version": "v2.6.4", + "version": "v2.6.5", "source": { "type": "git", "url": "https://github.com/amphp/amp.git", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d" + "reference": "d7dda98dae26e56f3f6fcfbf1c1f819c9a993207" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", - "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d", + "url": "https://api.github.com/repos/amphp/amp/zipball/d7dda98dae26e56f3f6fcfbf1c1f819c9a993207", + "reference": "d7dda98dae26e56f3f6fcfbf1c1f819c9a993207", "shasum": "" }, "require": { @@ -6694,11 +6704,6 @@ "vimeo/psalm": "^3.12" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.x-dev" - } - }, "autoload": { "files": [ "lib/functions.php", @@ -6746,7 +6751,7 @@ "support": { "irc": "irc://irc.freenode.org/amphp", "issues": "https://github.com/amphp/amp/issues", - "source": "https://github.com/amphp/amp/tree/v2.6.4" + "source": "https://github.com/amphp/amp/tree/v2.6.5" }, "funding": [ { @@ -6754,7 +6759,7 @@ "type": "github" } ], - "time": "2024-03-21T18:52:26+00:00" + "time": "2025-09-03T19:41:28+00:00" }, { "name": "amphp/byte-stream", @@ -6967,16 +6972,16 @@ }, { "name": "fidry/cpu-core-counter", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/theofidry/cpu-core-counter.git", - "reference": "8520451a140d3f46ac33042715115e290cf5785f" + "reference": "db9508f7b1474469d9d3c53b86f817e344732678" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/8520451a140d3f46ac33042715115e290cf5785f", - "reference": "8520451a140d3f46ac33042715115e290cf5785f", + "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678", + "reference": "db9508f7b1474469d9d3c53b86f817e344732678", "shasum": "" }, "require": { @@ -6986,10 +6991,10 @@ "fidry/makefile": "^0.2.0", "fidry/php-cs-fixer-config": "^1.1.2", "phpstan/extension-installer": "^1.2.0", - "phpstan/phpstan": "^1.9.2", - "phpstan/phpstan-deprecation-rules": "^1.0.0", - "phpstan/phpstan-phpunit": "^1.2.2", - "phpstan/phpstan-strict-rules": "^1.4.4", + "phpstan/phpstan": "^2.0", + "phpstan/phpstan-deprecation-rules": "^2.0.0", + "phpstan/phpstan-phpunit": "^2.0", + "phpstan/phpstan-strict-rules": "^2.0", "phpunit/phpunit": "^8.5.31 || ^9.5.26", "webmozarts/strict-phpunit": "^7.5" }, @@ -7016,7 +7021,7 @@ ], "support": { "issues": "https://github.com/theofidry/cpu-core-counter/issues", - "source": "https://github.com/theofidry/cpu-core-counter/tree/1.2.0" + "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0" }, "funding": [ { @@ -7024,7 +7029,7 @@ "type": "github" } ], - "time": "2024-08-06T10:04:20+00:00" + "time": "2025-08-14T07:29:31+00:00" }, { "name": "laravel/homestead", @@ -7078,20 +7083,21 @@ "issues": "https://github.com/laravel/homestead/issues", "source": "https://github.com/laravel/homestead/tree/v14.5.0" }, + "abandoned": true, "time": "2023-10-06T03:16:47+00:00" }, { "name": "masterminds/html5", - "version": "2.9.0", + "version": "2.10.0", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6" + "reference": "fcf91eb64359852f00d921887b219479b4f21251" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", - "reference": "f5ac2c0b0a2eefca70b2ce32a5809992227e75a6", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/fcf91eb64359852f00d921887b219479b4f21251", + "reference": "fcf91eb64359852f00d921887b219479b4f21251", "shasum": "" }, "require": { @@ -7143,9 +7149,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.9.0" + "source": "https://github.com/Masterminds/html5-php/tree/2.10.0" }, - "time": "2024-03-31T07:05:07+00:00" + "time": "2025-07-25T09:04:22+00:00" }, { "name": "misantron/dbunit", @@ -7204,16 +7210,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.13.3", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "faed855a7b5f4d4637717c2b3863e277116beb36" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/faed855a7b5f4d4637717c2b3863e277116beb36", - "reference": "faed855a7b5f4d4637717c2b3863e277116beb36", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -7252,7 +7258,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.13.3" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -7260,7 +7266,7 @@ "type": "tidelift" } ], - "time": "2025-07-05T12:25:42+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "netresearch/jsonmapper", @@ -7654,16 +7660,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.2", + "version": "5.6.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62" + "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/92dde6a5919e34835c506ac8c523ef095a95ed62", - "reference": "92dde6a5919e34835c506ac8c523ef095a95ed62", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94f8051919d1b0369a6bcc7931d679a511c03fe9", + "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9", "shasum": "" }, "require": { @@ -7712,9 +7718,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.2" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.3" }, - "time": "2025-04-13T19:20:35+00:00" + "time": "2025-08-01T19:43:32+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -7776,16 +7782,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "2.1.0", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68" + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", - "reference": "9b30d6fd026b2c132b3985ce6b23bec09ab3aa68", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", + "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", "shasum": "" }, "require": { @@ -7817,9 +7823,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.1.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" }, - "time": "2025-02-19T13:28:12+00:00" + "time": "2025-08-30T15:50:23+00:00" }, { "name": "phpunit/php-code-coverage", @@ -8144,16 +8150,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.48", + "version": "10.5.55", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6e0a2bc39f6fae7617989d690d76c48e6d2eb541" + "reference": "4b2d546b336876bd9562f24641b08a25335b06b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6e0a2bc39f6fae7617989d690d76c48e6d2eb541", - "reference": "6e0a2bc39f6fae7617989d690d76c48e6d2eb541", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/4b2d546b336876bd9562f24641b08a25335b06b6", + "reference": "4b2d546b336876bd9562f24641b08a25335b06b6", "shasum": "" }, "require": { @@ -8163,7 +8169,7 @@ "ext-mbstring": "*", "ext-xml": "*", "ext-xmlwriter": "*", - "myclabs/deep-copy": "^1.13.3", + "myclabs/deep-copy": "^1.13.4", "phar-io/manifest": "^2.0.4", "phar-io/version": "^3.2.1", "php": ">=8.1", @@ -8174,13 +8180,13 @@ "phpunit/php-timer": "^6.0.0", "sebastian/cli-parser": "^2.0.1", "sebastian/code-unit": "^2.0.0", - "sebastian/comparator": "^5.0.3", + "sebastian/comparator": "^5.0.4", "sebastian/diff": "^5.1.1", "sebastian/environment": "^6.1.0", "sebastian/exporter": "^5.1.2", "sebastian/global-state": "^6.0.2", "sebastian/object-enumerator": "^5.0.0", - "sebastian/recursion-context": "^5.0.0", + "sebastian/recursion-context": "^5.0.1", "sebastian/type": "^4.0.0", "sebastian/version": "^4.0.1" }, @@ -8225,7 +8231,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.48" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.55" }, "funding": [ { @@ -8249,7 +8255,7 @@ "type": "tidelift" } ], - "time": "2025-07-11T04:07:17+00:00" + "time": "2025-09-14T06:19:20+00:00" }, { "name": "psalm/plugin-symfony", @@ -8486,16 +8492,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.3", + "version": "5.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e" + "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", - "reference": "a18251eb0b7a2dcd2f7aa3d6078b18545ef0558e", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e8e53097718d2b53cfb2aa859b06a41abf58c62e", + "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e", "shasum": "" }, "require": { @@ -8551,15 +8557,27 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.3" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.4" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2024-10-18T14:56:07+00:00" + "time": "2025-09-07T05:25:07+00:00" }, { "name": "sebastian/complexity", @@ -9062,23 +9080,23 @@ }, { "name": "sebastian/recursion-context", - "version": "5.0.0", + "version": "5.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712" + "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/05909fb5bc7df4c52992396d0116aed689f93712", - "reference": "05909fb5bc7df4c52992396d0116aed689f93712", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/47e34210757a2f37a97dcd207d032e1b01e64c7a", + "reference": "47e34210757a2f37a97dcd207d032e1b01e64c7a", "shasum": "" }, "require": { "php": ">=8.1" }, "require-dev": { - "phpunit/phpunit": "^10.0" + "phpunit/phpunit": "^10.5" }, "type": "library", "extra": { @@ -9113,15 +9131,28 @@ "homepage": "https://github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.0" + "security": "https://github.com/sebastianbergmann/recursion-context/security/policy", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/5.0.1" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2023-02-03T07:05:40+00:00" + "time": "2025-08-10T07:50:56+00:00" }, { "name": "sebastian/type", @@ -9302,16 +9333,16 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.0", + "version": "3.13.4", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "65ff2489553b83b4597e89c3b8b721487011d186" + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186", - "reference": "65ff2489553b83b4597e89c3b8b721487011d186", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119", + "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119", "shasum": "" }, "require": { @@ -9382,20 +9413,20 @@ "type": "thanks_dev" } ], - "time": "2025-05-11T03:36:00+00:00" + "time": "2025-09-05T05:47:09+00:00" }, { "name": "symfony/browser-kit", - "version": "v6.4.19", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "ce95f3e3239159e7fa3be7690c6ce95a4714637f" + "reference": "3537d17782f8c20795b194acb6859071b60c6fac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ce95f3e3239159e7fa3be7690c6ce95a4714637f", - "reference": "ce95f3e3239159e7fa3be7690c6ce95a4714637f", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3537d17782f8c20795b194acb6859071b60c6fac", + "reference": "3537d17782f8c20795b194acb6859071b60c6fac", "shasum": "" }, "require": { @@ -9434,7 +9465,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.4.19" + "source": "https://github.com/symfony/browser-kit/tree/v6.4.24" }, "funding": [ { @@ -9445,25 +9476,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-14T11:23:16+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/cache", - "version": "v6.4.20", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "95af448bb7c3d8db02f7b4f5cbf3cb7a6ff1e432" + "reference": "d038cd3054aeaf1c674022a77048b2ef6376a175" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/95af448bb7c3d8db02f7b4f5cbf3cb7a6ff1e432", - "reference": "95af448bb7c3d8db02f7b4f5cbf3cb7a6ff1e432", + "url": "https://api.github.com/repos/symfony/cache/zipball/d038cd3054aeaf1c674022a77048b2ef6376a175", + "reference": "d038cd3054aeaf1c674022a77048b2ef6376a175", "shasum": "" }, "require": { @@ -9530,7 +9565,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v6.4.20" + "source": "https://github.com/symfony/cache/tree/v6.4.24" }, "funding": [ { @@ -9541,25 +9576,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-08T15:51:34+00:00" + "time": "2025-07-30T09:32:03+00:00" }, { "name": "symfony/cache-contracts", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/symfony/cache-contracts.git", - "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b" + "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b", - "reference": "15a4f8e5cd3bce9aeafc882b1acab39ec8de2c1b", + "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/5d68a57d66910405e5c0b63d6f0af941e66fc868", + "reference": "5d68a57d66910405e5c0b63d6f0af941e66fc868", "shasum": "" }, "require": { @@ -9573,7 +9612,7 @@ "name": "symfony/contracts" }, "branch-alias": { - "dev-main": "3.5-dev" + "dev-main": "3.6-dev" } }, "autoload": { @@ -9606,7 +9645,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/cache-contracts/tree/v3.5.1" + "source": "https://github.com/symfony/cache-contracts/tree/v3.6.0" }, "funding": [ { @@ -9622,20 +9661,20 @@ "type": "tidelift" } ], - "time": "2024-09-25T14:20:29+00:00" + "time": "2025-03-13T15:25:07+00:00" }, { "name": "symfony/css-selector", - "version": "v6.4.13", + "version": "v6.4.24", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e" + "reference": "9b784413143701aa3c94ac1869a159a9e53e8761" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/cb23e97813c5837a041b73a6d63a9ddff0778f5e", - "reference": "cb23e97813c5837a041b73a6d63a9ddff0778f5e", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9b784413143701aa3c94ac1869a159a9e53e8761", + "reference": "9b784413143701aa3c94ac1869a159a9e53e8761", "shasum": "" }, "require": { @@ -9671,7 +9710,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v6.4.13" + "source": "https://github.com/symfony/css-selector/tree/v6.4.24" }, "funding": [ { @@ -9682,25 +9721,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:18:03+00:00" + "time": "2025-07-10T08:14:14+00:00" }, { "name": "symfony/dom-crawler", - "version": "v6.4.19", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "19073e3e0bb50cbc1cb286077069b3107085206f" + "reference": "976302990f9f2a6d4c07206836dd4ca77cae9524" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/19073e3e0bb50cbc1cb286077069b3107085206f", - "reference": "19073e3e0bb50cbc1cb286077069b3107085206f", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/976302990f9f2a6d4c07206836dd4ca77cae9524", + "reference": "976302990f9f2a6d4c07206836dd4ca77cae9524", "shasum": "" }, "require": { @@ -9738,7 +9781,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v6.4.19" + "source": "https://github.com/symfony/dom-crawler/tree/v6.4.25" }, "funding": [ { @@ -9749,25 +9792,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-02-14T17:58:34+00:00" + "time": "2025-08-05T18:56:08+00:00" }, { "name": "symfony/framework-bundle", - "version": "v6.4.20", + "version": "v6.4.25", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "51418a20079cb25af3fcb8fa8ae1ed82f7fdd1ce" + "reference": "1d6a764b58e4f780df00f71c20ba3a61095ea447" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/51418a20079cb25af3fcb8fa8ae1ed82f7fdd1ce", - "reference": "51418a20079cb25af3fcb8fa8ae1ed82f7fdd1ce", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/1d6a764b58e4f780df00f71c20ba3a61095ea447", + "reference": "1d6a764b58e4f780df00f71c20ba3a61095ea447", "shasum": "" }, "require": { @@ -9887,7 +9934,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v6.4.20" + "source": "https://github.com/symfony/framework-bundle/tree/v6.4.25" }, "funding": [ { @@ -9898,12 +9945,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-03-23T16:46:24+00:00" + "time": "2025-08-26T10:44:20+00:00" }, { "name": "theseer/tokenizer", From 9e764b2a98876fb6191cca4bb46bc68ce8603c27 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 16 Sep 2025 22:35:55 +0700 Subject: [PATCH 0884/1214] [ticket/17543] Remove ReflectionProperty::setAccessible() method calls As of PHP 8.1.0, calling this method has no effect; all properties are accessible by default. The method is deprecated since PHP 8.5. PHPBB-17543 --- tests/avatar/driver_gravatar_test.php | 2 -- tests/ban/ban_manager_test.php | 1 - tests/cache/file_driver_test.php | 16 ---------------- tests/captcha/turnstile_test.php | 7 ------- tests/datetime/from_format_test.php | 2 -- tests/dbal/db_tools_test.php | 1 - tests/email/email_parsing_test.php | 1 - tests/extension/extension_base_test.php | 1 - tests/files/types_local_test.php | 1 - tests/files/upload_test.php | 1 - tests/filesystem/helper_realpath_test.php | 1 - tests/filesystem/realpath_test.php | 1 - tests/group/helper_test_case.php | 2 -- tests/language/language_test.php | 2 -- tests/messenger/queue_test.php | 2 -- tests/migrator/get_callable_from_step_test.php | 1 - .../notification_method_email_test.php | 1 - .../notification_method_webpush_test.php | 1 - tests/template/extension_test.php | 1 - tests/template/template_test_case.php | 1 - tests/template/twig_test.php | 1 - tests/text_reparser/plugins/post_text_test.php | 1 - .../plugins/test_row_based_plugin.php | 1 - tests/ucp/controller_webpush_test.php | 2 -- tests/upload/filespec_test.php | 2 -- 25 files changed, 53 deletions(-) diff --git a/tests/avatar/driver_gravatar_test.php b/tests/avatar/driver_gravatar_test.php index 026655e11a6..bc84f356102 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -166,13 +166,11 @@ public function test_prepare_form($expected_vars, $request_data, $row) ->willReturn([]); $requestInputReflection = new \ReflectionProperty($request, 'input'); - $requestInputReflection->setAccessible(true); $request_data[request_interface::GET] = $request_data[request_interface::GET] ?? []; $request_data[request_interface::POST] = $request_data[request_interface::POST] ?? []; $request_data[request_interface::REQUEST] = $request_data[request_interface::GET] + $request_data[request_interface::POST]; $requestInputReflection->setValue($request, $request_data); $requestTypeCastHelperReflection = new \ReflectionProperty($request, 'type_cast_helper'); - $requestTypeCastHelperReflection->setAccessible(true); $requestTypeCastHelperReflection->setValue($request, new \phpbb\request\type_cast_helper()); $this->gravatar->prepare_form($request, $this->template, $this->user, $row, $error); diff --git a/tests/ban/ban_manager_test.php b/tests/ban/ban_manager_test.php index cdc64435b50..34a0acdaa35 100644 --- a/tests/ban/ban_manager_test.php +++ b/tests/ban/ban_manager_test.php @@ -411,7 +411,6 @@ public function test_get_banned_users_own_method() $ban_type_ip_reflection = new \ReflectionClass($ban_type_ip); $get_excluded_reflection = $ban_type_ip_reflection->getMethod('get_excluded'); - $get_excluded_reflection->setAccessible(true); $this->assertFalse($get_excluded_reflection->invoke($ban_type_ip)); } diff --git a/tests/cache/file_driver_test.php b/tests/cache/file_driver_test.php index c8fe44be744..f615cea3b01 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -68,7 +68,6 @@ public function test_read_not_readable() $filename = "{$this->cache_dir}unreadable.$phpEx"; @chmod($filename, 0000); $readReflection = new \ReflectionMethod($this->cache_file, '_read'); - $readReflection->setAccessible(true); $this->assertFalse($readReflection->invoke($this->cache_file, 'unreadable')); @chmod($filename, 0600); $this->assertNotFalse($readReflection->invoke($this->cache_file, 'unreadable')); @@ -79,11 +78,9 @@ public function test_read_data_global_invalid() global $phpEx; $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); - $reflectionCacheVars->setAccessible(true); $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); - $reflectionCacheVarExpires->setAccessible(true); $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); // Create file in invalid format @@ -95,7 +92,6 @@ public function test_read_data_global_invalid() file_put_contents($filename, $cache_data); $readReflection = new \ReflectionMethod($this->cache_file, '_read'); - $readReflection->setAccessible(true); $this->assertFalse($readReflection->invoke($this->cache_file, 'data_global')); } @@ -104,11 +100,9 @@ public function test_read_data_global_zero_bytes() global $phpEx; $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); - $reflectionCacheVars->setAccessible(true); $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); - $reflectionCacheVarExpires->setAccessible(true); $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); // Create file in invalid format @@ -120,7 +114,6 @@ public function test_read_data_global_zero_bytes() file_put_contents($filename, $cache_data); $readReflection = new \ReflectionMethod($this->cache_file, '_read'); - $readReflection->setAccessible(true); $this->assertFalse($readReflection->invoke($this->cache_file, 'data_global')); } @@ -129,11 +122,9 @@ public function test_read_data_global_hex_bytes() global $phpEx; $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); - $reflectionCacheVars->setAccessible(true); $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); - $reflectionCacheVarExpires->setAccessible(true); $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() + 86400]); // Create file in invalid format @@ -145,18 +136,15 @@ public function test_read_data_global_hex_bytes() file_put_contents($filename, $cache_data); $readReflection = new \ReflectionMethod($this->cache_file, '_read'); - $readReflection->setAccessible(true); $this->assertFalse($readReflection->invoke($this->cache_file, 'data_global')); } public function test_read_data_global_expired() { $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); - $reflectionCacheVars->setAccessible(true); $reflectionCacheVars->setValue($this->cache_file, ['foo' => 'bar']); $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); - $reflectionCacheVarExpires->setAccessible(true); $reflectionCacheVarExpires->setValue($this->cache_file, ['foo' => time() - 86400]); // Create file in invalid format @@ -167,7 +155,6 @@ public function test_read_data_global_expired() $reflectionCacheVarExpires->setValue($this->cache_file, []); $readReflection = new \ReflectionMethod($this->cache_file, '_read'); - $readReflection->setAccessible(true); $this->assertTrue($readReflection->invoke($this->cache_file, 'data_global')); // Check data, should be empty @@ -177,12 +164,10 @@ public function test_read_data_global_expired() public function test_read_data_global() { $reflectionCacheVars = new \ReflectionProperty($this->cache_file, 'vars'); - $reflectionCacheVars->setAccessible(true); $expectedVars = ['foo' => 'bar']; $reflectionCacheVars->setValue($this->cache_file, $expectedVars); $reflectionCacheVarExpires = new \ReflectionProperty($this->cache_file, 'var_expires'); - $reflectionCacheVarExpires->setAccessible(true); $expectedVarExpires = ['foo' => time() + 86400]; $reflectionCacheVarExpires->setValue($this->cache_file, $expectedVarExpires); @@ -196,7 +181,6 @@ public function test_read_data_global() $this->assertEquals([], $reflectionCacheVarExpires->getValue($this->cache_file)); $readReflection = new \ReflectionMethod($this->cache_file, '_read'); - $readReflection->setAccessible(true); $this->assertTrue($readReflection->invoke($this->cache_file, 'data_global')); // Check data, should be empty diff --git a/tests/captcha/turnstile_test.php b/tests/captcha/turnstile_test.php index 8d3c9958107..c95e3225d2e 100644 --- a/tests/captcha/turnstile_test.php +++ b/tests/captcha/turnstile_test.php @@ -244,7 +244,6 @@ public function test_set_Name(): void { $this->turnstile->set_name('custom_service'); $service_name_property = new \ReflectionProperty($this->turnstile, 'service_name'); - $service_name_property->setAccessible(true); $this->assertEquals('custom_service', $service_name_property->getValue($this->turnstile)); } @@ -275,7 +274,6 @@ public function test_validate_with_response_success(): void // Use reflection to inject the mocked client into the turnstile class $reflection = new \ReflectionClass($this->turnstile); $client_property = $reflection->getProperty('client'); - $client_property->setAccessible(true); $client_property->setValue($this->turnstile, $client_mock); // Validate that the CAPTCHA was solved successfully @@ -301,7 +299,6 @@ public function test_validate_with_guzzle_exception(): void // Use reflection to inject the mocked client into the turnstile class $reflection = new \ReflectionClass($this->turnstile); $client_property = $reflection->getProperty('client'); - $client_property->setAccessible(true); $client_property->setValue($this->turnstile, $client_mock); // Validatation fails due to guzzle exception @@ -333,9 +330,7 @@ public function test_get_client(): void { $turnstile_reflection = new \ReflectionClass($this->turnstile); $get_client_method = $turnstile_reflection->getMethod('get_client'); - $get_client_method->setAccessible(true); $client_property = $turnstile_reflection->getProperty('client'); - $client_property->setAccessible(true); $this->assertFalse($client_property->isInitialized($this->turnstile)); $client = $get_client_method->invoke($this->turnstile); @@ -363,7 +358,6 @@ public function test_validate_with_response_failure(): void // Use reflection to inject the mocked client into the turnstile class $reflection = new \ReflectionClass($this->turnstile); $client_property = $reflection->getProperty('client'); - $client_property->setAccessible(true); $client_property->setValue($this->turnstile, $client_mock); // Validate that the CAPTCHA was not solved @@ -374,7 +368,6 @@ public function test_get_template(): void { // Mock is_solved to return false $is_solved_property = new \ReflectionProperty($this->turnstile, 'solved'); - $is_solved_property->setAccessible(true); $is_solved_property->setValue($this->turnstile, false); // Mock the template assignments diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 7c76da32d3b..8b4b39eb906 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -32,11 +32,9 @@ protected function setUp(): void $reflection_class = new ReflectionClass('\phpbb\language\language'); // Set default language files loaded flag to true $common_language_files_loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); - $common_language_files_loaded_flag->setAccessible(true); $common_language_files_loaded_flag->setValue($this->lang, true); // Set up test language data $lang_array = $reflection_class->getProperty('lang'); - $lang_array->setAccessible(true); $lang_array->setValue($this->lang, [ 'datetime' => [ 'TODAY' => 'Today', diff --git a/tests/dbal/db_tools_test.php b/tests/dbal/db_tools_test.php index f6c108cdae7..90fa0eca09c 100644 --- a/tests/dbal/db_tools_test.php +++ b/tests/dbal/db_tools_test.php @@ -509,7 +509,6 @@ public function test_create_index_with_long_name() if ($this->tools instanceof \phpbb\db\tools\mssql) { $max_length_method = new ReflectionMethod('\phpbb\db\tools\mssql', 'get_max_index_name_length'); - $max_length_method->setAccessible(true); $max_index_length = $max_length_method->invoke($this->tools); } diff --git a/tests/email/email_parsing_test.php b/tests/email/email_parsing_test.php index 574babea812..10447f363b8 100644 --- a/tests/email/email_parsing_test.php +++ b/tests/email/email_parsing_test.php @@ -146,7 +146,6 @@ protected function setUp(): void $reflection = new ReflectionObject($this->email); $this->reflection_template_property = $reflection->getProperty('template'); - $this->reflection_template_property->setAccessible(true); } public static function email_parsing_data() diff --git a/tests/extension/extension_base_test.php b/tests/extension/extension_base_test.php index 7dc8c1a45c7..e0d34fee814 100644 --- a/tests/extension/extension_base_test.php +++ b/tests/extension/extension_base_test.php @@ -27,7 +27,6 @@ public static function setUpBeforeClass(): void $reflection_class = new ReflectionClass('\phpbb\extension\base'); self::$reflection_method_get_migration_file_list = $reflection_class->getMethod('get_migration_file_list'); - self::$reflection_method_get_migration_file_list->setAccessible(true); } protected function setUp(): void diff --git a/tests/files/types_local_test.php b/tests/files/types_local_test.php index ea1fa23ecb0..9cdbb50ced7 100644 --- a/tests/files/types_local_test.php +++ b/tests/files/types_local_test.php @@ -146,7 +146,6 @@ public function test_upload_form($filename, $upload_ary, $expected) 'mimetype.extension_guesser' => new \phpbb\mimetype\extension_guesser(), ))); $filespec_local = new ReflectionProperty($filespec, 'local'); - $filespec_local->setAccessible(true); $filespec_local->setValue($filespec, true); $this->container->set('files.filespec', $filespec); $this->factory = new \phpbb\files\factory($this->container); diff --git a/tests/files/upload_test.php b/tests/files/upload_test.php index ab88b1cd83e..beee220fd84 100644 --- a/tests/files/upload_test.php +++ b/tests/files/upload_test.php @@ -76,7 +76,6 @@ public function test_set_disallowed_content() { $upload = new \phpbb\files\upload($this->factory, $this->language, $this->php_ini, $this->request); $disallowed_content = new ReflectionProperty($upload, 'disallowed_content'); - $disallowed_content->setAccessible(true); $upload->set_disallowed_content(array('foo')); $this->assertEquals(array('foo'), $disallowed_content->getValue($upload)); diff --git a/tests/filesystem/helper_realpath_test.php b/tests/filesystem/helper_realpath_test.php index 848a855a4dc..448b2665bca 100644 --- a/tests/filesystem/helper_realpath_test.php +++ b/tests/filesystem/helper_realpath_test.php @@ -22,7 +22,6 @@ static public function setUpBeforeClass(): void parent::setUpBeforeClass(); self::$filesystem_helper_phpbb_own_realpath = new ReflectionMethod('\phpbb\filesystem\helper', 'phpbb_own_realpath'); - self::$filesystem_helper_phpbb_own_realpath->setAccessible(true); } protected function setUp(): void diff --git a/tests/filesystem/realpath_test.php b/tests/filesystem/realpath_test.php index 8119541844f..75e34ea2401 100644 --- a/tests/filesystem/realpath_test.php +++ b/tests/filesystem/realpath_test.php @@ -24,7 +24,6 @@ static public function setUpBeforeClass(): void $reflection_class = new ReflectionClass('\phpbb\filesystem\filesystem'); self::$filesystem_own_realpath = $reflection_class->getMethod('phpbb_own_realpath'); - self::$filesystem_own_realpath->setAccessible(true); } protected function setUp(): void diff --git a/tests/group/helper_test_case.php b/tests/group/helper_test_case.php index 1514c616a93..3ee1d86b860 100644 --- a/tests/group/helper_test_case.php +++ b/tests/group/helper_test_case.php @@ -87,12 +87,10 @@ protected function setup_engine(array $new_config = array()) // Set default language files loaded flag to true $loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); - $loaded_flag->setAccessible(true); $loaded_flag->setValue($lang, true); // Set up test language data $lang_array = $reflection_class->getProperty('lang'); - $lang_array->setAccessible(true); $lang_array->setValue($lang, $this->get_test_language_data_set()); // Set up event dispatcher diff --git a/tests/language/language_test.php b/tests/language/language_test.php index 2b1b2454915..eaf2d5c800c 100644 --- a/tests/language/language_test.php +++ b/tests/language/language_test.php @@ -30,12 +30,10 @@ protected function setUp(): void // Set default language files loaded flag to true $loaded_flag = $reflection_class->getProperty('common_language_files_loaded'); - $loaded_flag->setAccessible(true); $loaded_flag->setValue($this->lang, true); // Set up test language data $lang_array = $reflection_class->getProperty('lang'); - $lang_array->setAccessible(true); $lang_array->setValue($this->lang, $this->get_test_data_set()); } diff --git a/tests/messenger/queue_test.php b/tests/messenger/queue_test.php index a7f336b14a6..457604fb251 100644 --- a/tests/messenger/queue_test.php +++ b/tests/messenger/queue_test.php @@ -191,7 +191,6 @@ public function test_process_no_queue_handling_chmod_exception() $filesystem->method('phpbb_chmod') ->will($this->throwException(new filesystem_exception('Chmod failed'))); $filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem'); - $filesystem_reflection->setAccessible(true); $filesystem_reflection->setValue($this->messenger_queue, $filesystem); // Process the queue @@ -312,7 +311,6 @@ public function test_save_chmod_fail() $filesystem->method('phpbb_chmod') ->will($this->throwException(new filesystem_exception('Chmod failed'))); $filesystem_reflection = new \ReflectionProperty(queue::class, 'filesystem'); - $filesystem_reflection->setAccessible(true); $filesystem_reflection->setValue($this->messenger_queue, $filesystem); $this->messenger_queue->save(); diff --git a/tests/migrator/get_callable_from_step_test.php b/tests/migrator/get_callable_from_step_test.php index 02ee53e1720..467ec99aa89 100644 --- a/tests/migrator/get_callable_from_step_test.php +++ b/tests/migrator/get_callable_from_step_test.php @@ -137,7 +137,6 @@ protected function call_get_callable_from_step($step) { $class = new ReflectionClass($this->migrator); $method = $class->getMethod('get_callable_from_step'); - $method->setAccessible(true); return $method->invokeArgs($this->migrator, array($step)); } } diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 71ebffef893..0634e3abd49 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -126,7 +126,6 @@ protected function setUp(): void $class = new ReflectionClass($notification_method_email); $empty_queue_method = $class->getMethod('empty_queue'); - $empty_queue_method->setAccessible(true); $this->notification_method_email->method('notify_using_messenger') ->will($this->returnCallback(function () use ($notification_method_email, $empty_queue_method) { diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index a1b7e6325e6..d2e49579121 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -680,7 +680,6 @@ public static function data_set_endpoint_padding(): array public function test_set_endpoint_padding($endpoint, $expected_padding): void { $web_push_reflection = new \ReflectionMethod($this->notification_method_webpush, 'set_endpoint_padding'); - $web_push_reflection->setAccessible(true); $auth = [ 'VAPID' => [ diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index 323c605fb98..c40a58da53f 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -84,7 +84,6 @@ protected function setup_engine(array $new_config = [], string $template_path = $class = new ReflectionClass('\phpbb\avatar\manager'); $enabled_drivers = $class->getProperty('enabled_drivers'); - $enabled_drivers->setAccessible(true); $enabled_drivers->setValue($class, false); $avatar_helper = new phpbb\avatar\helper( $config, diff --git a/tests/template/template_test_case.php b/tests/template/template_test_case.php index 3d3b560e5a1..68a3a5985d7 100644 --- a/tests/template/template_test_case.php +++ b/tests/template/template_test_case.php @@ -35,7 +35,6 @@ public static function setUpBeforeClass(): void $reflection = new ReflectionClass('\phpbb\language\language'); self::$language_reflection_lang = $reflection->getProperty('lang'); - self::$language_reflection_lang->setAccessible(true); } protected function display($handle) diff --git a/tests/template/twig_test.php b/tests/template/twig_test.php index f655cd87020..23a14b4b4f6 100644 --- a/tests/template/twig_test.php +++ b/tests/template/twig_test.php @@ -128,7 +128,6 @@ public function test_set_style() // Get loader instance $template_reflection = new \ReflectionObject($this->template); $loader_reflection = $template_reflection->getProperty('loader'); - $loader_reflection->setAccessible(true); /** @var \phpbb\template\twig\loader $loader */ $loader = $loader_reflection->getValue($this->template); diff --git a/tests/text_reparser/plugins/post_text_test.php b/tests/text_reparser/plugins/post_text_test.php index 8e63ca72563..0333afd95b1 100644 --- a/tests/text_reparser/plugins/post_text_test.php +++ b/tests/text_reparser/plugins/post_text_test.php @@ -74,7 +74,6 @@ public function test_reparse_url(string $input_text, string $expected_text) // Call reparse_record via reflection $reparser = $this->get_reparser(); $reparser_reflection = new \ReflectionMethod($reparser, 'reparse_record'); - $reparser_reflection->setAccessible(true); $reparser_reflection->invoke($reparser, $record); // Retrieve reparsed post text and compare with expectec diff --git a/tests/text_reparser/plugins/test_row_based_plugin.php b/tests/text_reparser/plugins/test_row_based_plugin.php index 60b3e30584f..425054f4c12 100644 --- a/tests/text_reparser/plugins/test_row_based_plugin.php +++ b/tests/text_reparser/plugins/test_row_based_plugin.php @@ -27,7 +27,6 @@ protected function get_rows(array $ids) $reflection_reparser = new ReflectionClass(get_class($reparser)); $table_property = $reflection_reparser->getProperty('table'); - $table_property->setAccessible(true); $sql = 'SELECT ' . $columns['id'] . ' AS id, ' . $columns['text'] . ' AS text FROM ' . $table_property->getValue($reparser) . ' diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index e1e53738626..9539fa73dcc 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -422,7 +422,6 @@ public function test_check_subscribe_requests_invalid_form_token() $this->expectExceptionMessage('FORM_INVALID'); $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); - $check_subscribe_reflection->setAccessible(true); $check_subscribe_reflection->invoke($this->controller); } @@ -436,7 +435,6 @@ public function test_check_subscribe_requests_anonymous_user() $this->expectExceptionMessage('NO_AUTH_OPERATION'); $check_subscribe_reflection = new ReflectionMethod($this->controller, 'check_subscribe_requests'); - $check_subscribe_reflection->setAccessible(true); $check_subscribe_reflection->invoke($this->controller); } diff --git a/tests/upload/filespec_test.php b/tests/upload/filespec_test.php index 032ab56803d..ed202757831 100644 --- a/tests/upload/filespec_test.php +++ b/tests/upload/filespec_test.php @@ -83,7 +83,6 @@ protected function setUp(): void private function set_reflection_property($class, $property_name, $value) { $property = new ReflectionProperty($class, $property_name); - $property->setAccessible(true); $property->setValue($class, $value); } @@ -538,7 +537,6 @@ public function test_is_uploaded() $filespec = new \phpbb\files\filespec($this->filesystem, $this->language, new \bantu\IniGetWrapper\IniGetWrapper, new \FastImageSize\FastImageSize(), $this->phpbb_root_path, null); $reflection_filespec = new ReflectionClass($filespec); $plupload_property = $reflection_filespec->getProperty('plupload'); - $plupload_property->setAccessible(true); $plupload_mock = $this->getMockBuilder('\phpbb\plupload\plupload') ->disableOriginalConstructor() ->getMock(); From dac58f53d735e6bb41402c390bd2ac1192446f68 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 16 Sep 2025 13:14:39 -0700 Subject: [PATCH 0885/1214] [ticket/17542] Optimize and simplify logic PHPBB-17542 --- tests/mock/event_dispatcher.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/tests/mock/event_dispatcher.php b/tests/mock/event_dispatcher.php index 654a08d7f16..2f0f1429053 100644 --- a/tests/mock/event_dispatcher.php +++ b/tests/mock/event_dispatcher.php @@ -24,18 +24,13 @@ public function __construct() public function trigger_event($eventName, $data = array()): array { - // Ensure tests never hard-exit when phpBB calls exit_handler() + $data = (array) $data; + if ($eventName === 'core.exit_handler') { - // Set the override flag so exit_handler() returns instead of exit; - if (is_array($data)) - { - $data['exit_handler_override'] = true; - } - return (array) $data; + $data['exit_handler_override'] = true; } - // Default behaviour of the mock: return the input data unchanged - return (array) $data; + return $data; } } From b2aa276a2a861d77259750faa0207e9a728e4f81 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 16 Sep 2025 23:36:35 +0700 Subject: [PATCH 0886/1214] [ticket/17543] Fix more PHP 8.5 deprecation warnings PHPBB-17543 --- phpBB/includes/functions_posting.php | 2 -- phpBB/phpbb/captcha/plugins/recaptcha_v3.php | 2 +- .../db/doctrine/connection_parameter_factory.php | 13 ++++++++++++- phpBB/phpbb/notification/type/post.php | 2 +- phpBB/phpbb/search/backend/fulltext_native.php | 6 +++--- tests/profilefields/type_bool_test.php | 2 +- tests/profilefields/type_dropdown_test.php | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-) diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index f4637c5057c..9559c10cfd0 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -763,8 +763,6 @@ function create_thumbnail($source, $destination, $mimetype) imagewebp($new_image, $destination); break; } - - imagedestroy($new_image); } else { diff --git a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php index e8399a5aef6..b62c561a676 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php @@ -325,7 +325,7 @@ protected function recaptcha_verify_token() $token = $request->variable('recaptcha_token', '', true); $action = $request->variable('recaptcha_action', '', true); $action = in_array($action, self::$actions) ? $action : reset(self::$actions); - $threshold = (double) $config["recaptcha_v3_threshold_{$action}"] ?? 0.5; + $threshold = (float) $config["recaptcha_v3_threshold_{$action}"] ?? 0.5; // No token was provided, discard spam submissions if (empty($token)) diff --git a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php index ea5a929ba75..30ee850138f 100644 --- a/phpBB/phpbb/db/doctrine/connection_parameter_factory.php +++ b/phpBB/phpbb/db/doctrine/connection_parameter_factory.php @@ -150,7 +150,18 @@ private static function enrich_parameters(array $params) : array if ($params['driver'] === 'pdo_mysql' && extension_loaded('pdo_mysql')) { - $params[\PDO::MYSQL_ATTR_FOUND_ROWS] = true; + // Constant PDO::MYSQL_ATTR_FOUND_ROWS is deprecated since 8.5, use Pdo\Mysql::ATTR_FOUND_ROWS instead + if (class_exists('\Pdo\Mysql')) + { + /** + * @psalm-suppress UndefinedClass + */ + $params[\Pdo\Mysql::ATTR_FOUND_ROWS] = true; + } + else + { + $params[\PDO::MYSQL_ATTR_FOUND_ROWS] = true; + } } return $params; diff --git a/phpBB/phpbb/notification/type/post.php b/phpBB/phpbb/notification/type/post.php index be8c8d75e90..9052f6cbcf7 100644 --- a/phpBB/phpbb/notification/type/post.php +++ b/phpBB/phpbb/notification/type/post.php @@ -386,7 +386,7 @@ public function create_insert_array($type_data, $pre_create_data = array()) // Topics can be "read" before they are public (while awaiting approval). // Make sure that if the user has read the topic, it's marked as read in the notification - if ($this->inherit_read_status && isset($pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time) + if ($this->inherit_read_status && isset($this->user_id, $pre_create_data[$this->user_id]) && $pre_create_data[$this->user_id] >= $this->notification_time) { $this->notification_read = true; } diff --git a/phpBB/phpbb/search/backend/fulltext_native.php b/phpBB/phpbb/search/backend/fulltext_native.php index 95efc38e432..7416544a36d 100644 --- a/phpBB/phpbb/search/backend/fulltext_native.php +++ b/phpBB/phpbb/search/backend/fulltext_native.php @@ -1577,7 +1577,7 @@ public function tidy(): void // Remove common words if ($this->config['num_posts'] >= 100 && $this->config['fulltext_native_common_thres']) { - $common_threshold = ((double) $this->config['fulltext_native_common_thres']) / 100.0; + $common_threshold = ((float) $this->config['fulltext_native_common_thres']) / 100.0; // First, get the IDs of common words $sql = 'SELECT word_id, word_text FROM ' . $this->search_wordlist_table . ' @@ -2034,14 +2034,14 @@ public function get_acp_options(): array

    ' . $this->language->lang('COMMON_WORD_THRESHOLD_EXPLAIN') . '
    -
    %
    +
    %
    '; // These are fields required in the config table return array( 'tpl' => $tpl, - 'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'double:0:100') + 'config' => array('fulltext_native_load_upd' => 'bool', 'fulltext_native_min_chars' => 'integer:0:255', 'fulltext_native_max_chars' => 'integer:0:255', 'fulltext_native_common_thres' => 'float:0:100') ); } } diff --git a/tests/profilefields/type_bool_test.php b/tests/profilefields/type_bool_test.php index 49bc45805a7..f102badb31b 100644 --- a/tests/profilefields/type_bool_test.php +++ b/tests/profilefields/type_bool_test.php @@ -187,7 +187,7 @@ public function test_get_profile_value_raw($value, $field_options, $expected, $d public function is_set_callback($field_id, $lang_id, $field_value) { - return isset($this->options[$field_value]); + return isset($field_value, $this->options[$field_value]); } public function get($field_id, $lang_id, $field_value) diff --git a/tests/profilefields/type_dropdown_test.php b/tests/profilefields/type_dropdown_test.php index 17e1a7b3f9a..9e979b80e26 100644 --- a/tests/profilefields/type_dropdown_test.php +++ b/tests/profilefields/type_dropdown_test.php @@ -225,7 +225,7 @@ public function test_get_profile_value_raw($value, $field_options, $expected, $d public function is_set_callback($field_id, $lang_id, $field_value) { - return isset($this->dropdown_options[$field_value]); + return isset($field_value, $this->dropdown_options[$field_value]); } public function get($field_id, $lang_id, $field_value) From f670231faa7676fa7bb516dd8e53b4586a0c0de9 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 17 Sep 2025 21:56:54 +0700 Subject: [PATCH 0887/1214] [ticket/17543] Adjust PHPUnit XML configuration Define source code directories to test and restrict reporting of deprecation errors to them only to avoid getting this kind of errors from the 3rd party software and temporary/cache files. PHPBB-17543 --- .github/phpunit-mariadb-github.xml | 12 ++++++++++++ .github/phpunit-mssql-github.xml | 12 ++++++++++++ .github/phpunit-mysql-github.xml | 12 ++++++++++++ .github/phpunit-postgres-github.xml | 12 ++++++++++++ .github/phpunit-psql-windows-github.xml | 12 ++++++++++++ .github/phpunit-sqlite3-github.xml | 12 ++++++++++++ phpunit.xml.dist | 12 +++++++++--- 7 files changed, 81 insertions(+), 3 deletions(-) diff --git a/.github/phpunit-mariadb-github.xml b/.github/phpunit-mariadb-github.xml index e301ced053e..d5ab282b3d1 100644 --- a/.github/phpunit-mariadb-github.xml +++ b/.github/phpunit-mariadb-github.xml @@ -23,6 +23,18 @@ slow + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + diff --git a/.github/phpunit-mssql-github.xml b/.github/phpunit-mssql-github.xml index b3061cce0e5..bd240fa534b 100644 --- a/.github/phpunit-mssql-github.xml +++ b/.github/phpunit-mssql-github.xml @@ -23,6 +23,18 @@ slow + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + diff --git a/.github/phpunit-mysql-github.xml b/.github/phpunit-mysql-github.xml index e15519e8b2b..ff42cf36dfd 100644 --- a/.github/phpunit-mysql-github.xml +++ b/.github/phpunit-mysql-github.xml @@ -23,6 +23,18 @@ slow + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + diff --git a/.github/phpunit-postgres-github.xml b/.github/phpunit-postgres-github.xml index 57333dacc5e..1636901039f 100644 --- a/.github/phpunit-postgres-github.xml +++ b/.github/phpunit-postgres-github.xml @@ -23,6 +23,18 @@ slow + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml index ab0c0600100..0b80da07748 100644 --- a/.github/phpunit-psql-windows-github.xml +++ b/.github/phpunit-psql-windows-github.xml @@ -23,6 +23,18 @@ slow + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + diff --git a/.github/phpunit-sqlite3-github.xml b/.github/phpunit-sqlite3-github.xml index 5c7e931b482..1ade12292c3 100644 --- a/.github/phpunit-sqlite3-github.xml +++ b/.github/phpunit-sqlite3-github.xml @@ -23,6 +23,18 @@ slow + + + ../phpBB/ + ../tests/ + + + ../phpBB/vendor/ + ../phpBB/cache/ + ../phpBB/develop/ + ../phpBB/store/ + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 58d0d5c1dfb..6240baa3208 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -26,10 +26,16 @@ slow - + - ./phpBB/includes/ - ./phpBB/phpbb/ + ./phpBB/ + ./tests/ + + ./phpBB/vendor/ + ./phpBB/cache/ + ./phpBB/develop/ + ./phpBB/store/ + From e74521a3cf231fb1600fe39bc658da83d2e8431a Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 17 Sep 2025 22:15:47 +0700 Subject: [PATCH 0888/1214] [ticket/17543] Enable bz2 and fileinfo PHP extensions for Windows tests PHPBB-17543 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4a021cd1b44..2b1b5703d1f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -522,7 +522,7 @@ jobs: uses: shivammathur/setup-php@v2 with: php-version: ${{ matrix.php }} - extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium + extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, intl, gd, exif, iconv, pgsql, pdo_pgsql, sodium, bz2, fileinfo ini-values: upload_tmp_dir=${{ runner.temp }}, sys_temp_dir=${{ runner.temp }} coverage: none From a00538d251281789f389f57140e7a6d1de697c3e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 18 Sep 2025 16:39:27 +0200 Subject: [PATCH 0889/1214] [ticket/17175] Correctly define variable for item link PHPBB-17175 --- phpBB/styles/prosilver/template/search_results.html | 8 ++++---- phpBB/styles/prosilver/template/viewforum_body.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 06a4e32c43a..9e8a3c3e9bd 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -81,12 +81,12 @@

    {SEARCH_TITLE} - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index e8b77ab2ce9..7937fb5683f 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '4.0.0-a1-dev'); +@define('PHPBB_VERSION', '4.0.0-a1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index c13efb604bb..d85d6d05dfb 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '4.0.0-a1-dev'); +define('PHPBB_VERSION', '4.0.0-a1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 0c4910fb788..dbdad251180 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -299,7 +299,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_last INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a1-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '[]'); From b3877642ac48022efff022642ffe42cd38d02987 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 11:40:00 +0200 Subject: [PATCH 0910/1214] [prep-release-4.0.0] Update version numbers to 4.0.0 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 6576275d6aa..84b31feac61 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -40,7 +40,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '4.0.0-a1-dev', + 'phpbb_version' => '4.0.0', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, From d8854ee4981d0614e578a5c0e8c5ef082f5a997f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 11:44:16 +0200 Subject: [PATCH 0911/1214] [prep-release-4.0.0] Add migration for 4.0.0-a1 --- phpBB/phpbb/db/migration/data/v400/v400a1.php | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/v400a1.php diff --git a/phpBB/phpbb/db/migration/data/v400/v400a1.php b/phpBB/phpbb/db/migration/data/v400/v400a1.php new file mode 100644 index 00000000000..adbaaed24be --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/v400a1.php @@ -0,0 +1,68 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +class v400a1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '4.0.0-a1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3315', + '\phpbb\db\migration\data\v400\add_mention_settings', + '\phpbb\db\migration\data\v400\remove_remote_avatar', + '\phpbb\db\migration\data\v400\increase_avatar_size', + '\phpbb\db\migration\data\v400\remove_img_link', + '\phpbb\db\migration\data\v400\rename_duplicated_index_names', + '\phpbb\db\migration\data\v400\add_bbcode_font_icon', + '\phpbb\db\migration\data\v400\font_awesome_6_upgrade', + '\phpbb\db\migration\data\v400\remove_broken_captcha', + '\phpbb\db\migration\data\v400\turnstile_captcha', + '\phpbb\db\migration\data\v400\add_audio_files_attachment_group', + '\phpbb\db\migration\data\v400\add_webpush_token', + '\phpbb\db\migration\data\v400\remove_remote_upload', + '\phpbb\db\migration\data\v400\remove_notify_type', + '\phpbb\db\migration\data\v400\remove_template_php', + '\phpbb\db\migration\data\v400\storage_adapter_local_subfolders_remove', + '\phpbb\db\migration\data\v400\add_webpush_options', + '\phpbb\db\migration\data\v400\remove_max_img_size', + '\phpbb\db\migration\data\v400\hidpi_smilies', + '\phpbb\db\migration\data\v400\extensions_composer_2', + '\phpbb\db\migration\data\v400\add_storage_permission', + '\phpbb\db\migration\data\v400\hidpi_icons', + '\phpbb\db\migration\data\v400\qa_captcha', + '\phpbb\db\migration\data\v400\search_backend_update', + '\phpbb\db\migration\data\v400\remove_flash_v2', + '\phpbb\db\migration\data\v400\add_disable_board_access_config', + '\phpbb\db\migration\data\v400\remove_dbms_version_config', + '\phpbb\db\migration\data\v400\ban_table_p2', + '\phpbb\db\migration\data\v400\extensions_composer_3', + '\phpbb\db\migration\data\v400\acp_storage_module', + '\phpbb\db\migration\data\v400\add_video_files_attachment_group', + '\phpbb\db\migration\data\v400\remove_attachment_download_mode', + '\phpbb\db\migration\data\v400\remove_smtp_auth_method', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '4.0.0-a1']], + ]; + } +} From 6b90b3e82d421a3a48324636968ad04b017f1a8c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 11:44:17 +0200 Subject: [PATCH 0912/1214] [prep-release-4.0.0] Update stylesheet hashes for 4.0.0-a1 --- phpBB/styles/prosilver/theme/stylesheet.css | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 0f0cf4b667c..27853ad399d 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -8,16 +8,16 @@ */ @import url("normalize.css?hash=e6c08715"); -@import url("base.css?hash=9b6738c8"); +@import url("base.css?hash=e4336923"); @import url("utilities.css?hash=b95e1ad4"); -@import url("icons.css?hash=8acd6188"); -@import url("common.css?hash=0aba47c9"); -@import url("buttons.css?hash=a034a326"); -@import url("links.css?hash=93969a21"); +@import url("icons.css?hash=cf9a9308"); +@import url("common.css?hash=b2c7c02b"); +@import url("buttons.css?hash=be0468e7"); +@import url("links.css?hash=ecc09d7a"); @import url("mentions.css?hash=308fbc69"); -@import url("content.css?hash=c0febad3"); -@import url("cp.css?hash=b02034ec"); -@import url("forms.css?hash=d6ca85f9"); -@import url("colours.css?hash=0d8bc6be"); -@import url("responsive.css?hash=749e01e6"); +@import url("content.css?hash=46dafcea"); +@import url("cp.css?hash=9ed1a111"); +@import url("forms.css?hash=e6a667ba"); +@import url("colours.css?hash=f1c629cc"); +@import url("responsive.css?hash=c6136396"); @import url("bidi.css?hash=c1b99d9a"); From 660de84a06e5d853ff6e86a3e04991e35d086f20 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 11:46:14 +0200 Subject: [PATCH 0913/1214] [prep-release-4.0.0] Update changelog for 4.0.0-a1 --- phpBB/docs/CHANGELOG.html | 435 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 435 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 0935611a293..3f42cefefb8 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

    Changelog

    1. Changelog
        +
      • Changes since 3.3.x
      • Changes since 3.3.15-RC1
      • Changes since 3.3.14
      • Changes since 3.3.14-RC1
        • @@ -175,6 +176,440 @@

        Changelog

        +

        Changes since 3.3.15

        +

        Bug

        +
          +
        • [PHPBB-11449] - Get rid of recursive calls in class phpbb_notification_manager
          • +
        • [PHPBB-12479] - Remove deprecated functions from bc file
          • +
        • [PHPBB-13276] - INCLUDEJS and INCLUDECSS do not obey PHPBB_USE_BOARD_URL_PATH
          • +
        • [PHPBB-14401] - Sphinx: Remove ending slash from binlog_path
          • +
        • [PHPBB-14404] - Set board_timezone for admin on install
          • +
        • [PHPBB-14601] - Fix composer.lock on master
          • +
        • [PHPBB-14782] - Quick Links > Your Posts gives mysql error
          • +
        • [PHPBB-14936] - Missing language variable INST_ERR_DB
          • +
        • [PHPBB-15099] - Remove not needed attribute from includeCSS and includeJS
          • +
        • [PHPBB-15154] - Missing constants during CLI installation
          • +
        • [PHPBB-15198] - Fix phpBB and PHP version info displayed in the ACP
          • +
        • [PHPBB-15233] - Avatars return should be standardized to not return html
          • +
        • [PHPBB-15234] - notification menu gr/avatar sizes are wrong
          • +
        • [PHPBB-15255] - Language variables of filesystem exception should moved
          • +
        • [PHPBB-15285] - Travis tests are failing due to trusty changes
          • +
        • [PHPBB-15314] - Wrong class constructor definition for convertor component
          • +
        • [PHPBB-15319] - Database update v310\style_update_p2 fails to drop sequences
          • +
        • [PHPBB-15336] - bidi.css causing travis failure on master
          • +
        • [PHPBB-15339] - Missing acp_send_statistics -> Upgrading to 3.2.0 fails for phpBB 3.0.5
          • +
        • [PHPBB-15357] - phpBB core should provide composer/installers to extensions
          • +
        • [PHPBB-15369] - Bump composer dependency version
          • +
        • [PHPBB-15400] - app.php urls aren't working in vagrant because of nginx
          • +
        • [PHPBB-15411] - Use lowercase in hex color code
          • +
        • [PHPBB-15415] - Styling typo in ucp_notifications.html
          • +
        • [PHPBB-15491] - Outdated linkes in installer support page
          • +
        • [PHPBB-15500] - Docs outdated for new PHP 5.4.7 requirement
          • +
        • [PHPBB-15502] - Errors in migrations in 3.2.2 release
          • +
        • [PHPBB-15507] - PHP 7.2 Warning
          • +
        • [PHPBB-15512] - Avoid reparsing non-existent polls
          • +
        • [PHPBB-15525] - composer.json License is Invalid/Deprecated
          • +
        • [PHPBB-15526] - Cast bbcode ID to integer
          • +
        • [PHPBB-15527] - Cannot interpret the BBCode definition
          • +
        • [PHPBB-15532] - Update pull request template
          • +
        • [PHPBB-15533] - Typo in viewtopic_topic_tools.html
          • +
        • [PHPBB-15536] - When using the catalog, extensions are installed in vendor-ext/ instead of ext/
          • +
        • [PHPBB-15559] - phpbb\report\report_handler_pm.php:56
          • +
        • [PHPBB-15600] - Ban reasons are not escaped in mcp_ban.html template
          • +
        • [PHPBB-15647] - post content line-height was not large enough
          • +
        • [PHPBB-15679] - notifications ucp front-page looks like shit due to poor cp styling
          • +
        • [PHPBB-15684] - Fix Broken Migration
          • +
        • [PHPBB-15686] - Update homestead for vagrant
          • +
        • [PHPBB-15688] - Event location in attachments download
          • +
        • [PHPBB-15720] - Redirections dont need to escape ampersands
          • +
        • [PHPBB-15725] - Testing framework fails to install extensions because of outdated assertion
          • +
        • [PHPBB-15755] - Broken events in /phpbb/attachment/delete.php
          • +
        • [PHPBB-15760] - write_stream never close connection
          • +
        • [PHPBB-15765] - Add debug.url_generator
          • +
        • [PHPBB-15795] - Broken Migration
          • +
        • [PHPBB-15846] - Wrong id for downloadable extension group
          • +
        • [PHPBB-15892] - Undefined $storage_attachment in parse_attachments() when using inline image attachment
          • +
        • [PHPBB-15919] - Lint test throws PHP warnings due to node modules folder
          • +
        • [PHPBB-15922] - Remove support for APC cache
          • +
        • [PHPBB-15935] - Check if APCu is installed before installing it
          • +
        • [PHPBB-15938] - Static attributes blacklist references no longer existing classes
          • +
        • [PHPBB-15959] - Travis Network Test is Failing for news.cnet.com
          • +
        • [PHPBB-16043] - SQL errors result in fatal error in specific cases
          • +
        • [PHPBB-16056] - JPEG dimensions undetectable for some kind of jpeg files
          • +
        • [PHPBB-16213] - vendor and phpbb folders should have .htaccess files
          • +
        • [PHPBB-16238] - Remove S_LOGIN_REDIRECT work around
          • +
        • [PHPBB-16309] - Smilies with a left square bracket do not work
          • +
        • [PHPBB-16346] - Random code errors
          • +
        • [PHPBB-16349] - Fix merge issues in acp_attachments and posting_attach_body.html
          • +
        • [PHPBB-16445] - unnecessary hr breaks content flow and semantics
          • +
        • [PHPBB-16477] - Padding-right is missing in icon.css
          • +
        • [PHPBB-16569] - Massive margin between posts when zoomed out in browser
          • +
        • [PHPBB-16587] - Replace sami with doctum
          • +
        • [PHPBB-16639] - Wrong use of make_path_relative
          • +
        • [PHPBB-16650] - Fatal error in Extensions catalog
          • +
        • [PHPBB-16666] - Windows tests in github actions can't write file in postgres
          • +
        • [PHPBB-16667] - Remove unused create_schema install task
          • +
        • [PHPBB-16688] - PHP fatal error on installing extension via catalog
          • +
        • [PHPBB-16717] - Fix installer bugs
          • +
        • [PHPBB-16732] - Vagrant is not working
          • +
        • [PHPBB-16749] - SQL error on installation
          • +
        • [PHPBB-16761] - Missing closing a tag in pagination
          • +
        • [PHPBB-16762] - Fix paging render issues in topicrow paging
          • +
        • [PHPBB-16763] - fix mine pip alignment on forum icons
          • +
        • [PHPBB-16778] - bidi.css loading was removed by a merge somewhere
          • +
        • [PHPBB-16786] - PHPUnit configuration validates against a deprecated schema
          • +
        • [PHPBB-16796] - misalignment on index and viewforum for topics and posts titles
          • +
        • [PHPBB-16817] - Oauth functional tests using incorrect selectors on master
          • +
        • [PHPBB-16835] - mentions_templates.html missing in ACP
          • +
        • [PHPBB-16836] - disk_free_space(): The system cannot find the path specified - PHP 8
          • +
        • [PHPBB-16857] - Remove leftover code for flash
          • +
        • [PHPBB-16891] - Controller Helper Routing in ACP can break Extension Installation
          • +
        • [PHPBB-16906] - Error running phpbb with vagrant
          • +
        • [PHPBB-16923] - Fix composer.json requirements
          • +
        • [PHPBB-16935] - Sphinx search references moved classes with old namespace
          • +
        • [PHPBB-16938] - Unexistent css property in inline style
          • +
        • [PHPBB-16943] - Composer error on installing extensions via catalog
          • +
        • [PHPBB-16960] - Migrations table not populated at the end of installation
          • +
        • [PHPBB-17022] - Link to SQL Report page is generated incorrectly
          • +
        • [PHPBB-17024] - Installing extension from catalog not possible with latest composer
          • +
        • [PHPBB-17049] - Minimum stability config entry missing from migrations
          • +
        • [PHPBB-17052] - Composer >=2.3.10 unable to load installer plugin for extension catalog
          • +
        • [PHPBB-17062] - Cron task service fail because service is being instantiated incorrectly
          • +
        • [PHPBB-17067] - Untranslated string in CLI command
          • +
        • [PHPBB-17069] - Array with duplicate keys
          • +
        • [PHPBB-17074] - Condition to avoid creation of roles with same name is broken
          • +
        • [PHPBB-17085] - Invalid icons referenced in template files
          • +
        • [PHPBB-17086] - phpBB / Codespaces support
          • +
        • [PHPBB-17105] - Extensions Can't Be Installed
          • +
        • [PHPBB-17142] - Installation errors when using MSSQL+ IIS + PHP 8.2
          • +
        • [PHPBB-17148] - phpBB3.3.10 Setup does not support PostgreSQL 8.3
          • +
        • [PHPBB-17157] - Read Topic Permission With Search permission
          • +
        • [PHPBB-17181] - If statement to highlight Reported PMS on the view message page doesn't work.
          • +
        • [PHPBB-17194] - Php version in vagrant configuration is not set correctly
          • +
        • [PHPBB-17209] - Mentions migration fails if standard roles can't be found
          • +
        • [PHPBB-17297] - Lazy Avatar Loading Broken
          • +
        • [PHPBB-17301] - Wrong length parameter for fread in phpbb/cache/driver/file.php can lead to unusable forum
          • +
        • [PHPBB-17306] - Wrong declaration of function input values
          • +
        • [PHPBB-17313] - Web Push Settings Module Update Error
          • +
        • [PHPBB-17318] - Avatars do not show in Notifications Dropdown
          • +
        • [PHPBB-17321] - Webpush worker not updated when its script is changed
          • +
        • [PHPBB-17323] - If there is no posts, search index fails
          • +
        • [PHPBB-17328] - Exporting events in master not possible
          • +
        • [PHPBB-17330] - Web Push Notifications Firefox/Android Bug
          • +
        • [PHPBB-17335] - Extension Management Language Bugs
          • +
        • [PHPBB-17336] - Extension Catalog Bugging on "Dev" Minimum Stability
          • +
        • [PHPBB-17341] - acp_forums_copy_perm adm template file is not used anymore
          • +
        • [PHPBB-17343] - Push Notification in Wrong Language
          • +
        • [PHPBB-17351] - phpBB2 password hashes incorrectly handled during rehash cron
          • +
        • [PHPBB-17353] - Gravatar avatar src is not image src
          • +
        • [PHPBB-17364] - Array to String error in ACP Forums
          • +
        • [PHPBB-17373] - Additional horizontal line at the bottom of the quick links
          • +
        • [PHPBB-17379] - Custom BBCode ID is offset due to removed flash bbcode
          • +
        • [PHPBB-17384] - Passing E_USER_ERROR to trigger_error() is deprecated in PHP 8.4
          • +
        • [PHPBB-17399] - Add select attribute for British English the default language
          • +
        • [PHPBB-17451] - Web Push Notification Updates Last Active Time
          • +
        • [PHPBB-17454] - Push Notification Site Names with Emoji
          • +
        • [PHPBB-17457] - app.php causing multiple sessions
          • +
        • [PHPBB-17460] - View quoted post FontAwesome icon is not rendered
          • +
        • [PHPBB-17468] - Reset password feature is not restricted to email
          • +
        • [PHPBB-17487] - PHP critical Uncaught Error when sending email via board
          • +
        • [PHPBB-17488] - PHP critical Uncaught Error when MySQL PDO driver is not enabled
          • +
        • [PHPBB-17489] - Email notifications won't be sent due to messenger queue issues
          • +
        • [PHPBB-17496] - PHP 8.4 deprecation error can break code execution
          • +
        • [PHPBB-17504] - Tests fail because of changed label of ondrej/php repo
          • +
        • [PHPBB-17507] - General SQL error on installing remove_jabber.php migration with PostgreSQL
          • +
        • [PHPBB-17508] - PHP warning on editing custom profile fields
          • +
        • [PHPBB-17510] - CodeSniffer ruleset is reported as DEPRECATED
          • +
        • [PHPBB-17519] - Cron URLs are encoded incorrectly
          • +
        • [PHPBB-17527] - PHP fatal error when decorating Twig phpBB extension service in phpBB extension
          • +
        • [PHPBB-17528] - Uncaught exception when adding autoincrement column in PostgreSQL
          • +
        • [PHPBB-17529] - Installer timeout if config.php doesn't exist
          • +
        • [PHPBB-17533] - Reverting migrations may cause restoring incorrect data and throw "module exists" exceptions
          • +
        • [PHPBB-17537] - Caching of extensions autoloader ConfigCache not working
          • +
        +

        Epic

        +
          +
        • [PHPBB-17009] - Add support for web push notifications
          • +
        +

        Improvement

        +
          +
        • [PHPBB-10824] - Styles should use the same composer.json format for metadata as extensions
          • +
        • [PHPBB-11063] - Change version check to SSL
          • +
        • [PHPBB-11515] - Add interface for lock classes and add new methods
          • +
        • [PHPBB-11838] - OAuth registration from ucp_register
          • +
        • [PHPBB-12439] - Unify behavior of sql_multi_insert for different dbms types
          • +
        • [PHPBB-12591] - Improve breadcrumb functionality with new "Home page"/"Forum index" link
          • +
        • [PHPBB-12623] - Remove the DEBUG constant
          • +
        • [PHPBB-12960] - Remove broken CAPTCHAs
          • +
        • [PHPBB-13162] - Add truncate table functionality to DBAL
          • +
        • [PHPBB-14095] - Replace loading.gif with CSS animations
          • +
        • [PHPBB-14131] - Completely overhaul all colors in Colours.css
          • +
        • [PHPBB-14336] - add title text to online status icon
          • +
        • [PHPBB-14573] - Extend breadcrumb to support more pages
          • +
        • [PHPBB-14771] - Support playing audio files directly in the browser
          • +
        • [PHPBB-14865] - Use stylelint.io to manage css standards
          • +
        • [PHPBB-14948] - Changes 3.3 PHP requirement to 7.1
          • +
        • [PHPBB-14970] - Use stylelint.io in travis CI builds
          • +
        • [PHPBB-14972] - PHP 7.2 compatibility: wrong sizeof/count parameter type
          • +
        • [PHPBB-14981] - Upgrade normalize to version 5
          • +
        • [PHPBB-15115] - Improve & Update the css linting & error checking
          • +
        • [PHPBB-15116] - Fix admin.css lint errors
          • +
        • [PHPBB-15148] - convert contact menu to svg
          • +
        • [PHPBB-15160] - Set correct gitignore path for node modules
          • +
        • [PHPBB-15274] - Migration "custom" tool does not allow parameters
          • +
        • [PHPBB-15291] - Allow short array notation in event declarations
          • +
        • [PHPBB-15295] - Restore MyIsam and mysql environments to test suite
          • +
        • [PHPBB-15330] - Twig function to know if a language string is defined
          • +
        • [PHPBB-15343] - Improve control of forum row
          • +
        • [PHPBB-15344] - upgrade stylelint
          • +
        • [PHPBB-15366] - Reference function directly instead of creating a method
          • +
        • [PHPBB-15371] - Split uploaded files into subdirectories
          • +
        • [PHPBB-15388] - Prosilver: Give interior of Category boxes round corners
          • +
        • [PHPBB-15392] - Change dirname(__FILE__) to __DIR__ everywhere
          • +
        • [PHPBB-15402] - Cleanup tweak.css file
          • +
        • [PHPBB-15403] - add useful front-end tools to package.json
          • +
        • [PHPBB-15404] - Simplify and standardize browser support
          • +
        • [PHPBB-15406] - cleanup and standardize rtl
          • +
        • [PHPBB-15413] - Login from any page and redirecting back there
          • +
        • [PHPBB-15414] - Cleanup unnecessary css
          • +
        • [PHPBB-15499] - Drop HHVM support
          • +
        • [PHPBB-15508] - Upgrade Twig to version 2.x
          • +
        • [PHPBB-15510] - Link Orphan attachments in ACP>General to Orphaned attachments page
          • +
        • [PHPBB-15514] - Improve accessibility by adding vital info from explanation to a title
          • +
        • [PHPBB-15518] - Do not attempt to accurately determine whether posters can read private messages in viewtopic
          • +
        • [PHPBB-15528] - Display the version of the installed styles in acp
          • +
        • [PHPBB-15529] - Color groups in ACP
          • +
        • [PHPBB-15531] - Log malformed BBCodes
          • +
        • [PHPBB-15534] - Outdated ACP extensions database link for phpBB 3.2
          • +
        • [PHPBB-15535] - Add S_FIRST_POST to postrow on viewtopic
          • +
        • [PHPBB-15545] - There is no vertical space between format buttons
          • +
        • [PHPBB-15553] - Add a method to get direct link to storage files
          • +
        • [PHPBB-15561] - Add core events for adding columns to MySQL and Postgres search backends
          • +
        • [PHPBB-15563] - Error instaling phpbb with sqlite database
          • +
        • [PHPBB-15569] - Adjust update instructions to suggest file replacement method
          • +
        • [PHPBB-15580] - Remove extra settings in ACP
          • +
        • [PHPBB-15605] - Correct Right-Margin for ribbon image
          • +
        • [PHPBB-15646] - Add support for Argon2i passwords
          • +
        • [PHPBB-15663] - Remove flash support in attachments
          • +
        • [PHPBB-15687] - Fix filenames in attachments downloads
          • +
        • [PHPBB-15689] - Show statistics of storages in acp_storage
          • +
        • [PHPBB-15692] - Move checks if file exist from adapter to storage
          • +
        • [PHPBB-15699] - Move files between remote filesystems when storage configuration is changed
          • +
        • [PHPBB-15714] - Login after register
          • +
        • [PHPBB-15718] - Update CONTRIBUTING.md
          • +
        • [PHPBB-15747] - Change parameter depth for a boolean subfolders
          • +
        • [PHPBB-15768] - Add a license to a repository
          • +
        • [PHPBB-15769] - Rework avatar handling
          • +
        • [PHPBB-15772] - Hide warning message in acp when install dir is present and allow_install_dir is true
          • +
        • [PHPBB-15924] - Move from precise to trusty builds
          • +
        • [PHPBB-15926] - Deny installs on PHP >= 7.3@dev - Increase min. req. to 5.4.7
          • +
        • [PHPBB-16105] - Use "global" reCAPTCHA domain to circumvent blocking in some countries
          • +
        • [PHPBB-16115] - Add PHP 7.4 builds to travis CI
          • +
        • [PHPBB-16198] - Change symfony debug component with symfony ErrorHandler component
          • +
        • [PHPBB-16204] - Remove hooks system
          • +
        • [PHPBB-16207] - Require cookies for sessions
          • +
        • [PHPBB-16237] - Icon overhaul and rework using twig mixin and iconify
          • +
        • [PHPBB-16240] - Remove deprecated template/theme log language strings
          • +
        • [PHPBB-16288] - PHP 8 compatibility
          • +
        • [PHPBB-16313] - Remote http{} block from nginx sample config
          • +
        • [PHPBB-16430] - Permission ordering
          • +
        • [PHPBB-16441] - Remove deprecated core.ucp_register_agreement
          • +
        • [PHPBB-16472] - Remove PhantomJS UI tests
          • +
        • [PHPBB-16473] - managed_with_clean_error_exception has incorrect filename
          • +
        • [PHPBB-16533] - Add core and template events to customize UCP login keys management module
          • +
        • [PHPBB-16549] - Use PHPUnit 9.3+ for PHP 8.0+ tests
          • +
        • [PHPBB-16574] - Remove support for flash BBCode
          • +
        • [PHPBB-16577] - Add documentation about return type hinting to coding guidelines
          • +
        • [PHPBB-16632] - Update composer to version 2
          • +
        • [PHPBB-16636] - Add PHP 8.0 builds to TravisCI
          • +
        • [PHPBB-16659] - Use Github Actions instead of TravisCI and AppVeyor
          • +
        • [PHPBB-16661] - Clean up github actions tasks after merge
          • +
        • [PHPBB-16668] - Clean up and optimize the schema generator
          • +
        • [PHPBB-16675] - Restore checking commit messages
          • +
        • [PHPBB-16687] - Add stylelint checks to GitHub Actions
          • +
        • [PHPBB-16737] - Rewrite acp_search by splitting configuration and indexing
          • +
        • [PHPBB-16748] - Update coding guidelines to place static after visibility qualifiers
          • +
        • [PHPBB-16751] - Add rank-img class for easier targeting
          • +
        • [PHPBB-16754] - Update doctum
          • +
        • [PHPBB-16764] - Remove remote avatar functionality
          • +
        • [PHPBB-16775] - Run xo linting in GitHub Actions
          • +
        • [PHPBB-16777] - Remove the max image width/height settings
          • +
        • [PHPBB-16782] - Adjust mentions bbcode to better distinct between user and group
          • +
        • [PHPBB-16820] - Move ATTACHMENT_CATEGORY_ constants to attachment manager class
          • +
        • [PHPBB-16821] - Keep Symfony up to the latest 5.x version
          • +
        • [PHPBB-16822] - Replace patchwork/utf8 with symfony/polyfill
          • +
        • [PHPBB-16825] - Adjust handling of session ID when requiring cookies
          • +
        • [PHPBB-16833] - Subscribe to forum or topic icons could be more intuitive
          • +
        • [PHPBB-16853] - Remove depreciated 3.2 css classes
          • +
        • [PHPBB-16858] - Update to the latest version of jQuery 3.6.0
          • +
        • [PHPBB-16860] - Breadcrumbs titles are messed up
          • +
        • [PHPBB-16885] - Add filters to Twig - INT and FLOAT
          • +
        • [PHPBB-16898] - Do not restrict the debug error handler to the development environment
          • +
        • [PHPBB-16899] - Add SVG and WEBP image type to ranks, smilies and topic icons
          • +
        • [PHPBB-16909] - Add PHP 8.2 builds to test matrix
          • +
        • [PHPBB-16913] - Add Search Index Progress Bar with Stats
          • +
        • [PHPBB-16920] - Upgrade Symfony to the version 5.4
          • +
        • [PHPBB-16937] - Run psalm in GitHub Actions
          • +
        • [PHPBB-16939] - Wait for postgres service to start in GitHub Actions windows builds
          • +
        • [PHPBB-16940] - Optimize phpBB Native Search
          • +
        • [PHPBB-16941] - Add Sphinx search backend tests
          • +
        • [PHPBB-16944] - Use icon bundle to load Iconify locally instead of loading from Iconify API
          • +
        • [PHPBB-16950] - Make functional download test work without rewrite config
          • +
        • [PHPBB-16955] - Improve psalm baseline results and add baseline
          • +
        • [PHPBB-16965] - Allow empty value as default database server name on installing
          • +
        • [PHPBB-16967] - Deprecate use of PHP and INCLUDEPHP in templates
          • +
        • [PHPBB-17010] - Add notification method webpush
          • +
        • [PHPBB-17025] - Move post destination topic field should not be populated with a zero
          • +
        • [PHPBB-17093] - Add ACP option to decide who can browse board "Disable board"
          • +
        • [PHPBB-17100] - Introduce twig macros for commonly used form elements
          • +
        • [PHPBB-17135] - Use Symfony Mailer to send emails
          • +
        • [PHPBB-17151] - Adjust twig form macros to follow HTML guidelines
          • +
        • [PHPBB-17153] - Remove deprecated avatar functions
          • +
        • [PHPBB-17155] - Open first unread post by default on topic with unread posts
          • +
        • [PHPBB-17176] - Upgrade Symfony to 6.3
          • +
        • [PHPBB-17184] - Storage: Remove split files into subfolders feature
          • +
        • [PHPBB-17193] - Combine unit and functional tests on github actions runs
          • +
        • [PHPBB-17195] - Remove travis CI files
          • +
        • [PHPBB-17230] - Update doctum for PHP 8.1 support
          • +
        • [PHPBB-17236] - Update symfony dependencies to improve PHP 8.3 compatibility
          • +
        • [PHPBB-17277] - Add template events to UCP
          • +
        • [PHPBB-17279] - Use only needed iconify icon packages
          • +
        • [PHPBB-17283] - Remove iconify support
          • +
        • [PHPBB-17291] - Use icon function in ACP templates
          • +
        • [PHPBB-17293] - Update composer and dependencies to latest versions
          • +
        • [PHPBB-17300] - Better Topic Icons
          • +
        • [PHPBB-17304] - HiDPI smilies for phpBB
          • +
        • [PHPBB-17308] - Rename tracker project key to PHPBB-
          • +
        • [PHPBB-17309] - Update gulp and remove no longer needed gulp packages
          • +
        • [PHPBB-17310] - Update GitHub actions workflows to Node.js 20
          • +
        • [PHPBB-17333] - Push Notification UX Enhancements
          • +
        • [PHPBB-17339] - Add support for push notifications when not logged in
          • +
        • [PHPBB-17340] - Update composer to 2.7.7
          • +
        • [PHPBB-17342] - Add PHP 8.4-dev tests to GitHub Actions
          • +
        • [PHPBB-17344] - UX improvements to web push subscription interface
          • +
        • [PHPBB-17355] - Update gravatar hash to sha256
          • +
        • [PHPBB-17359] - Distinct disabled and not installed extensions in the list
          • +
        • [PHPBB-17363] - Web Push Support for Apple Mobile Devices
          • +
        • [PHPBB-17371] - Web Push UX Updates
          • +
        • [PHPBB-17400] - MSSQL 2017 builds not working on GitHub Actions
          • +
        • [PHPBB-17402] - Add possibility to force reparsing BBCode via CLI
          • +
        • [PHPBB-17414] - Add interface class for CAPTCHA classes
          • +
        • [PHPBB-17415] - Add wrapper for backwards compatibility with legacy CAPTCHAs
          • +
        • [PHPBB-17416] - Add Web Push Notifications FAQ entires
          • +
        • [PHPBB-17418] - HiDPI topic icons
          • +
        • [PHPBB-17434] - Update Vagrantfile to make it work in recent ruby versions
          • +
        • [PHPBB-17445] - Webpush notifications availability shouldn't require email templates
          • +
        • [PHPBB-17449] - Proper emoji handling for progressive web app manifests
          • +
        • [PHPBB-17450] - Remove obsolete requirement for JSON extension
          • +
        • [PHPBB-17459] - Improve prosilver font sizes and backgrounds
          • +
        • [PHPBB-17465] - Add unit tests for handling of web push notifications
          • +
        • [PHPBB-17478] - Add security policy to repository
          • +
        • [PHPBB-17481] - Adjust package generation to be version independent
          • +
        • [PHPBB-17490] - Add unit tests for new Symfony Mailer classes
          • +
        • [PHPBB-17493] - Drop support for Jabber
          • +
        • [PHPBB-17494] - Functional tests don't handle boolean attributes correctly
          • +
        • [PHPBB-17498] - Move GitHub Actions Ubuntu 20.04 runners to Ubuntu 22.04
          • +
        • [PHPBB-17501] - Improve prosilver backgrounds and usability
          • +
        • [PHPBB-17513] - Web push notifications on Safari stop after 3 pushes
          • +
        • [PHPBB-17530] - Use Doctrine driver middleware instead of 'platform' parameter
          • +
        • [PHPBB-17535] - Upgrade PHPUnit to version 10
          • +
        • [PHPBB-17540] - Update windows runners and limit amount of runners on GitHub Actions
          • +
        • [PHPBB-17542] - Test Framework can be exited unexpectedly
          • +
        +

        New Feature

        +
          +
        • [PHPBB-9687] - Refactor ban system
          • +
        • [PHPBB-11150] - Extension Management with Composer
          • +
        • [PHPBB-12683] - Add a CLI command to generate the search index
          • +
        • [PHPBB-13713] - Add ability to @mention specific users in posts
          • +
        • [PHPBB-14169] - Split uploaded files storage into separate class(es)
          • +
        • [PHPBB-15214] - Ability to specify load order of template events
          • +
        • [PHPBB-15538] - Improve and simplify the inclusion of icons
          • +
        • [PHPBB-15565] - fix quote font-size after px conversion
          • +
        • [PHPBB-15851] - Automatic update downloader backend implementation
          • +
        • [PHPBB-16243] - Update template paths
          • +
        • [PHPBB-16856] - Add lang_js() function to twig as replacement for LA_
          • +
        • [PHPBB-16863] - Support playing video attachments
          • +
        • [PHPBB-17173] - Generate signatures for release packages
          • +
        • [PHPBB-17326] - Add icon setting to BBCode edit screen in ACP
          • +
        • [PHPBB-17413] - Add support for Cloudflare Turnstile CAPTCHA
          • +
        • [PHPBB-17515] - Add new event to: ucp_pm_viewmessage.html
          • +
        +

        Security Issue

        +
          +
        • [PHPBB-15570] - Extension version check is restricted to TLS 1.0
          • +
        +

        Sub-task

        + +

        Task

        +
          +
        • [PHPBB-14495] - Build the 3.3 version on the master branch
          • +
        • [PHPBB-14584] - Move deprecated globals and functions to compatibility_*.php
          • +
        • [PHPBB-15213] - Fix stylelint failures in master branch
          • +
        • [PHPBB-15244] - Remove the UNGLOBALISE-related code
          • +
        • [PHPBB-15410] - Remove obsolete code from BBCodes ACP
          • +
        • [PHPBB-15466] - Move Nils in CREDITS.txt
          • +
        • [PHPBB-15516] - Add instructions on running UI tests
          • +
        • [PHPBB-15540] - Refactor search backend classes to Symfony services
          • +
        • [PHPBB-15738] - Remove code related with safe mode
          • +
        • [PHPBB-15874] - Don't access directly to the user lang property
          • +
        • [PHPBB-15927] - Fix ACP table display error
          • +
        • [PHPBB-16112] - Update composer dependencies to latest
          • +
        • [PHPBB-16133] - Upgrade packages in packages.json
          • +
        • [PHPBB-16224] - Update composer dependencies
          • +
        • [PHPBB-16246] - Prettify and update README Automated Testing section
          • +
        • [PHPBB-16284] - Move 4.0 migrations to v400 folder.
          • +
        • [PHPBB-16405] - Update npm dependencies to latest versions
          • +
        • [PHPBB-16572] - Update node modules to latest versions
          • +
        • [PHPBB-16615] - Update node dependencies to resolve dependabot alert
          • +
        • [PHPBB-16616] - Update composer dependencies to latest versions
          • +
        • [PHPBB-16633] - Update pull request template after end of life of 3.2
          • +
        • [PHPBB-16669] - Update node ini dependency to latest version
          • +
        • [PHPBB-16746] - Update node dependencies in master
          • +
        • [PHPBB-16769] - Update composer to latest version
          • +
        • [PHPBB-16790] - Remove unused code in acp,mcp,ucp
          • +
        • [PHPBB-16928] - Update composer and composer dependencies to latest versions
          • +
        • [PHPBB-16987] - Update composer and composer dependencies
          • +
        • [PHPBB-17048] - Update composer and dependencies for 3.3.9
          • +
        • [PHPBB-17066] - Update GitHub Actions configuration to resolve deprecations
          • +
        • [PHPBB-17108] - Update composer dependencies to latest versions
          • +
        • [PHPBB-17110] - Reword "slander" to "libel" in registration legalese
          • +
        • [PHPBB-17149] - Update authors and pull request template
          • +
        • [PHPBB-17154] - Update composer and dependencies to latest versions
          • +
        • [PHPBB-17204] - Update composer and node dependencies
          • +
        • [PHPBB-17280] - Fallback to branch name on branches without ticket ID
          • +
        • [PHPBB-17281] - Update psalm to 5.x version
          • +
        • [PHPBB-17403] - Update composer and node requirements
          • +
        • [PHPBB-17432] - Update dependencies to latest version
          • +
        • [PHPBB-17464] - Remove deprecated meta tags
          • +
        • [PHPBB-17503] - Update composer dependencies
          • +
        • [PHPBB-17509] - Bump DBMS supported versions
          • +
        • [PHPBB-17512] - Add PHP Sniffer coding standard to check union type
          • +
        • [PHPBB-17514] - Remove version 3 specifier from paths and content
          • +
        • [PHPBB-17516] - Remove dependency on CHItA/TopologicalSort
          • +
        • [PHPBB-17517] - Make proper use of eslint
          • +
        • [PHPBB-17543] - Update composer and dependencies
          • +
        +

        Changes since 3.3.15-RC1

        Bug

          From ed6f609b3408a9f0ca2458d4e476200fe9f0ebb4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 12:40:05 +0200 Subject: [PATCH 0914/1214] [prep-release-4.0.0] Only build for latest versions of previous versions --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index c8fafa0e1c3..9ccb75e66cc 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + From c912d69fda37e8d08d7bf8224fb9b19500b8b796 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 12:40:54 +0200 Subject: [PATCH 0915/1214] [prep-release-4.0.0] Update version numbers to 4.0.0-a1 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index 9ccb75e66cc..c8fafa0e1c3 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + From 9f6bb5c2586587c2dba8137b11af312f0c873853 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 13:16:28 +0200 Subject: [PATCH 0916/1214] [prep-release-4.0.0] Update version numbers to 4.0.0-a1 --- build/build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/build.xml b/build/build.xml index c8fafa0e1c3..9ccb75e66cc 100644 --- a/build/build.xml +++ b/build/build.xml @@ -4,7 +4,7 @@ - + From e362789602bb633bdd5b0aa76ba84f4bc5aa63d4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 15:46:21 +0200 Subject: [PATCH 0917/1214] [prep-release-4.0.0] Do not add rename duplicate index names migration --- phpBB/phpbb/db/migration/data/v400/v400a1.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v400/v400a1.php b/phpBB/phpbb/db/migration/data/v400/v400a1.php index adbaaed24be..8897d6f279d 100644 --- a/phpBB/phpbb/db/migration/data/v400/v400a1.php +++ b/phpBB/phpbb/db/migration/data/v400/v400a1.php @@ -28,7 +28,6 @@ public static function depends_on() '\phpbb\db\migration\data\v400\remove_remote_avatar', '\phpbb\db\migration\data\v400\increase_avatar_size', '\phpbb\db\migration\data\v400\remove_img_link', - '\phpbb\db\migration\data\v400\rename_duplicated_index_names', '\phpbb\db\migration\data\v400\add_bbcode_font_icon', '\phpbb\db\migration\data\v400\font_awesome_6_upgrade', '\phpbb\db\migration\data\v400\remove_broken_captcha', From 7551729db2bafa2eae5870fd1491cadeb1183d52 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Sep 2025 21:56:41 +0200 Subject: [PATCH 0918/1214] [prep-release-4.0.0] Fix installer icons --- phpBB/adm/style/admin.css | 4 ++++ phpBB/config/installer/container/services.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 290eaffcf8d..8ffac325af6 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -663,6 +663,7 @@ li { #menu li span.completed:before { font-family: "Font Awesome 6 Free"; + font-weight: 900; color: #515f77; margin-right: 1px; margin-left: -8px; @@ -676,6 +677,7 @@ li { .rtl #menu li span.completed:before { font-family: "Font Awesome 6 Free"; + font-weight: 900; color: #515f77; margin-right: -8px; margin-left: 1px; @@ -2858,12 +2860,14 @@ fieldset.permissions .permissions-switch { .roles-options > span:after { font-family: "Font Awesome 6 Free"; + font-weight: 900; float: right; content: "\f107"; } .rtl .roles-options > span:after { font-family: "Font Awesome 6 Free"; + font-weight: 900; float: left; content: "\f107"; } diff --git a/phpBB/config/installer/container/services.yml b/phpBB/config/installer/container/services.yml index 7ef423afb11..40e890e01ce 100644 --- a/phpBB/config/installer/container/services.yml +++ b/phpBB/config/installer/container/services.yml @@ -9,6 +9,7 @@ imports: - { resource: ../../default/container/services_php.yml } - { resource: ../../default/container/services_routing.yml } - { resource: ../../default/container/services_twig.yml } + - { resource: ../../default/container/services_twig_extensions.yml } services: assets.bag: From 5c4a7cbed6b5e7e4a44a8200dac593384d76700d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Sep 2025 10:07:33 +0200 Subject: [PATCH 0919/1214] [prep-release-4.0.0] Update prosilver version --- phpBB/styles/prosilver/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/composer.json b/phpBB/styles/prosilver/composer.json index 761638e5e13..bc7144f407e 100644 --- a/phpBB/styles/prosilver/composer.json +++ b/phpBB/styles/prosilver/composer.json @@ -2,7 +2,7 @@ "name": "phpbb/phpbb-style-prosilver", "description": "phpBB Forum Software default style", "type": "phpbb-style", - "version": "4.0.0-a1-dev", + "version": "4.0.0-a1", "homepage": "https://www.phpbb.com", "license": "GPL-2.0-only", "authors": [ @@ -21,7 +21,7 @@ }, "extra": { "display-name": "prosilver", - "phpbb-version": "4.0.0-a1-dev", + "phpbb-version": "4.0.0-a1", "parent-style": "" } } From 6ee106e317a746702c6c64ec54d736e2636265e7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Sep 2025 10:09:28 +0200 Subject: [PATCH 0920/1214] [prep-release-4.0.0] Update version numbers to 4.0.0 --- phpBB/styles/prosilver/composer.json | 50 ++++++++++++++-------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/phpBB/styles/prosilver/composer.json b/phpBB/styles/prosilver/composer.json index bc7144f407e..7b6ee810963 100644 --- a/phpBB/styles/prosilver/composer.json +++ b/phpBB/styles/prosilver/composer.json @@ -1,27 +1,27 @@ { - "name": "phpbb/phpbb-style-prosilver", - "description": "phpBB Forum Software default style", - "type": "phpbb-style", - "version": "4.0.0-a1", - "homepage": "https://www.phpbb.com", - "license": "GPL-2.0-only", - "authors": [ - { - "name": "phpBB Limited", - "email": "operations@phpbb.com", - "homepage": "https://www.phpbb.com/go/authors" - } - ], - "support": { - "issues": "https://tracker.phpbb.com", - "forum": "https://www.phpbb.com/community/", - "docs": "https://www.phpbb.com/support/docs/", - "irc": "irc://irc.libera.chat/phpbb", - "chat": "https://www.phpbb.com/support/chat/" - }, - "extra": { - "display-name": "prosilver", - "phpbb-version": "4.0.0-a1", - "parent-style": "" - } + "name": "phpbb/phpbb-style-prosilver", + "description": "phpBB Forum Software default style", + "type": "phpbb-style", + "version": "4.0.0", + "homepage": "https://www.phpbb.com", + "license": "GPL-2.0-only", + "authors": [ + { + "name": "phpBB Limited", + "email": "operations@phpbb.com", + "homepage": "https://www.phpbb.com/go/authors" + } + ], + "support": { + "issues": "https://tracker.phpbb.com", + "forum": "https://www.phpbb.com/community/", + "docs": "https://www.phpbb.com/support/docs/", + "irc": "irc://irc.libera.chat/phpbb", + "chat": "https://www.phpbb.com/support/chat/" + }, + "extra": { + "display-name": "prosilver", + "phpbb-version": "4.0.0-a1", + "parent-style": "" + } } From a063b534eb7441f30251e6e470bd255ccd74eb2a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Sep 2025 10:11:06 +0200 Subject: [PATCH 0921/1214] [prep-release-4.0.0] Update changelog for 4.0.0-a1 --- phpBB/docs/CHANGELOG.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3f42cefefb8..8bb87f26bb2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -176,7 +176,7 @@

          Changelog

          -

          Changes since 3.3.15

          +

          Changes since 3.3.x

          Bug

          • [PHPBB-11449] - Get rid of recursive calls in class phpbb_notification_manager
            • @@ -326,6 +326,10 @@

            Bug

          • [PHPBB-17529] - Installer timeout if config.php doesn't exist
          • [PHPBB-17533] - Reverting migrations may cause restoring incorrect data and throw "module exists" exceptions
          • [PHPBB-17537] - Caching of extensions autoloader ConfigCache not working
            • +
          • [PHPBB-17546] - Schema generator CLI does not work
            • +
          • [PHPBB-17547] - Login fails after multiple failed attempts due to incorrect Captcha enum value passed to init()
            • +
          • [PHPBB-17548] - Updating to phpBB4 with files missing is giving a error
            • +
          • [PHPBB-17549] - British English language pack has wrong license definition in composer.json

          Epic

            @@ -513,6 +517,7 @@

            Improvement

          • [PHPBB-17513] - Web push notifications on Safari stop after 3 pushes
          • [PHPBB-17530] - Use Doctrine driver middleware instead of 'platform' parameter
          • [PHPBB-17535] - Upgrade PHPUnit to version 10
            • +
          • [PHPBB-17538] - Terms and Policy wording improvements
          • [PHPBB-17540] - Update windows runners and limit amount of runners on GitHub Actions
          • [PHPBB-17542] - Test Framework can be exited unexpectedly
          @@ -608,6 +613,7 @@

          Task

        • [PHPBB-17516] - Remove dependency on CHItA/TopologicalSort
        • [PHPBB-17517] - Make proper use of eslint
        • [PHPBB-17543] - Update composer and dependencies
          • +
        • [PHPBB-17544] - Support Codespaces on master

        Changes since 3.3.15-RC1

        From d54cb419c04163c522808e067d1289b471d174b4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Sep 2025 12:49:41 +0200 Subject: [PATCH 0922/1214] [master] Update versions to 4.0.0-a2-dev --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/build.xml b/build/build.xml index 9ccb75e66cc..a181092a235 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 7937fb5683f..356faa2f6cd 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '4.0.0-a1'); +@define('PHPBB_VERSION', '4.0.0-a2-dev'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index dbdad251180..2da7f8ba33d 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -299,7 +299,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_last INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a1'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a2-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '[]'); From aa674a42a04cad6d2ae1d2e18a23f12e81df3eaf Mon Sep 17 00:00:00 2001 From: rubencm Date: Sun, 11 Apr 2021 06:18:23 +0200 Subject: [PATCH 0923/1214] [ticket/16005] Remove phpbb2 converter PHPBB3-16005 --- phpBB/install/convertors/convert_phpbb20.php | 984 --------- .../install/convertors/functions_phpbb20.php | 1929 ----------------- phpBB/install/convertors/index.htm | 10 + 3 files changed, 10 insertions(+), 2913 deletions(-) delete mode 100644 phpBB/install/convertors/convert_phpbb20.php delete mode 100644 phpBB/install/convertors/functions_phpbb20.php create mode 100644 phpBB/install/convertors/index.htm diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php deleted file mode 100644 index 84b31feac61..00000000000 --- a/phpBB/install/convertors/convert_phpbb20.php +++ /dev/null @@ -1,984 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -use phpbb\messenger\method\messenger_interface; - -/** -* NOTE to potential convertor authors. Please use this file to get -* familiar with the structure since we added some bare explanations here. -* -* Since this file gets included more than once on one page you are not able to add functions to it. -* Instead use a functions_ file. -* -* @ignore -*/ -if (!defined('IN_PHPBB')) -{ - exit; -} - -$phpbb_config_php_file = new \phpbb\config_php_file($phpbb_root_path, $phpEx); -extract($phpbb_config_php_file->get_all()); -unset($dbpasswd); - -$dbms = \phpbb\config_php_file::convert_30_dbms_to_31($dbms); - -/** -* $convertor_data provides some basic information about this convertor which is -* used on the initial list of convertors and to populate the default settings -*/ -$convertor_data = array( - 'forum_name' => 'phpBB 2.0.x', - 'version' => '1.0.3', - 'phpbb_version' => '4.0.0', - 'author' => 'phpBB Limited', - 'dbms' => $dbms, - 'dbhost' => $dbhost, - 'dbport' => $dbport, - 'dbuser' => $dbuser, - 'dbpasswd' => '', - 'dbname' => $dbname, - 'table_prefix' => 'phpbb_', - 'forum_path' => '../forums', - 'author_notes' => '', -); - -/** -* $tables is a list of the tables (minus prefix) which we expect to find in the -* source forum. It is used to guess the prefix if the specified prefix is incorrect -*/ -$tables = array( - 'auth_access', - 'banlist', - 'categories', - 'disallow', - 'forum_prune', - 'forums', - 'groups', - 'posts', - 'posts_text', - 'privmsgs', - 'privmsgs_text', - 'ranks', - 'smilies', - 'topics', - 'topics_watch', - 'user_group', - 'users', - 'vote_desc', - 'vote_results', - 'vote_voters', - 'words' -); - -/** -* $config_schema details how the board configuration information is stored in the source forum. -* -* 'table_format' can take the value 'file' to indicate a config file. In this case array_name -* is set to indicate the name of the array the config values are stored in -* Example of using a file: -* $config_schema = array( -* 'table_format' => 'file', -* 'filename' => 'NAME OF FILE', // If the file is not in the root directory, the path needs to be added with no leading slash -* 'array_name' => 'NAME OF ARRAY', // Only used if the configuration file stores the setting in an array. -* 'settings' => array( -* 'board_email' => 'SUPPORT_EMAIL', // target config name => source target name -* ) -* ); -* 'table_format' can be an array if the values are stored in a table which is an assosciative array -* (as per phpBB 2.0.x) -* If left empty, values are assumed to be stored in a table where each config setting is -* a column (as per phpBB 1.x) -* -* In either of the latter cases 'table_name' indicates the name of the table in the database -* -* 'settings' is an array which maps the name of the config directive in the source forum -* to the config directive in phpBB. It can either be a direct mapping or use a function. -* Please note that the contents of the old config value are passed to the function, therefore -* an in-built function requiring the variable passed by reference is not able to be used. Since -* empty() is such a function we created the function is_empty() to be used instead. -*/ -$config_schema = array( - 'table_name' => 'config', - 'table_format' => array('config_name' => 'config_value'), - 'settings' => array( - 'allow_bbcode' => 'allow_bbcode', - 'allow_smilies' => 'allow_smilies', - 'allow_sig' => 'allow_sig', - 'allow_namechange' => 'allow_namechange', - 'allow_avatar_local' => 'allow_avatar_local', - 'allow_avatar_upload' => 'allow_avatar_upload', - 'board_disable' => 'board_disable', - 'sitename' => 'phpbb_set_encoding(sitename)', - 'site_desc' => 'phpbb_set_encoding(site_desc)', - 'session_length' => 'session_length', - 'board_email_sig' => 'phpbb_set_encoding(board_email_sig)', - 'posts_per_page' => 'posts_per_page', - 'topics_per_page' => 'topics_per_page', - 'enable_confirm' => 'enable_confirm', - 'board_email_form' => 'board_email_form', - 'override_user_style' => 'override_user_style', - 'hot_threshold' => 'hot_threshold', - 'max_poll_options' => 'max_poll_options', - 'max_sig_chars' => 'max_sig_chars', - 'pm_max_msgs' => 'max_inbox_privmsgs', - 'smtp_delivery' => 'smtp_delivery', - 'smtp_host' => 'smtp_host', - 'smtp_username' => 'smtp_username', - 'smtp_password' => 'smtp_password', - 'require_activation' => 'require_activation', - 'flood_interval' => 'flood_interval', - 'avatar_filesize' => 'avatar_filesize', - 'avatar_max_width' => 'avatar_max_width', - 'avatar_max_height' => 'avatar_max_height', - 'default_dateformat' => 'phpbb_set_encoding(default_dateformat)', - 'board_timezone' => 'phpbb_convert_timezone(board_timezone)', - 'allow_privmsg' => 'not(privmsg_disable)', - 'gzip_compress' => 'gzip_compress', - 'coppa_enable' => '!is_empty(coppa_mail)', - 'coppa_fax' => 'coppa_fax', - 'coppa_mail' => 'coppa_mail', - 'record_online_users' => 'record_online_users', - 'record_online_date' => 'record_online_date', - 'board_startdate' => 'board_startdate', - ) -); - -/** -* $test_file is the name of a file which is present on the source -* forum which can be used to check that the path specified by the -* user was correct -*/ -$test_file = 'modcp.php'; - -/** -* If this is set then we are not generating the first page of information but getting the conversion information. -*/ -if (!$get_info) -{ - // Test to see if the birthday MOD is installed on the source forum - // Niels' birthday mod - if (get_config_value('birthday_required') !== false || get_config_value('bday_require') !== false) - { - define('MOD_BIRTHDAY', true); - } - - // TerraFrost's validated birthday mod - if (get_config_value('bday_require') !== false) - { - define('MOD_BIRTHDAY_TERRA', true); - } - - // Test to see if the attachment MOD is installed on the source forum - // If it is, we will convert this data as well - $src_db->sql_return_on_error(true); - - $sql = "SELECT config_value - FROM {$convert->src_table_prefix}attachments_config - WHERE config_name = 'upload_dir'"; - $result = $src_db->sql_query($sql); - - if ($result && $row = $src_db->sql_fetchrow($result)) - { - // Here the constant is defined - define('MOD_ATTACHMENT', true); - - // Here i add more tables to be checked in the old forum - $tables += array( - 'attachments', - 'attachments_desc', - 'extensions', - 'extension_groups' - ); - - $src_db->sql_freeresult($result); - } - else if ($result) - { - $src_db->sql_freeresult($result); - } - - - /** - * Tests for further MODs can be included here. - * Please use constants for this, prefixing them with MOD_ - */ - - $src_db->sql_return_on_error(false); - - // Now let us set a temporary config variable for user id incrementing - $sql = "SELECT user_id - FROM {$convert->src_table_prefix}users - WHERE user_id = 1"; - $result = $src_db->sql_query($sql); - $user_id = (int) $src_db->sql_fetchfield('user_id'); - $src_db->sql_freeresult($result); - - // If there is a user id 1, we need to increment user ids. :/ - if ($user_id === 1) - { - // Try to get the maximum user id possible... - $sql = "SELECT MAX(user_id) AS max_user_id - FROM {$convert->src_table_prefix}users"; - $result = $src_db->sql_query($sql); - $user_id = (int) $src_db->sql_fetchfield('max_user_id'); - $src_db->sql_freeresult($result); - - $config->set('increment_user_id', ($user_id + 1), false); - } - else - { - $config->set('increment_user_id', 0, false); - } - - // Overwrite maximum avatar width/height - @define('DEFAULT_AVATAR_X_CUSTOM', get_config_value('avatar_max_width')); - @define('DEFAULT_AVATAR_Y_CUSTOM', get_config_value('avatar_max_height')); - - // additional table used only during conversion - @define('USERCONV_TABLE', $table_prefix . 'userconv'); - -/** -* Description on how to use the convertor framework. -* -* 'schema' Syntax Description -* -> 'target' => Target Table. If not specified the next table will be handled -* -> 'primary' => Primary Key. If this is specified then this table is processed in batches -* -> 'query_first' => array('target' or 'src', Query to execute before beginning the process -* (if more than one then specified as array)) -* -> 'function_first' => Function to execute before beginning the process (if more than one then specified as array) -* (This is mostly useful if variables need to be given to the converting process) -* -> 'test_file' => This is not used at the moment but should be filled with a file from the old installation -* -* // DB Functions -* 'distinct' => Add DISTINCT to the select query -* 'where' => Add WHERE to the select query -* 'group_by' => Add GROUP BY to the select query -* 'left_join' => Add LEFT JOIN to the select query (if more than one joins specified as array) -* 'having' => Add HAVING to the select query -* -* // DB INSERT array -* This one consist of three parameters -* First Parameter: -* The key need to be filled within the target table -* If this is empty, the target table gets not assigned the source value -* Second Parameter: -* Source value. If the first parameter is specified, it will be assigned this value. -* If the first parameter is empty, this only gets added to the select query -* Third Parameter: -* Custom Function. Function to execute while storing source value into target table. -* The functions return value get stored. -* The function parameter consist of the value of the second parameter. -* -* types: -* - empty string == execute nothing -* - string == function to execute -* - array == complex execution instructions -* -* Complex execution instructions: -* @todo test complex execution instructions - in theory they will work fine -* -* By defining an array as the third parameter you are able to define some statements to be executed. The key -* is defining what to execute, numbers can be appended... -* -* 'function' => execute function -* 'execute' => run code, whereby all occurrences of {VALUE} get replaced by the last returned value. -* The result *must* be assigned/stored to {RESULT}. -* 'typecast' => typecast value -* -* The returned variables will be made always available to the next function to continue to work with. -* -* example (variable inputted is an integer of 1): -* -* array( -* 'function1' => 'increment_by_one', // returned variable is 2 -* 'typecast' => 'string', // typecast variable to be a string -* 'execute' => '{RESULT} = {VALUE} . ' is good';', // returned variable is '2 is good' -* 'function2' => 'replace_good_with_bad', // returned variable is '2 is bad' -* ), -* -*/ - - $convertor = array( - 'test_file' => 'viewtopic.php', - - 'avatar_path' => get_config_value('avatar_path') . '/', - 'avatar_gallery_path' => get_config_value('avatar_gallery_path') . '/', - 'smilies_path' => get_config_value('smilies_path') . '/', - 'upload_path' => (defined('MOD_ATTACHMENT')) ? phpbb_get_files_dir() . '/' : '', - 'thumbnails' => (defined('MOD_ATTACHMENT')) ? array('thumbs/', 't_') : '', - 'ranks_path' => false, // phpBB 2.0.x had no config value for a ranks path - - // We empty some tables to have clean data available - 'query_first' => array( - array('target', $convert->truncate_statement . SEARCH_RESULTS_TABLE), - array('target', $convert->truncate_statement . SEARCH_WORDLIST_TABLE), - array('target', $convert->truncate_statement . SEARCH_WORDMATCH_TABLE), - array('target', $convert->truncate_statement . LOG_TABLE), - ), - -// with this you are able to import all attachment files on the fly. For large boards this is not an option, therefore commented out by default. -// Instead every file gets copied while processing the corresponding attachment entry. -// if (defined("MOD_ATTACHMENT")) { import_attachment_files(); phpbb_copy_thumbnails(); } - - // phpBB2 allowed some similar usernames to coexist which would have the same - // username_clean in phpBB which is not possible, so we'll give the admin a list - // of user ids and usernames and let him deicde what he wants to do with them - 'execute_first' => ' - phpbb_create_userconv_table(); - import_avatar_gallery(); - if (defined("MOD_ATTACHMENT")) phpbb_import_attach_config(); - phpbb_insert_forums(); - ', - - 'execute_last' => array(' - add_bots(); - ', ' - update_folder_pm_count(); - ', ' - update_unread_count(); - ', (defined('MOD_ATTACHMENT')) ? ' - phpbb_attachment_extension_group_name(); - ' : ' - ', ' - phpbb_convert_authentication(\'start\'); - ', ' - phpbb_convert_authentication(\'first\'); - ', ' - phpbb_convert_authentication(\'second\'); - ', ' - phpbb_convert_authentication(\'third\'); - '), - - 'schema' => array( - array( - 'target' => USERCONV_TABLE, - 'query_first' => array('target', $convert->truncate_statement . USERCONV_TABLE), - - - array('user_id', 'users.user_id', ''), - array('username_clean', 'users.username', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_clean_string')), - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '', - 'primary' => 'attachments.attach_id', - 'query_first' => (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . ATTACHMENTS_TABLE) : '', - 'autoincrement' => 'attach_id', - - array('attach_id', 'attachments.attach_id', ''), - array('post_msg_id', 'attachments.post_id', ''), - array('topic_id', 'posts.topic_id', ''), - array('in_message', 0, ''), - array('is_orphan', 0, ''), - array('poster_id', 'attachments.user_id_1 AS poster_id', 'phpbb_user_id'), - array('physical_filename', 'attachments_desc.physical_filename', 'import_attachment'), - array('real_filename', 'attachments_desc.real_filename', 'phpbb_set_encoding'), - array('download_count', 'attachments_desc.download_count', ''), - array('attach_comment', 'attachments_desc.comment', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('extension', 'attachments_desc.extension', ''), - array('mimetype', 'attachments_desc.mimetype', ''), - array('filesize', 'attachments_desc.filesize', ''), - array('filetime', 'attachments_desc.filetime', ''), - array('thumbnail', 'attachments_desc.thumbnail', ''), - - 'where' => 'attachments_desc.attach_id = attachments.attach_id AND attachments.privmsgs_id = 0 AND posts.post_id = attachments.post_id', - 'group_by' => 'attachments.attach_id' - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? ATTACHMENTS_TABLE : '', - 'primary' => 'attachments.attach_id', - 'autoincrement' => 'attach_id', - - array('attach_id', 'attachments.attach_id', ''), - array('post_msg_id', 'attachments.privmsgs_id', ''), - array('topic_id', 0, ''), - array('in_message', 1, ''), - array('is_orphan', 0, ''), - array('poster_id', 'attachments.user_id_1 AS poster_id', 'phpbb_user_id'), - array('physical_filename', 'attachments_desc.physical_filename', 'import_attachment'), - array('real_filename', 'attachments_desc.real_filename', 'phpbb_set_encoding'), - array('download_count', 'attachments_desc.download_count', ''), - array('attach_comment', 'attachments_desc.comment', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('extension', 'attachments_desc.extension', ''), - array('mimetype', 'attachments_desc.mimetype', ''), - array('filesize', 'attachments_desc.filesize', ''), - array('filetime', 'attachments_desc.filetime', ''), - array('thumbnail', 'attachments_desc.thumbnail', ''), - - 'where' => 'attachments_desc.attach_id = attachments.attach_id AND attachments.post_id = 0', - 'group_by' => 'attachments.attach_id' - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? EXTENSIONS_TABLE : '', - 'query_first' => (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSIONS_TABLE) : '', - 'autoincrement' => 'extension_id', - - array('extension_id', 'extensions.ext_id', ''), - array('group_id', 'extensions.group_id', ''), - array('extension', 'extensions.extension', ''), - ), - - array( - 'target' => (defined('MOD_ATTACHMENT')) ? EXTENSION_GROUPS_TABLE : '', - 'query_first' => (defined('MOD_ATTACHMENT')) ? array('target', $convert->truncate_statement . EXTENSION_GROUPS_TABLE) : '', - 'autoincrement' => 'group_id', - - array('group_id', 'extension_groups.group_id', ''), - array('group_name', 'extension_groups.group_name', array('function1' => 'phpbb_set_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('cat_id', 'extension_groups.cat_id', 'phpbb_attachment_category'), - array('allow_group', 'extension_groups.allow_group', ''), - array('upload_icon', '', ''), - array('max_filesize', 'extension_groups.max_filesize', ''), - array('allowed_forums', 'extension_groups.forum_permissions', 'phpbb_attachment_forum_perms'), - array('allow_in_pm', 1, ''), - ), - - array( - 'target' => BANS_TABLE, - 'execute_first' => 'phpbb_check_username_collisions();', - 'query_first' => array('target', $convert->truncate_statement . BANS_TABLE), - - array('ban_mode', 'user', ''), - array('ban_item', 'banlist.ban_userid', 'phpbb_user_id'), - array('ban_userid', 'banlist.ban_userid', 'phpbb_user_id'), - array('ban_reason', '', ''), - array('ban_reason_display', '', ''), - - 'where' => "banlist.ban_ip NOT LIKE '%.%' - AND banlist.ban_userid <> 0", - ), - - array( - 'target' => BANS_TABLE, - - array('ban_mode', 'email', ''), - array('ban_item', 'banlist.ban_email', ''), - array('ban_reason', '', ''), - array('ban_reason_display', '', ''), - - 'where' => "banlist.ban_ip NOT LIKE '%.%' - AND banlist.ban_email <> ''", - ), - - array( - 'target' => BANS_TABLE, - - array('ban_mode', 'ip', ''), - array('ban_item', 'banlist.ban_ip', 'decode_ban_ip'), - array('ban_reason', '', ''), - array('ban_reason_display', '', ''), - - 'where' => "banlist.ban_userid = 0 - AND banlist.ban_ip <> ''", - ), - - array( - 'target' => DISALLOW_TABLE, - 'query_first' => array('target', $convert->truncate_statement . DISALLOW_TABLE), - - array('disallow_username', 'disallow.disallow_username', 'phpbb_disallowed_username'), - ), - - array( - 'target' => RANKS_TABLE, - 'query_first' => array('target', $convert->truncate_statement . RANKS_TABLE), - 'autoincrement' => 'rank_id', - - array('rank_id', 'ranks.rank_id', ''), - array('rank_title', 'ranks.rank_title', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_htmlspecialchars')), - array('rank_min', 'ranks.rank_min', array('typecast' => 'int', 'execute' => '{RESULT} = ({VALUE}[0] < 0) ? 0 : {VALUE}[0];')), - array('rank_special', 'ranks.rank_special', ''), - array('rank_image', 'ranks.rank_image', 'import_rank'), - ), - - array( - 'target' => TOPICS_TABLE, - 'query_first' => array('target', $convert->truncate_statement . TOPICS_TABLE), - 'primary' => 'topics.topic_id', - 'autoincrement' => 'topic_id', - - array('topic_id', 'topics.topic_id', ''), - array('forum_id', 'topics.forum_id', ''), - array('icon_id', 0, ''), - array('topic_poster', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('topic_attachment', ((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''), - array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'), - array('topic_time', 'topics.topic_time', ''), - array('topic_views', 'topics.topic_views', ''), - array('topic_posts_approved', 'topics.topic_replies', 'phpbb_topic_replies_to_posts'), - array('topic_posts_unapproved', 0, ''), - array('topic_posts_softdeleted',0, ''), - array('topic_last_post_id', 'topics.topic_last_post_id', ''), - array('topic_status', 'topics.topic_status', 'is_topic_locked'), - array('topic_moved_id', 0, ''), - array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), - array('topic_first_post_id', 'topics.topic_first_post_id', ''), - array('topic_last_view_time', 'posts.post_time', 'intval'), - array('topic_visibility', ITEM_APPROVED, ''), - - array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')), - array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), - array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), - array('poll_max_options', 1, ''), - array('poll_vote_change', 0, ''), - - 'left_join' => array ( 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', - 'topics LEFT JOIN posts ON topics.topic_last_post_id = posts.post_id', - ), - 'where' => 'topics.topic_moved_id = 0', - ), - - array( - 'target' => TOPICS_TABLE, - 'primary' => 'topics.topic_id', - 'autoincrement' => 'topic_id', - - array('topic_id', 'topics.topic_id', ''), - array('forum_id', 'topics.forum_id', ''), - array('icon_id', 0, ''), - array('topic_poster', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('topic_attachment', ((defined('MOD_ATTACHMENT')) ? 'topics.topic_attachment' : 0), ''), - array('topic_title', 'topics.topic_title', 'phpbb_set_encoding'), - array('topic_time', 'topics.topic_time', ''), - array('topic_views', 'topics.topic_views', ''), - array('topic_posts_approved', 'topics.topic_replies', 'phpbb_topic_replies_to_posts'), - array('topic_posts_unapproved', 0, ''), - array('topic_posts_softdeleted',0, ''), - array('topic_last_post_id', 'topics.topic_last_post_id', ''), - array('topic_status', ITEM_MOVED, ''), - array('topic_moved_id', 'topics.topic_moved_id', ''), - array('topic_type', 'topics.topic_type', 'phpbb_convert_topic_type'), - array('topic_first_post_id', 'topics.topic_first_post_id', ''), - array('topic_visibility', ITEM_APPROVED, ''), - - array('poll_title', 'vote_desc.vote_text', array('function1' => 'null_to_str', 'function2' => 'phpbb_set_encoding', 'function3' => 'htmlspecialchars_decode', 'function4' => 'utf8_htmlspecialchars')), - array('poll_start', 'vote_desc.vote_start', 'null_to_zero'), - array('poll_length', 'vote_desc.vote_length', 'null_to_zero'), - array('poll_max_options', 1, ''), - array('poll_vote_change', 0, ''), - - 'left_join' => 'topics LEFT JOIN vote_desc ON topics.topic_id = vote_desc.topic_id AND topics.topic_vote = 1', - 'where' => 'topics.topic_moved_id <> 0', - ), - - array( - 'target' => TOPICS_WATCH_TABLE, - 'primary' => 'topics_watch.topic_id', - 'query_first' => array('target', $convert->truncate_statement . TOPICS_WATCH_TABLE), - - array('topic_id', 'topics_watch.topic_id', ''), - array('user_id', 'topics_watch.user_id', 'phpbb_user_id'), - array('notify_status', 'topics_watch.notify_status', ''), - ), - - array( - 'target' => SMILIES_TABLE, - 'query_first' => array('target', $convert->truncate_statement . SMILIES_TABLE), - 'autoincrement' => 'smiley_id', - - array('smiley_id', 'smilies.smilies_id', ''), - array('code', 'smilies.code', array('function1' => 'phpbb_smilie_html_decode', 'function2' => 'phpbb_set_encoding', 'function3' => 'utf8_htmlspecialchars')), - array('emotion', 'smilies.emoticon', 'phpbb_set_encoding'), - array('smiley_url', 'smilies.smile_url', 'import_smiley'), - array('smiley_width', 'smilies.smile_url', 'get_smiley_width'), - array('smiley_height', 'smilies.smile_url', 'get_smiley_height'), - array('smiley_order', 'smilies.smilies_id', ''), - array('display_on_posting', 'smilies.smilies_id', 'get_smiley_display'), - - 'order_by' => 'smilies.smilies_id ASC', - ), - - array( - 'target' => POLL_OPTIONS_TABLE, - 'primary' => 'vote_results.vote_option_id', - 'query_first' => array('target', $convert->truncate_statement . POLL_OPTIONS_TABLE), - - array('poll_option_id', 'vote_results.vote_option_id', ''), - array('topic_id', 'vote_desc.topic_id', ''), - array('', 'topics.topic_poster AS poster_id', 'phpbb_user_id'), - array('poll_option_text', 'vote_results.vote_option_text', array('function1' => 'phpbb_set_encoding', 'function2' => 'htmlspecialchars_decode', 'function3' => 'utf8_htmlspecialchars')), - array('poll_option_total', 'vote_results.vote_result', ''), - - 'where' => 'vote_results.vote_id = vote_desc.vote_id', - 'left_join' => 'vote_desc LEFT JOIN topics ON topics.topic_id = vote_desc.topic_id', - ), - - array( - 'target' => POLL_VOTES_TABLE, - 'primary' => 'vote_desc.topic_id', - 'query_first' => array('target', $convert->truncate_statement . POLL_VOTES_TABLE), - - array('poll_option_id', VOTE_CONVERTED, ''), - array('topic_id', 'vote_desc.topic_id', ''), - array('vote_user_id', 'vote_voters.vote_user_id', 'phpbb_user_id'), - array('vote_user_ip', 'vote_voters.vote_user_ip', 'decode_ip'), - - 'where' => 'vote_voters.vote_id = vote_desc.vote_id', - ), - - array( - 'target' => WORDS_TABLE, - 'primary' => 'words.word_id', - 'query_first' => array('target', $convert->truncate_statement . WORDS_TABLE), - 'autoincrement' => 'word_id', - - array('word_id', 'words.word_id', ''), - array('word', 'words.word', 'phpbb_set_encoding'), - array('replacement', 'words.replacement', 'phpbb_set_encoding'), - ), - - array( - 'target' => POSTS_TABLE, - 'primary' => 'posts.post_id', - 'autoincrement' => 'post_id', - 'query_first' => array('target', $convert->truncate_statement . POSTS_TABLE), - 'execute_first' => ' - $config["max_post_chars"] = 0; - $config["min_post_chars"] = 0; - $config["max_quote_depth"] = 0; - ', - - array('post_id', 'posts.post_id', ''), - array('topic_id', 'posts.topic_id', ''), - array('forum_id', 'posts.forum_id', ''), - array('poster_id', 'posts.poster_id', 'phpbb_user_id'), - array('icon_id', 0, ''), - array('poster_ip', 'posts.poster_ip', 'decode_ip'), - array('post_time', 'posts.post_time', ''), - array('enable_bbcode', 'posts.enable_bbcode', ''), - array('', 'posts.enable_html', ''), - array('enable_smilies', 'posts.enable_smilies', ''), - array('enable_sig', 'posts.enable_sig', ''), - array('enable_magic_url', 1, ''), - array('post_username', 'posts.post_username', 'phpbb_set_encoding'), - array('post_subject', 'posts_text.post_subject', 'phpbb_set_encoding'), - array('post_attachment', ((defined('MOD_ATTACHMENT')) ? 'posts.post_attachment' : 0), ''), - array('post_edit_time', 'posts.post_edit_time', array('typecast' => 'int')), - array('post_edit_count', 'posts.post_edit_count', ''), - array('post_edit_reason', '', ''), - array('post_edit_user', '', 'phpbb_post_edit_user'), - array('post_visibility', ITEM_APPROVED, ''), - - array('bbcode_uid', 'posts.post_time', 'make_uid'), - array('post_text', 'posts_text.post_text', 'phpbb_prepare_message'), - array('', 'posts_text.bbcode_uid AS old_bbcode_uid', ''), - array('bbcode_bitfield', '', 'get_bbcode_bitfield'), - array('post_checksum', '', ''), - - // Commented out inline search indexing, this takes up a LOT of time. :D - // @todo We either need to enable this or call the rebuild search functionality post convert -/* array('', '', 'search_indexing'), - array('', 'posts_text.post_text AS message', ''), - array('', 'posts_text.post_subject AS title', ''),*/ - - 'where' => 'posts.post_id = posts_text.post_id' - ), - - array( - 'target' => PRIVMSGS_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - 'autoincrement' => 'msg_id', - 'query_first' => array( - array('target', $convert->truncate_statement . PRIVMSGS_TABLE), - array('target', $convert->truncate_statement . PRIVMSGS_RULES_TABLE), - ), - - 'execute_first' => ' - $config["max_post_chars"] = 0; - $config["min_post_chars"] = 0; - $config["max_quote_depth"] = 0; - ', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('root_level', 0, ''), - array('author_id', 'privmsgs.privmsgs_from_userid AS poster_id', 'phpbb_user_id'), - array('icon_id', 0, ''), - array('author_ip', 'privmsgs.privmsgs_ip', 'decode_ip'), - array('message_time', 'privmsgs.privmsgs_date', ''), - array('enable_bbcode', 'privmsgs.privmsgs_enable_bbcode AS enable_bbcode', ''), - array('', 'privmsgs.privmsgs_enable_html AS enable_html', ''), - array('enable_smilies', 'privmsgs.privmsgs_enable_smilies AS enable_smilies', ''), - array('enable_magic_url', 1, ''), - array('enable_sig', 'privmsgs.privmsgs_attach_sig', ''), - array('message_subject', 'privmsgs.privmsgs_subject', 'phpbb_set_encoding'), // Already specialchared in 2.0.x - array('message_attachment', ((defined('MOD_ATTACHMENT')) ? 'privmsgs.privmsgs_attachment' : 0), ''), - array('message_edit_reason', '', ''), - array('message_edit_user', 0, ''), - array('message_edit_time', 0, ''), - array('message_edit_count', 0, ''), - - array('bbcode_uid', 'privmsgs.privmsgs_date AS post_time', 'make_uid'), - array('message_text', 'privmsgs_text.privmsgs_text', 'phpbb_prepare_message'), - array('', 'privmsgs_text.privmsgs_bbcode_uid AS old_bbcode_uid', ''), - array('bbcode_bitfield', '', 'get_bbcode_bitfield'), - array('to_address', 'privmsgs.privmsgs_to_userid', 'phpbb_privmsgs_to_userid'), - array('bcc_address', '', ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id' - ), - - array( - 'target' => PRIVMSGS_FOLDER_TABLE, - 'primary' => 'users.user_id', - 'query_first' => array('target', $convert->truncate_statement . PRIVMSGS_FOLDER_TABLE), - - array('user_id', 'users.user_id', 'phpbb_user_id'), - array('folder_name', $user->lang['CONV_SAVED_MESSAGES'], ''), - array('pm_count', 0, ''), - - 'where' => 'users.user_id <> -1', - ), - - // Inbox - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - 'query_first' => array('target', $convert->truncate_statement . PRIVMSGS_TO_TABLE), - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_to_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', PRIVMSGS_INBOX, ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND (privmsgs.privmsgs_type = 0 OR privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)', - ), - - // Outbox - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 0, ''), - array('pm_unread', 0, ''), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', PRIVMSGS_OUTBOX, ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND (privmsgs.privmsgs_type = 1 OR privmsgs.privmsgs_type = 5)', - ), - - // Sentbox - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', PRIVMSGS_SENTBOX, ''), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND privmsgs.privmsgs_type = 2', - ), - - // Savebox (SAVED IN) - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_to_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', 'privmsgs.privmsgs_to_userid', 'phpbb_get_savebox_id'), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND privmsgs.privmsgs_type = 3', - ), - - // Savebox (SAVED OUT) - array( - 'target' => PRIVMSGS_TO_TABLE, - 'primary' => 'privmsgs.privmsgs_id', - - array('msg_id', 'privmsgs.privmsgs_id', ''), - array('user_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('author_id', 'privmsgs.privmsgs_from_userid', 'phpbb_user_id'), - array('pm_deleted', 0, ''), - array('pm_new', 'privmsgs.privmsgs_type', 'phpbb_new_pm'), - array('pm_unread', 'privmsgs.privmsgs_type', 'phpbb_unread_pm'), - array('pm_replied', 0, ''), - array('pm_marked', 0, ''), - array('pm_forwarded', 0, ''), - array('folder_id', 'privmsgs.privmsgs_from_userid', 'phpbb_get_savebox_id'), - - 'where' => 'privmsgs.privmsgs_id = privmsgs_text.privmsgs_text_id - AND privmsgs.privmsgs_type = 4', - ), - - array( - 'target' => GROUPS_TABLE, - 'autoincrement' => 'group_id', - 'query_first' => array( - array('target', $convert->truncate_statement . GROUPS_TABLE), - array('target', $convert->truncate_statement . TEAMPAGE_TABLE), - ), - - array('group_id', 'groups.group_id', ''), - array('group_type', 'groups.group_type', 'phpbb_convert_group_type'), - array('group_display', 0, ''), - array('group_legend', 0, ''), - array('group_name', 'groups.group_name', 'phpbb_convert_group_name'), // phpbb_set_encoding called in phpbb_convert_group_name - array('group_desc', 'groups.group_description', 'phpbb_set_encoding'), - - 'where' => 'groups.group_single_user = 0', - ), - - array( - 'target' => USER_GROUP_TABLE, - 'query_first' => array('target', $convert->truncate_statement . USER_GROUP_TABLE), - 'execute_first' => ' - add_default_groups(); - add_groups_to_teampage(); - ', - - array('group_id', 'groups.group_id', ''), - array('user_id', 'groups.group_moderator', 'phpbb_user_id'), - array('group_leader', 1, ''), - array('user_pending', 0, ''), - - 'where' => 'groups.group_single_user = 0 AND groups.group_moderator <> 0', - ), - - array( - 'target' => USER_GROUP_TABLE, - - array('group_id', 'user_group.group_id', ''), - array('user_id', 'user_group.user_id', 'phpbb_user_id'), - array('group_leader', 0, ''), - array('user_pending', 'user_group.user_pending', ''), - - 'where' => 'user_group.group_id = groups.group_id AND groups.group_single_user = 0 AND groups.group_moderator <> user_group.user_id', - ), - - array( - 'target' => USERS_TABLE, - 'primary' => 'users.user_id', - 'autoincrement' => 'user_id', - 'query_first' => array( - array('target', 'DELETE FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS), - array('target', $convert->truncate_statement . BOTS_TABLE), - array('target', $convert->truncate_statement . USER_NOTIFICATIONS_TABLE), - ), - - 'execute_last' => ' - remove_invalid_users(); - ', - - array('user_id', 'users.user_id', 'phpbb_user_id'), - array('', 'users.user_id AS poster_id', 'phpbb_user_id'), - array('user_type', 'users.user_active', 'set_user_type'), - array('group_id', 'users.user_level', 'phpbb_set_primary_group'), - array('user_regdate', 'users.user_regdate', ''), - array('username', 'users.username', 'phpbb_set_default_encoding'), // recode to utf8 with default lang - array('username_clean', 'users.username', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')), - array('user_password', 'users.user_password', 'phpbb_convert_password_hash'), - array('user_posts', 'users.user_posts', 'intval'), - array('user_email', 'users.user_email', 'strtolower'), - array('user_birthday', ((defined('MOD_BIRTHDAY')) ? 'users.user_birthday' : ''), 'phpbb_get_birthday'), - array('user_lastvisit', 'users.user_lastvisit', 'intval'), - array('user_last_active', 'users.user_lastvisit', 'intval'), - array('user_lastmark', 'users.user_lastvisit', 'intval'), - array('user_lang', $config['default_lang'], ''), - array('', 'users.user_lang', ''), - array('user_timezone', 'users.user_timezone', 'phpbb_convert_timezone'), - array('user_dateformat', 'users.user_dateformat', array('function1' => 'phpbb_set_encoding', 'function2' => 'fill_dateformat')), - array('user_inactive_reason', '', 'phpbb_inactive_reason'), - array('user_inactive_time', '', 'phpbb_inactive_time'), - - array('user_rank', 'users.user_rank', 'intval'), - array('user_permissions', '', ''), - - array('user_avatar', 'users.user_avatar', 'phpbb_import_avatar'), - array('user_avatar_type', 'users.user_avatar_type', 'phpbb_avatar_type'), - array('user_avatar_width', 'users.user_avatar', 'phpbb_get_avatar_width'), - array('user_avatar_height', 'users.user_avatar', 'phpbb_get_avatar_height'), - - array('user_new_privmsg', 'users.user_new_privmsg', ''), - array('user_unread_privmsg', 0, ''), //'users.user_unread_privmsg' - array('user_last_privmsg', 'users.user_last_privmsg', 'intval'), - array('user_emailtime', 'users.user_emailtime', 'null_to_zero'), - array('user_notify', 'users.user_notify', 'intval'), - array('user_notify_pm', 'users.user_notify_pm', 'intval'), - array('user_allow_pm', 'users.user_allow_pm', 'intval'), - array('user_allow_viewonline', 'users.user_allow_viewonline', 'intval'), - array('user_allow_viewemail', 'users.user_viewemail', 'intval'), - array('user_actkey', 'users.user_actkey', ''), - array('user_newpasswd', '', ''), // Users need to re-request their password... - array('user_style', $config['default_style'], ''), - - array('user_options', '', 'set_user_options'), - array('', 'users.user_popup_pm AS popuppm', ''), - array('', 'users.user_allowhtml AS html', ''), - array('', 'users.user_allowbbcode AS bbcode', ''), - array('', 'users.user_allowsmile AS smile', ''), - array('', 'users.user_attachsig AS attachsig',''), - - array('user_sig_bbcode_uid', 'users.user_regdate', 'make_uid'), - array('user_sig', 'users.user_sig', 'phpbb_prepare_message'), - array('', 'users.user_sig_bbcode_uid AS old_bbcode_uid', ''), - array('user_sig_bbcode_bitfield', '', 'get_bbcode_bitfield'), - array('', 'users.user_regdate AS post_time', ''), - - array('', 'users.user_notify_pm', 'phpbb_add_notification_options'), - - 'where' => 'users.user_id <> -1', - ), - - array( - 'target' => PROFILE_FIELDS_DATA_TABLE, - 'primary' => 'users.user_id', - 'query_first' => array( - array('target', $convert->truncate_statement . PROFILE_FIELDS_DATA_TABLE), - ), - - array('user_id', 'users.user_id', 'phpbb_user_id'), - array('pf_phpbb_occupation', 'users.user_occ', array('function1' => 'phpbb_set_encoding')), - array('pf_phpbb_interests', 'users.user_interests', array('function1' => 'phpbb_set_encoding')), - array('pf_phpbb_location', 'users.user_from', array('function1' => 'phpbb_set_encoding')), - array('pf_phpbb_icq', 'users.user_icq', array('function1' => 'phpbb_set_encoding')), - array('pf_phpbb_yahoo', 'users.user_yim', array('function1' => 'phpbb_set_encoding')), - array('pf_phpbb_website', 'users.user_website', 'validate_website'), - - 'where' => 'users.user_id <> -1', - ), - ), - ); -} diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php deleted file mode 100644 index 450800c3140..00000000000 --- a/phpBB/install/convertors/functions_phpbb20.php +++ /dev/null @@ -1,1929 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -use phpbb\attachment\attachment_category; - -if (!defined('IN_PHPBB')) -{ - exit; -} - -/** -* Helper functions for phpBB 2.0.x to phpBB 3.1.x conversion -*/ - -/** -* Set forum flags - only prune old polls by default -*/ -function phpbb_forum_flags() -{ - // Set forum flags - $forum_flags = 0; - - // FORUM_FLAG_LINK_TRACK - $forum_flags += 0; - - // FORUM_FLAG_PRUNE_POLL - $forum_flags += FORUM_FLAG_PRUNE_POLL; - - // FORUM_FLAG_PRUNE_ANNOUNCE - $forum_flags += 0; - - // FORUM_FLAG_PRUNE_STICKY - $forum_flags += 0; - - // FORUM_FLAG_ACTIVE_TOPICS - $forum_flags += 0; - - // FORUM_FLAG_POST_REVIEW - $forum_flags += FORUM_FLAG_POST_REVIEW; - - return $forum_flags; -} - -/** -* Insert/Convert forums -*/ -function phpbb_insert_forums() -{ - global $db, $src_db, $same_db, $convert, $user; - - $db->sql_query($convert->truncate_statement . FORUMS_TABLE); - - // Determine the highest id used within the old forums table (we add the categories after the forum ids) - $sql = 'SELECT MAX(forum_id) AS max_forum_id - FROM ' . $convert->src_table_prefix . 'forums'; - $result = $src_db->sql_query($sql); - $max_forum_id = (int) $src_db->sql_fetchfield('max_forum_id'); - $src_db->sql_freeresult($result); - - $max_forum_id++; - - // pruning disabled globally? - $sql = "SELECT config_value - FROM {$convert->src_table_prefix}config - WHERE config_name = 'prune_enable'"; - $result = $src_db->sql_query($sql); - $prune_enabled = (int) $src_db->sql_fetchfield('config_value'); - $src_db->sql_freeresult($result); - - // Insert categories - $sql = 'SELECT cat_id, cat_title - FROM ' . $convert->src_table_prefix . 'categories - ORDER BY cat_order'; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $result = $src_db->sql_query($sql); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - switch ($db->get_sql_layer()) - { - case 'mssql_odbc': - case 'mssqlnative': - $db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' ON'); - break; - } - - $cats_added = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $sql_ary = array( - 'forum_id' => (int) $max_forum_id, - 'forum_name' => ($row['cat_title']) ? htmlspecialchars(phpbb_set_default_encoding($row['cat_title']), ENT_COMPAT, 'UTF-8') : $user->lang['CATEGORY'], - 'parent_id' => 0, - 'forum_parents' => '', - 'forum_desc' => '', - 'forum_type' => FORUM_CAT, - 'forum_status' => ITEM_UNLOCKED, - 'forum_rules' => '', - ); - - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . FORUMS_TABLE; - $_result = $db->sql_query($sql); - $cat_row = $db->sql_fetchrow($_result); - $db->sql_freeresult($_result); - - $sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1); - $sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2); - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $cats_added[$row['cat_id']] = $max_forum_id; - $max_forum_id++; - } - $src_db->sql_freeresult($result); - - // There may be installations having forums with non-existant category ids. - // We try to catch them and add them to an "unknown" category instead of leaving them out. - $sql = 'SELECT cat_id - FROM ' . $convert->src_table_prefix . 'forums - GROUP BY cat_id'; - $result = $src_db->sql_query($sql); - - $unknown_cat_id = false; - while ($row = $src_db->sql_fetchrow($result)) - { - // Catch those categories not been added before - if (!isset($cats_added[$row['cat_id']])) - { - $unknown_cat_id = true; - } - } - $src_db->sql_freeresult($result); - - // Is there at least one category not known? - if ($unknown_cat_id === true) - { - $unknown_cat_id = 'ghost'; - - $sql_ary = array( - 'forum_id' => (int) $max_forum_id, - 'forum_name' => (string) $user->lang['CATEGORY'], - 'parent_id' => 0, - 'forum_parents' => '', - 'forum_desc' => '', - 'forum_type' => FORUM_CAT, - 'forum_status' => ITEM_UNLOCKED, - 'forum_rules' => '', - ); - - $sql = 'SELECT MAX(right_id) AS right_id - FROM ' . FORUMS_TABLE; - $_result = $db->sql_query($sql); - $cat_row = $db->sql_fetchrow($_result); - $db->sql_freeresult($_result); - - $sql_ary['left_id'] = (int) ($cat_row['right_id'] + 1); - $sql_ary['right_id'] = (int) ($cat_row['right_id'] + 2); - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - - $cats_added[$unknown_cat_id] = $max_forum_id; - } - - // Now insert the forums - $sql = 'SELECT f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, fp.prune_days, fp.prune_freq FROM ' . $convert->src_table_prefix . 'forums f - LEFT JOIN ' . $convert->src_table_prefix . 'forum_prune fp ON f.forum_id = fp.forum_id - GROUP BY f.forum_id, f.forum_name, f.cat_id, f.forum_desc, f.forum_status, f.prune_enable, f.prune_next, f.forum_order, fp.prune_days, fp.prune_freq - ORDER BY f.cat_id, f.forum_order'; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $result = $src_db->sql_query($sql); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - while ($row = $src_db->sql_fetchrow($result)) - { - // Some might have forums here with an id not being "possible"... - // To be somewhat friendly we "change" the category id for those to a previously created ghost category - if (!isset($cats_added[$row['cat_id']]) && $unknown_cat_id !== false) - { - $row['cat_id'] = $unknown_cat_id; - } - - if (!isset($cats_added[$row['cat_id']])) - { - continue; - } - - // Define the new forums sql ary - $sql_ary = array( - 'forum_id' => (int) $row['forum_id'], - 'forum_name' => htmlspecialchars(phpbb_set_default_encoding($row['forum_name']), ENT_COMPAT, 'UTF-8'), - 'parent_id' => (int) $cats_added[$row['cat_id']], - 'forum_parents' => '', - 'forum_desc' => htmlspecialchars(phpbb_set_default_encoding($row['forum_desc']), ENT_COMPAT, 'UTF-8'), - 'forum_type' => FORUM_POST, - 'forum_status' => is_item_locked($row['forum_status']), - 'enable_prune' => ($prune_enabled) ? (int) $row['prune_enable'] : 0, - 'prune_next' => (int) null_to_zero($row['prune_next']), - 'prune_days' => (int) null_to_zero($row['prune_days']), - 'prune_viewed' => 0, - 'prune_freq' => (int) null_to_zero($row['prune_freq']), - - 'forum_flags' => phpbb_forum_flags(), - 'forum_options' => 0, - - // Default values - 'forum_desc_bitfield' => '', - 'forum_desc_options' => 7, - 'forum_desc_uid' => '', - 'forum_link' => '', - 'forum_password' => '', - 'forum_style' => 0, - 'forum_image' => '', - 'forum_rules' => '', - 'forum_rules_link' => '', - 'forum_rules_bitfield' => '', - 'forum_rules_options' => 7, - 'forum_rules_uid' => '', - 'forum_topics_per_page' => 0, - 'forum_posts_approved' => 0, - 'forum_posts_unapproved' => 0, - 'forum_posts_softdeleted' => 0, - 'forum_topics_approved' => 0, - 'forum_topics_unapproved' => 0, - 'forum_topics_softdeleted' => 0, - 'forum_last_post_id' => 0, - 'forum_last_poster_id' => 0, - 'forum_last_post_subject' => '', - 'forum_last_post_time' => 0, - 'forum_last_poster_name' => '', - 'forum_last_poster_colour' => '', - 'display_on_index' => 1, - 'enable_indexing' => 1, - 'enable_icons' => 0, - ); - - // Now add the forums with proper left/right ids - $sql = 'SELECT left_id, right_id - FROM ' . FORUMS_TABLE . ' - WHERE forum_id = ' . $cats_added[$row['cat_id']]; - $_result = $db->sql_query($sql); - $cat_row = $db->sql_fetchrow($_result); - $db->sql_freeresult($_result); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET left_id = left_id + 2, right_id = right_id + 2 - WHERE left_id > ' . $cat_row['right_id']; - $db->sql_query($sql); - - $sql = 'UPDATE ' . FORUMS_TABLE . ' - SET right_id = right_id + 2 - WHERE ' . $cat_row['left_id'] . ' BETWEEN left_id AND right_id'; - $db->sql_query($sql); - - $sql_ary['left_id'] = (int) $cat_row['right_id']; - $sql_ary['right_id'] = (int) ($cat_row['right_id'] + 1); - - $sql = 'INSERT INTO ' . FORUMS_TABLE . ' ' . $db->sql_build_array('INSERT', $sql_ary); - $db->sql_query($sql); - } - $src_db->sql_freeresult($result); - - switch ($db->get_sql_layer()) - { - case 'postgres': - $db->sql_query("SELECT SETVAL('" . FORUMS_TABLE . "_seq',(select case when max(forum_id)>0 then max(forum_id)+1 else 1 end from " . FORUMS_TABLE . '));'); - break; - - case 'mssql_odbc': - case 'mssqlnative': - $db->sql_query('SET IDENTITY_INSERT ' . FORUMS_TABLE . ' OFF'); - break; - - case 'oracle': - $result = $db->sql_query('SELECT MAX(forum_id) as max_id FROM ' . FORUMS_TABLE); - $row = $db->sql_fetchrow($result); - $db->sql_freeresult($result); - - $largest_id = (int) $row['max_id']; - - if ($largest_id) - { - $db->sql_query('DROP SEQUENCE ' . FORUMS_TABLE . '_seq'); - $db->sql_query('CREATE SEQUENCE ' . FORUMS_TABLE . '_seq START WITH ' . ($largest_id + 1)); - } - break; - } -} - -/** -* Function for recoding text with the default language -* -* @param string $text text to recode to utf8 -* @param bool $grab_user_lang if set to true the function tries to use $convert_row['user_lang'] (and falls back to $convert_row['poster_id']) instead of the boards default language -*/ -function phpbb_set_encoding($text, $grab_user_lang = true) -{ - global $lang_enc_array, $convert_row; - global $convert, $phpEx; - - /*static $lang_enc_array = array( - 'korean' => 'euc-kr', - 'serbian' => 'windows-1250', - 'polish' => 'iso-8859-2', - 'kurdish' => 'windows-1254', - 'slovak' => 'Windows-1250', - 'russian' => 'windows-1251', - 'estonian' => 'iso-8859-4', - 'chinese_simplified' => 'gb2312', - 'macedonian' => 'windows-1251', - 'azerbaijani' => 'UTF-8', - 'romanian' => 'iso-8859-2', - 'romanian_diacritice' => 'iso-8859-2', - 'lithuanian' => 'windows-1257', - 'turkish' => 'iso-8859-9', - 'ukrainian' => 'windows-1251', - 'japanese' => 'shift_jis', - 'hungarian' => 'ISO-8859-2', - 'romanian_no_diacritics' => 'iso-8859-2', - 'mongolian' => 'UTF-8', - 'slovenian' => 'windows-1250', - 'bosnian' => 'windows-1250', - 'czech' => 'Windows-1250', - 'farsi' => 'Windows-1256', - 'croatian' => 'windows-1250', - 'greek' => 'iso-8859-7', - 'russian_tu' => 'windows-1251', - 'sakha' => 'UTF-8', - 'serbian_cyrillic' => 'windows-1251', - 'bulgarian' => 'windows-1251', - 'chinese_traditional_taiwan' => 'big5', - 'chinese_traditional' => 'big5', - 'arabic' => 'windows-1256', - 'hebrew' => 'WINDOWS-1255', - 'thai' => 'windows-874', - //'chinese_traditional_taiwan' => 'utf-8' // custom modified, we may have to do an include :-( - );*/ - - if (empty($lang_enc_array)) - { - $lang_enc_array = array(); - } - - $get_lang = trim(get_config_value('default_lang')); - - // Do we need the users language encoding? - if ($grab_user_lang && !empty($convert_row)) - { - if (!empty($convert_row['user_lang'])) - { - $get_lang = trim($convert_row['user_lang']); - } - else if (!empty($convert_row['poster_id'])) - { - global $src_db, $same_db; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $sql = 'SELECT user_lang - FROM ' . $convert->src_table_prefix . 'users - WHERE user_id = ' . (int) $convert_row['poster_id']; - $result = $src_db->sql_query($sql); - $get_lang = (string) $src_db->sql_fetchfield('user_lang'); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - $get_lang = (!trim($get_lang)) ? trim(get_config_value('default_lang')) : trim($get_lang); - } - } - - if (!isset($lang_enc_array[$get_lang])) - { - $filename = $convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . $phpEx; - - if (!file_exists($filename)) - { - $get_lang = trim(get_config_value('default_lang')); - } - - if (!isset($lang_enc_array[$get_lang])) - { - include($convert->options['forum_path'] . '/language/lang_' . $get_lang . '/lang_main.' . $phpEx); - $lang_enc_array[$get_lang] = $lang['ENCODING']; - unset($lang); - } - } - - return utf8_recode($text, $lang_enc_array[$get_lang]); -} - -/** -* Same as phpbb_set_encoding, but forcing boards default language -*/ -function phpbb_set_default_encoding($text) -{ - return phpbb_set_encoding($text, false); -} - -/** -* Convert Birthday from Birthday MOD to phpBB Format -*/ -function phpbb_get_birthday($birthday = '') -{ - if (defined('MOD_BIRTHDAY_TERRA')) - { - $birthday = (string) $birthday; - - // stored as month, day, year - if (!$birthday) - { - return ' 0- 0- 0'; - } - - // We use the original mod code to retrieve the birthday (not ideal) - preg_match('/(..)(..)(....)/', sprintf('%08d', $birthday), $birthday_parts); - - $month = $birthday_parts[1]; - $day = $birthday_parts[2]; - $year = $birthday_parts[3]; - - return sprintf('%2d-%2d-%4d', $day, $month, $year); - } - else - { - $birthday = (int) $birthday; - - if (!$birthday || $birthday == 999999) - { - return ' 0- 0- 0'; - } - - // The birthday mod from niels is using this code to transform to day/month/year - return sprintf('%2d-%2d-%4d', gmdate('j', $birthday * 86400 + 1), gmdate('n', $birthday * 86400 + 1), gmdate('Y', $birthday * 86400 + 1)); - } -} - -/** -* Return correct user id value -* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well -*/ -function phpbb_user_id($user_id) -{ - global $config; - - // Increment user id if the old forum is having a user with the id 1 - if (!isset($config['increment_user_id'])) - { - global $src_db, $same_db, $convert; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - // Now let us set a temporary config variable for user id incrementing - $sql = "SELECT user_id - FROM {$convert->src_table_prefix}users - WHERE user_id = 1"; - $result = $src_db->sql_query($sql); - $id = (int) $src_db->sql_fetchfield('user_id'); - $src_db->sql_freeresult($result); - - // Try to get the maximum user id possible... - $sql = "SELECT MAX(user_id) AS max_user_id - FROM {$convert->src_table_prefix}users"; - $result = $src_db->sql_query($sql); - $max_id = (int) $src_db->sql_fetchfield('max_user_id'); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - // If there is a user id 1, we need to increment user ids. :/ - if ($id === 1) - { - $config->set('increment_user_id', ($max_id + 1), false); - $config['increment_user_id'] = $max_id + 1; - } - else - { - $config->set('increment_user_id', 0, false); - $config['increment_user_id'] = 0; - } - } - - // If the old user id is -1 in 2.0.x it is the anonymous user... - if ($user_id == -1) - { - return ANONYMOUS; - } - - if (!empty($config['increment_user_id']) && $user_id == 1) - { - return $config['increment_user_id']; - } - - // A user id of 0 can happen, for example within the ban table if no user is banned... - // Within the posts and topics table this can be "dangerous" but is the fault of the user - // having mods installed (a poster id of 0 is not possible in 2.0.x). - // Therefore, we return the user id "as is". - - return (int) $user_id; -} - -/** -* Return correct user id value -* Everyone's id will be one higher to allow the guest/anonymous user to have a positive id as well -*/ -function phpbb_topic_replies_to_posts($num_replies) -{ - return (int) $num_replies + 1; -} - -/* Copy additional table fields from old forum to new forum if user wants this (for Mod compatibility for example) -function phpbb_copy_table_fields() -{ -} -*/ - -/** -* Convert authentication -* user, group and forum table has to be filled in order to work -*/ -function phpbb_convert_authentication($mode) -{ - global $db, $src_db, $same_db, $convert, $config; - - if ($mode == 'start') - { - $db->sql_query($convert->truncate_statement . ACL_USERS_TABLE); - $db->sql_query($convert->truncate_statement . ACL_GROUPS_TABLE); - - // What we will do is handling all 2.0.x admins as founder to replicate what is common in 2.0.x. - // After conversion the main admin need to make sure he is removing permissions and the founder status if wanted. - - // Grab user ids of users with user_level of ADMIN - $sql = "SELECT user_id - FROM {$convert->src_table_prefix}users - WHERE user_level = 1 - ORDER BY user_regdate ASC"; - $result = $src_db->sql_query($sql); - - while ($row = $src_db->sql_fetchrow($result)) - { - $user_id = (int) phpbb_user_id($row['user_id']); - // Set founder admin... - $sql = 'UPDATE ' . USERS_TABLE . ' - SET user_type = ' . USER_FOUNDER . " - WHERE user_id = $user_id"; - $db->sql_query($sql); - } - $src_db->sql_freeresult($result); - - $sql = 'SELECT group_id - FROM ' . GROUPS_TABLE . " - WHERE group_name = '" . $db->sql_escape('BOTS') . "'"; - $result = $db->sql_query($sql); - $bot_group_id = (int) $db->sql_fetchfield('group_id'); - $db->sql_freeresult($result); - } - - // Grab forum auth information - $sql = "SELECT * - FROM {$convert->src_table_prefix}forums"; - $result = $src_db->sql_query($sql); - - $forum_access = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $forum_access[$row['forum_id']] = $row; - } - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - // Grab user auth information from 2.0.x board - $sql = "SELECT ug.user_id, aa.* - FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}user_group ug, {$convert->src_table_prefix}groups g, {$convert->src_table_prefix}forums f - WHERE g.group_id = aa.group_id - AND g.group_single_user = 1 - AND ug.group_id = g.group_id - AND f.forum_id = aa.forum_id"; - $result = $src_db->sql_query($sql); - - $user_access = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $user_access[$row['forum_id']][] = $row; - } - $src_db->sql_freeresult($result); - - // Grab group auth information - $sql = "SELECT g.group_id, aa.* - FROM {$convert->src_table_prefix}auth_access aa, {$convert->src_table_prefix}groups g - WHERE g.group_id = aa.group_id - AND g.group_single_user <> 1"; - $result = $src_db->sql_query($sql); - - $group_access = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $group_access[$row['forum_id']][] = $row; - } - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - // Add Forum Access List - $auth_map = array( - 'auth_view' => array('f_', 'f_list'), - 'auth_read' => array('f_read', 'f_search'), - 'auth_post' => array('f_post', 'f_bbcode', 'f_smilies', 'f_img', 'f_sigs', 'f_postcount', 'f_report', 'f_subscribe', 'f_print', 'f_email'), - 'auth_reply' => 'f_reply', - 'auth_edit' => 'f_edit', - 'auth_delete' => 'f_delete', - 'auth_pollcreate' => 'f_poll', - 'auth_vote' => 'f_vote', - 'auth_announce' => array('f_announce', 'f_announce_global'), - 'auth_sticky' => 'f_sticky', - 'auth_attachments' => array('f_attach', 'f_download'), - 'auth_download' => 'f_download', - ); - - // Define the ACL constants used in 2.0 to make the code slightly more readable - define('AUTH_ALL', 0); - define('AUTH_REG', 1); - define('AUTH_ACL', 2); - define('AUTH_MOD', 3); - define('AUTH_ADMIN', 5); - - // A mapping of the simple permissions used by 2.0 - $simple_auth_ary = array( - 'public' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_ALL, - 'auth_post' => AUTH_ALL, - 'auth_reply' => AUTH_ALL, - 'auth_edit' => AUTH_REG, - 'auth_delete' => AUTH_REG, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_REG, - 'auth_pollcreate' => AUTH_REG, - ), - 'registered' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_ALL, - 'auth_post' => AUTH_REG, - 'auth_reply' => AUTH_REG, - 'auth_edit' => AUTH_REG, - 'auth_delete' => AUTH_REG, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_REG, - 'auth_pollcreate' => AUTH_REG, - ), - 'registered_hidden' => array( - 'auth_view' => AUTH_REG, - 'auth_read' => AUTH_REG, - 'auth_post' => AUTH_REG, - 'auth_reply' => AUTH_REG, - 'auth_edit' => AUTH_REG, - 'auth_delete' => AUTH_REG, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_REG, - 'auth_pollcreate' => AUTH_REG, - ), - 'private' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_ACL, - 'auth_post' => AUTH_ACL, - 'auth_reply' => AUTH_ACL, - 'auth_edit' => AUTH_ACL, - 'auth_delete' => AUTH_ACL, - 'auth_sticky' => AUTH_ACL, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_ACL, - 'auth_pollcreate' => AUTH_ACL, - ), - 'private_hidden' => array( - 'auth_view' => AUTH_ACL, - 'auth_read' => AUTH_ACL, - 'auth_post' => AUTH_ACL, - 'auth_reply' => AUTH_ACL, - 'auth_edit' => AUTH_ACL, - 'auth_delete' => AUTH_ACL, - 'auth_sticky' => AUTH_ACL, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_ACL, - 'auth_pollcreate' => AUTH_ACL, - ), - 'moderator' => array( - 'auth_view' => AUTH_ALL, - 'auth_read' => AUTH_MOD, - 'auth_post' => AUTH_MOD, - 'auth_reply' => AUTH_MOD, - 'auth_edit' => AUTH_MOD, - 'auth_delete' => AUTH_MOD, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_MOD, - 'auth_pollcreate' => AUTH_MOD, - ), - 'moderator_hidden' => array( - 'auth_view' => AUTH_MOD, - 'auth_read' => AUTH_MOD, - 'auth_post' => AUTH_MOD, - 'auth_reply' => AUTH_MOD, - 'auth_edit' => AUTH_MOD, - 'auth_delete' => AUTH_MOD, - 'auth_sticky' => AUTH_MOD, - 'auth_announce' => AUTH_MOD, - 'auth_vote' => AUTH_MOD, - 'auth_pollcreate' => AUTH_MOD, - ), - ); - - if ($mode == 'start') - { - user_group_auth('guests', 'SELECT user_id, {GUESTS} FROM ' . USERS_TABLE . ' WHERE user_id = ' . ANONYMOUS, false); - user_group_auth('registered', 'SELECT user_id, {REGISTERED} FROM ' . USERS_TABLE . ' WHERE user_id <> ' . ANONYMOUS . " AND group_id <> $bot_group_id", false); - - // Selecting from old table - if (!empty($config['increment_user_id'])) - { - $auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1'; - user_group_auth('administrators', $auth_sql, true); - - $auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1'; - user_group_auth('administrators', $auth_sql, true); - } - else - { - $auth_sql = 'SELECT user_id, {ADMINISTRATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1'; - user_group_auth('administrators', $auth_sql, true); - } - - if (!empty($config['increment_user_id'])) - { - $auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id <> 1'; - user_group_auth('global_moderators', $auth_sql, true); - - $auth_sql = 'SELECT ' . $config['increment_user_id'] . ' as user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1 AND user_id = 1'; - user_group_auth('global_moderators', $auth_sql, true); - } - else - { - $auth_sql = 'SELECT user_id, {GLOBAL_MODERATORS} FROM ' . $convert->src_table_prefix . 'users WHERE user_level = 1'; - user_group_auth('global_moderators', $auth_sql, true); - } - } - else if ($mode == 'first') - { - // Go through all 2.0.x forums - foreach ($forum_access as $forum) - { - $new_forum_id = (int) $forum['forum_id']; - - // Administrators have full access to all forums whatever happens - mass_auth('group_role', $new_forum_id, 'administrators', 'FORUM_FULL'); - - $matched_type = ''; - foreach ($simple_auth_ary as $key => $auth_levels) - { - $matched = 1; - foreach ($auth_levels as $k => $level) - { - if ($forum[$k] != $auth_levels[$k]) - { - $matched = 0; - } - } - - if ($matched) - { - $matched_type = $key; - break; - } - } - - switch ($matched_type) - { - case 'public': - mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_LIMITED'); - mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_LIMITED_POLLS'); - mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT'); - break; - - case 'registered': - mass_auth('group_role', $new_forum_id, 'guests', 'FORUM_READONLY'); - mass_auth('group_role', $new_forum_id, 'bots', 'FORUM_BOT'); - - // no break; - - case 'registered_hidden': - mass_auth('group_role', $new_forum_id, 'registered', 'FORUM_POLLS'); - break; - - case 'private': - case 'private_hidden': - case 'moderator': - case 'moderator_hidden': - default: - // The permissions don't match a simple set, so we're going to have to map them directly - - // No post approval for all, in 2.0.x this feature does not exist - mass_auth('group', $new_forum_id, 'guests', 'f_noapprove', ACL_YES); - mass_auth('group', $new_forum_id, 'registered', 'f_noapprove', ACL_YES); - - // Go through authentication map - foreach ($auth_map as $old_auth_key => $new_acl) - { - // If old authentication key does not exist we continue - // This is helpful for mods adding additional authentication fields, we need to add them to the auth_map array - if (!isset($forum[$old_auth_key])) - { - continue; - } - - // Now set the new ACL correctly - switch ($forum[$old_auth_key]) - { - // AUTH_ALL - case AUTH_ALL: - mass_auth('group', $new_forum_id, 'guests', $new_acl, ACL_YES); - mass_auth('group', $new_forum_id, 'bots', $new_acl, ACL_YES); - mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES); - break; - - // AUTH_REG - case AUTH_REG: - mass_auth('group', $new_forum_id, 'registered', $new_acl, ACL_YES); - break; - - // AUTH_ACL - case AUTH_ACL: - // Go through the old group access list for this forum - if (isset($group_access[$forum['forum_id']])) - { - foreach ($group_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES); - } - } - } - - if (isset($user_access[$forum['forum_id']])) - { - foreach ($user_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES); - } - } - } - break; - - // AUTH_MOD - case AUTH_MOD: - if (isset($group_access[$forum['forum_id']])) - { - foreach ($group_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('group', $new_forum_id, (int) $access['group_id'], $new_acl, ACL_YES); - } - } - } - - if (isset($user_access[$forum['forum_id']])) - { - foreach ($user_access[$forum['forum_id']] as $index => $access) - { - // We only check for ACL_YES equivalence entry - if (isset($access[$old_auth_key]) && $access[$old_auth_key] == 1) - { - mass_auth('user', $new_forum_id, (int) phpbb_user_id($access['user_id']), $new_acl, ACL_YES); - } - } - } - break; - } - } - break; - } - } - } - else if ($mode == 'second') - { - // Assign permission roles and other default permissions - - // guests having u_download and u_search ability - $db->sql_query('INSERT INTO ' . ACL_GROUPS_TABLE . ' (group_id, forum_id, auth_option_id, auth_role_id, auth_setting) SELECT ' . get_group_id('guests') . ', 0, auth_option_id, 0, 1 FROM ' . ACL_OPTIONS_TABLE . " WHERE auth_option IN ('u_', 'u_download', 'u_search')"); - - // administrators/global mods having full user features - mass_auth('group_role', 0, 'administrators', 'USER_FULL'); - mass_auth('group_role', 0, 'global_moderators', 'USER_FULL'); - - // By default all converted administrators are given full access - mass_auth('group_role', 0, 'administrators', 'ADMIN_FULL'); - - // All registered users are assigned the standard user role - mass_auth('group_role', 0, 'registered', 'USER_STANDARD'); - mass_auth('group_role', 0, 'registered_coppa', 'USER_STANDARD'); - - // Instead of administrators being global moderators we give the MOD_FULL role to global mods (admins already assigned to this group) - mass_auth('group_role', 0, 'global_moderators', 'MOD_FULL'); - - // And now those who have had their avatar rights removed get assigned a more restrictive role - $sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users - WHERE user_allowavatar = 0 - AND user_id > 0'; - $result = $src_db->sql_query($sql); - - while ($row = $src_db->sql_fetchrow($result)) - { - mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOAVATAR'); - } - $src_db->sql_freeresult($result); - - // And the same for those who have had their PM rights removed - $sql = 'SELECT user_id FROM ' . $convert->src_table_prefix . 'users - WHERE user_allow_pm = 0 - AND user_id > 0'; - $result = $src_db->sql_query($sql); - - while ($row = $src_db->sql_fetchrow($result)) - { - mass_auth('user_role', 0, (int) phpbb_user_id($row['user_id']), 'USER_NOPM'); - } - $src_db->sql_freeresult($result); - } - else if ($mode == 'third') - { - // And now the moderators - // We make sure that they have at least standard access to the forums they moderate in addition to the moderating permissions - - $mod_post_map = array( - 'auth_announce' => array('f_announce', 'f_announce_global'), - 'auth_sticky' => 'f_sticky' - ); - - foreach ($user_access as $forum_id => $access_map) - { - $forum_id = (int) $forum_id; - - foreach ($access_map as $access) - { - if (isset($access['auth_mod']) && $access['auth_mod'] == 1) - { - mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'MOD_STANDARD'); - mass_auth('user_role', $forum_id, (int) phpbb_user_id($access['user_id']), 'FORUM_STANDARD'); - foreach ($mod_post_map as $old => $new) - { - if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) - { - mass_auth('user', $forum_id, (int) phpbb_user_id($access['user_id']), $new, ACL_YES); - } - } - } - } - } - - foreach ($group_access as $forum_id => $access_map) - { - $forum_id = (int) $forum_id; - - foreach ($access_map as $access) - { - if (isset($access['auth_mod']) && $access['auth_mod'] == 1) - { - mass_auth('group_role', $forum_id, (int) $access['group_id'], 'MOD_STANDARD'); - mass_auth('group_role', $forum_id, (int) $access['group_id'], 'FORUM_STANDARD'); - foreach ($mod_post_map as $old => $new) - { - if (isset($forum_access[$forum_id]) && isset($forum_access[$forum_id][$old]) && $forum_access[$forum_id][$old] == AUTH_MOD) - { - mass_auth('group', $forum_id, (int) $access['group_id'], $new, ACL_YES); - } - } - } - } - } - - // We grant everyone readonly access to the categories to ensure that the forums are visible - $sql = 'SELECT forum_id, forum_name, parent_id, left_id, right_id - FROM ' . FORUMS_TABLE . ' - ORDER BY left_id ASC'; - $result = $db->sql_query($sql); - - $parent_forums = $forums = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['parent_id'] == 0) - { - mass_auth('group_role', $row['forum_id'], 'administrators', 'FORUM_FULL'); - mass_auth('group_role', $row['forum_id'], 'global_moderators', 'FORUM_FULL'); - $parent_forums[] = $row; - } - else - { - $forums[] = $row; - } - } - $db->sql_freeresult($result); - - global $auth; - - // Let us see which groups have access to these forums... - foreach ($parent_forums as $row) - { - // Get the children - $branch = $forum_ids = array(); - - foreach ($forums as $key => $_row) - { - if ($_row['left_id'] > $row['left_id'] && $_row['left_id'] < $row['right_id']) - { - $branch[] = $_row; - $forum_ids[] = $_row['forum_id']; - continue; - } - } - - if (count($forum_ids)) - { - // Now make sure the user is able to read these forums - $hold_ary = $auth->acl_group_raw_data(false, 'f_list', $forum_ids); - - if (empty($hold_ary)) - { - continue; - } - - foreach ($hold_ary as $g_id => $f_id_ary) - { - $set_group = false; - - foreach ($f_id_ary as $f_id => $auth_ary) - { - foreach ($auth_ary as $auth_option => $setting) - { - if ($setting == ACL_YES) - { - $set_group = true; - break 2; - } - } - } - - if ($set_group) - { - mass_auth('group', $row['forum_id'], $g_id, 'f_list', ACL_YES); - } - } - } - } - } -} - -/** -* Set primary group. -* Really simple and only based on user_level (remaining groups will be assigned later) -*/ -function phpbb_set_primary_group($user_level) -{ - global $convert_row; - - if ($user_level == 1) - { - return get_group_id('administrators'); - } -/* else if ($user_level == 2) - { - return get_group_id('global_moderators'); - } - else if ($user_level == 0 && $convert_row['user_active'])*/ - else if ($convert_row['user_active']) - { - return get_group_id('registered'); - } - - return 0; -} - -/** -* Convert the group name, making sure to avoid conflicts with 3.0 special groups -*/ -function phpbb_convert_group_name($group_name) -{ - $default_groups = array( - 'GUESTS', - 'REGISTERED', - 'REGISTERED_COPPA', - 'GLOBAL_MODERATORS', - 'ADMINISTRATORS', - 'BOTS', - ); - - if (in_array(strtoupper($group_name), $default_groups)) - { - return 'phpBB2 - ' . $group_name; - } - - return phpbb_set_default_encoding($group_name); -} - -/** -* Convert the group type constants -*/ -function phpbb_convert_group_type($group_type) -{ - switch ($group_type) - { - case 0: - return GROUP_OPEN; - break; - - case 1: - return GROUP_CLOSED; - break; - - case 2: - return GROUP_HIDDEN; - break; - } - - // Never return GROUP_SPECIAL here, because only phpBB's default groups are allowed to have this type set. - return GROUP_HIDDEN; -} - -/** -* Convert the topic type constants -*/ -function phpbb_convert_topic_type($topic_type) -{ - switch ($topic_type) - { - case 0: - return POST_NORMAL; - break; - - case 1: - return POST_STICKY; - break; - - case 2: - return POST_ANNOUNCE; - break; - - case 3: - return POST_GLOBAL; - break; - } - - return POST_NORMAL; -} - -function phpbb_replace_size($matches) -{ - return '[size=' . min(200, ceil(100.0 * (((double) $matches[1])/12.0))) . ':' . $matches[2] . ']'; -} - -/** -* Reparse the message stripping out the bbcode_uid values and adding new ones and setting the bitfield -* @todo What do we want to do about HTML in messages - currently it gets converted to the entities, but there may be some objections to this -*/ -function phpbb_prepare_message($message) -{ - global $convert, $user, $convert_row, $message_parser; - - if (!$message) - { - $convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = 0; - return ''; - } - - // Decode phpBB 2.0.x Message - if (isset($convert->row['old_bbcode_uid']) && $convert->row['old_bbcode_uid'] != '') - { - // Adjust size... - if (strpos($message, '[size=') !== false) - { - $message = preg_replace_callback('/\[size=(\d*):(' . $convert->row['old_bbcode_uid'] . ')\]/', 'phpbb_replace_size', $message); - } - - $message = preg_replace('/\:(([a-z0-9]:)?)' . $convert->row['old_bbcode_uid'] . '/s', '', $message); - } - - if (strpos($message, '[quote=') !== false) - { - $message = preg_replace('/\[quote="(.*?)"\]/s', '[quote="\1"]', $message); - $message = preg_replace('/\[quote=\\\"(.*?)\\\"\]/s', '[quote="\1"]', $message); - - // let's hope that this solves more problems than it causes. Deal with escaped quotes. - $message = str_replace('\"', '"', $message); - $message = str_replace('\"', '"', $message); - } - - $message = str_replace('
        ', "\n", $message); - $message = str_replace('<', '<', $message); - $message = str_replace('>', '>', $message); - - // make the post UTF-8 - $message = phpbb_set_encoding($message); - - $message_parser->warn_msg = array(); // Reset the errors from the previous message - $message_parser->bbcode_uid = make_uid($convert->row['post_time']); - $message_parser->message = $message; - unset($message); - - // Make sure options are set. -// $enable_html = (!isset($row['enable_html'])) ? false : $row['enable_html']; - $enable_bbcode = (!isset($convert->row['enable_bbcode'])) ? true : $convert->row['enable_bbcode']; - $enable_smilies = (!isset($convert->row['enable_smilies'])) ? true : $convert->row['enable_smilies']; - $enable_magic_url = (!isset($convert->row['enable_magic_url'])) ? true : $convert->row['enable_magic_url']; - - // parse($allow_bbcode, $allow_magic_url, $allow_smilies, $allow_img_bbcode = true, $allow_quote_bbcode = true, $allow_url_bbcode = true, $update_this_message = true, $mode = 'post') - $message_parser->parse($enable_bbcode, $enable_magic_url, $enable_smilies); - - if (count($message_parser->warn_msg)) - { - $msg_id = isset($convert->row['post_id']) ? $convert->row['post_id'] : $convert->row['privmsgs_id']; - $convert->p_master->error('' . $user->lang['POST_ID'] . ': ' . $msg_id . ' ' . $user->lang['CONV_ERROR_MESSAGE_PARSER'] . ':

        ' . implode('
        ', $message_parser->warn_msg), __LINE__, __FILE__, true); - } - - $convert->row['mp_bbcode_bitfield'] = $convert_row['mp_bbcode_bitfield'] = $message_parser->bbcode_bitfield; - - $message = $message_parser->message; - unset($message_parser->message); - - return $message; -} - -/** -* Return the bitfield calculated by the previous function -*/ -function get_bbcode_bitfield() -{ - global $convert_row; - - return $convert_row['mp_bbcode_bitfield']; -} - -/** -* Determine the last user to edit a post -* In practice we only tracked edits by the original poster in 2.0.x so this will only be set if they had edited their own post -*/ -function phpbb_post_edit_user() -{ - global $convert_row; - - if (isset($convert_row['post_edit_count'])) - { - return phpbb_user_id($convert_row['poster_id']); - } - - return 0; -} - -/** -* Obtain the path to uploaded files on the 2.0.x forum -* This is only used if the Attachment MOD was installed -*/ -function phpbb_get_files_dir() -{ - if (!defined('MOD_ATTACHMENT')) - { - return ''; - } - - global $src_db, $same_db, $convert, $user; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - $sql = 'SELECT config_value AS upload_dir - FROM ' . $convert->src_table_prefix . "attachments_config - WHERE config_name = 'upload_dir'"; - $result = $src_db->sql_query($sql); - $upload_path = $src_db->sql_fetchfield('upload_dir'); - $src_db->sql_freeresult($result); - - $sql = 'SELECT config_value AS ftp_upload - FROM ' . $convert->src_table_prefix . "attachments_config - WHERE config_name = 'allow_ftp_upload'"; - $result = $src_db->sql_query($sql); - $ftp_upload = (int) $src_db->sql_fetchfield('ftp_upload'); - $src_db->sql_freeresult($result); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - if ($ftp_upload) - { - $convert->p_master->error($user->lang['CONV_ERROR_ATTACH_FTP_DIR'], __LINE__, __FILE__); - } - - return $upload_path; -} - -/** -* Copy thumbnails of uploaded images from the 2.0.x forum -* This is only used if the Attachment MOD was installed -*/ -function phpbb_copy_thumbnails() -{ - global $convert, $config, $phpbb_root_path; - - $src_path = $convert->options['forum_path'] . '/' . phpbb_get_files_dir() . '/thumbs/'; - - if ($handle = @opendir($src_path)) - { - while ($entry = readdir($handle)) - { - if ($entry[0] == '.') - { - continue; - } - - if (is_dir($src_path . $entry)) - { - continue; - } - else - { - copy_file($src_path . $entry, $config['upload_path'] . '/' . preg_replace('/^t_/', 'thumb_', $entry)); - @unlink($phpbb_root_path . $config['upload_path'] . '/thumbs/' . $entry); - } - } - closedir($handle); - } -} - -/** -* Convert the attachment category constants -* This is only used if the Attachment MOD was installed -*/ -function phpbb_attachment_category($cat_id) -{ - switch ($cat_id) - { - case 1: - return attachment_category::IMAGE; - break; - - case 2: - return ATTACHMENT_CATEGORY_WM; - break; - } - - return attachment_category::NONE; -} - -/** -* Convert the attachment extension names -* This is only used if the Attachment MOD was installed -*/ -function phpbb_attachment_extension_group_name() -{ - global $db, $phpbb_root_path, $phpEx; - - // Update file extension group names to use language strings. - $sql = 'SELECT lang_dir - FROM ' . LANG_TABLE; - $result = $db->sql_query($sql); - - $extension_groups_updated = array(); - while ($row = $db->sql_fetchrow($result)) - { - $lang_dir = basename($row['lang_dir']); - $lang_file = $phpbb_root_path . 'language/' . $lang_dir . '/acp/attachments.' . $phpEx; - - if (!file_exists($lang_file)) - { - continue; - } - - $lang = array(); - include($lang_file); - - foreach ($lang as $lang_key => $lang_val) - { - if (isset($extension_groups_updated[$lang_key]) || strpos($lang_key, 'EXT_GROUP_') !== 0) - { - continue; - } - - $sql_ary = array( - 'group_name' => substr($lang_key, 10), // Strip off 'EXT_GROUP_' - ); - - $sql = 'UPDATE ' . EXTENSION_GROUPS_TABLE . ' - SET ' . $db->sql_build_array('UPDATE', $sql_ary) . " - WHERE group_name = '" . $db->sql_escape($lang_val) . "'"; - $db->sql_query($sql); - - $extension_groups_updated[$lang_key] = true; - } - } - $db->sql_freeresult($result); -} - -/** -* Obtain list of forums in which different attachment categories can be used -*/ -function phpbb_attachment_forum_perms($forum_permissions) -{ - if (empty($forum_permissions)) - { - return ''; - } - - // Decode forum permissions - $forum_ids = array(); - - $one_char_encoding = '#'; - $two_char_encoding = '.'; - - $auth_len = 1; - for ($pos = 0; $pos < strlen($forum_permissions); $pos += $auth_len) - { - $forum_auth = substr($forum_permissions, $pos, 1); - if ($forum_auth == $one_char_encoding) - { - $auth_len = 1; - continue; - } - else if ($forum_auth == $two_char_encoding) - { - $auth_len = 2; - $pos--; - continue; - } - - $forum_auth = substr($forum_permissions, $pos, $auth_len); - $forum_id = base64_unpack($forum_auth); - - $forum_ids[] = (int) $forum_id; - } - - if (count($forum_ids)) - { - return attachment_forum_perms($forum_ids); - } - - return ''; -} - -/** -* Convert the avatar type constants -*/ -function phpbb_avatar_type($type) -{ - switch ($type) - { - case 1: - return AVATAR_UPLOAD; - - case 3: - return AVATAR_GALLERY; - } - - return 0; -} - - -/** -* Just undos the replacing of '<' and '>' -*/ -function phpbb_smilie_html_decode($code) -{ - $code = str_replace('<', '<', $code); - return str_replace('>', '>', $code); -} - -/** -* Transfer avatars, copying the image if it was uploaded -*/ -function phpbb_import_avatar($user_avatar) -{ - global $convert_row; - - if (!$convert_row['user_avatar_type']) - { - return ''; - } - else if ($convert_row['user_avatar_type'] == 1) - { - // Uploaded avatar - return import_avatar($user_avatar, false, $convert_row['user_id']); - } - else if ($convert_row['user_avatar_type'] == 3) - { - // Gallery avatar - return $user_avatar; - } - - return ''; -} - - -/** -* Find out about the avatar's dimensions -*/ -function phpbb_get_avatar_height($user_avatar) -{ - global $convert_row; - - if (empty($convert_row['user_avatar_type'])) - { - return 0; - } - return get_avatar_height($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']); -} - - -/** -* Find out about the avatar's dimensions -*/ -function phpbb_get_avatar_width($user_avatar) -{ - global $convert_row; - - if (empty($convert_row['user_avatar_type'])) - { - return 0; - } - - return get_avatar_width($user_avatar, 'phpbb_avatar_type', $convert_row['user_avatar_type']); -} - - -/** -* Calculate the correct to_address field for private messages -*/ -function phpbb_privmsgs_to_userid($to_userid) -{ - return 'u_' . phpbb_user_id($to_userid); -} - -/** -* Calculate whether a private message was unread using the bitfield -*/ -function phpbb_unread_pm($pm_type) -{ - return ($pm_type == 5) ? 1 : 0; -} - -/** -* Calculate whether a private message was new using the bitfield -*/ -function phpbb_new_pm($pm_type) -{ - return ($pm_type == 1) ? 1 : 0; -} - -/** -* Obtain the folder_id for the custom folder created to replace the savebox from 2.0.x (used to store saved private messages) -*/ -function phpbb_get_savebox_id($user_id) -{ - global $db; - - $user_id = phpbb_user_id($user_id); - - // Only one custom folder, check only one - $sql = 'SELECT folder_id - FROM ' . PRIVMSGS_FOLDER_TABLE . ' - WHERE user_id = ' . $user_id; - $result = $db->sql_query_limit($sql, 1); - $folder_id = (int) $db->sql_fetchfield('folder_id'); - $db->sql_freeresult($result); - - return $folder_id; -} - -/** -* Transfer attachment specific configuration options -* These were not stored in the main config table on 2.0.x -* This is only used if the Attachment MOD was installed -*/ -function phpbb_import_attach_config() -{ - global $src_db, $same_db, $convert, $config; - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'binary'"); - } - - $sql = 'SELECT * - FROM ' . $convert->src_table_prefix . 'attachments_config'; - $result = $src_db->sql_query($sql); - - if ($convert->mysql_convert && $same_db) - { - $src_db->sql_query("SET NAMES 'utf8'"); - } - - $attach_config = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $attach_config[$row['config_name']] = $row['config_value']; - } - $src_db->sql_freeresult($result); - - $config->set('allow_attachments', 1); - - // old attachment mod? Must be very old if this entry do not exist... - if (!empty($attach_config['display_order'])) - { - $config->set('display_order', $attach_config['display_order']); - } - $config->set('max_filesize', $attach_config['max_filesize']); - $config->set('max_filesize_pm', $attach_config['max_filesize_pm']); - $config->set('attachment_quota', $attach_config['attachment_quota']); - $config->set('max_attachments', $attach_config['max_attachments']); - $config->set('max_attachments_pm', $attach_config['max_attachments_pm']); - $config->set('allow_pm_attach', $attach_config['allow_pm_attach']); - - $config->set('img_display_inlined', $attach_config['img_display_inlined']); - $config->set('img_max_width', $attach_config['img_max_width']); - $config->set('img_max_height', $attach_config['img_max_height']); - $config->set('img_create_thumbnail', $attach_config['img_create_thumbnail']); - $config->set('img_max_thumb_width', 400); - $config->set('img_min_thumb_filesize', $attach_config['img_min_thumb_filesize']); -} - -/** -* Calculate the date a user became inactive -*/ -function phpbb_inactive_time() -{ - global $convert_row; - - if ($convert_row['user_active']) - { - return 0; - } - - if ($convert_row['user_lastvisit']) - { - return $convert_row['user_lastvisit']; - } - - return $convert_row['user_regdate']; -} - -/** -* Calculate the reason a user became inactive -* We can't actually tell the difference between a manual deactivation and one for profile changes -* from the data available to assume the latter -*/ -function phpbb_inactive_reason() -{ - global $convert_row; - - if ($convert_row['user_active']) - { - return 0; - } - - if ($convert_row['user_lastvisit']) - { - return INACTIVE_PROFILE; - } - - return INACTIVE_REGISTER; -} - -/** -* Adjust 2.0.x disallowed names to 3.0.x format -*/ -function phpbb_disallowed_username($username) -{ - // Replace * with % - $username = phpbb_set_default_encoding(str_replace('*', '%', $username)); - return utf8_htmlspecialchars($username); -} - -/** -* Checks whether there are any usernames on the old board that would map to the same -* username_clean on phpBB. Prints out a list if any exist and exits. -*/ -function phpbb_create_userconv_table() -{ - global $db; - - switch ($db->get_sql_layer()) - { - case 'mysqli': - $map_dbms = 'mysql_41'; - break; - - case 'mssql_odbc': - case 'mssqlnative': - $map_dbms = 'mssql'; - break; - - default: - $map_dbms = $db->get_sql_layer(); - break; - } - - // create a temporary table in which we store the clean usernames - $drop_sql = 'DROP TABLE ' . USERCONV_TABLE; - switch ($map_dbms) - { - case 'mssql': - $create_sql = 'CREATE TABLE [' . USERCONV_TABLE . '] ( - [user_id] [int] NOT NULL , - [username_clean] [varchar] (255) DEFAULT (\'\') NOT NULL - )'; - break; - - case 'mysql_41': - $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( - user_id mediumint(8) NOT NULL, - username_clean varchar(255) DEFAULT \'\' NOT NULL - ) CHARACTER SET `utf8` COLLATE `utf8_bin`'; - break; - - case 'oracle': - $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( - user_id number(8) NOT NULL, - username_clean varchar2(255) DEFAULT \'\' - )'; - break; - - case 'postgres': - $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( - user_id INT4 DEFAULT \'0\', - username_clean varchar_ci DEFAULT \'\' NOT NULL - )'; - break; - - case 'sqlite3': - $create_sql = 'CREATE TABLE ' . USERCONV_TABLE . ' ( - user_id INTEGER NOT NULL DEFAULT \'0\', - username_clean varchar(255) NOT NULL DEFAULT \'\' - )'; - break; - } - - $db->sql_return_on_error(true); - $db->sql_query($drop_sql); - $db->sql_return_on_error(false); - $db->sql_query($create_sql); -} - -function phpbb_check_username_collisions() -{ - global $db, $src_db, $convert, $user, $lang; - - // now find the clean version of the usernames that collide - $sql = 'SELECT username_clean - FROM ' . USERCONV_TABLE .' - GROUP BY username_clean - HAVING COUNT(user_id) > 1'; - $result = $db->sql_query($sql); - - $colliding_names = array(); - while ($row = $db->sql_fetchrow($result)) - { - $colliding_names[] = $row['username_clean']; - } - $db->sql_freeresult($result); - - // there was at least one collision, the admin will have to solve it before conversion can continue - if (count($colliding_names)) - { - $sql = 'SELECT user_id, username_clean - FROM ' . USERCONV_TABLE . ' - WHERE ' . $db->sql_in_set('username_clean', $colliding_names); - $result = $db->sql_query($sql); - unset($colliding_names); - - $colliding_user_ids = array(); - while ($row = $db->sql_fetchrow($result)) - { - $colliding_user_ids[(int) $row['user_id']] = $row['username_clean']; - } - $db->sql_freeresult($result); - - $sql = 'SELECT username, user_id, user_posts - FROM ' . $convert->src_table_prefix . 'users - WHERE ' . $src_db->sql_in_set('user_id', array_keys($colliding_user_ids)); - $result = $src_db->sql_query($sql); - - $colliding_users = array(); - while ($row = $src_db->sql_fetchrow($result)) - { - $row['user_id'] = (int) $row['user_id']; - if (isset($colliding_user_ids[$row['user_id']])) - { - $colliding_users[$colliding_user_ids[$row['user_id']]][] = $row; - } - } - $src_db->sql_freeresult($result); - unset($colliding_user_ids); - - $list = ''; - foreach ($colliding_users as $username_clean => $users) - { - $list .= sprintf($user->lang['COLLIDING_CLEAN_USERNAME'], $username_clean) . "
        \n"; - foreach ($users as $i => $row) - { - $list .= sprintf($user->lang['COLLIDING_USER'], $row['user_id'], phpbb_set_default_encoding($row['username']), $row['user_posts']) . "
        \n"; - } - } - - $lang['INST_ERR_FATAL'] = $user->lang['CONV_ERR_FATAL']; - $convert->p_master->error('' . $user->lang['COLLIDING_USERNAMES_FOUND'] . '

        ' . $list . '', __LINE__, __FILE__); - } - - $drop_sql = 'DROP TABLE ' . USERCONV_TABLE; - $db->sql_query($drop_sql); -} - -function phpbb_convert_timezone($timezone) -{ - return \phpbb\db\migration\data\v310\timezone::convert_phpbb30_timezone($timezone, 0); -} - -function phpbb_add_notification_options($user_notify_pm) -{ - global $convert_row, $db; - - $user_id = phpbb_user_id($convert_row['user_id']); - if ($user_id == ANONYMOUS) - { - return; - } - - $rows = array(); - - $rows[] = array( - 'item_type' => 'post', - 'item_id' => 0, - 'user_id' => (int) $user_id, - 'notify' => 1, - 'method' => 'email', - ); - $rows[] = array( - 'item_type' => 'topic', - 'item_id' => 0, - 'user_id' => (int) $user_id, - 'notify' => 1, - 'method' => 'email', - ); - if ($user_notify_pm) - { - $rows[] = array( - 'item_type' => 'pm', - 'item_id' => 0, - 'user_id' => (int) $user_id, - 'notify' => 1, - 'method' => 'email', - ); - } - - $db->sql_multi_insert(USER_NOTIFICATIONS_TABLE, $rows); -} - -function phpbb_convert_password_hash($hash) -{ - global $phpbb_container; - - /* @var $manager \phpbb\passwords\manager */ - $manager = $phpbb_container->get('passwords.manager'); - $hash = $manager->hash($hash, '$H$'); - - return '$CP$' . $hash; -} diff --git a/phpBB/install/convertors/index.htm b/phpBB/install/convertors/index.htm new file mode 100644 index 00000000000..ee1f723a7dd --- /dev/null +++ b/phpBB/install/convertors/index.htm @@ -0,0 +1,10 @@ + + + + + + + + + + From 391bda011e9985b799608ecab89e807fc4314875 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 26 Sep 2025 15:38:13 +0200 Subject: [PATCH 0924/1214] [ticket/16005] Remove references that don't make sense anymore PHPBB-16005 --- phpBB/includes/functions_convert.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 8a161edfa75..9292281c1f3 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1022,7 +1022,7 @@ function user_group_auth($group, $select_query, $use_src_db) /** * Retrieves configuration information from the source forum and caches it as an array * Both database and file driven configuration formats can be handled -* (the type used is specified in $config_schema, see convert_phpbb20.php for more details) +* (the type used is specified in $config_schema) */ function get_config() { @@ -1110,7 +1110,7 @@ function get_config() /** * Transfers the relevant configuration information from the source forum -* The mapping of fields is specified in $config_schema, see convert_phpbb20.php for more details +* The mapping of fields is specified in $config_schema */ function restore_config($schema) { From 56e393c80547aaddbeeb8d129fda925e78179937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Fri, 28 Sep 2018 23:28:06 +0200 Subject: [PATCH 0925/1214] [ticket/15813] Team page to controller PHPBB3-15813 --- phpBB/config/default/container/services.yml | 1 + .../default/container/services_members.yml | 16 + phpBB/config/default/routing/members.yml | 4 + phpBB/config/default/routing/routing.yml | 3 + phpBB/memberlist.php | 276 +------------ phpBB/phpbb/members/controller/team.php | 389 ++++++++++++++++++ 6 files changed, 418 insertions(+), 271 deletions(-) create mode 100644 phpBB/config/default/container/services_members.yml create mode 100644 phpBB/config/default/routing/members.yml create mode 100644 phpBB/phpbb/members/controller/team.php diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index ecf8f3109e7..e3652c0dbf8 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -19,6 +19,7 @@ imports: - { resource: services_http.yml } - { resource: services_language.yml } - { resource: services_mention.yml } + - { resource: services_members.yml } - { resource: services_messenger.yml } - { resource: services_migrator.yml } - { resource: services_mimetype_guesser.yml } diff --git a/phpBB/config/default/container/services_members.yml b/phpBB/config/default/container/services_members.yml new file mode 100644 index 00000000000..5eca54f6ea2 --- /dev/null +++ b/phpBB/config/default/container/services_members.yml @@ -0,0 +1,16 @@ +services: + +# Controllers + members.controller.team: + class: phpbb\members\controller\team + arguments: + - '@auth' + - '@config' + - '@dbal.conn' + - '@dispatcher' + - '@group_helper' + - '@controller.helper' + - '@language' + - '@request' + - '@template' + - '@user' diff --git a/phpBB/config/default/routing/members.yml b/phpBB/config/default/routing/members.yml new file mode 100644 index 00000000000..a254a43a29b --- /dev/null +++ b/phpBB/config/default/routing/members.yml @@ -0,0 +1,4 @@ +phpbb_members_team: + path: /team + defaults: + _controller: members.controller.team:handle diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 46d20e45270..8e28174b165 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -28,6 +28,9 @@ phpbb_manifest_controller: path: /manifest defaults: { _controller: manifest.controller:handle } +phpbb_members_routing: + resource: members.yml + phpbb_mention_controller: path: /mention methods: [GET, POST] diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index e41d751106a..055971c6dda 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -62,6 +62,11 @@ case 'contactadmin': break; + case 'team': + send_status_line(301, 'Moved Permanently'); + redirect($controller_helper->route('phpbb_members_team', [], false)); + break; + case 'livesearch': if (!$config['allow_live_searches']) { @@ -102,277 +107,6 @@ // What do you want to do today? ... oops, I think that line is taken ... switch ($mode) { - case 'team': - // Display a listing of board admins, moderators - if (!function_exists('user_get_id_name')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - $page_title = $user->lang['THE_TEAM']; - $template_html = 'memberlist_team.html'; - - $sql = 'SELECT * - FROM ' . TEAMPAGE_TABLE . ' - ORDER BY teampage_position ASC'; - $result = $db->sql_query($sql, 3600); - $teampage_data = $db->sql_fetchrowset($result); - $db->sql_freeresult($result); - - $sql_ary = array( - 'SELECT' => 'g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id, t.teampage_id', - - 'FROM' => array(GROUPS_TABLE => 'g'), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(TEAMPAGE_TABLE => 't'), - 'ON' => 't.group_id = g.group_id', - ), - array( - 'FROM' => array(USER_GROUP_TABLE => 'ug'), - 'ON' => 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $user->data['user_id'], - ), - ), - ); - - $result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); - - $group_ids = $groups_ary = array(); - while ($row = $db->sql_fetchrow($result)) - { - if ($row['group_type'] == GROUP_HIDDEN && !$auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $user->data['user_id']) - { - $row['group_name'] = $user->lang['GROUP_UNDISCLOSED']; - $row['u_group'] = ''; - } - else - { - $row['group_name'] = $group_helper->get_name($row['group_name']); - $row['u_group'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']); - } - - if ($row['teampage_id']) - { - // Only put groups into the array we want to display. - // We are fetching all groups, to ensure we got all data for default groups. - $group_ids[] = (int) $row['group_id']; - } - $groups_ary[(int) $row['group_id']] = $row; - } - $db->sql_freeresult($result); - - $sql_ary = array( - 'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_type, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id', - - 'FROM' => array( - USER_GROUP_TABLE => 'ug', - ), - - 'LEFT_JOIN' => array( - array( - 'FROM' => array(USERS_TABLE => 'u'), - 'ON' => 'ug.user_id = u.user_id', - ), - array( - 'FROM' => array(GROUPS_TABLE => 'g'), - 'ON' => 'ug.group_id = g.group_id', - ), - ), - - 'WHERE' => $db->sql_in_set('g.group_id', $group_ids, false, true) . ' AND ug.user_pending = 0', - - 'ORDER_BY' => 'u.username_clean ASC', - ); - - /** - * Modify the query used to get the users for the team page - * - * @event core.memberlist_team_modify_query - * @var array sql_ary Array containing the query - * @var array group_ids Array of group ids - * @var array teampage_data The teampage data - * @since 3.1.3-RC1 - */ - $vars = array( - 'sql_ary', - 'group_ids', - 'teampage_data', - ); - extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars))); - - $result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); - - $user_ary = $user_ids = $group_users = array(); - while ($row = $db->sql_fetchrow($result)) - { - $row['forums'] = ''; - $row['forums_ary'] = array(); - $user_ary[(int) $row['user_id']] = $row; - $user_ids[] = (int) $row['user_id']; - $group_users[(int) $row['group_id']][] = (int) $row['user_id']; - } - $db->sql_freeresult($result); - - $user_ids = array_unique($user_ids); - - if (!empty($user_ids) && $config['teampage_forums']) - { - $template->assign_var('S_DISPLAY_MODERATOR_FORUMS', true); - // Get all moderators - $perm_ary = $auth->acl_get_list($user_ids, array('m_'), false); - - foreach ($perm_ary as $forum_id => $forum_ary) - { - foreach ($forum_ary as $auth_option => $id_ary) - { - foreach ($id_ary as $id) - { - if (!$forum_id) - { - $user_ary[$id]['forums'] = $user->lang['ALL_FORUMS']; - } - else - { - $user_ary[$id]['forums_ary'][] = $forum_id; - } - } - } - } - - $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE; - $result = $db->sql_query($sql); - - $forums = array(); - while ($row = $db->sql_fetchrow($result)) - { - $forums[$row['forum_id']] = $row['forum_name']; - } - $db->sql_freeresult($result); - - foreach ($user_ary as $user_id => $user_data) - { - if (!$user_data['forums']) - { - foreach ($user_data['forums_ary'] as $forum_id) - { - $user_ary[$user_id]['forums_options'] = true; - if (isset($forums[$forum_id])) - { - if ($auth->acl_get('f_list', $forum_id)) - { - $user_ary[$user_id]['forums'] .= ''; - } - } - } - } - } - } - - $parent_team = 0; - foreach ($teampage_data as $team_data) - { - // If this team entry has no group, it's a category - if (!$team_data['group_id']) - { - $template->assign_block_vars('group', array( - 'GROUP_NAME' => $team_data['teampage_name'], - )); - - $parent_team = (int) $team_data['teampage_id']; - continue; - } - - $group_data = $groups_ary[(int) $team_data['group_id']]; - $group_id = (int) $team_data['group_id']; - - if (!$team_data['teampage_parent']) - { - // If the group does not have a parent category, we display the groupname as category - $template->assign_block_vars('group', array( - 'GROUP_NAME' => $group_data['group_name'], - 'GROUP_COLOR' => $group_data['group_colour'], - 'U_GROUP' => $group_data['u_group'], - )); - } - - // Display group members. - if (!empty($group_users[$group_id])) - { - foreach ($group_users[$group_id] as $user_id) - { - if (isset($user_ary[$user_id])) - { - $row = $user_ary[$user_id]; - if ($config['teampage_memberships'] == 1 && ($group_id != $groups_ary[$row['default_group']]['group_id']) && $groups_ary[$row['default_group']]['teampage_id']) - { - // Display users in their primary group, instead of the first group, when it is displayed on the teampage. - continue; - } - - $user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts'])); - - $template_vars = array( - 'USER_ID' => $row['user_id'], - 'FORUMS' => $row['forums'], - 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, - 'RANK_TITLE' => $user_rank_data['title'], - - 'GROUP_NAME' => $groups_ary[$row['default_group']]['group_name'], - 'GROUP_COLOR' => $groups_ary[$row['default_group']]['group_colour'], - 'U_GROUP' => $groups_ary[$row['default_group']]['u_group'], - - 'RANK_IMG' => $user_rank_data['img'], - 'RANK_IMG_SRC' => $user_rank_data['img_src'], - - 'S_INACTIVE' => $row['user_type'] == USER_INACTIVE, - - 'U_PM' => ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '', - - 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), - 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), - 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), - 'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), - ); - - /** - * Modify the template vars for displaying the user in the groups on the teampage - * - * @event core.memberlist_team_modify_template_vars - * @var array template_vars Array containing the query - * @var array row Array containing the action user row - * @var array groups_ary Array of groups with all users that should be displayed - * @since 3.1.3-RC1 - */ - $vars = array( - 'template_vars', - 'row', - 'groups_ary', - ); - extract($phpbb_dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars))); - - $template->assign_block_vars('group.user', $template_vars); - - if ($config['teampage_memberships'] != 2) - { - unset($user_ary[$user_id]); - } - } - } - } - } - - $template->assign_block_vars('navlinks', array( - 'BREADCRUMB_NAME' => $page_title, - 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=team"), - )); - - $template->assign_vars(array( - 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE'])) - ); - break; - case 'viewprofile': // Display a profile if ($user_id == ANONYMOUS && !$username) diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php new file mode 100644 index 00000000000..5ca0a20e747 --- /dev/null +++ b/phpBB/phpbb/members/controller/team.php @@ -0,0 +1,389 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\members\controller; + +use \phpbb\auth\auth; +use \phpbb\config\config; +use \phpbb\db\driver\driver_interface; +use \phpbb\event\dispatcher; +use \phpbb\group\helper as group_helper; +use \phpbb\controller\helper; +use \phpbb\language\language; +use \phpbb\request\request_interface; +use \phpbb\template\template; +use \phpbb\user; + +class team +{ + /** + * @var auth + */ + protected $auth; + + /** + * @var config + */ + protected $config; + + /** + * @var driver_interface + */ + protected $db; + + /** + * @var dispatcher + */ + protected $dispatcher; + + /** + * @var group_helper + */ + protected $group_helper; + + /** + * @var helper + */ + protected $helper; + + /** + * @var language + */ + protected $language; + + /** + * @var request_interface + */ + protected $request; + + /** + * @var template + */ + protected $template; + + /** + * @var user + */ + protected $user; + + public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, group_helper $group_helper, helper $helper, language $language, request_interface $request, template $template, user $user) + { + $this->auth = $auth; + $this->config = $config; + $this->db = $db; + $this->dispatcher = $dispatcher; + $this->group_helper = $group_helper; + $this->helper = $helper; + $this->language = $language; + $this->request = $request; + $this->template = $template; + $this->user = $user; + } + + /** + * Controller for /team route + * + * @return \Symfony\Component\HttpFoundation\Response a Symfony response object + */ + public function handle() + { + global $phpbb_root_path, $phpEx; + + // Display a listing of board admins, moderators + if (!function_exists('user_get_id_name')) + { + include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + } + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + + // Load language strings + $this->language->add_lang('memberlist'); + + // Can this user view profiles/memberlist? + if (!$this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) + { + if ($this->user->data['user_id'] != ANONYMOUS) + { + send_status_line(403, 'Forbidden'); + trigger_error('NO_VIEW_USERS'); + } + + login_box('', $this->language->lang('LOGIN_EXPLAIN_TEAM')); + } + + $sql = 'SELECT * + FROM ' . TEAMPAGE_TABLE . ' + ORDER BY teampage_position ASC'; + $result = $this->db->sql_query($sql, 3600); + $teampage_data = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + $sql_ary = array( + 'SELECT' => 'g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id, t.teampage_id', + + 'FROM' => array(GROUPS_TABLE => 'g'), + + 'LEFT_JOIN' => array( + array( + 'FROM' => array(TEAMPAGE_TABLE => 't'), + 'ON' => 't.group_id = g.group_id', + ), + array( + 'FROM' => array(USER_GROUP_TABLE => 'ug'), + 'ON' => 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $this->user->data['user_id'], + ), + ), + ); + + $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); + + $group_ids = $groups_ary = array(); + while ($row = $this->db->sql_fetchrow($result)) + { + if ($row['group_type'] == GROUP_HIDDEN && !$this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $this->user->data['user_id']) + { + $row['group_name'] = $this->language->lang('GROUP_UNDISCLOSED'); + $row['u_group'] = ''; + } + else + { + $row['group_name'] = $this->group_helper->get_name($row['group_name']); + $row['u_group'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']); + } + + if ($row['teampage_id']) + { + // Only put groups into the array we want to display. + // We are fetching all groups, to ensure we got all data for default groups. + $group_ids[] = (int) $row['group_id']; + } + $groups_ary[(int) $row['group_id']] = $row; + } + $this->db->sql_freeresult($result); + + $sql_ary = array( + 'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_type, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id', + + 'FROM' => array( + USER_GROUP_TABLE => 'ug', + ), + + 'LEFT_JOIN' => array( + array( + 'FROM' => array(USERS_TABLE => 'u'), + 'ON' => 'ug.user_id = u.user_id', + ), + array( + 'FROM' => array(GROUPS_TABLE => 'g'), + 'ON' => 'ug.group_id = g.group_id', + ), + ), + + 'WHERE' => $this->db->sql_in_set('g.group_id', $group_ids, false, true), + + 'ORDER_BY' => 'u.username_clean ASC', + ); + + /** + * Modify the query used to get the users for the team page + * + * @event core.memberlist_team_modify_query + * @var array sql_ary Array containing the query + * @var array group_ids Array of group ids + * @var array teampage_data The teampage data + * @since 3.1.3-RC1 + */ + $vars = array( + 'sql_ary', + 'group_ids', + 'teampage_data', + ); + extract($this->dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars))); + + $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); + + $user_ary = $user_ids = $group_users = array(); + while ($row = $this->db->sql_fetchrow($result)) + { + $row['forums'] = ''; + $row['forums_ary'] = array(); + $user_ary[(int) $row['user_id']] = $row; + $user_ids[] = (int) $row['user_id']; + $group_users[(int) $row['group_id']][] = (int) $row['user_id']; + } + $this->db->sql_freeresult($result); + + $user_ids = array_unique($user_ids); + + if (!empty($user_ids) && $this->config['teampage_forums']) + { + $this->template->assign_var('S_DISPLAY_MODERATOR_FORUMS', true); + // Get all moderators + $perm_ary = $this->auth->acl_get_list($user_ids, array('m_'), false); + + foreach ($perm_ary as $forum_id => $forum_ary) + { + foreach ($forum_ary as $this->auth_option => $id_ary) + { + foreach ($id_ary as $id) + { + if (!$forum_id) + { + $user_ary[$id]['forums'] = $this->language->lang('ALL_FORUMS'); + } + else + { + $user_ary[$id]['forums_ary'][] = $forum_id; + } + } + } + } + + $sql = 'SELECT forum_id, forum_name + FROM ' . FORUMS_TABLE; + $result = $this->db->sql_query($sql); + + $forums = array(); + while ($row = $this->db->sql_fetchrow($result)) + { + $forums[$row['forum_id']] = $row['forum_name']; + } + $this->db->sql_freeresult($result); + + foreach ($user_ary as $user_id => $user_data) + { + if (!$user_data['forums']) + { + foreach ($user_data['forums_ary'] as $forum_id) + { + $user_ary[$user_id]['forums_options'] = true; + if (isset($forums[$forum_id])) + { + if ($this->auth->acl_get('f_list', $forum_id)) + { + $user_ary[$user_id]['forums'] .= ''; + } + } + } + } + } + } + + $parent_team = 0; + foreach ($teampage_data as $team_data) + { + // If this team entry has no group, it's a category + if (!$team_data['group_id']) + { + $this->template->assign_block_vars('group', array( + 'GROUP_NAME' => $team_data['teampage_name'], + )); + + $parent_team = (int) $team_data['teampage_id']; + continue; + } + + $group_data = $groups_ary[(int) $team_data['group_id']]; + $group_id = (int) $team_data['group_id']; + + if (!$team_data['teampage_parent']) + { + // If the group does not have a parent category, we display the groupname as category + $this->template->assign_block_vars('group', array( + 'GROUP_NAME' => $group_data['group_name'], + 'GROUP_COLOR' => $group_data['group_colour'], + 'U_GROUP' => $group_data['u_group'], + )); + } + + // Display group members. + if (!empty($group_users[$group_id])) + { + foreach ($group_users[$group_id] as $user_id) + { + if (isset($user_ary[$user_id])) + { + $row = $user_ary[$user_id]; + if ($this->config['teampage_memberships'] == 1 && ($group_id != $groups_ary[$row['default_group']]['group_id']) && $groups_ary[$row['default_group']]['teampage_id']) + { + // Display users in their primary group, instead of the first group, when it is displayed on the teampage. + continue; + } + + $user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts'])); + + $template_vars = array( + 'USER_ID' => $row['user_id'], + 'FORUMS' => $row['forums'], + 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, + 'RANK_TITLE' => $user_rank_data['title'], + + 'GROUP_NAME' => $groups_ary[$row['default_group']]['group_name'], + 'GROUP_COLOR' => $groups_ary[$row['default_group']]['group_colour'], + 'U_GROUP' => $groups_ary[$row['default_group']]['u_group'], + + 'RANK_IMG' => $user_rank_data['img'], + 'RANK_IMG_SRC' => $user_rank_data['img_src'], + + 'S_INACTIVE' => $row['user_type'] == USER_INACTIVE, + + 'U_PM' => ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '', + + 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), + 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), + 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), + 'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), + ); + + /** + * Modify the template vars for displaying the user in the groups on the teampage + * + * @event core.memberlist_team_modify_template_vars + * @var array template_vars Array containing the query + * @var array row Array containing the action user row + * @var array groups_ary Array of groups with all users that should be displayed + * @since 3.1.3-RC1 + */ + $vars = array( + 'template_vars', + 'row', + 'groups_ary', + ); + extract($this->dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars))); + + $this->template->assign_block_vars('group.user', $template_vars); + + if ($this->config['teampage_memberships'] != 2) + { + unset($user_ary[$user_id]); + } + } + } + } + } + + $this->template->assign_vars(array( + 'PM_IMG' => $this->user->img('icon_contact_pm', $this->language->lang('SEND_PRIVATE_MESSAGE'))) + ); + + // Breadcrums + $this->template->assign_block_vars('navlinks', array( + 'BREADCRUMB_NAME' => $this->language->lang('THE_TEAM'), + 'U_BREADCRUMB' => $this->helper->route('phpbb_members_team'), + )); + + // Render + return $this->helper->render('memberlist_team.html', $this->language->lang('THE_TEAM')); + } + +} From af4d6ece154eb8dd24184c0678a98afd1feb9ca0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 1 Oct 2018 17:01:37 +0200 Subject: [PATCH 0926/1214] [ticket/15813] Add make_jumpbox PHPBB3-15813 --- phpBB/phpbb/members/controller/team.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php index 5ca0a20e747..1774260a593 100644 --- a/phpBB/phpbb/members/controller/team.php +++ b/phpBB/phpbb/members/controller/team.php @@ -382,6 +382,8 @@ public function handle() 'U_BREADCRUMB' => $this->helper->route('phpbb_members_team'), )); + make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); + // Render return $this->helper->render('memberlist_team.html', $this->language->lang('THE_TEAM')); } From b1b3a066dcea4d1c0066becf2a26f545203b9013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 1 Oct 2018 21:09:31 +0200 Subject: [PATCH 0927/1214] [ticket/15813] Update routes PHPBB3-15813 --- phpBB/includes/functions.php | 2 +- tests/functional/memberlist_test.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 3bb60af3cc9..45a8fc3c7b4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3866,7 +3866,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller'), 'U_CONTACT_US' => ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '', - 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'), + 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : append_sid($controller_helper->route('phpbb_members_team')), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), 'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')), diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index 5497c240375..21b16a666bc 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -43,7 +43,7 @@ public function test_viewprofile() protected function get_memberlist_leaders_table_crawler() { - $crawler = self::request('GET', 'memberlist.php?mode=team&sid=' . $this->sid); + $crawler = self::request('GET', 'team?sid=' . $this->sid); return $crawler->filter('.forumbg-table'); } From 97d7b447c31f0267aac7633ad75e468e6d34eb5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Mon, 1 Oct 2018 22:07:07 +0200 Subject: [PATCH 0928/1214] [ticket/15813] Remove unused parameter PHPBB3-15813 --- phpBB/config/default/container/services_members.yml | 1 - phpBB/phpbb/members/controller/team.php | 9 +-------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/phpBB/config/default/container/services_members.yml b/phpBB/config/default/container/services_members.yml index 5eca54f6ea2..a75015e2396 100644 --- a/phpBB/config/default/container/services_members.yml +++ b/phpBB/config/default/container/services_members.yml @@ -11,6 +11,5 @@ services: - '@group_helper' - '@controller.helper' - '@language' - - '@request' - '@template' - '@user' diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php index 1774260a593..9b0f5d7df39 100644 --- a/phpBB/phpbb/members/controller/team.php +++ b/phpBB/phpbb/members/controller/team.php @@ -20,7 +20,6 @@ use \phpbb\group\helper as group_helper; use \phpbb\controller\helper; use \phpbb\language\language; -use \phpbb\request\request_interface; use \phpbb\template\template; use \phpbb\user; @@ -61,11 +60,6 @@ class team */ protected $language; - /** - * @var request_interface - */ - protected $request; - /** * @var template */ @@ -76,7 +70,7 @@ class team */ protected $user; - public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, group_helper $group_helper, helper $helper, language $language, request_interface $request, template $template, user $user) + public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, group_helper $group_helper, helper $helper, language $language, template $template, user $user) { $this->auth = $auth; $this->config = $config; @@ -85,7 +79,6 @@ public function __construct(auth $auth, config $config, driver_interface $db, di $this->group_helper = $group_helper; $this->helper = $helper; $this->language = $language; - $this->request = $request; $this->template = $template; $this->user = $user; } From 5dd3bfc576780aa24d6eaf373fc89394909b59bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20Calvo?= Date: Wed, 3 Oct 2018 23:13:09 +0200 Subject: [PATCH 0929/1214] [ticket/15813] Don't use trigger_error on controllers PHPBB3-15813 --- phpBB/phpbb/members/controller/team.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php index 9b0f5d7df39..8fa26444676 100644 --- a/phpBB/phpbb/members/controller/team.php +++ b/phpBB/phpbb/members/controller/team.php @@ -107,8 +107,7 @@ public function handle() { if ($this->user->data['user_id'] != ANONYMOUS) { - send_status_line(403, 'Forbidden'); - trigger_error('NO_VIEW_USERS'); + throw new http_exception(403, 'NO_VIEW_USERS'); } login_box('', $this->language->lang('LOGIN_EXPLAIN_TEAM')); From b2ca53f64f6f1791983a4cc6c232d8c4683aa0fd Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Thu, 1 Nov 2018 20:37:17 +0000 Subject: [PATCH 0930/1214] [ticket/15813] Remove append_sid from route PHPBB3-15813 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 45a8fc3c7b4..188f98d7e99 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3866,7 +3866,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_SEARCH_ACTIVE_TOPICS'=> append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=active_topics'), 'U_DELETE_COOKIES' => $controller_helper->route('phpbb_ucp_delete_cookies_controller'), 'U_CONTACT_US' => ($config['contact_admin_form_enable'] && $config['email_enable']) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin') : '', - 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : append_sid($controller_helper->route('phpbb_members_team')), + 'U_TEAM' => (!$auth->acl_get('u_viewprofile')) ? '' : $controller_helper->route('phpbb_members_team'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'), 'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), 'UA_PRIVACY' => addslashes(append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy')), From 4b71f0323afbd4ae436d9052b35ff231cd215393 Mon Sep 17 00:00:00 2001 From: Derky Date: Sat, 27 Sep 2025 17:27:36 +0200 Subject: [PATCH 0931/1214] [ticket/17554] Mock Extensions Catalog cache in tests PHPBB-17554 --- tests/functional/extension_acp_test.php | 22 +++++++++++- .../fixtures/files/extensions_catalog.json | 34 +++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 tests/functional/fixtures/files/extensions_catalog.json diff --git a/tests/functional/extension_acp_test.php b/tests/functional/extension_acp_test.php index 8f76a91b957..94106e0872e 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -79,6 +79,18 @@ protected function setUp(): void $this->add_lang(['acp/common', 'acp/extensions']); } + /** + * Mocks the extensions catalog cache used in phpBB/phpbb/composer/manager.php + * with a predefined fixture so no external calls are made. + */ + protected function mock_extensions_catalog_cache():void { + $fixture_file = __DIR__ . '/fixtures/files/extensions_catalog.json'; + $package_type = 'phpbb-extension'; + + $available_extensions = json_decode(file_get_contents($fixture_file), true); + $this->cache->put('_composer_' . $package_type . '_available', $available_extensions, 24*60*60); + } + public function test_list() { $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=main&sid=' . $this->sid); @@ -247,6 +259,7 @@ public function test_actions() public function test_extensions_catalog() { // Access extensions catalog main page + $this->mock_extensions_catalog_cache(); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid); $this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content()); @@ -260,6 +273,7 @@ public function test_extensions_catalog() $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('div[class="successbox"] > p')->text()); // Revisit extensions catalog main page after configuration change + $this->mock_extensions_catalog_cache(); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid); $this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content()); @@ -270,12 +284,17 @@ public function test_extensions_catalog() public function test_extensions_catalog_installing_extension() { // Let's check the overview, multiple packages should be listed + $this->mock_extensions_catalog_cache(); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&mode=catalog&sid=' . $this->sid); $this->assertContainsLang('ACP_EXTENSIONS_CATALOG', $this->get_content()); $this->assertGreaterThan(1, $crawler->filter('tr')->count()); $this->assertGreaterThan(1, $crawler->selectLink($this->lang('INSTALL'))->count()); - $pages = (int) $crawler->filter('div.pagination li:nth-last-child(2) a')->first()->text(); + $pages = 1; + $pagination = $crawler->filter('div.pagination li:nth-last-child(2) a'); + if ($pagination->count() > 0) { + $pages = (int) $pagination->first()->text(); + } // Get Install links for both extensions $extension_filter = function($crawler, $extension_name, &$install_link) @@ -297,6 +316,7 @@ function ($node, $i) use ($extension_name) { if ($i != 0) { + $this->mock_extensions_catalog_cache(); $crawler = self::request('GET', 'adm/index.php?i=acp_extensions&start=' . $i * 20 . '&mode=catalog&sid=' . $this->sid); } diff --git a/tests/functional/fixtures/files/extensions_catalog.json b/tests/functional/fixtures/files/extensions_catalog.json new file mode 100644 index 00000000000..f2683e7709a --- /dev/null +++ b/tests/functional/fixtures/files/extensions_catalog.json @@ -0,0 +1,34 @@ +[ + { + "name": "extension1\/vendor", + "display_name": "Extension 1", + "composer_name": "extension1\/vendor", + "version": "1.0.0", + "description": "Dummy extension 1 for testing.", + "url": "https:\/\/example.com\/extension1", + "authors": [ + { + "name": "Author One", + "email": "author1@example.com", + "homepage": "https:\/\/author1.example.com", + "role": "Developer" + } + ] + }, + { + "name": "phpbb\/viglink", + "display_name": "VigLink", + "composer_name": "phpbb\/viglink", + "version": "dev-master", + "description": "The VigLink extension for phpBB makes it possible to earn revenue, without any change to the user experience, when users post and follow links to commercial sites.", + "url": "https:\/\/www.phpbb.com\/", + "authors": [ + { + "name": "Author Two", + "email": "author2@example.com", + "homepage": "https:\/\/author2.example.com", + "role": "Developer" + } + ] + } +] From a8d71f60e6f075e940e6fc4f8d1beb65c420e3dd Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 27 Sep 2025 15:45:15 +0200 Subject: [PATCH 0932/1214] [ticket/15813] Fix code style PHPBB3-15813 --- phpBB/memberlist.php | 3 ++ phpBB/phpbb/members/controller/team.php | 39 +++++++++++++------------ 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 055971c6dda..adeec2e6432 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -43,6 +43,9 @@ $group_id = $request->variable('g', 0); $topic_id = $request->variable('t', 0); +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); + // Redirect when old mode is used if ($mode == 'leaders') { diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php index 8fa26444676..a536f98e703 100644 --- a/phpBB/phpbb/members/controller/team.php +++ b/phpBB/phpbb/members/controller/team.php @@ -1,27 +1,28 @@ - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ +* +* This file is part of the phpBB Forum Software package. +* +* @copyright (c) phpBB Limited +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ namespace phpbb\members\controller; -use \phpbb\auth\auth; -use \phpbb\config\config; -use \phpbb\db\driver\driver_interface; -use \phpbb\event\dispatcher; -use \phpbb\group\helper as group_helper; -use \phpbb\controller\helper; -use \phpbb\language\language; -use \phpbb\template\template; -use \phpbb\user; +use phpbb\auth\auth; +use phpbb\config\config; +use phpbb\db\driver\driver_interface; +use phpbb\event\dispatcher; +use phpbb\exception\http_exception; +use phpbb\group\helper as group_helper; +use phpbb\controller\helper; +use phpbb\language\language; +use phpbb\template\template; +use phpbb\user; class team { From 74b1de0bc244db56fd105e91c9e9f453332d9eb6 Mon Sep 17 00:00:00 2001 From: Patrick Webster Date: Sat, 27 Sep 2025 17:07:36 -0500 Subject: [PATCH 0933/1214] [ticket/17477] Support non-prefixed whois servers Referral servers lacking the whois:// prefix are not currently supported. This ticket adds support for those servers. At the moment, this is mainly an issue for RIPE entries on ARIN. They will now be detected and followed. PHPBB-17477 --- phpBB/includes/functions_user.php | 3 ++- tests/functions_user/whois_test.php | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index a87b79d3a65..1c615fa9d0d 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1482,7 +1482,8 @@ function user_ipwhois($ip) $match = array(); // Test for referrals from $whois_host to other whois databases, roll on rwhois - if (preg_match('#ReferralServer:[\x20]*whois://(.+)#im', $ipwhois, $match)) + // Search for referral servers with or without the "whois://" prefix + if (preg_match('#ReferralServer:[\x20]*whois://(.+)#im', $ipwhois, $match) || preg_match('#ReferralServer:[\x20]*([^/]+)$#im', $ipwhois, $match)) { if (strpos($match[1], ':') !== false) { diff --git a/tests/functions_user/whois_test.php b/tests/functions_user/whois_test.php index 4dd72311bb5..70873f6b1a9 100644 --- a/tests/functions_user/whois_test.php +++ b/tests/functions_user/whois_test.php @@ -33,8 +33,10 @@ public function setUp(): void public function ips_data() { return [ - ['2001:4860:4860::8888'], // Google public DNS - ['64.233.161.139'], // google.com + ['2001:4860:4860::8888'], // Google public DNS (ARIN) + ['64.233.161.139'], // google.com (ARIN) + ['1.1.1.1'], // Cloudflare (APNIC via whois:// referral) + ['213.133.116.44'], // Hetzner (RIPE via non-whois:// referral) ]; } @@ -47,5 +49,6 @@ public function test_ip_whois($ip) $this->assertStringNotContainsString('Query terms are ambiguous', $ip_whois); $this->assertStringNotContainsString('no entries found', $ip_whois); $this->assertStringNotContainsString('ERROR', $ip_whois); + $this->assertStringNotContainsString('Allocated to RIPE NCC', $ip_whois); // This only shows if the referral isn't found } } From 7bec5486530a4d17b957b86bc654d4def3296eac Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sun, 28 Sep 2025 11:53:33 +0200 Subject: [PATCH 0934/1214] [ticket/17539] Changes default password complexity to PASS_TYPE_ALPHA PHPBB-17539 --- phpBB/install/schemas/schema_data.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 2da7f8ba33d..d567d8296b2 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -230,7 +230,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('min_search_author_ INSERT INTO phpbb_config (config_name, config_value) VALUES ('new_member_group_default', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('new_member_post_limit', '3'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('override_user_style', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ANY'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('pass_complex', 'PASS_TYPE_ALPHA'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('plupload_salt', 'phpbb_plupload'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_edit_time', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('pm_max_boxes', '4'); From 31665995b03d9bed34fa0f76d73b5ebf8e2b396a Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sun, 28 Sep 2025 12:17:52 +0200 Subject: [PATCH 0935/1214] [ticket/17536] Addings four events to acp_forums.html fieldset PHPBB-17536 --- phpBB/adm/style/acp_forums.html | 4 ++++ phpBB/docs/events.md | 24 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index f51ce987767..915751b4256 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -189,11 +189,13 @@

        {L_WARNING}

        {L_GENERAL_FORUM_SETTINGS} + {% EVENT acp_forum_cat_options_prepend %}

        {L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
        + {% EVENT acp_forum_cat_options_append %}
        @@ -307,6 +309,7 @@

        {L_WARNING}

        diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 35c3e59c6f3..38d441bba53 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -108,12 +108,36 @@ acp_ext_list_not_installed_title_after * Changed: 3.3.14 Renamed from acp_ext_list_available_title_after * Purpose: Add text after not installed extensions section title. +acp_forums_cat_options_prepend +=== +* Location: adm/style/acp_forums.html +* Since: 3.3.16-RC1 +* Purpose: Add additional settings to a forum type 'category' within 'General forum settings' fieldset + +acp_forums_cat_options_append +=== +* Location: adm/style/acp_forums.html +* Since: 3.3.16-RC1 +* Purpose: Add additional settings to a forum type 'category' within 'General forum settings' fieldset + acp_forums_custom_settings === * Location: adm/style/acp_forums.html * Since: 3.1.6-RC1 * Purpose: Add its own box (fieldset) for extension settings +acp_forums_link_options_prepend +=== +* Location: adm/style/acp_forums.html +* Since: 3.3.16-RC1 +* Purpose: Add additional settings to a forum type 'link' within 'General forum settings' fieldset + +acp_forums_link_options_append +=== +* Location: adm/style/acp_forums.html +* Since: 3.3.16-RC1 +* Purpose: Add additional settings to a forum type 'link' within 'General forum settings' fieldset + acp_forums_main_settings_append === * Location: adm/style/acp_forums.html From 0eab040b971047770af7d9d98c56a6ae65fc1b21 Mon Sep 17 00:00:00 2001 From: Derky Date: Sun, 28 Sep 2025 13:28:18 +0200 Subject: [PATCH 0936/1214] [ticket/17554] Prevent opening Extension Catalog in test_all_acp_module_links PHPBB-17554 --- tests/functional/acp_test.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/functional/acp_test.php b/tests/functional/acp_test.php index bf37fc7203f..d390d3158bd 100644 --- a/tests/functional/acp_test.php +++ b/tests/functional/acp_test.php @@ -58,6 +58,12 @@ function ($node, $i) // Browse all ACP submodules' modes foreach ($acp_submodules as $acp_submodule) { + // Don't click the ACP Extensions Catalog to prevent calling an external HTTP service in the test suite + if ($acp_submodule->getNode()->textContent === $this->lang('ACP_EXTENSIONS_CATALOG')) + { + continue; + } + self::$client->click($acp_submodule); self::assert_response_html(); } From 6c55b75616a4b82c53a41168959f101031718ff9 Mon Sep 17 00:00:00 2001 From: Derky Date: Sun, 28 Sep 2025 13:44:50 +0200 Subject: [PATCH 0937/1214] [ticket/17557] Add error suppression to avatars in storage_track migration PHPBB-17557 --- phpBB/phpbb/db/migration/data/v400/storage_track.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v400/storage_track.php b/phpBB/phpbb/db/migration/data/v400/storage_track.php index 7d2b4dec202..35ebda12395 100644 --- a/phpBB/phpbb/db/migration/data/v400/storage_track.php +++ b/phpBB/phpbb/db/migration/data/v400/storage_track.php @@ -98,7 +98,7 @@ public function track_avatars() $filename = $this->config['avatar_salt'] . '_' . ($avatar_group ? 'g' : '') . $filename . '.' . $ext; $files[] = [ 'file_path' => $filename, - 'filesize' => filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename), + 'filesize' => @filesize($this->phpbb_root_path . $this->config['storage\\avatar\\config\\path'] . '/' . $filename), ]; if (count($files) >= self::BATCH_SIZE) From 3a105548a9580edf1b541a17b3995c62f61079b8 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 28 Sep 2025 10:09:59 -0700 Subject: [PATCH 0938/1214] [ticket/17555] Optimize windows tests PHPBB-17555 --- .github/phpunit-psql-windows-github.xml | 5 +- .github/workflows/tests.yml | 64 +++++++++++++++---- .../phpbb_functional_test_case.php | 16 +++-- 3 files changed, 65 insertions(+), 20 deletions(-) diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml index 0b80da07748..179dfe6bd3a 100644 --- a/.github/phpunit-psql-windows-github.xml +++ b/.github/phpunit-psql-windows-github.xml @@ -7,7 +7,10 @@ bootstrap="../tests/bootstrap.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/10.5/phpunit.xsd" cacheDirectory=".phpunit.cache" - backupStaticProperties="false"> + backupStaticProperties="false" + timeoutForSmallTests="60" + timeoutForMediumTests="300" + timeoutForLargeTests="600"> ../tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2b1b5703d1f..018b4891937 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -544,6 +544,9 @@ jobs: GITHUB_WORKSPACE: ${{ github.workspace }} TEMP_DIR: ${{ runner.temp }} run: | + # Disable Windows Defender real-time monitoring early to improve performance + Set-MpPreference -DisableRealtimeMonitoring $true + Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole, IIS-WebServer, IIS-CommonHttpFeatures, IIS-ManagementConsole, IIS-HttpErrors, IIS-HttpRedirect, IIS-WindowsAuthentication, IIS-StaticContent, IIS-DefaultDocument, IIS-HttpCompressionStatic, IIS-DirectoryBrowsing, IIS-WebServerManagementTools, IIS-CGI -All Set-Service wuauserv -StartupType Manual (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("", "`n`t`n`t`t`n`t") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config @@ -564,16 +567,38 @@ jobs: New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either iisreset NET START W3SVC - mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test" - mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\installer" - icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\files" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\store" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\ext" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\vendor-ext" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\composer-ext.json" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\composer-ext.lock" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\images\avatars\upload" /grant Users:F /T + + # Wait for IIS to be ready and test connectivity + Start-Sleep -Seconds 10 + try { + $response = Invoke-WebRequest -Uri "http://phpbb.test/" -UseBasicParsing -TimeoutSec 30 + Write-Host "Web server is responding: $($response.StatusCode)" + } catch { + Write-Host "Web server test failed: $_" + } + + # Create directories and set permissions more efficiently + $dirs = @("cache\test", "cache\installer") + foreach ($dir in $dirs) { + New-Item -Path "${env:GITHUB_WORKSPACE}\phpBB\$dir" -ItemType Directory -Force + } + + # Set permissions in batch for better performance + $paths = @("cache", "files", "store", "ext", "vendor-ext", "images\avatars\upload") + foreach ($path in $paths) { + if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$path") { + icacls "${env:GITHUB_WORKSPACE}\phpBB\$path" /grant Users:F /T /Q + } + } + + # Set permissions for specific files + $files = @("composer-ext.json", "composer-ext.lock") + foreach ($file in $files) { + if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$file") { + icacls "${env:GITHUB_WORKSPACE}\phpBB\$file" /grant Users:F /Q + } + } + $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow") $acl = Get-ACL "${env:TEMP_DIR}" $acl.AddAccessRule($accessRule) @@ -586,7 +611,7 @@ jobs: $postgreSqlSvc = Get-Service "postgresql*" Set-Service $postgreSqlSvc.Name -StartupType manual $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running - $maxStartTimeout = New-TimeSpan -Seconds 30 + $maxStartTimeout = New-TimeSpan -Seconds 120 try { $postgreSqlSvc.Start() $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout) @@ -595,12 +620,17 @@ jobs: } [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}") $env:PGPASSWORD = 'root' - psql -c 'ALTER SYSTEM SET hot_standby = on;' -U postgres - psql -c 'ALTER SYSTEM SET wal_level = minimal;' -U postgres + + # Optimize PostgreSQL for testing performance + psql -c "ALTER SYSTEM SET fsync = off;" -U postgres + psql -c "ALTER SYSTEM SET synchronous_commit = off;" -U postgres + psql -c "ALTER SYSTEM SET checkpoint_completion_target = 0.9;" -U postgres + psql -c "ALTER SYSTEM SET wal_buffers = '16MB';" -U postgres + psql -c "ALTER SYSTEM SET shared_buffers = '128MB';" -U postgres psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres psql -c 'create database phpbb_tests;' -U postgres + Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender - Set-MpPreference -DisableRealtimeMonitoring $true - name: Setup node uses: actions/setup-node@v4 @@ -615,5 +645,11 @@ jobs: phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --display-all-issues --stop-on-error --exclude-group functional,slow - name: Run functional tests if: ${{ matrix.type == 'functional' }} + timeout-minutes: 45 + env: + PHPBB_FUNCTIONAL_TIMEOUT: 30 + SYMFONY_DEPRECATIONS_HELPER: disabled + PHPBB_TEST_REDIS_HOST: '' + PHPBB_TEST_MEMCACHED_HOST: '' run: | phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --display-all-issues --stop-on-error --group functional diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 980f397a2a7..022bbd1e0cc 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -129,11 +129,17 @@ protected function setUp(): void $this->bootstrap(); self::$cookieJar = new CookieJar; - // Force native client on windows platform - self::$http_client = strtolower(substr(PHP_OS, 0, 3)) === 'win' ? new NativeHttpClient() : HttpClient::create(); - self::$http_client->withOptions([ - 'timeout' => 60, - ]); + // Optimize HTTP client for Windows platform + if (strtolower(substr(PHP_OS, 0, 3)) === 'win') { + self::$http_client = new NativeHttpClient([ + 'timeout' => 30, + 'max_duration' => 60, + ]); + } else { + self::$http_client = HttpClient::create([ + 'timeout' => 60, + ]); + } self::$client = new HttpBrowser(self::$http_client, null, self::$cookieJar); // Clear the language array so that things From 784b3181daa034e278a3a55c7f13a894b99a7eb9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 29 Sep 2025 08:13:34 -0700 Subject: [PATCH 0939/1214] [ticket/17559] Ensure extension catalog repos are stored correct PHPBB-17559 --- phpBB/install/schemas/schema_data.sql | 2 +- phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 2da7f8ba33d..76c02fd25ae 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -302,7 +302,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a2-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '[]'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '["https://satis.phpbb.com/","https://www.phpbb.com/customise/db/composer/"]'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_packagist', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_json_file', 'composer-ext.json'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_vendor_dir', 'vendor-ext/'); diff --git a/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php b/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php index fe4b9f4cefb..9c2500949ca 100644 --- a/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php +++ b/phpBB/phpbb/db/migration/data/v400/extensions_composer_2.php @@ -24,7 +24,7 @@ public function effectively_installed() public function update_data() { - $repositories = json_decode($this->config['exts_composer_repositories'], true); + $repositories = json_decode($this->config['exts_composer_repositories'], true) ?: []; $repositories[] = 'https://satis.phpbb.com'; $repositories = array_unique($repositories); From dc22ad07a28bb0567f37ba6e7c6c81f917429337 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Sep 2025 20:10:27 +0200 Subject: [PATCH 0940/1214] [ticket/17555] Apply windows runner adjustments from master PHPBB-17555 --- .github/phpunit-psql-windows-github.xml | 21 +++++---- .github/workflows/tests.yml | 60 ++++++++++++++++++++----- 2 files changed, 62 insertions(+), 19 deletions(-) diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml index 5f131bae80f..88fce1693b4 100644 --- a/.github/phpunit-psql-windows-github.xml +++ b/.github/phpunit-psql-windows-github.xml @@ -1,14 +1,17 @@ + backupStaticAttributes="false" + colors="true" + convertErrorsToExceptions="true" + convertNoticesToExceptions="true" + convertWarningsToExceptions="true" + processIsolation="false" + stopOnFailure="false" + verbose="true" + bootstrap="../tests/bootstrap.php" + timeoutForSmallTests="60" + timeoutForMediumTests="300" + timeoutForLargeTests="600">> ../tests diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e070cabb928..9dac7ee0c5b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -553,6 +553,9 @@ jobs: GITHUB_WORKSPACE: ${{ github.workspace }} TEMP_DIR: ${{ runner.temp }} run: | + # Disable Windows Defender real-time monitoring early to improve performance + Set-MpPreference -DisableRealtimeMonitoring $true + Enable-WindowsOptionalFeature -Online -FeatureName IIS-WebServerRole, IIS-WebServer, IIS-CommonHttpFeatures, IIS-ManagementConsole, IIS-HttpErrors, IIS-HttpRedirect, IIS-WindowsAuthentication, IIS-StaticContent, IIS-DefaultDocument, IIS-HttpCompressionStatic, IIS-DirectoryBrowsing, IIS-WebServerManagementTools, IIS-CGI -All Set-Service wuauserv -StartupType Manual (Get-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config).replace("", "`n`t`n`t`t`n`t") | Set-Content ${env:GITHUB_WORKSPACE}\phpBB\web.config @@ -573,12 +576,38 @@ jobs: New-WebHandler -Name "PHP-FastCGI" -Path "*.php" -Modules FastCgiModule -ScriptProcessor "C:\tools\php\php-cgi.exe" -Verb '*' -ResourceType Either iisreset NET START W3SVC - mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\test" - mkdir "${env:GITHUB_WORKSPACE}\phpBB\cache\installer" - icacls "${env:GITHUB_WORKSPACE}\phpBB\cache" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\files" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\store" /grant Users:F /T - icacls "${env:GITHUB_WORKSPACE}\phpBB\images\avatars\upload" /grant Users:F /T + + # Wait for IIS to be ready and test connectivity + Start-Sleep -Seconds 10 + try { + $response = Invoke-WebRequest -Uri "http://phpbb.test/" -UseBasicParsing -TimeoutSec 30 + Write-Host "Web server is responding: $($response.StatusCode)" + } catch { + Write-Host "Web server test failed: $_" + } + + # Create directories and set permissions more efficiently + $dirs = @("cache\test", "cache\installer") + foreach ($dir in $dirs) { + New-Item -Path "${env:GITHUB_WORKSPACE}\phpBB\$dir" -ItemType Directory -Force + } + + # Set permissions in batch for better performance + $paths = @("cache", "files", "store", "ext", "vendor-ext", "images\avatars\upload") + foreach ($path in $paths) { + if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$path") { + icacls "${env:GITHUB_WORKSPACE}\phpBB\$path" /grant Users:F /T /Q + } + } + + # Set permissions for specific files + $files = @("composer-ext.json", "composer-ext.lock") + foreach ($file in $files) { + if (Test-Path "${env:GITHUB_WORKSPACE}\phpBB\$file") { + icacls "${env:GITHUB_WORKSPACE}\phpBB\$file" /grant Users:F /Q + } + } + $accessRule = New-Object System.Security.AccessControl.FileSystemAccessRule("IIS_IUSRS", "FullControl", "ContainerInherit,ObjectInherit", "None", "Allow") $acl = Get-ACL "${env:TEMP_DIR}" $acl.AddAccessRule($accessRule) @@ -593,7 +622,7 @@ jobs: $postgreSqlSvc = Get-Service "postgresql*" Set-Service $postgreSqlSvc.Name -StartupType manual $runningStatus = [System.ServiceProcess.ServiceControllerStatus]::Running - $maxStartTimeout = New-TimeSpan -Seconds 30 + $maxStartTimeout = New-TimeSpan -Seconds 120 try { $postgreSqlSvc.Start() $postgreSqlSvc.WaitForStatus($runningStatus, $maxStartTimeout) @@ -602,17 +631,28 @@ jobs: } [System.Environment]::SetEnvironmentVariable('PATH',$Env:PATH+";${env:PGBIN}") $env:PGPASSWORD = 'root' - psql -c 'ALTER SYSTEM SET hot_standby = on;' -U postgres - psql -c 'ALTER SYSTEM SET wal_level = minimal;' -U postgres + + # Optimize PostgreSQL for testing performance + psql -c "ALTER SYSTEM SET fsync = off;" -U postgres + psql -c "ALTER SYSTEM SET synchronous_commit = off;" -U postgres + psql -c "ALTER SYSTEM SET checkpoint_completion_target = 0.9;" -U postgres + psql -c "ALTER SYSTEM SET wal_buffers = '16MB';" -U postgres + psql -c "ALTER SYSTEM SET shared_buffers = '128MB';" -U postgres psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres psql -c 'create database phpbb_tests;' -U postgres + Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender - Set-MpPreference -DisableRealtimeMonitoring $true - name: Run unit tests if: ${{ matrix.type == 'unit' }} run: | phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional - name: Run unit tests if: ${{ matrix.type == 'functional' }} + timeout-minutes: 45 + env: + PHPBB_FUNCTIONAL_TIMEOUT: 30 + SYMFONY_DEPRECATIONS_HELPER: disabled + PHPBB_TEST_REDIS_HOST: '' + PHPBB_TEST_MEMCACHED_HOST: '' run: | phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional From 1a92461e4b5a733405847ab3a0b8303dfae873d9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 1 Oct 2025 21:24:06 +0200 Subject: [PATCH 0941/1214] [ticket/17539] Set pass type to any for functional reg tests PHPBB-17539 --- tests/functional/registration_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/functional/registration_test.php b/tests/functional/registration_test.php index 9b77feaa86b..e47d8193b5e 100644 --- a/tests/functional/registration_test.php +++ b/tests/functional/registration_test.php @@ -24,6 +24,7 @@ public function test_disable_captcha_on_registration() $crawler = self::request('GET', "adm/index.php?i=acp_board&mode=registration&sid={$this->sid}"); $form = $crawler->selectButton('Submit')->form(); $form['config[enable_confirm]']->setValue('0'); + $form['config[pass_complex]']->setValue('PASS_TYPE_ANY'); $crawler = self::submit($form); $this->assertContainsLang('CONFIG_UPDATED', $crawler->filter('#main .successbox')->text()); From ed5359ce97835909cb2304c11de6bced61a56182 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sat, 4 Oct 2025 18:22:54 +0200 Subject: [PATCH 0942/1214] [ticket/17536] Change order in events.md of new events PHPBB-17536 --- phpBB/docs/events.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 38d441bba53..0209c05b26f 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -108,13 +108,13 @@ acp_ext_list_not_installed_title_after * Changed: 3.3.14 Renamed from acp_ext_list_available_title_after * Purpose: Add text after not installed extensions section title. -acp_forums_cat_options_prepend +acp_forums_cat_options_append === * Location: adm/style/acp_forums.html * Since: 3.3.16-RC1 * Purpose: Add additional settings to a forum type 'category' within 'General forum settings' fieldset -acp_forums_cat_options_append +acp_forums_cat_options_prepend === * Location: adm/style/acp_forums.html * Since: 3.3.16-RC1 @@ -126,13 +126,13 @@ acp_forums_custom_settings * Since: 3.1.6-RC1 * Purpose: Add its own box (fieldset) for extension settings -acp_forums_link_options_prepend +acp_forums_link_options_append === * Location: adm/style/acp_forums.html * Since: 3.3.16-RC1 * Purpose: Add additional settings to a forum type 'link' within 'General forum settings' fieldset -acp_forums_link_options_append +acp_forums_link_options_prepend === * Location: adm/style/acp_forums.html * Since: 3.3.16-RC1 From fd74f70468edc73328ba8746c9b9e64cbb48a3ba Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Sat, 4 Oct 2025 18:34:09 +0200 Subject: [PATCH 0943/1214] [ticket/17536] Fix typo in new acp_forums event names PHPBB-17536 --- phpBB/adm/style/acp_forums.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index 915751b4256..c1d00209552 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -189,13 +189,13 @@

        {L_WARNING}

        {L_GENERAL_FORUM_SETTINGS} - {% EVENT acp_forum_cat_options_prepend %} + {% EVENT acp_forums_cat_options_prepend %}

        {L_DISPLAY_ACTIVE_TOPICS_EXPLAIN}
        - {% EVENT acp_forum_cat_options_append %} + {% EVENT acp_forums_cat_options_append %}
        @@ -309,7 +309,7 @@

        {L_WARNING}

        From db86ad60cbf23e70badf5c5446a0d57eedf8a918 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Oct 2025 19:52:43 +0200 Subject: [PATCH 0944/1214] [ticket/17555] Use windows-2025 runner for 3.3.x branch PHPBB-17555 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9dac7ee0c5b..dade39ed281 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -474,7 +474,7 @@ jobs: # Test with IIS & PostgreSQL on Windows windows-tests: - runs-on: windows-latest + runs-on: windows-2025 strategy: matrix: include: From 17e4fd206e7bc0b39b87f9f508030f581c67a5fb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Oct 2025 20:42:11 +0200 Subject: [PATCH 0945/1214] [ticket/17555] Fix typo in phpunit config PHPBB-17555 --- .github/phpunit-psql-windows-github.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/phpunit-psql-windows-github.xml b/.github/phpunit-psql-windows-github.xml index 88fce1693b4..470f3cd498e 100644 --- a/.github/phpunit-psql-windows-github.xml +++ b/.github/phpunit-psql-windows-github.xml @@ -11,7 +11,7 @@ bootstrap="../tests/bootstrap.php" timeoutForSmallTests="60" timeoutForMediumTests="300" - timeoutForLargeTests="600">> + timeoutForLargeTests="600"> ../tests From 8e6096fb14e8f5908281d19b780a6840dae03bdb Mon Sep 17 00:00:00 2001 From: Derky Date: Sun, 5 Oct 2025 11:40:41 +0200 Subject: [PATCH 0946/1214] [ticket/17554] Remove escaping in json PHPBB-17554 --- .../fixtures/files/extensions_catalog.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/functional/fixtures/files/extensions_catalog.json b/tests/functional/fixtures/files/extensions_catalog.json index f2683e7709a..1ab64d98dff 100644 --- a/tests/functional/fixtures/files/extensions_catalog.json +++ b/tests/functional/fixtures/files/extensions_catalog.json @@ -1,32 +1,32 @@ [ { - "name": "extension1\/vendor", + "name": "extension1/vendor", "display_name": "Extension 1", - "composer_name": "extension1\/vendor", + "composer_name": "extension1/vendor", "version": "1.0.0", "description": "Dummy extension 1 for testing.", - "url": "https:\/\/example.com\/extension1", + "url": "https://example.com/extension1", "authors": [ { "name": "Author One", "email": "author1@example.com", - "homepage": "https:\/\/author1.example.com", + "homepage": "https://author1.example.com", "role": "Developer" } ] }, { - "name": "phpbb\/viglink", + "name": "phpbb/viglink", "display_name": "VigLink", - "composer_name": "phpbb\/viglink", + "composer_name": "phpbb/viglink", "version": "dev-master", "description": "The VigLink extension for phpBB makes it possible to earn revenue, without any change to the user experience, when users post and follow links to commercial sites.", - "url": "https:\/\/www.phpbb.com\/", + "url": "https://www.phpbb.com/", "authors": [ { "name": "Author Two", "email": "author2@example.com", - "homepage": "https:\/\/author2.example.com", + "homepage": "https://author2.example.com", "role": "Developer" } ] From b104af78c32492345fd28b5179c1db9fa8291e23 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Oct 2025 17:16:04 +0200 Subject: [PATCH 0947/1214] [ticket/17555] Only run unit tests on windows runners PHPBB-17555 --- .github/workflows/tests.yml | 37 +------------------------------------ 1 file changed, 1 insertion(+), 36 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index dade39ed281..3b4a08a8f9e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -480,42 +480,18 @@ jobs: include: - php: '7.4' db: "postgres" - type: 'unit' - php: '8.0' db: "postgres" - type: 'unit' - php: '8.1' db: "postgres" - type: 'unit' - php: '8.2' db: "postgres" - type: 'unit' - php: '8.3' db: "postgres" - type: 'unit' - php: '8.4' db: "postgres" - type: 'unit' - - php: '7.4' - db: "postgres" - type: 'functional' - - php: '8.0' - db: "postgres" - type: 'functional' - - php: '8.1' - db: "postgres" - type: 'functional' - - php: '8.2' - db: "postgres" - type: 'functional' - - php: '8.3' - db: "postgres" - type: 'functional' - - php: '8.4' - db: "postgres" - type: 'functional' - name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} - ${{ matrix.type }} + name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} steps: - name: Prepare git for Windows @@ -643,16 +619,5 @@ jobs: Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender - name: Run unit tests - if: ${{ matrix.type == 'unit' }} run: | phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional - - name: Run unit tests - if: ${{ matrix.type == 'functional' }} - timeout-minutes: 45 - env: - PHPBB_FUNCTIONAL_TIMEOUT: 30 - SYMFONY_DEPRECATIONS_HELPER: disabled - PHPBB_TEST_REDIS_HOST: '' - PHPBB_TEST_MEMCACHED_HOST: '' - run: | - phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --group functional From 7e22d7ad24cf78b1629b3f8c32f3ae066b990fd2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Oct 2025 20:53:21 +0200 Subject: [PATCH 0948/1214] [ticket/17555] Reduce callbacks to external URLs in unit tests PHPBB-17555 --- tests/avatar/manager_test.php | 10 +++++++--- tests/console/update/check_test.php | 27 ++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index dbcf6dae7e9..669c5515116 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -57,7 +57,11 @@ protected function setUp(): void new \phpbb\mimetype\content_guesser, ); $guesser = new \phpbb\mimetype\guesser($guessers); - $imagesize = new \FastImageSize\FastImageSize(); + $imagesize = $this->getMockBuilder('\FastImageSize\FastImageSize') + ->setMethods(['getImageSize']) + ->getMock(); + $imagesize->method('getImageSize') + ->willReturn(['width' => 80, 'height' => 80, 'mime' => 'image/jpeg']); $dispatcher = new phpbb_mock_event_dispatcher(); $phpbb_dispatcher = $dispatcher; @@ -405,9 +409,9 @@ public function data_remote_avatar_url() { return array( array('127.0.0.1:91?foo.jpg', 80, 80, array('AVATAR_URL_INVALID')), - array(gethostbyname('secure.gravatar.com') . '/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), + array('127.0.0.1/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), array('secure.gravatar.com/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80), - array(gethostbyname('secure.gravatar.com') . ':120/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), + array('127.0.0.1:120/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), array('secure.gravatar.com:80/avatar/55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), array('secure.gravatar.com:80?55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), array('secure.gravatar.com?55502f40dc8b7c769880b10874abc9d0.jpg', 80, 80, array('AVATAR_URL_INVALID')), // should be a 404 diff --git a/tests/console/update/check_test.php b/tests/console/update/check_test.php index 2578eb21ccb..5768808464b 100644 --- a/tests/console/update/check_test.php +++ b/tests/console/update/check_test.php @@ -94,7 +94,32 @@ public function get_command_tester($current_version) ->getMock(); $config = new \phpbb\config\config(array('version' => $current_version)); - $this->version_helper = new \phpbb\version_helper($cache, $config, new \phpbb\file_downloader()); + $this->version_helper = $this->getMockBuilder('\phpbb\version_helper') + ->setConstructorArgs([$cache, $config, new \phpbb\file_downloader()]) + ->setMethods(['get_latest_version', 'get_suggested_updates']) + ->getMock(); + $this->version_helper->method('get_suggested_updates') + ->willReturnCallback(function($force_update = false, $force_cache = false) use ($config) + { + if ($config['version'] === '100000') + { + return []; + } + else if ($config['version'] === '0') + { + return [ + [ + 'version' => '100000', + 'stability' => 'stable', + 'download_url' => 'https://www.phpbb.com/downloads/', + ], + ]; + } + else + { + throw new \phpbb\exception\runtime_exception('VERSIONCHECK_FAIL'); + } + }); $container = new phpbb_mock_container_builder; $container->set('version_helper', $this->version_helper); From b3b5e328f91181363cfe8259ace7ec628caa19d4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Oct 2025 21:52:57 +0200 Subject: [PATCH 0949/1214] [ticket/17555] Properly mock version helper return PHPBB-17555 --- tests/console/update/check_test.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/console/update/check_test.php b/tests/console/update/check_test.php index 5768808464b..a00b49f0d11 100644 --- a/tests/console/update/check_test.php +++ b/tests/console/update/check_test.php @@ -109,9 +109,10 @@ public function get_command_tester($current_version) { return [ [ - 'version' => '100000', - 'stability' => 'stable', - 'download_url' => 'https://www.phpbb.com/downloads/', + 'current' => '100000', + 'announcement' => 'https://www.phpbb.com/downloads/', + 'eol' => null, + 'security' => false, ], ]; } From 2a65b0ee2eda609d65e5725313b9e467e6de88fd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 6 Oct 2025 17:06:30 +0200 Subject: [PATCH 0950/1214] [ticket/17555] Use retries for windows tests PHPBB-17555 --- .github/workflows/tests.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3b4a08a8f9e..b6e7f1fe9f2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -619,5 +619,8 @@ jobs: Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender - name: Run unit tests - run: | - phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional + uses: nick-fields/retry@v3 + with: + timeout_minutes: 15 + max_attempts: 3 + command: phpBB/vendor/bin/phpunit --configuration .github/phpunit-psql-windows-github.xml --verbose --stop-on-error --exclude-group functional From fcc0f081ce7a3d7ece3b9983f2fd59eb0ddf60b3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 5 Oct 2025 17:48:20 +0200 Subject: [PATCH 0951/1214] [ticket/17564] Adjust text-shadow of header profile for better contrast PHPBB-17564 --- phpBB/styles/prosilver/theme/colours.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 2a66af4b062..d45583f3c27 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -128,7 +128,7 @@ th a:hover { } .header-profile { - text-shadow: 0 0 1.75rem #eaf8ff; + text-shadow: 0 0 0.25rem rgba(0, 0, 0, 0.5); } .panel { From 3a0060552a66ed8e761561029f430991fbc243bc Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Oct 2025 22:26:04 +0200 Subject: [PATCH 0952/1214] [ticket/15085] Add HTTP authentication subscriber for feed controllers PHPBB-15085 --- .../default/container/services_feed.yml | 10 + .../phpbb/feed/event/http_auth_subscriber.php | 242 ++++++++++++++++++ 2 files changed, 252 insertions(+) create mode 100644 phpBB/phpbb/feed/event/http_auth_subscriber.php diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml index f32d0cb4d30..2f27f6915b4 100644 --- a/phpBB/config/default/container/services_feed.yml +++ b/phpBB/config/default/container/services_feed.yml @@ -15,6 +15,16 @@ services: - '@language' - '%core.php_ext%' + feed.http_auth_subscriber: + class: phpbb\feed\event\http_auth_subscriber + arguments: + - '@auth' + - '@config' + - '@request' + - '@user' + tags: + - { name: kernel.event_subscriber } + feed.helper: class: phpbb\feed\helper arguments: diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php new file mode 100644 index 00000000000..8b3f03b0bdb --- /dev/null +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -0,0 +1,242 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\feed\event; + +use phpbb\auth\auth; +use phpbb\config\config; +use phpbb\request\request_interface; +use phpbb\user; +use Symfony\Component\EventDispatcher\EventSubscriberInterface; +use Symfony\Component\HttpFoundation\Response; +use Symfony\Component\HttpKernel\Event\GetResponseEvent; +use Symfony\Component\HttpKernel\KernelEvents; + +/** + * Event subscriber for HTTP authentication on feed routes + */ +class http_auth_subscriber implements EventSubscriberInterface +{ + /** @var auth */ + protected $auth; + + /** @var config */ + protected $config; + + /** @var request_interface */ + protected $request; + + /** @var user */ + protected $user; + + /** + * Constructor + * + * @param auth $auth Auth object + * @param config $config Config object + * @param request_interface $request Request object + * @param user $user User object + */ + public function __construct(auth $auth, config $config, request_interface $request, user $user) + { + $this->auth = $auth; + $this->config = $config; + $this->request = $request; + $this->user = $user; + } + + /** + * Handle HTTP authentication for feed routes + * + * @param GetResponseEvent $event + * @return void + */ + public function on_kernel_request(GetResponseEvent $event) + { + $request = $event->getRequest(); + $route = $request->attributes->get('_route'); + + // Only apply to feed routes + if (strpos($route, 'phpbb_feed_') !== 0) + { + return; + } + + // Check if HTTP authentication is enabled + if (!$this->config['feed_http_auth']) + { + return; + } + + // User is already logged in, no need to authenticate + if (!empty($this->user->data['is_registered'])) + { + return; + } + + // Get HTTP authentication credentials + $username = $this->get_http_username(); + $password = $this->get_http_password(); + + // If no credentials provided, send authentication challenge + if ($username === null || $password === null) + { + $this->send_auth_challenge($event); + return; + } + + // Attempt to login with the provided credentials + $auth_result = $this->auth->login($username, $password, false, true, false); + + if ($auth_result['status'] == LOGIN_SUCCESS) + { + return; + } + else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS) + { + // Too many login attempts + $response = new Response('', Response::HTTP_UNAUTHORIZED); + $event->setResponse($response); + return; + } + + // Authentication failed, send challenge + $this->send_auth_challenge($event); + } + + /** + * Get HTTP username from request headers + * + * @return string|null + */ + protected function get_http_username() + { + $username_keys = array( + 'PHP_AUTH_USER', + 'Authorization', + 'REMOTE_USER', + 'REDIRECT_REMOTE_USER', + 'HTTP_AUTHORIZATION', + 'REDIRECT_HTTP_AUTHORIZATION', + 'REMOTE_AUTHORIZATION', + 'REDIRECT_REMOTE_AUTHORIZATION', + 'AUTH_USER', + ); + + foreach ($username_keys as $key) + { + if ($this->request->is_set($key, request_interface::SERVER)) + { + $username = html_entity_decode($this->request->server($key), ENT_COMPAT); + + // Decode Basic authentication header + if (strpos($username, 'Basic ') === 0) + { + $credentials = base64_decode(substr($username, 6)); + if (strpos($credentials, ':') !== false) + { + list($username, ) = explode(':', $credentials, 2); + } + } + + return $username; + } + } + + return null; + } + + /** + * Get HTTP password from request headers + * + * @return string|null + */ + protected function get_http_password() + { + $password_keys = array( + 'PHP_AUTH_PW', + 'REMOTE_PASSWORD', + 'AUTH_PASSWORD', + ); + + foreach ($password_keys as $key) + { + if ($this->request->is_set($key, request_interface::SERVER)) + { + return html_entity_decode($this->request->server($key), ENT_COMPAT); + } + } + + // Check if password is in Authorization header (Basic auth) + $username_keys = array( + 'PHP_AUTH_USER', + 'Authorization', + 'REMOTE_USER', + 'REDIRECT_REMOTE_USER', + 'HTTP_AUTHORIZATION', + 'REDIRECT_HTTP_AUTHORIZATION', + 'REMOTE_AUTHORIZATION', + 'REDIRECT_REMOTE_AUTHORIZATION', + 'AUTH_USER', + ); + + foreach ($username_keys as $key) + { + if ($this->request->is_set($key, request_interface::SERVER)) + { + $auth_header = html_entity_decode($this->request->server($key), ENT_COMPAT); + + // Decode Basic authentication header + if (strpos($auth_header, 'Basic ') === 0) + { + $credentials = base64_decode(substr($auth_header, 6)); + if (strpos($credentials, ':') !== false) + { + list(, $password) = explode(':', $credentials, 2); + return $password; + } + } + } + } + + return null; + } + + /** + * Send HTTP authentication challenge + * + * @param GetResponseEvent $event + * @return void + */ + protected function send_auth_challenge(GetResponseEvent $event) + { + $realm = $this->config['sitename']; + // Filter out non-ASCII characters per RFC2616 + $realm = preg_replace('/[\x80-\xFF]/', '?', $realm); + + $response = new Response('', Response::HTTP_UNAUTHORIZED); + $response->headers->set('WWW-Authenticate', 'Basic realm="' . $realm . '"'); + $event->setResponse($response); + } + + /** + * {@inheritdoc} + */ + public static function getSubscribedEvents() + { + return array( + // Priority should be high to run after session_begin but before controller + KernelEvents::REQUEST => array('on_kernel_request', 5), + ); + } +} From f4700b0a38e3b5edbbfe3126727415cf7af871fb Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Oct 2025 22:26:58 +0200 Subject: [PATCH 0953/1214] [ticket/15085] Add unit tests for HTTP authentication subscriber PHPBB-15085 --- .phpunit.result.cache | 1 + tests/feed/http_auth_subscriber_test.php | 159 +++++++++++++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 .phpunit.result.cache create mode 100644 tests/feed/http_auth_subscriber_test.php diff --git a/.phpunit.result.cache b/.phpunit.result.cache new file mode 100644 index 00000000000..aac751d9fb3 --- /dev/null +++ b/.phpunit.result.cache @@ -0,0 +1 @@ +{"version":1,"defects":[],"times":{"phpbb\\feed\\event\\http_auth_subscriber_test::test_subscriber_events":0.006,"phpbb\\feed\\event\\http_auth_subscriber_test::test_non_feed_route_skipped":0.005,"phpbb\\feed\\event\\http_auth_subscriber_test::test_http_auth_disabled":0.001,"phpbb\\feed\\event\\http_auth_subscriber_test::test_user_already_logged_in":0.001}} \ No newline at end of file diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php new file mode 100644 index 00000000000..d3f00aef68a --- /dev/null +++ b/tests/feed/http_auth_subscriber_test.php @@ -0,0 +1,159 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\feed\event; + +class http_auth_subscriber_test extends \phpbb_test_case +{ + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\auth\auth */ + protected $auth; + + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\config\config */ + protected $config; + + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\request\request_interface */ + protected $request; + + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\user */ + protected $user; + + /** @var http_auth_subscriber */ + protected $subscriber; + + protected function setUp(): void + { + parent::setUp(); + + $this->auth = $this->getMockBuilder('\phpbb\auth\auth') + ->disableOriginalConstructor() + ->getMock(); + + $this->config = new \phpbb\config\config(array( + 'feed_http_auth' => 1, + 'sitename' => 'Test Site', + )); + + $this->request = $this->getMockBuilder('\phpbb\request\request_interface') + ->getMock(); + + $this->user = $this->getMockBuilder('\phpbb\user') + ->disableOriginalConstructor() + ->getMock(); + + $this->user->data = array('is_registered' => false); + + $this->subscriber = new http_auth_subscriber( + $this->auth, + $this->config, + $this->request, + $this->user + ); + } + + public function test_subscriber_events() + { + $events = http_auth_subscriber::getSubscribedEvents(); + $this->assertArrayHasKey(\Symfony\Component\HttpKernel\KernelEvents::REQUEST, $events); + } + + public function test_non_feed_route_skipped() + { + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('not_a_feed_route'); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_http_auth_disabled() + { + $this->config['feed_http_auth'] = 0; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_user_already_logged_in() + { + $this->user->data = array('is_registered' => true); + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } +} From 3dbc1b28b59a0b073fe2d72cfae2dc3ff22bc6ff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Oct 2025 22:27:29 +0200 Subject: [PATCH 0954/1214] [ticket/15085] Reload ACL after HTTP authentication and update gitignore PHPBB-15085 --- .gitignore | 1 + .phpunit.result.cache | 1 - phpBB/phpbb/feed/event/http_auth_subscriber.php | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 .phpunit.result.cache diff --git a/.gitignore b/.gitignore index 15125b68cc6..eda70c06051 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ node_modules .idea *.DS_Store* /.vscode +/.phpunit.result.cache diff --git a/.phpunit.result.cache b/.phpunit.result.cache deleted file mode 100644 index aac751d9fb3..00000000000 --- a/.phpunit.result.cache +++ /dev/null @@ -1 +0,0 @@ -{"version":1,"defects":[],"times":{"phpbb\\feed\\event\\http_auth_subscriber_test::test_subscriber_events":0.006,"phpbb\\feed\\event\\http_auth_subscriber_test::test_non_feed_route_skipped":0.005,"phpbb\\feed\\event\\http_auth_subscriber_test::test_http_auth_disabled":0.001,"phpbb\\feed\\event\\http_auth_subscriber_test::test_user_already_logged_in":0.001}} \ No newline at end of file diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php index 8b3f03b0bdb..3c35c769c84 100644 --- a/phpBB/phpbb/feed/event/http_auth_subscriber.php +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -100,6 +100,8 @@ public function on_kernel_request(GetResponseEvent $event) if ($auth_result['status'] == LOGIN_SUCCESS) { + // Reload ACL for the newly logged-in user + $this->auth->acl($this->user->data); return; } else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS) From 752ce67da0b1772cd1f773e6505a9d0c7315dfcd Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Oct 2025 22:28:06 +0200 Subject: [PATCH 0955/1214] [ticket/15085] Add HTTPS requirement for HTTP authentication on feeds PHPBB-15085 --- .../phpbb/feed/event/http_auth_subscriber.php | 6 +++ tests/feed/http_auth_subscriber_test.php | 41 +++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php index 3c35c769c84..6aedfb361bc 100644 --- a/phpBB/phpbb/feed/event/http_auth_subscriber.php +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -72,6 +72,12 @@ public function on_kernel_request(GetResponseEvent $event) return; } + // Only allow HTTP authentication in secure context (HTTPS) + if (!$request->isSecure()) + { + return; + } + // Check if HTTP authentication is enabled if (!$this->config['feed_http_auth']) { diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php index d3f00aef68a..ee50ec9088d 100644 --- a/tests/feed/http_auth_subscriber_test.php +++ b/tests/feed/http_auth_subscriber_test.php @@ -95,6 +95,39 @@ public function test_non_feed_route_skipped() $this->subscriber->on_kernel_request($event); } + public function test_insecure_connection_skipped() + { + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(false); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + public function test_http_auth_disabled() { $this->config['feed_http_auth'] = 0; @@ -112,6 +145,10 @@ public function test_http_auth_disabled() ->with('_route') ->willReturn('phpbb_feed_overall'); + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') ->disableOriginalConstructor() ->getMock(); @@ -143,6 +180,10 @@ public function test_user_already_logged_in() ->with('_route') ->willReturn('phpbb_feed_overall'); + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') ->disableOriginalConstructor() ->getMock(); From 82b72016aa2cfea16336b4913e2d105323efdcc1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 3 Oct 2025 22:20:33 +0200 Subject: [PATCH 0956/1214] [ticket/15085] Clean up code and output error with language PHPBB-15085 --- .../default/container/services_feed.yml | 1 + .../phpbb/feed/event/http_auth_subscriber.php | 124 ++++++------------ 2 files changed, 43 insertions(+), 82 deletions(-) diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml index 2f27f6915b4..8a468959052 100644 --- a/phpBB/config/default/container/services_feed.yml +++ b/phpBB/config/default/container/services_feed.yml @@ -20,6 +20,7 @@ services: arguments: - '@auth' - '@config' + - '@language' - '@request' - '@user' tags: diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php index 6aedfb361bc..b2937a3c22e 100644 --- a/phpBB/phpbb/feed/event/http_auth_subscriber.php +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -15,6 +15,7 @@ use phpbb\auth\auth; use phpbb\config\config; +use phpbb\language\language; use phpbb\request\request_interface; use phpbb\user; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -33,6 +34,9 @@ class http_auth_subscriber implements EventSubscriberInterface /** @var config */ protected $config; + /** @var language */ + protected $language; + /** @var request_interface */ protected $request; @@ -44,13 +48,15 @@ class http_auth_subscriber implements EventSubscriberInterface * * @param auth $auth Auth object * @param config $config Config object + * @param language $language Language object * @param request_interface $request Request object * @param user $user User object */ - public function __construct(auth $auth, config $config, request_interface $request, user $user) + public function __construct(auth $auth, config $config, language $language, request_interface $request, user $user) { $this->auth = $auth; $this->config = $config; + $this->language = $language; $this->request = $request; $this->user = $user; } @@ -63,6 +69,12 @@ public function __construct(auth $auth, config $config, request_interface $reque */ public function on_kernel_request(GetResponseEvent $event) { + // Check if HTTP authentication is enabled + if (!$this->config['feed_http_auth']) + { + return; + } + $request = $event->getRequest(); $route = $request->attributes->get('_route'); @@ -78,12 +90,6 @@ public function on_kernel_request(GetResponseEvent $event) return; } - // Check if HTTP authentication is enabled - if (!$this->config['feed_http_auth']) - { - return; - } - // User is already logged in, no need to authenticate if (!empty($this->user->data['is_registered'])) { @@ -91,8 +97,7 @@ public function on_kernel_request(GetResponseEvent $event) } // Get HTTP authentication credentials - $username = $this->get_http_username(); - $password = $this->get_http_password(); + [$username, $password] = $this->get_credentials(); // If no credentials provided, send authentication challenge if ($username === null || $password === null) @@ -113,7 +118,7 @@ public function on_kernel_request(GetResponseEvent $event) else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS) { // Too many login attempts - $response = new Response('', Response::HTTP_UNAUTHORIZED); + $response = new Response($this->language->lang('NOT_AUTHORISED'), Response::HTTP_UNAUTHORIZED); $event->setResponse($response); return; } @@ -123,13 +128,13 @@ public function on_kernel_request(GetResponseEvent $event) } /** - * Get HTTP username from request headers + * Retrieve HTTP authentication credentials from server variables * - * @return string|null + * @return array [username, password] Array containing the username and password, or null if not found */ - protected function get_http_username() + protected function get_credentials(): array { - $username_keys = array( + $username_keys = [ 'PHP_AUTH_USER', 'Authorization', 'REMOTE_USER', @@ -139,85 +144,41 @@ protected function get_http_username() 'REMOTE_AUTHORIZATION', 'REDIRECT_REMOTE_AUTHORIZATION', 'AUTH_USER', - ); + ]; + + $password_keys = [ + 'PHP_AUTH_PW', + 'REMOTE_PASSWORD', + 'AUTH_PASSWORD', + ]; + $username = null; foreach ($username_keys as $key) { if ($this->request->is_set($key, request_interface::SERVER)) { - $username = html_entity_decode($this->request->server($key), ENT_COMPAT); - - // Decode Basic authentication header - if (strpos($username, 'Basic ') === 0) - { - $credentials = base64_decode(substr($username, 6)); - if (strpos($credentials, ':') !== false) - { - list($username, ) = explode(':', $credentials, 2); - } - } - - return $username; + $username = htmlspecialchars_decode($this->request->server($key)); + break; } } - return null; - } - - /** - * Get HTTP password from request headers - * - * @return string|null - */ - protected function get_http_password() - { - $password_keys = array( - 'PHP_AUTH_PW', - 'REMOTE_PASSWORD', - 'AUTH_PASSWORD', - ); - + $password = null; foreach ($password_keys as $key) { if ($this->request->is_set($key, request_interface::SERVER)) { - return html_entity_decode($this->request->server($key), ENT_COMPAT); + $password = htmlspecialchars_decode($this->request->server($key)); + break; } } - // Check if password is in Authorization header (Basic auth) - $username_keys = array( - 'PHP_AUTH_USER', - 'Authorization', - 'REMOTE_USER', - 'REDIRECT_REMOTE_USER', - 'HTTP_AUTHORIZATION', - 'REDIRECT_HTTP_AUTHORIZATION', - 'REMOTE_AUTHORIZATION', - 'REDIRECT_REMOTE_AUTHORIZATION', - 'AUTH_USER', - ); - - foreach ($username_keys as $key) + // Decode Basic authentication header if needed + if (!is_null($username) && is_null($password) && strpos($username, 'Basic ') === 0) { - if ($this->request->is_set($key, request_interface::SERVER)) - { - $auth_header = html_entity_decode($this->request->server($key), ENT_COMPAT); - - // Decode Basic authentication header - if (strpos($auth_header, 'Basic ') === 0) - { - $credentials = base64_decode(substr($auth_header, 6)); - if (strpos($credentials, ':') !== false) - { - list(, $password) = explode(':', $credentials, 2); - return $password; - } - } - } + [$username, $password] = explode(':', base64_decode(substr($username, 6)), 2); } - return null; + return [$username, $password]; } /** @@ -232,19 +193,18 @@ protected function send_auth_challenge(GetResponseEvent $event) // Filter out non-ASCII characters per RFC2616 $realm = preg_replace('/[\x80-\xFF]/', '?', $realm); - $response = new Response('', Response::HTTP_UNAUTHORIZED); - $response->headers->set('WWW-Authenticate', 'Basic realm="' . $realm . '"'); + $response = new Response($this->language->lang('NOT_AUTHORISED'), Response::HTTP_UNAUTHORIZED); + $response->headers->set('WWW-Authenticate', 'Basic realm="' . $realm . ' - Feed"'); $event->setResponse($response); } /** * {@inheritdoc} */ - public static function getSubscribedEvents() + public static function getSubscribedEvents(): array { - return array( - // Priority should be high to run after session_begin but before controller - KernelEvents::REQUEST => array('on_kernel_request', 5), - ); + return [ + KernelEvents::REQUEST => ['on_kernel_request', 5], + ]; } } From 2bc90da6876ebf2d272117199a5c398355836e50 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Oct 2025 13:21:06 +0200 Subject: [PATCH 0957/1214] [ticket/15085] Extend unit tests for http_auth_subscriber PHPBB-15085 --- .../phpbb/feed/event/http_auth_subscriber.php | 1 + tests/feed/http_auth_subscriber_test.php | 315 ++++++++++++++++-- 2 files changed, 297 insertions(+), 19 deletions(-) diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php index b2937a3c22e..14426f3aad7 100644 --- a/phpBB/phpbb/feed/event/http_auth_subscriber.php +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -190,6 +190,7 @@ protected function get_credentials(): array protected function send_auth_challenge(GetResponseEvent $event) { $realm = $this->config['sitename']; + // Filter out non-ASCII characters per RFC2616 $realm = preg_replace('/[\x80-\xFF]/', '?', $realm); diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php index ee50ec9088d..f25859c5351 100644 --- a/tests/feed/http_auth_subscriber_test.php +++ b/tests/feed/http_auth_subscriber_test.php @@ -1,26 +1,33 @@ -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb\feed\event; - -class http_auth_subscriber_test extends \phpbb_test_case + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class phpbb_feed_http_auth_subscriber_test extends \phpbb_test_case { /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\auth\auth */ protected $auth; - /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\config\config */ + /** @var \PHPUnit\Framework\MockObject\MockObject|config */ protected $config; + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\language\language */ + protected $language; + /** @var \PHPUnit\Framework\MockObject\MockObject|\phpbb\request\request_interface */ protected $request; @@ -37,12 +44,26 @@ protected function setUp(): void $this->auth = $this->getMockBuilder('\phpbb\auth\auth') ->disableOriginalConstructor() ->getMock(); - - $this->config = new \phpbb\config\config(array( + $this->auth->method('login') + ->willReturnMap([ + ['valid_user', 'valid_password', false, true, false, ['status' => LOGIN_SUCCESS]], + ['invalid_user', 'invalid_password', false, true, false, ['status' => LOGIN_ERROR_USERNAME]], + ['attempts_user', 'valid_password', false, true, false, ['status' => LOGIN_ERROR_ATTEMPTS]], + ]); + + $this->config = new config(array( 'feed_http_auth' => 1, 'sitename' => 'Test Site', )); + $this->language = $this->getMockBuilder('\phpbb\language\language') + ->disableOriginalConstructor() + ->getMock(); + $this->language->method('lang') + ->willReturnMap([ + ['NOT_AUTHORISED', 'NOT_AUTHORISED'], + ]); + $this->request = $this->getMockBuilder('\phpbb\request\request_interface') ->getMock(); @@ -55,6 +76,7 @@ protected function setUp(): void $this->subscriber = new http_auth_subscriber( $this->auth, $this->config, + $this->language, $this->request, $this->user ); @@ -132,6 +154,37 @@ public function test_http_auth_disabled() { $this->config['feed_http_auth'] = 0; + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->never()) + ->method('get'); + + $request->expects($this->never()) + ->method('isSecure'); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->never()) + ->method('getRequest'); + + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + } + + public function test_user_already_logged_in() + { + $this->user->data = array('is_registered' => true); + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') ->disableOriginalConstructor() ->getMock(); @@ -163,9 +216,9 @@ public function test_http_auth_disabled() $this->subscriber->on_kernel_request($event); } - public function test_user_already_logged_in() + public function test_no_credentials() { - $this->user->data = array('is_registered' => true); + $this->user->data = ['is_registered' => false]; $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') ->disableOriginalConstructor() @@ -192,9 +245,233 @@ public function test_user_already_logged_in() ->method('getRequest') ->willReturn($request); + /** @var Response $response */ + $response = null; + $event->expects($this->once()) + ->method('setResponse') + ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) + ->will($this->returnCallback(function ($newResponse) use (&$response) { + $response = $newResponse; + })); + + $this->subscriber->on_kernel_request($event); + + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); + $this->assertEquals('NOT_AUTHORISED', $response->getContent()); + $this->assertTrue($response->headers->has('WWW-Authenticate')); + } + + public function test_valid_credentials() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['PHP_AUTH_USER', request_interface::SERVER, true], + ['PHP_AUTH_PW', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['PHP_AUTH_USER', '', 'valid_user'], + ['PHP_AUTH_PW', '', 'valid_password'], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; $event->expects($this->never()) ->method('setResponse'); $this->subscriber->on_kernel_request($event); + + $this->assertNull($response); + } + + public function test_valid_credentials_base64() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['Authorization', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['Authorization', '', 'Basic dmFsaWRfdXNlcjp2YWxpZF9wYXNzd29yZA=='], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->never()) + ->method('setResponse'); + + $this->subscriber->on_kernel_request($event); + + $this->assertNull($response); + } + + public function test_too_many_attempts() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['PHP_AUTH_USER', request_interface::SERVER, true], + ['PHP_AUTH_PW', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['PHP_AUTH_USER', '', 'attempts_user'], + ['PHP_AUTH_PW', '', 'valid_password'], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->once()) + ->method('setResponse') + ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) + ->will($this->returnCallback(function ($newResponse) use (&$response) { + $response = $newResponse; + })); + + $this->subscriber->on_kernel_request($event); + + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); + $this->assertEquals('NOT_AUTHORISED', $response->getContent()); + $this->assertFalse($response->headers->has('WWW-Authenticate')); + } + + public function test_wrong_credentials() + { + $this->user->data = ['is_registered' => false]; + + $request = $this->getMockBuilder('\Symfony\Component\HttpFoundation\Request') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes = $this->getMockBuilder('\Symfony\Component\HttpFoundation\ParameterBag') + ->disableOriginalConstructor() + ->getMock(); + + $request->attributes->expects($this->once()) + ->method('get') + ->with('_route') + ->willReturn('phpbb_feed_overall'); + + $this->request->method('is_set') + ->willReturnMap([ + ['PHP_AUTH_USER', request_interface::SERVER, true], + ['PHP_AUTH_PW', request_interface::SERVER, true], + ]); + + $this->request->method('server') + ->willReturnMap([ + ['PHP_AUTH_USER', '', 'invalid_user'], + ['PHP_AUTH_PW', '', 'invalid_password'], + ]); + + $request->expects($this->once()) + ->method('isSecure') + ->willReturn(true); + + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + ->disableOriginalConstructor() + ->getMock(); + + $event->expects($this->once()) + ->method('getRequest') + ->willReturn($request); + + /** @var Response $response */ + $response = null; + $event->expects($this->once()) + ->method('setResponse') + ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) + ->will($this->returnCallback(function ($newResponse) use (&$response) { + $response = $newResponse; + })); + + $this->subscriber->on_kernel_request($event); + + $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); + $this->assertEquals('NOT_AUTHORISED', $response->getContent()); + $this->assertTrue($response->headers->has('WWW-Authenticate')); } } From 8ef5c5549db69abe0f06f967fb1aed17c67f867f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Oct 2025 13:27:54 +0200 Subject: [PATCH 0958/1214] [ticket/15085] Add info that HTTP auth is only possible via https PHPBB-15085 --- phpBB/language/en/acp/board.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index e99632e4424..bd0e8599de7 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -298,7 +298,7 @@ 'ACP_FEED_OVERALL_FORUMS_EXPLAIN' => 'Enables the “All forums” feed, which displays a list of forums.', 'ACP_FEED_HTTP_AUTH' => 'Allow HTTP Authentication', - 'ACP_FEED_HTTP_AUTH_EXPLAIN' => 'Enables HTTP authentication, which allows users to receive content that is hidden to guest users by adding the auth=http parameter to the feed URL. Please note that some PHP setups require additional changes to the .htaccess file. Instructions can be found in that file.', + 'ACP_FEED_HTTP_AUTH_EXPLAIN' => 'Enables HTTP authentication, allowing users to access content hidden from guests by adding the auth=http parameter to the feed URL. Please note that some PHP configurations may require additional changes to the .htaccess file; refer to that file for guidance. HTTP authentication is only supported over encrypted (https) connections.', 'ACP_FEED_ITEM_STATISTICS' => 'Item statistics', 'ACP_FEED_ITEM_STATISTICS_EXPLAIN' => 'Display individual statistics underneath feed items
        (e.g. posted by, date and time, replies, views)', 'ACP_FEED_EXCLUDE_ID' => 'Exclude these forums', From 033fb28fdc3bc707eee04fab99808612e7db46ca Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 4 Oct 2025 13:36:27 +0200 Subject: [PATCH 0959/1214] [ticket/15085] Improve commit message check hook output PHPBB-15085 --- git-tools/hooks/commit-msg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg index 6405d5b7c80..95b8e313edd 100755 --- a/git-tools/hooks/commit-msg +++ b/git-tools/hooks/commit-msg @@ -337,7 +337,7 @@ done # If EOF is expected exit cleanly echo "$expecting" | grep -q "eof" || ( # Unexpected EOF, error - complain "Unexpected EOF encountered" >&2; + complain "Expected to see footer (e.g. PHPBB-12345) or description line, but reached end of file." >&2; quit $ERR_EOF; ) && ( # Do post scan checks From 82a7e6db1908f422991fe650a015ac33f93f87ee Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 7 Oct 2025 12:30:46 +0700 Subject: [PATCH 0960/1214] [ticket/17565] Fix exporting PM as CSV for Excel PHPBB-17565 --- phpBB/includes/ucp/ucp_pm_viewfolder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_pm_viewfolder.php b/phpBB/includes/ucp/ucp_pm_viewfolder.php index 4b6377e0b74..b5da2d23feb 100644 --- a/phpBB/includes/ucp/ucp_pm_viewfolder.php +++ b/phpBB/includes/ucp/ucp_pm_viewfolder.php @@ -314,7 +314,7 @@ function view_folder($id, $mode, $folder_id, $folder) $newline = "\n"; } - $string = ''; + $string = $export_type == 'CSV_EXCEL' ? "\xEF\xBB\xBF" : ''; // Add UTF-8 BOM mark for Excel foreach ($data as $value) { $recipients = $value['to']; From a9b62f338a5a8bc15038d8962c1d97a70f8a1cb0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 7 Oct 2025 19:44:01 +0200 Subject: [PATCH 0961/1214] [ticket/15085] Output login error with attempts info in http auth PHPBB-15085 --- phpBB/phpbb/feed/event/http_auth_subscriber.php | 2 +- tests/feed/http_auth_subscriber_test.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php index 14426f3aad7..4ff411666e7 100644 --- a/phpBB/phpbb/feed/event/http_auth_subscriber.php +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -118,7 +118,7 @@ public function on_kernel_request(GetResponseEvent $event) else if ($auth_result['status'] == LOGIN_ERROR_ATTEMPTS) { // Too many login attempts - $response = new Response($this->language->lang('NOT_AUTHORISED'), Response::HTTP_UNAUTHORIZED); + $response = new Response($this->language->lang('LOGIN_ERROR_ATTEMPTS'), Response::HTTP_UNAUTHORIZED); $event->setResponse($response); return; } diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php index f25859c5351..5fede1572b7 100644 --- a/tests/feed/http_auth_subscriber_test.php +++ b/tests/feed/http_auth_subscriber_test.php @@ -62,6 +62,7 @@ protected function setUp(): void $this->language->method('lang') ->willReturnMap([ ['NOT_AUTHORISED', 'NOT_AUTHORISED'], + ['LOGIN_ERROR_ATTEMPTS', 'LOGIN_ERROR_ATTEMPTS'] ]); $this->request = $this->getMockBuilder('\phpbb\request\request_interface') @@ -414,7 +415,7 @@ public function test_too_many_attempts() $this->subscriber->on_kernel_request($event); $this->assertEquals(Response::HTTP_UNAUTHORIZED, $response->getStatusCode()); - $this->assertEquals('NOT_AUTHORISED', $response->getContent()); + $this->assertEquals('LOGIN_ERROR_ATTEMPTS', $response->getContent()); $this->assertFalse($response->headers->has('WWW-Authenticate')); } From edf90678025778d6dfb24d8a4ae3b12050e2c926 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 7 Oct 2025 21:31:30 +0200 Subject: [PATCH 0962/1214] [ticket/15085] Use ResponseEvent in http auth subscriber and update tests PHPBB-15085 --- .../phpbb/feed/event/http_auth_subscriber.php | 10 +++--- tests/feed/http_auth_subscriber_test.php | 31 ++++++++++--------- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/phpBB/phpbb/feed/event/http_auth_subscriber.php b/phpBB/phpbb/feed/event/http_auth_subscriber.php index 4ff411666e7..901164814c3 100644 --- a/phpBB/phpbb/feed/event/http_auth_subscriber.php +++ b/phpBB/phpbb/feed/event/http_auth_subscriber.php @@ -20,7 +20,7 @@ use phpbb\user; use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\HttpFoundation\Response; -use Symfony\Component\HttpKernel\Event\GetResponseEvent; +use Symfony\Component\HttpKernel\Event\RequestEvent; use Symfony\Component\HttpKernel\KernelEvents; /** @@ -64,10 +64,10 @@ public function __construct(auth $auth, config $config, language $language, requ /** * Handle HTTP authentication for feed routes * - * @param GetResponseEvent $event + * @param RequestEvent $event * @return void */ - public function on_kernel_request(GetResponseEvent $event) + public function on_kernel_request(RequestEvent $event) { // Check if HTTP authentication is enabled if (!$this->config['feed_http_auth']) @@ -184,10 +184,10 @@ protected function get_credentials(): array /** * Send HTTP authentication challenge * - * @param GetResponseEvent $event + * @param RequestEvent $event * @return void */ - protected function send_auth_challenge(GetResponseEvent $event) + protected function send_auth_challenge(RequestEvent $event) { $realm = $this->config['sitename']; diff --git a/tests/feed/http_auth_subscriber_test.php b/tests/feed/http_auth_subscriber_test.php index 5fede1572b7..5e1c11b07c7 100644 --- a/tests/feed/http_auth_subscriber_test.php +++ b/tests/feed/http_auth_subscriber_test.php @@ -104,7 +104,8 @@ public function test_non_feed_route_skipped() ->with('_route') ->willReturn('not_a_feed_route'); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') + ->onlyMethods(['getRequest', 'setResponse']) ->disableOriginalConstructor() ->getMock(); @@ -137,7 +138,7 @@ public function test_insecure_connection_skipped() ->method('isSecure') ->willReturn(false); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -169,7 +170,7 @@ public function test_http_auth_disabled() $request->expects($this->never()) ->method('isSecure'); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -203,7 +204,7 @@ public function test_user_already_logged_in() ->method('isSecure') ->willReturn(true); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -238,7 +239,7 @@ public function test_no_credentials() ->method('isSecure') ->willReturn(true); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -251,9 +252,9 @@ public function test_no_credentials() $event->expects($this->once()) ->method('setResponse') ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) - ->will($this->returnCallback(function ($newResponse) use (&$response) { + ->willReturnCallback(function ($newResponse) use (&$response) { $response = $newResponse; - })); + }); $this->subscriber->on_kernel_request($event); @@ -295,7 +296,7 @@ public function test_valid_credentials() ->method('isSecure') ->willReturn(true); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -344,7 +345,7 @@ public function test_valid_credentials_base64() ->method('isSecure') ->willReturn(true); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -395,7 +396,7 @@ public function test_too_many_attempts() ->method('isSecure') ->willReturn(true); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -408,9 +409,9 @@ public function test_too_many_attempts() $event->expects($this->once()) ->method('setResponse') ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) - ->will($this->returnCallback(function ($newResponse) use (&$response) { + ->willReturnCallback(function ($newResponse) use (&$response) { $response = $newResponse; - })); + }); $this->subscriber->on_kernel_request($event); @@ -452,7 +453,7 @@ public function test_wrong_credentials() ->method('isSecure') ->willReturn(true); - $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\GetResponseEvent') + $event = $this->getMockBuilder('\Symfony\Component\HttpKernel\Event\RequestEvent') ->disableOriginalConstructor() ->getMock(); @@ -465,9 +466,9 @@ public function test_wrong_credentials() $event->expects($this->once()) ->method('setResponse') ->with($this->isInstanceOf('\Symfony\Component\HttpFoundation\Response')) - ->will($this->returnCallback(function ($newResponse) use (&$response) { + ->willReturnCallback(function ($newResponse) use (&$response) { $response = $newResponse; - })); + }); $this->subscriber->on_kernel_request($event); From 8e39a61d07c002d58da9073cfcb5e40abc343e2c Mon Sep 17 00:00:00 2001 From: cabot Date: Tue, 14 Oct 2025 17:55:30 +0200 Subject: [PATCH 0963/1214] [ticket/17567] Change wrap's min-width PHPBB-17567 --- phpBB/styles/prosilver/theme/common.css | 2 +- phpBB/styles/prosilver/theme/responsive.css | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 26c3b390554..9c9a32b17c5 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -154,7 +154,7 @@ a:hover { border: solid transparent; border-width: 0 1px 1px; border-radius: 0 0 8px 8px; - min-width: 625px; + min-width: 320px; max-width: 1152px; margin: 0 auto; padding: 0 15px 15px; diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index ce5462455e0..9ba363a5c05 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -182,8 +182,7 @@ .wrap { border: none; border-radius: 0; - min-width: 390px; - margin: 0 !important; + box-sizing: border-box; padding: 0 5px; } @@ -863,7 +862,7 @@ } } -@media (max-width: 1220px) { +@media (min-width: 751px) and (max-width: 1200px) { .wrap { margin: 0 12px; } From 888df78de50e0c28933b4e3fdf71440a4ce982a1 Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 18 Oct 2025 22:56:16 +0700 Subject: [PATCH 0964/1214] [ticket/17560] Fix diff engine PHP fatal error PHPBB-17560 --- phpBB/includes/diff/diff.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index 7c92d375701..83ebd83da29 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -768,12 +768,12 @@ class diff3_op /** * @var array|mixed */ - protected $final1; + public $final1; /** * @var array|mixed */ - protected $final2; + public $final2; /** * @var false From 4be8e8c92fa98a08a1bfa008f61fc04e4e5b3087 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 19 Oct 2025 16:11:21 +0700 Subject: [PATCH 0965/1214] [ticket/17560] Add unit test PHPBB-17560 --- tests/diff/diff_files_test.php | 110 ++++++++++++++++++ .../install/update/new/test_files_diff.php | 3 + .../install/update/old/test_files_diff.php | 3 + tests/diff/fixtures/test_files_diff.php | 4 + 4 files changed, 120 insertions(+) create mode 100644 tests/diff/diff_files_test.php create mode 100644 tests/diff/fixtures/install/update/new/test_files_diff.php create mode 100644 tests/diff/fixtures/install/update/old/test_files_diff.php create mode 100644 tests/diff/fixtures/test_files_diff.php diff --git a/tests/diff/diff_files_test.php b/tests/diff/diff_files_test.php new file mode 100644 index 00000000000..c25537db41d --- /dev/null +++ b/tests/diff/diff_files_test.php @@ -0,0 +1,110 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +class diff_files_test extends phpbb_test_case +{ + /** + * @var \phpbb\install\module\update_filesystem\task\diff_files + */ + protected $diff_task; + + /** + * @var \phpbb\install\helper\config + */ + protected $config; + + /** + * @var phpbb_mock_container_builder + */ + protected $container; + + + /** + * @var \phpbb\request\request + */ + protected $request; + + private static $helper; + + /** + * @var string + */ + protected $phpbb_root_path; + + /** + * @var string + */ + protected $phpEx; + + protected function setUp(): void + { + $this->phpbb_root_path = __DIR__ . '/../../phpBB/'; + $this->phpEx = 'php'; + + $language = new \phpbb\language\language( + new \phpbb\language\language_file_loader($this->phpbb_root_path, $this->phpEx) + ); + $this->request = new \phpbb\request\request(); + $update_helper = new \phpbb\install\helper\update_helper($this->phpbb_root_path); + $this->container = new \phpbb\install\helper\container_factory($language, $this->request, $update_helper, $this->phpbb_root_path, $this->phpEx); + + $iohandler = $this->createMock('\phpbb\install\helper\iohandler\iohandler_interface'); + + $this->config = new \phpbb\install\helper\config(new \phpbb\filesystem\filesystem(), new \bantu\IniGetWrapper\IniGetWrapper(), ''); + $update_files['update_with_diff'] = [ + 'test_files_diff.php', + ]; + $this->config->set('update_files', $update_files); + + $this->diff_task = new \phpbb\install\module\update_filesystem\task\diff_files($this->container, $this->config, $iohandler, $update_helper, $this->phpbb_root_path, $this->phpEx); + } + + protected function tearDown(): void + { + $disable_super_globals = $this->request->super_globals_disabled(); + + // This is needed because \phpbb\install\helper\container_factory disables it + if ($disable_super_globals) + { + $this->request->enable_super_globals(); + } + } + + public static function setUpBeforeClass(): void + { + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + + parent::setUpBeforeClass(); + + self::$helper = new phpbb_test_case_helpers(__CLASS__); + self::$helper->copy_dir(__DIR__ . '/fixtures/', $phpbb_root_path); + } + + public static function tearDownAfterClass(): void + { + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + + parent::tearDownAfterClass(); + + self::$helper->empty_dir($phpbb_root_path . 'install/update'); + rmdir($phpbb_root_path . 'install/update'); + unlink($phpbb_root_path . 'test_files_diff.php'); + } + + public function test_diff_files() + { + $this->diff_task->run(); + + $this->assertEmpty($this->config->get('update_files')); + } +} diff --git a/tests/diff/fixtures/install/update/new/test_files_diff.php b/tests/diff/fixtures/install/update/new/test_files_diff.php new file mode 100644 index 00000000000..6daabbe92e8 --- /dev/null +++ b/tests/diff/fixtures/install/update/new/test_files_diff.php @@ -0,0 +1,3 @@ + Date: Sun, 19 Oct 2025 14:31:45 +0200 Subject: [PATCH 0966/1214] [ticket/17569] Fix responsive display in navbar footer PHPBB-17569 --- phpBB/styles/prosilver/theme/common.css | 4 ++++ phpBB/styles/prosilver/theme/responsive.css | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 26c3b390554..d55d4e339b6 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -320,6 +320,10 @@ ul.linklist li.responsive-menu { margin: 0 5px 0 0; } +.nav-footer .responsive-menu { + display: none; +} + .hasjs ul.linklist.leftside, .hasjs ul.linklist.rightside { max-width: 48%; diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index ce5462455e0..68abef814d7 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -781,7 +781,6 @@ display: block !important; } - .nav-footer.linklist .responsive-menu, .nav-main.linklist .responsive-menu .in-menu { display: none !important; } From cac26d96c5582074d4ae977fb7c937acfc7a1374 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 19 Oct 2025 19:00:38 +0700 Subject: [PATCH 0967/1214] [ticket/17560] Refactor unit test PHPBB-17560 --- tests/diff/diff_files_test.php | 153 ++++++++++++++++++--------------- 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/tests/diff/diff_files_test.php b/tests/diff/diff_files_test.php index c25537db41d..b7e3a47ca08 100644 --- a/tests/diff/diff_files_test.php +++ b/tests/diff/diff_files_test.php @@ -11,100 +11,119 @@ * */ +include_once(__DIR__ . '/../../phpBB/includes/diff/diff.php'); +include_once(__DIR__ . '/../../phpBB/includes/diff/engine.php'); + class diff_files_test extends phpbb_test_case { /** - * @var \phpbb\install\module\update_filesystem\task\diff_files - */ - protected $diff_task; - - /** - * @var \phpbb\install\helper\config + * @var string */ - protected $config; + protected $filename; /** * @var phpbb_mock_container_builder */ - protected $container; - + protected $old_path; /** - * @var \phpbb\request\request + * @var \phpbb\install\helper\config */ - protected $request; - - private static $helper; + protected $new_path; /** * @var string */ - protected $phpbb_root_path; + protected $path; /** - * @var string + * @var array */ - protected $phpEx; + protected $update_files = []; protected function setUp(): void { - $this->phpbb_root_path = __DIR__ . '/../../phpBB/'; - $this->phpEx = 'php'; - - $language = new \phpbb\language\language( - new \phpbb\language\language_file_loader($this->phpbb_root_path, $this->phpEx) - ); - $this->request = new \phpbb\request\request(); - $update_helper = new \phpbb\install\helper\update_helper($this->phpbb_root_path); - $this->container = new \phpbb\install\helper\container_factory($language, $this->request, $update_helper, $this->phpbb_root_path, $this->phpEx); - - $iohandler = $this->createMock('\phpbb\install\helper\iohandler\iohandler_interface'); - - $this->config = new \phpbb\install\helper\config(new \phpbb\filesystem\filesystem(), new \bantu\IniGetWrapper\IniGetWrapper(), ''); - $update_files['update_with_diff'] = [ - 'test_files_diff.php', + $this->filename = 'test_files_diff.php'; + $this->path = __DIR__ . '/fixtures/'; + $this->old_path = $this->path . 'install/update/old/'; + $this->new_path = $this->path . 'install/update/new/'; + $this->update_files = [ + $this->filename, ]; - $this->config->set('update_files', $update_files); - - $this->diff_task = new \phpbb\install\module\update_filesystem\task\diff_files($this->container, $this->config, $iohandler, $update_helper, $this->phpbb_root_path, $this->phpEx); } - protected function tearDown(): void + public function test_diff_files() { - $disable_super_globals = $this->request->super_globals_disabled(); - - // This is needed because \phpbb\install\helper\container_factory disables it - if ($disable_super_globals) + foreach ($this->update_files as $key => $filename) { - $this->request->enable_super_globals(); + $merge_conflicts = $file_contents = []; + + $file_to_diff = $this->old_path . $filename; + $file_contents[0] = file_get_contents($file_to_diff); + $this->assertNotFalse($file_contents[0], "File $file_to_diff is empty"); + + $filenames = [ + $this->path . $filename, + $this->new_path . $filename + ]; + + foreach ($filenames as $file_to_diff) + { + $file_contents[] = file_get_contents($file_to_diff); + $this->assertNotFalse($file_contents[count($file_contents) - 1], "File $file_to_diff is empty"); + } + + $diff = new \diff3($file_contents[0], $file_contents[1], $file_contents[2]); + + $file_is_merged = $diff->merged_output() === $file_contents[1]; + + // Handle conflicts + if ($diff->get_num_conflicts() !== 0) + { + // Check if current file content is merge of new or original file + $tmp = [ + 'file1' => $file_contents[1], + 'file2' => implode("\n", $diff->merged_new_output()), + ]; + + $diff2 = new \diff($tmp['file1'], $tmp['file2']); + $empty = $diff2->is_empty(); + + if (!$empty) + { + unset($tmp, $diff2); + + // We check if the user merged with his output + $tmp = [ + 'file1' => $file_contents[1], + 'file2' => implode("\n", $diff->merged_orig_output()), + ]; + + $diff2 = new \diff($tmp['file1'], $tmp['file2']); + $empty = $diff2->is_empty(); + } + + unset($diff2); + + if (!$empty && in_array($filename, $merge_conflicts)) + { + $merge_conflicts[] = $filename; + } + else + { + $file_is_merged = true; + } + } + + if ($file_is_merged) + { + unset($this->update_files[$key]); + } + + unset($file_contents); + unset($diff); } - } - - public static function setUpBeforeClass(): void - { - $phpbb_root_path = __DIR__ . '/../../phpBB/'; - - parent::setUpBeforeClass(); - - self::$helper = new phpbb_test_case_helpers(__CLASS__); - self::$helper->copy_dir(__DIR__ . '/fixtures/', $phpbb_root_path); - } - - public static function tearDownAfterClass(): void - { - $phpbb_root_path = __DIR__ . '/../../phpBB/'; - - parent::tearDownAfterClass(); - - self::$helper->empty_dir($phpbb_root_path . 'install/update'); - rmdir($phpbb_root_path . 'install/update'); - unlink($phpbb_root_path . 'test_files_diff.php'); - } - - public function test_diff_files() - { - $this->diff_task->run(); - $this->assertEmpty($this->config->get('update_files')); + $this->assertEquals([], $this->update_files); } } From 93b89d64fd97d0ccba2638aebbbef0c99f08c6a3 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 19 Oct 2025 20:14:56 +0700 Subject: [PATCH 0968/1214] [ticket/17560] Fix coding style PHPBB-17560 --- phpBB/includes/diff/engine.php | 130 +++++++++++------- .../update_filesystem/task/diff_files.php | 4 +- 2 files changed, 82 insertions(+), 52 deletions(-) diff --git a/phpBB/includes/diff/engine.php b/phpBB/includes/diff/engine.php index 0d73db02dad..8fcff6c4950 100644 --- a/phpBB/includes/diff/engine.php +++ b/phpBB/includes/diff/engine.php @@ -1,68 +1,98 @@ -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ + * + * This file is part of the phpBB Forum Software package. + * + * @copyright (c) phpBB Limited + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ /** -* @ignore -*/ + * @ignore + */ if (!defined('IN_PHPBB')) { exit; } /** -* Code from pear.php.net, Text_Diff-1.1.0 package -* http://pear.php.net/package/Text_Diff/ (native engine) -* -* Modified by phpBB Limited to meet our coding standards -* and being able to integrate into phpBB -* -* Class used internally by Text_Diff to actually compute the diffs. This -* class is implemented using native PHP code. -* -* The algorithm used here is mostly lifted from the perl module -* Algorithm::Diff (version 1.06) by Ned Konz, which is available at: -* http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip -* -* More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html -* -* Some ideas (and a bit of code) are taken from analyze.c, of GNU -* diffutils-2.7, which can be found at: -* ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz -* -* Some ideas (subdivision by NCHUNKS > 2, and some optimizations) are from -* Geoffrey T. Dairiki . The original PHP version of this -* code was written by him, and is used/adapted with his permission. -* -* Copyright 2004-2008 The Horde Project (http://www.horde.org/) -* -* @author Geoffrey T. Dairiki -* @package diff -* -* @access private -*/ + * Code from pear.php.net, Text_Diff-1.1.0 package + * http://pear.php.net/package/Text_Diff/ (native engine) + * + * Modified by phpBB Limited to meet our coding standards + * and being able to integrate into phpBB + * + * Class used internally by Text_Diff to actually compute the diffs. This + * class is implemented using native PHP code. + * + * The algorithm used here is mostly lifted from the perl module + * Algorithm::Diff (version 1.06) by Ned Konz, which is available at: + * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip + * + * More ideas are taken from: http://www.ics.uci.edu/~eppstein/161/960229.html + * + * Some ideas (and a bit of code) are taken from analyze.c, of GNU + * diffutils-2.7, which can be found at: + * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz + * + * Some ideas (subdivision by NCHUNKS > 2, and some optimizations) are from + * Geoffrey T. Dairiki . The original PHP version of this + * code was written by him, and is used/adapted with his permission. + * + * Copyright 2004-2008 The Horde Project (http://www.horde.org/) + * + * @author Geoffrey T. Dairiki + * @package diff + * + * @access private + */ class diff_engine { + /** var array */ + protected $in_seq; + + /** var int */ + protected $lcs; + + /** var array */ + protected $seq; + /** - * If set to true we trim all lines before we compare them. This ensures that sole space/tab changes do not trigger diffs. - */ - var $skip_whitespace_changes = true; + * bool + * + * If set to true we trim all lines before we compare them. This ensures that sole space/tab changes do not trigger diffs. + */ + protected $skip_whitespace_changes = true; + + /** var array */ + protected $xchanged; + + /** var array */ + protected $xind; + + /** var array */ + protected $xv; + + /** var array */ + protected $ychanged; + + /** var array */ + protected $yind; + + /** var array */ + protected $yv; function diff(&$from_lines, &$to_lines, $preserve_cr = true) { - // Remove empty lines... - // If preserve_cr is true, we basically only change \r\n and bare \r to \n to get the same carriage returns for both files - // If it is false, we try to only use \n once per line and ommit all empty lines to be able to get a proper data diff - + /* + * Remove empty lines... + * If preserve_cr is true, we basically only change \r\n and bare \r to \n to get the same carriage returns for both files + * If it is false, we try to only use \n once per line and ommit all empty lines to be able to get a proper data diff + */ if (is_array($from_lines)) { $from_lines = implode("\n", $from_lines); @@ -87,7 +117,7 @@ function diff(&$from_lines, &$to_lines, $preserve_cr = true) $n_from = count($from_lines); $n_to = count($to_lines); - $this->xchanged = $this->ychanged = $this->xv = $this->yv = $this->xind = $this->yind = array(); + $this->xchanged = $this->ychanged = $this->xv = $this->yv = $this->xind = $this->yind = []; unset($this->seq, $this->in_seq, $this->lcs); // Skip leading common lines. diff --git a/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php b/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php index e4ed6a77140..45caa0d3cfa 100644 --- a/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php +++ b/phpBB/phpbb/install/module/update_filesystem/task/diff_files.php @@ -187,8 +187,8 @@ public function run() if (!$empty && in_array($filename, $merge_conflicts)) { - $merge_conflicts[] = $filename; - } + $merge_conflicts[] = $filename; + } else { $file_is_merged = true; From 22ce4641064e57b63c0b78d1bfb38b53061394e0 Mon Sep 17 00:00:00 2001 From: cabot Date: Mon, 20 Oct 2025 14:38:00 +0200 Subject: [PATCH 0969/1214] [ticket/17570] Replace old CSS accessibility hack PHPBB-17570 --- phpBB/styles/prosilver/theme/bidi.css | 7 +------ phpBB/styles/prosilver/theme/content.css | 9 +++++++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 4b284439694..af18e1b17c8 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -395,11 +395,6 @@ li.breadcrumbs span:first-child > a { border-left: none; } -.rtl ul.topiclist dfn { - left: auto; - right: -999px; -} - .rtl ul.topiclist li.row dt a.subforum { padding-right: 12px; background-position: right; @@ -1071,7 +1066,7 @@ li.breadcrumbs span:first-child > a { .captcha-panel dd.captcha { margin-right: 0; } - + .rtl p.responsive-center { float: none; text-align: center; diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index f436391d1c3..916d3d8028e 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -77,9 +77,14 @@ ul.topiclist li.row dd { ul.topiclist dfn { /* Labels for post/view counts */ + border: 0; position: absolute; - left: -999px; - width: 990px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + width: 1px; + height: 1px; + margin: -1px; + padding: 0; } .forum-image { From 9466f505b662b9b486bbe628a962a300190833f7 Mon Sep 17 00:00:00 2001 From: Prosk8er Date: Fri, 24 Oct 2025 21:45:00 -0400 Subject: [PATCH 0970/1214] [ticket/17572] meta apple-mobile-web-app-capable depreciated is deprecated. Please include add to overall_header.html PHPBB-17572 --- phpBB/styles/prosilver/template/overall_header.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html index 71df3ccd4d8..cb94e8b11d3 100644 --- a/phpBB/styles/prosilver/template/overall_header.html +++ b/phpBB/styles/prosilver/template/overall_header.html @@ -6,6 +6,7 @@ + {META} <!-- IF UNREAD_NOTIFICATIONS_COUNT -->({UNREAD_NOTIFICATIONS_COUNT}) <!-- ENDIF --><!-- IF not S_VIEWTOPIC and not S_VIEWFORUM -->{SITENAME} - <!-- ENDIF --><!-- IF S_IN_MCP -->{L_MCP} - <!-- ELSEIF S_IN_UCP -->{L_UCP} - <!-- ENDIF -->{PAGE_TITLE}<!-- IF S_VIEWTOPIC or S_VIEWFORUM --> - {SITENAME}<!-- ENDIF --> From 6e3f16f2305cf7895472f28530bac76519171c07 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 25 Oct 2025 19:10:51 +0200 Subject: [PATCH 0971/1214] [ticket/17571] Fix undefined user_id in event dispatcher PHPBB3-17571 --- phpBB/phpbb/storage/controller/attachment.php | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 7aed1ccdb37..610b4b17779 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -370,6 +370,7 @@ protected function phpbb_download_handle_pm_auth(int $msg_id): void } $allowed = $this->phpbb_download_check_pm_auth($msg_id); + $user_id = $this->user->data['user_id']; /** * Event to modify PM attachments download auth From d9788b09c3a23de13b23f72ce734601706a3f5e6 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 26 Oct 2025 11:24:42 +0100 Subject: [PATCH 0972/1214] [ticket/17573] Skip tests when dbms is null PHPBB3-17573 --- tests/migrator/schema_generator_test.php | 10 +++++++++- tests/test_framework/phpbb_database_test_case.php | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tests/migrator/schema_generator_test.php b/tests/migrator/schema_generator_test.php index e7129c4cc3e..2df7bf05d36 100644 --- a/tests/migrator/schema_generator_test.php +++ b/tests/migrator/schema_generator_test.php @@ -57,7 +57,15 @@ protected function setUp(): void $this->config = new \phpbb\config\config(array()); $this->db = new \phpbb\db\driver\sqlite3(); - $this->doctrine_db = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file()); + // Some local setups may not configure a DB driver. If the configured + // 'dbms' is null, skip this test instead of failing with a TypeError in + // the connection factory which expects a non-null driver name. + $mock_config = new phpbb_mock_config_php_file(); + if ($mock_config->get('dbms') === null) + { + self::markTestSkipped('Skipping schema generator tests: dbms is not configured (null) in local environment.'); + } + $this->doctrine_db = \phpbb\db\doctrine\connection_factory::get_connection($mock_config); $factory = new \phpbb\db\tools\factory(); $this->db_tools = $factory->get($this->doctrine_db); $this->db_tools->set_table_prefix($this->table_prefix); diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index 6da764adfb0..de8a605f2af 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -66,7 +66,15 @@ public static function setUpBeforeClass(): void global $table_prefix; $db = new \phpbb\db\driver\sqlite3(); - $doctrine = \phpbb\db\doctrine\connection_factory::get_connection(new phpbb_mock_config_php_file()); + // Some local setups may not configure a DB driver. If the configured + // 'dbms' is null, skip this test instead of failing with a TypeError in + // the connection factory which expects a non-null driver name. + $mock_config = new phpbb_mock_config_php_file(); + if ($mock_config->get('dbms') === null) + { + self::markTestSkipped('Skipping schema generator tests: dbms is not configured (null) in local environment.'); + } + $doctrine = \phpbb\db\doctrine\connection_factory::get_connection($mock_config); $factory = new \phpbb\db\tools\factory(); $db_tools = $factory->get($doctrine, true); $db_tools->set_table_prefix($table_prefix); From 4f9312809718200ad1817a25a70713bbf94acfb4 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 26 Oct 2025 08:07:14 -0700 Subject: [PATCH 0973/1214] [ticket/17575] Fix web manifest scope path creation PHPBB-17575 --- phpBB/config/default/container/services.yml | 1 - phpBB/phpbb/manifest.php | 23 ++-- tests/manifest/controller_test.php | 138 ++++++++++++++++++++ 3 files changed, 150 insertions(+), 12 deletions(-) create mode 100644 tests/manifest/controller_test.php diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index ecf8f3109e7..6efad8827af 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -163,7 +163,6 @@ services: class: phpbb\manifest arguments: - '@config' - - '@path_helper' - '@event_dispatcher' - '@user' diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 6b48138517e..72a830abf38 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -22,9 +22,6 @@ class manifest /** @var config */ protected $config; - /** @var path_helper */ - protected $path_helper; - /** @var dispatcher_interface */ protected $phpbb_dispatcher; @@ -35,14 +32,12 @@ class manifest * Constructor for manifest controller * * @param config $config - * @param path_helper $path_helper * @param dispatcher_interface $phpbb_dispatcher * @param user $user */ - public function __construct(config $config, path_helper $path_helper, dispatcher_interface $phpbb_dispatcher, user $user) + public function __construct(config $config, dispatcher_interface $phpbb_dispatcher, user $user) { $this->config = $config; - $this->path_helper = $path_helper; $this->phpbb_dispatcher = $phpbb_dispatcher; $this->user = $user; } @@ -54,7 +49,12 @@ public function __construct(config $config, path_helper $path_helper, dispatcher */ public function handle(): JsonResponse { - $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : $this->path_helper->get_web_root_path(); + // Get the board URL and extract the path component + $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : (parse_url(generate_board_url())['path'] ?? ''); + + // Ensure path ends with '/' for PWA scope + $scope = rtrim($board_path, '/\\') . '/'; + $start_url = $scope; $sitename = html_entity_decode($this->config['sitename'], ENT_QUOTES, 'UTF-8'); $sitename_short = html_entity_decode($this->config['sitename_short'], ENT_QUOTES, 'UTF-8'); @@ -64,8 +64,8 @@ public function handle(): JsonResponse 'short_name' => $sitename_short ?: utf8_substr($sitename, 0, 12), 'display' => 'standalone', 'orientation' => 'portrait', - 'start_url' => $board_path, - 'scope' => $board_path, + 'start_url' => $start_url, + 'scope' => $scope, ]; /** @@ -73,12 +73,13 @@ public function handle(): JsonResponse * * @event core.modify_manifest * @var array manifest Array of manifest members - * @var string board_path Path to the board root + * @var string scope PWA scope path + * @var string start_url PWA start URL * @var string sitename Full name of the board * @var string sitename_short Shortened name of the board * @since 4.0.0-a1 */ - $vars = ['manifest', 'board_path', 'sitename', 'sitename_short']; + $vars = ['manifest', 'scope', 'start_url', 'sitename', 'sitename_short']; extract($this->phpbb_dispatcher->trigger_event('core.modify_manifest', compact($vars))); $response = new JsonResponse($manifest); diff --git a/tests/manifest/controller_test.php b/tests/manifest/controller_test.php new file mode 100644 index 00000000000..6b98002a1e2 --- /dev/null +++ b/tests/manifest/controller_test.php @@ -0,0 +1,138 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +use Symfony\Component\HttpFoundation\JsonResponse; + +class phpbb_manifest_controller_test extends phpbb_test_case +{ + protected $config; + protected $user; + protected $manifest; + + protected function setUp(): void + { + global $config, $user, $phpbb_root_path, $phpEx; + + parent::setUp(); + + $config = $this->config = new phpbb\config\config([ + 'sitename' => 'phpBB Testing Framework', + 'sitename_short' => '', + 'force_server_vars' => false, + 'script_path' => '', + ]); + + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); + $lang_loader = new phpbb\language\language_file_loader($phpbb_root_path, $phpEx); + $language = new phpbb\language\language($lang_loader); + $user = $this->user = new phpbb\user($language, '\phpbb\datetime'); + + $this->manifest = new phpbb\manifest($this->config, $phpbb_dispatcher, $this->user); + } + + public static function manifest_data() + { + return [ + 'using board url root path' => [ + [ + 'force_server_vars' => false, + ], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Testin', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/', + 'scope' => '/', + ], + ], + 'using script path' => [ + [ + 'force_server_vars' => true, + 'script_path' => '/foo/', + ], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Testin', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/foo/', + 'scope' => '/foo/', + ], + ], + 'with shortname' => [ + [ + 'sitename_short' => 'phpBB Test', + ], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Test', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/', + 'scope' => '/', + ], + ], + 'without shortname or script path' => [ + [], + [ + 'name' => 'phpBB Testing Framework', + 'short_name' => 'phpBB Testin', + 'display' => 'standalone', + 'orientation' => 'portrait', + 'start_url' => '/', + 'scope' => '/', + ], + ], + ]; + } + + /** + * @dataProvider manifest_data + */ + public function test_manifest($configs, $expected) + { + foreach ($configs as $key => $value) + { + $this->config->set($key, $value); + } + + $response = $this->manifest->handle(); + + $this->assertInstanceOf(JsonResponse::class, $response); + + $this->assertEquals($expected, json_decode($response->getContent(), true)); + } + + public static function manifest_with_bot_data() + { + return [ + 'is a bot' => [true, 'yes'], + 'not a bot' => [false, null], + ]; + } + + /** + * @dataProvider manifest_with_bot_data + */ + public function test_manifest_with_bot($is_bot, $expected) + { + $this->user->data['is_bot'] = $is_bot; + + $response = $this->manifest->handle(); + + $this->assertInstanceOf(JsonResponse::class, $response); + + $this->assertEquals($expected, $response->headers->get('X-PHPBB-IS-BOT')); + } +} From 215256019ef0001f48d0a44fa560a83b367ab92c Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 23 Dec 2024 23:25:40 +0100 Subject: [PATCH 0974/1214] [ticket/17447] Add http range requests to attachments downloads PHPBB-17447 --- phpBB/develop/adjust_avatars.php | 5 +- phpBB/phpbb/storage/controller/attachment.php | 161 ++++++++++++------ phpBB/phpbb/storage/controller/avatar.php | 6 +- phpBB/phpbb/storage/controller/controller.php | 59 +++---- 4 files changed, 137 insertions(+), 94 deletions(-) diff --git a/phpBB/develop/adjust_avatars.php b/phpBB/develop/adjust_avatars.php index a6b326109dd..f470305e5eb 100644 --- a/phpBB/develop/adjust_avatars.php +++ b/phpBB/develop/adjust_avatars.php @@ -4,6 +4,9 @@ * * You should make a backup from your users table and the avatar directory in case something goes wrong */ + +use phpbb\storage\provider\local; + die("Please read the first lines of this script for instructions on how to enable it"); set_time_limit(0); @@ -30,7 +33,7 @@ die('database not up to date'); } -if (!isset($config['storage\\avatar\\config\\path']) || $config['storage\\avatar\\config\\path'] !== 'phpbb\\storage\\provider\\local') +if (!isset($config['storage\\avatar\\provider']) || $config['storage\\avatar\\provider'] !== local::class) { die('use local provider'); } diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 7aed1ccdb37..2ac36f839fb 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -24,8 +24,11 @@ use phpbb\language\language; use phpbb\mimetype\extension_guesser; use phpbb\request\request; +use phpbb\storage\provider\local; use phpbb\storage\storage; use phpbb\user; +use Symfony\Component\HttpFoundation\BinaryFileResponse; +use Symfony\Component\HttpFoundation\HeaderUtils; use Symfony\Component\HttpFoundation\Request as symfony_request; use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; @@ -35,26 +38,41 @@ /** * Controller for /download/attachment/{id} routes */ -class attachment extends controller +class attachment { /** @var auth */ protected $auth; + /** @var service */ + protected $cache; + /** @var config */ protected $config; /** @var content_visibility */ protected $content_visibility; + /** @var driver_interface */ + protected $db; + /** @var dispatcher_interface */ protected $dispatcher; + /** @var extension_guesser */ + protected $extension_guesser; + /** @var language */ protected $language; /** @var request */ protected $request; + /** @var storage */ + protected $storage; + + /** @var symfony_request */ + protected $symfony_request; + /** @var user */ protected $user; @@ -76,14 +94,17 @@ class attachment extends controller */ public function __construct(auth $auth, service $cache, config $config, content_visibility $content_visibility, driver_interface $db, dispatcher_interface $dispatcher, extension_guesser $extension_guesser, language $language, request $request, storage $storage, symfony_request $symfony_request, user $user) { - parent::__construct($cache, $db, $extension_guesser, $storage, $symfony_request); - $this->auth = $auth; + $this->cache = $cache; $this->config = $config; $this->content_visibility = $content_visibility; + $this->db = $db; $this->dispatcher = $dispatcher; + $this->extension_guesser = $extension_guesser; $this->language = $language; $this->request = $request; + $this->storage = $storage; + $this->symfony_request = $symfony_request; $this->user = $user; } @@ -110,15 +131,7 @@ public function handle_attachment(int $id, string $filename): Response throw new http_exception(404, 'NO_ATTACHMENT_SELECTED'); } - $sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id, - is_orphan, physical_filename, real_filename, extension, mimetype, - filesize, filetime - FROM ' . ATTACHMENTS_TABLE . " - WHERE attach_id = $attach_id" . - (($filename) ? " AND real_filename = '" . $this->db->sql_escape($filename) . "'" : ''); - $result = $this->db->sql_query($sql); - $attachment = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); + $attachment = $this->get_attachment($attach_id, $filename); if (!$attachment) { @@ -157,12 +170,7 @@ public function handle_attachment(int $id, string $filename): Response { $this->phpbb_download_handle_forum_auth($attachment['topic_id']); - $sql = 'SELECT forum_id, poster_id, post_visibility - FROM ' . POSTS_TABLE . ' - WHERE post_id = ' . (int) $attachment['post_msg_id']; - $result = $this->db->sql_query($sql); - $post_row = $this->db->sql_fetchrow($result); - $this->db->sql_freeresult($result); + $post_row = $this->get_post((int) $attachment['post_msg_id']); if (!$post_row || !$this->content_visibility->is_visible('post', $post_row['forum_id'], $post_row)) { @@ -173,11 +181,11 @@ public function handle_attachment(int $id, string $filename): Response else { // Attachment is in a private message. - $post_row = array('forum_id' => false); + $post_row = ['forum_id' => false]; $this->phpbb_download_handle_pm_auth( $attachment['post_msg_id']); } - $extensions = array(); + $extensions = []; if (!extension_allowed($post_row['forum_id'], $attachment['extension'], $extensions)) { throw new http_exception(403, 'EXTENSION_DISABLED_AFTER_POSTING', [$attachment['extension']]); @@ -216,13 +224,13 @@ public function handle_attachment(int $id, string $filename): Response * @changed 3.3.0-a1 Remove display_cat variable * @changed 3.3.0-a1 Remove mode variable */ - $vars = array( + $vars = [ 'attach_id', 'attachment', 'extensions', 'thumbnail', 'redirect', - ); + ]; extract($this->dispatcher->trigger_event('core.download_file_send_to_browser_before', compact($vars))); // If the redirect variable have been overwritten, do redirect there @@ -247,26 +255,15 @@ public function handle_attachment(int $id, string $filename): Response * @changed 3.3.0-a1 Removed size variable * @changed 3.3.0-a1 Removed filename variable */ - $vars = array( + $vars = [ 'attachment', - ); + ]; extract($this->dispatcher->trigger_event('core.send_file_to_browser_before', compact($vars))); - // TODO: The next lines should go better in prepare, also the mimetype is handled by the storage table - // so probably can be removed - - $response = new StreamedResponse(); - - // Content-type header - $response->headers->set('Content-Type', $attachment['mimetype']); - - // Display file types in browser and force download for others - if (strpos($attachment['mimetype'], 'image') !== false - || strpos($attachment['mimetype'], 'audio') !== false - || strpos($attachment['mimetype'], 'video') !== false - ) + // Display images in browser and force download for others + if ($display_cat == attachment_category::IMAGE && str_starts_with($attachment['mimetype'], 'image')) { - $disposition = $response->headers->makeDisposition( + $disposition = HeaderUtils::makeDisposition( ResponseHeaderBag::DISPOSITION_INLINE, $attachment['real_filename'], $this->filenameFallback($attachment['real_filename']) @@ -274,40 +271,91 @@ public function handle_attachment(int $id, string $filename): Response } else { - $disposition = $response->headers->makeDisposition( + // Correct the mime type - we force application/octet-stream for all files, except images + $attachment['mimetype'] = 'application/octet-stream'; + + $disposition = HeaderUtils::makeDisposition( ResponseHeaderBag::DISPOSITION_ATTACHMENT, $attachment['real_filename'], $this->filenameFallback($attachment['real_filename']) ); } + if ($this->config['storage\\attachment\\provider'] === local::class) + { + $response = new BinaryFileResponse($this->config['storage\\attachment\\config\\path'] . '/' . $attachment['physical_filename']); + } + else + { + $response = new StreamedResponse(); + + $fp = $this->storage->read($attachment['physical_filename']); + + $output = fopen('php://output', 'w+b'); + + $response->setCallback(function () use ($fp, $output) { + stream_copy_to_stream($fp, $output); + fclose($fp); + fclose($output); + flush(); + + // Terminate script to avoid the execution of terminate events + // This avoids possible errors with db connection closed + exit; + }); + } + + // Close db connection and unload cache + $this->cache->unload(); + $this->db->sql_close(); + + // Don't cache attachments on proxies + $response->setPrivate(); + + // Content-type and content-disposition headers + $response->headers->set('Content-Type', $attachment['mimetype']); $response->headers->set('Content-Disposition', $disposition); - // Set expires header for browser cache - $time = new \DateTime(); - $response->setExpires($time->modify('+1 year')); + @set_time_limit(0); - return parent::handle($attachment['physical_filename']); + return $response; } - /** - * Remove non valid characters https://github.com/symfony/http-foundation/commit/c7df9082ee7205548a97031683bc6550b5dc9551 - */ - protected function filenameFallback($filename): string + protected function get_attachment(int $attach_id, string $filename): array|null { - $filename = (string) preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename); + $sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id, + is_orphan, physical_filename, real_filename, extension, mimetype, + filesize, filetime + FROM ' . ATTACHMENTS_TABLE . " + WHERE attach_id = $attach_id" . + (($filename) ? " AND real_filename = '" . $this->db->sql_escape($filename) . "'" : ''); + $result = $this->db->sql_query($sql); + $attachment = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); - return !empty($filename) ? $filename : 'File'; + return $attachment ?: null; + } + + protected function get_post(int $post_id): array|null + { + $sql = 'SELECT forum_id, poster_id, post_visibility + FROM ' . POSTS_TABLE . ' + WHERE post_id = ' . (int) $post_id; + $result = $this->db->sql_query($sql); + $post_row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + return $post_row ?: null; } /** - * {@inheritdoc} + * Remove non valid characters https://github.com/symfony/http-foundation/commit/c7df9082ee7205548a97031683bc6550b5dc9551 */ - protected function prepare(StreamedResponse $response, string $file): void + protected function filenameFallback($filename): string { - $response->setPrivate(); // By default, should be private, but make sure of it + $filename = (string) preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename); - parent::prepare($response, $file); + return !empty($filename) ? $filename : 'File'; } /** @@ -380,7 +428,7 @@ protected function phpbb_download_handle_pm_auth(int $msg_id): void * @var int user_id The user id for auth check * @since 3.1.11-RC1 */ - $vars = array('allowed', 'msg_id', 'user_id'); + $vars = ['allowed', 'msg_id', 'user_id']; extract($this->dispatcher->trigger_event('core.modify_pm_attach_download_auth', compact($vars))); if (!$allowed) @@ -407,7 +455,8 @@ protected function phpbb_download_check_pm_auth(int $msg_id): bool AND ( user_id = ' . (int) $user_id . ' OR author_id = ' . (int) $user_id . ' - )'; + ) + '; $result = $this->db->sql_query_limit($sql, 1); $allowed = (bool) $this->db->sql_fetchfield('msg_id'); $this->db->sql_freeresult($result); @@ -460,7 +509,7 @@ protected function download_allowed(): bool unset($url); $allowed = !$this->config['secure_allow_deny']; - $iplist = array(); + $iplist = []; if (($ip_ary = @gethostbynamel($hostname)) !== false) { diff --git a/phpBB/phpbb/storage/controller/avatar.php b/phpBB/phpbb/storage/controller/avatar.php index ba8a8a4e957..c4406f73888 100644 --- a/phpBB/phpbb/storage/controller/avatar.php +++ b/phpBB/phpbb/storage/controller/avatar.php @@ -18,10 +18,10 @@ use phpbb\db\driver\driver_interface; use phpbb\mimetype\extension_guesser; use phpbb\storage\storage; +use Symfony\Component\HttpFoundation\HeaderUtils; use Symfony\Component\HttpFoundation\Request as symfony_request; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\ResponseHeaderBag; -use Symfony\Component\HttpFoundation\StreamedResponse; /** * Controller for /download/avatar/{file} routes @@ -98,11 +98,11 @@ protected function decode_filename(string $file): string /** * {@inheritdoc} */ - protected function prepare(StreamedResponse $response, string $file): void + protected function prepare(Response $response, string $file): void { $response->setPublic(); - $disposition = $response->headers->makeDisposition( + $disposition = HeaderUtils::makeDisposition( ResponseHeaderBag::DISPOSITION_INLINE, rawurlencode($file) ); diff --git a/phpBB/phpbb/storage/controller/controller.php b/phpBB/phpbb/storage/controller/controller.php index 155d3df7a6a..bdf59ae2ddb 100644 --- a/phpBB/phpbb/storage/controller/controller.php +++ b/phpBB/phpbb/storage/controller/controller.php @@ -72,8 +72,6 @@ public function __construct(service $cache, driver_interface $db, extension_gues */ public function handle(string $file): Response { - $response = new StreamedResponse(); - if (!static::is_allowed($file)) { throw new http_exception(403, 'Forbidden'); @@ -84,6 +82,21 @@ public function handle(string $file): Response throw new http_exception(404, 'Not Found'); } + $response = new StreamedResponse(); + $fp = $this->storage->read($file); + $output = fopen('php://output', 'w+b'); + + $response->setCallback(function () use ($fp, $output) { + stream_copy_to_stream($fp, $output); + fclose($fp); + fclose($output); + flush(); + + // Terminate script to avoid the execution of terminate events + // This avoids possible errors with db connection closed + exit; + }); + static::prepare($response, $file); if (headers_sent()) @@ -91,6 +104,14 @@ public function handle(string $file): Response throw new http_exception(500, 'Headers already sent'); } + // Close db connection and unload cache + $this->cache->unload(); + $this->db->sql_close(); + + $response->isNotModified($this->symfony_request); + + @set_time_limit(0); + return $response; } @@ -121,13 +142,13 @@ protected function file_exists(string $file): bool /** * Prepare response * - * @param StreamedResponse $response + * @param Response $response * @param string $file File path * * @return void * @throws storage_exception when there is an error reading the file */ - protected function prepare(StreamedResponse $response, string $file): void + protected function prepare(Response $response, string $file): void { // Add Content-Type header if (!$response->headers->has('Content-Type')) @@ -157,35 +178,5 @@ protected function prepare(StreamedResponse $response, string $file): void } } - @set_time_limit(0); - - $fp = $this->storage->read($file); - - // Close db connection - $this->file_gc(); - - $output = fopen('php://output', 'w+b'); - - $response->setCallback(function () use ($fp, $output) { - stream_copy_to_stream($fp, $output); - fclose($fp); - fclose($output); - flush(); - - // Terminate script to avoid the execution of terminate events - // This avoids possible errors with db connection closed - exit; - }); - - $response->isNotModified($this->symfony_request); - } - - /** - * Garbage Collection - */ - protected function file_gc(): void - { - $this->cache->unload(); // Equivalent to $this->cache->get_driver()->unload(); - $this->db->sql_close(); } } From ce4240d0982adfc623b7ff47aa90691d2b524009 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 25 Oct 2025 20:10:57 +0200 Subject: [PATCH 0975/1214] [ticket/15813] Short array syntax, avoid globals and other small changes PHPBB3-15813 --- .../default/container/services_members.yml | 7 + phpBB/config/default/routing/routing.yml | 1 + phpBB/memberlist.php | 2 +- phpBB/phpbb/members/controller/team.php | 193 +++++++++++------- tests/functional/memberlist_test.php | 2 +- 5 files changed, 134 insertions(+), 71 deletions(-) diff --git a/phpBB/config/default/container/services_members.yml b/phpBB/config/default/container/services_members.yml index a75015e2396..edacb697cf6 100644 --- a/phpBB/config/default/container/services_members.yml +++ b/phpBB/config/default/container/services_members.yml @@ -13,3 +13,10 @@ services: - '@language' - '@template' - '@user' + - '%core.root_path%' + - '%core.php_ext%' + - '%tables.forums%' + - '%tables.groups%' + - '%tables.teampage%' + - '%tables.user_group%' + - '%tables.users%' diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 8e28174b165..3a6f6fbcb1e 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -30,6 +30,7 @@ phpbb_manifest_controller: phpbb_members_routing: resource: members.yml + prefix: /members phpbb_mention_controller: path: /mention diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index adeec2e6432..1170411f98e 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -50,7 +50,7 @@ if ($mode == 'leaders') { send_status_line(301, 'Moved Permanently'); - redirect(append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team')); + redirect($controller_helper->route('phpbb_members_team', [], false)); } // Check our mode... diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php index a536f98e703..1aac91d70cf 100644 --- a/phpBB/phpbb/members/controller/team.php +++ b/phpBB/phpbb/members/controller/team.php @@ -23,6 +23,7 @@ use phpbb\language\language; use phpbb\template\template; use phpbb\user; +use Symfony\Component\HttpFoundation\Response; class team { @@ -71,7 +72,63 @@ class team */ protected $user; - public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, group_helper $group_helper, helper $helper, language $language, template $template, user $user) + /** + * @var string + */ + protected $phpbb_root_path; + + /** + * @var string + */ + protected $php_ext; + + /** + * @var string + */ + protected $forums_table; + + /** + * @var string + */ + protected $groups_table; + + /** + * @var string + */ + protected $teampage_table; + + /** + * @var string + */ + protected $user_group_table; + + /** + * @var string + */ + protected $users_table; + + + /** + * Constructor + * + * @param auth $auth Authentication service + * @param config $config Configuration + * @param driver_interface $db Database driver + * @param dispatcher $dispatcher Event dispatcher + * @param group_helper $group_helper Group helper + * @param helper $helper Controller helper + * @param language $language Language service + * @param template $template Template service + * @param user $user User object + * @param string $phpbb_root_path Path to phpBB root + * @param string $phpEx PHP file extension + * @param string $forums_table Table name for forums + * @param string $groups_table Table name for groups + * @param string $teampage_table Table name for teampage + * @param string $user_group_table Table name for user_group + * @param string $users_table Table name for users + */ + public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, group_helper $group_helper, helper $helper, language $language, template $template, user $user, string $phpbb_root_path, string $phpEx, string $forums_table, string $groups_table, string $teampage_table, string $user_group_table, string $users_table) { $this->auth = $auth; $this->config = $config; @@ -82,23 +139,31 @@ public function __construct(auth $auth, config $config, driver_interface $db, di $this->language = $language; $this->template = $template; $this->user = $user; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ext = $phpEx; + $this->forums_table = $forums_table; + $this->groups_table = $groups_table; + $this->teampage_table = $teampage_table; + $this->user_group_table = $user_group_table; + $this->users_table = $users_table; } /** * Controller for /team route * - * @return \Symfony\Component\HttpFoundation\Response a Symfony response object + * @return Response a Symfony response object */ - public function handle() + public function handle() : Response { - global $phpbb_root_path, $phpEx; - // Display a listing of board admins, moderators if (!function_exists('user_get_id_name')) { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); + include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ext); + } + if (!function_exists('phpbb_get_user_rank')) + { + include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext); } - include($phpbb_root_path . 'includes/functions_display.' . $phpEx); // Load language strings $this->language->add_lang('memberlist'); @@ -115,32 +180,32 @@ public function handle() } $sql = 'SELECT * - FROM ' . TEAMPAGE_TABLE . ' + FROM ' . $this->teampage_table . ' ORDER BY teampage_position ASC'; $result = $this->db->sql_query($sql, 3600); $teampage_data = $this->db->sql_fetchrowset($result); $this->db->sql_freeresult($result); - $sql_ary = array( + $sql_ary = [ 'SELECT' => 'g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id, t.teampage_id', - 'FROM' => array(GROUPS_TABLE => 'g'), + 'FROM' => [$this->groups_table => 'g'], - 'LEFT_JOIN' => array( - array( - 'FROM' => array(TEAMPAGE_TABLE => 't'), + 'LEFT_JOIN' => [ + [ + 'FROM' => [$this->teampage_table => 't'], 'ON' => 't.group_id = g.group_id', - ), - array( - 'FROM' => array(USER_GROUP_TABLE => 'ug'), + ], + [ + 'FROM' => [$this->user_group_table => 'ug'], 'ON' => 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . (int) $this->user->data['user_id'], - ), - ), - ); + ], + ], + ]; $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); - $group_ids = $groups_ary = array(); + $group_ids = $groups_ary = []; while ($row = $this->db->sql_fetchrow($result)) { if ($row['group_type'] == GROUP_HIDDEN && !$this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel') && $row['ug_user_id'] != $this->user->data['user_id']) @@ -151,7 +216,7 @@ public function handle() else { $row['group_name'] = $this->group_helper->get_name($row['group_name']); - $row['u_group'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=group&g=' . $row['group_id']); + $row['u_group'] = append_sid("{$this->phpbb_root_path}memberlist.{$this->php_ext}", 'mode=group&g=' . $row['group_id']); } if ($row['teampage_id']) @@ -164,28 +229,28 @@ public function handle() } $this->db->sql_freeresult($result); - $sql_ary = array( + $sql_ary = [ 'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.username_clean, u.user_colour, u.user_type, u.user_rank, u.user_posts, u.user_allow_pm, g.group_id', - 'FROM' => array( - USER_GROUP_TABLE => 'ug', - ), + 'FROM' => [ + $this->user_group_table => 'ug', + ], - 'LEFT_JOIN' => array( - array( - 'FROM' => array(USERS_TABLE => 'u'), + 'LEFT_JOIN' => [ + [ + 'FROM' => [$this->users_table => 'u'], 'ON' => 'ug.user_id = u.user_id', - ), - array( - 'FROM' => array(GROUPS_TABLE => 'g'), + ], + [ + 'FROM' => [$this->groups_table => 'g'], 'ON' => 'ug.group_id = g.group_id', - ), - ), + ], + ], - 'WHERE' => $this->db->sql_in_set('g.group_id', $group_ids, false, true), + 'WHERE' => $this->db->sql_in_set('g.group_id', $group_ids, false, true) . ' AND ug.user_pending = 0', 'ORDER_BY' => 'u.username_clean ASC', - ); + ]; /** * Modify the query used to get the users for the team page @@ -196,20 +261,16 @@ public function handle() * @var array teampage_data The teampage data * @since 3.1.3-RC1 */ - $vars = array( - 'sql_ary', - 'group_ids', - 'teampage_data', - ); + $vars = ['sql_ary', 'group_ids', 'teampage_data']; extract($this->dispatcher->trigger_event('core.memberlist_team_modify_query', compact($vars))); $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); - $user_ary = $user_ids = $group_users = array(); + $user_ary = $user_ids = $group_users = []; while ($row = $this->db->sql_fetchrow($result)) { $row['forums'] = ''; - $row['forums_ary'] = array(); + $row['forums_ary'] = []; $user_ary[(int) $row['user_id']] = $row; $user_ids[] = (int) $row['user_id']; $group_users[(int) $row['group_id']][] = (int) $row['user_id']; @@ -222,11 +283,11 @@ public function handle() { $this->template->assign_var('S_DISPLAY_MODERATOR_FORUMS', true); // Get all moderators - $perm_ary = $this->auth->acl_get_list($user_ids, array('m_'), false); + $perm_ary = $this->auth->acl_get_list($user_ids, ['m_'], false); foreach ($perm_ary as $forum_id => $forum_ary) { - foreach ($forum_ary as $this->auth_option => $id_ary) + foreach ($forum_ary as $id_ary) { foreach ($id_ary as $id) { @@ -243,10 +304,10 @@ public function handle() } $sql = 'SELECT forum_id, forum_name - FROM ' . FORUMS_TABLE; + FROM ' . $this->forums_table; $result = $this->db->sql_query($sql); - $forums = array(); + $forums = []; while ($row = $this->db->sql_fetchrow($result)) { $forums[$row['forum_id']] = $row['forum_name']; @@ -272,17 +333,15 @@ public function handle() } } - $parent_team = 0; foreach ($teampage_data as $team_data) { // If this team entry has no group, it's a category if (!$team_data['group_id']) { - $this->template->assign_block_vars('group', array( + $this->template->assign_block_vars('group', [ 'GROUP_NAME' => $team_data['teampage_name'], - )); + ]); - $parent_team = (int) $team_data['teampage_id']; continue; } @@ -292,11 +351,11 @@ public function handle() if (!$team_data['teampage_parent']) { // If the group does not have a parent category, we display the groupname as category - $this->template->assign_block_vars('group', array( + $this->template->assign_block_vars('group', [ 'GROUP_NAME' => $group_data['group_name'], 'GROUP_COLOR' => $group_data['group_colour'], 'U_GROUP' => $group_data['u_group'], - )); + ]); } // Display group members. @@ -315,7 +374,7 @@ public function handle() $user_rank_data = phpbb_get_user_rank($row, (($row['user_id'] == ANONYMOUS) ? false : $row['user_posts'])); - $template_vars = array( + $template_vars = [ 'USER_ID' => $row['user_id'], 'FORUMS' => $row['forums'], 'FORUM_OPTIONS' => (isset($row['forums_options'])) ? true : false, @@ -330,13 +389,13 @@ public function handle() 'S_INACTIVE' => $row['user_type'] == USER_INACTIVE, - 'U_PM' => ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_'))) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&mode=compose&u=' . $row['user_id']) : '', + 'U_PM' => ($this->config['allow_privmsg'] && $this->auth->acl_get('u_sendpm') && ($row['user_allow_pm'] || $this->auth->acl_gets('a_', 'm_') || $this->auth->acl_getf_global('m_'))) ? append_sid("{$this->phpbb_root_path}ucp.{$this->php_ext}", 'i=pm&mode=compose&u=' . $row['user_id']) : '', 'USERNAME_FULL' => get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']), 'USERNAME' => get_username_string('username', $row['user_id'], $row['username'], $row['user_colour']), 'USER_COLOR' => get_username_string('colour', $row['user_id'], $row['username'], $row['user_colour']), 'U_VIEW_PROFILE' => get_username_string('profile', $row['user_id'], $row['username'], $row['user_colour']), - ); + ]; /** * Modify the template vars for displaying the user in the groups on the teampage @@ -347,11 +406,7 @@ public function handle() * @var array groups_ary Array of groups with all users that should be displayed * @since 3.1.3-RC1 */ - $vars = array( - 'template_vars', - 'row', - 'groups_ary', - ); + $vars = ['template_vars', 'row', 'groups_ary']; extract($this->dispatcher->trigger_event('core.memberlist_team_modify_template_vars', compact($vars))); $this->template->assign_block_vars('group.user', $template_vars); @@ -365,17 +420,17 @@ public function handle() } } - $this->template->assign_vars(array( - 'PM_IMG' => $this->user->img('icon_contact_pm', $this->language->lang('SEND_PRIVATE_MESSAGE'))) - ); + $this->template->assign_vars([ + 'PM_IMG' => $this->user->img('icon_contact_pm', $this->language->lang('SEND_PRIVATE_MESSAGE')), + ]); - // Breadcrums - $this->template->assign_block_vars('navlinks', array( - 'BREADCRUMB_NAME' => $this->language->lang('THE_TEAM'), - 'U_BREADCRUMB' => $this->helper->route('phpbb_members_team'), - )); + // Breadcrumbs + $this->template->assign_block_vars('navlinks', [ + 'BREADCRUMB_NAME' => $this->language->lang('THE_TEAM'), + 'U_BREADCRUMB' => $this->helper->route('phpbb_members_team'), + ]); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); + make_jumpbox(append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}")); // Render return $this->helper->render('memberlist_team.html', $this->language->lang('THE_TEAM')); diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index 21b16a666bc..0847aadd5c5 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -43,7 +43,7 @@ public function test_viewprofile() protected function get_memberlist_leaders_table_crawler() { - $crawler = self::request('GET', 'team?sid=' . $this->sid); + $crawler = self::request('GET', 'members/team'); return $crawler->filter('.forumbg-table'); } From 20e48f7c3b1a657589aa1b77e49d9d62ac2d942e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Sep 2025 16:48:26 +0200 Subject: [PATCH 0976/1214] [ticket/17553] Only remove jabber notifications settings PHPBB-17553 --- .../db/migration/data/v400/remove_jabber.php | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php index 17bf49d7534..ab27b1bc067 100644 --- a/phpBB/phpbb/db/migration/data/v400/remove_jabber.php +++ b/phpBB/phpbb/db/migration/data/v400/remove_jabber.php @@ -114,26 +114,12 @@ public function revert_data(): array ]; } - public function move_jabber_to_email_notifications(int|null $start) + public function move_jabber_to_email_notifications() { - $limit = 1000; + $sql = 'DELETE FROM ' . $this->tables['user_notifications'] . " + WHERE method = 'notification.method.jabber'"; + $this->db->sql_query($sql); - $sql = 'SELECT id FROM ' . $this->tables['user_notifications'] . " - WHERE method = 'notification.method.jabber' - ORDER BY id ASC"; - $result = $this->db->sql_query_limit($sql, $limit, $start ?: 0); - $rowset = $this->db->sql_fetchrowset($result); - $this->db->sql_freeresult($result); - $ids_array = array_column($rowset, 'id'); - - if (count($ids_array)) - { - $sql = 'UPDATE ' . $this->tables['user_notifications'] . ' - SET ' . $this->db->sql_build_array('UPDATE', ['method' => 'notification.method.email']) . ' - WHERE ' . $this->db->sql_in_set('id', $ids_array); - $this->db->sql_query($sql); - } - - return count($ids_array) < $limit ? true : $start + $limit; + return true; } } From 9ca7a86dfe21daae2883e67c183e73df5b64d5c0 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Sep 2025 17:36:46 +0200 Subject: [PATCH 0977/1214] [ticket/17553] Adjust unit tests for jabber migration PHPBB-17553 --- tests/migrations/remove_jabber_migration_test.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/migrations/remove_jabber_migration_test.php b/tests/migrations/remove_jabber_migration_test.php index e80a5cbbaac..bf1962b6675 100644 --- a/tests/migrations/remove_jabber_migration_test.php +++ b/tests/migrations/remove_jabber_migration_test.php @@ -42,13 +42,13 @@ public function test_remove_jabber_migration() WHERE method = 'notification.method.jabber'"; $this->db->sql_query($sql); $this->assertFalse($this->db->sql_fetchfield('id')); - + $sql = "SELECT id FROM phpbb_user_notifications - WHERE method = 'notification.method.email'"; + WHERE method = 'notification.method.jabber'"; $result = $this->db->sql_query($sql); $rowset = $this->db->sql_fetchrowset($result); $this->db->sql_freeresult($result); - $this->assertEquals(14, count($rowset)); + $this->assertEquals(0, count($rowset)); $sql = "SELECT config_name FROM phpbb_config WHERE config_name = 'jab_enable'"; From 9675d0d3507c57975e5b08620ffb0246d6bc35bf Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 2 Nov 2025 10:26:11 -0800 Subject: [PATCH 0978/1214] [ticket/17563] CodeSniffer throws uninitialized string offset errors PHPBB-17563 --- build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 56a3e747d40..7cf5f64baf5 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -103,7 +103,7 @@ public function process(File $phpcsFile, $stackPtr) $ok = $this->findClassUsage($phpcsFile, $stackPtr, $tokens, $name_full, $name_short); } - if ($name_full[0] === '\\') + if (!empty($name_full) && $name_full[0] === '\\') { $phpcsFile->addError("There must not be a leading '\\' in use statements.", $stackPtr, 'Malformed'); } From 1f7cf6dcee8f2c5fb893e6ece7d3e24489ad3aa3 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 29 Sep 2025 15:11:14 -0700 Subject: [PATCH 0979/1214] [ticket/17561] Use ext-catalog for compatible extension catalog items PHPBB-17561 --- phpBB/phpbb/composer/installer.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index f5633629945..757a23616b5 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -525,6 +525,12 @@ private function get_compatible_versions(array $compatible_packages, ConstraintI } } + // Check for ext-catalog in 'extra' section - must be present and set to true + if (!isset($extra['ext-catalog']) || $extra['ext-catalog'] !== true) + { + continue; + } + $compatible_packages[$package_name][] = $version; } catch (\Exception $e) From 9fb58ea0b20f0cc10e541cb09c6784eadbf34674 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 30 Sep 2025 11:19:37 -0700 Subject: [PATCH 0980/1214] [ticket/17561] Require installers 2 to be listed in catalog PHPBB-17561 --- phpBB/phpbb/composer/installer.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/composer/installer.php b/phpBB/phpbb/composer/installer.php index 757a23616b5..7e8943bee49 100644 --- a/phpBB/phpbb/composer/installer.php +++ b/phpBB/phpbb/composer/installer.php @@ -525,8 +525,17 @@ private function get_compatible_versions(array $compatible_packages, ConstraintI } } - // Check for ext-catalog in 'extra' section - must be present and set to true - if (!isset($extra['ext-catalog']) || $extra['ext-catalog'] !== true) + // Check for composer/installers requirement - must support version 2.0 or later + if (isset($requires['composer/installers'])) + { + $installers_constraint = $requires['composer/installers']->getConstraint(); + $min_version_constraint = $version_parser->parseConstraints('>=2.0'); + if (!$min_version_constraint->matches($installers_constraint)) + { + continue; + } + } + else { continue; } From 7350ead28cbb09d8d58ab551e066d13d4fe96f68 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 4 Nov 2025 11:32:09 +0700 Subject: [PATCH 0981/1214] [ticket/17581] Fix PHP warning on bots viewing posts with avatars PHPBB-17581 --- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index febc2d35d46..447e32524d6 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -144,7 +144,7 @@

        {POLL_
        - {postrow.POSTER_AVATAR_HTML}{postrow.POSTER_AVATAR} + {postrow.POSTER_AVATAR_HTML}{postrow.POSTER_AVATAR_HTML}
        From 1799af8859f3b3b13ea4faeb0f7fba6e40841c40 Mon Sep 17 00:00:00 2001 From: Christian Schnegelberger Date: Wed, 5 Nov 2025 22:04:41 +0100 Subject: [PATCH 0982/1214] [ticket/17582] Add lang('') to variables in acp_ext_list.html PHPBB-17582 --- phpBB/adm/style/acp_ext_list.html | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index 3264d5e8b33..e1774577247 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -99,9 +99,9 @@

        {L_EXTENSIONS_ADMIN}

          -
        1. {{ EXTENSION_INSTALLING_EXPLAIN_STEP1 }}
          2. -
        2. {{ EXTENSION_INSTALLING_EXPLAIN_STEP2 }}
          3. -
        3. {{ EXTENSION_INSTALLING_EXPLAIN_STEP3 }}
          4. +
        4. {{ lang('EXTENSION_INSTALLING_EXPLAIN_STEP1') }}
          5. +
        5. {{ lang('EXTENSION_INSTALLING_EXPLAIN_STEP2') }}
          6. +
        6. {{ lang('EXTENSION_INSTALLING_EXPLAIN_STEP3') }}
        @@ -111,10 +111,10 @@

        {L_EXTENSIONS_ADMIN}

          -
        1. {{ EXTENSION_UPDATING_EXPLAIN_STEP1 }}
          2. -
        2. {{ EXTENSION_UPDATING_EXPLAIN_STEP2 }}
          3. -
        3. {{ EXTENSION_UPDATING_EXPLAIN_STEP3 }}
          4. -
        4. {{ EXTENSION_UPDATING_EXPLAIN_STEP4 }}
          5. +
        5. {{ lang('EXTENSION_UPDATING_EXPLAIN_STEP1') }}
          6. +
        6. {{ lang('EXTENSION_UPDATING_EXPLAIN_STEP2') }}
          7. +
        7. {{ lang('EXTENSION_UPDATING_EXPLAIN_STEP3') }}
          8. +
        8. {{ lang('EXTENSION_UPDATING_EXPLAIN_STEP4') }}
        @@ -124,9 +124,9 @@

        {L_EXTENSIONS_ADMIN}

          -
        1. {{ EXTENSION_REMOVING_EXPLAIN_STEP1 }}
          2. -
        2. {{ EXTENSION_REMOVING_EXPLAIN_STEP2 }}
          3. -
        3. {{ EXTENSION_REMOVING_EXPLAIN_STEP3 }}
          4. +
        4. {{ lang('EXTENSION_REMOVING_EXPLAIN_STEP1') }}
          5. +
        5. {{ lang('EXTENSION_REMOVING_EXPLAIN_STEP2') }}
          6. +
        6. {{ lang('EXTENSION_REMOVING_EXPLAIN_STEP3') }}
        From 07deaa04f88e8118e4b5500048b6b4a83690b0b0 Mon Sep 17 00:00:00 2001 From: cabot Date: Thu, 2 Oct 2025 16:20:40 +0200 Subject: [PATCH 0983/1214] [ticket/17562] Fix prosilver base font-size PHPBB-17562 --- phpBB/styles/prosilver/theme/common.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 26c3b390554..e48d7ee5b79 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -5,8 +5,6 @@ /* stylelint-disable selector-no-qualifying-type */ html { - font-size: 100%; - /* Always show a scrollbar for short pages - stops the jump when the scrollbar appears. non-IE browsers */ height: 101%; } From b50082a1653071c8196819e279407233e46815a6 Mon Sep 17 00:00:00 2001 From: Neo-CTC <92761505+Neo-CTC@users.noreply.github.com> Date: Mon, 3 Nov 2025 16:23:00 -0600 Subject: [PATCH 0984/1214] [ticket/17580] Downloading a byte range of 8192 cause fatal errors When a client asks to download part file using a Range header with a range of 8192 bytes, the send_file_to_browser() throws a fatal error as it tries to read zero bytes on line 279. Requesting a Range with a multiple of 8192 also throws a fatal error. PHPBB-17580 --- phpBB/includes/functions_download.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 78b56fc755a..90058929860 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -268,12 +268,16 @@ function send_file_to_browser($attachment, $upload_dir, $category) header('Content-Length: ' . $range['bytes_requested']); // First read chunks - while (!feof($fp) && ftell($fp) < $range['byte_pos_end'] - 8192) + while (!feof($fp) && ftell($fp) <= $range['byte_pos_end'] - 8191) { echo fread($fp, 8192); } // Then, read the remainder - echo fread($fp, $range['bytes_requested'] % 8192); + $remainder = $range['bytes_requested'] % 8192; + if ($remainder > 0) + { + echo fread($fp, $remainder); + } } else { From a6356b682a79601e977efd90f122468f966abe51 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 16 Nov 2025 08:41:20 +0100 Subject: [PATCH 0985/1214] [ticket/17580] Change while to be more readable again PHPBB-17580 --- phpBB/includes/functions_download.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 90058929860..eb607f020bc 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -268,7 +268,7 @@ function send_file_to_browser($attachment, $upload_dir, $category) header('Content-Length: ' . $range['bytes_requested']); // First read chunks - while (!feof($fp) && ftell($fp) <= $range['byte_pos_end'] - 8191) + while (!feof($fp) && ftell($fp) < $range['byte_pos_end'] - 8192) { echo fread($fp, 8192); } From 87ddd91e440956d37604b2eb8ca50df759455ec4 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 23 Nov 2025 07:49:59 -0800 Subject: [PATCH 0986/1214] [ticket/17584] Exclude tests from some PSR1 code sniffs PHPBB-17584 --- build/code_sniffer/ruleset-php-strict.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build/code_sniffer/ruleset-php-strict.xml b/build/code_sniffer/ruleset-php-strict.xml index 9e2f0664d8f..12ac8014fb4 100644 --- a/build/code_sniffer/ruleset-php-strict.xml +++ b/build/code_sniffer/ruleset-php-strict.xml @@ -32,7 +32,9 @@ - + + */tests/* + #', '', $code); + return preg_replace('##', '', $code) ?: ''; } /** @@ -162,7 +162,7 @@ protected function fix_inline_variable_tokens($tokens, $code) return ""; }; - return preg_replace_callback('##', $callback, $code); + return preg_replace_callback('##', $callback, $code) ?: ''; } /** @@ -177,7 +177,7 @@ protected function fix_inline_variable_tokens($tokens, $code) */ protected function add_surrounding_quotes($tokens, $code) { - return preg_replace('##', '', $code); + return preg_replace('##', '', $code) ?: ''; } /** @@ -253,7 +253,7 @@ public function fix_begin_tokens($code, $parent_nodes = array()) return "{% for {$name} in {$parent}{$name}{$subset} %}{$body}{% endfor %}"; }; - return preg_replace_callback('#(.+?)#s', $callback, $code); + return preg_replace_callback('#(.+?)#s', $callback, $code) ?: ''; } /** @@ -285,7 +285,7 @@ protected function fix_if_tokens($code) return ""; }; - return preg_replace_callback('##', $callback, $code); + return preg_replace_callback('##', $callback, $code) ?: ''; } /** @@ -320,7 +320,7 @@ protected function fix_define_tokens($code) // Replace all of our variables, ~ $VARNAME ~, with Twig style, ~ definition.VARNAME ~ $code = preg_replace('#~ \$([a-zA-Z0-9_\.]+) ~#', '~ definition.$1 ~', $code); - return $code; + return $code ?: ''; } /** @@ -330,7 +330,7 @@ protected function fix_define_tokens($code) * * @param string $code * @param array $twig_tags All tags we want to create a mask for - * @return string + * @return null|string */ protected function replace_twig_tag_masks($code, $twig_tags) { diff --git a/phpBB/phpbb/textformatter/s9e/factory.php b/phpBB/phpbb/textformatter/s9e/factory.php index 78f8cbe6c66..ecb36fb7e98 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -647,7 +647,7 @@ protected function merge_templates(array $style_templates) // Return the template as-is if there's only one style or all styles share the same template if (count(array_unique($style_templates)) === 1) { - return end($style_templates); + return end($style_templates) ?: ''; } // Group identical templates together diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 01111f9ca41..61dd0ce1cf4 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -166,7 +166,7 @@ private function get_user_notifications(): string throw new http_exception(Response::HTTP_BAD_REQUEST, 'AJAX_ERROR_TEXT'); } - return $this->get_notification_data($notification_data); + return $this->get_notification_data($notification_data) ?: ''; } /** @@ -219,7 +219,7 @@ private function get_anonymous_notifications(): string { $this->language->set_user_language($user_lang, true); } - return $this->get_notification_data($notification_data); + return $this->get_notification_data($notification_data) ?: ''; } } @@ -231,9 +231,9 @@ private function get_anonymous_notifications(): string * * @param string $notification_data Encoded data stored in database * - * @return string Data for notification output with javascript + * @return false|string Data for notification output with javascript */ - private function get_notification_data(string $notification_data): string + private function get_notification_data(string $notification_data): false|string { $row_data = json_decode($notification_data, true); diff --git a/psalm.xml b/psalm.xml index a85fe20a03c..2bb877d330b 100644 --- a/psalm.xml +++ b/psalm.xml @@ -4,6 +4,7 @@ phpVersion="8.2" findUnusedBaselineEntry="true" findUnusedCode="false" + ensureOverrideAttribute="false" autoloader="build/psalm_bootstrap.php" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://getpsalm.org/schema/config" @@ -11,15 +12,15 @@ > + + + - - - - - + + From 129c2436ee30164896a2da6a6d329e5938ec53ee Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 29 Nov 2025 08:19:25 +0100 Subject: [PATCH 0996/1214] [ticket/17556] Update to Symfony 7.4 stable version PHPBB-17556 --- phpBB/composer.json | 38 +- phpBB/composer.lock | 1052 ++++++++++++++++++++++--------------------- 2 files changed, 550 insertions(+), 540 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 8df501ecd6d..9777e023f07 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -42,23 +42,23 @@ "marc1706/fast-image-size": "^1.1", "minishlink/web-push": "^8.0", "s9e/text-formatter": "^2.0", - "symfony/config": "^7.4@dev", - "symfony/console": "^7.4@dev", - "symfony/dependency-injection": "^7.4@dev", - "symfony/error-handler": "^7.4@dev", - "symfony/event-dispatcher": "^7.4@dev", - "symfony/filesystem": "^7.4@dev", - "symfony/finder": "^7.4@dev", - "symfony/http-foundation": "^7.4@dev", - "symfony/http-kernel": "^7.4@dev", + "symfony/config": "^7.4", + "symfony/console": "^7.4", + "symfony/dependency-injection": "^7.4", + "symfony/error-handler": "^7.4", + "symfony/event-dispatcher": "^7.4", + "symfony/filesystem": "^7.4", + "symfony/finder": "^7.4", + "symfony/http-foundation": "^7.4", + "symfony/http-kernel": "^7.4", "symfony/polyfill-mbstring": "^1.23", - "symfony/mailer": "^7.4@dev", - "symfony/mime": "^7.4@dev", - "symfony/process": "^7.4@dev", + "symfony/mailer": "^7.4", + "symfony/mime": "^7.4", + "symfony/process": "^7.4", "symfony/proxy-manager-bridge": "^6.4", - "symfony/routing": "^7.4@dev", - "symfony/twig-bridge": "^7.4@dev", - "symfony/yaml": "^7.4@dev", + "symfony/routing": "^7.4", + "symfony/twig-bridge": "^7.4", + "symfony/yaml": "^7.4", "twig/twig": "^3.14" }, "require-dev": { @@ -67,10 +67,10 @@ "phing/phing": "~2.4", "phpunit/phpunit": "^10.0", "squizlabs/php_codesniffer": "~3.4", - "symfony/browser-kit": "^7.3", - "symfony/css-selector": "^7.3", - "symfony/dom-crawler": "^7.3", - "symfony/http-client": "^7.3", + "symfony/browser-kit": "^7.4", + "symfony/css-selector": "^7.4", + "symfony/dom-crawler": "^7.4", + "symfony/http-client": "^7.4", "vimeo/psalm": "^6.13.1", "psalm/plugin-symfony": "^v5.1.0" }, diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 9e6eb159409..9df14737d75 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ced4dd12f99cdcc9f7bc1cf55bef24da", + "content-hash": "7f502aca03f40b41dc54e901dcb5ab41", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -173,16 +173,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.8", + "version": "1.5.9", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "719026bb30813accb68271fee7e39552a58e9f65" + "reference": "1905981ee626e6f852448b7aaa978f8666c5bc54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/719026bb30813accb68271fee7e39552a58e9f65", - "reference": "719026bb30813accb68271fee7e39552a58e9f65", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/1905981ee626e6f852448b7aaa978f8666c5bc54", + "reference": "1905981ee626e6f852448b7aaa978f8666c5bc54", "shasum": "" }, "require": { @@ -229,7 +229,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.8" + "source": "https://github.com/composer/ca-bundle/tree/1.5.9" }, "funding": [ { @@ -241,26 +241,26 @@ "type": "github" } ], - "time": "2025-08-20T18:49:47+00:00" + "time": "2025-11-06T11:46:17+00:00" }, { "name": "composer/class-map-generator", - "version": "1.6.2", + "version": "1.7.0", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076" + "reference": "2373419b7709815ed323ebf18c3c72d03ff4a8a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/ba9f089655d4cdd64e762a6044f411ccdaec0076", - "reference": "ba9f089655d4cdd64e762a6044f411ccdaec0076", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/2373419b7709815ed323ebf18c3c72d03ff4a8a6", + "reference": "2373419b7709815ed323ebf18c3c72d03ff4a8a6", "shasum": "" }, "require": { "composer/pcre": "^2.1 || ^3.1", "php": "^7.2 || ^8.0", - "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7" + "symfony/finder": "^4.4 || ^5.3 || ^6 || ^7 || ^8" }, "require-dev": { "phpstan/phpstan": "^1.12 || ^2", @@ -268,7 +268,7 @@ "phpstan/phpstan-phpunit": "^1 || ^2", "phpstan/phpstan-strict-rules": "^1.1 || ^2", "phpunit/phpunit": "^8", - "symfony/filesystem": "^5.4 || ^6" + "symfony/filesystem": "^5.4 || ^6 || ^7 || ^8" }, "type": "library", "extra": { @@ -298,7 +298,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.6.2" + "source": "https://github.com/composer/class-map-generator/tree/1.7.0" }, "funding": [ { @@ -310,30 +310,31 @@ "type": "github" } ], - "time": "2025-08-20T18:52:43+00:00" + "time": "2025-11-19T10:41:15+00:00" }, { "name": "composer/composer", - "version": "2.8.12", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "3e38919bc9a2c3c026f2151b5e56d04084ce8f0b" + "reference": "8d5358f147c63a3a681b002076deff8c90e0b19d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/3e38919bc9a2c3c026f2151b5e56d04084ce8f0b", - "reference": "3e38919bc9a2c3c026f2151b5e56d04084ce8f0b", + "url": "https://api.github.com/repos/composer/composer/zipball/8d5358f147c63a3a681b002076deff8c90e0b19d", + "reference": "8d5358f147c63a3a681b002076deff8c90e0b19d", "shasum": "" }, "require": { "composer/ca-bundle": "^1.5", "composer/class-map-generator": "^1.4.0", "composer/metadata-minifier": "^1.0", - "composer/pcre": "^2.2 || ^3.2", + "composer/pcre": "^2.3 || ^3.3", "composer/semver": "^3.3", "composer/spdx-licenses": "^1.5.7", "composer/xdebug-handler": "^2.0.2 || ^3.0.3", + "ext-json": "*", "justinrainbow/json-schema": "^6.5.1", "php": "^7.2.5 || ^8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", @@ -341,13 +342,14 @@ "seld/jsonlint": "^1.4", "seld/phar-utils": "^1.2", "seld/signal-handler": "^2.0", - "symfony/console": "^5.4.47 || ^6.4.25 || ^7.1.10", - "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.1.10", - "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.1.10", + "symfony/console": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0", + "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0", + "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.1.10 || ^8.0", "symfony/polyfill-php73": "^1.24", "symfony/polyfill-php80": "^1.24", "symfony/polyfill-php81": "^1.24", - "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10" + "symfony/polyfill-php84": "^1.30", + "symfony/process": "^5.4.47 || ^6.4.25 || ^7.1.10 || ^8.0" }, "require-dev": { "phpstan/phpstan": "^1.11.8", @@ -355,12 +357,13 @@ "phpstan/phpstan-phpunit": "^1.4.0", "phpstan/phpstan-strict-rules": "^1.6.0", "phpstan/phpstan-symfony": "^1.4.0", - "symfony/phpunit-bridge": "^6.4.25 || ^7.3.3" + "symfony/phpunit-bridge": "^6.4.25 || ^7.3.3 || ^8.0" }, "suggest": { - "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", - "ext-zip": "Enabling the zip extension allows you to unzip archives", - "ext-zlib": "Allow gzip compression of HTTP requests" + "ext-curl": "Provides HTTP support (will fallback to PHP streams if missing)", + "ext-openssl": "Enables access to repositories and packages over HTTPS", + "ext-zip": "Allows direct extraction of ZIP archives (unzip/7z binaries will be used instead if available)", + "ext-zlib": "Enables gzip for HTTP requests" }, "bin": [ "bin/composer" @@ -373,7 +376,7 @@ ] }, "branch-alias": { - "dev-main": "2.8-dev" + "dev-main": "2.9-dev" } }, "autoload": { @@ -408,7 +411,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.8.12" + "source": "https://github.com/composer/composer/tree/2.9.2" }, "funding": [ { @@ -420,7 +423,7 @@ "type": "github" } ], - "time": "2025-09-19T11:41:59+00:00" + "time": "2025-11-19T20:57:25+00:00" }, { "name": "composer/installers", @@ -1014,16 +1017,16 @@ }, { "name": "doctrine/dbal", - "version": "3.10.2", + "version": "3.10.3", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "c6c16cf787eaba3112203dfcd715fa2059c62282" + "reference": "65edaca19a752730f290ec2fb89d593cb40afb43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/c6c16cf787eaba3112203dfcd715fa2059c62282", - "reference": "c6c16cf787eaba3112203dfcd715fa2059c62282", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/65edaca19a752730f290ec2fb89d593cb40afb43", + "reference": "65edaca19a752730f290ec2fb89d593cb40afb43", "shasum": "" }, "require": { @@ -1039,14 +1042,14 @@ }, "require-dev": { "doctrine/cache": "^1.11|^2.0", - "doctrine/coding-standard": "13.0.1", + "doctrine/coding-standard": "14.0.0", "fig/log-test": "^1", "jetbrains/phpstorm-stubs": "2023.1", - "phpstan/phpstan": "2.1.22", + "phpstan/phpstan": "2.1.30", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "9.6.23", - "slevomat/coding-standard": "8.16.2", - "squizlabs/php_codesniffer": "3.13.1", + "phpunit/phpunit": "9.6.29", + "slevomat/coding-standard": "8.24.0", + "squizlabs/php_codesniffer": "4.0.0", "symfony/cache": "^5.4|^6.0|^7.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0" }, @@ -1108,7 +1111,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.10.2" + "source": "https://github.com/doctrine/dbal/tree/3.10.3" }, "funding": [ { @@ -1124,7 +1127,7 @@ "type": "tidelift" } ], - "time": "2025-09-04T23:51:27+00:00" + "time": "2025-10-09T09:05:12+00:00" }, { "name": "doctrine/deprecations", @@ -1411,22 +1414,22 @@ }, { "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.18", + "version": "v1.0.19", "source": { "type": "git", "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "2c8a6cffc3220e99352ad958fe7cf06bf6f7690f" + "reference": "c20299aa9f48a622052964a75c5a4cef017398b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/2c8a6cffc3220e99352ad958fe7cf06bf6f7690f", - "reference": "2c8a6cffc3220e99352ad958fe7cf06bf6f7690f", + "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/c20299aa9f48a622052964a75c5a4cef017398b2", + "reference": "c20299aa9f48a622052964a75c5a4cef017398b2", "shasum": "" }, "require": { "laminas/laminas-code": "~3.4.1|^4.0", "php": ">=7.1", - "symfony/filesystem": "^4.4.17|^5.0|^6.0|^7.0" + "symfony/filesystem": "^4.4.17|^5.0|^6.0|^7.0|^8.0" }, "conflict": { "laminas/laminas-stdlib": "<3.2.1", @@ -1477,7 +1480,7 @@ ], "support": { "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.18" + "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.19" }, "funding": [ { @@ -1489,7 +1492,7 @@ "type": "tidelift" } ], - "time": "2024-03-20T12:50:41+00:00" + "time": "2025-10-28T10:28:17+00:00" }, { "name": "google/recaptcha", @@ -1870,16 +1873,16 @@ }, { "name": "justinrainbow/json-schema", - "version": "6.5.2", + "version": "6.6.2", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "ac0d369c09653cf7af561f6d91a705bc617a87b8" + "reference": "3c25fe750c1599716ef26aa997f7c026cee8c4b7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/ac0d369c09653cf7af561f6d91a705bc617a87b8", - "reference": "ac0d369c09653cf7af561f6d91a705bc617a87b8", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/3c25fe750c1599716ef26aa997f7c026cee8c4b7", + "reference": "3c25fe750c1599716ef26aa997f7c026cee8c4b7", "shasum": "" }, "require": { @@ -1939,33 +1942,33 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.5.2" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.2" }, - "time": "2025-09-09T09:42:27+00:00" + "time": "2025-11-28T15:24:03+00:00" }, { "name": "laminas/laminas-code", - "version": "4.16.0", + "version": "4.17.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-code.git", - "reference": "1793e78dad4108b594084d05d1fb818b85b110af" + "reference": "40d61e2899ec17c5d08bbc0a2d586b3ca17ab9bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/1793e78dad4108b594084d05d1fb818b85b110af", - "reference": "1793e78dad4108b594084d05d1fb818b85b110af", + "url": "https://api.github.com/repos/laminas/laminas-code/zipball/40d61e2899ec17c5d08bbc0a2d586b3ca17ab9bd", + "reference": "40d61e2899ec17c5d08bbc0a2d586b3ca17ab9bd", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0" + "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0" }, "require-dev": { "doctrine/annotations": "^2.0.1", "ext-phar": "*", "laminas/laminas-coding-standard": "^3.0.0", "laminas/laminas-stdlib": "^3.18.0", - "phpunit/phpunit": "^10.5.37", + "phpunit/phpunit": "^10.5.58", "psalm/plugin-phpunit": "^0.19.0", "vimeo/psalm": "^5.15.0" }, @@ -2004,7 +2007,7 @@ "type": "community_bridge" } ], - "time": "2024-11-20T13:15:13+00:00" + "time": "2025-11-01T09:38:14+00:00" }, { "name": "marc-mabe/php-enum", @@ -2277,16 +2280,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v2.2.0", + "version": "v2.4.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "9c3535883f1b60b5d26aeae5914bbec61132ad7f" + "reference": "547e2dc4d45107440e76c17ab5a46e4252460158" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/9c3535883f1b60b5d26aeae5914bbec61132ad7f", - "reference": "9c3535883f1b60b5d26aeae5914bbec61132ad7f", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/547e2dc4d45107440e76c17ab5a46e4252460158", + "reference": "547e2dc4d45107440e76c17ab5a46e4252460158", "shasum": "" }, "require": { @@ -2367,9 +2370,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/v2.2.0" + "source": "https://github.com/paragonie/sodium_compat/tree/v2.4.0" }, - "time": "2025-09-21T18:27:14+00:00" + "time": "2025-10-06T08:47:40+00:00" }, { "name": "psr/cache", @@ -2988,16 +2991,16 @@ }, { "name": "s9e/text-formatter", - "version": "2.19.0", + "version": "2.19.3", "source": { "type": "git", "url": "https://github.com/s9e/TextFormatter.git", - "reference": "d65a4f61cbe494937afb3150dc73b6e757d400d3" + "reference": "aee579c12d05ca3053f9b9abdb8c479c0f2fbe69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/d65a4f61cbe494937afb3150dc73b6e757d400d3", - "reference": "d65a4f61cbe494937afb3150dc73b6e757d400d3", + "url": "https://api.github.com/repos/s9e/TextFormatter/zipball/aee579c12d05ca3053f9b9abdb8c479c0f2fbe69", + "reference": "aee579c12d05ca3053f9b9abdb8c479c0f2fbe69", "shasum": "" }, "require": { @@ -3025,7 +3028,7 @@ }, "type": "library", "extra": { - "version": "2.19.0" + "version": "2.19.3" }, "autoload": { "psr-4": { @@ -3057,9 +3060,9 @@ ], "support": { "issues": "https://github.com/s9e/TextFormatter/issues", - "source": "https://github.com/s9e/TextFormatter/tree/2.19.0" + "source": "https://github.com/s9e/TextFormatter/tree/2.19.3" }, - "time": "2025-04-26T09:27:34+00:00" + "time": "2025-11-14T21:26:59+00:00" }, { "name": "seld/jsonlint", @@ -3301,20 +3304,20 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.3.0", + "version": "1.4.0", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "eced5b5ce70518b983ff2be486e902bbd15135ae" + "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/eced5b5ce70518b983ff2be486e902bbd15135ae", - "reference": "eced5b5ce70518b983ff2be486e902bbd15135ae", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/bf6f55a9d9eb25b7781640221cb54f5c727850d7", + "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7", "shasum": "" }, "require": { - "brick/math": "^0.10|^0.11|^0.12|^0.13", + "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14", "ext-mbstring": "*", "php": ">=8.1" }, @@ -3322,7 +3325,7 @@ "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0", "ext-gmp": "*", "ext-openssl": "*", - "infection/infection": "^0.28|^0.29", + "infection/infection": "^0.28|^0.29|^0.31", "php-parallel-lint/php-parallel-lint": "^1.3", "phpstan/extension-installer": "^1.3|^2.0", "phpstan/phpstan": "^1.8|^2.0", @@ -3332,8 +3335,8 @@ "phpunit/phpunit": "^10.1|^11.0|^12.0", "rector/rector": "^1.0|^2.0", "roave/security-advisories": "dev-latest", - "symfony/string": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0", + "symfony/string": "^6.4|^7.0|^8.0", + "symfony/var-dumper": "^6.4|^7.0|^8.0", "symplify/easy-coding-standard": "^12.0" }, "suggest": { @@ -3394,7 +3397,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.3.0" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.0" }, "funding": [ { @@ -3406,20 +3409,20 @@ "type": "patreon" } ], - "time": "2025-06-13T08:35:04+00:00" + "time": "2025-10-22T08:24:34+00:00" }, { "name": "symfony/config", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "3a4138903f5283f422626439dd317157b9363fbb" + "reference": "f76c74e93bce2b9285f2dad7fbd06fa8182a7a41" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/3a4138903f5283f422626439dd317157b9363fbb", - "reference": "3a4138903f5283f422626439dd317157b9363fbb", + "url": "https://api.github.com/repos/symfony/config/zipball/f76c74e93bce2b9285f2dad7fbd06fa8182a7a41", + "reference": "f76c74e93bce2b9285f2dad7fbd06fa8182a7a41", "shasum": "" }, "require": { @@ -3465,7 +3468,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/7.4" + "source": "https://github.com/symfony/config/tree/v7.4.0" }, "funding": [ { @@ -3485,20 +3488,20 @@ "type": "tidelift" } ], - "time": "2025-09-23T06:13:50+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/console", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a687b340755a81fe8a7114d45e3665feaa06b8cc" + "reference": "0bc0f45254b99c58d45a8fbf9fb955d46cbd1bb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a687b340755a81fe8a7114d45e3665feaa06b8cc", - "reference": "a687b340755a81fe8a7114d45e3665feaa06b8cc", + "url": "https://api.github.com/repos/symfony/console/zipball/0bc0f45254b99c58d45a8fbf9fb955d46cbd1bb8", + "reference": "0bc0f45254b99c58d45a8fbf9fb955d46cbd1bb8", "shasum": "" }, "require": { @@ -3563,7 +3566,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/7.4" + "source": "https://github.com/symfony/console/tree/v7.4.0" }, "funding": [ { @@ -3583,20 +3586,20 @@ "type": "tidelift" } ], - "time": "2025-09-27T09:05:58+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/dependency-injection", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "0587fdea12f41402bdf39af26a9fb31b235567e0" + "reference": "3972ca7bbd649467b21a54870721b9e9f3652f9b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0587fdea12f41402bdf39af26a9fb31b235567e0", - "reference": "0587fdea12f41402bdf39af26a9fb31b235567e0", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3972ca7bbd649467b21a54870721b9e9f3652f9b", + "reference": "3972ca7bbd649467b21a54870721b9e9f3652f9b", "shasum": "" }, "require": { @@ -3647,7 +3650,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/7.4" + "source": "https://github.com/symfony/dependency-injection/tree/v7.4.0" }, "funding": [ { @@ -3667,7 +3670,7 @@ "type": "tidelift" } ], - "time": "2025-09-21T07:58:28+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3738,16 +3741,16 @@ }, { "name": "symfony/error-handler", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "b40ab8ba2e572c512f2c415c795c76383e09001c" + "reference": "48be2b0653594eea32dcef130cca1c811dcf25c2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/b40ab8ba2e572c512f2c415c795c76383e09001c", - "reference": "b40ab8ba2e572c512f2c415c795c76383e09001c", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/48be2b0653594eea32dcef130cca1c811dcf25c2", + "reference": "48be2b0653594eea32dcef130cca1c811dcf25c2", "shasum": "" }, "require": { @@ -3796,7 +3799,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/7.4" + "source": "https://github.com/symfony/error-handler/tree/v7.4.0" }, "funding": [ { @@ -3816,20 +3819,20 @@ "type": "tidelift" } ], - "time": "2025-09-11T10:15:23+00:00" + "time": "2025-11-05T14:29:59+00:00" }, { "name": "symfony/event-dispatcher", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "c511634ea987e9f96eafe4270a3c5e7cf6f2f747" + "reference": "9dddcddff1ef974ad87b3708e4b442dc38b2261d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c511634ea987e9f96eafe4270a3c5e7cf6f2f747", - "reference": "c511634ea987e9f96eafe4270a3c5e7cf6f2f747", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9dddcddff1ef974ad87b3708e4b442dc38b2261d", + "reference": "9dddcddff1ef974ad87b3708e4b442dc38b2261d", "shasum": "" }, "require": { @@ -3850,6 +3853,7 @@ "symfony/dependency-injection": "^6.4|^7.0|^8.0", "symfony/error-handler": "^6.4|^7.0|^8.0", "symfony/expression-language": "^6.4|^7.0|^8.0", + "symfony/framework-bundle": "^6.4|^7.0|^8.0", "symfony/http-foundation": "^6.4|^7.0|^8.0", "symfony/service-contracts": "^2.5|^3", "symfony/stopwatch": "^6.4|^7.0|^8.0" @@ -3880,7 +3884,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/7.4" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.0" }, "funding": [ { @@ -3900,7 +3904,7 @@ "type": "tidelift" } ], - "time": "2025-08-13T13:43:36+00:00" + "time": "2025-10-28T09:38:46+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3980,16 +3984,16 @@ }, { "name": "symfony/filesystem", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "633c6fdfb2eac90041c2de30ad1ccff95a671f66" + "reference": "d551b38811096d0be9c4691d406991b47c0c630a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/633c6fdfb2eac90041c2de30ad1ccff95a671f66", - "reference": "633c6fdfb2eac90041c2de30ad1ccff95a671f66", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/d551b38811096d0be9c4691d406991b47c0c630a", + "reference": "d551b38811096d0be9c4691d406991b47c0c630a", "shasum": "" }, "require": { @@ -4026,7 +4030,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/7.4" + "source": "https://github.com/symfony/filesystem/tree/v7.4.0" }, "funding": [ { @@ -4046,20 +4050,20 @@ "type": "tidelift" } ], - "time": "2025-08-12T20:20:59+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/finder", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "c1a41e8ecb0f76b9e6d93deaeb5b85718975b12a" + "reference": "340b9ed7320570f319028a2cbec46d40535e94bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/c1a41e8ecb0f76b9e6d93deaeb5b85718975b12a", - "reference": "c1a41e8ecb0f76b9e6d93deaeb5b85718975b12a", + "url": "https://api.github.com/repos/symfony/finder/zipball/340b9ed7320570f319028a2cbec46d40535e94bd", + "reference": "340b9ed7320570f319028a2cbec46d40535e94bd", "shasum": "" }, "require": { @@ -4094,7 +4098,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/7.4" + "source": "https://github.com/symfony/finder/tree/v7.4.0" }, "funding": [ { @@ -4114,20 +4118,20 @@ "type": "tidelift" } ], - "time": "2025-09-08T21:17:01+00:00" + "time": "2025-11-05T05:42:40+00:00" }, { "name": "symfony/http-client", - "version": "v7.3.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "4b62871a01c49457cf2a8e560af7ee8a94b87a62" + "reference": "ee5e0e0139ab506f6063a230e631bed677c650a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/4b62871a01c49457cf2a8e560af7ee8a94b87a62", - "reference": "4b62871a01c49457cf2a8e560af7ee8a94b87a62", + "url": "https://api.github.com/repos/symfony/http-client/zipball/ee5e0e0139ab506f6063a230e631bed677c650a4", + "reference": "ee5e0e0139ab506f6063a230e631bed677c650a4", "shasum": "" }, "require": { @@ -4158,12 +4162,13 @@ "php-http/httplug": "^1.0|^2.0", "psr/http-client": "^1.0", "symfony/amphp-http-client-meta": "^1.0|^2.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/rate-limiter": "^6.4|^7.0", - "symfony/stopwatch": "^6.4|^7.0" + "symfony/cache": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/messenger": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0", + "symfony/rate-limiter": "^6.4|^7.0|^8.0", + "symfony/stopwatch": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -4194,7 +4199,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.3.4" + "source": "https://github.com/symfony/http-client/tree/v7.4.0" }, "funding": [ { @@ -4214,7 +4219,7 @@ "type": "tidelift" } ], - "time": "2025-09-11T10:12:26+00:00" + "time": "2025-11-20T12:32:50+00:00" }, { "name": "symfony/http-client-contracts", @@ -4296,16 +4301,16 @@ }, { "name": "symfony/http-foundation", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "6907afdb22878d2975009e256e8424fa22d2ce4d" + "reference": "769c1720b68e964b13b58529c17d4a385c62167b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/6907afdb22878d2975009e256e8424fa22d2ce4d", - "reference": "6907afdb22878d2975009e256e8424fa22d2ce4d", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/769c1720b68e964b13b58529c17d4a385c62167b", + "reference": "769c1720b68e964b13b58529c17d4a385c62167b", "shasum": "" }, "require": { @@ -4354,7 +4359,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/7.4" + "source": "https://github.com/symfony/http-foundation/tree/v7.4.0" }, "funding": [ { @@ -4374,20 +4379,20 @@ "type": "tidelift" } ], - "time": "2025-09-18T15:19:23+00:00" + "time": "2025-11-13T08:49:24+00:00" }, { "name": "symfony/http-kernel", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "10e0595aa528575f6597da1e2929870cd08ef491" + "reference": "7348193cd384495a755554382e4526f27c456085" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/10e0595aa528575f6597da1e2929870cd08ef491", - "reference": "10e0595aa528575f6597da1e2929870cd08ef491", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7348193cd384495a755554382e4526f27c456085", + "reference": "7348193cd384495a755554382e4526f27c456085", "shasum": "" }, "require": { @@ -4406,6 +4411,7 @@ "symfony/console": "<6.4", "symfony/dependency-injection": "<6.4", "symfony/doctrine-bridge": "<6.4", + "symfony/flex": "<2.10", "symfony/form": "<6.4", "symfony/http-client": "<6.4", "symfony/http-client-contracts": "<2.5", @@ -4472,7 +4478,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/7.4" + "source": "https://github.com/symfony/http-kernel/tree/v7.4.0" }, "funding": [ { @@ -4492,20 +4498,20 @@ "type": "tidelift" } ], - "time": "2025-09-23T16:26:37+00:00" + "time": "2025-11-27T13:38:24+00:00" }, { "name": "symfony/mailer", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "bee1739939a671e9503f717efa68f6afa11087df" + "reference": "a3d9eea8cfa467ece41f0f54ba28185d74bd53fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/bee1739939a671e9503f717efa68f6afa11087df", - "reference": "bee1739939a671e9503f717efa68f6afa11087df", + "url": "https://api.github.com/repos/symfony/mailer/zipball/a3d9eea8cfa467ece41f0f54ba28185d74bd53fd", + "reference": "a3d9eea8cfa467ece41f0f54ba28185d74bd53fd", "shasum": "" }, "require": { @@ -4556,7 +4562,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/7.4" + "source": "https://github.com/symfony/mailer/tree/v7.4.0" }, "funding": [ { @@ -4576,20 +4582,20 @@ "type": "tidelift" } ], - "time": "2025-09-18T08:45:38+00:00" + "time": "2025-11-21T15:26:00+00:00" }, { "name": "symfony/mime", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "adb6275d178ac5fabb59ac18d42bbbf887f809bc" + "reference": "bdb02729471be5d047a3ac4a69068748f1a6be7a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/adb6275d178ac5fabb59ac18d42bbbf887f809bc", - "reference": "adb6275d178ac5fabb59ac18d42bbbf887f809bc", + "url": "https://api.github.com/repos/symfony/mime/zipball/bdb02729471be5d047a3ac4a69068748f1a6be7a", + "reference": "bdb02729471be5d047a3ac4a69068748f1a6be7a", "shasum": "" }, "require": { @@ -4645,7 +4651,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/7.4" + "source": "https://github.com/symfony/mime/tree/v7.4.0" }, "funding": [ { @@ -4665,7 +4671,7 @@ "type": "tidelift" } ], - "time": "2025-09-16T08:41:45+00:00" + "time": "2025-11-16T10:14:42+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5413,6 +5419,86 @@ ], "time": "2025-07-08T02:45:35+00:00" }, + { + "name": "symfony/polyfill-php84", + "version": "v1.33.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php84.git", + "reference": "d8ced4d875142b6a7426000426b8abc631d6b191" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191", + "reference": "d8ced4d875142b6a7426000426b8abc631d6b191", + "shasum": "" + }, + "require": { + "php": ">=7.2" + }, + "type": "library", + "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php84\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2025-06-24T13:30:11+00:00" + }, { "name": "symfony/polyfill-php85", "version": "v1.33.0", @@ -5495,16 +5581,16 @@ }, { "name": "symfony/process", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "c61e87dafe1f427ce8d2e1d87c8b90d4806974cd" + "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/c61e87dafe1f427ce8d2e1d87c8b90d4806974cd", - "reference": "c61e87dafe1f427ce8d2e1d87c8b90d4806974cd", + "url": "https://api.github.com/repos/symfony/process/zipball/7ca8dc2d0dcf4882658313aba8be5d9fd01026c8", + "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8", "shasum": "" }, "require": { @@ -5536,7 +5622,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/7.4" + "source": "https://github.com/symfony/process/tree/v7.4.0" }, "funding": [ { @@ -5556,20 +5642,20 @@ "type": "tidelift" } ], - "time": "2025-08-18T09:46:12+00:00" + "time": "2025-10-16T11:21:06+00:00" }, { "name": "symfony/proxy-manager-bridge", - "version": "v6.4.24", + "version": "v6.4.28", "source": { "type": "git", "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "2a14a1539f2854a8adb73319abf8923b1d7a6589" + "reference": "9ecac7f98ad685d474394dbd06dab29bab4e18a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/2a14a1539f2854a8adb73319abf8923b1d7a6589", - "reference": "2a14a1539f2854a8adb73319abf8923b1d7a6589", + "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/9ecac7f98ad685d474394dbd06dab29bab4e18a6", + "reference": "9ecac7f98ad685d474394dbd06dab29bab4e18a6", "shasum": "" }, "require": { @@ -5607,7 +5693,7 @@ "description": "Provides integration for ProxyManager with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.24" + "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.28" }, "funding": [ { @@ -5627,20 +5713,20 @@ "type": "tidelift" } ], - "time": "2025-07-14T16:38:25+00:00" + "time": "2025-11-02T18:11:54+00:00" }, { "name": "symfony/routing", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "0d12667d0f1ffb762337c67650d1c24743dea9fa" + "reference": "4720254cb2644a0b876233d258a32bf017330db7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/0d12667d0f1ffb762337c67650d1c24743dea9fa", - "reference": "0d12667d0f1ffb762337c67650d1c24743dea9fa", + "url": "https://api.github.com/repos/symfony/routing/zipball/4720254cb2644a0b876233d258a32bf017330db7", + "reference": "4720254cb2644a0b876233d258a32bf017330db7", "shasum": "" }, "require": { @@ -5692,7 +5778,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/7.4" + "source": "https://github.com/symfony/routing/tree/v7.4.0" }, "funding": [ { @@ -5712,20 +5798,20 @@ "type": "tidelift" } ], - "time": "2025-09-09T13:52:22+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/service-contracts", - "version": "v3.6.0", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4" + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4", - "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/45112560a3ba2d715666a509a0bc9521d10b6c43", + "reference": "45112560a3ba2d715666a509a0bc9521d10b6c43", "shasum": "" }, "require": { @@ -5779,7 +5865,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/service-contracts/tree/v3.6.1" }, "funding": [ { @@ -5790,31 +5876,36 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-25T09:37:31+00:00" + "time": "2025-07-15T11:30:57+00:00" }, { "name": "symfony/string", - "version": "v7.3.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f96476035142921000338bad71e5247fbc138872" + "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872", - "reference": "f96476035142921000338bad71e5247fbc138872", + "url": "https://api.github.com/repos/symfony/string/zipball/d50e862cb0a0e0886f73ca1f31b865efbb795003", + "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003", "shasum": "" }, "require": { "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3.0", "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-intl-grapheme": "~1.0", + "symfony/polyfill-intl-grapheme": "~1.33", "symfony/polyfill-intl-normalizer": "~1.0", "symfony/polyfill-mbstring": "~1.0" }, @@ -5822,11 +5913,11 @@ "symfony/translation-contracts": "<2.5" }, "require-dev": { - "symfony/emoji": "^7.1", - "symfony/http-client": "^6.4|^7.0", - "symfony/intl": "^6.4|^7.0", + "symfony/emoji": "^7.1|^8.0", + "symfony/http-client": "^6.4|^7.0|^8.0", + "symfony/intl": "^6.4|^7.0|^8.0", "symfony/translation-contracts": "^2.5|^3.0", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -5865,7 +5956,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.3.4" + "source": "https://github.com/symfony/string/tree/v7.4.0" }, "funding": [ { @@ -5885,20 +5976,20 @@ "type": "tidelift" } ], - "time": "2025-09-11T14:36:48+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "symfony/translation-contracts", - "version": "v3.6.0", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/symfony/translation-contracts.git", - "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d" + "reference": "65a8bc82080447fae78373aa10f8d13b38338977" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/df210c7a2573f1913b2d17cc95f90f53a73d8f7d", - "reference": "df210c7a2573f1913b2d17cc95f90f53a73d8f7d", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/65a8bc82080447fae78373aa10f8d13b38338977", + "reference": "65a8bc82080447fae78373aa10f8d13b38338977", "shasum": "" }, "require": { @@ -5947,7 +6038,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v3.6.0" + "source": "https://github.com/symfony/translation-contracts/tree/v3.6.1" }, "funding": [ { @@ -5958,25 +6049,29 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-27T08:32:26+00:00" + "time": "2025-07-15T13:41:35+00:00" }, { "name": "symfony/twig-bridge", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "f5fe218e1cd9015b4492281b9c490d2b96647ca1" + "reference": "e96998da928007554b8b8c02e677861877daced9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/f5fe218e1cd9015b4492281b9c490d2b96647ca1", - "reference": "f5fe218e1cd9015b4492281b9c490d2b96647ca1", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/e96998da928007554b8b8c02e677861877daced9", + "reference": "e96998da928007554b8b8c02e677861877daced9", "shasum": "" }, "require": { @@ -6058,7 +6153,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/7.4" + "source": "https://github.com/symfony/twig-bridge/tree/v7.4.0" }, "funding": [ { @@ -6078,20 +6173,20 @@ "type": "tidelift" } ], - "time": "2025-09-24T07:02:42+00:00" + "time": "2025-11-05T14:29:59+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.3.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "b8abe7daf2730d07dfd4b2ee1cecbf0dd2fbdabb" + "reference": "41fd6c4ae28c38b294b42af6db61446594a0dece" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/b8abe7daf2730d07dfd4b2ee1cecbf0dd2fbdabb", - "reference": "b8abe7daf2730d07dfd4b2ee1cecbf0dd2fbdabb", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/41fd6c4ae28c38b294b42af6db61446594a0dece", + "reference": "41fd6c4ae28c38b294b42af6db61446594a0dece", "shasum": "" }, "require": { @@ -6103,10 +6198,10 @@ "symfony/console": "<6.4" }, "require-dev": { - "symfony/console": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0", - "symfony/uid": "^6.4|^7.0", + "symfony/console": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0", + "symfony/uid": "^6.4|^7.0|^8.0", "twig/twig": "^3.12" }, "bin": [ @@ -6145,7 +6240,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.3.4" + "source": "https://github.com/symfony/var-dumper/tree/v7.4.0" }, "funding": [ { @@ -6165,20 +6260,20 @@ "type": "tidelift" } ], - "time": "2025-09-11T10:12:26+00:00" + "time": "2025-10-27T20:36:44+00:00" }, { "name": "symfony/var-exporter", - "version": "v7.3.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/var-exporter.git", - "reference": "0f020b544a30a7fe8ba972e53ee48a74c0bc87f4" + "reference": "03a60f169c79a28513a78c967316fbc8bf17816f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-exporter/zipball/0f020b544a30a7fe8ba972e53ee48a74c0bc87f4", - "reference": "0f020b544a30a7fe8ba972e53ee48a74c0bc87f4", + "url": "https://api.github.com/repos/symfony/var-exporter/zipball/03a60f169c79a28513a78c967316fbc8bf17816f", + "reference": "03a60f169c79a28513a78c967316fbc8bf17816f", "shasum": "" }, "require": { @@ -6186,9 +6281,9 @@ "symfony/deprecation-contracts": "^2.5|^3" }, "require-dev": { - "symfony/property-access": "^6.4|^7.0", - "symfony/serializer": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/property-access": "^6.4|^7.0|^8.0", + "symfony/serializer": "^6.4|^7.0|^8.0", + "symfony/var-dumper": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -6226,7 +6321,7 @@ "serialize" ], "support": { - "source": "https://github.com/symfony/var-exporter/tree/v7.3.4" + "source": "https://github.com/symfony/var-exporter/tree/v7.4.0" }, "funding": [ { @@ -6246,20 +6341,20 @@ "type": "tidelift" } ], - "time": "2025-09-11T10:12:26+00:00" + "time": "2025-09-11T10:15:23+00:00" }, { "name": "symfony/yaml", - "version": "7.4.x-dev", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "0d7c67f404dc22bfa340546f8537cd0eb61eec6a" + "reference": "6c84a4b55aee4cd02034d1c528e83f69ddf63810" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/0d7c67f404dc22bfa340546f8537cd0eb61eec6a", - "reference": "0d7c67f404dc22bfa340546f8537cd0eb61eec6a", + "url": "https://api.github.com/repos/symfony/yaml/zipball/6c84a4b55aee4cd02034d1c528e83f69ddf63810", + "reference": "6c84a4b55aee4cd02034d1c528e83f69ddf63810", "shasum": "" }, "require": { @@ -6302,7 +6397,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/7.4" + "source": "https://github.com/symfony/yaml/tree/v7.4.0" }, "funding": [ { @@ -6322,20 +6417,20 @@ "type": "tidelift" } ], - "time": "2025-09-27T09:05:58+00:00" + "time": "2025-11-16T10:14:42+00:00" }, { "name": "twig/twig", - "version": "v3.21.1", + "version": "v3.22.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d" + "reference": "4509984193026de413baf4ba80f68590a7f2c51d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/285123877d4dd97dd7c11842ac5fb7e86e60d81d", - "reference": "285123877d4dd97dd7c11842ac5fb7e86e60d81d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/4509984193026de413baf4ba80f68590a7f2c51d", + "reference": "4509984193026de413baf4ba80f68590a7f2c51d", "shasum": "" }, "require": { @@ -6389,7 +6484,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.21.1" + "source": "https://github.com/twigphp/Twig/tree/v3.22.0" }, "funding": [ { @@ -6401,7 +6496,7 @@ "type": "tidelift" } ], - "time": "2025-05-03T07:21:55+00:00" + "time": "2025-10-29T15:56:47+00:00" }, { "name": "web-token/jwt-key-mgmt", @@ -6473,16 +6568,16 @@ }, { "name": "web-token/jwt-library", - "version": "3.4.8", + "version": "3.4.9", "source": { "type": "git", "url": "https://github.com/web-token/jwt-library.git", - "reference": "92445671cc788fa5f639898a67c06f9fd0bf491f" + "reference": "8fe1650bf3a73673a9c520feff8f9a0e9cbbcd8f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/web-token/jwt-library/zipball/92445671cc788fa5f639898a67c06f9fd0bf491f", - "reference": "92445671cc788fa5f639898a67c06f9fd0bf491f", + "url": "https://api.github.com/repos/web-token/jwt-library/zipball/8fe1650bf3a73673a9c520feff8f9a0e9cbbcd8f", + "reference": "8fe1650bf3a73673a9c520feff8f9a0e9cbbcd8f", "shasum": "" }, "require": { @@ -6555,7 +6650,7 @@ ], "support": { "issues": "https://github.com/web-token/jwt-library/issues", - "source": "https://github.com/web-token/jwt-library/tree/3.4.8" + "source": "https://github.com/web-token/jwt-library/tree/3.4.9" }, "funding": [ { @@ -6567,7 +6662,7 @@ "type": "patreon" } ], - "time": "2025-05-07T09:11:18+00:00" + "time": "2025-11-17T20:20:37+00:00" }, { "name": "web-token/jwt-signature", @@ -7942,33 +8037,38 @@ }, { "name": "league/uri", - "version": "7.5.1", + "version": "7.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "81fb5145d2644324614cc532b28efd0215bda430" + "reference": "f625804987a0a9112d954f9209d91fec52182344" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/81fb5145d2644324614cc532b28efd0215bda430", - "reference": "81fb5145d2644324614cc532b28efd0215bda430", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/f625804987a0a9112d954f9209d91fec52182344", + "reference": "f625804987a0a9112d954f9209d91fec52182344", "shasum": "" }, "require": { - "league/uri-interfaces": "^7.5", - "php": "^8.1" + "league/uri-interfaces": "^7.6", + "php": "^8.1", + "psr/http-factory": "^1" }, "conflict": { "league/uri-schemes": "^1.0" }, "suggest": { "ext-bcmath": "to improve IPV4 host parsing", + "ext-dom": "to convert the URI into an HTML anchor tag", "ext-fileinfo": "to create Data URI from file contennts", "ext-gmp": "to improve IPV4 host parsing", "ext-intl": "to handle IDN host with the best performance", + "ext-uri": "to use the PHP native URI class", "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain", "league/uri-components": "Needed to easily manipulate URI objects components", + "league/uri-polyfill": "Needed to backport the PHP URI extension for older versions of PHP", "php-64bit": "to improve IPV4 host parsing", + "rowbot/url": "to handle WHATWG URL", "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", @@ -7996,6 +8096,7 @@ "description": "URI manipulation library", "homepage": "https://uri.thephpleague.com", "keywords": [ + "URN", "data-uri", "file-uri", "ftp", @@ -8008,9 +8109,11 @@ "psr-7", "query-string", "querystring", + "rfc2141", "rfc3986", "rfc3987", "rfc6570", + "rfc8141", "uri", "uri-template", "url", @@ -8020,7 +8123,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri/tree/7.5.1" + "source": "https://github.com/thephpleague/uri/tree/7.6.0" }, "funding": [ { @@ -8028,26 +8131,25 @@ "type": "github" } ], - "time": "2024-12-08T08:40:02+00:00" + "time": "2025-11-18T12:17:23+00:00" }, { "name": "league/uri-interfaces", - "version": "7.5.0", + "version": "7.6.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742" + "reference": "ccbfb51c0445298e7e0b7f4481b942f589665368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/08cfc6c4f3d811584fb09c37e2849e6a7f9b0742", - "reference": "08cfc6c4f3d811584fb09c37e2849e6a7f9b0742", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/ccbfb51c0445298e7e0b7f4481b942f589665368", + "reference": "ccbfb51c0445298e7e0b7f4481b942f589665368", "shasum": "" }, "require": { "ext-filter": "*", "php": "^8.1", - "psr/http-factory": "^1", "psr/http-message": "^1.1 || ^2.0" }, "suggest": { @@ -8055,6 +8157,7 @@ "ext-gmp": "to improve IPV4 host parsing", "ext-intl": "to handle IDN host with the best performance", "php-64bit": "to improve IPV4 host parsing", + "rowbot/url": "to handle WHATWG URL", "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", @@ -8079,7 +8182,7 @@ "homepage": "https://nyamsprod.com" } ], - "description": "Common interfaces and classes for URI representation and interaction", + "description": "Common tools for parsing and resolving RFC3987/RFC3986 URI", "homepage": "https://uri.thephpleague.com", "keywords": [ "data-uri", @@ -8104,7 +8207,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri-interfaces/tree/7.5.0" + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.6.0" }, "funding": [ { @@ -8112,7 +8215,7 @@ "type": "github" } ], - "time": "2024-12-08T08:18:47+00:00" + "time": "2025-11-18T12:17:23+00:00" }, { "name": "masterminds/html5", @@ -8349,16 +8452,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.1", + "version": "v5.6.2", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2" + "reference": "3a454ca033b9e06b63282ce19562e892747449bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", - "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", + "reference": "3a454ca033b9e06b63282ce19562e892747449bb", "shasum": "" }, "require": { @@ -8401,9 +8504,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" }, - "time": "2025-08-13T20:13:15+00:00" + "time": "2025-10-21T19:32:17+00:00" }, { "name": "phar-io/manifest", @@ -8690,16 +8793,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.3", + "version": "5.6.5", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9" + "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94f8051919d1b0369a6bcc7931d679a511c03fe9", - "reference": "94f8051919d1b0369a6bcc7931d679a511c03fe9", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761", + "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761", "shasum": "" }, "require": { @@ -8748,22 +8851,22 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.3" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5" }, - "time": "2025-08-01T19:43:32+00:00" + "time": "2025-11-27T19:50:05+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.10.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a" + "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/679e3ce485b99e84c775d28e2e96fade9a7fb50a", - "reference": "679e3ce485b99e84c775d28e2e96fade9a7fb50a", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195", + "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195", "shasum": "" }, "require": { @@ -8806,9 +8909,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.10.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0" }, - "time": "2024-11-09T15:12:26+00:00" + "time": "2025-11-21T15:09:14+00:00" }, { "name": "phpstan/phpdoc-parser", @@ -9180,16 +9283,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.57", + "version": "10.5.58", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "8e7598bbb17bb5cd80728f4831d3f83223d3a6b3" + "reference": "e24fb46da450d8e6a5788670513c1af1424f16ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e7598bbb17bb5cd80728f4831d3f83223d3a6b3", - "reference": "8e7598bbb17bb5cd80728f4831d3f83223d3a6b3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e24fb46da450d8e6a5788670513c1af1424f16ca", + "reference": "e24fb46da450d8e6a5788670513c1af1424f16ca", "shasum": "" }, "require": { @@ -9261,7 +9364,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.57" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.58" }, "funding": [ { @@ -9285,7 +9388,7 @@ "type": "tidelift" } ], - "time": "2025-09-24T06:30:38+00:00" + "time": "2025-09-28T12:04:46+00:00" }, { "name": "psalm/plugin-symfony", @@ -9354,16 +9457,16 @@ }, { "name": "revolt/event-loop", - "version": "v1.0.7", + "version": "v1.0.8", "source": { "type": "git", "url": "https://github.com/revoltphp/event-loop.git", - "reference": "09bf1bf7f7f574453efe43044b06fafe12216eb3" + "reference": "b6fc06dce8e9b523c9946138fa5e62181934f91c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/revoltphp/event-loop/zipball/09bf1bf7f7f574453efe43044b06fafe12216eb3", - "reference": "09bf1bf7f7f574453efe43044b06fafe12216eb3", + "url": "https://api.github.com/repos/revoltphp/event-loop/zipball/b6fc06dce8e9b523c9946138fa5e62181934f91c", + "reference": "b6fc06dce8e9b523c9946138fa5e62181934f91c", "shasum": "" }, "require": { @@ -9420,9 +9523,9 @@ ], "support": { "issues": "https://github.com/revoltphp/event-loop/issues", - "source": "https://github.com/revoltphp/event-loop/tree/v1.0.7" + "source": "https://github.com/revoltphp/event-loop/tree/v1.0.8" }, - "time": "2025-01-25T19:27:39+00:00" + "time": "2025-08-27T21:33:23+00:00" }, { "name": "sebastian/cli-parser", @@ -10379,16 +10482,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.4.0", + "version": "3.4.3", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67" + "reference": "7b9202dccfe18d4e3a13303156d6bbcc1c61dabf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67", - "reference": "7dcfc67d60b0272926dabad1ec01f6b8a5fb5e67", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/7b9202dccfe18d4e3a13303156d6bbcc1c61dabf", + "reference": "7b9202dccfe18d4e3a13303156d6bbcc1c61dabf", "shasum": "" }, "require": { @@ -10431,7 +10534,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.4.0" + "source": "https://github.com/spatie/array-to-xml/tree/3.4.3" }, "funding": [ { @@ -10443,20 +10546,20 @@ "type": "github" } ], - "time": "2024-12-16T12:45:15+00:00" + "time": "2025-11-27T09:08:26+00:00" }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.4", + "version": "3.13.5", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119" + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/ad545ea9c1b7d270ce0fc9cbfb884161cd706119", - "reference": "ad545ea9c1b7d270ce0fc9cbfb884161cd706119", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4", + "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4", "shasum": "" }, "require": { @@ -10473,11 +10576,6 @@ "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -10527,31 +10625,32 @@ "type": "thanks_dev" } ], - "time": "2025-09-05T05:47:09+00:00" + "time": "2025-11-04T16:30:35+00:00" }, { "name": "symfony/browser-kit", - "version": "v7.3.2", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "f0b889b73a845cddef1d25fe207b37fd04cb5419" + "reference": "3bb26dafce31633b1f699894c86379eefc8af5bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/f0b889b73a845cddef1d25fe207b37fd04cb5419", - "reference": "f0b889b73a845cddef1d25fe207b37fd04cb5419", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3bb26dafce31633b1f699894c86379eefc8af5bb", + "reference": "3bb26dafce31633b1f699894c86379eefc8af5bb", "shasum": "" }, "require": { "php": ">=8.2", - "symfony/dom-crawler": "^6.4|^7.0" + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/dom-crawler": "^6.4|^7.0|^8.0" }, "require-dev": { - "symfony/css-selector": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/mime": "^6.4|^7.0", - "symfony/process": "^6.4|^7.0" + "symfony/css-selector": "^6.4|^7.0|^8.0", + "symfony/http-client": "^6.4|^7.0|^8.0", + "symfony/mime": "^6.4|^7.0|^8.0", + "symfony/process": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -10579,7 +10678,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v7.3.2" + "source": "https://github.com/symfony/browser-kit/tree/v7.4.0" }, "funding": [ { @@ -10599,20 +10698,20 @@ "type": "tidelift" } ], - "time": "2025-07-10T08:47:49+00:00" + "time": "2025-11-05T14:29:59+00:00" }, { "name": "symfony/cache", - "version": "v7.3.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "bf8afc8ffd4bfd3d9c373e417f041d9f1e5b863f" + "reference": "a7a1325a5de2e54ddb45fda002ff528162e48293" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/bf8afc8ffd4bfd3d9c373e417f041d9f1e5b863f", - "reference": "bf8afc8ffd4bfd3d9c373e417f041d9f1e5b863f", + "url": "https://api.github.com/repos/symfony/cache/zipball/a7a1325a5de2e54ddb45fda002ff528162e48293", + "reference": "a7a1325a5de2e54ddb45fda002ff528162e48293", "shasum": "" }, "require": { @@ -10620,12 +10719,14 @@ "psr/cache": "^2.0|^3.0", "psr/log": "^1.1|^2|^3", "symfony/cache-contracts": "^3.6", - "symfony/deprecation-contracts": "^2.5|^3.0", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/service-contracts": "^2.5|^3", - "symfony/var-exporter": "^6.4|^7.0" + "symfony/var-exporter": "^6.4|^7.0|^8.0" }, "conflict": { "doctrine/dbal": "<3.6", + "ext-redis": "<6.1", + "ext-relay": "<0.12.1", "symfony/dependency-injection": "<6.4", "symfony/http-kernel": "<6.4", "symfony/var-dumper": "<6.4" @@ -10640,13 +10741,13 @@ "doctrine/dbal": "^3.6|^4", "predis/predis": "^1.1|^2.0", "psr/simple-cache": "^1.0|^2.0|^3.0", - "symfony/clock": "^6.4|^7.0", - "symfony/config": "^6.4|^7.0", - "symfony/dependency-injection": "^6.4|^7.0", - "symfony/filesystem": "^6.4|^7.0", - "symfony/http-kernel": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/var-dumper": "^6.4|^7.0" + "symfony/clock": "^6.4|^7.0|^8.0", + "symfony/config": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/filesystem": "^6.4|^7.0|^8.0", + "symfony/http-kernel": "^6.4|^7.0|^8.0", + "symfony/messenger": "^6.4|^7.0|^8.0", + "symfony/var-dumper": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -10681,7 +10782,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.3.4" + "source": "https://github.com/symfony/cache/tree/v7.4.0" }, "funding": [ { @@ -10701,7 +10802,7 @@ "type": "tidelift" } ], - "time": "2025-09-11T10:12:26+00:00" + "time": "2025-11-16T10:14:42+00:00" }, { "name": "symfony/cache-contracts", @@ -10781,16 +10882,16 @@ }, { "name": "symfony/css-selector", - "version": "v7.3.0", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2" + "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/601a5ce9aaad7bf10797e3663faefce9e26c24e2", - "reference": "601a5ce9aaad7bf10797e3663faefce9e26c24e2", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab862f478513e7ca2fe9ec117a6f01a8da6e1135", + "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135", "shasum": "" }, "require": { @@ -10826,7 +10927,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.3.0" + "source": "https://github.com/symfony/css-selector/tree/v7.4.0" }, "funding": [ { @@ -10837,35 +10938,40 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-09-25T14:21:43+00:00" + "time": "2025-10-30T13:39:42+00:00" }, { "name": "symfony/dom-crawler", - "version": "v7.3.3", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "efa076ea0eeff504383ff0dcf827ea5ce15690ba" + "reference": "8f3e7464fe7e77294686e935956a6a8ccf7442c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/efa076ea0eeff504383ff0dcf827ea5ce15690ba", - "reference": "efa076ea0eeff504383ff0dcf827ea5ce15690ba", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8f3e7464fe7e77294686e935956a6a8ccf7442c4", + "reference": "8f3e7464fe7e77294686e935956a6a8ccf7442c4", "shasum": "" }, "require": { "masterminds/html5": "^2.6", "php": ">=8.2", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "~1.8", "symfony/polyfill-mbstring": "~1.0" }, "require-dev": { - "symfony/css-selector": "^6.4|^7.0" + "symfony/css-selector": "^6.4|^7.0|^8.0" }, "type": "library", "autoload": { @@ -10893,7 +10999,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v7.3.3" + "source": "https://github.com/symfony/dom-crawler/tree/v7.4.0" }, "funding": [ { @@ -10913,38 +11019,39 @@ "type": "tidelift" } ], - "time": "2025-08-06T20:13:54+00:00" + "time": "2025-10-31T09:30:03+00:00" }, { "name": "symfony/framework-bundle", - "version": "v7.3.4", + "version": "v7.4.0", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "b13e7cec5a144c8dba6f4233a2c53c00bc29e140" + "reference": "3c62a3437267ac55bcd40175689c74772250e943" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/b13e7cec5a144c8dba6f4233a2c53c00bc29e140", - "reference": "b13e7cec5a144c8dba6f4233a2c53c00bc29e140", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/3c62a3437267ac55bcd40175689c74772250e943", + "reference": "3c62a3437267ac55bcd40175689c74772250e943", "shasum": "" }, "require": { "composer-runtime-api": ">=2.1", "ext-xml": "*", "php": ">=8.2", - "symfony/cache": "^6.4|^7.0", - "symfony/config": "^7.3", - "symfony/dependency-injection": "^7.2", + "symfony/cache": "^6.4.12|^7.0|^8.0", + "symfony/config": "^7.4|^8.0", + "symfony/dependency-injection": "^7.4|^8.0", "symfony/deprecation-contracts": "^2.5|^3", - "symfony/error-handler": "^7.3", - "symfony/event-dispatcher": "^6.4|^7.0", - "symfony/filesystem": "^7.1", - "symfony/finder": "^6.4|^7.0", - "symfony/http-foundation": "^7.3", - "symfony/http-kernel": "^7.2", + "symfony/error-handler": "^7.3|^8.0", + "symfony/event-dispatcher": "^6.4|^7.0|^8.0", + "symfony/filesystem": "^7.1|^8.0", + "symfony/finder": "^6.4|^7.0|^8.0", + "symfony/http-foundation": "^7.4|^8.0", + "symfony/http-kernel": "^7.4|^8.0", "symfony/polyfill-mbstring": "~1.0", - "symfony/routing": "^6.4|^7.0" + "symfony/polyfill-php85": "^1.32", + "symfony/routing": "^7.4|^8.0" }, "conflict": { "doctrine/persistence": "<1.3", @@ -10956,14 +11063,12 @@ "symfony/console": "<6.4", "symfony/dom-crawler": "<6.4", "symfony/dotenv": "<6.4", - "symfony/form": "<6.4", + "symfony/form": "<7.4", "symfony/http-client": "<6.4", - "symfony/json-streamer": ">=7.4", "symfony/lock": "<6.4", "symfony/mailer": "<6.4", - "symfony/messenger": "<6.4", + "symfony/messenger": "<7.4", "symfony/mime": "<6.4", - "symfony/object-mapper": ">=7.4", "symfony/property-access": "<6.4", "symfony/property-info": "<6.4", "symfony/runtime": "<6.4.13|>=7.0,<7.1.6", @@ -10978,51 +11083,52 @@ "symfony/validator": "<6.4", "symfony/web-profiler-bundle": "<6.4", "symfony/webhook": "<7.2", - "symfony/workflow": "<7.3.0-beta2" + "symfony/workflow": "<7.4" }, "require-dev": { "doctrine/persistence": "^1.3|^2|^3", "dragonmantank/cron-expression": "^3.1", "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", "seld/jsonlint": "^1.10", - "symfony/asset": "^6.4|^7.0", - "symfony/asset-mapper": "^6.4|^7.0", - "symfony/browser-kit": "^6.4|^7.0", - "symfony/clock": "^6.4|^7.0", - "symfony/console": "^6.4|^7.0", - "symfony/css-selector": "^6.4|^7.0", - "symfony/dom-crawler": "^6.4|^7.0", - "symfony/dotenv": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/form": "^6.4|^7.0", - "symfony/html-sanitizer": "^6.4|^7.0", - "symfony/http-client": "^6.4|^7.0", - "symfony/json-streamer": "7.3.*", - "symfony/lock": "^6.4|^7.0", - "symfony/mailer": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/mime": "^6.4|^7.0", - "symfony/notifier": "^6.4|^7.0", - "symfony/object-mapper": "^v7.3.0-beta2", + "symfony/asset": "^6.4|^7.0|^8.0", + "symfony/asset-mapper": "^6.4|^7.0|^8.0", + "symfony/browser-kit": "^6.4|^7.0|^8.0", + "symfony/clock": "^6.4|^7.0|^8.0", + "symfony/console": "^6.4|^7.0|^8.0", + "symfony/css-selector": "^6.4|^7.0|^8.0", + "symfony/dom-crawler": "^6.4|^7.0|^8.0", + "symfony/dotenv": "^6.4|^7.0|^8.0", + "symfony/expression-language": "^6.4|^7.0|^8.0", + "symfony/form": "^7.4|^8.0", + "symfony/html-sanitizer": "^6.4|^7.0|^8.0", + "symfony/http-client": "^6.4|^7.0|^8.0", + "symfony/json-streamer": "^7.3|^8.0", + "symfony/lock": "^6.4|^7.0|^8.0", + "symfony/mailer": "^6.4|^7.0|^8.0", + "symfony/messenger": "^7.4|^8.0", + "symfony/mime": "^6.4|^7.0|^8.0", + "symfony/notifier": "^6.4|^7.0|^8.0", + "symfony/object-mapper": "^7.3|^8.0", "symfony/polyfill-intl-icu": "~1.0", - "symfony/process": "^6.4|^7.0", - "symfony/property-info": "^6.4|^7.0", - "symfony/rate-limiter": "^6.4|^7.0", - "symfony/scheduler": "^6.4.4|^7.0.4", - "symfony/security-bundle": "^6.4|^7.0", - "symfony/semaphore": "^6.4|^7.0", - "symfony/serializer": "^7.2.5", - "symfony/stopwatch": "^6.4|^7.0", - "symfony/string": "^6.4|^7.0", - "symfony/translation": "^7.3", - "symfony/twig-bundle": "^6.4|^7.0", - "symfony/type-info": "^7.1.8", - "symfony/uid": "^6.4|^7.0", - "symfony/validator": "^6.4|^7.0", - "symfony/web-link": "^6.4|^7.0", - "symfony/webhook": "^7.2", - "symfony/workflow": "^7.3", - "symfony/yaml": "^6.4|^7.0", + "symfony/process": "^6.4|^7.0|^8.0", + "symfony/property-info": "^6.4|^7.0|^8.0", + "symfony/rate-limiter": "^6.4|^7.0|^8.0", + "symfony/runtime": "^6.4.13|^7.1.6|^8.0", + "symfony/scheduler": "^6.4.4|^7.0.4|^8.0", + "symfony/security-bundle": "^6.4|^7.0|^8.0", + "symfony/semaphore": "^6.4|^7.0|^8.0", + "symfony/serializer": "^7.2.5|^8.0", + "symfony/stopwatch": "^6.4|^7.0|^8.0", + "symfony/string": "^6.4|^7.0|^8.0", + "symfony/translation": "^7.3|^8.0", + "symfony/twig-bundle": "^6.4|^7.0|^8.0", + "symfony/type-info": "^7.1.8|^8.0", + "symfony/uid": "^6.4|^7.0|^8.0", + "symfony/validator": "^7.4|^8.0", + "symfony/web-link": "^6.4|^7.0|^8.0", + "symfony/webhook": "^7.2|^8.0", + "symfony/workflow": "^7.4|^8.0", + "symfony/yaml": "^7.3|^8.0", "twig/twig": "^3.12" }, "type": "symfony-bundle", @@ -11051,87 +11157,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v7.3.4" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://github.com/nicolas-grekas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2025-09-17T05:51:54+00:00" - }, - { - "name": "symfony/polyfill-php84", - "version": "v1.33.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php84.git", - "reference": "d8ced4d875142b6a7426000426b8abc631d6b191" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191", - "reference": "d8ced4d875142b6a7426000426b8abc631d6b191", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/symfony/polyfill", - "name": "symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php84\\": "" - }, - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0" + "source": "https://github.com/symfony/framework-bundle/tree/v7.4.0" }, "funding": [ { @@ -11151,20 +11177,20 @@ "type": "tidelift" } ], - "time": "2025-06-24T13:30:11+00:00" + "time": "2025-11-27T13:27:24+00:00" }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", "shasum": "" }, "require": { @@ -11193,7 +11219,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" }, "funding": [ { @@ -11201,7 +11227,7 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-17T20:03:58+00:00" }, { "name": "vimeo/psalm", @@ -11323,28 +11349,28 @@ }, { "name": "webmozart/assert", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", "shasum": "" }, "require": { "ext-ctype": "*", + "ext-date": "*", + "ext-filter": "*", "php": "^7.2 || ^8.0" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-intl": "", + "ext-simplexml": "", + "ext-spl": "" }, "type": "library", "extra": { @@ -11375,30 +11401,14 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/webmozarts/assert/tree/1.12.1" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2025-10-29T15:56:20+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "symfony/config": 20, - "symfony/console": 20, - "symfony/dependency-injection": 20, - "symfony/error-handler": 20, - "symfony/event-dispatcher": 20, - "symfony/filesystem": 20, - "symfony/finder": 20, - "symfony/http-foundation": 20, - "symfony/http-kernel": 20, - "symfony/mailer": 20, - "symfony/mime": 20, - "symfony/process": 20, - "symfony/routing": 20, - "symfony/twig-bridge": 20, - "symfony/yaml": 20 - }, + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { From b8d14180a1b9fb72b311f966f34240ac9de4f260 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 29 Nov 2025 08:47:51 +0100 Subject: [PATCH 0997/1214] [ticket/17556] Remove not needed line PHPBB-17556 --- tests/console/cron/cron_list_test.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/console/cron/cron_list_test.php b/tests/console/cron/cron_list_test.php index 66eb4d8b33b..25e8efd74ee 100644 --- a/tests/console/cron/cron_list_test.php +++ b/tests/console/cron/cron_list_test.php @@ -79,7 +79,6 @@ public function get_cron_manager(array $tasks) ->onlyMethods(array('setContext', 'generate')) ->disableOriginalConstructor() ->getMock(); - $mock_router->method('setContext'); $mock_router->method('generate') ->willReturn('foobar'); From b4a163021b47a658836d97588ed8ca9ff2b6698b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 29 Nov 2025 08:53:59 +0100 Subject: [PATCH 0998/1214] [ticket/17556] Remove PHP 8.1 and add PHP 8.5 PHPBB-17556 --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8aab1512e8a..ddb18790600 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -494,7 +494,7 @@ jobs: runs-on: windows-2025 strategy: matrix: - php: ['8.1', '8.2', '8.3', '8.4'] + php: ['8.2', '8.3', '8.4', '8.5'] db: ['postgres'] name: Windows - PHP ${{ matrix.php }} - ${{ matrix.db }} From 835815be8df3142de22fe7890b77c09343346034 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 29 Nov 2025 17:06:23 +0100 Subject: [PATCH 0999/1214] [ticket/17556] Try relying on symfony's proxy instantiator PHPBB-17556 --- phpBB/phpbb/di/container_builder.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 087dbf9649e..66964ea9adf 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -542,7 +542,6 @@ protected function dump_container($cache) protected function create_container(array $extensions) { $container = new ContainerBuilder(new ParameterBag($this->get_core_parameters())); - $container->setProxyInstantiator(new proxy_instantiator($this->get_cache_dir())); $extensions_alias = array(); From d4e392d8ab66257437fc686d045f348596958e94 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 29 Nov 2025 21:22:20 +0100 Subject: [PATCH 1000/1214] [ticket/17556] Remove unused proxy instantiator PHPBB-17556 --- phpBB/phpbb/di/proxy_instantiator.php | 72 --------------------------- 1 file changed, 72 deletions(-) delete mode 100644 phpBB/phpbb/di/proxy_instantiator.php diff --git a/phpBB/phpbb/di/proxy_instantiator.php b/phpBB/phpbb/di/proxy_instantiator.php deleted file mode 100644 index d724d2dcd22..00000000000 --- a/phpBB/phpbb/di/proxy_instantiator.php +++ /dev/null @@ -1,72 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\di; - -use ProxyManager\Configuration; -use ProxyManager\Factory\LazyLoadingValueHolderFactory; -use ProxyManager\GeneratorStrategy\EvaluatingGeneratorStrategy; -use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\Definition; -use Symfony\Component\DependencyInjection\LazyProxy\Instantiator\InstantiatorInterface; - -/** - * Runtime lazy loading proxy generator extended for allowing use while using - * open_basedir restrictions - * - * Original author: Marco Pivetta - */ -class proxy_instantiator implements InstantiatorInterface -{ - /** - * @var LazyLoadingValueHolderFactory - */ - private $factory; - - /** - * proxy_instantiator constructor - * @param string $cache_dir Cache dir for fall back when using open_basedir - */ - public function __construct($cache_dir) - { - $config = new Configuration(); - - // Prevent trying to write to system temp dir in case of open_basedir - // restrictions being in effect - $tmp_dir = (function_exists('sys_get_temp_dir')) ? sys_get_temp_dir() : ''; - if (empty($tmp_dir) || !@file_exists($tmp_dir) || !@is_writable($tmp_dir)) - { - $config->setProxiesTargetDir($cache_dir); - } - $config->setGeneratorStrategy(new EvaluatingGeneratorStrategy()); - - $this->factory = new LazyLoadingValueHolderFactory($config); - } - - /** - * {@inheritdoc} - */ - public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator): object - { - return $this->factory->createProxy( - $definition->getClass(), - function (&$wrappedInstance, \ProxyManager\Proxy\LazyLoadingInterface $proxy) use ($realInstantiator) { - $wrappedInstance = call_user_func($realInstantiator); - - $proxy->setProxyInitializer(null); - - return true; - } - ); - } -} From de7de02ef29f728035e8c335542bbc3eda1b2d72 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 30 Nov 2025 09:05:05 +0100 Subject: [PATCH 1001/1214] [ticket/17556] Remove proxy manager PHPBB-17556 --- phpBB/composer.json | 1 - phpBB/composer.lock | 234 ++------------------------------------------ 2 files changed, 9 insertions(+), 226 deletions(-) diff --git a/phpBB/composer.json b/phpBB/composer.json index 9777e023f07..3762817907c 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -55,7 +55,6 @@ "symfony/mailer": "^7.4", "symfony/mime": "^7.4", "symfony/process": "^7.4", - "symfony/proxy-manager-bridge": "^6.4", "symfony/routing": "^7.4", "symfony/twig-bridge": "^7.4", "symfony/yaml": "^7.4", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 9df14737d75..600ce1dc6a5 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7f502aca03f40b41dc54e901dcb5ab41", + "content-hash": "a100d158a331a9dc8b112c1c850e38b4", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -1017,16 +1017,16 @@ }, { "name": "doctrine/dbal", - "version": "3.10.3", + "version": "3.10.4", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "65edaca19a752730f290ec2fb89d593cb40afb43" + "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/65edaca19a752730f290ec2fb89d593cb40afb43", - "reference": "65edaca19a752730f290ec2fb89d593cb40afb43", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/63a46cb5aa6f60991186cc98c1d1b50c09311868", + "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868", "shasum": "" }, "require": { @@ -1050,8 +1050,8 @@ "phpunit/phpunit": "9.6.29", "slevomat/coding-standard": "8.24.0", "squizlabs/php_codesniffer": "4.0.0", - "symfony/cache": "^5.4|^6.0|^7.0", - "symfony/console": "^4.4|^5.4|^6.0|^7.0" + "symfony/cache": "^5.4|^6.0|^7.0|^8.0", + "symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -1111,7 +1111,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.10.3" + "source": "https://github.com/doctrine/dbal/tree/3.10.4" }, "funding": [ { @@ -1127,7 +1127,7 @@ "type": "tidelift" } ], - "time": "2025-10-09T09:05:12+00:00" + "time": "2025-11-29T10:46:08+00:00" }, { "name": "doctrine/deprecations", @@ -1412,88 +1412,6 @@ ], "time": "2025-03-06T22:45:56+00:00" }, - { - "name": "friendsofphp/proxy-manager-lts", - "version": "v1.0.19", - "source": { - "type": "git", - "url": "https://github.com/FriendsOfPHP/proxy-manager-lts.git", - "reference": "c20299aa9f48a622052964a75c5a4cef017398b2" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/FriendsOfPHP/proxy-manager-lts/zipball/c20299aa9f48a622052964a75c5a4cef017398b2", - "reference": "c20299aa9f48a622052964a75c5a4cef017398b2", - "shasum": "" - }, - "require": { - "laminas/laminas-code": "~3.4.1|^4.0", - "php": ">=7.1", - "symfony/filesystem": "^4.4.17|^5.0|^6.0|^7.0|^8.0" - }, - "conflict": { - "laminas/laminas-stdlib": "<3.2.1", - "zendframework/zend-stdlib": "<3.2.1" - }, - "replace": { - "ocramius/proxy-manager": "^2.1" - }, - "require-dev": { - "ext-phar": "*", - "symfony/phpunit-bridge": "^5.4|^6.0|^7.0" - }, - "type": "library", - "extra": { - "thanks": { - "url": "https://github.com/Ocramius/ProxyManager", - "name": "ocramius/proxy-manager" - } - }, - "autoload": { - "psr-4": { - "ProxyManager\\": "src/ProxyManager" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Marco Pivetta", - "email": "ocramius@gmail.com", - "homepage": "https://ocramius.github.io/" - }, - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - } - ], - "description": "Adding support for a wider range of PHP versions to ocramius/proxy-manager", - "homepage": "https://github.com/FriendsOfPHP/proxy-manager-lts", - "keywords": [ - "aop", - "lazy loading", - "proxy", - "proxy pattern", - "service proxies" - ], - "support": { - "issues": "https://github.com/FriendsOfPHP/proxy-manager-lts/issues", - "source": "https://github.com/FriendsOfPHP/proxy-manager-lts/tree/v1.0.19" - }, - "funding": [ - { - "url": "https://github.com/Ocramius", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/ocramius/proxy-manager", - "type": "tidelift" - } - ], - "time": "2025-10-28T10:28:17+00:00" - }, { "name": "google/recaptcha", "version": "1.3.1", @@ -1946,69 +1864,6 @@ }, "time": "2025-11-28T15:24:03+00:00" }, - { - "name": "laminas/laminas-code", - "version": "4.17.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-code.git", - "reference": "40d61e2899ec17c5d08bbc0a2d586b3ca17ab9bd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-code/zipball/40d61e2899ec17c5d08bbc0a2d586b3ca17ab9bd", - "reference": "40d61e2899ec17c5d08bbc0a2d586b3ca17ab9bd", - "shasum": "" - }, - "require": { - "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0" - }, - "require-dev": { - "doctrine/annotations": "^2.0.1", - "ext-phar": "*", - "laminas/laminas-coding-standard": "^3.0.0", - "laminas/laminas-stdlib": "^3.18.0", - "phpunit/phpunit": "^10.5.58", - "psalm/plugin-phpunit": "^0.19.0", - "vimeo/psalm": "^5.15.0" - }, - "suggest": { - "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features", - "laminas/laminas-stdlib": "Laminas\\Stdlib component" - }, - "type": "library", - "autoload": { - "psr-4": { - "Laminas\\Code\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Extensions to the PHP Reflection API, static code scanning, and code generation", - "homepage": "https://laminas.dev", - "keywords": [ - "code", - "laminas", - "laminasframework" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-code/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-code/issues", - "rss": "https://github.com/laminas/laminas-code/releases.atom", - "source": "https://github.com/laminas/laminas-code" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2025-11-01T09:38:14+00:00" - }, { "name": "marc-mabe/php-enum", "version": "v4.7.2", @@ -5644,77 +5499,6 @@ ], "time": "2025-10-16T11:21:06+00:00" }, - { - "name": "symfony/proxy-manager-bridge", - "version": "v6.4.28", - "source": { - "type": "git", - "url": "https://github.com/symfony/proxy-manager-bridge.git", - "reference": "9ecac7f98ad685d474394dbd06dab29bab4e18a6" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/proxy-manager-bridge/zipball/9ecac7f98ad685d474394dbd06dab29bab4e18a6", - "reference": "9ecac7f98ad685d474394dbd06dab29bab4e18a6", - "shasum": "" - }, - "require": { - "friendsofphp/proxy-manager-lts": "^1.0.2", - "php": ">=8.1", - "symfony/dependency-injection": "^6.3|^7.0", - "symfony/deprecation-contracts": "^2.5|^3" - }, - "require-dev": { - "symfony/config": "^6.1|^7.0" - }, - "type": "symfony-bridge", - "autoload": { - "psr-4": { - "Symfony\\Bridge\\ProxyManager\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Provides integration for ProxyManager with various Symfony components", - "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/proxy-manager-bridge/tree/v6.4.28" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://github.com/nicolas-grekas", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2025-11-02T18:11:54+00:00" - }, { "name": "symfony/routing", "version": "v7.4.0", From e96e2c427a4797d82dfba5d828a26d34cef19697 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 1 Dec 2025 19:22:11 +0100 Subject: [PATCH 1002/1214] [ticket/17556] Use symfony's LazyServiceDumper PHPBB-17556 --- phpBB/phpbb/di/container_builder.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/di/container_builder.php b/phpBB/phpbb/di/container_builder.php index 66964ea9adf..6a1ad68e922 100644 --- a/phpBB/phpbb/di/container_builder.php +++ b/phpBB/phpbb/di/container_builder.php @@ -13,11 +13,11 @@ namespace phpbb\di; -use Symfony\Bridge\ProxyManager\LazyProxy\PhpDumper\ProxyDumper; use Symfony\Component\Config\ConfigCache; use Symfony\Component\Config\FileLocator; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\Dumper\PhpDumper; +use Symfony\Component\DependencyInjection\LazyProxy\PhpDumper\LazyServiceDumper; use Symfony\Component\DependencyInjection\Loader\YamlFileLoader; use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag; use Symfony\Component\EventDispatcher\DependencyInjection\RegisterListenersPass; @@ -517,7 +517,7 @@ protected function dump_container($cache) try { $dumper = new PhpDumper($this->container); - $proxy_dumper = new ProxyDumper(); + $proxy_dumper = new LazyServiceDumper(); $dumper->setProxyDumper($proxy_dumper); $cached_container_dump = $dumper->dump(array( From 5cc35e271923522232099d8db47ed2a2b2937a1f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 1 Dec 2025 19:22:37 +0100 Subject: [PATCH 1003/1214] [ticket/17556] Do not rely on rewrite in tests PHPBB-17556 --- tests/functional/memberlist_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index 0847aadd5c5..b088b67dbb2 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -43,7 +43,7 @@ public function test_viewprofile() protected function get_memberlist_leaders_table_crawler() { - $crawler = self::request('GET', 'members/team'); + $crawler = self::request('GET', 'app.php/members/team'); return $crawler->filter('.forumbg-table'); } From 0024373d06271a40625a79e0cd65dfba469e8413 Mon Sep 17 00:00:00 2001 From: Neo-CTC <92761505+Neo-CTC@users.noreply.github.com> Date: Tue, 2 Dec 2025 00:51:53 -0600 Subject: [PATCH 1004/1214] [ticket/17589] Check confirm id When a login fails the qa captcha is reset and creates a new `confirm_id`. However, the `confirm_id` is never checked for changes causing the captcha to believe it's still solved and thus no need to generate a new captcha. This commit checks the known `confirm_id` against the `confirm_id` given by the user, marking the captcha solved accordingly. PHPBB-17589 --- phpBB/phpbb/captcha/plugins/qa.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/captcha/plugins/qa.php b/phpBB/phpbb/captcha/plugins/qa.php index 966b8d32f25..6cd01388785 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -573,6 +573,7 @@ function check_answer() global $db, $request; $answer = ($this->question_strict) ? $request->variable('qa_answer', '', true) : utf8_clean_string($request->variable('qa_answer', '', true)); + $confirm_id = $request->variable('qa_confirm_id', ''); $sql = 'SELECT answer_text FROM ' . $this->table_captcha_answers . ' @@ -583,7 +584,7 @@ function check_answer() { $solution = ($this->question_strict) ? $row['answer_text'] : utf8_clean_string($row['answer_text']); - if ($solution === $answer) + if ($solution === $answer && $this->confirm_id === $confirm_id) { $this->solved = true; From cacd24f41fb11804c69bc8cc0e7f0ea6c34c9a41 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 3 Dec 2025 20:09:53 +0100 Subject: [PATCH 1005/1214] [ticket/17556] Handle behavior of new HTML5 dom parser in tests PHPBB-17556 --- tests/functional/acp_smilies_test.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/functional/acp_smilies_test.php b/tests/functional/acp_smilies_test.php index c8aa1d9b7d6..12001c0f0a1 100644 --- a/tests/functional/acp_smilies_test.php +++ b/tests/functional/acp_smilies_test.php @@ -38,6 +38,15 @@ public function test_htmlspecialchars() $crawler = self::submit($form); $html = $crawler->filter('#preview')->html(); - $this->assertMatchesRegularExpression('(]+ alt=">:D" title=">:D"[^>]*>)', $html); + + // Native HTML5 parser (PHP 8.4+) will encode entities + if (\PHP_VERSION_ID >= 80400) + { + $this->assertMatchesRegularExpression('(]+ alt=">:D" title=">:D"[^>]*>)', $html); + } + else + { + $this->assertMatchesRegularExpression('(]+ alt=">:D" title=">:D"[^>]*>)', $html); + } } } From 39c55c66b7968627341776b7aeea3706cf01a7d1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 3 Dec 2025 20:22:49 +0100 Subject: [PATCH 1006/1214] [ticket/17556] Increase minimum PHP version to 8.2 PHPBB-17556 --- phpBB/docs/INSTALL.html | 2 +- phpBB/docs/README.html | 6 +++--- phpBB/includes/startup.php | 6 +++--- phpBB/language/en/install.php | 2 +- phpBB/phpbb/composer.json | 2 +- .../module/requirements/task/check_server_environment.php | 2 +- vagrant/after.sh | 2 +- vagrant/bootstrap.yaml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 6d5b976aa45..06557dca6d3 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -147,7 +147,7 @@

        Install

      • Oracle

      2. -
    2. PHP 8.1.0+ up to and including PHP 8.3 with support for the database you intend to use.
      3. +
    3. PHP 8.2.0+ up to and including PHP 8.5 with support for the database you intend to use.
    4. The following PHP modules are required:
      • json
        • diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index e8cc96342cb..80d81b484f1 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -265,7 +265,7 @@

        Readme

        • Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.
          • -
        • PHP version and mode of operation, e.g. PHP 8.1.0 as a module, PHP 8.2.3 running as CGI, etc.
          • +
        • PHP version and mode of operation, e.g. PHP 8.2.0 as a module, PHP 8.2.3 running as CGI, etc.
        • DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 (via ODBC), etc.
        @@ -323,11 +323,11 @@

        Readme

        -

        phpBB 4.0.x takes advantage of new features added in PHP 8.1. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 8.1.0 and the maximum supported version is the latest stable version of PHP.

        +

        phpBB 4.0.x takes advantage of new features added in PHP 8.2. We recommend that you upgrade to the latest stable release of PHP to run phpBB. The minimum version required is PHP 8.2.0 and the maximum supported version is the latest stable version of PHP.

        Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

        -

        This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 8.1.x to 8.2.x and 8.3.x.

        +

        This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 8.2.x to 8.3.x, 8.4.x and 8.5.x.

        7.i. Notice on PHP security issues

        diff --git a/phpBB/includes/startup.php b/phpBB/includes/startup.php index dac52a025f1..d0b3567bd33 100644 --- a/phpBB/includes/startup.php +++ b/phpBB/includes/startup.php @@ -23,11 +23,11 @@ error_reporting($level); /** -* Minimum Requirement: PHP 8.1.0 +* Minimum Requirement: PHP 8.2.0 */ -if (version_compare(PHP_VERSION, '8.1.0', '<')) +if (version_compare(PHP_VERSION, '8.2.0', '<')) { - die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 8.1.0 or higher before trying to install or update to phpBB 4.0'); + die('You are running an unsupported PHP version (' . PHP_VERSION . '). Please upgrade to PHP 8.2.0 or higher before trying to install or update to phpBB 4.0'); } // In PHP 5.3.0 the error level has been raised to E_WARNING which causes problems diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 750eb672819..efaf8696542 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -105,7 +105,7 @@ // Server requirements 'PHP_VERSION_REQD' => 'PHP version', - 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 7.2.0 or higher.', + 'PHP_VERSION_REQD_EXPLAIN' => 'phpBB requires PHP version 8.2.0 or higher.', 'PHP_GETIMAGESIZE_SUPPORT' => 'PHP getimagesize() function is required', 'PHP_GETIMAGESIZE_SUPPORT_EXPLAIN' => 'In order for phpBB to function correctly, the getimagesize function needs to be available.', 'PCRE_UTF_SUPPORT' => 'PCRE UTF-8 support', diff --git a/phpBB/phpbb/composer.json b/phpBB/phpbb/composer.json index f4805ac3f65..dc3d808b418 100644 --- a/phpBB/phpbb/composer.json +++ b/phpBB/phpbb/composer.json @@ -23,7 +23,7 @@ "classmap": [""] }, "require": { - "php": "^8.1" + "php": "^8.2" }, "extra": { "branch-alias": { diff --git a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php index 9ae953ee8ea..ccff406d145 100644 --- a/phpBB/phpbb/install/module/requirements/task/check_server_environment.php +++ b/phpBB/phpbb/install/module/requirements/task/check_server_environment.php @@ -96,7 +96,7 @@ protected function set_test_passed($is_passed) */ protected function check_php_version() { - if (version_compare(PHP_VERSION, '8.1.0', '<')) + if (version_compare(PHP_VERSION, '8.2.0', '<')) { $this->response_helper->add_error_message('PHP_VERSION_REQD', 'PHP_VERSION_REQD_EXPLAIN'); diff --git a/vagrant/after.sh b/vagrant/after.sh index 829a28a25dd..a6e23d46dd4 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -1,6 +1,6 @@ #!/bin/sh -PHP_VERSION="8.1" +PHP_VERSION="8.2" PHPBB_PATH="/home/vagrant/phpbb" PHPBB_CONFIG="${PHPBB_PATH}/phpBB/config.php" PHPBB_INSTALL="${PHPBB_PATH}/vagrant/phpbb-install-config.yml" diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml index 0924206cd53..fd1e90d355c 100644 --- a/vagrant/bootstrap.yaml +++ b/vagrant/bootstrap.yaml @@ -18,7 +18,7 @@ sites: - map: phpbb.app to: "/home/vagrant/phpbb/phpBB" type: apache - php: "8.1" + php: "8.2" # blackfire: # - id: foo From afa19ef74b3c82d05131253ab6e3cc2041072935 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 4 Dec 2025 20:29:49 +0100 Subject: [PATCH 1007/1214] [ticket/17556] Update supported dbms versions PHPBB-17556 --- phpBB/docs/INSTALL.html | 14 +++++++------- phpBB/docs/README.html | 7 +++---- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 06557dca6d3..cb39e0ccf90 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -133,18 +133,18 @@

        Install

        -

        phpBB 3.3.x has a few requirements which must be met before you are able to install and use it.

        +

        phpBB 4.0.x has a few requirements which must be met before you are able to install and use it.

        • A webserver or web hosting account running on any major Operating System with support for PHP
        • A SQL database system, one of:
            -
          • MySQL 4.1.3 or above (MySQLi required)
            • -
          • MariaDB 5.1 or above
            • -
          • PostgreSQL 9.4+
            • -
          • SQLite 3.6.15+
            • -
          • MS SQL Server 2000 or above (via ODBC or the native adapter)
            • -
          • Oracle
            • +
          • MySQL 8.0 or above (MySQLi required)
            • +
          • MariaDB 10.2.7 or above
            • +
          • PostgreSQL 9.5 or above
            • +
          • SQLite 3.8.3 or above
            • +
          • MS SQL Server 2012 or above
            • +
          • Oracle 12.1.0.2 or above
        • PHP 8.2.0+ up to and including PHP 8.5 with support for the database you intend to use.
          • diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html index 80d81b484f1..7a5644f764e 100644 --- a/phpBB/docs/README.html +++ b/phpBB/docs/README.html @@ -106,7 +106,6 @@

          Readme

        • Updates from phpBB 3.0 RC1, 3.1 RC1 and 3.2 RC1 to the latest version
        • Note: if using the Advanced Update Package, updates are supported from phpBB 3.0.2 onward. To update a pre-3.0.2 installation, first update to 3.0.2 and then update to the current version.
        • Conversions from phpBB 2.0.x to the latest version
          • -
        • New installations of phpBB 3.2.x - only the latest released version
        • New installations of phpBB 3.3.x - only the latest released version
        @@ -264,9 +263,9 @@

        Readme

        If you do post a new bug (i.e. one that isn't already listed in the bug tracker) first make sure that you have logged in (your username and password are the same as for the community forums) then please include the following details:

          -
        • Your server type/version, e.g. Apache 2.2.3, IIS 7, Sambar, etc.
          • +
        • Your server type/version, e.g. Apache 2.4.65, IIS 10, Sambar, etc.
        • PHP version and mode of operation, e.g. PHP 8.2.0 as a module, PHP 8.2.3 running as CGI, etc.
          • -
        • DB type/version, e.g. MySQL 5.0.77, PostgreSQL 9.0.6, MSSQL Server 2000 (via ODBC), etc.
          • +
        • DB type/version, e.g. MySQL 8.0.44, PostgreSQL 9.5.6, MSSQL Server 2012 (via ODBC), etc.

        The relevant database type/version is listed within the administration control panel.

        @@ -327,7 +326,7 @@

        Readme

        Please remember that running any application on a development (unstable, e.g. a beta release) version of PHP can lead to strange/unexpected results which may appear to be bugs in the application. Therefore, we recommend you upgrade to the newest stable version of PHP before running phpBB. If you are running a development version of PHP please check any bugs you find on a system running a stable release before submitting.

        -

        This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 4.1.3, 4.x, 5.x, MariaDB 5.x, PostgreSQL 8.x, Oracle 8 and SQLite 3. Versions of PHP used range from 8.2.x to 8.3.x, 8.4.x and 8.5.x.

        +

        This board has been developed and tested under Linux and Windows (amongst others) running Apache using MySQLi 8.0 to 9.4, MariaDB 10.2 to 10.11, PostgreSQL 9.5 to 15, Oracle 12 and SQLite 3. Versions of PHP used range from 8.2.x to 8.3.x, 8.4.x and 8.5.x.

        7.i. Notice on PHP security issues

        From a3aae2860ce4fa6068a8313cb1003956c315eea9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 6 Dec 2025 11:52:11 +0100 Subject: [PATCH 1008/1214] [ticket/17556] Use new Yaml flags PHPBB-17556 --- phpBB/develop/create_schema_files.php | 4 +++- phpBB/phpbb/install/console/command/install/config/show.php | 2 +- .../phpbb/install/console/command/install/config/validate.php | 2 +- phpBB/phpbb/install/console/command/install/install.php | 2 +- phpBB/phpbb/install/console/command/update/config/show.php | 2 +- .../phpbb/install/console/command/update/config/validate.php | 2 +- phpBB/phpbb/install/console/command/update/update.php | 2 +- .../module/install_database/task/create_schema_file.php | 3 ++- tests/test_framework/phpbb_database_test_case.php | 3 ++- 9 files changed, 13 insertions(+), 9 deletions(-) diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index 82d00fc5ad5..7766faaf672 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -18,6 +18,8 @@ * If you overwrite the original schema files please make sure you save the file with UNIX linefeeds. */ +use Symfony\Component\Yaml\Yaml; + $schema_path = __DIR__ . '/../install/schemas/'; $supported_dbms = array( 'mssql', @@ -87,7 +89,7 @@ public function createSchemaManager($connection): \Doctrine\DBAL\Schema\Abstract $db_tools = $factory->get($db_doctrine, true); $db_tools->set_table_prefix($table_prefix); -$tables_data = \Symfony\Component\Yaml\Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml'); +$tables_data = Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); $tables = []; foreach ($tables_data['parameters'] as $parameter => $table) diff --git a/phpBB/phpbb/install/console/command/install/config/show.php b/phpBB/phpbb/install/console/command/install/config/show.php index 11c5af6094a..4f89087f04e 100644 --- a/phpBB/phpbb/install/console/command/install/config/show.php +++ b/phpBB/phpbb/install/console/command/install/config/show.php @@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int try { - $config = Yaml::parse(file_get_contents($config_file)); + $config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); } catch (ParseException $e) { diff --git a/phpBB/phpbb/install/console/command/install/config/validate.php b/phpBB/phpbb/install/console/command/install/config/validate.php index 4a044ecc17e..2521fce7516 100644 --- a/phpBB/phpbb/install/console/command/install/config/validate.php +++ b/phpBB/phpbb/install/console/command/install/config/validate.php @@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int try { - $config = Yaml::parse(file_get_contents($config_file)); + $config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); } catch (ParseException $e) { diff --git a/phpBB/phpbb/install/console/command/install/install.php b/phpBB/phpbb/install/console/command/install/install.php index 3bc1778a306..8461c7a7189 100644 --- a/phpBB/phpbb/install/console/command/install/install.php +++ b/phpBB/phpbb/install/console/command/install/install.php @@ -126,7 +126,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int try { - $config = Yaml::parse(file_get_contents($config_file)); + $config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); } catch (ParseException $e) { diff --git a/phpBB/phpbb/install/console/command/update/config/show.php b/phpBB/phpbb/install/console/command/update/config/show.php index 1023734cc8d..f35b55ba87c 100644 --- a/phpBB/phpbb/install/console/command/update/config/show.php +++ b/phpBB/phpbb/install/console/command/update/config/show.php @@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int try { - $config = Yaml::parse(file_get_contents($config_file)); + $config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); } catch (ParseException $e) { diff --git a/phpBB/phpbb/install/console/command/update/config/validate.php b/phpBB/phpbb/install/console/command/update/config/validate.php index 2f27ea1c728..ba36f06fb24 100644 --- a/phpBB/phpbb/install/console/command/update/config/validate.php +++ b/phpBB/phpbb/install/console/command/update/config/validate.php @@ -96,7 +96,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int try { - $config = Yaml::parse(file_get_contents($config_file)); + $config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); } catch (ParseException $e) { diff --git a/phpBB/phpbb/install/console/command/update/update.php b/phpBB/phpbb/install/console/command/update/update.php index e3ce381cab0..036bf6f766d 100644 --- a/phpBB/phpbb/install/console/command/update/update.php +++ b/phpBB/phpbb/install/console/command/update/update.php @@ -124,7 +124,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int try { - $config = Yaml::parse(file_get_contents($config_file)); + $config = Yaml::parse(file_get_contents($config_file), Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); } catch (ParseException $e) { diff --git a/phpBB/phpbb/install/module/install_database/task/create_schema_file.php b/phpBB/phpbb/install/module/install_database/task/create_schema_file.php index 20615c134a8..250b19f46b5 100644 --- a/phpBB/phpbb/install/module/install_database/task/create_schema_file.php +++ b/phpBB/phpbb/install/module/install_database/task/create_schema_file.php @@ -15,6 +15,7 @@ use phpbb\db\doctrine\connection_factory; use phpbb\install\exception\resource_limit_reached_exception; +use Symfony\Component\Yaml\Yaml; /** * Create database schema @@ -146,7 +147,7 @@ public function run() $factory = new \phpbb\db\tools\factory(); $db_tools = $factory->get($this->db_doctrine, true); $db_tools->set_table_prefix($table_prefix); - $tables_data = \Symfony\Component\Yaml\Yaml::parseFile($this->phpbb_root_path . '/config/default/container/tables.yml'); + $tables_data = Yaml::parseFile($this->phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); $tables = []; foreach ($tables_data['parameters'] as $parameter => $table) { diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index de8a605f2af..0df91f9e83b 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -12,6 +12,7 @@ */ use PHPUnit\DbUnit\TestCase; +use Symfony\Component\Yaml\Yaml; abstract class phpbb_database_test_case extends TestCase { @@ -392,7 +393,7 @@ public static function get_core_tables() : array if (empty($core_tables)) { - $tables_yml_data = \Symfony\Component\Yaml\Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml'); + $tables_yml_data = Yaml::parseFile($phpbb_root_path . '/config/default/container/tables.yml', Yaml::PARSE_EXCEPTION_ON_INVALID_TYPE); foreach ($tables_yml_data['parameters'] as $parameter => $table) { From 4cd5589eaa15fe658a3c9089be812659180724b5 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 6 Dec 2025 11:54:02 +0100 Subject: [PATCH 1009/1214] [ticket/17556] Remove mbstring requirement since we have polyfill PHPBB-17556 --- phpBB/docs/INSTALL.html | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index cb39e0ccf90..0752d2c5071 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -151,7 +151,6 @@

        Install

      • The following PHP modules are required:
        • json
          • -
        • mbstring
        • XML support
        • From c4263affa907d9a6329b215cb8e0fdb0e1c7c765 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 7 Dec 2025 14:11:50 -0800 Subject: [PATCH 1010/1214] [ticket/17591] Update Code Sniffer to v4 PHPBB-17591 --- .../Sniffs/Namespaces/UnusedUseSniff.php | 86 +++++++++++++++---- phpBB/composer.json | 2 +- phpBB/composer.lock | 25 +++--- 3 files changed, 78 insertions(+), 35 deletions(-) diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 7cf5f64baf5..7c5a52e8f96 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -27,6 +27,24 @@ class UnusedUseSniff implements Sniff T_WHITESPACE, ]; + private function getNameTokens() + { + $tokens = [T_NS_SEPARATOR, T_STRING]; + if (defined('T_NAME_QUALIFIED')) + { + $tokens[] = T_NAME_QUALIFIED; + } + if (defined('T_NAME_FULLY_QUALIFIED')) + { + $tokens[] = T_NAME_FULLY_QUALIFIED; + } + if (defined('T_NAME_RELATIVE')) + { + $tokens[] = T_NAME_RELATIVE; + } + return $tokens; + } + /** * {@inheritdoc} */ @@ -71,9 +89,25 @@ public function process(File $phpcsFile, $stackPtr) $tokens = $phpcsFile->getTokens(); - $class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1)); + $class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($stackPtr + 1)); - $class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true); + // Handle PHPCS v4 T_NAME_QUALIFIED tokens + if (isset($tokens[$class_name_start]) && + (defined('T_NAME_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_QUALIFIED || + defined('T_NAME_FULLY_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_FULLY_QUALIFIED || + defined('T_NAME_RELATIVE') && $tokens[$class_name_start]['code'] === T_NAME_RELATIVE)) + { + $name_full = $tokens[$class_name_start]['content']; + $class_name_end = $class_name_start + 1; + $parts = explode('\\', $name_full); + $name_short = end($parts); + } + else + { + $class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true); + $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)); + $name_short = $tokens[$class_name_end - 1]['content']; + } $aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true); if ($aliasing_as_position !== false) @@ -82,11 +116,6 @@ public function process(File $phpcsFile, $stackPtr) $name_short = $tokens[$alias_position]['content']; $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); } - else - { - $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)); - $name_short = $tokens[$class_name_end - 1]['content']; - } if ($tokens[$class_name_start]['content'] === 'function' && $tokens[$class_name_start + 1]['code'] === T_WHITESPACE) @@ -127,9 +156,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name { $old_simple_statement = $simple_statement; - $simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1)); + $simple_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($simple_statement + 1)); - if ($simple_class_name_start === false) { + if ($simple_class_name_start === false) + { continue; } @@ -137,7 +167,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name $simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start))); - $ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok; + if (!empty($simple_class_name)) + { + $ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok; + } } } @@ -152,7 +185,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name $paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start))); - $ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok; + if (!empty($paamayim_nekudotayim_class_name)) + { + $ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok; + } } // Checks in implements @@ -166,12 +202,15 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name { $old_implemented_class = $implemented_class; - $implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1)); + $implements_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($implemented_class - 1)); $implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true); $implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start))); - $ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok; + if (!empty($implements_class_name)) + { + $ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok; + } } } @@ -192,7 +231,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name $params = $phpcsFile->getMethodParameters($function_declaration); foreach ($params as $param) { - $ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok; + if (!empty($param['type_hint'])) + { + $ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok; + } } } @@ -202,12 +244,15 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name { $old_catch = $catch; - $caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1); + $caught_class_name_start = $phpcsFile->findNext($this->getNameTokens(), $catch + 1); $caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, null, true); $caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start))); - $ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok; + if (!empty($caught_class_name)) + { + $ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok; + } } $old_use = $stackPtr; @@ -227,11 +272,14 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name continue; } - $class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $use + 1, null, false, null, true); + $class_name_start = $phpcsFile->findNext($this->getNameTokens(), $use + 1, null, false, null, true); $class_name_end = $phpcsFile->findNext(self::FIND, $class_name_start + 1, null, true, null, true); $found_name = trim($phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start))); - $ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok; + if (!empty($found_name)) + { + $ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok; + } } return $ok; @@ -252,7 +300,7 @@ private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_fu ); $position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1); - if ($found_start === null) + if ($found_start === null || $found_start === false) { continue; } diff --git a/phpBB/composer.json b/phpBB/composer.json index 2f559733f76..42271c2da05 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -62,7 +62,7 @@ "phing/phing": "~2.4", "phpunit/dbunit": "~4.0", "phpunit/phpunit": "^7.0", - "squizlabs/php_codesniffer": "~3.4", + "squizlabs/php_codesniffer": "^4.0", "symfony/browser-kit": "~3.4", "symfony/css-selector": "~3.4", "symfony/dom-crawler": "~3.4" diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 54c3c22aac8..ff18af9dd2d 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eb658f95a4047347f31406a96a021c80", + "content-hash": "b63d9eb2d41744fe5532d47955802f7e", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -4702,37 +4702,32 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "65ff2489553b83b4597e89c3b8b721487011d186" + "reference": "0525c73950de35ded110cffafb9892946d7771b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/65ff2489553b83b4597e89c3b8b721487011d186", - "reference": "65ff2489553b83b4597e89c3b8b721487011d186", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5", + "reference": "0525c73950de35ded110cffafb9892946d7771b5", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31" }, "bin": [ "bin/phpcbf", "bin/phpcs" ], "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "notification-url": "https://packagist.org/downloads/", "license": [ "BSD-3-Clause" @@ -4751,7 +4746,7 @@ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.", "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", @@ -4782,7 +4777,7 @@ "type": "thanks_dev" } ], - "time": "2025-05-11T03:36:00+00:00" + "time": "2025-11-10T16:43:36+00:00" }, { "name": "symfony/browser-kit", @@ -5110,5 +5105,5 @@ "platform-overrides": { "php": "7.2" }, - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.6.0" } From a9fcf738b98af275e53774c3ad5a6dee34fa66ff Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 7 Dec 2025 14:22:55 -0800 Subject: [PATCH 1011/1214] [ticket/17591] Allow eval on legacy core files that legitametely use it PHPBB-17591 --- build/code_sniffer/ruleset-php-legacy-core.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/build/code_sniffer/ruleset-php-legacy-core.xml b/build/code_sniffer/ruleset-php-legacy-core.xml index 55f2461a04a..c5dd34d5fea 100644 --- a/build/code_sniffer/ruleset-php-legacy-core.xml +++ b/build/code_sniffer/ruleset-php-legacy-core.xml @@ -8,4 +8,11 @@ + + + */install/convert/convertor.php + */includes/functions_module.php + */includes/functions_convert.php + + From 7faf8e55b4ba45211ed24c097c5411fc984a0e45 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 7 Dec 2025 15:01:02 -0800 Subject: [PATCH 1012/1214] [ticket/17591] Sniff ext dir only if it contains PHP files PHPBB-17591 --- build/build.xml | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/build/build.xml b/build/build.xml index 3bd584b1b88..f8ea1db2dc5 100644 --- a/build/build.xml +++ b/build/build.xml @@ -106,13 +106,22 @@ --ignore=${sniffIgnoreList} phpBB" dir="." returnProperty="retval-php-legacy" passthru="true" /> - + + + + + + + + + + From eb31be134b00d02706cf2e161a2e8741070f44bd Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 8 Dec 2025 07:49:37 -0800 Subject: [PATCH 1013/1214] [ticket/17591] Update annotations for bypassing eval where legitimate PHPBB-17591 --- build/code_sniffer/ruleset-php-legacy-core.xml | 7 ------- phpBB/includes/functions_convert.php | 2 ++ phpBB/includes/functions_module.php | 2 ++ phpBB/install/convert/convertor.php | 14 ++++++++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/build/code_sniffer/ruleset-php-legacy-core.xml b/build/code_sniffer/ruleset-php-legacy-core.xml index c5dd34d5fea..55f2461a04a 100644 --- a/build/code_sniffer/ruleset-php-legacy-core.xml +++ b/build/code_sniffer/ruleset-php-legacy-core.xml @@ -8,11 +8,4 @@ - - - */install/convert/convertor.php - */includes/functions_module.php - */includes/functions_convert.php - - diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index f980ab200d1..9f145b44d36 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1278,7 +1278,9 @@ function restore_config($schema) $var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'"; $exec = '$config_value = ' . $m[1] . '(' . $var . ');'; // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($exec); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } else diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 573c4146d18..41e660cdfe6 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -469,7 +469,9 @@ static function module_auth($module_auth, $forum_id) $is_auth = false; // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval('$is_auth = (int) (' . $module_auth . ');'); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd return $is_auth; diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php index b40b53cdb59..d433333c430 100644 --- a/phpBB/install/convert/convertor.php +++ b/phpBB/install/convert/convertor.php @@ -454,7 +454,9 @@ function convert_data($converter) if (!empty($convert->convertor['execute_first'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_first']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } @@ -526,7 +528,9 @@ function convert_data($converter) if (!empty($schema['execute_first'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($schema['execute_first']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } @@ -593,7 +597,9 @@ function convert_data($converter) if (!empty($schema['execute_always'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($schema['execute_always']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } @@ -1110,7 +1116,9 @@ function jump($converter, $jump, $last_statement) if (!is_array($convert->convertor['execute_last'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } else @@ -1118,7 +1126,9 @@ function jump($converter, $jump, $last_statement) while ($last_statement < count($convert->convertor['execute_last'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last'][$last_statement]); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd $this->template->assign_block_vars('checks', array( @@ -1486,7 +1496,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($execution); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } } @@ -1541,7 +1553,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($execution); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } } From 078f40d0f9f7617b5fcfda608fd5ec6703213871 Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 10 Dec 2025 10:56:14 +0700 Subject: [PATCH 1014/1214] [ticket/17592] Translate "No match found!!!" if no mention entry was found PHPBB-17592 --- phpBB/assets/javascript/mentions.js | 4 ++++ phpBB/language/en/posting.php | 1 + phpBB/styles/prosilver/template/posting_buttons.html | 2 ++ 3 files changed, 7 insertions(+) diff --git a/phpBB/assets/javascript/mentions.js b/phpBB/assets/javascript/mentions.js index efd57bc9731..803d7053ea6 100644 --- a/phpBB/assets/javascript/mentions.js +++ b/phpBB/assets/javascript/mentions.js @@ -290,6 +290,10 @@ selectClass: 'is-active', itemClass: 'mention-item', menuItemTemplate, + noMatchTemplate() { + const returnTemplate = (typeof mention_no_match_found === 'undefined') ? 'No match found' : mention_no_match_found; + return '
      • ' + returnTemplate + '
        • '; + }, selectTemplate(item) { return '[mention ' + (item.type === 'g' ? 'group_id=' : 'user_id=') + item.id + ']' + item.name + '[/mention]'; }, diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index fd629f4aef4..6b96f0977b0 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -158,6 +158,7 @@ 2 => 'Your images may only be up to %d pixels wide.', ), + 'MENTION_NO_MATCH_FOUND' => 'No match found', 'MESSAGE_BODY_EXPLAIN' => array( 0 => '', // zero means no limit, so we don't view a message here. 1 => 'Enter your message here, it may contain no more than %d character.', diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 85e05a0d491..3463f97ad10 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -10,6 +10,8 @@ var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[size=]','[/size]', {custom_tags.BBCODE_NAME}); var imageTag = false; + var mention_no_match_found = '{{ lang('MENTION_NO_MATCH_FOUND')|e('js') }}'; + function change_palette() { phpbb.toggleDisplay('colour_palette'); From 1359703d59add10eb47ed4a7689dcfc2439ff541 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 29 Nov 2025 13:28:44 +0100 Subject: [PATCH 1015/1214] [ticket/17587] Move mark notification read to controller PHPBB-17587 --- .../container/services_notification.yml | 12 ++ .../config/default/routing/notifications.yml | 6 + phpBB/config/default/routing/routing.yml | 4 + phpBB/index.php | 59 -------- .../notification/controller/mark_read.php | 137 ++++++++++++++++++ phpBB/phpbb/notification/type/base.php | 13 +- tests/mock/notification_type_post.php | 3 +- tests/notification/base.php | 1 + .../fixtures/services_notification.yml | 6 + .../notification_method_email_test.php | 1 + .../notification_method_webpush_test.php | 5 + tests/notification/submit_post_base.php | 1 + tests/notification/user_list_trim_test.php | 2 +- tests/ucp/controller_webpush_test.php | 4 + 14 files changed, 188 insertions(+), 66 deletions(-) create mode 100644 phpBB/config/default/routing/notifications.yml create mode 100644 phpBB/phpbb/notification/controller/mark_read.php diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index ccf16223cf9..b3ff08586dd 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -26,6 +26,7 @@ services: notification.type.base: abstract: true arguments: + - '@controller.helper' - '@dbal.conn' - '@language' - '@user' @@ -248,3 +249,14 @@ services: - '%tables.push_subscriptions%' tags: - { name: notification.method } + +# ----- Notification's controllers ----- + notification.controller.mark_read: + class: phpbb\notification\controller\mark_read + arguments: + - '@event_dispatcher' + - '@language' + - '@notification_manager' + - '@request' + - '@user' + - '%core.root_path%' diff --git a/phpBB/config/default/routing/notifications.yml b/phpBB/config/default/routing/notifications.yml new file mode 100644 index 00000000000..4a0f3d56ad4 --- /dev/null +++ b/phpBB/config/default/routing/notifications.yml @@ -0,0 +1,6 @@ +phpbb_notifications_mark_read: + path: /mark-read/{id} + defaults: + _controller: notification.controller.mark_read:handle + requirements: + id: \d+ diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 3a6f6fbcb1e..2e2638741c3 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -37,6 +37,10 @@ phpbb_mention_controller: methods: [GET, POST] defaults: { _controller: mention.controller:handle } +phpbb_notifications: + resource: notifications.yml + prefix: /notifications + phpbb_report_routing: resource: report.yml diff --git a/phpBB/index.php b/phpBB/index.php index bc7c1a4707f..4353264b213 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -11,9 +11,6 @@ * */ -/** -*/ - /** * @ignore */ @@ -28,62 +25,6 @@ $auth->acl($user->data); $user->setup('viewforum'); -// Mark notifications read -if (($mark_notification = $request->variable('mark_notification', 0))) -{ - if ($user->data['user_id'] == ANONYMOUS) - { - if ($request->is_ajax()) - { - trigger_error('LOGIN_REQUIRED'); - } - login_box('', $user->lang['LOGIN_REQUIRED']); - } - - if (check_link_hash($request->variable('hash', ''), 'mark_notification_read')) - { - /* @var $phpbb_notifications \phpbb\notification\manager */ - $phpbb_notifications = $phpbb_container->get('notification_manager'); - - $notification = $phpbb_notifications->load_notifications('notification.method.board', array( - 'notification_id' => $mark_notification, - )); - - if (isset($notification['notifications'][$mark_notification])) - { - $notification = $notification['notifications'][$mark_notification]; - - $notification->mark_read(); - - /** - * You can use this event to perform additional tasks or redirect user elsewhere. - * - * @event core.index_mark_notification_after - * @var int mark_notification Notification ID - * @var \phpbb\notification\type\type_interface notification Notification instance - * @since 3.2.6-RC1 - */ - $vars = array('mark_notification', 'notification'); - extract($phpbb_dispatcher->trigger_event('core.index_mark_notification_after', compact($vars))); - - if ($request->is_ajax()) - { - $json_response = new \phpbb\json_response(); - $json_response->send(array( - 'success' => true, - )); - } - - if (($redirect = $request->variable('redirect', ''))) - { - redirect(append_sid($phpbb_root_path . $redirect)); - } - - redirect($notification->get_redirect_url()); - } - } -} - display_forums('', $config['load_moderators']); /** @var \phpbb\group\helper $group_helper */ diff --git a/phpBB/phpbb/notification/controller/mark_read.php b/phpBB/phpbb/notification/controller/mark_read.php new file mode 100644 index 00000000000..0371c71f51c --- /dev/null +++ b/phpBB/phpbb/notification/controller/mark_read.php @@ -0,0 +1,137 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\notification\controller; + +use phpbb\event\dispatcher; +use phpbb\exception\http_exception; +use phpbb\language\language; +use phpbb\notification\manager; +use phpbb\notification\type\type_interface; +use phpbb\request\request; +use phpbb\user; +use Symfony\Component\HttpFoundation\JsonResponse; +use Symfony\Component\HttpFoundation\RedirectResponse; +use Symfony\Component\HttpFoundation\Response; + +class mark_read +{ + /** @var dispatcher */ + protected $dispatcher; + + /** @var language */ + protected $language; + + /** @var manager */ + protected $manager; + + /** @var request */ + protected $request; + + /** @var user */ + protected $user; + + /** @var string */ + protected $phpbb_root_path; + + /** + * Constructor + * + * @param dispatcher $dispatcher Event dispatcher + * @param language $language Language object + * @param manager $manager Notification manager + * @param request $request Request object + * @param user $user User object + * @param string $phpbb_root_path phpBB root path + */ + public function __construct(dispatcher $dispatcher, language $language, manager $manager, request $request, user $user, string $phpbb_root_path) + { + $this->dispatcher = $dispatcher; + $this->language = $language; + $this->manager = $manager; + $this->request = $request; + $this->user = $user; + $this->phpbb_root_path = $phpbb_root_path; + } + + /** + * Mark notification as read + * + * @param int $id Notification ID + * + * @return Response + * + * @throws http_exception + * + * @psalm-suppress InvalidArgument + */ + public function handle(int $id): Response + { + $mark_notification = $id; + + if ($this->user->data['user_id'] == ANONYMOUS) + { + if ($this->request->is_ajax()) + { + throw new http_exception(403, 'LOGIN_REQUIRED'); + } + login_box('', $this->language->lang('LOGIN_REQUIRED')); + } + + if (!check_link_hash($this->request->variable('hash', ''), 'mark_notification_read')) + { + // Link hash error + throw new http_exception(403, 'NOT_AUTHORISED'); + } + + $notification = $this->manager->load_notifications('notification.method.board', [ + 'notification_id' => $mark_notification, + ]); + + if (!isset($notification['notifications'][$mark_notification])) + { + // Notification id not found + throw new http_exception(404, 'PAGE_NOT_FOUND'); + } + + $notification = $notification['notifications'][$mark_notification]; + + $notification->mark_read(); + + /** + * You can use this event to perform additional tasks or redirect user elsewhere. + * + * @event core.index_mark_notification_after + * @var int mark_notification Notification ID + * @var type_interface notification Notification instance + * @since 3.2.6-RC1 + */ + $vars = ['mark_notification', 'notification']; + extract($this->dispatcher->trigger_event('core.index_mark_notification_after', compact($vars))); + + if ($this->request->is_ajax()) + { + $data = [ + 'success' => true, + ]; + return new JsonResponse($data); + } + + if (($redirect = $this->request->variable('redirect', ''))) + { + return new RedirectResponse(append_sid($this->phpbb_root_path . $redirect)); + } + + return new RedirectResponse($notification->get_redirect_url()); + } +} diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 70fa979a57f..009ea2ff887 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -21,6 +21,9 @@ abstract class base implements \phpbb\notification\type\type_interface /** @var \phpbb\notification\manager */ protected $notification_manager; + /** @var \phpbb\controller\helper|null */ + protected $controller_helper; + /** @var \phpbb\db\driver\driver_interface */ protected $db; @@ -76,6 +79,7 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Notification Type Base Constructor * + * @param \phpbb\controller\helper $controller_helper * @param \phpbb\db\driver\driver_interface $db * @param \phpbb\language\language $language * @param \phpbb\user $user @@ -84,8 +88,9 @@ abstract class base implements \phpbb\notification\type\type_interface * @param string $php_ext * @param string $user_notifications_table */ - public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\user $user, \phpbb\auth\auth $auth, $phpbb_root_path, $php_ext, $user_notifications_table) + public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\user $user, \phpbb\auth\auth $auth, $phpbb_root_path, $php_ext, $user_notifications_table) { + $this->controller_helper = $controller_helper; $this->db = $db; $this->language = $language; $this->user = $user; @@ -132,7 +137,6 @@ public function __get($name) return $this->data[$name] ?? null; } - /** * Magic method to set data on this notification * @@ -286,13 +290,12 @@ public function prepare_for_display() if ($this->get_url()) { - $u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&hash=' . $mark_hash); + $u_mark_read = $this->controller_helper->route('phpbb_notifications_mark_read', ['id' => $this->notification_id, 'hash' => $mark_hash]); } else { $redirect = (($this->user->page['page_dir']) ? $this->user->page['page_dir'] . '/' : '') . $this->user->page['page_name'] . (($this->user->page['query_string']) ? '?' . $this->user->page['query_string'] : ''); - - $u_mark_read = append_sid($this->phpbb_root_path . 'index.' . $this->php_ext, 'mark_notification=' . $this->notification_id . '&hash=' . $mark_hash . '&redirect=' . urlencode($redirect)); + $u_mark_read = $this->controller_helper->route('phpbb_notifications_mark_read', ['id' => $this->notification_id, 'hash' => $mark_hash, 'redirect' => $redirect]); } $avatar = $this->get_avatar(); diff --git a/tests/mock/notification_type_post.php b/tests/mock/notification_type_post.php index 4116fecf5e8..fbc82c9845f 100644 --- a/tests/mock/notification_type_post.php +++ b/tests/mock/notification_type_post.php @@ -21,9 +21,10 @@ class phpbb_mock_notification_type_post extends \phpbb\notification\type\post { - public function __construct($user_loader, $db, $cache, $language, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $user_notifications_table) + public function __construct($user_loader, $controller_helper, $db, $cache, $language, $user, $auth, $config, $phpbb_root_path, $php_ext, $notification_types_table, $user_notifications_table) { $this->user_loader = $user_loader; + $this->controller_helper = $controller_helper; $this->db = $db; $this->cache = $cache; $this->language = $language; diff --git a/tests/notification/base.php b/tests/notification/base.php index a018191d66f..4d080296156 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -102,6 +102,7 @@ protected function setUp(): void $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); $phpbb_container->set('config', $this->config); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); $phpbb_container->set('dbal.conn', $this->db); $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); diff --git a/tests/notification/fixtures/services_notification.yml b/tests/notification/fixtures/services_notification.yml index 69e6374f4cf..fd256f3016e 100644 --- a/tests/notification/fixtures/services_notification.yml +++ b/tests/notification/fixtures/services_notification.yml @@ -14,6 +14,9 @@ services: config: synthetic: true + controller.helper: + synthetic: true + dbal.conn: synthetic: true @@ -38,6 +41,9 @@ services: groupposition.teampage: synthetic: true + request: + synthetic: true + text_formatter.s9e.factory: synthetic: true diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 0634e3abd49..08819ae995a 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -79,6 +79,7 @@ protected function setUp(): void $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); $phpbb_container->set('config', $this->config); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); $phpbb_container->set('dbal.conn', $this->db); $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index d2e49579121..f07012dc003 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -92,6 +92,9 @@ protected function setUp(): void $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') ->disableOriginalConstructor() ->getMock(); + $controller_helper = $this->getMockBuilder('\phpbb\controller\helper') + ->disableOriginalConstructor() + ->getMock(); $db = $this->db = $this->new_dbal(); $config = $this->config = new \phpbb\config\config([ 'allow_privmsg' => true, @@ -133,12 +136,14 @@ protected function setUp(): void $phpbb_container->set('language', $this->language); $phpbb_container->set('config', $this->config); $phpbb_container->set('dbal.conn', $this->db); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); $phpbb_container->set('log', $this->log); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set('dispatcher', $this->phpbb_dispatcher); + $phpbb_container->set('event_dispatcher', $this->phpbb_dispatcher); $phpbb_container->setParameter('core.root_path', $phpbb_root_path); $phpbb_container->setParameter('core.php_ext', $phpEx); $phpbb_container->setParameter('tables.notifications', 'phpbb_notifications'); diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index d90a4736a84..3559f01a0db 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -135,6 +135,7 @@ protected function setUp(): void $phpbb_container->set('auth', $auth); $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); + $phpbb_container->set('controller.helper', $this->createMock('\phpbb\controller\helper')); $phpbb_container->set('log', new \phpbb\log\dummy()); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); $phpbb_container->set( diff --git a/tests/notification/user_list_trim_test.php b/tests/notification/user_list_trim_test.php index f895b895896..640adf6e4e4 100644 --- a/tests/notification/user_list_trim_test.php +++ b/tests/notification/user_list_trim_test.php @@ -66,7 +66,7 @@ protected function setUp(): void $user_loader->load_users(array(2, 3, 4, 5, 6)); $this->notification = new phpbb_mock_notification_type_post( - $user_loader, null, null, $lang, $user, null, null, $phpbb_root_path, $phpEx, null, null + $user_loader, null, null, null, $lang, $user, null, null, $phpbb_root_path, $phpEx, null, null ); } diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index 9539fa73dcc..4dade9862fc 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -188,6 +188,7 @@ public function test_get_user_notification() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->controller_helper, $this->db, $this->language, $this->user, @@ -242,6 +243,7 @@ public function test_get_user_notification_anonymous() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->controller_helper, $this->db, $this->language, $this->user, @@ -297,6 +299,7 @@ public function test_get_user_notification_anonymous_invalid_token() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->controller_helper, $this->db, $this->language, $this->user, @@ -345,6 +348,7 @@ public function test_get_user_notification_legacy() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->controller_helper, $this->db, $this->language, $this->user, From 25acb763d4758852cb01af24eba1fa07680dad2f Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 11 Dec 2025 07:09:43 -0800 Subject: [PATCH 1016/1214] [ticket/17591] Update CodeSniffer to v4 PHPBB-17591 --- build/build.xml | 23 +++-- .../Sniffs/Namespaces/UnusedUseSniff.php | 86 +++++++++++++++---- phpBB/composer.json | 2 +- phpBB/composer.lock | 18 ++-- phpBB/includes/functions_convert.php | 2 + phpBB/includes/functions_module.php | 2 + phpBB/install/convert/convertor.php | 14 +++ 7 files changed, 111 insertions(+), 36 deletions(-) diff --git a/build/build.xml b/build/build.xml index a181092a235..a1c5511457d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -106,13 +106,22 @@ --ignore=${sniffIgnoreList} phpBB" dir="." returnProperty="retval-php-legacy" passthru="true" /> - + + + + + + + + + + diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 4e78d87ce8e..3fa18a63fec 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -27,6 +27,24 @@ class UnusedUseSniff implements Sniff T_WHITESPACE, ]; + private function getNameTokens() + { + $tokens = [T_NS_SEPARATOR, T_STRING]; + if (defined('T_NAME_QUALIFIED')) + { + $tokens[] = T_NAME_QUALIFIED; + } + if (defined('T_NAME_FULLY_QUALIFIED')) + { + $tokens[] = T_NAME_FULLY_QUALIFIED; + } + if (defined('T_NAME_RELATIVE')) + { + $tokens[] = T_NAME_RELATIVE; + } + return $tokens; + } + /** * {@inheritdoc} */ @@ -82,9 +100,25 @@ public function process(File $phpcsFile, $stackPtr) $tokens = $phpcsFile->getTokens(); - $class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($stackPtr + 1)); + $class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($stackPtr + 1)); - $class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true); + // Handle PHPCS v4 T_NAME_QUALIFIED tokens + if (isset($tokens[$class_name_start]) && + (defined('T_NAME_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_QUALIFIED || + defined('T_NAME_FULLY_QUALIFIED') && $tokens[$class_name_start]['code'] === T_NAME_FULLY_QUALIFIED || + defined('T_NAME_RELATIVE') && $tokens[$class_name_start]['code'] === T_NAME_RELATIVE)) + { + $name_full = $tokens[$class_name_start]['content']; + $class_name_end = $class_name_start + 1; + $parts = explode('\\', $name_full); + $name_short = end($parts); + } + else + { + $class_name_end = $phpcsFile->findNext(self::FIND, ($stackPtr + 1), null, true); + $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)); + $name_short = $tokens[$class_name_end - 1]['content']; + } $aliasing_as_position = $phpcsFile->findNext(T_AS, $class_name_end, null, false, null, true); if ($aliasing_as_position !== false) @@ -93,11 +127,6 @@ public function process(File $phpcsFile, $stackPtr) $name_short = $tokens[$alias_position]['content']; $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); } - else - { - $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start)); - $name_short = $tokens[$class_name_end - 1]['content']; - } if ($tokens[$class_name_start]['content'] === 'function' && $tokens[$class_name_start + 1]['code'] === T_WHITESPACE) @@ -138,9 +167,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name { $old_simple_statement = $simple_statement; - $simple_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($simple_statement + 1)); + $simple_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($simple_statement + 1)); - if ($simple_class_name_start === false) { + if ($simple_class_name_start === false) + { continue; } @@ -148,7 +178,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name $simple_class_name = trim($phpcsFile->getTokensAsString($simple_class_name_start, ($simple_class_name_end - $simple_class_name_start))); - $ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok; + if (!empty($simple_class_name)) + { + $ok = $this->check($phpcsFile, $simple_class_name, $class_name_full, $class_name_short, $simple_statement) || $ok; + } } } @@ -163,7 +196,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name $paamayim_nekudotayim_class_name = trim($phpcsFile->getTokensAsString($paamayim_nekudotayim_class_name_start + 1, ($paamayim_nekudotayim_class_name_end - $paamayim_nekudotayim_class_name_start))); - $ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok; + if (!empty($paamayim_nekudotayim_class_name)) + { + $ok = $this->check($phpcsFile, $paamayim_nekudotayim_class_name, $class_name_full, $class_name_short, $paamayim_nekudotayim) || $ok; + } } // Checks in implements @@ -177,12 +213,15 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name { $old_implemented_class = $implemented_class; - $implements_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), ($implemented_class - 1)); + $implements_class_name_start = $phpcsFile->findNext($this->getNameTokens(), ($implemented_class - 1)); $implements_class_name_end = $phpcsFile->findNext(self::FIND, ($implemented_class - 1), null, true); $implements_class_name = trim($phpcsFile->getTokensAsString($implements_class_name_start, ($implements_class_name_end - $implements_class_name_start))); - $ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok; + if (!empty($implements_class_name)) + { + $ok = $this->check($phpcsFile, $implements_class_name, $class_name_full, $class_name_short, $implements) || $ok; + } } } @@ -203,7 +242,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name $params = $phpcsFile->getMethodParameters($function_declaration); foreach ($params as $param) { - $ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok; + if (!empty($param['type_hint'])) + { + $ok = $this->check($phpcsFile, $param['type_hint'], $class_name_full, $class_name_short, $function_declaration) || $ok; + } } $method_properties = $phpcsFile->getMethodProperties($function_declaration); @@ -216,12 +258,15 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name { $old_catch = $catch; - $caught_class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $catch + 1); + $caught_class_name_start = $phpcsFile->findNext($this->getNameTokens(), $catch + 1); $caught_class_name_end = $phpcsFile->findNext(self::FIND, $caught_class_name_start + 1, null, true); $caught_class_name = trim($phpcsFile->getTokensAsString($caught_class_name_start, ($caught_class_name_end - $caught_class_name_start))); - $ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok; + if (!empty($caught_class_name)) + { + $ok = $this->check($phpcsFile, $caught_class_name, $class_name_full, $class_name_short, $catch) || $ok; + } } $old_use = $stackPtr; @@ -241,11 +286,14 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name continue; } - $class_name_start = $phpcsFile->findNext(array(T_NS_SEPARATOR, T_STRING), $use + 1, null, false, null, true); + $class_name_start = $phpcsFile->findNext($this->getNameTokens(), $use + 1, null, false, null, true); $class_name_end = $phpcsFile->findNext(self::FIND, $class_name_start + 1, null, true, null, true); $found_name = trim($phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start))); - $ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok; + if (!empty($found_name)) + { + $ok = $this->check($phpcsFile, $found_name, $class_name_full, $class_name_short, $use) || $ok; + } } return $ok; @@ -266,7 +314,7 @@ private function findFunctionUsage(File $phpcsFile, $stackPtr, $tokens, $name_fu ); $position = $phpcsFile->findNext(T_OPEN_PARENTHESIS, $position + 1); - if ($found_start === null) + if ($found_start === null || $found_start === false) { continue; } diff --git a/phpBB/composer.json b/phpBB/composer.json index 3762817907c..594d9b9f16c 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -65,7 +65,7 @@ "misantron/dbunit": "~5.0", "phing/phing": "~2.4", "phpunit/phpunit": "^10.0", - "squizlabs/php_codesniffer": "~3.4", + "squizlabs/php_codesniffer": "^4.0", "symfony/browser-kit": "^7.4", "symfony/css-selector": "^7.4", "symfony/dom-crawler": "^7.4", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 600ce1dc6a5..19ca12ccb0f 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a100d158a331a9dc8b112c1c850e38b4", + "content-hash": "82ec75bff268307a263f6ff9851df677", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -10334,26 +10334,26 @@ }, { "name": "squizlabs/php_codesniffer", - "version": "3.13.5", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git", - "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4" + "reference": "0525c73950de35ded110cffafb9892946d7771b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4", - "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4", + "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0525c73950de35ded110cffafb9892946d7771b5", + "reference": "0525c73950de35ded110cffafb9892946d7771b5", "shasum": "" }, "require": { "ext-simplexml": "*", "ext-tokenizer": "*", "ext-xmlwriter": "*", - "php": ">=5.4.0" + "php": ">=7.2.0" }, "require-dev": { - "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" + "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31" }, "bin": [ "bin/phpcbf", @@ -10378,7 +10378,7 @@ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors" } ], - "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.", + "description": "PHP_CodeSniffer tokenizes PHP files and detects violations of a defined set of coding standards.", "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer", "keywords": [ "phpcs", @@ -10409,7 +10409,7 @@ "type": "thanks_dev" } ], - "time": "2025-11-04T16:30:35+00:00" + "time": "2025-11-10T16:43:36+00:00" }, { "name": "symfony/browser-kit", diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 9292281c1f3..4abc5aab0cb 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1125,7 +1125,9 @@ function restore_config($schema) $var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'"; $exec = '$config_value = ' . $m[1] . '(' . $var . ');'; // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($exec); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } else diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index d1f35107c50..e6adc4e7601 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -469,7 +469,9 @@ static function module_auth($module_auth, $forum_id) $is_auth = false; // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval('$is_auth = (int) (' . $module_auth . ');'); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd return $is_auth; diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php index 1f09943b504..1e69a57b193 100644 --- a/phpBB/install/convert/convertor.php +++ b/phpBB/install/convert/convertor.php @@ -446,7 +446,9 @@ function convert_data($converter) if (!empty($convert->convertor['execute_first'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_first']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } @@ -518,7 +520,9 @@ function convert_data($converter) if (!empty($schema['execute_first'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($schema['execute_first']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } @@ -585,7 +589,9 @@ function convert_data($converter) if (!empty($schema['execute_always'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($schema['execute_always']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } @@ -1102,7 +1108,9 @@ function jump($converter, $jump, $last_statement) if (!is_array($convert->convertor['execute_last'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last']); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } else @@ -1110,7 +1118,9 @@ function jump($converter, $jump, $last_statement) while ($last_statement < count($convert->convertor['execute_last'])) { // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last'][$last_statement]); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd $this->template->assign_block_vars('checks', array( @@ -1478,7 +1488,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($execution); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } } @@ -1533,7 +1545,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); // @codingStandardsIgnoreStart + // phpcs:disable Squiz.PHP.Eval eval($execution); + // phpcs:enable Squiz.PHP.Eval // @codingStandardsIgnoreEnd } } From 074a342fb8eebf54d42d6669047046a706e17e15 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 11 Dec 2025 07:50:24 -0800 Subject: [PATCH 1017/1214] [ticket/17591] Fix false positive sniffs on aliased namespaces PHPBB-17591 --- .../phpbb/Sniffs/Namespaces/UnusedUseSniff.php | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 3fa18a63fec..fe72b67c897 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -69,7 +69,7 @@ protected function check(File $phpcsFile, $found_name, $full_name, $short_name, $phpcsFile->addError($error, $stack_pointer, 'FullName'); } - /* + /* * Check for possible union types (like string|MyType|null) * and question mark nullable type syntax (like ?MyType) */ @@ -125,7 +125,20 @@ public function process(File $phpcsFile, $stackPtr) { $alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true); $name_short = $tokens[$alias_position]['content']; - $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); + + // Only recalculate name_full if it wasn't a single token (T_NAME_QUALIFIED) + // to avoid calculating it as 0 length string. Prevents incorrectly calculating the + // "full name" of the aliased class (resolving it to an empty string in some cases). + if (!isset($tokens[$class_name_start]) || + ( + (!defined('T_NAME_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_QUALIFIED) && + (!defined('T_NAME_FULLY_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_FULLY_QUALIFIED) && + (!defined('T_NAME_RELATIVE') || $tokens[$class_name_start]['code'] !== T_NAME_RELATIVE) + ) + ) + { + $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); + } } if ($tokens[$class_name_start]['content'] === 'function' From bc680bc06a5668cca06fe889f92306784f76f4ac Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 11 Dec 2025 08:02:15 -0800 Subject: [PATCH 1018/1214] [ticket/17591] Empty array offset fix PHPBB-17591 --- .../code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index fe72b67c897..42a0fc5288b 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -262,7 +262,10 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name } $method_properties = $phpcsFile->getMethodProperties($function_declaration); - $ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok; + if (!empty($method_properties['return_type'])) + { + $ok = $this->check($phpcsFile, $method_properties['return_type'], $class_name_full, $class_name_short, $function_declaration) || $ok; + } } // Checks in catch blocks From 3490dfdb0538670dc276f832af1b50ae6f09fbe2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 11 Dec 2025 07:54:01 -0800 Subject: [PATCH 1019/1214] [ticket/17591] Fix false positive sniffs on aliased namespaces PHPBB-17591 --- .../phpbb/Sniffs/Namespaces/UnusedUseSniff.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 7c5a52e8f96..571d5058ae8 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -114,7 +114,20 @@ public function process(File $phpcsFile, $stackPtr) { $alias_position = $phpcsFile->findNext(T_STRING, $aliasing_as_position, null, false, null, true); $name_short = $tokens[$alias_position]['content']; - $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); + + // Only recalculate name_full if it wasn't a single token (T_NAME_QUALIFIED) + // to avoid calculating it as 0 length string. Prevents incorrectly calculating the + // "full name" of the aliased class (resolving it to an empty string in some cases). + if (!isset($tokens[$class_name_start]) || + ( + (!defined('T_NAME_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_QUALIFIED) && + (!defined('T_NAME_FULLY_QUALIFIED') || $tokens[$class_name_start]['code'] !== T_NAME_FULLY_QUALIFIED) && + (!defined('T_NAME_RELATIVE') || $tokens[$class_name_start]['code'] !== T_NAME_RELATIVE) + ) + ) + { + $name_full = $phpcsFile->getTokensAsString($class_name_start, ($class_name_end - $class_name_start - 1)); + } } if ($tokens[$class_name_start]['content'] === 'function' From e875d0975ae3245bcf3d8f8e5116fdcbc028d9f5 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 12 Dec 2025 10:18:14 -0800 Subject: [PATCH 1020/1214] [ticket/17593] Allow functional tests on local servers with SSL PHPBB-17593 --- tests/RUNNING_TESTS.md | 9 +++++++++ tests/test_framework/phpbb_functional_test_case.php | 7 +++++++ tests/test_framework/phpbb_test_case_helpers.php | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index 81d7516c0bd..0470a09a148 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -175,6 +175,15 @@ on which to run tests. $phpbb_functional_url = 'http://localhost/phpBB3/'; +If your local server uses an SSL certificate with HTTPS, you may need to specify the +path to your security certificate for functional tests to run successfully. Set +`$path_to_ssl_cert` to the location of your certificate file (.pem or .crt). +If you can’t locate your certificate, or it still isn’t working, you can disable +SSL verification by setting this value to `false` (though this is less secure). +Note: You must keep `$phpbb_functional_url` set to `http`, since this option bypasses https. + + $path_to_ssl_cert = '/path/to/your/certificate.pem'; + Functional tests are automatically run, if '$phpbb_functional_url' is configured. If you only want the functional tests, run: diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index dd3b14e7152..957e035e9b1 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -89,6 +89,13 @@ protected function setUp(): void self::$cookieJar = new CookieJar; self::$client = new Goutte\Client(array(), null, self::$cookieJar); + // Disable SSL verification for local development with self-signed certificates + if (isset(self::$config['path_to_ssl_cert'])) + { + $guzzle_client = new \GuzzleHttp\Client(['verify' => self::$config['path_to_ssl_cert']]); + self::$client->setClient($guzzle_client); + } + // Clear the language array so that things // that were added in other tests are gone $this->lang = array(); diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index d22b1cb8fad..eb667e0336d 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -167,6 +167,11 @@ static public function get_test_config() $config['phpbb_functional_url'] = $phpbb_functional_url; } + if (isset($path_to_ssl_cert)) + { + $config['path_to_ssl_cert'] = $path_to_ssl_cert; + } + if (isset($phpbb_redis_host)) { $config['redis_host'] = $phpbb_redis_host; From 10aecb92644aedc83cecb1dcd962b83c02765b68 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 10 Oct 2025 22:02:45 +0200 Subject: [PATCH 1021/1214] [ticket/17566] Add default avatars based on username using css & html PHPBB-17566 --- phpBB/includes/ucp/ucp_pm_viewmessage.php | 1 + phpBB/memberlist.php | 1 + .../prosilver/template/memberlist_view.html | 23 ++++++++++++++----- .../template/ucp_pm_viewmessage.html | 10 +++++++- .../prosilver/template/viewtopic_body.html | 12 +++++++--- phpBB/styles/prosilver/theme/colours.css | 11 +++++++++ phpBB/styles/prosilver/theme/content.css | 17 +++++++++++++- phpBB/styles/prosilver/theme/responsive.css | 6 +++++ 8 files changed, 70 insertions(+), 11 deletions(-) diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index d418e498871..3aa4dc6ca75 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -214,6 +214,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row) 'MESSAGE_AUTHOR_FULL' => get_username_string('full', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'MESSAGE_AUTHOR_COLOUR' => get_username_string('colour', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'MESSAGE_AUTHOR' => get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), + 'MESSAGE_AUTHOR_ID' => $author_id, 'U_MESSAGE_AUTHOR' => get_username_string('profile', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username']), 'RANK_TITLE' => $user_info['rank_title'], diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 1170411f98e..4cf4cac950c 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -428,6 +428,7 @@ 'U_REMOVE_FOE' => ($foe && $foes_enabled) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=zebra&remove=1&mode=foes&usernames[]=' . $user_id) : '', 'U_CANONICAL' => generate_board_url() . '/' . append_sid("memberlist.$phpEx", 'mode=viewprofile&u=' . $user_id, true, ''), + 'USER_ID' => $user_id, ); /** diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 2a6d13847af..958face98b5 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -8,14 +8,25 @@

        {PAGE_TITLE}

        - + {% if AVATAR_HTML %}
        -
        {AVATAR_HTML}
        - -
        {RANK_TITLE}
        - +
        {{ AVATAR_HTML }}
        + {% EVENT memberlist_view_rank_avatar_before %} + {% if RANK_TITLE %}
        {{ RANK_TITLE }}
        {% endif %} + {% EVENT memberlist_view_rank_avatar_after %}
        - + {% else %} + {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} + {% set color_class = color_classes[USER_ID % 5] %} +
        +
        +
        {{ USERNAME|striptags|slice(0, 2)|upper }}
        +
        + {% EVENT memberlist_view_rank_avatar_before %} + {% if RANK_TITLE %}
        {{ RANK_TITLE }}
        {% endif %} + {% EVENT memberlist_view_rank_avatar_after %} +
        + {% endif %}
        diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 9300eb285a2..8dc596bfc42 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -29,7 +29,15 @@
        - {AUTHOR_AVATAR_HTML} + {% if AUTHOR_AVATAR_HTML %} + {{ AUTHOR_AVATAR_HTML }} + {% else %} + {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} + {% set color_class = color_classes[MESSAGE_AUTHOR_ID % 5] %} + +
        {{ MESSAGE_AUTHOR|striptags|slice(0, 2)|upper }}
        +         + {% endif %}
        {% apply spaceless %} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 447e32524d6..fbfb9ecb829 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -143,9 +143,15 @@

        {POLL_
        - - {postrow.POSTER_AVATAR_HTML}{postrow.POSTER_AVATAR_HTML} - + {% if postrow.POSTER_AVATAR_HTML %} + {% if postrow.U_POST_AUTHOR %}{{ postrow.POSTER_AVATAR_HTML|raw }}{% else %}{{ postrow.POSTER_AVATAR_HTML|raw }}{% endif %} + {% else %} + {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} + {% set color_class = color_classes[postrow.POSTER_ID % 5] %} +
        +
        {{ postrow.POST_AUTHOR|striptags|slice(0, 1)|upper }}
        +
        + {% endif %}
        diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index d45583f3c27..38007b303ce 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -991,6 +991,17 @@ dl.mini dt { background-color: #ededed; } +/* avatar placeholder colours */ +.avatar-color-0 { background-color: #d32f2f; } +.avatar-color-1 { background-color: #c2185b; } +.avatar-color-2 { background-color: #7b1fa2; } +.avatar-color-3 { background-color: #512da8; } +.avatar-color-4 { background-color: #303f9f; } + +.avatar-initials { + color: #ffffff; +} + /* colours and backgrounds for forms.css */ /* general form styles */ diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 07a4ddb325d..33a0d9b4c8b 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -805,7 +805,7 @@ fieldset.polls dd div { } /* Post-profile avatars */ -.postprofile .has-avatar .avatar-container { +.postprofile .avatar-container { overflow: hidden; margin-bottom: 3px; } @@ -822,6 +822,21 @@ fieldset.polls dd div { height: auto !important; } +.avatar-placeholder { + font-size: 36px; + font-weight: bold; + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + width: 80px; + height: 80px; +} + +.avatar-initials { + line-height: 1; +} + .postprofile .profile-posts a { font-weight: normal; } diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css index 0416598eaf8..a5f2ff207a7 100644 --- a/phpBB/styles/prosilver/theme/responsive.css +++ b/phpBB/styles/prosilver/theme/responsive.css @@ -574,6 +574,12 @@ max-height: 32px; } + .postprofile .avatar-placeholder { + font-size: 1rem; + width: 32px; + height: 32px; + } + .has-profile .postbody h3 { margin-right: 0 !important; margin-left: 0 !important; From d30f42bf529e6e63cae27287f1560272974cc549 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 10 Oct 2025 22:06:34 +0200 Subject: [PATCH 1022/1214] [ticket/17566] Unify number of characters for other pages as well PHPBB-17566 --- phpBB/styles/prosilver/template/memberlist_view.html | 2 +- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 958face98b5..a3fec16c0ea 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -20,7 +20,7 @@

        {PAGE_TITLE}

        {% set color_class = color_classes[USER_ID % 5] %}
        -
        {{ USERNAME|striptags|slice(0, 2)|upper }}
        +
        {{ USERNAME|striptags|slice(0, 1)|upper }}
        {% EVENT memberlist_view_rank_avatar_before %} {% if RANK_TITLE %}
        {{ RANK_TITLE }}
        {% endif %} diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 8dc596bfc42..f7a86280661 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -35,7 +35,7 @@ {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} {% set color_class = color_classes[MESSAGE_AUTHOR_ID % 5] %} -
        {{ MESSAGE_AUTHOR|striptags|slice(0, 2)|upper }}
        +
        {{ MESSAGE_AUTHOR|striptags|slice(0, 1)|upper }}
         {% endif %} From 89869e043d2ad7621e5f854e127e02f37647d1a1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Dec 2025 20:36:37 +0100 Subject: [PATCH 1023/1214] [ticket/17566] Adjust avatar handling via twig PHPBB-17566 --- phpBB/phpbb/avatar/manager.php | 5 ++ .../phpbb/template/twig/extension/avatar.php | 5 +- .../prosilver/template/viewtopic_body.html | 4 +- phpBB/viewtopic.php | 8 +--- tests/avatar/manager_test.php | 14 +++--- tests/template/extension_test.php | 48 +++++++++---------- tests/template/templates/avatar_group.html | 2 +- tests/template/templates/avatar_user.html | 2 +- 8 files changed, 43 insertions(+), 45 deletions(-) diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index f4fc16ab52c..ce47402def3 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -205,6 +205,11 @@ public static function clean_row($row, $prefix = '') $output = []; foreach ($row as $key => $value) { + if (!str_starts_with($key, $prefix ? "{$prefix}_avatar": 'avatar') && $key !== 'user_id' && $key !== 'group_id') + { + continue; + } + $key = preg_replace("#^(?:{$prefix}_)#", '', (string) $key); $output[$key] = $value; } diff --git a/phpBB/phpbb/template/twig/extension/avatar.php b/phpBB/phpbb/template/twig/extension/avatar.php index e10330301ef..2ae085194c8 100644 --- a/phpBB/phpbb/template/twig/extension/avatar.php +++ b/phpBB/phpbb/template/twig/extension/avatar.php @@ -63,19 +63,18 @@ public function getFunctions(): array * Get avatar for placing into templates. * * How to use in a template: - * - {{ avatar('mode', row, alt, ignore_config, lazy) }} + * - {{ avatar(row, alt, ignore_config, lazy) }} * * The mode and row (group_row or user_row) are required. * The other fields (alt|ignore_config|lazy) are optional. * * @return string The avatar HTML for the specified mode */ - public function get_avatar(environment $environment, string $mode, array $row, string|null $alt, bool|null $ignore_config, bool|null $lazy): string + public function get_avatar(environment $environment, array $row, string|null $alt = null, bool|null $ignore_config = null, bool|null $lazy = null): string { $alt = $alt ?? false; $ignore_config = $ignore_config ?? false; $lazy = $lazy ?? false; - $row = manager::clean_row($row, $mode); $avatar = $this->avatar_helper->get_avatar($row, $alt, $ignore_config, $lazy); try diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index fbfb9ecb829..949b1fad089 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -143,8 +143,8 @@

        {POLL_
        - {% if postrow.POSTER_AVATAR_HTML %} - {% if postrow.U_POST_AUTHOR %}{{ postrow.POSTER_AVATAR_HTML|raw }}{% else %}{{ postrow.POSTER_AVATAR_HTML|raw }}{% endif %} + {% if postrow.POSTER_AVATAR %} + {% if postrow.U_POST_AUTHOR %}{{ avatar(postrow.POSTER_AVATAR, lang('USER_AVATAR')) }}{% else %}{{ avatar(postrow.POSTER_AVATAR, lang('USER_AVATAR')) }}{% endif %} {% else %} {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} {% set color_class = color_classes[postrow.POSTER_ID % 5] %} diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 31812042922..4e980e224d0 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1479,7 +1479,7 @@ 'viewonline' => $row['user_allow_viewonline'], 'allow_pm' => $row['user_allow_pm'], - 'avatar' => ($user->optionget('viewavatars')) ? $avatar_helper->get_user_avatar($row) : [], + 'avatar' => ($user->optionget('viewavatars')) ? \phpbb\avatar\manager::clean_row($row, 'user') : [], 'age' => '', 'rank_title' => '', @@ -2032,6 +2032,7 @@ 'RANK_TITLE' => $user_cache[$poster_id]['rank_title'], 'RANK_IMG' => $user_cache[$poster_id]['rank_image'], 'RANK_IMG_SRC' => $user_cache[$poster_id]['rank_image_src'], + 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], 'POSTER_JOINED' => $user_cache[$poster_id]['joined'], 'POSTER_POSTS' => $user_cache[$poster_id]['posts'], 'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '', @@ -2105,11 +2106,6 @@ 'S_DELETE_PERMANENT' => $permanent_delete_allowed, ); - if ($user_cache[$poster_id]['avatar']) - { - $post_row += $avatar_helper->get_template_vars($user_cache[$poster_id]['avatar'], 'POSTER_'); - } - $user_poster_data = $user_cache[$poster_id]; $current_row_number = $i; diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index caf2dc82e55..66cba2e8900 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -220,13 +220,7 @@ public static function database_row_data() 'user_avatar_height' => '', 'group_avatar' => '', ), - array( - 'user_avatar' => '', - 'user_avatar_type' => '', - 'user_avatar_width' => '', - 'user_avatar_height' => '', - 'group_avatar' => '', - ), + array(), 'foobar', ), array( @@ -245,7 +239,6 @@ public static function database_row_data() 'group_id' => 4, ), array( - 'user_avatar' => '', 'user_id' => 5, 'group_id' => 4, ), @@ -290,6 +283,11 @@ public function test_clean_row(array $input, array $output, $prefix = '') $this->assertArrayHasKey($key, $cleaned_row); $this->assertEquals($cleaned_row[$key], $value); } + + if (empty($output)) + { + $this->assertEquals($output, $cleaned_row); + } } public function test_clean_driver_name() diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index c40a58da53f..d1c03e9d8b7 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -148,10 +148,10 @@ public static function data_template_extensions() 'avatar_user.html', [ 'row' => [ - 'user_avatar' => 'great_avatar.png', - 'user_avatar_type' => 'avatar.driver.upload', - 'user_avatar_width' => 90, - 'user_avatar_height' => 90, + 'avatar' => 'great_avatar.png', + 'avatar_type' => 'avatar.driver.upload', + 'avatar_width' => 90, + 'avatar_height' => 90, ], 'alt' => 'foo' ], @@ -164,10 +164,10 @@ public static function data_template_extensions() 'avatar_user.html', [ 'row' => [ - 'user_avatar' => 'great_avatar.png', - 'user_avatar_type' => 'avatar.driver.upload', - 'user_avatar_width' => 90, - 'user_avatar_height' => 90, + 'avatar' => 'great_avatar.png', + 'avatar_type' => 'avatar.driver.upload', + 'avatar_width' => 90, + 'avatar_height' => 90, ], 'alt' => 'foo', 'ignore_config' => true, @@ -182,10 +182,10 @@ public static function data_template_extensions() 'avatar_user.html', [ 'row' => [ - 'user_avatar' => 'foo@bar.com', - 'user_avatar_type' => 'avatar.driver.gravatar', - 'user_avatar_width' => 90, - 'user_avatar_height' => 90, + 'avatar' => 'foo@bar.com', + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_width' => 90, + 'avatar_height' => 90, ], 'alt' => 'foo' ], @@ -198,10 +198,10 @@ public static function data_template_extensions() 'avatar_group.html', [ 'row' => [ - 'group_avatar' => 'great_avatar.png', - 'group_avatar_type' => 'avatar.driver.upload', - 'group_avatar_width' => 90, - 'group_avatar_height' => 90, + 'avatar' => 'great_avatar.png', + 'avatar_type' => 'avatar.driver.upload', + 'avatar_width' => 90, + 'avatar_height' => 90, ], 'alt' => 'foo' ], @@ -214,10 +214,10 @@ public static function data_template_extensions() 'avatar_group.html', [ 'row' => [ - 'group_avatar' => 'great_avatar.png', - 'group_avatar_type' => 'avatar.driver.upload', - 'group_avatar_width' => 90, - 'group_avatar_height' => 90, + 'avatar' => 'great_avatar.png', + 'avatar_type' => 'avatar.driver.upload', + 'avatar_width' => 90, + 'avatar_height' => 90, ], 'alt' => 'foo', 'ignore_config' => true, @@ -232,10 +232,10 @@ public static function data_template_extensions() 'avatar_group.html', [ 'row' => [ - 'group_avatar' => 'foo@bar.com', - 'group_avatar_type' => 'avatar.driver.gravatar', - 'group_avatar_width' => 90, - 'group_avatar_height' => 90, + 'avatar' => 'foo@bar.com', + 'avatar_type' => 'avatar.driver.gravatar', + 'avatar_width' => 90, + 'avatar_height' => 90, ], 'alt' => 'foo' ], diff --git a/tests/template/templates/avatar_group.html b/tests/template/templates/avatar_group.html index 95ae9c08c0f..2532b86e8cb 100644 --- a/tests/template/templates/avatar_group.html +++ b/tests/template/templates/avatar_group.html @@ -1 +1 @@ -{{ avatar('group', row, alt, ignore_config, lazy) }} +{{ avatar(row, alt, ignore_config, lazy) }} diff --git a/tests/template/templates/avatar_user.html b/tests/template/templates/avatar_user.html index bd0b9606118..2532b86e8cb 100644 --- a/tests/template/templates/avatar_user.html +++ b/tests/template/templates/avatar_user.html @@ -1 +1 @@ -{{ avatar('user', row, alt, ignore_config, lazy) }} +{{ avatar(row, alt, ignore_config, lazy) }} From 6856c09f07704382dfdce36e5f444a9e0940c826 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 14 Dec 2025 21:02:50 +0100 Subject: [PATCH 1024/1214] [ticket/17566] Ensure filename is output in pre-commit hook PHPBB-17566 --- git-tools/hooks/pre-commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-tools/hooks/pre-commit b/git-tools/hooks/pre-commit index 06ba15c7fa3..d7071f2c474 100755 --- a/git-tools/hooks/pre-commit +++ b/git-tools/hooks/pre-commit @@ -75,7 +75,7 @@ do if [ $? -ne 0 ] then # Swap back in correct filenames - errors=$(echo "$errors"; echo "$result" | grep ':' | sed -e "s@in - on@in $filename on@g") + errors=$(echo "$errors"; echo "$result" | grep ':' | sed -E "s@in (.+) on line@in $filename on@g") fi done unset IFS From 41c5b89ee9f7828b858ae341f3a0283e083d3b8e Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Dec 2025 08:23:25 +0100 Subject: [PATCH 1025/1214] [ticket/17566] Remove unused use statement PHPBB-17566 --- phpBB/phpbb/template/twig/extension/avatar.php | 1 - 1 file changed, 1 deletion(-) diff --git a/phpBB/phpbb/template/twig/extension/avatar.php b/phpBB/phpbb/template/twig/extension/avatar.php index 2ae085194c8..1675413ce70 100644 --- a/phpBB/phpbb/template/twig/extension/avatar.php +++ b/phpBB/phpbb/template/twig/extension/avatar.php @@ -14,7 +14,6 @@ namespace phpbb\template\twig\extension; use phpbb\avatar\helper; -use phpbb\avatar\manager; use phpbb\template\twig\environment; use Twig\Error\Error; use Twig\Extension\AbstractExtension; From 65105cc471a012724e97502ff859ec95d25f847a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 20 Dec 2025 08:45:51 +0100 Subject: [PATCH 1026/1214] [ticket/17580] Replace while and remainder logic with simple loop PHPBB-17580 --- phpBB/includes/functions_download.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index eb607f020bc..5b0ac2bea4c 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -267,16 +267,13 @@ function send_file_to_browser($attachment, $upload_dir, $category) header('Content-Range: bytes ' . $range['byte_pos_start'] . '-' . $range['byte_pos_end'] . '/' . $range['bytes_total']); header('Content-Length: ' . $range['bytes_requested']); - // First read chunks - while (!feof($fp) && ftell($fp) < $range['byte_pos_end'] - 8192) + // Read until we reach the end of the requested range + $bytes_to_read = $range['bytes_requested']; + while ($bytes_to_read > 0 && !feof($fp)) { - echo fread($fp, 8192); - } - // Then, read the remainder - $remainder = $range['bytes_requested'] % 8192; - if ($remainder > 0) - { - echo fread($fp, $remainder); + $chunk = ($bytes_to_read > 8192) ? 8192 : $bytes_to_read; + echo fread($fp, $chunk); + $bytes_to_read -= $chunk; } } else From 503fffc5726166a0a55383889ccacf04f7fe09a7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 11:02:26 +0100 Subject: [PATCH 1027/1214] [ticket/17566] Remove underline when hovering over placeholder PHPBB-17566 --- phpBB/styles/prosilver/theme/links.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css index 2f7ac86236e..11cffbf73b2 100644 --- a/phpBB/styles/prosilver/theme/links.css +++ b/phpBB/styles/prosilver/theme/links.css @@ -140,6 +140,10 @@ a.lastsubject:hover { text-decoration: underline; } +.postprofile a.avatar:hover { + text-decoration: none; +} + /* Profile searchresults */ .search .postprofile a { font-weight: normal; From 9903f1da547d9c73f601e4e7e0c7529df52e4f59 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 11:03:18 +0100 Subject: [PATCH 1028/1214] [ticket/17566] Simplify avatar twig function and remove html PHPBB-17566 --- phpBB/phpbb/avatar/helper.php | 3 +-- .../phpbb/template/twig/extension/avatar.php | 19 +++++++------------ phpBB/viewtopic.php | 8 ++++++-- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php index 135bf22c88a..7187e0b6ca9 100644 --- a/phpBB/phpbb/avatar/helper.php +++ b/phpBB/phpbb/avatar/helper.php @@ -81,7 +81,7 @@ public function __construct( */ public function get_template_vars(array $avatar, string $prefix = ''): array { - $prefix = $prefix && substr($prefix, -1) !== '_' ? "{$prefix}_" : $prefix; + $prefix = $prefix && !str_ends_with($prefix, '_') ? "{$prefix}_" : $prefix; return [ "{$prefix}AVATAR" => $avatar, @@ -94,7 +94,6 @@ public function get_template_vars(array $avatar, string $prefix = ''): array "{$prefix}AVATAR_HEIGHT" => $avatar['height'], "{$prefix}AVATAR_LAZY" => $avatar['lazy'], - "{$prefix}AVATAR_HTML" => $avatar['html'], ]; } diff --git a/phpBB/phpbb/template/twig/extension/avatar.php b/phpBB/phpbb/template/twig/extension/avatar.php index 1675413ce70..5a1678cdc88 100644 --- a/phpBB/phpbb/template/twig/extension/avatar.php +++ b/phpBB/phpbb/template/twig/extension/avatar.php @@ -69,22 +69,17 @@ public function getFunctions(): array * * @return string The avatar HTML for the specified mode */ - public function get_avatar(environment $environment, array $row, string|null $alt = null, bool|null $ignore_config = null, bool|null $lazy = null): string + public function get_avatar(environment $environment, array $row): string { - $alt = $alt ?? false; - $ignore_config = $ignore_config ?? false; - $lazy = $lazy ?? false; - $avatar = $this->avatar_helper->get_avatar($row, $alt, $ignore_config, $lazy); - try { return $environment->render('macros/avatar.twig', [ - 'SRC' => $avatar['lazy'] ? $this->avatar_helper->get_no_avatar_source() : $avatar['src'], - 'DATA_SRC' => $avatar['lazy'] ? $avatar['src'] : '', - 'WIDTH' => $avatar['width'], - 'HEIGHT' => $avatar['height'], - 'TITLE' => $avatar['title'], - 'LAZY' => $avatar['lazy'], + 'SRC' => $row['lazy'] ? $this->avatar_helper->get_no_avatar_source() : $row['src'], + 'DATA_SRC' => $row['lazy'] ? $row['src'] : '', + 'WIDTH' => $row['width'], + 'HEIGHT' => $row['height'], + 'TITLE' => $row['title'], + 'LAZY' => $row['lazy'], ]); } catch (Error $e) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 4e980e224d0..31812042922 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1479,7 +1479,7 @@ 'viewonline' => $row['user_allow_viewonline'], 'allow_pm' => $row['user_allow_pm'], - 'avatar' => ($user->optionget('viewavatars')) ? \phpbb\avatar\manager::clean_row($row, 'user') : [], + 'avatar' => ($user->optionget('viewavatars')) ? $avatar_helper->get_user_avatar($row) : [], 'age' => '', 'rank_title' => '', @@ -2032,7 +2032,6 @@ 'RANK_TITLE' => $user_cache[$poster_id]['rank_title'], 'RANK_IMG' => $user_cache[$poster_id]['rank_image'], 'RANK_IMG_SRC' => $user_cache[$poster_id]['rank_image_src'], - 'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'], 'POSTER_JOINED' => $user_cache[$poster_id]['joined'], 'POSTER_POSTS' => $user_cache[$poster_id]['posts'], 'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '', @@ -2106,6 +2105,11 @@ 'S_DELETE_PERMANENT' => $permanent_delete_allowed, ); + if ($user_cache[$poster_id]['avatar']) + { + $post_row += $avatar_helper->get_template_vars($user_cache[$poster_id]['avatar'], 'POSTER_'); + } + $user_poster_data = $user_cache[$poster_id]; $current_row_number = $i; From b7d6734c5358f79be0d1eb5b8519a4824b7445f9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 11:06:44 +0100 Subject: [PATCH 1029/1214] [ticket/17566] Add user avatar template PHPBB-17566 --- phpBB/includes/mcp/mcp_notes.php | 3 ++- .../styles/prosilver/template/mcp_notes_user.html | 5 +++++ phpBB/styles/prosilver/template/user_avatar.html | 15 +++++++++++++++ .../styles/prosilver/template/viewtopic_body.html | 15 ++++++--------- 4 files changed, 28 insertions(+), 10 deletions(-) create mode 100644 phpBB/styles/prosilver/template/user_avatar.html diff --git a/phpBB/includes/mcp/mcp_notes.php b/phpBB/includes/mcp/mcp_notes.php index 72e03c00f23..658ac007284 100644 --- a/phpBB/includes/mcp/mcp_notes.php +++ b/phpBB/includes/mcp/mcp_notes.php @@ -234,7 +234,7 @@ function mcp_notes_user_view($action) $avatar_helper = $phpbb_container->get('avatar.helper'); $avatar = $avatar_helper->get_user_avatar($userrow); - $template->assign_vars($avatar_helper->get_template_vars($avatar)); + $template->assign_vars($avatar_helper->get_template_vars($avatar, 'USER_')); $template->assign_vars(array( 'U_POST_ACTION' => $this->u_action, @@ -255,6 +255,7 @@ function mcp_notes_user_view($action) 'USERNAME_FULL' => get_username_string('full', $userrow['user_id'], $userrow['username'], $userrow['user_colour']), 'USERNAME_COLOUR' => get_username_string('colour', $userrow['user_id'], $userrow['username'], $userrow['user_colour']), 'USERNAME' => get_username_string('username', $userrow['user_id'], $userrow['username'], $userrow['user_colour']), + 'USER_ID' => $userrow['user_id'], 'U_PROFILE' => get_username_string('profile', $userrow['user_id'], $userrow['username'], $userrow['user_colour']), 'RANK_IMG' => $rank_data['img'], diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 98f56cbb600..d061539fe21 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -11,6 +11,11 @@

        {USERNAME_FULL}

        + {% include 'user_avatar.html' with { + 'avatar_data': USER_AVATAR, + 'user_id': USER_ID, + 'username': USERNAME + } only %}
        {AVATAR_HTML}
        diff --git a/phpBB/styles/prosilver/template/user_avatar.html b/phpBB/styles/prosilver/template/user_avatar.html new file mode 100644 index 00000000000..5ca6d86f18e --- /dev/null +++ b/phpBB/styles/prosilver/template/user_avatar.html @@ -0,0 +1,15 @@ +{% if avatar_data.src %} + {% if user_link %} + {{ avatar(avatar_data, lang('USER_AVATAR')) }} + {% else %} + {{ avatar(avatar_data, lang('USER_AVATAR')) }} + {% endif %} +{% else %} + {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} + {% set color_class = color_classes[user_id % 5] %} + {% if user_link %}{% endif %} +
        +
        {{ username|striptags|slice(0, 1)|upper }}
        +
        + {% if user_link %}        {% endif %} +{% endif %} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 949b1fad089..9af52337b5a 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -143,15 +143,12 @@

        {POLL_
        - {% if postrow.POSTER_AVATAR %} - {% if postrow.U_POST_AUTHOR %}{{ avatar(postrow.POSTER_AVATAR, lang('USER_AVATAR')) }}{% else %}{{ avatar(postrow.POSTER_AVATAR, lang('USER_AVATAR')) }}{% endif %} - {% else %} - {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} - {% set color_class = color_classes[postrow.POSTER_ID % 5] %} -
        -
        {{ postrow.POST_AUTHOR|striptags|slice(0, 1)|upper }}
        -
        - {% endif %} + {% include 'user_avatar.html' with { + 'avatar_data': postrow.POSTER_AVATAR, + 'user_id': postrow.POSTER_ID, + 'username': postrow.POST_AUTHOR, + 'user_link': postrow.U_POST_AUTHOR + } only %}
        From 36e8fef5bb208692bf6d6c86c69f9fe2432ff526 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 13:01:22 +0100 Subject: [PATCH 1030/1214] [ticket/17566] Adapt navbar avatar to new template PHPBB-17566 --- phpBB/styles/prosilver/template/navbar_header.html | 4 ++-- phpBB/styles/prosilver/theme/common.css | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index 7d6ee666eca..baab6954598 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -113,13 +113,13 @@ {% EVENT navbar_header_user_profile_prepend %} -
      • +
      • {% EVENT navbar_header_username_prepend %}
        - {% if CURRENT_USER_AVATAR_HTML %}{{ CURRENT_USER_AVATAR_HTML }} {% endif %} + {% if CURRENT_USER_AVATAR %}{% include 'user_avatar.html' with {'avatar_data': CURRENT_USER_AVATAR, 'user_id': S_USER_ID, 'username': S_USERNAME} only %} {% endif %} {{ CURRENT_USERNAME_SIMPLE }} {{ Icon('font', 'caret-down', '', true, '', {'style': 'color: #' ~ CURRENT_USER_GROUP_COLOR}) }} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e278bab9c0a..8bc2ef5421f 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -386,13 +386,20 @@ a.header-avatar:hover { text-decoration: none; } -a.header-avatar img { +a.header-avatar img, +a.header-avatar .avatar-placeholder { vertical-align: middle; width: auto; max-height: 20px; margin-bottom: 2px; } +a.header-avatar .avatar-placeholder { + font-size: var(--ps-font-small); + display: inline-flex; + width: 20px; +} + /* Dropdown menu ---------------------------------------- */ .dropdown-container { From f85e78917048ea9634a0f72608f179370f69118c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 16:40:22 +0100 Subject: [PATCH 1031/1214] [ticket/17566] Use new user_avatar in all places in prosilver PHPBB-17566 --- phpBB/phpbb/avatar/helper.php | 3 ++- phpBB/phpbb/user_loader.php | 1 + .../prosilver/template/mcp_notes_user.html | 2 -- .../prosilver/template/memberlist_view.html | 16 +--------------- .../prosilver/template/ucp_avatar_options.html | 2 +- .../prosilver/template/ucp_pm_viewmessage.html | 10 +--------- phpBB/styles/prosilver/template/user_avatar.html | 12 ++++++------ .../prosilver/template/viewtopic_body.html | 3 +-- phpBB/styles/prosilver/theme/common.css | 2 +- 9 files changed, 14 insertions(+), 37 deletions(-) diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php index 7187e0b6ca9..748edf04b76 100644 --- a/phpBB/phpbb/avatar/helper.php +++ b/phpBB/phpbb/avatar/helper.php @@ -143,7 +143,7 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals if (!$this->config['allow_avatar'] && !$ignore_config) { return [ - 'html' => '', + 'id' => 0, 'lazy' => false, 'src' => '', 'title' => '', @@ -154,6 +154,7 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals } $data = [ + 'id' => $row['id'], 'src' => $row['avatar'], 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 5d84a843a3a..3e72dd00160 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -197,6 +197,7 @@ public function get_avatar($user_id, $query = false, $lazy = false) } $row = [ + 'id' => $user['user_id'], 'avatar' => $user['user_avatar'], 'avatar_type' => $user['user_avatar_type'], 'avatar_width' => $user['user_avatar_width'], diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index d061539fe21..4f73cd98b7f 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -13,10 +13,8 @@

        {USERNAME_FULL}

        {% include 'user_avatar.html' with { 'avatar_data': USER_AVATAR, - 'user_id': USER_ID, 'username': USERNAME } only %} -
        {AVATAR_HTML}
        diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index a3fec16c0ea..2d8b780e13c 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -7,26 +7,12 @@

        {PAGE_TITLE}

        - - {% if AVATAR_HTML %} -
        -
        {{ AVATAR_HTML }}
        - {% EVENT memberlist_view_rank_avatar_before %} - {% if RANK_TITLE %}
        {{ RANK_TITLE }}
        {% endif %} - {% EVENT memberlist_view_rank_avatar_after %} -
        - {% else %} - {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} - {% set color_class = color_classes[USER_ID % 5] %}
        -
        -
        {{ USERNAME|striptags|slice(0, 1)|upper }}
        -
        +
        {% include 'user_avatar.html' with {'avatar_data': AVATAR, 'username': USERNAME} only %}
        {% EVENT memberlist_view_rank_avatar_before %} {% if RANK_TITLE %}
        {{ RANK_TITLE }}
        {% endif %} {% EVENT memberlist_view_rank_avatar_after %}
        - {% endif %}
        diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 941a22ab451..d88d98a31d9 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -8,7 +8,7 @@

        {ERROR}


        {L_AVATAR_EXPLAIN}
        -
        {AVATAR_HTML}
        +
        {% include 'user_avatar.html' with {'avatar_data': AVATAR, 'username': S_USERNAME} only %}

    diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index f7a86280661..53c3c811f12 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -29,15 +29,7 @@
    - {% if AUTHOR_AVATAR_HTML %} - {{ AUTHOR_AVATAR_HTML }} - {% else %} - {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} - {% set color_class = color_classes[MESSAGE_AUTHOR_ID % 5] %} - -
    {{ MESSAGE_AUTHOR|striptags|slice(0, 1)|upper }}
    -     - {% endif %} + {% include 'user_avatar.html' with {'avatar_data': AUTHOR_AVATAR, 'username': MESSAGE_AUTHOR, 'avatar_link': U_MESSAGE_AUTHOR} only %}
    {% apply spaceless %} diff --git a/phpBB/styles/prosilver/template/user_avatar.html b/phpBB/styles/prosilver/template/user_avatar.html index 5ca6d86f18e..baccab5513d 100644 --- a/phpBB/styles/prosilver/template/user_avatar.html +++ b/phpBB/styles/prosilver/template/user_avatar.html @@ -1,15 +1,15 @@ {% if avatar_data.src %} - {% if user_link %} - {{ avatar(avatar_data, lang('USER_AVATAR')) }} + {% if avatar_link %} + {{ avatar(avatar_data, lang('USER_AVATAR')) }} {% else %} {{ avatar(avatar_data, lang('USER_AVATAR')) }} {% endif %} -{% else %} +{% elseif avatar_data.id %} {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} - {% set color_class = color_classes[user_id % 5] %} - {% if user_link %}{% endif %} + {% set color_class = color_classes[avatar_data.id % 5] %} + {% if avatar_link %}{% endif %}
    {{ username|striptags|slice(0, 1)|upper }}
    - {% if user_link %}    {% endif %} + {% if avatar_link %}{% endif %} {% endif %} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 9af52337b5a..f6bdea3563c 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -145,9 +145,8 @@

    {POLL_ {% include 'user_avatar.html' with { 'avatar_data': postrow.POSTER_AVATAR, - 'user_id': postrow.POSTER_ID, 'username': postrow.POST_AUTHOR, - 'user_link': postrow.U_POST_AUTHOR + 'avatar_link': postrow.U_POST_AUTHOR } only %} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index 8bc2ef5421f..2d5dd2601af 100644 --- a/phpBB/styles/prosilver/theme/common.css +++ b/phpBB/styles/prosilver/theme/common.css @@ -395,7 +395,7 @@ a.header-avatar .avatar-placeholder { } a.header-avatar .avatar-placeholder { - font-size: var(--ps-font-small); + font-size: var(--ps-font-tiny); display: inline-flex; width: 20px; } From 02271c2a990198ce3506e196886c0570d4fa2f9f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 16:52:54 +0100 Subject: [PATCH 1032/1214] [ticket/17566] Use avatar template for all avatars in prosilver PHPBB-17566 --- .../styles/prosilver/template/{user_avatar.html => avatar.html} | 2 +- phpBB/styles/prosilver/template/mcp_notes_user.html | 2 +- phpBB/styles/prosilver/template/memberlist_body.html | 1 + phpBB/styles/prosilver/template/memberlist_view.html | 2 +- phpBB/styles/prosilver/template/navbar_header.html | 2 +- phpBB/styles/prosilver/template/ucp_avatar_options.html | 2 +- phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 2 +- phpBB/styles/prosilver/template/viewtopic_body.html | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) rename phpBB/styles/prosilver/template/{user_avatar.html => avatar.html} (89%) diff --git a/phpBB/styles/prosilver/template/user_avatar.html b/phpBB/styles/prosilver/template/avatar.html similarity index 89% rename from phpBB/styles/prosilver/template/user_avatar.html rename to phpBB/styles/prosilver/template/avatar.html index baccab5513d..451b9102b49 100644 --- a/phpBB/styles/prosilver/template/user_avatar.html +++ b/phpBB/styles/prosilver/template/avatar.html @@ -4,7 +4,7 @@ {% else %} {{ avatar(avatar_data, lang('USER_AVATAR')) }} {% endif %} -{% elseif avatar_data.id %} +{% elseif avatar_data.id and not avatar_data.id starts with 'g' %} {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} {% set color_class = color_classes[avatar_data.id % 5] %} {% if avatar_link %}{% endif %} diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 4f73cd98b7f..5e6b9ac97e9 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -11,7 +11,7 @@

    {USERNAME_FULL}

    - {% include 'user_avatar.html' with { + {% include 'avatar.html' with { 'avatar_data': USER_AVATAR, 'username': USERNAME } only %} diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index f908852ee3f..4a23619ab1e 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -26,6 +26,7 @@

    style="color:#{GROUP_COLOR};"{AVATAR_HTML} {% EVENT memberlist_body_group_rank_before %} {% if RANK_IMG %}{{ RANK_IMG }}{% endif %} diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 2d8b780e13c..f1fd43c4751 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -8,7 +8,7 @@

    {PAGE_TITLE}

    -
    {% include 'user_avatar.html' with {'avatar_data': AVATAR, 'username': USERNAME} only %}
    +
    {% include 'avatar.html' with {'avatar_data': AVATAR, 'username': USERNAME} only %}
    {% EVENT memberlist_view_rank_avatar_before %} {% if RANK_TITLE %}
    {{ RANK_TITLE }}
    {% endif %} {% EVENT memberlist_view_rank_avatar_after %} diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index baab6954598..b5bc775c07e 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -119,7 +119,7 @@
    - {% if CURRENT_USER_AVATAR %}{% include 'user_avatar.html' with {'avatar_data': CURRENT_USER_AVATAR, 'user_id': S_USER_ID, 'username': S_USERNAME} only %} {% endif %} + {% if CURRENT_USER_AVATAR %}{% include 'avatar.html' with {'avatar_data': CURRENT_USER_AVATAR, 'user_id': S_USER_ID, 'username': S_USERNAME} only %} {% endif %} {{ CURRENT_USERNAME_SIMPLE }} {{ Icon('font', 'caret-down', '', true, '', {'style': 'color: #' ~ CURRENT_USER_GROUP_COLOR}) }} diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index d88d98a31d9..1ed0d1506e7 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -8,7 +8,7 @@

    {ERROR}


    {L_AVATAR_EXPLAIN}
    -
    {% include 'user_avatar.html' with {'avatar_data': AVATAR, 'username': S_USERNAME} only %}
    +
    {% include 'avatar.html' with {'avatar_data': AVATAR, 'username': S_USERNAME} only %}
    diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 53c3c811f12..42259f2f620 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -29,7 +29,7 @@
    - {% include 'user_avatar.html' with {'avatar_data': AUTHOR_AVATAR, 'username': MESSAGE_AUTHOR, 'avatar_link': U_MESSAGE_AUTHOR} only %} + {% include 'avatar.html' with {'avatar_data': AUTHOR_AVATAR, 'username': MESSAGE_AUTHOR, 'avatar_link': U_MESSAGE_AUTHOR} only %}
    {% apply spaceless %} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index f6bdea3563c..88247b31597 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -143,7 +143,7 @@

    {POLL_
    - {% include 'user_avatar.html' with { + {% include 'avatar.html' with { 'avatar_data': postrow.POSTER_AVATAR, 'username': postrow.POST_AUTHOR, 'avatar_link': postrow.U_POST_AUTHOR From 75bdaafcffa120d9883a23a08ac8998c9cd9c0c5 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 11:53:46 -0800 Subject: [PATCH 1033/1214] [ticket/17594] Move subscription code into a try catch block PHPBB-17594 --- phpBB/assets/javascript/webpush.js | 72 ++++++++++++++++-------------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js index 4adb9ecf101..a9679587968 100644 --- a/phpBB/assets/javascript/webpush.js +++ b/phpBB/assets/javascript/webpush.js @@ -167,46 +167,50 @@ function PhpbbWebpush() { subscribeButton.addEventListener('click', subscribeButtonHandler); - // Prevent the user from clicking the subscribe button multiple times. - const result = await Notification.requestPermission(); - if (result === 'denied') { - phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg')); - return; - } + try { + // Prevent the user from clicking the subscribe button multiple times. + const result = await Notification.requestPermission(); + if (result === 'denied') { + phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-l-msg')); + return; + } - const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl); + const registration = await navigator.serviceWorker.getRegistration(serviceWorkerUrl); - // We might already have a subscription that is unknown to this instance of phpBB. - // Unsubscribe before trying to subscribe again. - if (typeof registration !== 'undefined') { - const subscribed = await registration.pushManager.getSubscription(); - if (subscribed) { - await subscribed.unsubscribe(); + // We might already have a subscription that is unknown to this instance of phpBB. + // Unsubscribe before trying to subscribe again. + if (typeof registration !== 'undefined') { + const subscribed = await registration.pushManager.getSubscription(); + if (subscribed) { + await subscribed.unsubscribe(); + } } - } - const newSubscription = await registration.pushManager.subscribe({ - userVisibleOnly: true, - applicationServerKey: urlB64ToUint8Array(vapidPublicKey), - }); + const newSubscription = await registration.pushManager.subscribe({ + userVisibleOnly: true, + applicationServerKey: urlB64ToUint8Array(vapidPublicKey), + }); - const loadingIndicator = phpbb.loadingIndicator(); - fetch(subscribeUrl, { - method: 'POST', - headers: { - 'X-Requested-With': 'XMLHttpRequest', - }, - body: getFormData(newSubscription), - }) - .then(response => { - loadingIndicator.fadeOut(phpbb.alertTime); - return response.json(); + const loadingIndicator = phpbb.loadingIndicator(); + fetch(subscribeUrl, { + method: 'POST', + headers: { + 'X-Requested-With': 'XMLHttpRequest', + }, + body: getFormData(newSubscription), }) - .then(handleSubscribe) - .catch(error => { - loadingIndicator.fadeOut(phpbb.alertTime); - phpbb.alert(ajaxErrorTitle, error); - }); + .then(response => { + loadingIndicator.fadeOut(phpbb.alertTime); + return response.json(); + }) + .then(handleSubscribe) + .catch(error => { + loadingIndicator.fadeOut(phpbb.alertTime); + phpbb.alert(ajaxErrorTitle, error); + }); + } catch (error) { + phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-disabled-msg')); + } } /** From 28f35fe1e751c531711e675fafd85354a70b8071 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 11:54:46 -0800 Subject: [PATCH 1034/1214] [ticket/17594] Prevent spamming the subscribe button correctly PHPBB-17594 --- phpBB/assets/javascript/webpush.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js index a9679587968..e62f9c17132 100644 --- a/phpBB/assets/javascript/webpush.js +++ b/phpBB/assets/javascript/webpush.js @@ -165,7 +165,7 @@ function PhpbbWebpush() { async function subscribeButtonHandler(event) { event.preventDefault(); - subscribeButton.addEventListener('click', subscribeButtonHandler); + subscribeButton.removeEventListener('click', subscribeButtonHandler); try { // Prevent the user from clicking the subscribe button multiple times. @@ -210,6 +210,8 @@ function PhpbbWebpush() { }); } catch (error) { phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-disabled-msg')); + } finally { + subscribeButton.addEventListener('click', subscribeButtonHandler); } } From ba8eaa9cdc70b1511963d60c8f0aca6448d17ee2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 11:55:31 -0800 Subject: [PATCH 1035/1214] [ticket/17594] Escape lang vars being used in javascript PHPBB-17594 --- phpBB/styles/prosilver/template/notification_dropdown.html | 2 +- phpBB/styles/prosilver/template/ucp_notifications_options.html | 2 +- phpBB/styles/prosilver/template/ucp_notifications_webpush.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index 715f04e1a2c..33fc0dc5327 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -47,7 +47,7 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
    {{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} - +
    {% endif %} diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index 5b953362feb..051db844832 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -10,7 +10,7 @@

    {{ TITLE }}


    {{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
    - +
    diff --git a/phpBB/styles/prosilver/template/ucp_notifications_webpush.html b/phpBB/styles/prosilver/template/ucp_notifications_webpush.html index 31c4790b33d..f96b19a9898 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_webpush.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_webpush.html @@ -3,7 +3,7 @@ serviceWorkerUrl: '{{ U_WEBPUSH_WORKER_URL }}', subscribeUrl: '{{ U_WEBPUSH_SUBSCRIBE }}', unsubscribeUrl: '{{ U_WEBPUSH_UNSUBSCRIBE }}', - ajaxErrorTitle: '{{ lang('AJAX_ERROR_TITLE') }}', + ajaxErrorTitle: '{{ lang_js('AJAX_ERROR_TITLE') }}', vapidPublicKey: '{{ VAPID_PUBLIC_KEY }}', formTokens: { creationTime: '{{ WEBPUSH_FORM_TOKENS.creation_time }}', From 7dc6f24b246aa9b3cfd3ecb43da4caec5a1f5b85 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 12:01:56 -0800 Subject: [PATCH 1036/1214] [ticket/17594] Fix brackets typo PHPBB-17594 --- phpBB/styles/prosilver/template/notification_dropdown.html | 2 +- phpBB/styles/prosilver/template/ucp_notifications_options.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index 33fc0dc5327..0e1e0807fd1 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -47,7 +47,7 @@ {% if NOTIFICATIONS_WEBPUSH_ENABLE and notification_types is not defined %}
    {{ lang('NOTIFY_WEB_PUSH_ENABLE') ~ lang('COLON') }} - +
    {% endif %} diff --git a/phpBB/styles/prosilver/template/ucp_notifications_options.html b/phpBB/styles/prosilver/template/ucp_notifications_options.html index 051db844832..cfc12e2bdea 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -10,7 +10,7 @@

    {{ TITLE }}


    {{ lang('NOTIFY_WEBPUSH_ENABLE_EXPLAIN') }}
    - +
    From ccd049b993f3f7e4b485c20dfd5ee1c58a498fcb Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 12:18:22 -0800 Subject: [PATCH 1037/1214] [ticket/17594] Fix error reporting messaging PHPBB-17594 --- phpBB/assets/javascript/webpush.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/phpBB/assets/javascript/webpush.js b/phpBB/assets/javascript/webpush.js index e62f9c17132..2391f2f60c2 100644 --- a/phpBB/assets/javascript/webpush.js +++ b/phpBB/assets/javascript/webpush.js @@ -209,7 +209,8 @@ function PhpbbWebpush() { phpbb.alert(ajaxErrorTitle, error); }); } catch (error) { - phpbb.alert(subscribeButton.getAttribute('data-l-err'), subscribeButton.getAttribute('data-disabled-msg')); + console.info(error); + phpbb.alert(subscribeButton.getAttribute('data-l-err'), error.message || subscribeButton.getAttribute('data-disabled-msg')); } finally { subscribeButton.addEventListener('click', subscribeButtonHandler); } From a9a2781dd3aea88fc3947799094c98039486caac Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 22:36:58 +0100 Subject: [PATCH 1038/1214] [ticket/17566] Add fallback for when creating group PHPBB-17566 --- phpBB/phpbb/avatar/helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php index 748edf04b76..9400e76a59c 100644 --- a/phpBB/phpbb/avatar/helper.php +++ b/phpBB/phpbb/avatar/helper.php @@ -154,7 +154,7 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals } $data = [ - 'id' => $row['id'], + 'id' => $row['id'] ?? 0, 'src' => $row['avatar'], 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], From dcff00d0b7263c0159925d0bf8b7f71e0f9cbc3a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 22 Dec 2025 22:44:14 +0100 Subject: [PATCH 1039/1214] [ticket/17566] Update template extensions tests PHPBB-17566 --- tests/template/extension_test.php | 67 ++++++++-------------- tests/template/templates/avatar_group.html | 2 +- tests/template/templates/avatar_user.html | 2 +- 3 files changed, 25 insertions(+), 46 deletions(-) diff --git a/tests/template/extension_test.php b/tests/template/extension_test.php index d1c03e9d8b7..1d67cc21467 100644 --- a/tests/template/extension_test.php +++ b/tests/template/extension_test.php @@ -148,84 +148,63 @@ public static function data_template_extensions() 'avatar_user.html', [ 'row' => [ - 'avatar' => 'great_avatar.png', - 'avatar_type' => 'avatar.driver.upload', - 'avatar_width' => 90, - 'avatar_height' => 90, - ], - 'alt' => 'foo' - ], - [], - [], - 'foo', - [] - ], - [ - 'avatar_user.html', - [ - 'row' => [ - 'avatar' => 'great_avatar.png', - 'avatar_type' => 'avatar.driver.upload', - 'avatar_width' => 90, - 'avatar_height' => 90, + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'lazy' => false, + 'title' => 'foo' ], - 'alt' => 'foo', - 'ignore_config' => true, - 'lazy' => true, ], [], [], - 'foo', + 'foo', [] ], [ 'avatar_user.html', [ 'row' => [ - 'avatar' => 'foo@bar.com', - 'avatar_type' => 'avatar.driver.gravatar', - 'avatar_width' => 90, - 'avatar_height' => 90, + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'title' => 'foo', + 'lazy' => true, ], - 'alt' => 'foo' ], [], [], - '', + 'foo', [] ], [ 'avatar_group.html', [ 'row' => [ - 'avatar' => 'great_avatar.png', - 'avatar_type' => 'avatar.driver.upload', - 'avatar_width' => 90, - 'avatar_height' => 90, + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'title' => 'foo', ], - 'alt' => 'foo' ], [], [], - 'foo', + 'foo', [] ], [ 'avatar_group.html', [ 'row' => [ - 'avatar' => 'great_avatar.png', - 'avatar_type' => 'avatar.driver.upload', - 'avatar_width' => 90, - 'avatar_height' => 90, + 'src' => 'great_avatar.png', + 'width' => 90, + 'height' => 90, + 'title' => 'foo', + 'lazy' => true, ], - 'alt' => 'foo', - 'ignore_config' => true, - 'lazy' => true, ], [], [], - 'foo', + 'foo', [] ], [ diff --git a/tests/template/templates/avatar_group.html b/tests/template/templates/avatar_group.html index 2532b86e8cb..d7f114fb948 100644 --- a/tests/template/templates/avatar_group.html +++ b/tests/template/templates/avatar_group.html @@ -1 +1 @@ -{{ avatar(row, alt, ignore_config, lazy) }} +{{ avatar(row) }} diff --git a/tests/template/templates/avatar_user.html b/tests/template/templates/avatar_user.html index 2532b86e8cb..d7f114fb948 100644 --- a/tests/template/templates/avatar_user.html +++ b/tests/template/templates/avatar_user.html @@ -1 +1 @@ -{{ avatar(row, alt, ignore_config, lazy) }} +{{ avatar(row) }} From 038f2c21b2c587bb1e06e62d72380993d88ee905 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 15:33:05 -0800 Subject: [PATCH 1040/1214] [ticket/17595] Ext Catalog Uses 40 repo branch PHPBB-17595 --- phpBB/install/schemas/schema_data.sql | 2 +- .../data/v400/extensions_composer_4.php | 47 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e40b6007ecd..58a04c85b0b 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -302,7 +302,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '4.0.0-a2-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '["https://satis.phpbb.com/","https://www.phpbb.com/customise/db/composer/"]'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_repositories', '["https://satis.phpbb.com/","https://www.phpbb.com/customise/db/composer/40/"]'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_packagist', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_json_file', 'composer-ext.json'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('exts_composer_vendor_dir', 'vendor-ext/'); diff --git a/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php new file mode 100644 index 00000000000..48ec65fdb96 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php @@ -0,0 +1,47 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class extensions_composer_4 extends migration +{ + public function effectively_installed() + { + return strpos($this->config['exts_composer_repositories'], 'https://www.phpbb.com/customise/db/composer/40') !== false; + } + + public function update_data() + { + $repositories = json_decode($this->config['exts_composer_repositories'], true); + $repositories = array_map(function($repo) { + return $repo === 'https://www.phpbb.com/customise/db/composer/' + ? 'https://www.phpbb.com/customise/db/composer/40/' + : $repo; + }, $repositories); + + return [ + ['config.update', ['exts_composer_repositories', json_encode($repositories, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES)]], + ]; + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v400\extensions_composer', + '\phpbb\db\migration\data\v400\extensions_composer_2', + '\phpbb\db\migration\data\v400\extensions_composer_3' + ]; + } +} From 039dabea45a0e5183597c1e4794a4391e27a49b5 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Mon, 22 Dec 2025 15:49:53 -0800 Subject: [PATCH 1041/1214] [ticket/17595] Fix json_decode related issue PHPBB-17595 --- phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php index 48ec65fdb96..d0c7d477e14 100644 --- a/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php +++ b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php @@ -24,7 +24,7 @@ public function effectively_installed() public function update_data() { - $repositories = json_decode($this->config['exts_composer_repositories'], true); + $repositories = json_decode($this->config['exts_composer_repositories'], true) ?: []; $repositories = array_map(function($repo) { return $repo === 'https://www.phpbb.com/customise/db/composer/' ? 'https://www.phpbb.com/customise/db/composer/40/' From f041c8d299429f5295af01bf963b7ef7412622b6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Dec 2025 11:07:16 +0100 Subject: [PATCH 1042/1214] [ticket/17566] Fix login detection and improve session test PHPBB-17566 --- tests/session/check_ban_test.php | 55 +++++++++++++------ .../phpbb_functional_test_case.php | 2 +- 2 files changed, 40 insertions(+), 17 deletions(-) diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php index 44a4012d3b2..d89201638bb 100644 --- a/tests/session/check_ban_test.php +++ b/tests/session/check_ban_test.php @@ -26,14 +26,22 @@ public function getDataSet() return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_banlist.xml'); } - static function check_banned_data() + static function check_banned_data(): array { - return array( - array('All false values, should not be banned', - false, false, false, false, /* should be banned? -> */ false), - array('Matching values in the database, should be banned', - 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true), - ); + return [ + 'not_banned' => [ + 'All false values, should not be banned', + false, false, false, false, /* should be banned? -> */ false + ], + 'banned' => [ + 'Matching values in the database, should be banned', + 4, '127.0.0.1', 'bar@example.org', true, /* should be banned? -> */ true + ], + 'banned_with_trigger_error' => [ + 'Matching values in the database, should be banned', + 4, '127.0.0.1', 'bar@example.org', false, /* should be banned? -> */ true + ], + ]; } protected function setUp(): void @@ -90,6 +98,17 @@ protected function setUp(): void $ban_manager = new \phpbb\ban\manager($collection, $cache->get_driver(), $this->db, $language, $phpbb_log, $user, 'phpbb_bans', 'phpbb_users'); $phpbb_container->set('ban.manager', $ban_manager); + + $phpbb_container->set( + 'auth.provider.db', + new phpbb_mock_auth_provider() + ); + $provider_collection = new \phpbb\auth\provider_collection($phpbb_container, $config); + $provider_collection->add('auth.provider.db'); + $phpbb_container->set( + 'auth.provider_collection', + $provider_collection + ); } protected function tearDown(): void @@ -103,16 +122,20 @@ protected function tearDown(): void /** @dataProvider check_banned_data */ public function test_check_is_banned($test_msg, $user_id, $user_ips, $user_email, $return, $should_be_banned) { - try - { - $ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return); - $is_banned = !empty($ban); - } - catch (PHPUnit\Framework\Error\Notice $e) - { - // User error was triggered, user must have been banned + $is_banned = false; + + // Set a custom handler to "catch" the notice + set_error_handler(function ($errno, $errstr) use (&$is_banned) { $is_banned = true; - } + return true; // Stop PHP from handling the error further + }, E_USER_NOTICE); + + $ban = $this->session->check_ban($user_id, $user_ips, $user_email, $return); + + // Restore the default handler immediately after the call + restore_error_handler(); + + $is_banned = !empty($ban) || $is_banned; $this->assertEquals($should_be_banned, $is_banned, $test_msg); } diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 022bbd1e0cc..e58ed075fc2 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1688,7 +1688,7 @@ protected static function get_logged_in_user() $is_logged_in = strpos($crawler->filter('div[class="navbar"]')->text(), 'Login') === false; if ($is_logged_in) { - $username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span')->text(); + $username_logged_in = $crawler->filter('li[id="username_logged_in"] > div > a > span:not(.avatar)')->text(); } return $username_logged_in; } From e3e3165d7c449c750aae6c8d38009e0e6a8222dd Mon Sep 17 00:00:00 2001 From: rxu Date: Wed, 24 Dec 2025 00:01:34 +0700 Subject: [PATCH 1043/1214] [ticket/17596] Fix logout link in ACP PHPBB-17596 --- phpBB/includes/functions_acp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 3a3dc080d0e..54df35415d3 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -81,7 +81,7 @@ function adm_page_header($page_title) 'PHPBB_VERSION' => PHPBB_VERSION, 'PHPBB_MAJOR' => $phpbb_major, - 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout'), + 'U_LOGOUT' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=logout&hash=' . generate_link_hash('ucp_logout')), 'U_ADM_LOGOUT' => append_sid("{$phpbb_admin_path}index.$phpEx", 'action=admlogout&hash=' . generate_link_hash('acp_logout')), 'U_ADM_INDEX' => append_sid("{$phpbb_admin_path}index.$phpEx"), 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), From 1e8d385bba565cb12a7a37660470205a9ebdb5cf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 23 Dec 2025 19:57:37 +0100 Subject: [PATCH 1044/1214] [ticket/17566] Fix exclude of placeholder for groups and trim username PHPBB-17566 --- phpBB/styles/prosilver/template/avatar.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/styles/prosilver/template/avatar.html b/phpBB/styles/prosilver/template/avatar.html index 451b9102b49..f7d835bca8a 100644 --- a/phpBB/styles/prosilver/template/avatar.html +++ b/phpBB/styles/prosilver/template/avatar.html @@ -4,12 +4,12 @@ {% else %} {{ avatar(avatar_data, lang('USER_AVATAR')) }} {% endif %} -{% elseif avatar_data.id and not avatar_data.id starts with 'g' %} +{% elseif avatar_data.id and not(avatar_data.id starts with 'g') %} {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} {% set color_class = color_classes[avatar_data.id % 5] %} {% if avatar_link %}{% endif %}
    -
    {{ username|striptags|slice(0, 1)|upper }}
    +
    {{ username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper }}
    {% if avatar_link %}    {% endif %} {% endif %} From 04f016f2cabb9ce6deb43e6387f6cc892d51709d Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 23 Dec 2025 14:31:24 -0800 Subject: [PATCH 1045/1214] [ticket/17593] Ensure cookies are secure when using ssl for testing PHPBB-17593 --- tests/test_framework/phpbb_functional_test_case.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 957e035e9b1..0d5e5051eb1 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -86,12 +86,19 @@ protected function setUp(): void $this->bootstrap(); + $db = $this->get_db(); + self::$cookieJar = new CookieJar; self::$client = new Goutte\Client(array(), null, self::$cookieJar); // Disable SSL verification for local development with self-signed certificates if (isset(self::$config['path_to_ssl_cert'])) { + // Synchronize cookie secure flag with the server protocol + $cookie_secure = (strpos(self::$root_url, 'https://') === 0) ? '1' : '0'; + $sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = '$cookie_secure' WHERE config_name = 'cookie_secure'"; + $db->sql_query($sql); + $guzzle_client = new \GuzzleHttp\Client(['verify' => self::$config['path_to_ssl_cert']]); self::$client->setClient($guzzle_client); } @@ -101,8 +108,6 @@ protected function setUp(): void $this->lang = array(); $this->add_lang('common'); - $db = $this->get_db(); - // Special flag for testing without possibility to run into lock scenario. // Unset entry and add it back if lock behavior for posting should be tested. // Unset ci_tests_no_lock_posting from config From a425d0bad324c3dee2f4ffb8f7d179d765a58b63 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 23 Dec 2025 14:33:05 -0800 Subject: [PATCH 1046/1214] [ticket/17593] Update running tests readme doc about using SSL PHPBB-17593 --- tests/RUNNING_TESTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index 0470a09a148..53bc91364e0 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -180,7 +180,7 @@ path to your security certificate for functional tests to run successfully. Set `$path_to_ssl_cert` to the location of your certificate file (.pem or .crt). If you can’t locate your certificate, or it still isn’t working, you can disable SSL verification by setting this value to `false` (though this is less secure). -Note: You must keep `$phpbb_functional_url` set to `http`, since this option bypasses https. +Note: You must ensure `$phpbb_functional_url` is using `https://`. $path_to_ssl_cert = '/path/to/your/certificate.pem'; From df2b74dae1d5f35e6e00e3cf3c8d1bec638cd849 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 23 Dec 2025 14:33:43 -0800 Subject: [PATCH 1047/1214] [ticket/17593] Fix unrelated code error in test framework PHPBB-17593 --- tests/test_framework/phpbb_functional_test_case.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 0d5e5051eb1..c52cf4ee696 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -864,7 +864,7 @@ protected function login($username = 'admin', $autologin = false) $cookies = self::$cookieJar->all(); // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie); + foreach ($cookies as $cookie) { if (substr($cookie->getName(), -4) == '_sid') { @@ -913,7 +913,7 @@ protected function admin_login($username = 'admin') $cookies = self::$cookieJar->all(); // The session id is stored in a cookie that ends with _sid - we assume there is only one such cookie - foreach ($cookies as $cookie); + foreach ($cookies as $cookie) { if (substr($cookie->getName(), -4) == '_sid') { From 3bda26a34bc53b9b3c7fbc851ea1de08341def0b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 24 Dec 2025 07:35:55 -0800 Subject: [PATCH 1048/1214] [ticket/17591] Remove deprecated code sniffer comments PHPBB-17591 --- phpBB/includes/functions_convert.php | 2 -- phpBB/includes/functions_module.php | 2 -- phpBB/install/convert/convertor.php | 14 -------------- phpBB/phpbb/extension/manager.php | 6 ------ 4 files changed, 24 deletions(-) diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 9f145b44d36..01afbe8d170 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1277,11 +1277,9 @@ function restore_config($schema) { $var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'"; $exec = '$config_value = ' . $m[1] . '(' . $var . ');'; - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($exec); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } else { diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index 41e660cdfe6..5ee0cee7198 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -468,11 +468,9 @@ static function module_auth($module_auth, $forum_id) ); $is_auth = false; - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval('$is_auth = (int) (' . $module_auth . ');'); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd return $is_auth; } diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php index d433333c430..b4a75c0fb61 100644 --- a/phpBB/install/convert/convertor.php +++ b/phpBB/install/convert/convertor.php @@ -453,11 +453,9 @@ function convert_data($converter) // Now process queries and execute functions that have to be executed prior to the conversion if (!empty($convert->convertor['execute_first'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_first']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } if (!empty($convert->convertor['query_first'])) @@ -527,11 +525,9 @@ function convert_data($converter) // process execute_first and query_first for this table... if (!empty($schema['execute_first'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($schema['execute_first']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } if (!empty($schema['query_first'])) @@ -596,11 +592,9 @@ function convert_data($converter) // it gets split because of time restrictions if (!empty($schema['execute_always'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($schema['execute_always']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } // @@ -1115,21 +1109,17 @@ function jump($converter, $jump, $last_statement) { if (!is_array($convert->convertor['execute_last'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } else { while ($last_statement < count($convert->convertor['execute_last'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last'][$last_statement]); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd $this->template->assign_block_vars('checks', array( 'TITLE' => $convert->convertor['execute_last'][$last_statement], @@ -1495,11 +1485,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($execution); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } } } @@ -1552,11 +1540,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($execution); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } } } diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index 2fb9ba881a1..2abf92b665f 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -260,9 +260,7 @@ public function enable_step($name) */ public function enable($name) { - // @codingStandardsIgnoreStart while ($this->enable_step($name)); - // @codingStandardsIgnoreEnd } /** @@ -308,9 +306,7 @@ public function disable_step($name) */ public function disable($name) { - // @codingStandardsIgnoreStart while ($this->disable_step($name)); - // @codingStandardsIgnoreEnd } /** @@ -363,9 +359,7 @@ public function purge_step($name) */ public function purge($name) { - // @codingStandardsIgnoreStart while ($this->purge_step($name)); - // @codingStandardsIgnoreEnd } /** From e018954436000f712386e809cad15ede9ed131ec Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 24 Dec 2025 07:38:48 -0800 Subject: [PATCH 1049/1214] [ticket/17591] Remove deprecated code sniffer comments PHPBB-17591 --- phpBB/includes/functions_convert.php | 2 -- phpBB/includes/functions_module.php | 2 -- phpBB/install/convert/convertor.php | 14 -------------- phpBB/phpbb/extension/manager.php | 6 ------ 4 files changed, 24 deletions(-) diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php index 4abc5aab0cb..b2d394b86f8 100644 --- a/phpBB/includes/functions_convert.php +++ b/phpBB/includes/functions_convert.php @@ -1124,11 +1124,9 @@ function restore_config($schema) { $var = (empty($m[2]) || empty($convert_config[$m[2]])) ? "''" : "'" . addslashes($convert_config[$m[2]]) . "'"; $exec = '$config_value = ' . $m[1] . '(' . $var . ');'; - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($exec); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } else { diff --git a/phpBB/includes/functions_module.php b/phpBB/includes/functions_module.php index e6adc4e7601..55e08ec03df 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -468,11 +468,9 @@ static function module_auth($module_auth, $forum_id) ); $is_auth = false; - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval('$is_auth = (int) (' . $module_auth . ');'); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd return $is_auth; } diff --git a/phpBB/install/convert/convertor.php b/phpBB/install/convert/convertor.php index 1e69a57b193..f2a9ce51f42 100644 --- a/phpBB/install/convert/convertor.php +++ b/phpBB/install/convert/convertor.php @@ -445,11 +445,9 @@ function convert_data($converter) // Now process queries and execute functions that have to be executed prior to the conversion if (!empty($convert->convertor['execute_first'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_first']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } if (!empty($convert->convertor['query_first'])) @@ -519,11 +517,9 @@ function convert_data($converter) // process execute_first and query_first for this table... if (!empty($schema['execute_first'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($schema['execute_first']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } if (!empty($schema['query_first'])) @@ -588,11 +584,9 @@ function convert_data($converter) // it gets split because of time restrictions if (!empty($schema['execute_always'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($schema['execute_always']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } // @@ -1107,21 +1101,17 @@ function jump($converter, $jump, $last_statement) { if (!is_array($convert->convertor['execute_last'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last']); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } else { while ($last_statement < count($convert->convertor['execute_last'])) { - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($convert->convertor['execute_last'][$last_statement]); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd $this->template->assign_block_vars('checks', array( 'TITLE' => $convert->convertor['execute_last'][$last_statement], @@ -1487,11 +1477,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($execution); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } } } @@ -1544,11 +1532,9 @@ function process_row(&$schema, &$sql_data, &$insert_values) $execution = str_replace('{RESULT}', '$value', $execution); $execution = str_replace('{VALUE}', '$value', $execution); - // @codingStandardsIgnoreStart // phpcs:disable Squiz.PHP.Eval eval($execution); // phpcs:enable Squiz.PHP.Eval - // @codingStandardsIgnoreEnd } } } diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index ffa38be2868..29b7cc213dd 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -258,9 +258,7 @@ public function enable_step($name) */ public function enable($name) { - // @codingStandardsIgnoreStart while ($this->enable_step($name)); - // @codingStandardsIgnoreEnd } /** @@ -306,9 +304,7 @@ public function disable_step($name) */ public function disable($name) { - // @codingStandardsIgnoreStart while ($this->disable_step($name)); - // @codingStandardsIgnoreEnd } /** @@ -361,9 +357,7 @@ public function purge_step($name) */ public function purge($name) { - // @codingStandardsIgnoreStart while ($this->purge_step($name)); - // @codingStandardsIgnoreEnd } /** From a84f7e2fb2d5cbf0db08463c1fc8e0166cdab6ce Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 24 Dec 2025 12:29:45 -0800 Subject: [PATCH 1050/1214] [ticket/17593] Set cookie secure for functional tests during setup PHPBB-17593 --- tests/test_framework/phpbb_functional_test_case.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index c52cf4ee696..4c6e8f06252 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -86,19 +86,12 @@ protected function setUp(): void $this->bootstrap(); - $db = $this->get_db(); - self::$cookieJar = new CookieJar; self::$client = new Goutte\Client(array(), null, self::$cookieJar); // Disable SSL verification for local development with self-signed certificates if (isset(self::$config['path_to_ssl_cert'])) { - // Synchronize cookie secure flag with the server protocol - $cookie_secure = (strpos(self::$root_url, 'https://') === 0) ? '1' : '0'; - $sql = 'UPDATE ' . CONFIG_TABLE . " SET config_value = '$cookie_secure' WHERE config_name = 'cookie_secure'"; - $db->sql_query($sql); - $guzzle_client = new \GuzzleHttp\Client(['verify' => self::$config['path_to_ssl_cert']]); self::$client->setClient($guzzle_client); } @@ -108,6 +101,8 @@ protected function setUp(): void $this->lang = array(); $this->add_lang('common'); + $db = $this->get_db(); + // Special flag for testing without possibility to run into lock scenario. // Unset entry and add it back if lock behavior for posting should be tested. // Unset ci_tests_no_lock_posting from config @@ -405,7 +400,7 @@ static protected function install_board() $iohandler->set_input('smtp_pass', 'nxpass'); $iohandler->set_input('submit_email', 'submit'); - $iohandler->set_input('cookie_secure', '0'); + $iohandler->set_input('cookie_secure', (strpos(self::$root_url, 'https://') === 0) ? '1' : '0'); $iohandler->set_input('server_protocol', '0'); $iohandler->set_input('force_server_vars', $parseURL['scheme'] . '://'); $iohandler->set_input('server_name', $parseURL['host']); From c8a5130c19e2fef40a6c915bb988a355524ad148 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 25 Dec 2025 14:32:13 +0100 Subject: [PATCH 1051/1214] [ticket/17592] Move html to template file for no match template PHPBB-17592 --- phpBB/assets/javascript/mentions.js | 3 +-- phpBB/styles/prosilver/template/posting_buttons.html | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/phpBB/assets/javascript/mentions.js b/phpBB/assets/javascript/mentions.js index 803d7053ea6..7e287ab6d65 100644 --- a/phpBB/assets/javascript/mentions.js +++ b/phpBB/assets/javascript/mentions.js @@ -291,8 +291,7 @@ itemClass: 'mention-item', menuItemTemplate, noMatchTemplate() { - const returnTemplate = (typeof mention_no_match_found === 'undefined') ? 'No match found' : mention_no_match_found; - return '
  • ' + returnTemplate + '
    • '; + return (typeof mention_no_match_found === 'undefined') ? 'No match found' : mention_no_match_found; }, selectTemplate(item) { return '[mention ' + (item.type === 'g' ? 'group_id=' : 'user_id=') + item.id + ']' + item.name + '[/mention]'; diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html index 3463f97ad10..4712cc34a62 100644 --- a/phpBB/styles/prosilver/template/posting_buttons.html +++ b/phpBB/styles/prosilver/template/posting_buttons.html @@ -10,7 +10,7 @@ var bbtags = new Array('[b]','[/b]','[i]','[/i]','[u]','[/u]','[quote]','[/quote]','[code]','[/code]','[list]','[/list]','[list=]','[/list]','[img]','[/img]','[url]','[/url]','[size=]','[/size]', {custom_tags.BBCODE_NAME}); var imageTag = false; - var mention_no_match_found = '{{ lang('MENTION_NO_MATCH_FOUND')|e('js') }}'; + var mention_no_match_found = '
  • {{ lang('MENTION_NO_MATCH_FOUND')|e('js') }}
    • '; function change_palette() { From 87fb4c19cbe34ad2c201c5d493ff8ccc50aa954c Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Thu, 25 Dec 2025 07:42:25 -0800 Subject: [PATCH 1052/1214] [ticket/17593] Allow server env var for SSL paths in functional tests PHPBB-17593 --- tests/RUNNING_TESTS.md | 19 +++++++++++++------ .../phpbb_test_case_helpers.php | 5 +++++ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/tests/RUNNING_TESTS.md b/tests/RUNNING_TESTS.md index 53bc91364e0..5c369b1771d 100644 --- a/tests/RUNNING_TESTS.md +++ b/tests/RUNNING_TESTS.md @@ -175,6 +175,17 @@ on which to run tests. $phpbb_functional_url = 'http://localhost/phpBB3/'; +Functional tests are automatically run, if '$phpbb_functional_url' is configured. +If you only want the functional tests, run: + + $ phpBB/vendor/bin/phpunit --group functional + +This will change your board's config.php file, but it makes a backup at +config_dev.php, so you can restore it after the test run is complete. + +Running on SSL +-------------- + If your local server uses an SSL certificate with HTTPS, you may need to specify the path to your security certificate for functional tests to run successfully. Set `$path_to_ssl_cert` to the location of your certificate file (.pem or .crt). @@ -184,13 +195,9 @@ Note: You must ensure `$phpbb_functional_url` is using `https://`. $path_to_ssl_cert = '/path/to/your/certificate.pem'; -Functional tests are automatically run, if '$phpbb_functional_url' is configured. -If you only want the functional tests, run: - - $ phpBB/vendor/bin/phpunit --group functional +Or via environment variables as follows: -This will change your board's config.php file, but it makes a backup at -config_dev.php, so you can restore it after the test run is complete. + $ PHPBB_TEST_SSL_CERT_PATH=/path/to/your/certificate.pem phpunit UI tests ======== diff --git a/tests/test_framework/phpbb_test_case_helpers.php b/tests/test_framework/phpbb_test_case_helpers.php index eb667e0336d..bb1ae974d6c 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -237,6 +237,11 @@ static public function get_test_config() $config['memcached_port'] = $_SERVER['PHPBB_TEST_MEMCACHED_PORT']; } + if (isset($_SERVER['PHPBB_TEST_SSL_CERT_PATH'])) + { + $config['path_to_ssl_cert'] = $_SERVER['PHPBB_TEST_SSL_CERT_PATH']; + } + return $config; } From af917d069aacbbd3b416c5bb12d590d69ab38d7c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 27 Dec 2025 21:17:41 +0100 Subject: [PATCH 1053/1214] [ticket/17597] Improve avatar handling in prosilver and add to notifications PHPBB-17597 --- .../container/services_notification.yml | 1 + phpBB/includes/mcp/mcp_warn.php | 4 +- phpBB/phpbb/avatar/helper.php | 2 + phpBB/phpbb/notification/type/base.php | 56 ++++++++++--------- phpBB/phpbb/user_loader.php | 1 + phpBB/styles/prosilver/template/avatar.html | 4 +- .../prosilver/template/mcp_warn_post.html | 5 +- .../prosilver/template/mcp_warn_user.html | 5 +- .../prosilver/template/memberlist_body.html | 1 - .../template/notification_dropdown.html | 2 +- .../prosilver/template/ucp_notifications.html | 1 + phpBB/styles/prosilver/theme/bidi.css | 10 +++- phpBB/styles/prosilver/theme/content.css | 16 ++++++ 13 files changed, 73 insertions(+), 35 deletions(-) diff --git a/phpBB/config/default/container/services_notification.yml b/phpBB/config/default/container/services_notification.yml index b3ff08586dd..98482a2b042 100644 --- a/phpBB/config/default/container/services_notification.yml +++ b/phpBB/config/default/container/services_notification.yml @@ -26,6 +26,7 @@ services: notification.type.base: abstract: true arguments: + - '@avatar.helper' - '@controller.helper' - '@dbal.conn' - '@language' diff --git a/phpBB/includes/mcp/mcp_warn.php b/phpBB/includes/mcp/mcp_warn.php index d555773c0c6..da4aacd11b4 100644 --- a/phpBB/includes/mcp/mcp_warn.php +++ b/phpBB/includes/mcp/mcp_warn.php @@ -347,7 +347,7 @@ function mcp_warn_post_view($action) $avatar_helper = $phpbb_container->get('avatar.helper'); $avatar = $avatar_helper->get_user_avatar($user_row); - $template->assign_vars($avatar_helper->get_template_vars($avatar)); + $template->assign_vars($avatar_helper->get_template_vars($avatar, 'USER_')); $template->assign_vars(array( 'U_POST_ACTION' => $this->u_action, @@ -500,7 +500,7 @@ function mcp_warn_user_view($action) $avatar_helper = $phpbb_container->get('avatar.helper'); $avatar = $avatar_helper->get_user_avatar($user_row); - $template->assign_vars($avatar_helper->get_template_vars($avatar)); + $template->assign_vars($avatar_helper->get_template_vars($avatar, 'USER_')); // OK, they didn't submit a warning so lets build the page for them to do so $template->assign_vars(array( diff --git a/phpBB/phpbb/avatar/helper.php b/phpBB/phpbb/avatar/helper.php index 9400e76a59c..119cd5dc210 100644 --- a/phpBB/phpbb/avatar/helper.php +++ b/phpBB/phpbb/avatar/helper.php @@ -144,6 +144,7 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals { return [ 'id' => 0, + 'username' => '', 'lazy' => false, 'src' => '', 'title' => '', @@ -155,6 +156,7 @@ public function get_avatar(array $row, string $title, bool $ignore_config = fals $data = [ 'id' => $row['id'] ?? 0, + 'username' => $row['username'] ?? '', 'src' => $row['avatar'], 'width' => $row['avatar_width'], 'height' => $row['avatar_height'], diff --git a/phpBB/phpbb/notification/type/base.php b/phpBB/phpbb/notification/type/base.php index 009ea2ff887..ad03fb11c22 100644 --- a/phpBB/phpbb/notification/type/base.php +++ b/phpBB/phpbb/notification/type/base.php @@ -13,6 +13,13 @@ namespace phpbb\notification\type; +use phpbb\auth\auth; +use phpbb\avatar\helper as avatar_helper; +use phpbb\controller\helper; +use phpbb\db\driver\driver_interface; +use phpbb\language\language; +use phpbb\user; + /** * Base notifications class */ @@ -21,19 +28,22 @@ abstract class base implements \phpbb\notification\type\type_interface /** @var \phpbb\notification\manager */ protected $notification_manager; - /** @var \phpbb\controller\helper|null */ + /** @var avatar_helper */ + protected $avatar_helper; + + /** @var helper|null */ protected $controller_helper; - /** @var \phpbb\db\driver\driver_interface */ + /** @var driver_interface */ protected $db; - /** @var \phpbb\language\language */ + /** @var language */ protected $language; - /** @var \phpbb\user */ + /** @var user */ protected $user; - /** @var \phpbb\auth\auth */ + /** @var auth */ protected $auth; /** @var string */ @@ -79,17 +89,20 @@ abstract class base implements \phpbb\notification\type\type_interface /** * Notification Type Base Constructor * - * @param \phpbb\controller\helper $controller_helper - * @param \phpbb\db\driver\driver_interface $db - * @param \phpbb\language\language $language - * @param \phpbb\user $user - * @param \phpbb\auth\auth $auth - * @param string $phpbb_root_path - * @param string $php_ext - * @param string $user_notifications_table + * @param avatar_helper $avatar_helper + * @param helper $controller_helper + * @param driver_interface $db + * @param language $language + * @param user $user + * @param auth $auth + * @param string $phpbb_root_path + * @param string $php_ext + * @param string $user_notifications_table */ - public function __construct(\phpbb\controller\helper $controller_helper, \phpbb\db\driver\driver_interface $db, \phpbb\language\language $language, \phpbb\user $user, \phpbb\auth\auth $auth, $phpbb_root_path, $php_ext, $user_notifications_table) + public function __construct(avatar_helper $avatar_helper, helper $controller_helper, driver_interface $db, language $language, + user $user, auth $auth, string $phpbb_root_path, string $php_ext, string $user_notifications_table) { + $this->avatar_helper = $avatar_helper; $this->controller_helper = $controller_helper; $this->db = $db; $this->language = $language; @@ -299,8 +312,9 @@ public function prepare_for_display() } $avatar = $this->get_avatar(); + $avatar_data = count($avatar) ? $this->avatar_helper->get_template_vars($avatar) : []; - return [ + return array_merge($avatar_data, [ 'NOTIFICATION_ID' => $this->notification_id, 'STYLING' => $this->get_style_class(), 'FORMATTED_TITLE' => $this->get_title(), @@ -311,18 +325,8 @@ public function prepare_for_display() 'TIME' => $this->user->format_date($this->notification_time), 'UNREAD' => !$this->notification_read, - 'AVATAR_SOURCE' => $avatar ? $avatar['src'] : '', - 'AVATAR_TITLE' => $avatar ? $avatar['title'] : '', - 'AVATAR_TYPE' => $avatar ? $avatar['type'] : '', - - 'AVATAR_WIDTH' => $avatar ? $avatar['width'] : 0, - 'AVATAR_HEIGHT' => $avatar ? $avatar['height'] : 0, - - 'AVATAR_HTML' => $avatar ? $avatar['html'] : '', - 'AVATAR_LAZY' => $avatar ? $avatar['lazy'] : true, - 'U_MARK_READ' => (!$this->notification_read) ? $u_mark_read : '', - ]; + ]); } /** diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php index 3e72dd00160..47c0e63ed7f 100644 --- a/phpBB/phpbb/user_loader.php +++ b/phpBB/phpbb/user_loader.php @@ -198,6 +198,7 @@ public function get_avatar($user_id, $query = false, $lazy = false) $row = [ 'id' => $user['user_id'], + 'username' => $user['username'], 'avatar' => $user['user_avatar'], 'avatar_type' => $user['user_avatar_type'], 'avatar_width' => $user['user_avatar_width'], diff --git a/phpBB/styles/prosilver/template/avatar.html b/phpBB/styles/prosilver/template/avatar.html index f7d835bca8a..28448f52769 100644 --- a/phpBB/styles/prosilver/template/avatar.html +++ b/phpBB/styles/prosilver/template/avatar.html @@ -9,7 +9,9 @@ {% set color_class = color_classes[avatar_data.id % 5] %} {% if avatar_link %}{% endif %}
    -
    {{ username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper }}
    + {% set username = username ?: avatar_data.username %} + {% set initials = username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper %} +
    {% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}
    {% if avatar_link %}    {% endif %} {% endif %} diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index 231a80fcc0e..031e1baa9a5 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -11,7 +11,10 @@

    {USERNAME}
    -
    {AVATAR_HTML}
    + {% include 'avatar.html' with { + 'avatar_data': USER_AVATAR, + 'username': USERNAME + } only %}
    diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index 64a940de7ee..d619b04a9e1 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -11,7 +11,10 @@

    {USERNAME_FULL}

    -
    {AVATAR_HTML}
    + {% include 'avatar.html' with { + 'avatar_data': USER_AVATAR, + 'username': USERNAME + } only %}
    diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index 4a23619ab1e..c749a457d96 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -27,7 +27,6 @@

    style="color:#{GROUP_COLOR};"{AVATAR_HTML} {% EVENT memberlist_body_group_rank_before %} {% if RANK_IMG %}{{ RANK_IMG }}{% endif %} {% if GROUP_RANK %} diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html index 0e1e0807fd1..24db06e32f8 100644 --- a/phpBB/styles/prosilver/template/notification_dropdown.html +++ b/phpBB/styles/prosilver/template/notification_dropdown.html @@ -22,7 +22,7 @@ - {notifications.AVATAR_HTML} + {% include 'avatar.html' with {'avatar_data': notifications.AVATAR} only %}

    {notifications.FORMATTED_TITLE}

    {notifications.REFERENCE}

    diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 7c5715fb41d..3efbd1076d4 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -40,6 +40,7 @@

    {TITLE}

    + {% include 'avatar.html' with {'avatar_data': notification_list.AVATAR} only %} {notification_list.AVATAR_HTML}
    diff --git a/phpBB/styles/prosilver/theme/bidi.css b/phpBB/styles/prosilver/theme/bidi.css index 27a4923fb2c..cad38b96089 100644 --- a/phpBB/styles/prosilver/theme/bidi.css +++ b/phpBB/styles/prosilver/theme/bidi.css @@ -143,6 +143,12 @@ margin-left: 5px; } +.rtl .notification-block .avatar-placeholder, +.rtl .notification-list .topiclist .notification-item .avatar-placeholder, +.rtl .notification-list .topiclist .notification-item .avatar { + float: right; +} + .rtl .notification-menu .notifications { margin-right: 50px; margin-left: 0; @@ -512,7 +518,7 @@ .rtl .postbody, .rtl .postbody h3 { - float: right; + float: right !important; } .rtl .has-profile .postbody h3 { @@ -656,7 +662,7 @@ } .rtl .postprofile .avatar { - float: right; + float: left; } .rtl dl.pmlist dd { diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css index 33a0d9b4c8b..e98fcb4c849 100644 --- a/phpBB/styles/prosilver/theme/content.css +++ b/phpBB/styles/prosilver/theme/content.css @@ -837,6 +837,22 @@ fieldset.polls dd div { line-height: 1; } +.avatar-initials .o-icon { + font-size: 36px; + vertical-align: baseline !important; + width: auto; + height: auto; +} + +.notification-block .avatar-placeholder, +.notification-list .topiclist .notification-item .avatar, +.notification-list .topiclist .notification-item .avatar-placeholder { + font-size: 22px; + float: left; + width: 50px; + height: 50px; +} + .postprofile .profile-posts a { font-weight: normal; } From 06aeb4d63ba5da6afc52200bf0c447945b23efff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 08:19:42 +0100 Subject: [PATCH 1054/1214] [ticket/17597] Remove event locations for users without avatar With the placeholders this location is no longer needed. PHPBB-17597 --- phpBB/docs/events.md | 14 -------------- .../styles/prosilver/template/memberlist_view.html | 6 ------ 2 files changed, 20 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 1856aa5570a..117aa4cb2d5 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -1543,20 +1543,6 @@ memberlist_view_rank_avatar_before * Since: 3.1.6-RC1 * Purpose: Add information before rank in memberlist (with avatar) -memberlist_view_rank_no_avatar_after -=== -* Locations: - + styles/prosilver/template/memberlist_view.html -* Since: 3.1.6-RC1 -* Purpose: Add information after rank in memberlist (without avatar) - -memberlist_view_rank_no_avatar_before -=== -* Locations: - + styles/prosilver/template/memberlist_view.html -* Since: 3.1.6-RC1 -* Purpose: Add information before rank in memberlist (without avatar) - memberlist_view_user_statistics_after === * Locations: diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index f1fd43c4751..bfb166928b8 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -25,12 +25,6 @@

    {PAGE_TITLE}

    [     {L_USER_BAN} ] [ {L_USE_PERMISSIONS} ] - - -
    {L_RANK}{L_COLON}
    {RANK_TITLE}
    - {% if RANK_IMG %}
    {% if RANK_TITLE %} {% else %}{{ lang('RANK') ~ lang('COLON') }}{% endif %}
    {{ RANK_IMG }}
    {% endif %} - -
    {L_USER_IS_INACTIVE}{L_COLON}
    {USER_INACTIVE_REASON}
    {L_AGE}{L_COLON}
    {AGE}
    {L_USERGROUPS}{L_COLON}
    From d0fd7a5fdb5da3230d84afc70165cf283b83fcc8 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 08:24:07 +0100 Subject: [PATCH 1055/1214] [ticket/17597] Add username as default to avatar data and remove use of html PHPBB-17597 --- phpBB/phpbb/avatar/manager.php | 3 ++- phpBB/styles/prosilver/template/mcp_notes_user.html | 5 +---- phpBB/styles/prosilver/template/mcp_warn_post.html | 5 +---- phpBB/styles/prosilver/template/mcp_warn_user.html | 5 +---- phpBB/styles/prosilver/template/memberlist_view.html | 2 +- phpBB/styles/prosilver/template/navbar_header.html | 2 +- phpBB/styles/prosilver/template/ucp_avatar_options.html | 2 +- phpBB/styles/prosilver/template/ucp_notifications.html | 1 - phpBB/styles/prosilver/template/ucp_pm_viewmessage.html | 4 ++-- phpBB/styles/prosilver/template/viewtopic_body.html | 3 +-- 10 files changed, 11 insertions(+), 21 deletions(-) diff --git a/phpBB/phpbb/avatar/manager.php b/phpBB/phpbb/avatar/manager.php index ce47402def3..c4bc49de43b 100644 --- a/phpBB/phpbb/avatar/manager.php +++ b/phpBB/phpbb/avatar/manager.php @@ -202,10 +202,11 @@ public static function clean_row($row, $prefix = '') return self::$default_row; } + $required_keys = ['user_id', 'group_id', 'username']; $output = []; foreach ($row as $key => $value) { - if (!str_starts_with($key, $prefix ? "{$prefix}_avatar": 'avatar') && $key !== 'user_id' && $key !== 'group_id') + if (!str_starts_with($key, $prefix ? "{$prefix}_avatar": 'avatar') && !in_array($key, $required_keys)) { continue; } diff --git a/phpBB/styles/prosilver/template/mcp_notes_user.html b/phpBB/styles/prosilver/template/mcp_notes_user.html index 5e6b9ac97e9..c4682e09754 100644 --- a/phpBB/styles/prosilver/template/mcp_notes_user.html +++ b/phpBB/styles/prosilver/template/mcp_notes_user.html @@ -11,10 +11,7 @@

    {USERNAME_FULL}

    - {% include 'avatar.html' with { - 'avatar_data': USER_AVATAR, - 'username': USERNAME - } only %} + {% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
    diff --git a/phpBB/styles/prosilver/template/mcp_warn_post.html b/phpBB/styles/prosilver/template/mcp_warn_post.html index 031e1baa9a5..2928170b1b5 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_post.html +++ b/phpBB/styles/prosilver/template/mcp_warn_post.html @@ -11,10 +11,7 @@

    {USERNAME}
    - {% include 'avatar.html' with { - 'avatar_data': USER_AVATAR, - 'username': USERNAME - } only %} + {% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
    diff --git a/phpBB/styles/prosilver/template/mcp_warn_user.html b/phpBB/styles/prosilver/template/mcp_warn_user.html index d619b04a9e1..68fa78b0d35 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_user.html +++ b/phpBB/styles/prosilver/template/mcp_warn_user.html @@ -11,10 +11,7 @@

    {USERNAME_FULL}

    - {% include 'avatar.html' with { - 'avatar_data': USER_AVATAR, - 'username': USERNAME - } only %} + {% include 'avatar.html' with {'avatar_data': USER_AVATAR} only %}
    diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index bfb166928b8..14fb6736eff 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -8,7 +8,7 @@

    {PAGE_TITLE}

    -
    {% include 'avatar.html' with {'avatar_data': AVATAR, 'username': USERNAME} only %}
    +
    {% include 'avatar.html' with {'avatar_data': AVATAR} only %}
    {% EVENT memberlist_view_rank_avatar_before %} {% if RANK_TITLE %}
    {{ RANK_TITLE }}
    {% endif %} {% EVENT memberlist_view_rank_avatar_after %} diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index b5bc775c07e..70d2e4bc9af 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -119,7 +119,7 @@
    - {% if CURRENT_USER_AVATAR %}{% include 'avatar.html' with {'avatar_data': CURRENT_USER_AVATAR, 'user_id': S_USER_ID, 'username': S_USERNAME} only %} {% endif %} + {% if CURRENT_USER_AVATAR %}{% include 'avatar.html' with {'avatar_data': CURRENT_USER_AVATAR} only %} {% endif %} {{ CURRENT_USERNAME_SIMPLE }} {{ Icon('font', 'caret-down', '', true, '', {'style': 'color: #' ~ CURRENT_USER_GROUP_COLOR}) }} diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options.html b/phpBB/styles/prosilver/template/ucp_avatar_options.html index 1ed0d1506e7..45edbf964b5 100644 --- a/phpBB/styles/prosilver/template/ucp_avatar_options.html +++ b/phpBB/styles/prosilver/template/ucp_avatar_options.html @@ -8,7 +8,7 @@

    {ERROR}


    {L_AVATAR_EXPLAIN}
    -
    {% include 'avatar.html' with {'avatar_data': AVATAR, 'username': S_USERNAME} only %}
    +
    {% include 'avatar.html' with {'avatar_data': AVATAR} only %}
    diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 3efbd1076d4..d1cf04ec213 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -41,7 +41,6 @@

    {TITLE}

    {% include 'avatar.html' with {'avatar_data': notification_list.AVATAR} only %} - {notification_list.AVATAR_HTML}

    {notification_list.FORMATTED_TITLE} {notification_list.REFERENCE}

    diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html index 42259f2f620..d0c4c6961b3 100644 --- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html +++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html @@ -26,10 +26,10 @@
    -
    +
    - {% include 'avatar.html' with {'avatar_data': AUTHOR_AVATAR, 'username': MESSAGE_AUTHOR, 'avatar_link': U_MESSAGE_AUTHOR} only %} + {% include 'avatar.html' with {'avatar_data': AUTHOR_AVATAR} only %}
    {% apply spaceless %} diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index 88247b31597..d974ef334bb 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -140,12 +140,11 @@

    {POLL_
    style="display: none;"> -
    +
    {% include 'avatar.html' with { 'avatar_data': postrow.POSTER_AVATAR, - 'username': postrow.POST_AUTHOR, 'avatar_link': postrow.U_POST_AUTHOR } only %} From a73999e8eb66fa995947f51109d7e8014536e5cf Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 08:50:17 +0100 Subject: [PATCH 1056/1214] [ticket/17597] Use placeholder avatars in ACP PHPBB-17597 --- phpBB/adm/style/acp_groups.html | 2 +- phpBB/adm/style/acp_users_avatar.html | 2 +- phpBB/adm/style/admin.css | 32 +++++++++++++++++++++ phpBB/adm/style/avatar.html | 17 +++++++++++ phpBB/styles/prosilver/template/avatar.html | 4 +-- 5 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 phpBB/adm/style/avatar.html diff --git a/phpBB/adm/style/acp_groups.html b/phpBB/adm/style/acp_groups.html index 1559feebc3a..99851a5b989 100644 --- a/phpBB/adm/style/acp_groups.html +++ b/phpBB/adm/style/acp_groups.html @@ -113,7 +113,7 @@

    {L_WARNING}

    {L_GROUP_AVATAR}

    {L_AVATAR_EXPLAIN}
    -
    {% if AVATAR_HTML %}{{ AVATAR_HTML }}{% else %}{% endif %}
    +
    {% include 'avatar.html' with {avatar_data: AVATAR} only %}
    diff --git a/phpBB/adm/style/acp_users_avatar.html b/phpBB/adm/style/acp_users_avatar.html index 17aef46bd39..3c2556905db 100644 --- a/phpBB/adm/style/acp_users_avatar.html +++ b/phpBB/adm/style/acp_users_avatar.html @@ -5,7 +5,7 @@

    {ERROR}


    {L_AVATAR_EXPLAIN}
    -
    {% if AVATAR_HTML %}{{ AVATAR_HTML }}{% else %}{% endif %}
    +
    {% include 'avatar.html' with {avatar_data: AVATAR} only %}
    diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css index 8ffac325af6..c01b0cd3359 100644 --- a/phpBB/adm/style/admin.css +++ b/phpBB/adm/style/admin.css @@ -2708,6 +2708,38 @@ fieldset.permissions .permissions-switch { padding: 0; } +/* Placeholder avatars +---------------------------------------- */ +.avatar-color-default { background-color: hsl(207, 15%, 80%); } +.avatar-color-0 { background-color: #d32f2f; } +.avatar-color-1 { background-color: #c2185b; } +.avatar-color-2 { background-color: #7b1fa2; } +.avatar-color-3 { background-color: #512da8; } +.avatar-color-4 { background-color: #303f9f; } + +.avatar-initials { + font-size: 36px; + font-weight: bold; + line-height: 1; + color: #ffffff; +} + +.avatar-placeholder { + border-radius: 50%; + display: flex; + justify-content: center; + align-items: center; + width: 80px; + height: 80px; +} + +.avatar-initials .o-icon { + font-size: 36px; + vertical-align: baseline !important; + width: auto; + height: auto; +} + /* Dropdown menu ---------------------------------------- */ .dropdown { diff --git a/phpBB/adm/style/avatar.html b/phpBB/adm/style/avatar.html new file mode 100644 index 00000000000..902799b0625 --- /dev/null +++ b/phpBB/adm/style/avatar.html @@ -0,0 +1,17 @@ +{% if avatar_data.src %} + {% if avatar_link %} + {{ avatar(avatar_data, lang('USER_AVATAR')) }} + {% else %} + {{ avatar(avatar_data, lang('USER_AVATAR')) }} + {% endif %} +{% elseif avatar_data.id %} + {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} + {% set color_class = not(avatar_data.id starts with 'g') ? color_classes[avatar_data.id % 5] : 'avatar-color-default' %} + {% if avatar_link %}    {% endif %} +
    + {% set username = username ?: avatar_data.username %} + {% set initials = username|striptags|trim(' -+_[]', 'left')|slice(0, 1)|upper %} +
    {% if initials %}{{ initials }}{% else %}{{ Icon('font', 'user', '', true) }}{% endif %}
    +
    + {% if avatar_link %}    {% endif %} +{% endif %} diff --git a/phpBB/styles/prosilver/template/avatar.html b/phpBB/styles/prosilver/template/avatar.html index 28448f52769..902799b0625 100644 --- a/phpBB/styles/prosilver/template/avatar.html +++ b/phpBB/styles/prosilver/template/avatar.html @@ -4,9 +4,9 @@ {% else %} {{ avatar(avatar_data, lang('USER_AVATAR')) }} {% endif %} -{% elseif avatar_data.id and not(avatar_data.id starts with 'g') %} +{% elseif avatar_data.id %} {% set color_classes = ['avatar-color-0', 'avatar-color-1', 'avatar-color-2', 'avatar-color-3', 'avatar-color-4'] %} - {% set color_class = color_classes[avatar_data.id % 5] %} + {% set color_class = not(avatar_data.id starts with 'g') ? color_classes[avatar_data.id % 5] : 'avatar-color-default' %} {% if avatar_link %}{% endif %}
    {% set username = username ?: avatar_data.username %} From a253add18a2074e040ac94cd30b911c0b0eadf5a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 08:59:06 +0100 Subject: [PATCH 1057/1214] [ticket/17597] Fix avatar cropping in UCP PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index c380f2ef99a..33be2a56de8 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -45,7 +45,8 @@ this.$buttons.appendTo(this.$box); // Ensure we have an img for the cropping - if (this.$box.children('img').length === 0) { + const $existingImg = this.$box.find('img'); + if ($existingImg.length === 0) { const $avatarImg = $(''); $avatarImg.setAttribute('width', phpbb.avatars.$data.data().maxWidth); $avatarImg.setAttribute('height', phpbb.avatars.$data.data().maxHeight); @@ -53,7 +54,7 @@ this.image = $avatarImg; this.$box.prepend($avatarImg); } else { - this.image = this.$box.children('img'); + this.image = $existingImg; } this.bindInput(); From 5d094e114abd17d37fad2170533f9f9f95e5f81c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 10:01:09 +0100 Subject: [PATCH 1058/1214] [ticket/17597] Update tests for modified avatar handling PHPBB-17597 --- phpBB/styles/prosilver/theme/colours.css | 1 + tests/notification/base.php | 1 + .../notification_method_email_test.php | 1 + tests/notification/submit_post_base.php | 1 + tests/ucp/controller_webpush_test.php | 22 +++++++++++-------- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css index 38007b303ce..711963f54ff 100644 --- a/phpBB/styles/prosilver/theme/colours.css +++ b/phpBB/styles/prosilver/theme/colours.css @@ -992,6 +992,7 @@ dl.mini dt { } /* avatar placeholder colours */ +.avatar-color-default { background-color: hsl(207, 15%, 80%); } .avatar-color-0 { background-color: #d32f2f; } .avatar-color-1 { background-color: #c2185b; } .avatar-color-2 { background-color: #7b1fa2; } diff --git a/tests/notification/base.php b/tests/notification/base.php index 4d080296156..d3d07c46c06 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -98,6 +98,7 @@ protected function setUp(): void $phpbb_container = $this->container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); $phpbb_container->set('user_loader', $this->user_loader); $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); diff --git a/tests/notification/notification_method_email_test.php b/tests/notification/notification_method_email_test.php index 08819ae995a..05586e5cc8a 100644 --- a/tests/notification/notification_method_email_test.php +++ b/tests/notification/notification_method_email_test.php @@ -75,6 +75,7 @@ protected function setUp(): void $phpbb_container = $this->container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); $phpbb_container->set('user_loader', $this->user_loader); $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 3559f01a0db..6c5979be05b 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -127,6 +127,7 @@ protected function setUp(): void $phpbb_container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); $phpbb_container->set('user_loader', $user_loader); $phpbb_container->set('user', $user); $phpbb_container->set('language', $lang); diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index 4dade9862fc..9641db0a1ad 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -164,7 +164,7 @@ public function test_notification_no_data($is_ajax, $is_bot, $user_type, $user_i $this->request->method('is_ajax')->willReturn($is_ajax); $this->request->expects($this->any()) ->method('variable') - ->will($this->returnValueMap($request_data)); + ->willReturnMap($request_data); $this->user->data = [ 'is_bot' => $is_bot, 'user_type' => $user_type, @@ -188,6 +188,7 @@ public function test_get_user_notification() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->avatar_helper, $this->controller_helper, $this->db, $this->language, @@ -207,11 +208,11 @@ public function test_get_user_notification() $this->request->method('is_ajax')->willReturn(true); $this->request->expects($this->any()) ->method('variable') - ->will($this->returnValueMap([ + ->willReturnMap([ ['token', '', false, request_interface::REQUEST, 'foobar'], ['item_id', 0, false, request_interface::REQUEST, 1], ['type_id', 0, false, request_interface::REQUEST, 4], - ])); + ]); $this->user->data = [ 'is_bot' => false, 'user_type' => USER_NORMAL, @@ -243,6 +244,7 @@ public function test_get_user_notification_anonymous() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->avatar_helper, $this->controller_helper, $this->db, $this->language, @@ -262,12 +264,12 @@ public function test_get_user_notification_anonymous() $this->request->method('is_ajax')->willReturn(true); $this->request->expects($this->any()) ->method('variable') - ->will($this->returnValueMap([ + ->willReturnMap([ ['token', '', false, request_interface::REQUEST, '0ccf8fcd96a66297b77b66109cbe9870e1a6fa66e42b9bf36d1f2c7263240058'], ['item_id', 0, false, request_interface::REQUEST, 1], ['type_id', 0, false, request_interface::REQUEST, 4], ['user_id', 0, false, request_interface::REQUEST, 2], - ])); + ]); $this->user->data = [ 'is_bot' => false, 'user_type' => USER_NORMAL, @@ -299,6 +301,7 @@ public function test_get_user_notification_anonymous_invalid_token() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->avatar_helper, $this->controller_helper, $this->db, $this->language, @@ -318,12 +321,12 @@ public function test_get_user_notification_anonymous_invalid_token() $this->request->method('is_ajax')->willReturn(true); $this->request->expects($this->any()) ->method('variable') - ->will($this->returnValueMap([ + ->willReturnMap([ ['token', '', false, request_interface::REQUEST, '488c17afe4f18714c235b395e21b78df1c3d78bf1e13d0633ed9425d2eebf967'], ['item_id', 0, false, request_interface::REQUEST, 1], ['type_id', 0, false, request_interface::REQUEST, 4], ['user_id', 0, false, request_interface::REQUEST, 2], - ])); + ]); $this->user->data = [ 'is_bot' => false, 'user_type' => USER_NORMAL, @@ -348,6 +351,7 @@ public function test_get_user_notification_legacy() $this->notification_manager->method('get_item_type_class') ->willReturnCallback(function(string $type_name, array $row_data) { $notification_type = new quote( + $this->avatar_helper, $this->controller_helper, $this->db, $this->language, @@ -367,11 +371,11 @@ public function test_get_user_notification_legacy() $this->request->method('is_ajax')->willReturn(true); $this->request->expects($this->any()) ->method('variable') - ->will($this->returnValueMap([ + ->willReturnMap([ ['token', '', false, request_interface::REQUEST, 'foobar'], ['item_id', 0, false, request_interface::REQUEST, 2], ['type_id', 0, false, request_interface::REQUEST, 4], - ])); + ]); $this->user->data = [ 'is_bot' => false, 'user_type' => USER_NORMAL, From 1d1ea59f124da5bdbcbe6f85d1100a5af7158108 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 10:36:36 +0100 Subject: [PATCH 1059/1214] [ticket/17597] Add missing service definition to webpush test PHPBB-17597 --- tests/notification/notification_method_webpush_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/notification/notification_method_webpush_test.php b/tests/notification/notification_method_webpush_test.php index f07012dc003..2e8c7910aa3 100644 --- a/tests/notification/notification_method_webpush_test.php +++ b/tests/notification/notification_method_webpush_test.php @@ -131,6 +131,7 @@ protected function setUp(): void $phpbb_container = $this->container = new ContainerBuilder(); $loader = new YamlFileLoader($phpbb_container, new FileLocator(__DIR__ . '/fixtures')); $loader->load('services_notification.yml'); + $phpbb_container->set('avatar.helper', $avatar_helper); $phpbb_container->set('user_loader', $this->user_loader); $phpbb_container->set('user', $user); $phpbb_container->set('language', $this->language); From b1527f87d5fcdc1aa50f36f077c856cfe55e3c9e Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Wed, 10 Oct 2018 07:56:56 +0000 Subject: [PATCH 1060/1214] [ticket/15823] Move viewonline to controller PHPBB3-15823 --- phpBB/config/default/container/services.yml | 4 +- .../default/container/services_members.yml | 50 ++ phpBB/config/default/routing/members.yml | 10 + phpBB/includes/functions.php | 2 +- phpBB/index.php | 3 +- phpBB/phpbb/group/helper.php | 24 +- phpBB/phpbb/members/controller/online.php | 312 ++++++++++++ .../phpbb/members/controller/online_whois.php | 149 ++++++ phpBB/phpbb/members/viewonline_helper.php | 468 +++++++++++++++++ phpBB/phpbb/routing/router.php | 11 + phpBB/phpbb/viewonline_helper.php | 98 ---- phpBB/viewonline.php | 480 +----------------- tests/functional/viewonline_test.php | 10 +- tests/group/helper_test_case.php | 7 +- tests/mention/controller_test.php | 4 +- tests/notification/group_request_test.php | 2 + tests/viewonline/helper_test.php | 28 +- 17 files changed, 1093 insertions(+), 569 deletions(-) create mode 100644 phpBB/phpbb/members/controller/online.php create mode 100644 phpBB/phpbb/members/controller/online_whois.php create mode 100644 phpBB/phpbb/members/viewonline_helper.php delete mode 100644 phpBB/phpbb/viewonline_helper.php diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index e3652c0dbf8..73c3f78a965 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -18,8 +18,8 @@ imports: - { resource: services_help.yml } - { resource: services_http.yml } - { resource: services_language.yml } - - { resource: services_mention.yml } - { resource: services_members.yml } + - { resource: services_mention.yml } - { resource: services_messenger.yml } - { resource: services_migrator.yml } - { resource: services_mimetype_guesser.yml } @@ -141,11 +141,13 @@ services: arguments: - '@auth' - '@avatar.helper' + - '@dbal.conn' - '@cache' - '@config' - '@language' - '@event_dispatcher' - '@path_helper' + - '@template' - '@user' log: diff --git a/phpBB/config/default/container/services_members.yml b/phpBB/config/default/container/services_members.yml index edacb697cf6..3464fe03f5f 100644 --- a/phpBB/config/default/container/services_members.yml +++ b/phpBB/config/default/container/services_members.yml @@ -1,6 +1,37 @@ services: # Controllers + members.controller.online: + class: phpbb\members\controller\online + arguments: + - '@auth' + - '@config' + - '@dispatcher' + - '@group_helper' + - '@viewonline_helper' + - '@controller.helper' + - '@language' + - '@pagination' + - '@request' + - '@template' + - '@user' + - '%core.root_path%' + - '%core.php_ext%' + + members.controller.online.whois: + class: phpbb\members\controller\online_whois + arguments: + - '@auth' + - '@dbal.conn' + - '@controller.helper' + - '@language' + - '@template' + - '@user' + - '%tables.users%' + - '%tables.sessions%' + - '%core.root_path%' + - '%core.php_ext%' + members.controller.team: class: phpbb\members\controller\team arguments: @@ -20,3 +51,22 @@ services: - '%tables.teampage%' - '%tables.user_group%' - '%tables.users%' + +# Helpers + viewonline_helper: + class: phpbb\members\viewonline_helper + arguments: + - '@dbal.conn' + - '@config' + - '@event_dispatcher' + - '@router' + - '@controller.helper' + - '@language' + - '@auth' + - '%core.root_path%' + - '%core.php_ext%' + - '%core.adm_relative_path%' + - '%tables.users%' + - '%tables.sessions%' + - '%tables.topics%' + - '%tables.forums%' diff --git a/phpBB/config/default/routing/members.yml b/phpBB/config/default/routing/members.yml index a254a43a29b..c46bbd2cfd7 100644 --- a/phpBB/config/default/routing/members.yml +++ b/phpBB/config/default/routing/members.yml @@ -1,3 +1,13 @@ +phpbb_members_online: + path: /online + defaults: + _controller: members.controller.online:handle + +phpbb_members_online_whois: + path: /online/whois/{session_id} + defaults: + _controller: members.controller.online.whois:handle + phpbb_members_team: path: /team defaults: diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 188f98d7e99..f89644dce88 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3849,7 +3849,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_PRIVATEMSGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'U_RETURN_INBOX' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=pm&folder=inbox'), 'U_MEMBERLIST' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), - 'U_VIEWONLINE' => ($auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) ? append_sid("{$phpbb_root_path}viewonline.$phpEx") : '', + 'U_VIEWONLINE' => $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel') ? $controller_helper->route('phpbb_members_online') : '', 'U_LOGIN_LOGOUT' => $u_login_logout, 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), 'U_SEARCH' => append_sid("{$phpbb_root_path}search.$phpEx"), diff --git a/phpBB/index.php b/phpBB/index.php index 4353264b213..e64a5614e05 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -30,7 +30,8 @@ /** @var \phpbb\group\helper $group_helper */ $group_helper = $phpbb_container->get('group_helper'); -$group_helper->display_legend($db, $template); +// This is shown only if display_online_list is true +$group_helper->display_legend(); // Generate birthday list if required ... $show_birthdays = ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')); diff --git a/phpBB/phpbb/group/helper.php b/phpBB/phpbb/group/helper.php index 4098846709e..5e1aaa1dc48 100644 --- a/phpBB/phpbb/group/helper.php +++ b/phpBB/phpbb/group/helper.php @@ -32,6 +32,9 @@ class helper /** @var avatar_helper */ protected $avatar_helper; + /** @var driver_interface */ + protected $db; + /** @var cache */ protected $cache; @@ -47,6 +50,9 @@ class helper /** @var path_helper */ protected $path_helper; + /** @var template */ + protected $template; + /** @var user */ protected $user; @@ -61,22 +67,26 @@ class helper * * @param auth $auth Authentication object * @param avatar_helper $avatar_helper Avatar helper object + * @param driver_interface $db Database connection * @param cache $cache Cache service object * @param config $config Configuration object * @param language $language Language object * @param dispatcher_interface $dispatcher Event dispatcher object * @param path_helper $path_helper Path helper object + * @param template $template Template service * @param user $user User object */ - public function __construct(auth $auth, avatar_helper $avatar_helper, cache $cache, config $config, language $language, dispatcher_interface $dispatcher, path_helper $path_helper, user $user) + public function __construct(auth $auth, avatar_helper $avatar_helper, driver_interface $db, cache $cache, config $config, language $language, dispatcher_interface $dispatcher, path_helper $path_helper, template $template, user $user) { $this->auth = $auth; $this->avatar_helper = $avatar_helper; + $this->db = $db; $this->cache = $cache; $this->config = $config; $this->language = $language; $this->dispatcher = $dispatcher; $this->path_helper = $path_helper; + $this->template = $template; $this->user = $user; $this->phpbb_root_path = $path_helper->get_phpbb_root_path(); @@ -304,11 +314,9 @@ public function get_avatar($group_row, $alt = 'GROUP_AVATAR', $ignore_config = f /** * Display groups legend * - * @param driver_interface $db - * @param template $template * @return void */ - public function display_legend(driver_interface $db, template $template): void + public function display_legend(): void { $order_legend = $this->config['legend_sort_groupname'] ? 'group_name' : 'group_legend'; @@ -334,18 +342,18 @@ public function display_legend(driver_interface $db, template $template): void AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ') ORDER BY g.' . $order_legend . ' ASC'; } - $result = $db->sql_query($sql); + $result = $this->db->sql_query($sql); - while ($row = $db->sql_fetchrow($result)) + while ($row = $this->db->sql_fetchrow($result)) { $show_group_url = $row['group_name'] != 'BOTS' && $this->auth->acl_get('u_viewprofile'); - $template->assign_block_vars('LEGEND', [ + $this->template->assign_block_vars('LEGEND', [ 'GROUP_COLOR' => $row['group_colour'] ?: '', 'GROUP_NAME' => $this->get_name($row['group_name']), 'GROUP_URL' => $show_group_url ? append_sid("{$this->path_helper->get_phpbb_root_path()}memberlist.{$this->path_helper->get_php_ext()}", 'mode=group&g=' . $row['group_id']) : '', ]); } - $db->sql_freeresult($result); + $this->db->sql_freeresult($result); } } diff --git a/phpBB/phpbb/members/controller/online.php b/phpBB/phpbb/members/controller/online.php new file mode 100644 index 00000000000..a28ffe95dd2 --- /dev/null +++ b/phpBB/phpbb/members/controller/online.php @@ -0,0 +1,312 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\members\controller; + +use phpbb\auth\auth; +use phpbb\config\config; +use phpbb\event\dispatcher; +use phpbb\exception\http_exception; +use phpbb\group\helper as group_helper; +use phpbb\controller\helper; +use phpbb\language\language; +use phpbb\members\viewonline_helper; +use phpbb\pagination; +use phpbb\request\request; +use phpbb\template\template; +use phpbb\user; +use Symfony\Component\HttpFoundation\Response; + +class online +{ + /** @var auth */ + protected $auth; + + /** @var config */ + protected $config; + + /** @var dispatcher */ + protected $dispatcher; + + /** @var group_helper */ + protected $group_helper; + + /** @var viewonline_helper */ + protected $viewonline_helper; + + /** @var helper */ + protected $helper; + + /** @var language */ + protected $language; + + /** @var pagination */ + protected $pagination; + + /** @var request */ + protected $request; + + /** @var template */ + protected $template; + + /** @var user */ + protected $user; + + /** @var string */ + protected $phpbb_root_path; + + /** @var string */ + protected $php_ex; + + /** + * online constructor. + * @param auth $auth + * @param config $config + * @param dispatcher $dispatcher + * @param group_helper $group_helper + * @param viewonline_helper $viewonline_helper + * @param helper $helper + * @param language $language + * @param pagination $pagination + * @param request $request + * @param template $template + * @param user $user + * @param string $phpbb_root_path + * @param string $php_ex + */ + public function __construct(auth $auth, config $config, dispatcher $dispatcher, group_helper $group_helper, viewonline_helper $viewonline_helper, helper $helper, language $language, pagination $pagination, request $request, template $template, user $user, string $phpbb_root_path, string $php_ex) + { + $this->auth = $auth; + $this->config = $config; + $this->dispatcher = $dispatcher; + $this->group_helper = $group_helper; + $this->viewonline_helper = $viewonline_helper; + $this->helper = $helper; + $this->language = $language; + $this->pagination = $pagination; + $this->request = $request; + $this->template = $template; + $this->user = $user; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ex = $php_ex; + } + + /** + * Controller for /online route + * + * @return Response a Symfony response object + */ + public function handle() + { + // Display a listing of board admins, moderators + if (!function_exists('display_user_activity')) + { + include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ex); + } + + // Load language strings + $this->language->add_lang('memberlist'); + + // Can this user view profiles/memberlist? + if (!$this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) + { + if ($this->user->data['user_id'] != ANONYMOUS) + { + throw new http_exception(403, 'NO_VIEW_USERS'); + } + + login_box('', $this->language->lang('LOGIN_EXPLAIN_VIEWONLINE')); + } + + // Get and set some variables + $mode = $this->request->variable('mode', ''); + $session_id = $this->request->variable('s', ''); + $start = $this->request->variable('start', 0); + $sort_key = $this->request->variable('sk', 'b'); + $sort_dir = $this->request->variable('sd', 'd'); + $show_guests = ($this->config['load_online_guests']) ? $this->request->variable('sg', 0) : 0; + + $sort_key_text = ['a' => $this->language->lang('SORT_USERNAME'), 'b' => $this->language->lang('SORT_JOINED'), 'c' => $this->language->lang('SORT_LOCATION')]; + $sort_key_sql = ['a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page']; + + // Sorting and order + if (!isset($sort_key_text[$sort_key])) + { + $sort_key = 'b'; + } + + $order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); + + $this->user->update_session_infos(); + + // Get number of online guests (if we do not display them) + $guest_counter = (!$show_guests) ? $this->viewonline_helper->get_number_guests() : 0; + + // Get user list (moved into viewonline_helper) + $session_data_rowset = $this->viewonline_helper->get_session_data_rowset($show_guests, $order_by, $guest_counter); + + $prev_id = $prev_ip = $user_list = []; + $logged_visible_online = $logged_hidden_online = $counter = 0; + + // Get forum IDs for session pages which have only 't' parameter + $this->viewonline_helper->get_forum_ids($session_data_rowset); + + foreach ($session_data_rowset as $row) + { + if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']])) + { + $view_online = $s_user_hidden = false; + $user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : ''; + + $username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '' . $row['username'] . ''; + + if (!$row['session_viewonline']) + { + $view_online = ($this->auth->acl_get('u_viewonline') || $row['user_id'] === $this->user->data['user_id']) ? true : false; + $logged_hidden_online++; + + $username_full = '' . $username_full . ''; + $s_user_hidden = true; + } + else + { + $view_online = true; + $logged_visible_online++; + } + + $prev_id[$row['user_id']] = 1; + + if ($view_online) + { + $counter++; + } + + if (!$view_online || $counter > $start + $this->config['topics_per_page'] || $counter <= $start) + { + continue; + } + } + else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']])) + { + $prev_ip[$row['session_ip']] = 1; + $guest_counter++; + $counter++; + + if ($counter > $start + $this->config['topics_per_page'] || $counter <= $start) + { + continue; + } + + $s_user_hidden = false; + $username_full = get_username_string('full', $row['user_id'], $this->language->lang('GUEST')); + } + else + { + continue; + } + + list($location, $location_url) = $this->viewonline_helper->get_location($row['session_page'], $row['session_forum_id']); + + // TODO: Check if these two lines should be moved to the router + $session_page = parse_url($row['session_page'], PHP_URL_PATH); // Remove query string + $session_page = '/' . ((substr($session_page, 0, 8) == 'app.php/') ? substr($session_page, 8) : $session_page); // Remove app.php/ + $on_page = $this->viewonline_helper->get_user_page($session_page); + + $forum_data = $this->viewonline_helper->get_forum_data(); + + /** + * Overwrite the location's name and URL, which are displayed in the list + * + * @event core.viewonline_overwrite_location + * @var array on_page File name and query string + * @var array row Array with the users sql row + * @var string location Page name to displayed in the list + * @var string location_url Page url to displayed in the list + * @var array forum_data Array with forum data + * @since 3.1.0-a1 + * @changed 3.1.0-a2 Added var forum_data + */ + $vars = ['on_page', 'row', 'location', 'location_url', 'forum_data']; + extract($this->dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars))); + + $template_row = [ + 'USERNAME' => $row['username'], + 'USERNAME_COLOUR' => $row['user_colour'], + 'USERNAME_FULL' => $username_full, + 'LASTUPDATE' => $this->user->format_date($row['session_time']), + 'FORUM_LOCATION' => $location, + 'USER_IP' => ($this->auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '', + 'USER_BROWSER' => ($this->auth->acl_get('a_user')) ? $row['session_browser'] : '', + + 'U_USER_PROFILE' => ($row['user_type'] != USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '', + 'U_USER_IP' => append_sid($this->phpbb_root_path . "viewonline." . $this->php_ex, 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir"), + 'U_WHOIS' => $this->helper->route('phpbb_members_online_whois', ['session_id' => $row['session_id']]), + 'U_FORUM_LOCATION' => $location_url, + + 'S_USER_HIDDEN' => $s_user_hidden, + 'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false, + 'S_USER_TYPE' => $row['user_type'], + ]; + + /** + * Modify viewonline template data before it is displayed in the list + * + * @event core.viewonline_modify_user_row + * @var array on_page File name and query string + * @var array row Array with the users sql row + * @var array forum_data Array with forum data + * @var array template_row Array with template variables for the user row + * @since 3.1.0-RC4 + */ + $vars = ['on_page', 'row', 'forum_data', 'template_row']; + extract($this->dispatcher->trigger_event('core.viewonline_modify_user_row', compact($vars))); + + $this->template->assign_block_vars('user_row', $template_row); + } + + $this->group_helper->display_legend(); + + // Refreshing the page every 60 seconds... + meta_refresh(60, $this->helper->route('phpbb_members_online', ['sg' => $show_guests, 'sk' => $sort_key, 'sd' => $sort_dir, 'start' => $start])); + + $start = $this->pagination->validate_start($start, $this->config['topics_per_page'], $counter); + $base_url = $this->helper->route('phpbb_members_online', ['sg' => $show_guests, 'sk' => $sort_key, 'sd' => $sort_dir]); + $this->pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $this->config['topics_per_page'], $start); + + // Send data to template + $this->template->assign_vars([ + 'TOTAL_REGISTERED_USERS_ONLINE' => $this->language->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $this->language->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)), + 'TOTAL_GUEST_USERS_ONLINE' => $this->language->lang('GUEST_USERS_ONLINE', (int) $guest_counter), + + 'U_SORT_USERNAME' => $this->helper->route('phpbb_members_online', ['sg' => (int) $show_guests, 'sk' => 'a', 'sd' => (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a')]), + 'U_SORT_UPDATED' => $this->helper->route('phpbb_members_online', ['sg' => (int) $show_guests, 'sk' => 'b', 'sd' => (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a')]), + 'U_SORT_LOCATION' => $this->helper->route('phpbb_members_online', ['sg' => (int) $show_guests, 'sk' => 'c', 'sd' => (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a')]), + + 'U_SWITCH_GUEST_DISPLAY' => $this->helper->route('phpbb_members_online', ['sg' => (int) !$show_guests]), + 'L_SWITCH_GUEST_DISPLAY' => ($show_guests) ? $this->language->lang('HIDE_GUESTS') : $this->language->lang('DISPLAY_GUESTS'), + 'S_SWITCH_GUEST_DISPLAY' => ($this->config['load_online_guests']) ? true : false, + 'S_VIEWONLINE' => true, + ]); + + $this->template->assign_block_vars('navlinks', [ + 'BREADCRUMB_NAME' => $this->language->lang('WHO_IS_ONLINE'), + 'U_BREADCRUMB' => $this->helper->route('phpbb_members_online'), + ]); + + make_jumpbox(append_sid($this->phpbb_root_path . "viewforum." . $this->php_ex)); + + // Render + return $this->helper->render('viewonline_body.html', $this->language->lang('WHO_IS_ONLINE')); + } + +} diff --git a/phpBB/phpbb/members/controller/online_whois.php b/phpBB/phpbb/members/controller/online_whois.php new file mode 100644 index 00000000000..180fc3939af --- /dev/null +++ b/phpBB/phpbb/members/controller/online_whois.php @@ -0,0 +1,149 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\members\controller; + +use phpbb\auth\auth; +use phpbb\db\driver\driver_interface; +use phpbb\controller\helper; +use phpbb\exception\http_exception; +use phpbb\language\language; +use phpbb\template\template; +use phpbb\user; +use Symfony\Component\HttpFoundation\Response; + +class online_whois +{ + /** + * @var auth + */ + protected $auth; + + /** + * @var driver_interface + */ + protected $db; + + /** + * @var helper + */ + protected $helper; + + /** + * @var language + */ + protected $language; + + /** + * @var template + */ + protected $template; + + /** + * @var user + */ + protected $user; + + /** @var string */ + private $users_table; + + /** @var string */ + private $sessions_table; + + /** + * @var string + */ + private $phpbb_root_path; + + /** + * @var string + */ + private $php_ex; + + /** + * online_whois constructor. + * @param auth $auth + * @param driver_interface $db + * @param helper $helper + * @param language $language + * @param template $template + * @param user $user + * @param string $users_table + * @param string $sessions_table + * @param string $phpbb_root_path + * @param string $php_ex + */ + public function __construct(auth $auth, driver_interface $db, helper $helper, language $language, template $template, user $user, string $users_table, string $sessions_table, string $phpbb_root_path, string $php_ex) + { + $this->auth = $auth; + $this->db = $db; + $this->helper = $helper; + $this->language = $language; + $this->template = $template; + $this->user = $user; + $this->users_table = $users_table; + $this->sessions_table = $sessions_table; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ex = $php_ex; + } + + /** + * Controller for /online/whois/{session_id} route + * + * @param $session_id + * @return Response a Symfony response object + */ + public function handle($session_id) + { + if (!function_exists('user_ipwhois')) + { + include($this->phpbb_root_path . 'includes/functions_user.' . $this->php_ex); + } + + // Load language strings + $this->language->add_lang('memberlist'); + + // Can this user view profiles/memberlist? + if (!$this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) + { + if ($this->user->data['user_id'] != ANONYMOUS) + { + throw new http_exception(403, 'NO_VIEW_USERS'); + } + + login_box('', $this->language->lang('LOGIN_EXPLAIN_VIEWONLINE')); + } + + if (!$this->auth->acl_get('a_')) + { + $this->language->add_lang('acp/common'); + + throw new http_exception(403, 'NO_ADMIN'); + } + + $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip + FROM ' . $this->users_table . ' u, ' . $this->sessions_table . " s + WHERE s.session_id = '" . $this->db->sql_escape($session_id) . "' + AND u.user_id = s.session_user_id"; + $result = $this->db->sql_query($sql); + + if ($row = $this->db->sql_fetchrow($result)) + { + $this->template->assign_var('WHOIS', user_ipwhois($row['session_ip'])); + } + $this->db->sql_freeresult($result); + + // Render + return $this->helper->render('viewonline_whois.html', $this->language->lang('WHO_IS_ONLINE')); + } +} diff --git a/phpBB/phpbb/members/viewonline_helper.php b/phpBB/phpbb/members/viewonline_helper.php new file mode 100644 index 00000000000..54dfcb90789 --- /dev/null +++ b/phpBB/phpbb/members/viewonline_helper.php @@ -0,0 +1,468 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\members; + +use phpbb\filesystem\helper as filesystem_helper; + +/** + * Class to handle viewonline related tasks + */ +class viewonline_helper +{ + /** @var \phpbb\db\driver\driver_interface */ + protected $db; + + /** @var \phpbb\config\config */ + protected $config; + + /** @var \phpbb\event\dispatcher_interface */ + protected $dispatcher; + + /** @var \phpbb\routing\router */ + protected $router; + + /** @var \phpbb\controller\helper */ + protected $helper; + + /** @var \phpbb\language\language */ + protected $language; + + /** @var \phpbb\auth\auth */ + protected $auth; + + /** @var string */ + protected $phpbb_root_path; + + /** @var string */ + protected $php_ex; + + /** @var string */ + protected $phpbb_adm_relative_path; + + /** @var string */ + protected $forums_table; + + /** @var string */ + protected $topics_table; + + /** @var string */ + protected $users_table; + + /** @var string */ + protected $sessions_table; + + /** + * @param \phpbb\db\driver\driver_interface $db + * @param \phpbb\config\config $config + * @param \phpbb\event\dispatcher_interface $dispatcher + * @param \phpbb\routing\router $router + * @param \phpbb\controller\helper $helper + * @param \phpbb\language\language $language + * @param \phpbb\auth\auth $auth + * @param string $phpbb_root_path + * @param string $php_ex + * @param string $phpbb_adm_relative_path + * @param string $users_table + * @param string $sessions_table + * @param string $topics_table + * @param string $forums_table + */ + public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\config\config $config, \phpbb\event\dispatcher_interface $dispatcher, \phpbb\routing\router $router, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\auth\auth $auth, string $phpbb_root_path, string $php_ex, string $phpbb_adm_relative_path, string $users_table, string $sessions_table, string $topics_table, string $forums_table) + { + $this->db = $db; + $this->config = $config; + $this->dispatcher = $dispatcher; + + $this->router = $router; + $this->helper = $helper; + $this->language = $language; + $this->auth = $auth; + $this->phpbb_root_path = $phpbb_root_path; + $this->php_ex = $php_ex; + $this->phpbb_adm_relative_path = $phpbb_adm_relative_path; + + $this->users_table = $users_table; + $this->sessions_table = $sessions_table; + $this->topics_table = $topics_table; + $this->forums_table = $forums_table; + } + + /** + * Get forum IDs for topics + * + * Retrieve forum IDs and add the data into the session data array + * Array structure matches sql_fethrowset() result array + * + * @param array $session_data_rowset Users' session data array + * @return void + */ + public function get_forum_ids(array &$session_data_rowset): void + { + $topic_ids = $match = []; + foreach ($session_data_rowset as $number => $row) + { + if ($row['session_forum_id'] == 0 && preg_match('#t=([0-9]+)#', $row['session_page'], $match)) + { + $topic_ids[$number] = (int) $match[1]; + } + } + + if (count($topic_ids = array_unique($topic_ids))) + { + $sql_ary = [ + 'SELECT' => 't.topic_id, t.forum_id', + 'FROM' => [ + $this->topics_table => 't', + ], + 'WHERE' => $this->db->sql_in_set('t.topic_id', $topic_ids), + 'ORDER_BY' => 't.topic_id', + ]; + $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); + $forum_ids_rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + foreach ($forum_ids_rowset as $forum_ids_row) + { + $session_data_row_number = array_search((int) $forum_ids_row['topic_id'], $topic_ids); + $session_data_rowset[$session_data_row_number]['session_forum_id'] = (int) $forum_ids_row['forum_id']; + } + } + } + + /** + * Get user page + * + * @param string $session_page User's session page + * @return array Match array filled by preg_match() + */ + public function get_user_page($session_page) + { + $session_page = filesystem_helper::clean_path($session_page); + if (strpos($session_page, './') === 0) + { + $session_page = substr($session_page, 2); + } + + preg_match('#^((\.\./)*([a-z0-9/_-]+))#i', $session_page, $on_page); + if (empty($on_page)) + { + $on_page[1] = ''; + } + + return $on_page; + } + + /** + * Given a certain page, it returns the title of the page and a link to it. + * There are 2 strategies to detect the page the user is in: + * - Try to get the controller route from the router service + * - And second, if is not possible to get the controller route, the + * page is analyzed by path, analyzing the file that is accessed. This + * is mostly for legacy pages, and should be removed in the future. + * + * @param string $session_page + * @param int $forum_id + * @return array + */ + public function get_location(string $session_page, int $forum_id) + { + try + { + $match = $this->router->match($session_page); + + switch ($match['_route']) + { + case 'phpbb_help_bbcode_controller': + $location = $this->language->lang('VIEWING_FAQ'); + $location_url = $this->helper->route('phpbb_help_faq_controller'); + break; + + case 'phpbb_members_online': + case 'phpbb_members_online_whois': + $location = $this->language->lang('VIEWING_ONLINE'); + $location_url = $this->helper->route('phpbb_members_online'); + break; + + case 'phpbb_report_pm_controller': + case 'phpbb_report_post_controller': + $location = $this->language->lang('REPORTING_POST'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + break; + + case 'phpbb_message_admin': + // https://github.com/phpbb/phpbb/pull/5391/files + // The current behavior is show users in contact admin, but they will be different controllers + //case 'phpbb_message_topic': + //case 'phpbb_message_user': + $location = $this->language->lang('VIEWING_CONTACT_ADMIN'); + $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex, 'mode=contactadmin'); + break; + + case 'phpbb_members_profile': + $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); + $location = $this->language->lang('VIEWING_MEMBER_PROFILE'); + break; + + case 'phpbb_members_team': + $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); + $location = $this->language->lang('VIEWING_MEMBERS'); + break; + + default: + // Is a route, but not in the switch + $location = $this->language->lang('INDEX'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + } + } + catch (\RuntimeException $e) // Urls without route + { + $on_page = $this->get_user_page($session_page); + + switch ($on_page[1]) + { + case 'index': + $location = $this->language->lang('INDEX'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + break; + + case $this->phpbb_adm_relative_path . 'index': + $location = $this->language->lang('ACP'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + break; + + case 'posting': + case 'viewforum': + case 'viewtopic': + + $forum_data = $this->get_forum_data(); + + if ($forum_id && $this->auth->acl_get('f_list', $forum_id)) + { + $location = ''; + $location_url = append_sid($this->phpbb_root_path . "viewforum." . $this->php_ex, 'f=' . $forum_id); + + if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK) + { + $location = $this->language->lang('READING_LINK', $forum_data[$forum_id]['forum_name']); + break; + } + + switch ($on_page[1]) + { + case 'posting': + preg_match('#mode=([a-z]+)#', $session_page, $on_page); + $posting_mode = (!empty($on_page[1])) ? $on_page[1] : ''; + + switch ($posting_mode) + { + case 'reply': + case 'quote': + $location = $this->language->lang('REPLYING_MESSAGE', $forum_data[$forum_id]['forum_name']); + break; + + default: + $location = $this->language->lang('POSTING_MESSAGE', $forum_data[$forum_id]['forum_name']); + break; + } + break; + + case 'viewtopic': + $location = $this->language->lang('READING_TOPIC', $forum_data[$forum_id]['forum_name']); + break; + + case 'viewforum': + $location = $this->language->lang('READING_FORUM', $forum_data[$forum_id]['forum_name']); + break; + } + } + else + { + $location = $this->language->lang('INDEX'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + } + break; + + case 'search': + $location = $this->language->lang('SEARCHING_FORUMS'); + $location_url = append_sid($this->phpbb_root_path . "search." . $this->php_ex); + break; + + case 'memberlist': + $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); + $location = $this->language->lang('VIEWING_MEMBERS'); + break; + + case 'mcp': + $location = $this->language->lang('VIEWING_MCP'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + break; + + case 'ucp': + $location = $this->language->lang('VIEWING_UCP'); + + // Grab some common modules + $url_params = [ + 'mode=register' => 'VIEWING_REGISTER', + 'i=pm&mode=compose' => 'POSTING_PRIVATE_MESSAGE', + 'i=pm&' => 'VIEWING_PRIVATE_MESSAGES', + 'i=profile&' => 'CHANGING_PROFILE', + 'i=prefs&' => 'CHANGING_PREFERENCES', + ]; + + foreach ($url_params as $param => $lang) + { + if (strpos($session_page, $param) !== false) + { + $location = $this->language->lang($lang); + break; + } + } + + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + break; + + default: + $location = $this->language->lang('INDEX'); + $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); + break; + } + } + + return [$location, $location_url]; + } + + /** + * Get number of guests online + * + * @return int + */ + public function get_number_guests() + { + switch ($this->db->get_sql_layer()) + { + case 'sqlite3': + $sql = 'SELECT COUNT(session_ip) as num_guests + FROM ( + SELECT DISTINCT session_ip + FROM ' . $this->sessions_table . ' + WHERE session_user_id = ' . ANONYMOUS . ' + AND session_time >= ' . (time() - ($this->config['load_online_time'] * 60)) . + ')'; + break; + + default: + $sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests + FROM ' . $this->sessions_table . ' + WHERE session_user_id = ' . ANONYMOUS . ' + AND session_time >= ' . (time() - ($this->config['load_online_time'] * 60)); + break; + } + $result = $this->db->sql_query($sql); + $guest_counter = (int) $this->db->sql_fetchfield('num_guests'); + $this->db->sql_freeresult($result); + + return $guest_counter; + } + + /** + * Get forum data + * + * @return array + */ + public function get_forum_data() + { + static $forum_data; + + if (isset($forum_data)) + { + return $forum_data; + } + + // Forum info + $sql_ary = [ + 'SELECT' => 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id', + 'FROM' => [ + $this->forums_table => 'f', + ], + 'ORDER_BY' => 'f.left_id ASC', + ]; + + /** + * Modify the forum data SQL query for getting additional fields if needed + * + * @event core.viewonline_modify_forum_data_sql + * @var array sql_ary The SQL array + * @since 3.1.5-RC1 + */ + $vars = ['sql_ary']; + extract($this->dispatcher->trigger_event('core.viewonline_modify_forum_data_sql', compact($vars))); + + $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary), 600); + unset($sql_ary); + + $forum_data = []; + while ($row = $this->db->sql_fetchrow($result)) + { + $forum_data[$row['forum_id']] = $row; + } + $this->db->sql_freeresult($result); + + return $forum_data; + } + + /** + * Build and execute the sessions query and return the rowset. + * + * @param bool $show_guests + * @param string $order_by + * @param int &$guest_counter + * @return array + */ + public function get_session_data_rowset(bool &$show_guests, string $order_by, int &$guest_counter): array + { + $forum_data = $this->get_forum_data(); + + $sql_ary = [ + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline, s.session_forum_id', + 'FROM' => [ + $this->users_table => 'u', + $this->sessions_table => 's', + ], + 'WHERE' => 'u.user_id = s.session_user_id + AND s.session_time >= ' . (time() - ($this->config['load_online_time'] * 60)) . + (($show_guests) ? '' : ' AND s.session_user_id <> ' . ANONYMOUS), + 'ORDER_BY' => $order_by, + ]; + + /** + * Modify the SQL query for getting the user data to display viewonline list + * + * @event core.viewonline_modify_sql + * @var array sql_ary The SQL array + * @var bool show_guests Do we display guests in the list + * @var int guest_counter Number of guests displayed + * @var array forum_data Array with forum data + * @since 3.1.0-a1 + * @changed 3.1.0-a2 Added vars guest_counter and forum_data + */ + $vars = ['sql_ary', 'show_guests', 'guest_counter', 'forum_data']; + extract($this->dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars))); + + $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); + $session_data_rowset = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + return $session_data_rowset; + } +} diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index e51d7df6222..a6fbc6a15d3 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -189,6 +189,17 @@ public function generate(string $name, array $parameters = [], int $referenceTyp */ public function match(string $pathinfo): array { + // Remove query string + $pathinfo = parse_url($pathinfo, PHP_URL_PATH); + + if ($pathinfo === null) + { + throw new RuntimeException('Malformed pathinfo given to the router.'); + } + + // Remove app.php if present + $pathinfo = preg_replace('/^\/app\.php\//', '/', $pathinfo); + return $this->get_matcher()->match($pathinfo); } diff --git a/phpBB/phpbb/viewonline_helper.php b/phpBB/phpbb/viewonline_helper.php deleted file mode 100644 index 647d3dbf193..00000000000 --- a/phpBB/phpbb/viewonline_helper.php +++ /dev/null @@ -1,98 +0,0 @@ - -* @license GNU General Public License, version 2 (GPL-2.0) -* -* For full copyright and license information, please see -* the docs/CREDITS.txt file. -* -*/ - -namespace phpbb; - -use phpbb\filesystem\helper as filesystem_helper; - -/** - * Class to handle viewonline related tasks - */ -class viewonline_helper -{ - /** @var \phpbb\db\driver\driver_interface */ - protected $db; - - /** - * @param \phpbb\db\driver\driver_interface $db - */ - public function __construct(\phpbb\db\driver\driver_interface $db) - { - $this->db = $db; - } - - /** - * Get forum IDs for topics - * - * Retrieve forum IDs and add the data into the session data array - * Array structure matches sql_fethrowset() result array - * - * @param array $session_data_rowset Users' session data array - * @return void - */ - public function get_forum_ids(array &$session_data_rowset): void - { - $topic_ids = $match = []; - foreach ($session_data_rowset as $number => $row) - { - if ($row['session_forum_id'] == 0 && preg_match('#t=([0-9]+)#', $row['session_page'], $match)) - { - $topic_ids[$number] = (int) $match[1]; - } - } - - if (count($topic_ids = array_unique($topic_ids))) - { - $sql_ary = [ - 'SELECT' => 't.topic_id, t.forum_id', - 'FROM' => [ - TOPICS_TABLE => 't', - ], - 'WHERE' => $this->db->sql_in_set('t.topic_id', $topic_ids), - 'ORDER_BY' => 't.topic_id', - ]; - $result = $this->db->sql_query($this->db->sql_build_query('SELECT', $sql_ary)); - $forum_ids_rowset = $this->db->sql_fetchrowset($result); - $this->db->sql_freeresult($result); - - foreach ($forum_ids_rowset as $forum_ids_row) - { - $session_data_row_number = array_search((int) $forum_ids_row['topic_id'], $topic_ids); - $session_data_rowset[$session_data_row_number]['session_forum_id'] = (int) $forum_ids_row['forum_id']; - } - } - } - - /** - * Get user page - * - * @param string $session_page User's session page - * @return array Match array filled by preg_match() - */ - public function get_user_page($session_page) - { - $session_page = filesystem_helper::clean_path($session_page); - if (strpos($session_page, './') === 0) - { - $session_page = substr($session_page, 2); - } - - preg_match('#^((\.\./)*([a-z0-9/_-]+))#i', $session_page, $on_page); - if (empty($on_page)) - { - $on_page[1] = ''; - } - - return $on_page; - } -} diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index f80d105ff2c..de237e9e612 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -11,6 +11,8 @@ * */ +use Symfony\Component\HttpFoundation\RedirectResponse; + /** * @ignore */ @@ -25,464 +27,38 @@ $user->setup('memberlist'); // Get and set some variables -$mode = $request->variable('mode', ''); -$session_id = $request->variable('s', ''); -$start = $request->variable('start', 0); -$sort_key = $request->variable('sk', 'b'); -$sort_dir = $request->variable('sd', 'd'); -$show_guests = ($config['load_online_guests']) ? $request->variable('sg', 0) : 0; - -// Can this user view profiles/memberlist? -if (!$auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) -{ - if ($user->data['user_id'] != ANONYMOUS) - { - send_status_line(403, 'Forbidden'); - trigger_error('NO_VIEW_USERS'); - } - - login_box('', $user->lang['LOGIN_EXPLAIN_VIEWONLINE']); -} - -/* @var $pagination \phpbb\pagination */ -$pagination = $phpbb_container->get('pagination'); +$mode = $request->variable('mode', null); +$session_id = $request->variable('s', null); +$start = $request->variable('start', null); +$sort_key = $request->variable('sk', null); +$sort_dir = $request->variable('sd', null); +$show_guests = ($config['load_online_guests']) ? $request->variable('sg', null) : null; -/* @var $viewonline_helper \phpbb\viewonline_helper */ -$viewonline_helper = $phpbb_container->get('viewonline_helper'); -$sort_key_text = array('a' => $user->lang['SORT_USERNAME'], 'b' => $user->lang['SORT_JOINED'], 'c' => $user->lang['SORT_LOCATION']); -$sort_key_sql = array('a' => 'u.username_clean', 'b' => 's.session_time', 'c' => 's.session_page'); - -// Sorting and order -if (!isset($sort_key_text[$sort_key])) -{ - $sort_key = 'b'; -} - -$order_by = $sort_key_sql[$sort_key] . ' ' . (($sort_dir == 'a') ? 'ASC' : 'DESC'); +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); -// Whois requested -if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) +if ($mode == 'whois') { - if (!function_exists('user_get_id_name')) - { - include($phpbb_root_path . 'includes/functions_user.' . $phpEx); - } - - $sql = 'SELECT u.user_id, u.username, u.user_type, s.session_ip - FROM ' . USERS_TABLE . ' u, ' . SESSIONS_TABLE . " s - WHERE s.session_id = '" . $db->sql_escape($session_id) . "' - AND u.user_id = s.session_user_id"; - $result = $db->sql_query($sql); - - if ($row = $db->sql_fetchrow($result)) - { - $template->assign_var('WHOIS', user_ipwhois($row['session_ip'])); - } - $db->sql_freeresult($result); - - // Output the page - page_header($user->lang['WHO_IS_ONLINE']); - - $template->set_filenames(array( - 'body' => 'viewonline_whois.html') + $response = new RedirectResponse( + $controller_helper->route('phpbb_members_online_whois', array( + 's' => $session_id, + ), false), + 301 ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - - page_footer(); } - -$user->update_session_infos(); - -// Forum info -$sql_ary = array( - 'SELECT' => 'f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id', - 'FROM' => array( - FORUMS_TABLE => 'f', - ), - 'ORDER_BY' => 'f.left_id ASC', -); - -/** -* Modify the forum data SQL query for getting additional fields if needed -* -* @event core.viewonline_modify_forum_data_sql -* @var array sql_ary The SQL array -* @since 3.1.5-RC1 -*/ -$vars = array('sql_ary'); -extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_forum_data_sql', compact($vars))); - -$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary), 600); -unset($sql_ary); - -$forum_data = array(); -while ($row = $db->sql_fetchrow($result)) -{ - $forum_data[$row['forum_id']] = $row; -} -$db->sql_freeresult($result); - -$guest_counter = 0; - -// Get number of online guests (if we do not display them) -if (!$show_guests) +else { - switch ($db->get_sql_layer()) - { - case 'sqlite3': - $sql = 'SELECT COUNT(session_ip) as num_guests - FROM ( - SELECT DISTINCT session_ip - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - ')'; - break; - - default: - $sql = 'SELECT COUNT(DISTINCT session_ip) as num_guests - FROM ' . SESSIONS_TABLE . ' - WHERE session_user_id = ' . ANONYMOUS . ' - AND session_time >= ' . (time() - ($config['load_online_time'] * 60)); - break; - } - $result = $db->sql_query($sql); - $guest_counter = (int) $db->sql_fetchfield('num_guests'); - $db->sql_freeresult($result); -} - -// Get user list -$sql_ary = array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_type, u.user_colour, s.session_id, s.session_time, s.session_page, s.session_ip, s.session_browser, s.session_viewonline, s.session_forum_id', - 'FROM' => array( - USERS_TABLE => 'u', - SESSIONS_TABLE => 's', - ), - 'WHERE' => 'u.user_id = s.session_user_id - AND s.session_time >= ' . (time() - ($config['load_online_time'] * 60)) . - ((!$show_guests) ? ' AND s.session_user_id <> ' . ANONYMOUS : ''), - 'ORDER_BY' => $order_by, -); - -/** -* Modify the SQL query for getting the user data to display viewonline list -* -* @event core.viewonline_modify_sql -* @var array sql_ary The SQL array -* @var bool show_guests Do we display guests in the list -* @var int guest_counter Number of guests displayed -* @var array forum_data Array with forum data -* @since 3.1.0-a1 -* @changed 3.1.0-a2 Added vars guest_counter and forum_data -*/ -$vars = array('sql_ary', 'show_guests', 'guest_counter', 'forum_data'); -extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_sql', compact($vars))); - -$result = $db->sql_query($db->sql_build_query('SELECT', $sql_ary)); -$session_data_rowset = $db->sql_fetchrowset($result); -$db->sql_freeresult($result); - -$prev_id = $prev_ip = $user_list = array(); -$logged_visible_online = $logged_hidden_online = $counter = 0; - -/** @var \phpbb\controller\helper $controller_helper */ -$controller_helper = $phpbb_container->get('controller.helper'); - -/** @var \phpbb\group\helper $group_helper */ -$group_helper = $phpbb_container->get('group_helper'); - -// Get forum IDs for session pages which have only 't' parameter -$viewonline_helper->get_forum_ids($session_data_rowset); - -foreach ($session_data_rowset as $row) -{ - if ($row['user_id'] != ANONYMOUS && !isset($prev_id[$row['user_id']])) - { - $view_online = $s_user_hidden = false; - $user_colour = ($row['user_colour']) ? ' style="color:#' . $row['user_colour'] . '" class="username-coloured"' : ''; - - $username_full = ($row['user_type'] != USER_IGNORE) ? get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']) : '' . $row['username'] . ''; - - if (!$row['session_viewonline']) - { - $view_online = ($auth->acl_get('u_viewonline') || $row['user_id'] === $user->data['user_id']) ? true : false; - $logged_hidden_online++; - - $username_full = '' . $username_full . ''; - $s_user_hidden = true; - } - else - { - $view_online = true; - $logged_visible_online++; - } - - $prev_id[$row['user_id']] = 1; - - if ($view_online) - { - $counter++; - } - - if (!$view_online || $counter > $start + $config['topics_per_page'] || $counter <= $start) - { - continue; - } - } - else if ($show_guests && $row['user_id'] == ANONYMOUS && !isset($prev_ip[$row['session_ip']])) - { - $prev_ip[$row['session_ip']] = 1; - $guest_counter++; - $counter++; - - if ($counter > $start + $config['topics_per_page'] || $counter <= $start) - { - continue; - } - - $s_user_hidden = false; - $username_full = get_username_string('full', $row['user_id'], $user->lang['GUEST']); - } - else - { - continue; - } - - $on_page = $viewonline_helper->get_user_page($row['session_page']); - - switch ($on_page[1]) - { - case 'index': - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case $phpbb_adm_relative_path . 'index': - $location = $user->lang['ACP']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'posting': - case 'viewforum': - case 'viewtopic': - $forum_id = $row['session_forum_id']; - - if ($forum_id && $auth->acl_get('f_list', $forum_id)) - { - $location = ''; - $location_url = append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id); - - if ($forum_data[$forum_id]['forum_type'] == FORUM_LINK) - { - $location = sprintf($user->lang['READING_LINK'], $forum_data[$forum_id]['forum_name']); - break; - } - - switch ($on_page[1]) - { - case 'posting': - preg_match('#mode=([a-z]+)#', $row['session_page'], $on_page); - $posting_mode = (!empty($on_page[1])) ? $on_page[1] : ''; - - switch ($posting_mode) - { - case 'reply': - case 'quote': - $location = sprintf($user->lang['REPLYING_MESSAGE'], $forum_data[$forum_id]['forum_name']); - break; - - default: - $location = sprintf($user->lang['POSTING_MESSAGE'], $forum_data[$forum_id]['forum_name']); - break; - } - break; - - case 'viewtopic': - $location = sprintf($user->lang['READING_TOPIC'], $forum_data[$forum_id]['forum_name']); - break; - - case 'viewforum': - $location = sprintf($user->lang['READING_FORUM'], $forum_data[$forum_id]['forum_name']); - break; - } - } - else - { - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - } - break; - - case 'search': - $location = $user->lang['SEARCHING_FORUMS']; - $location_url = append_sid("{$phpbb_root_path}search.$phpEx"); - break; - - case 'viewonline': - $location = $user->lang['VIEWING_ONLINE']; - $location_url = append_sid("{$phpbb_root_path}viewonline.$phpEx"); - break; - - case 'memberlist': - $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx"); - - if (strpos($row['session_page'], 'mode=viewprofile') !== false) - { - $location = $user->lang['VIEWING_MEMBER_PROFILE']; - } - else if (strpos($row['session_page'], 'mode=contactadmin') !== false) - { - $location = $user->lang['VIEWING_CONTACT_ADMIN']; - $location_url = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=contactadmin'); - } - else - { - $location = $user->lang['VIEWING_MEMBERS']; - } - break; - - case 'mcp': - $location = $user->lang['VIEWING_MCP']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'ucp': - $location = $user->lang['VIEWING_UCP']; - - // Grab some common modules - $url_params = array( - 'mode=register' => 'VIEWING_REGISTER', - 'i=pm&mode=compose' => 'POSTING_PRIVATE_MESSAGE', - 'i=pm&' => 'VIEWING_PRIVATE_MESSAGES', - 'i=profile&' => 'CHANGING_PROFILE', - 'i=prefs&' => 'CHANGING_PREFERENCES', - ); - - foreach ($url_params as $param => $lang) - { - if (strpos($row['session_page'], $param) !== false) - { - $location = $user->lang[$lang]; - break; - } - } - - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'download/file': - $location = $user->lang['DOWNLOADING_FILE']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - case 'report': - $location = $user->lang['REPORTING_POST']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - break; - - default: - $location = $user->lang['INDEX']; - $location_url = append_sid("{$phpbb_root_path}index.$phpEx"); - - if ($row['session_page'] === 'app.' . $phpEx . '/help/faq' || - $row['session_page'] === 'app.' . $phpEx . '/help/bbcode') - { - $location = $user->lang['VIEWING_FAQ']; - $location_url = $controller_helper->route('phpbb_help_faq_controller'); - } - break; - } - - /** - * Overwrite the location's name and URL, which are displayed in the list - * - * @event core.viewonline_overwrite_location - * @var array on_page File name and query string - * @var array row Array with the users sql row - * @var string location Page name to displayed in the list - * @var string location_url Page url to displayed in the list - * @var array forum_data Array with forum data - * @since 3.1.0-a1 - * @changed 3.1.0-a2 Added var forum_data - */ - $vars = array('on_page', 'row', 'location', 'location_url', 'forum_data'); - extract($phpbb_dispatcher->trigger_event('core.viewonline_overwrite_location', compact($vars))); - - $template_row = array( - 'USERNAME' => $row['username'], - 'USERNAME_COLOUR' => $row['user_colour'], - 'USERNAME_FULL' => $username_full, - 'LASTUPDATE' => $user->format_date($row['session_time']), - 'FORUM_LOCATION' => $location, - 'USER_IP' => ($auth->acl_get('a_')) ? (($mode == 'lookup' && $session_id == $row['session_id']) ? gethostbyaddr($row['session_ip']) : $row['session_ip']) : '', - 'USER_BROWSER' => ($auth->acl_get('a_user')) ? $row['session_browser'] : '', - - 'U_USER_PROFILE' => ($row['user_type'] != USER_IGNORE) ? get_username_string('profile', $row['user_id'], '') : '', - 'U_USER_IP' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=lookup' . (($mode != 'lookup' || $row['session_id'] != $session_id) ? '&s=' . $row['session_id'] : '') . "&sg=$show_guests&start=$start&sk=$sort_key&sd=$sort_dir"), - 'U_WHOIS' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'mode=whois&s=' . $row['session_id']), - 'U_FORUM_LOCATION' => $location_url, - - 'S_USER_HIDDEN' => $s_user_hidden, - 'S_GUEST' => ($row['user_id'] == ANONYMOUS) ? true : false, - 'S_USER_TYPE' => $row['user_type'], + $response = new RedirectResponse( + $controller_helper->route('phpbb_members_online', array( + 'mode' => $mode, + 's' => $session_id, + 'start' => $start, + 'sk' => $sort_key, + 'sd' => $sort_dir, + 'sg' => $show_guests, + ), false), + 301 ); - - /** - * Modify viewonline template data before it is displayed in the list - * - * @event core.viewonline_modify_user_row - * @var array on_page File name and query string - * @var array row Array with the users sql row - * @var array forum_data Array with forum data - * @var array template_row Array with template variables for the user row - * @since 3.1.0-RC4 - */ - $vars = array('on_page', 'row', 'forum_data', 'template_row'); - extract($phpbb_dispatcher->trigger_event('core.viewonline_modify_user_row', compact($vars))); - - $template->assign_block_vars('user_row', $template_row); } -unset($prev_id, $prev_ip); - -$group_helper->display_legend($db, $template); - -// Refreshing the page every 60 seconds... -meta_refresh(60, append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir&start=$start")); - -$start = $pagination->validate_start($start, $config['topics_per_page'], $counter); -$base_url = append_sid("{$phpbb_root_path}viewonline.$phpEx", "sg=$show_guests&sk=$sort_key&sd=$sort_dir"); -$pagination->generate_template_pagination($base_url, 'pagination', 'start', $counter, $config['topics_per_page'], $start); - -$template->assign_block_vars('navlinks', array( - 'BREADCRUMB_NAME' => $user->lang('WHO_IS_ONLINE'), - 'U_BREADCRUMB' => append_sid("{$phpbb_root_path}viewonline.$phpEx"), -)); - -// Send data to template -$template->assign_vars(array( - 'TOTAL_REGISTERED_USERS_ONLINE' => $user->lang('REG_USERS_ONLINE', (int) $logged_visible_online, $user->lang('HIDDEN_USERS_ONLINE', (int) $logged_hidden_online)), - 'TOTAL_GUEST_USERS_ONLINE' => $user->lang('GUEST_USERS_ONLINE', (int) $guest_counter), - - 'U_SORT_USERNAME' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=a&sd=' . (($sort_key == 'a' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - 'U_SORT_UPDATED' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=b&sd=' . (($sort_key == 'b' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - 'U_SORT_LOCATION' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sk=c&sd=' . (($sort_key == 'c' && $sort_dir == 'a') ? 'd' : 'a') . '&sg=' . ((int) $show_guests)), - - 'U_SWITCH_GUEST_DISPLAY' => append_sid("{$phpbb_root_path}viewonline.$phpEx", 'sg=' . ((int) !$show_guests)), - 'L_SWITCH_GUEST_DISPLAY' => ($show_guests) ? $user->lang['HIDE_GUESTS'] : $user->lang['DISPLAY_GUESTS'], - 'S_SWITCH_GUEST_DISPLAY' => ($config['load_online_guests']) ? true : false, - 'S_VIEWONLINE' => true, -)); - -// We do not need to load the who is online box here. ;) -$config['load_online'] = false; - -// Output the page -page_header($user->lang['WHO_IS_ONLINE']); - -$template->set_filenames(array( - 'body' => 'viewonline_body.html') -); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - -page_footer(); +$response->send(); diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php index c30a446ad0f..f6b1ad7f707 100644 --- a/tests/functional/viewonline_test.php +++ b/tests/functional/viewonline_test.php @@ -57,7 +57,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid); + $crawler = self::request('GET', 'members/online'); // Make sure posting reply page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text()); @@ -72,7 +72,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid); + $crawler = self::request('GET', 'members/online'); // Make sure posting message page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); @@ -88,7 +88,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid); + $crawler = self::request('GET', 'members/online'); // Make sure posting message page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); @@ -102,7 +102,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid); + $crawler = self::request('GET', 'members/online'); // Make sure reading topic page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text()); @@ -116,7 +116,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'viewonline.php?sid=' . $this->sid); + $crawler = self::request('GET', 'members/online'); // Make sure reading forum page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text()); diff --git a/tests/group/helper_test_case.php b/tests/group/helper_test_case.php index 3ee1d86b860..e23a1d8f467 100644 --- a/tests/group/helper_test_case.php +++ b/tests/group/helper_test_case.php @@ -67,6 +67,9 @@ protected function setup_engine(array $new_config = array()) array('u_viewprofile', true), ))); + // Set up database connection for testing + $db = $this->getMockBuilder('\phpbb\db\driver\driver_interface')->getMock(); + // Set up cache service $cache_service = $this->getMockBuilder('\phpbb\cache\service')->disableOriginalConstructor()->getMock(); $cache_service->expects($this->any()) @@ -108,6 +111,8 @@ protected function setup_engine(array $new_config = array()) $path_helper->method('update_web_root_path') ->will($this->returnArgument(0)); + $template = $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(); + $user = new \phpbb\user($lang, '\phpbb\datetime'); $user->data['user_id'] = ANONYMOUS; @@ -115,7 +120,7 @@ protected function setup_engine(array $new_config = array()) ->disableOriginalConstructor() ->getMock(); - $this->group_helper = new \phpbb\group\helper($auth, $avatar_helper, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $user); + $this->group_helper = new \phpbb\group\helper($auth, $avatar_helper, $db, $cache_service, $config, $lang, $phpbb_dispatcher, $path_helper, $template, $user); } protected function setUp(): void diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php index cef50af7812..1cb2c2f789f 100644 --- a/tests/mention/controller_test.php +++ b/tests/mention/controller_test.php @@ -117,6 +117,7 @@ public function setUp(): void $phpbb_container->set('group_helper', new \phpbb\group\helper( $this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(), $avatar_helper, + $db, $cache, $config, new \phpbb\language\language( @@ -131,6 +132,7 @@ public function setUp(): void $phpbb_root_path, $phpEx ), + $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(), $user )); $phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils()); @@ -552,7 +554,7 @@ public function test_handle($keyword, $topic_id, $expected_result) ['keyword', '', true, \phpbb\request\request_interface::REQUEST] => $keyword, ['topic_id', 0, false, \phpbb\request\request_interface::REQUEST] => $topic_id, };}); - + $data = json_decode($this->controller->handle()->getContent(), true); $this->assertEquals($expected_result, $data); } diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php index d523c80f34f..b593957bbcb 100644 --- a/tests/notification/group_request_test.php +++ b/tests/notification/group_request_test.php @@ -49,6 +49,7 @@ public function test_notifications() $this->container->set('group_helper', new \phpbb\group\helper( $this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(), $this->getMockBuilder('\phpbb\avatar\helper')->disableOriginalConstructor()->getMock(), + $this->db, $this->cache, $this->config, new \phpbb\language\language( @@ -63,6 +64,7 @@ public function test_notifications() $phpbb_root_path, $phpEx ), + $this->getMockBuilder('\phpbb\template\template')->disableOriginalConstructor()->getMock(), $this->user )); $phpbb_dispatcher = new phpbb_mock_event_dispatcher; diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php index 0c3f9d993e8..424d7ef5e0e 100644 --- a/tests/viewonline/helper_test.php +++ b/tests/viewonline/helper_test.php @@ -23,7 +23,33 @@ protected function setUp(): void ->disableOriginalConstructor() ->getMock(); - $this->viewonline_helper = new \phpbb\viewonline_helper($db); + $config = $this->getMockBuilder('\phpbb\config\config') + ->disableOriginalConstructor() + ->getMock(); + + $dispatcher = $this->getMockBuilder('phpbb_mock_event_dispatcher') + ->getMock(); + + $router = $this->getMockBuilder('\phpbb\routing\router') + ->disableOriginalConstructor() + ->getMock(); + + $controller_helper = $this->getMockBuilder('\phpbb\controller\helper') + ->disableOriginalConstructor() + ->getMock(); + + $language = $this->getMockBuilder('\phpbb\language\language') + ->disableOriginalConstructor() + ->getMock(); + + $auth = $this->getMockBuilder('\phpbb\auth\auth') + ->disableOriginalConstructor() + ->getMock(); + + $phpbb_root_path = './'; + $phpEx = 'php'; + + $this->viewonline_helper = new \phpbb\members\viewonline_helper($db, $config, $dispatcher, $router, $controller_helper, $language, $auth, $phpbb_root_path, $phpEx, 'adm/', '%tables.users%', '%tables.sessions%', '%tables.topics%', '%tables.forums%'); } public static function session_pages_data() From 393404e84f60e97bf39647397a59b6539ff88842 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 28 Dec 2025 20:24:19 +0100 Subject: [PATCH 1061/1214] [ticket/17598] Deny access to composer files in apache PHPBB-17598 --- phpBB/.htaccess | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/phpBB/.htaccess b/phpBB/.htaccess index 0be28ab670b..e55375e58be 100644 --- a/phpBB/.htaccess +++ b/phpBB/.htaccess @@ -60,6 +60,14 @@ RewriteRule ^(.*)$ app.php [QSA,L] Order Allow,Deny Deny from All + + Order Allow,Deny + Deny from All + + + Order Allow,Deny + Deny from All + = 2.4> @@ -68,6 +76,12 @@ RewriteRule ^(.*)$ app.php [QSA,L] Require all denied + + Require all denied + + + Require all denied + @@ -80,6 +94,14 @@ RewriteRule ^(.*)$ app.php [QSA,L] Order Allow,Deny Deny from All + + Order Allow,Deny + Deny from All + + + Order Allow,Deny + Deny from All + @@ -88,5 +110,11 @@ RewriteRule ^(.*)$ app.php [QSA,L] Require all denied + + Require all denied + + + Require all denied + From bdf4b069fbe8bed600f79cce54c09d9732b0ab91 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 20:38:19 +0100 Subject: [PATCH 1062/1214] [ticket/17597] Add missing include in acp PHPBB-17597 --- phpBB/adm/style/acp_avatar_options_upload.html | 1 + 1 file changed, 1 insertion(+) diff --git a/phpBB/adm/style/acp_avatar_options_upload.html b/phpBB/adm/style/acp_avatar_options_upload.html index 7601b802de9..5d22fd777ef 100644 --- a/phpBB/adm/style/acp_avatar_options_upload.html +++ b/phpBB/adm/style/acp_avatar_options_upload.html @@ -6,6 +6,7 @@ {% INCLUDECSS T_ASSETS_PATH ~ '/css/cropper.min.css' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/cropper.min.js' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/jquery-cropper.js' %} +{% INCLUDEJS T_ASSETS_PATH ~ '/javascript/hermite.js' %} {% INCLUDEJS T_ASSETS_PATH ~ '/javascript/phpbb-avatars.js' %} Date: Sun, 28 Dec 2025 20:40:34 +0100 Subject: [PATCH 1063/1214] [ticket/17597] Fix avatar cropper in ACP PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 26 +++++++++++++++---- phpBB/includes/acp/acp_users.php | 32 ++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 7 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index 33be2a56de8..8597a705c62 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -47,10 +47,11 @@ // Ensure we have an img for the cropping const $existingImg = this.$box.find('img'); if ($existingImg.length === 0) { + /** @type {jQuery} */ const $avatarImg = $(''); - $avatarImg.setAttribute('width', phpbb.avatars.$data.data().maxWidth); - $avatarImg.setAttribute('height', phpbb.avatars.$data.data().maxHeight); - $avatarImg.addClass('avatar'); + $avatarImg.attr('width', phpbb.avatars.$data.data().maxWidth); + $avatarImg.attr('height', phpbb.avatars.$data.data().maxHeight); + $avatarImg.addClass('avatar hidden'); this.image = $avatarImg; this.$box.prepend($avatarImg); } else { @@ -92,6 +93,11 @@ phpbb.avatars.$input.trigger('change'); } } else { + // Show placeholder avatar if it exists and was hidden + if (phpbb.avatars.$box.children('.avatar-placeholder').length) { + phpbb.avatars.$box.children('.avatar-placeholder').show(); + } + phpbb.avatars.destroy(); } }); @@ -129,6 +135,11 @@ const $this = this; $this.$form = this.$input.closest('form'); $this.$form.on('submit', () => { + if ($this.$form.find('#avatar_delete').is(':checked')) { + return; + } + + const $submitButton = this.$form.find('fieldset > input[type=submit]').first(); const data = phpbb.avatars.$data.data(); const avatarCanvas = phpbb.avatars.cropper.getCroppedCanvas({ @@ -143,7 +154,7 @@ avatarCanvas.toBlob(blob => { const formData = new FormData($this.$form[0]); formData.set('avatar_upload_file', blob, $this.getUploadFileName()); - formData.set('submit', '1'); + formData.set($submitButton.attr('name'), $submitButton.val()); const canvasDataUrl = avatarCanvas.toDataURL('image/png'); @@ -182,7 +193,9 @@ /** * Handle response from avatar submission - * @param {Object} response AJAX response object + * @param {{MESSAGE_TITLE: string, MESSAGE_TEXT: string, + * REFRESH_DATA: {time: int, url: string}, + * error: {title: string, messages: string[]}}} response AJAX response object * @param {string} canvasDataUrl Uploaded canvas element as data URL */ uploadDone(response, canvasDataUrl) { @@ -240,6 +253,9 @@ * and registers a callback function for the 'crop' event. */ initCropper() { + // Hide placeholder avatar + this.$box.children('.avatar-placeholder').hide(); + this.cropper = this.image.cropper({ aspectRatio: 1, autoCropArea: 1, diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 6abf55ebc8a..42680017131 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -16,6 +16,7 @@ */ use phpbb\controller\helper; +use phpbb\language\language; use phpbb\messenger\method\messenger_interface; if (!defined('IN_PHPBB')) @@ -43,6 +44,9 @@ function main($id, $mode) /** @var helper $controller_helper */ $controller_helper = $phpbb_container->get('controller.helper'); + /** @var language $language Language object */ + $language = $phpbb_container->get('language'); + $user->add_lang(array('posting', 'ucp', 'acp/users')); $this->tpl_name = 'acp_users'; @@ -1889,9 +1893,33 @@ function main($id, $mode) $sql = 'UPDATE ' . USERS_TABLE . ' SET ' . $db->sql_build_array('UPDATE', $result) . ' WHERE user_id = ' . (int) $user_id; - $db->sql_query($sql); - trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); + + if ($request->is_ajax()) + { + /** @var \phpbb\avatar\helper $avatar_helper */ + $avatar_helper = $phpbb_container->get('avatar.helper'); + + $avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true); + + $json_response = new \phpbb\json_response; + $json_response->send([ + 'success' => true, + + 'MESSAGE_TITLE' => $language->lang('INFORMATION'), + 'MESSAGE_TEXT' => $language->lang('USER_AVATAR_UPDATED'), + 'AVATAR' => $avatar_helper->get_template_vars($avatar), + 'REFRESH_DATA' => [ + 'time' => 3, + 'url' => $this->u_action . '&u=' . $user_id, + 'text' => $language->lang('BACK_TO_PREV'), + ] + ]); + } + else + { + trigger_error($user->lang['USER_AVATAR_UPDATED'] . adm_back_link($this->u_action . '&u=' . $user_id)); + } } } } From af518e4e0709cf5309f7bf8c70c89ec98c3d62b7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 21:35:15 +0100 Subject: [PATCH 1064/1214] [ticket/17597] Improve sizing and use of data for size limits PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 33 ++++++++++++++++++------ 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index 8597a705c62..935d4cc6252 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -32,6 +32,12 @@ /** @type {string} */ driverUpload: 'avatar_driver_upload', + /** @type {{width: {min: number, max: number}, height: {min: number, max: number}}} Allowed avatar sizes */ + allowedSizes: { + width: {min: -1, max: -1}, + height: {min: -1, max: -1}, + }, + /** * Initialise avatar cropping. */ @@ -41,6 +47,13 @@ return; } + // Set allowed sizes from data attributes + const data = this.$data.data(); + this.allowedSizes.width.min = data.minWidth; + this.allowedSizes.width.max = data.maxWidth; + this.allowedSizes.height.min = data.minHeight; + this.allowedSizes.height.max = data.maxHeight; + // Correctly position the cropper buttons this.$buttons.appendTo(this.$box); @@ -49,8 +62,8 @@ if ($existingImg.length === 0) { /** @type {jQuery} */ const $avatarImg = $(''); - $avatarImg.attr('width', phpbb.avatars.$data.data().maxWidth); - $avatarImg.attr('height', phpbb.avatars.$data.data().maxHeight); + $avatarImg.attr('width', this.allowedSizes.width.max); + $avatarImg.attr('height', this.allowedSizes.height.max); $avatarImg.addClass('avatar hidden'); this.image = $avatarImg; this.$box.prepend($avatarImg); @@ -140,7 +153,6 @@ } const $submitButton = this.$form.find('fieldset > input[type=submit]').first(); - const data = phpbb.avatars.$data.data(); const avatarCanvas = phpbb.avatars.cropper.getCroppedCanvas({ maxWidth: 4096, // High values for max quality cropping @@ -149,7 +161,7 @@ // eslint-disable-next-line no-undef const hermiteResize = new Hermite_class(); - hermiteResize.resample_single(avatarCanvas, data.maxWidth, data.maxHeight, true); + hermiteResize.resample_single(avatarCanvas, phpbb.avatars.allowedSizes.width.max, phpbb.avatars.allowedSizes.height.max, true); avatarCanvas.toBlob(blob => { const formData = new FormData($this.$form[0]); @@ -205,6 +217,9 @@ // Handle errors while deleting file if (typeof response.error === 'undefined') { + // Ensure image is visible after upload + phpbb.avatars.image.removeClass('hidden'); + const alert = phpbb.alert(response.MESSAGE_TITLE, response.MESSAGE_TEXT); setTimeout(() => { @@ -259,6 +274,8 @@ this.cropper = this.image.cropper({ aspectRatio: 1, autoCropArea: 1, + minContainerHeight: this.allowedSizes.height.max * 2, + minContainerWidth: this.allowedSizes.width.max * 2, }).data('cropper'); this.image.off('crop.phpbb.avatars').on('crop.phpbb.avatars', phpbb.avatars.onCrop); @@ -278,12 +295,12 @@ * @param {object} event */ onCrop(event) { - const data = phpbb.avatars.$data.data(); let { width, height } = event.detail; + const allowedSizes = phpbb.avatars.allowedSizes; - if (width < data.minWidth || height < data.minHeight) { - width = Math.max(data.minWidth, Math.min(data.maxWidth, width)); - height = Math.max(data.minHeight, Math.min(data.maxHeight, height)); + if (width < allowedSizes.width.min || height < allowedSizes.height.min) { + width = Math.max(allowedSizes.width.min, Math.min(allowedSizes.width.max, width)); + height = Math.max(allowedSizes.height.min, Math.min(allowedSizes.height.max, height)); phpbb.avatars.cropper.setData({ width, height, From 1450cc8b09f7a44f17c9654f4a53bb841b4b69f3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 28 Dec 2025 21:44:23 +0100 Subject: [PATCH 1065/1214] [ticket/17597] Make eslint happy PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index 935d4cc6252..28913b5de7e 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -34,8 +34,8 @@ /** @type {{width: {min: number, max: number}, height: {min: number, max: number}}} Allowed avatar sizes */ allowedSizes: { - width: {min: -1, max: -1}, - height: {min: -1, max: -1}, + width: { min: -1, max: -1 }, + height: { min: -1, max: -1 }, }, /** From 098a1bb61c160867b95d2bc6e0e1da917e1a9499 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 28 Dec 2025 18:31:55 +0100 Subject: [PATCH 1066/1214] [ticket/15823] Improve viewonline_helper coverage and small fixes PHPBB-15823 --- .../default/container/services_members.yml | 2 +- phpBB/phpbb/members/controller/online.php | 7 +- .../phpbb/members/controller/online_whois.php | 34 ++--- phpBB/phpbb/members/viewonline_helper.php | 51 ++++--- tests/viewonline/helper_test.php | 142 +++++++++++++++--- 5 files changed, 164 insertions(+), 72 deletions(-) diff --git a/phpBB/config/default/container/services_members.yml b/phpBB/config/default/container/services_members.yml index 3464fe03f5f..4a39991ea00 100644 --- a/phpBB/config/default/container/services_members.yml +++ b/phpBB/config/default/container/services_members.yml @@ -18,7 +18,7 @@ services: - '%core.root_path%' - '%core.php_ext%' - members.controller.online.whois: + members.controller.online_whois: class: phpbb\members\controller\online_whois arguments: - '@auth' diff --git a/phpBB/phpbb/members/controller/online.php b/phpBB/phpbb/members/controller/online.php index a28ffe95dd2..164b9804734 100644 --- a/phpBB/phpbb/members/controller/online.php +++ b/phpBB/phpbb/members/controller/online.php @@ -106,7 +106,7 @@ public function __construct(auth $auth, config $config, dispatcher $dispatcher, * * @return Response a Symfony response object */ - public function handle() + public function handle(): Response { // Display a listing of board admins, moderators if (!function_exists('display_user_activity')) @@ -217,9 +217,8 @@ public function handle() list($location, $location_url) = $this->viewonline_helper->get_location($row['session_page'], $row['session_forum_id']); - // TODO: Check if these two lines should be moved to the router - $session_page = parse_url($row['session_page'], PHP_URL_PATH); // Remove query string - $session_page = '/' . ((substr($session_page, 0, 8) == 'app.php/') ? substr($session_page, 8) : $session_page); // Remove app.php/ + $session_page = parse_url($row['session_page'], PHP_URL_PATH); + $session_page = preg_replace('/^\/app\.php\//', '/', $session_page); $on_page = $this->viewonline_helper->get_user_page($session_page); $forum_data = $this->viewonline_helper->get_forum_data(); diff --git a/phpBB/phpbb/members/controller/online_whois.php b/phpBB/phpbb/members/controller/online_whois.php index 180fc3939af..71274a96a75 100644 --- a/phpBB/phpbb/members/controller/online_whois.php +++ b/phpBB/phpbb/members/controller/online_whois.php @@ -24,34 +24,22 @@ class online_whois { - /** - * @var auth - */ + /** @var auth */ protected $auth; - /** - * @var driver_interface - */ + /** @var driver_interface */ protected $db; - /** - * @var helper - */ + /** @var helper */ protected $helper; - /** - * @var language - */ + /** @var language */ protected $language; - /** - * @var template - */ + /** @var template */ protected $template; - /** - * @var user - */ + /** @var user */ protected $user; /** @var string */ @@ -60,14 +48,10 @@ class online_whois /** @var string */ private $sessions_table; - /** - * @var string - */ + /** @var string */ private $phpbb_root_path; - /** - * @var string - */ + /** @var string */ private $php_ex; /** @@ -103,7 +87,7 @@ public function __construct(auth $auth, driver_interface $db, helper $helper, la * @param $session_id * @return Response a Symfony response object */ - public function handle($session_id) + public function handle($session_id): Response { if (!function_exists('user_ipwhois')) { diff --git a/phpBB/phpbb/members/viewonline_helper.php b/phpBB/phpbb/members/viewonline_helper.php index 54dfcb90789..a8c9dac627b 100644 --- a/phpBB/phpbb/members/viewonline_helper.php +++ b/phpBB/phpbb/members/viewonline_helper.php @@ -146,10 +146,11 @@ public function get_forum_ids(array &$session_data_rowset): void * @param string $session_page User's session page * @return array Match array filled by preg_match() */ - public function get_user_page($session_page) + public function get_user_page($session_page): array { $session_page = filesystem_helper::clean_path($session_page); - if (strpos($session_page, './') === 0) + + if (str_starts_with($session_page, './')) { $session_page = substr($session_page, 2); } @@ -175,7 +176,7 @@ public function get_user_page($session_page) * @param int $forum_id * @return array */ - public function get_location(string $session_page, int $forum_id) + public function get_location(string $session_page, int $forum_id): array { try { @@ -184,6 +185,7 @@ public function get_location(string $session_page, int $forum_id) switch ($match['_route']) { case 'phpbb_help_bbcode_controller': + case 'phpbb_help_faq_controller': $location = $this->language->lang('VIEWING_FAQ'); $location_url = $this->helper->route('phpbb_help_faq_controller'); break; @@ -194,31 +196,17 @@ public function get_location(string $session_page, int $forum_id) $location_url = $this->helper->route('phpbb_members_online'); break; + case 'phpbb_members_team': + $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); + $location = $this->language->lang('VIEWING_MEMBERS'); + break; + case 'phpbb_report_pm_controller': case 'phpbb_report_post_controller': $location = $this->language->lang('REPORTING_POST'); $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); break; - case 'phpbb_message_admin': - // https://github.com/phpbb/phpbb/pull/5391/files - // The current behavior is show users in contact admin, but they will be different controllers - //case 'phpbb_message_topic': - //case 'phpbb_message_user': - $location = $this->language->lang('VIEWING_CONTACT_ADMIN'); - $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex, 'mode=contactadmin'); - break; - - case 'phpbb_members_profile': - $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); - $location = $this->language->lang('VIEWING_MEMBER_PROFILE'); - break; - - case 'phpbb_members_team': - $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); - $location = $this->language->lang('VIEWING_MEMBERS'); - break; - default: // Is a route, but not in the switch $location = $this->language->lang('INDEX'); @@ -300,7 +288,20 @@ public function get_location(string $session_page, int $forum_id) case 'memberlist': $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex); - $location = $this->language->lang('VIEWING_MEMBERS'); + + if (str_contains($session_page, 'mode=viewprofile')) + { + $location = $this->language->lang('VIEWING_MEMBER_PROFILE'); + } + else if (str_contains($session_page, 'mode=contactadmin')) + { + $location = $this->language->lang('VIEWING_CONTACT_ADMIN'); + $location_url = append_sid($this->phpbb_root_path . "memberlist." . $this->php_ex, 'mode=contactadmin'); + } + else + { + $location = $this->language->lang('VIEWING_MEMBERS'); + } break; case 'mcp': @@ -347,7 +348,7 @@ public function get_location(string $session_page, int $forum_id) * * @return int */ - public function get_number_guests() + public function get_number_guests(): int { switch ($this->db->get_sql_layer()) { @@ -380,7 +381,7 @@ public function get_number_guests() * * @return array */ - public function get_forum_data() + public function get_forum_data(): array { static $forum_data; diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php index 424d7ef5e0e..01a9c96edc3 100644 --- a/tests/viewonline/helper_test.php +++ b/tests/viewonline/helper_test.php @@ -14,42 +14,73 @@ class phpbb_viewonline_helper_test extends phpbb_test_case { protected $viewonline_helper; + private $auth; protected function setUp(): void { + global $phpbb_dispatcher; + parent::setUp(); - $db = $this->getMockBuilder('\phpbb\db\driver\mysqli') - ->disableOriginalConstructor() - ->getMock(); + $phpbb_root_path = __DIR__ . '/../../phpBB/'; + $phpEx = 'php'; - $config = $this->getMockBuilder('\phpbb\config\config') + $db = $this->getMockBuilder('\phpbb\db\driver\driver_interface') ->disableOriginalConstructor() ->getMock(); - $dispatcher = $this->getMockBuilder('phpbb_mock_event_dispatcher') - ->getMock(); + // Mock database to return forum data + $forum_data = [ + 'forum_id' => 1, + 'forum_name' => 'Test Forum', + 'parent_id' => 0, + 'forum_type' => FORUM_POST, + 'left_id' => 1, + 'right_id' => 2, + ]; - $router = $this->getMockBuilder('\phpbb\routing\router') - ->disableOriginalConstructor() - ->getMock(); + $db->method('sql_fetchrow')->willReturnOnConsecutiveCalls($forum_data, false); + + $config = new \phpbb\config\config([]); + + $dispatcher = new phpbb_mock_event_dispatcher(); + $phpbb_dispatcher = $dispatcher; + + + $container = new phpbb_mock_container_builder(); + $container->setParameter('core.environment', PHPBB_ENVIRONMENT); + $loader = new \Symfony\Component\Routing\Loader\YamlFileLoader( + new \phpbb\routing\file_locator($phpbb_root_path) + ); + + $extension_manager = new phpbb_mock_extension_manager($phpbb_root_path); + $resources_locator = new \phpbb\routing\resources_locator\default_resources_locator( + $phpbb_root_path, + PHPBB_ENVIRONMENT, + $extension_manager + ); + + // Create router + $router = new phpbb_mock_router($container, $resources_locator, $loader, $phpEx, './', '', ''); + + // Mock controller helper to use the real router for generating route URLs $controller_helper = $this->getMockBuilder('\phpbb\controller\helper') ->disableOriginalConstructor() ->getMock(); + $controller_helper->method('route') + ->willReturnCallback(function($route) use ($router) { + // Use the real router to generate the actual URL for the route + return '.' . $router->generate($route); + }); - $language = $this->getMockBuilder('\phpbb\language\language') - ->disableOriginalConstructor() - ->getMock(); + $language = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); - $auth = $this->getMockBuilder('\phpbb\auth\auth') + $this->auth = $this->getMockBuilder('\phpbb\auth\auth') ->disableOriginalConstructor() ->getMock(); - $phpbb_root_path = './'; - $phpEx = 'php'; - - $this->viewonline_helper = new \phpbb\members\viewonline_helper($db, $config, $dispatcher, $router, $controller_helper, $language, $auth, $phpbb_root_path, $phpEx, 'adm/', '%tables.users%', '%tables.sessions%', '%tables.topics%', '%tables.forums%'); + $this->viewonline_helper = new \phpbb\members\viewonline_helper($db, $config, $dispatcher, $router, $controller_helper, $language, $this->auth, './', $phpEx, 'adm/', '%tables.users%', '%tables.sessions%', '%tables.topics%', '%tables.forums%'); } public static function session_pages_data() @@ -75,4 +106,81 @@ public function test_get_user_page($session_page, $expected) $this->assertArrayHasKey(1, $on_page); $this->assertSame($expected, $on_page[1]); } + + public static function get_location_data() + { + return array( + // Route-based pages - routes have prefixes as defined in routing.yml + // help.yml routes have prefix /help + array('/help/bbcode', 0, true, 'Viewing FAQ', './help/faq'), + array('/help/faq', 0, true, 'Viewing FAQ', './help/faq'), + // members.yml routes have prefix /members + array('/members/online', 0, true, 'Viewing who is online', './members/online'), + array('/members/online/whois/abc123', 0, true, 'Viewing who is online', './members/online'), + array('/members/team', 0, true, 'Viewing member details', './memberlist.php'), + // report.yml routes have no prefix + array('/pm/5/report', 0, true, 'Reporting post', './index.php'), + array('/post/10/report', 0, true, 'Reporting post', './index.php'), + + // Legacy pages - index + array('index.php', 0, true, 'Index page', './index.php'), + array('./index.php', 0, true, 'Index page', './index.php'), + + // Legacy pages - admin + array('adm/index.php', 0, true, 'Administration Control Panel', './index.php'), + + // Legacy pages - search + array('search.php', 0, true, 'Searching forums', './search.php'), + + // Legacy pages - memberlist + array('memberlist.php', 0, true, 'Viewing member details', './memberlist.php'), + array('memberlist.php?mode=viewprofile&u=2', 0, true, 'Viewing member profile', './memberlist.php'), + array('memberlist.php?mode=contactadmin', 0, true, 'Viewing contact page', './memberlist.php?mode=contactadmin'), + + // Legacy pages - MCP + array('mcp.php', 0, true, 'Viewing moderator control panel', './index.php'), + + // Legacy pages - UCP + array('ucp.php', 0, true, 'Viewing user control panel', './index.php'), + array('ucp.php?mode=register', 0, true, 'Registering account', './index.php'), + array('ucp.php?i=pm&mode=compose', 0, true, 'Composing private message', './index.php'), + array('ucp.php?i=pm&mode=view', 0, true, 'Viewing private messages', './index.php'), + array('ucp.php?i=prefs&mode=view', 0, true, 'Changing board preferences', './index.php'), + array('ucp.php?i=profile&mode=edit', 0, true, 'Changing profile settings', './index.php'), + + // Forum-based pages with forum access + array('posting.php?f=1&mode=reply', 1, true, 'Replying to message in Test Forum', './viewforum.php?f=1'), + array('posting.php?f=1&mode=quote', 1, true, 'Replying to message in Test Forum', './viewforum.php?f=1'), + array('posting.php?f=1&mode=post', 1, true, 'Posting message in Test Forum', './viewforum.php?f=1'), + array('viewtopic.php?f=1&t=1', 1, true, 'Reading topic in Test Forum', './viewforum.php?f=1'), + array('viewforum.php?f=1', 1, true, 'Viewing topics in Test Forum', './viewforum.php?f=1'), + + // Forum-based pages without forum access - should redirect to index + array('posting.php?f=1&mode=reply', 1, false, 'Index page', './index.php'), + array('viewtopic.php?f=1&t=1', 1, false, 'Index page', './index.php'), + array('viewforum.php?f=1', 1, false, 'Index page', './index.php'), + + // Unknown route + array('/unknown/route', 0, true, 'Index page', './index.php'), + + // Empty page + array('', 0, true, 'Index page', './index.php'), + ); + } + + /** + * @dataProvider get_location_data + */ + public function test_get_location($session_page, $forum_id, $has_access, $expected_location, $expected_url) + { + $this->auth->method('acl_get')->willReturn($has_access); + + list($location, $location_url) = $this->viewonline_helper->get_location($session_page, $forum_id); + + $this->assertIsString($location); + $this->assertIsString($location_url); + + $this->assertEquals($expected_location, $location, "Location mismatch for page: {$session_page}"); + $this->assertEquals($expected_url, $location_url, "URL mismatch for page: {$session_page}"); + } } From 0280cea268ad5ec3a360b29ae905c18dae608011 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Dec 2025 08:55:06 +0100 Subject: [PATCH 1067/1214] [ticket/17597] Remove deprecated function and improve documentation PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index 28913b5de7e..896fc77f84d 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -43,7 +43,7 @@ */ init() { // If the cropper library is not available - if (!$.isFunction($.fn.cropper)) { + if (!$.fn.hasOwnProperty('cropper') || typeof $.fn.cropper !== "function") { return; } @@ -60,7 +60,6 @@ // Ensure we have an img for the cropping const $existingImg = this.$box.find('img'); if ($existingImg.length === 0) { - /** @type {jQuery} */ const $avatarImg = $(''); $avatarImg.attr('width', this.allowedSizes.width.max); $avatarImg.attr('height', this.allowedSizes.height.max); @@ -274,8 +273,8 @@ this.cropper = this.image.cropper({ aspectRatio: 1, autoCropArea: 1, - minContainerHeight: this.allowedSizes.height.max * 2, - minContainerWidth: this.allowedSizes.width.max * 2, + minContainerHeight: this.allowedSizes.height.max * 2, // Double max size for better usability + minContainerWidth: this.allowedSizes.width.max * 2, // Double max size for better usability }).data('cropper'); this.image.off('crop.phpbb.avatars').on('crop.phpbb.avatars', phpbb.avatars.onCrop); From 645a5b87d2c2030625ad9c2f715a1de2b36589c9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Dec 2025 12:00:13 +0100 Subject: [PATCH 1068/1214] [ticket/17597] Improve display and handling of avatars after/before submit PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 55 ++++++++++++++++++------ 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index 896fc77f84d..0e8e0ce38c1 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -11,6 +11,9 @@ cropper: null, image: null, + /** @type {jQuery|null} */ + $originalAvatar: null, + /** @type {jQuery} */ $form: null, @@ -57,19 +60,19 @@ // Correctly position the cropper buttons this.$buttons.appendTo(this.$box); - // Ensure we have an img for the cropping + // Add image for cropping but track original avatar if it exists const $existingImg = this.$box.find('img'); - if ($existingImg.length === 0) { - const $avatarImg = $(''); - $avatarImg.attr('width', this.allowedSizes.width.max); - $avatarImg.attr('height', this.allowedSizes.height.max); - $avatarImg.addClass('avatar hidden'); - this.image = $avatarImg; - this.$box.prepend($avatarImg); - } else { - this.image = $existingImg; + if ($existingImg.length) { + this.$originalAvatar = $existingImg; } + const $avatarImg = $(''); + $avatarImg.attr('width', this.allowedSizes.width.max); + $avatarImg.attr('height', this.allowedSizes.height.max); + $avatarImg.addClass('avatar hidden'); + this.image = $avatarImg; + this.$box.prepend($avatarImg); + this.bindInput(); this.bindSelect(); this.bindSubmit(); @@ -81,9 +84,11 @@ destroy() { this.$buttons.find('[data-cropper-action]').off('click.phpbb.avatars'); this.image.off('crop.phpbb.avatars'); + this.setAvatarVisible(true); this.$form.off('submit'); this.$data.val(''); + this.$input.val(null); this.$buttons.hide(); this.$box.removeClass('c-cropper-avatar-box'); @@ -101,9 +106,8 @@ bindSelect() { this.$driver.on('change', function() { if ($(this).val() === phpbb.avatars.driverUpload) { - if (phpbb.avatars.$input.val() !== '') { - phpbb.avatars.$input.trigger('change'); - } + // Rebind submit after switching back to upload driver + phpbb.avatars.bindSubmit(); } else { // Show placeholder avatar if it exists and was hidden if (phpbb.avatars.$box.children('.avatar-placeholder').length) { @@ -131,6 +135,7 @@ fileReader.addEventListener('load', function() { phpbb.avatars.image.cropper('destroy').attr('src', this.result).addClass('avatar'); phpbb.avatars.$box.addClass('c-cropper-avatar-box'); + phpbb.avatars.setAvatarVisible(false); phpbb.avatars.initCropper(); phpbb.avatars.initButtons(); }); @@ -140,6 +145,21 @@ }); }, + /** + * Show or hide the original avatar image. + * @param {boolean} visible + * @return {void} + */ + setAvatarVisible(visible) { + if (this.$originalAvatar !== null) { + if (visible) { + phpbb.avatars.$originalAvatar.removeClass('hidden'); + } else { + phpbb.avatars.$originalAvatar.addClass('hidden'); + } + } + }, + /** * Bind submit button to be handled by ajax submit */ @@ -226,7 +246,14 @@ alert.hide(); }, response.REFRESH_DATA.time * 1000); - phpbb.avatars.image.attr('src', canvasDataUrl); + // Update original avatar image if it exists or create a new one + if (phpbb.avatars.$originalAvatar !== null) { + phpbb.avatars.$originalAvatar.attr('src', canvasDataUrl); + phpbb.avatars.image.addClass('hidden'); + } else { + phpbb.avatars.image.attr('src', canvasDataUrl); + } + phpbb.avatars.destroy(); } else { phpbb.alert(response.error.title, response.error.messages.join('
    ')); From 1a5ed15012b02c5ea2448c339256f91e71924145 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 29 Dec 2025 12:53:08 +0100 Subject: [PATCH 1069/1214] [ticket/17597] Update comment and clean up code PHPBB-17597 --- phpBB/assets/javascript/phpbb-avatars.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/assets/javascript/phpbb-avatars.js b/phpBB/assets/javascript/phpbb-avatars.js index 0e8e0ce38c1..ecb6c506312 100644 --- a/phpBB/assets/javascript/phpbb-avatars.js +++ b/phpBB/assets/javascript/phpbb-avatars.js @@ -46,7 +46,7 @@ */ init() { // If the cropper library is not available - if (!$.fn.hasOwnProperty('cropper') || typeof $.fn.cropper !== "function") { + if (!$.fn.hasOwnProperty('cropper') || typeof $.fn.cropper !== 'function') { return; } @@ -246,7 +246,7 @@ alert.hide(); }, response.REFRESH_DATA.time * 1000); - // Update original avatar image if it exists or create a new one + // Update original avatar image if it exists or use added image if (phpbb.avatars.$originalAvatar !== null) { phpbb.avatars.$originalAvatar.attr('src', canvasDataUrl); phpbb.avatars.image.addClass('hidden'); From 8386c2b69902b1d0e5eeca22f10984c7f0bfa6c0 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 29 Dec 2025 15:08:00 +0100 Subject: [PATCH 1070/1214] [ticket/17598] Deny access to composer files in lighthttpd and nginx PHPBB-17598 --- phpBB/docs/lighttpd.sample.conf | 5 +++++ phpBB/docs/nginx.sample.conf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/lighttpd.sample.conf b/phpBB/docs/lighttpd.sample.conf index 5411719feea..d95657c4a82 100644 --- a/phpBB/docs/lighttpd.sample.conf +++ b/phpBB/docs/lighttpd.sample.conf @@ -41,6 +41,11 @@ $HTTP["host"] == "www.myforums.com" { url.access-deny = ( "" ) } + # Deny access to composer files. + $HTTP["url"] =~ "^/composer\.(json|lock)$" { + url.access-deny = ( "" ) + } + # Deny access to version control system directories. $HTTP["url"] =~ "/\.svn|/\.git" { url.access-deny = ( "" ) diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf index a4a08ae805c..1ea78dd1dc2 100644 --- a/phpBB/docs/nginx.sample.conf +++ b/phpBB/docs/nginx.sample.conf @@ -63,7 +63,7 @@ server { } # Deny access to internal phpbb files. - location ~ /(config|common\.php|cache|files|images/avatars/upload|includes|(? Date: Mon, 29 Dec 2025 13:45:50 -0800 Subject: [PATCH 1071/1214] [ticket/17575] Use component parameter for PHP_URL_PATH PHPBB-17575 --- phpBB/phpbb/manifest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/manifest.php b/phpBB/phpbb/manifest.php index 72a830abf38..a9ef60f7f7e 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -50,7 +50,7 @@ public function __construct(config $config, dispatcher_interface $phpbb_dispatch public function handle(): JsonResponse { // Get the board URL and extract the path component - $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : (parse_url(generate_board_url())['path'] ?? ''); + $board_path = $this->config['force_server_vars'] ? $this->config['script_path'] : (parse_url(generate_board_url(), PHP_URL_PATH) ?? ''); // Ensure path ends with '/' for PWA scope $scope = rtrim($board_path, '/\\') . '/'; From f0a21668f1cbb04532850bcaa90aa0f0d2a0c2c9 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 29 Dec 2025 23:12:06 +0100 Subject: [PATCH 1072/1214] [ticket/15823] Fix yaml PHPBB-15823 --- phpBB/config/default/routing/members.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/config/default/routing/members.yml b/phpBB/config/default/routing/members.yml index c46bbd2cfd7..f6021422d7d 100644 --- a/phpBB/config/default/routing/members.yml +++ b/phpBB/config/default/routing/members.yml @@ -6,7 +6,7 @@ phpbb_members_online: phpbb_members_online_whois: path: /online/whois/{session_id} defaults: - _controller: members.controller.online.whois:handle + _controller: members.controller.online_whois:handle phpbb_members_team: path: /team From dea8c3de6fab821eeaf79cb0810f23fea5868ba9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Dec 2025 15:47:57 +0100 Subject: [PATCH 1073/1214] [ticket/15007] Add restart button to installer PHPBB-15007 --- phpBB/adm/style/installer_install.html | 3 +++ phpBB/language/en/install.php | 1 + phpBB/phpbb/install/controller/helper.php | 17 +++++++++++++++++ phpBB/phpbb/install/controller/install.php | 1 + phpBB/phpbb/install/helper/config.php | 12 +++++++++++- 5 files changed, 33 insertions(+), 1 deletion(-) diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html index 53a91f27002..ae77f6b55ec 100644 --- a/phpBB/adm/style/installer_install.html +++ b/phpBB/adm/style/installer_install.html @@ -6,6 +6,9 @@

    {TITLE}

    {L_SUBMIT} + {% if SHOW_RESTART_BUTTON %} + + {% endif %}
    diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 33070d02626..046fb80e097 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -84,6 +84,7 @@ 'INSTALL_PHPBB_INSTALLED' => 'phpBB is already installed.', 'INSTALL_PHPBB_NOT_INSTALLED' => 'phpBB is not installed yet.', + 'INSTALL_RESTART' => 'Restart installation', )); // Requirements translation diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php index 04c24fbe7d4..461a4684c3f 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -204,6 +204,23 @@ public function handle_language_select() } } + /** + * Handle installer restart + */ + public function handle_installer_restart(): void + { + $restart = $this->phpbb_request->variable('install_restart', false); + if ($restart) + { + // Clean up config file to restart installer + $this->installer_config->clean_up_config_file(); + } + else if ($this->installer_config->exists()) + { + $this->template->assign_var('SHOW_RESTART_BUTTON', true); + } + } + /** * Process navigation data to reflect active/completed stages * diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php index 92506872a31..b5267bc2837 100644 --- a/phpBB/phpbb/install/controller/install.php +++ b/phpBB/phpbb/install/controller/install.php @@ -124,6 +124,7 @@ public function handle() // Set the appropriate input-output handler $this->installer->set_iohandler($this->iohandler_factory->get()); $this->controller_helper->handle_language_select(); + $this->controller_helper->handle_installer_restart(); if ($this->request->is_ajax()) { diff --git a/phpBB/phpbb/install/helper/config.php b/phpBB/phpbb/install/helper/config.php index 7eb0ae3b052..1e73be145a7 100644 --- a/phpBB/phpbb/install/helper/config.php +++ b/phpBB/phpbb/install/helper/config.php @@ -217,12 +217,22 @@ public function get_progress_data() return $this->progress_data; } + /** + * Checks whether install config exists, i.e. whether an installation is in progress + * + * @return bool + */ + public function exists(): bool + { + return $this->filesystem->exists($this->install_config_file); + } + /** * Recovers install configuration from file */ public function load_config() { - if (!$this->filesystem->exists($this->install_config_file)) + if (!$this->exists()) { return; } From 58087cbe8954c5ed72d68682f78ce3d648290105 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 31 Dec 2025 08:31:09 -0800 Subject: [PATCH 1074/1214] [ticket/17595] Update effectively installed PHPBB-17595 --- phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php index d0c7d477e14..9f1167f8eb6 100644 --- a/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php +++ b/phpBB/phpbb/db/migration/data/v400/extensions_composer_4.php @@ -19,7 +19,7 @@ class extensions_composer_4 extends migration { public function effectively_installed() { - return strpos($this->config['exts_composer_repositories'], 'https://www.phpbb.com/customise/db/composer/40') !== false; + return str_contains($this->config['exts_composer_repositories'], 'https://www.phpbb.com/customise/db/composer/40/'); } public function update_data() From 03d3a6a47f23bfa7c5c4a722b183dbc6e4de9fc0 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Wed, 31 Dec 2025 17:57:01 +0100 Subject: [PATCH 1075/1214] [ticket/15823] Remove unused permission check PHPBB-15823 --- phpBB/phpbb/members/controller/online_whois.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/phpBB/phpbb/members/controller/online_whois.php b/phpBB/phpbb/members/controller/online_whois.php index 71274a96a75..479582501a0 100644 --- a/phpBB/phpbb/members/controller/online_whois.php +++ b/phpBB/phpbb/members/controller/online_whois.php @@ -97,17 +97,6 @@ public function handle($session_id): Response // Load language strings $this->language->add_lang('memberlist'); - // Can this user view profiles/memberlist? - if (!$this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')) - { - if ($this->user->data['user_id'] != ANONYMOUS) - { - throw new http_exception(403, 'NO_VIEW_USERS'); - } - - login_box('', $this->language->lang('LOGIN_EXPLAIN_VIEWONLINE')); - } - if (!$this->auth->acl_get('a_')) { $this->language->add_lang('acp/common'); From 0f01383e7df0e62b3de5b0dbe485020d1b5a5142 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Dec 2025 22:36:14 +0100 Subject: [PATCH 1076/1214] [ticket/17599] Update composer to 2.9.3 PHPBB-17599 --- composer.phar | Bin 3124368 -> 3283968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/composer.phar b/composer.phar index ee830d113df2a40cd7fcbd49966711d4aa4276bb..5a80d7434b52429654c8010bff8169c3b50fa48d 100755 GIT binary patch delta 108265 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 delta 29442 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 Pc2uKvpT5%D>F)eH)m{zf From 9e35e89446c9da4cac774ebbcf545c7ff069cced Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Dec 2025 22:37:01 +0100 Subject: [PATCH 1077/1214] [ticket/17599] Update composer dependencies to their latest versions PHPBB-17599 --- phpBB/composer.lock | 434 ++++++++++++++++++++++---------------------- 1 file changed, 219 insertions(+), 215 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 19ca12ccb0f..289853da726 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -173,16 +173,16 @@ }, { "name": "composer/ca-bundle", - "version": "1.5.9", + "version": "1.5.10", "source": { "type": "git", "url": "https://github.com/composer/ca-bundle.git", - "reference": "1905981ee626e6f852448b7aaa978f8666c5bc54" + "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/ca-bundle/zipball/1905981ee626e6f852448b7aaa978f8666c5bc54", - "reference": "1905981ee626e6f852448b7aaa978f8666c5bc54", + "url": "https://api.github.com/repos/composer/ca-bundle/zipball/961a5e4056dd2e4a2eedcac7576075947c28bf63", + "reference": "961a5e4056dd2e4a2eedcac7576075947c28bf63", "shasum": "" }, "require": { @@ -229,7 +229,7 @@ "support": { "irc": "irc://irc.freenode.org/composer", "issues": "https://github.com/composer/ca-bundle/issues", - "source": "https://github.com/composer/ca-bundle/tree/1.5.9" + "source": "https://github.com/composer/ca-bundle/tree/1.5.10" }, "funding": [ { @@ -241,20 +241,20 @@ "type": "github" } ], - "time": "2025-11-06T11:46:17+00:00" + "time": "2025-12-08T15:06:51+00:00" }, { "name": "composer/class-map-generator", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/composer/class-map-generator.git", - "reference": "2373419b7709815ed323ebf18c3c72d03ff4a8a6" + "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/class-map-generator/zipball/2373419b7709815ed323ebf18c3c72d03ff4a8a6", - "reference": "2373419b7709815ed323ebf18c3c72d03ff4a8a6", + "url": "https://api.github.com/repos/composer/class-map-generator/zipball/8f5fa3cc214230e71f54924bd0197a3bcc705eb1", + "reference": "8f5fa3cc214230e71f54924bd0197a3bcc705eb1", "shasum": "" }, "require": { @@ -298,7 +298,7 @@ ], "support": { "issues": "https://github.com/composer/class-map-generator/issues", - "source": "https://github.com/composer/class-map-generator/tree/1.7.0" + "source": "https://github.com/composer/class-map-generator/tree/1.7.1" }, "funding": [ { @@ -310,20 +310,20 @@ "type": "github" } ], - "time": "2025-11-19T10:41:15+00:00" + "time": "2025-12-29T13:15:25+00:00" }, { "name": "composer/composer", - "version": "2.9.2", + "version": "2.9.3", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "8d5358f147c63a3a681b002076deff8c90e0b19d" + "reference": "fb3bee27676fd852a8a11ebbb1de19b4dada5aba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/8d5358f147c63a3a681b002076deff8c90e0b19d", - "reference": "8d5358f147c63a3a681b002076deff8c90e0b19d", + "url": "https://api.github.com/repos/composer/composer/zipball/fb3bee27676fd852a8a11ebbb1de19b4dada5aba", + "reference": "fb3bee27676fd852a8a11ebbb1de19b4dada5aba", "shasum": "" }, "require": { @@ -411,7 +411,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.9.2" + "source": "https://github.com/composer/composer/tree/2.9.3" }, "funding": [ { @@ -423,7 +423,7 @@ "type": "github" } ], - "time": "2025-11-19T20:57:25+00:00" + "time": "2025-12-30T12:40:17+00:00" }, { "name": "composer/installers", @@ -1791,21 +1791,21 @@ }, { "name": "justinrainbow/json-schema", - "version": "6.6.2", + "version": "6.6.3", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "3c25fe750c1599716ef26aa997f7c026cee8c4b7" + "reference": "134e98916fa2f663afa623970af345cd788e8967" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/3c25fe750c1599716ef26aa997f7c026cee8c4b7", - "reference": "3c25fe750c1599716ef26aa997f7c026cee8c4b7", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/134e98916fa2f663afa623970af345cd788e8967", + "reference": "134e98916fa2f663afa623970af345cd788e8967", "shasum": "" }, "require": { "ext-json": "*", - "marc-mabe/php-enum": "^4.0", + "marc-mabe/php-enum": "^4.4", "php": "^7.2 || ^8.0" }, "require-dev": { @@ -1860,9 +1860,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.2" + "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.3" }, - "time": "2025-11-28T15:24:03+00:00" + "time": "2025-12-02T10:21:33+00:00" }, { "name": "marc-mabe/php-enum", @@ -2135,16 +2135,16 @@ }, { "name": "paragonie/sodium_compat", - "version": "v2.4.0", + "version": "v2.5.0", "source": { "type": "git", "url": "https://github.com/paragonie/sodium_compat.git", - "reference": "547e2dc4d45107440e76c17ab5a46e4252460158" + "reference": "4714da6efdc782c06690bc72ce34fae7941c2d9f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/547e2dc4d45107440e76c17ab5a46e4252460158", - "reference": "547e2dc4d45107440e76c17ab5a46e4252460158", + "url": "https://api.github.com/repos/paragonie/sodium_compat/zipball/4714da6efdc782c06690bc72ce34fae7941c2d9f", + "reference": "4714da6efdc782c06690bc72ce34fae7941c2d9f", "shasum": "" }, "require": { @@ -2225,9 +2225,9 @@ ], "support": { "issues": "https://github.com/paragonie/sodium_compat/issues", - "source": "https://github.com/paragonie/sodium_compat/tree/v2.4.0" + "source": "https://github.com/paragonie/sodium_compat/tree/v2.5.0" }, - "time": "2025-10-06T08:47:40+00:00" + "time": "2025-12-30T16:12:18+00:00" }, { "name": "psr/cache", @@ -3159,16 +3159,16 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.4.0", + "version": "1.4.1", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7" + "reference": "f0e9a548df4e3942886adc9b7830581a46334631" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/bf6f55a9d9eb25b7781640221cb54f5c727850d7", - "reference": "bf6f55a9d9eb25b7781640221cb54f5c727850d7", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/f0e9a548df4e3942886adc9b7830581a46334631", + "reference": "f0e9a548df4e3942886adc9b7830581a46334631", "shasum": "" }, "require": { @@ -3252,7 +3252,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.0" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.1" }, "funding": [ { @@ -3264,20 +3264,20 @@ "type": "patreon" } ], - "time": "2025-10-22T08:24:34+00:00" + "time": "2025-12-20T12:57:40+00:00" }, { "name": "symfony/config", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "f76c74e93bce2b9285f2dad7fbd06fa8182a7a41" + "reference": "800ce889e358a53a9678b3212b0c8cecd8c6aace" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/f76c74e93bce2b9285f2dad7fbd06fa8182a7a41", - "reference": "f76c74e93bce2b9285f2dad7fbd06fa8182a7a41", + "url": "https://api.github.com/repos/symfony/config/zipball/800ce889e358a53a9678b3212b0c8cecd8c6aace", + "reference": "800ce889e358a53a9678b3212b0c8cecd8c6aace", "shasum": "" }, "require": { @@ -3323,7 +3323,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.4.0" + "source": "https://github.com/symfony/config/tree/v7.4.3" }, "funding": [ { @@ -3343,20 +3343,20 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2025-12-23T14:24:27+00:00" }, { "name": "symfony/console", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "0bc0f45254b99c58d45a8fbf9fb955d46cbd1bb8" + "reference": "732a9ca6cd9dfd940c639062d5edbde2f6727fb6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/0bc0f45254b99c58d45a8fbf9fb955d46cbd1bb8", - "reference": "0bc0f45254b99c58d45a8fbf9fb955d46cbd1bb8", + "url": "https://api.github.com/repos/symfony/console/zipball/732a9ca6cd9dfd940c639062d5edbde2f6727fb6", + "reference": "732a9ca6cd9dfd940c639062d5edbde2f6727fb6", "shasum": "" }, "require": { @@ -3421,7 +3421,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.4.0" + "source": "https://github.com/symfony/console/tree/v7.4.3" }, "funding": [ { @@ -3441,20 +3441,20 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2025-12-23T14:50:43+00:00" }, { "name": "symfony/dependency-injection", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "3972ca7bbd649467b21a54870721b9e9f3652f9b" + "reference": "54122901b6d772e94f1e71a75e0533bc16563499" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/3972ca7bbd649467b21a54870721b9e9f3652f9b", - "reference": "3972ca7bbd649467b21a54870721b9e9f3652f9b", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54122901b6d772e94f1e71a75e0533bc16563499", + "reference": "54122901b6d772e94f1e71a75e0533bc16563499", "shasum": "" }, "require": { @@ -3505,7 +3505,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v7.4.0" + "source": "https://github.com/symfony/dependency-injection/tree/v7.4.3" }, "funding": [ { @@ -3525,7 +3525,7 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2025-12-28T10:55:46+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3909,16 +3909,16 @@ }, { "name": "symfony/finder", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "340b9ed7320570f319028a2cbec46d40535e94bd" + "reference": "fffe05569336549b20a1be64250b40516d6e8d06" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/340b9ed7320570f319028a2cbec46d40535e94bd", - "reference": "340b9ed7320570f319028a2cbec46d40535e94bd", + "url": "https://api.github.com/repos/symfony/finder/zipball/fffe05569336549b20a1be64250b40516d6e8d06", + "reference": "fffe05569336549b20a1be64250b40516d6e8d06", "shasum": "" }, "require": { @@ -3953,7 +3953,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.4.0" + "source": "https://github.com/symfony/finder/tree/v7.4.3" }, "funding": [ { @@ -3973,20 +3973,20 @@ "type": "tidelift" } ], - "time": "2025-11-05T05:42:40+00:00" + "time": "2025-12-23T14:50:43+00:00" }, { "name": "symfony/http-client", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "ee5e0e0139ab506f6063a230e631bed677c650a4" + "reference": "d01dfac1e0dc99f18da48b18101c23ce57929616" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/ee5e0e0139ab506f6063a230e631bed677c650a4", - "reference": "ee5e0e0139ab506f6063a230e631bed677c650a4", + "url": "https://api.github.com/repos/symfony/http-client/zipball/d01dfac1e0dc99f18da48b18101c23ce57929616", + "reference": "d01dfac1e0dc99f18da48b18101c23ce57929616", "shasum": "" }, "require": { @@ -4054,7 +4054,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.4.0" + "source": "https://github.com/symfony/http-client/tree/v7.4.3" }, "funding": [ { @@ -4074,7 +4074,7 @@ "type": "tidelift" } ], - "time": "2025-11-20T12:32:50+00:00" + "time": "2025-12-23T14:50:43+00:00" }, { "name": "symfony/http-client-contracts", @@ -4156,16 +4156,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "769c1720b68e964b13b58529c17d4a385c62167b" + "reference": "a70c745d4cea48dbd609f4075e5f5cbce453bd52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/769c1720b68e964b13b58529c17d4a385c62167b", - "reference": "769c1720b68e964b13b58529c17d4a385c62167b", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a70c745d4cea48dbd609f4075e5f5cbce453bd52", + "reference": "a70c745d4cea48dbd609f4075e5f5cbce453bd52", "shasum": "" }, "require": { @@ -4214,7 +4214,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.4.0" + "source": "https://github.com/symfony/http-foundation/tree/v7.4.3" }, "funding": [ { @@ -4234,20 +4234,20 @@ "type": "tidelift" } ], - "time": "2025-11-13T08:49:24+00:00" + "time": "2025-12-23T14:23:49+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "7348193cd384495a755554382e4526f27c456085" + "reference": "885211d4bed3f857b8c964011923528a55702aa5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/7348193cd384495a755554382e4526f27c456085", - "reference": "7348193cd384495a755554382e4526f27c456085", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/885211d4bed3f857b8c964011923528a55702aa5", + "reference": "885211d4bed3f857b8c964011923528a55702aa5", "shasum": "" }, "require": { @@ -4333,7 +4333,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.4.0" + "source": "https://github.com/symfony/http-kernel/tree/v7.4.3" }, "funding": [ { @@ -4353,20 +4353,20 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:38:24+00:00" + "time": "2025-12-31T08:43:57+00:00" }, { "name": "symfony/mailer", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "a3d9eea8cfa467ece41f0f54ba28185d74bd53fd" + "reference": "e472d35e230108231ccb7f51eb6b2100cac02ee4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/a3d9eea8cfa467ece41f0f54ba28185d74bd53fd", - "reference": "a3d9eea8cfa467ece41f0f54ba28185d74bd53fd", + "url": "https://api.github.com/repos/symfony/mailer/zipball/e472d35e230108231ccb7f51eb6b2100cac02ee4", + "reference": "e472d35e230108231ccb7f51eb6b2100cac02ee4", "shasum": "" }, "require": { @@ -4417,7 +4417,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.4.0" + "source": "https://github.com/symfony/mailer/tree/v7.4.3" }, "funding": [ { @@ -4437,7 +4437,7 @@ "type": "tidelift" } ], - "time": "2025-11-21T15:26:00+00:00" + "time": "2025-12-16T08:02:06+00:00" }, { "name": "symfony/mime", @@ -5436,16 +5436,16 @@ }, { "name": "symfony/process", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8" + "reference": "2f8e1a6cdf590ca63715da4d3a7a3327404a523f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/7ca8dc2d0dcf4882658313aba8be5d9fd01026c8", - "reference": "7ca8dc2d0dcf4882658313aba8be5d9fd01026c8", + "url": "https://api.github.com/repos/symfony/process/zipball/2f8e1a6cdf590ca63715da4d3a7a3327404a523f", + "reference": "2f8e1a6cdf590ca63715da4d3a7a3327404a523f", "shasum": "" }, "require": { @@ -5477,7 +5477,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.4.0" + "source": "https://github.com/symfony/process/tree/v7.4.3" }, "funding": [ { @@ -5497,20 +5497,20 @@ "type": "tidelift" } ], - "time": "2025-10-16T11:21:06+00:00" + "time": "2025-12-19T10:00:43+00:00" }, { "name": "symfony/routing", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "4720254cb2644a0b876233d258a32bf017330db7" + "reference": "5d3fd7adf8896c2fdb54e2f0f35b1bcbd9e45090" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/4720254cb2644a0b876233d258a32bf017330db7", - "reference": "4720254cb2644a0b876233d258a32bf017330db7", + "url": "https://api.github.com/repos/symfony/routing/zipball/5d3fd7adf8896c2fdb54e2f0f35b1bcbd9e45090", + "reference": "5d3fd7adf8896c2fdb54e2f0f35b1bcbd9e45090", "shasum": "" }, "require": { @@ -5562,7 +5562,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.4.0" + "source": "https://github.com/symfony/routing/tree/v7.4.3" }, "funding": [ { @@ -5582,7 +5582,7 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2025-12-19T10:00:43+00:00" }, { "name": "symfony/service-contracts", @@ -5846,16 +5846,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "e96998da928007554b8b8c02e677861877daced9" + "reference": "43c922fce020060c65b0fd54bfd8def3b38949b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/e96998da928007554b8b8c02e677861877daced9", - "reference": "e96998da928007554b8b8c02e677861877daced9", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/43c922fce020060c65b0fd54bfd8def3b38949b6", + "reference": "43c922fce020060c65b0fd54bfd8def3b38949b6", "shasum": "" }, "require": { @@ -5887,7 +5887,7 @@ "symfony/emoji": "^7.1|^8.0", "symfony/expression-language": "^6.4|^7.0|^8.0", "symfony/finder": "^6.4|^7.0|^8.0", - "symfony/form": "^6.4.20|^7.2.5|^8.0", + "symfony/form": "^6.4.30|~7.3.8|^7.4.1|^8.0.1", "symfony/html-sanitizer": "^6.4|^7.0|^8.0", "symfony/http-foundation": "^7.3|^8.0", "symfony/http-kernel": "^6.4|^7.0|^8.0", @@ -5937,7 +5937,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v7.4.0" + "source": "https://github.com/symfony/twig-bridge/tree/v7.4.3" }, "funding": [ { @@ -5957,20 +5957,20 @@ "type": "tidelift" } ], - "time": "2025-11-05T14:29:59+00:00" + "time": "2025-12-16T08:02:06+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "41fd6c4ae28c38b294b42af6db61446594a0dece" + "reference": "7e99bebcb3f90d8721890f2963463280848cba92" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/41fd6c4ae28c38b294b42af6db61446594a0dece", - "reference": "41fd6c4ae28c38b294b42af6db61446594a0dece", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7e99bebcb3f90d8721890f2963463280848cba92", + "reference": "7e99bebcb3f90d8721890f2963463280848cba92", "shasum": "" }, "require": { @@ -6024,7 +6024,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.4.0" + "source": "https://github.com/symfony/var-dumper/tree/v7.4.3" }, "funding": [ { @@ -6044,7 +6044,7 @@ "type": "tidelift" } ], - "time": "2025-10-27T20:36:44+00:00" + "time": "2025-12-18T07:04:31+00:00" }, { "name": "symfony/var-exporter", @@ -6129,16 +6129,16 @@ }, { "name": "symfony/yaml", - "version": "v7.4.0", + "version": "v7.4.1", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "6c84a4b55aee4cd02034d1c528e83f69ddf63810" + "reference": "24dd4de28d2e3988b311751ac49e684d783e2345" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/6c84a4b55aee4cd02034d1c528e83f69ddf63810", - "reference": "6c84a4b55aee4cd02034d1c528e83f69ddf63810", + "url": "https://api.github.com/repos/symfony/yaml/zipball/24dd4de28d2e3988b311751ac49e684d783e2345", + "reference": "24dd4de28d2e3988b311751ac49e684d783e2345", "shasum": "" }, "require": { @@ -6181,7 +6181,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.4.0" + "source": "https://github.com/symfony/yaml/tree/v7.4.1" }, "funding": [ { @@ -6201,20 +6201,20 @@ "type": "tidelift" } ], - "time": "2025-11-16T10:14:42+00:00" + "time": "2025-12-04T18:11:45+00:00" }, { "name": "twig/twig", - "version": "v3.22.0", + "version": "v3.22.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "4509984193026de413baf4ba80f68590a7f2c51d" + "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/4509984193026de413baf4ba80f68590a7f2c51d", - "reference": "4509984193026de413baf4ba80f68590a7f2c51d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/946ddeafa3c9f4ce279d1f34051af041db0e16f2", + "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2", "shasum": "" }, "require": { @@ -6268,7 +6268,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.22.0" + "source": "https://github.com/twigphp/Twig/tree/v3.22.2" }, "funding": [ { @@ -6280,7 +6280,7 @@ "type": "tidelift" } ], - "time": "2025-10-29T15:56:47+00:00" + "time": "2025-12-14T11:28:47+00:00" }, { "name": "web-token/jwt-key-mgmt", @@ -6959,16 +6959,16 @@ }, { "name": "amphp/parallel", - "version": "v2.3.2", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/amphp/parallel.git", - "reference": "321b45ae771d9c33a068186b24117e3cd1c48dce" + "reference": "296b521137a54d3a02425b464e5aee4c93db2c60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/amphp/parallel/zipball/321b45ae771d9c33a068186b24117e3cd1c48dce", - "reference": "321b45ae771d9c33a068186b24117e3cd1c48dce", + "url": "https://api.github.com/repos/amphp/parallel/zipball/296b521137a54d3a02425b464e5aee4c93db2c60", + "reference": "296b521137a54d3a02425b464e5aee4c93db2c60", "shasum": "" }, "require": { @@ -7031,7 +7031,7 @@ ], "support": { "issues": "https://github.com/amphp/parallel/issues", - "source": "https://github.com/amphp/parallel/tree/v2.3.2" + "source": "https://github.com/amphp/parallel/tree/v2.3.3" }, "funding": [ { @@ -7039,7 +7039,7 @@ "type": "github" } ], - "time": "2025-08-27T21:55:40+00:00" + "time": "2025-11-15T06:23:42+00:00" }, { "name": "amphp/parser", @@ -7821,20 +7821,20 @@ }, { "name": "league/uri", - "version": "7.6.0", + "version": "7.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "f625804987a0a9112d954f9209d91fec52182344" + "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/f625804987a0a9112d954f9209d91fec52182344", - "reference": "f625804987a0a9112d954f9209d91fec52182344", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/8d587cddee53490f9b82bf203d3a9aa7ea4f9807", + "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807", "shasum": "" }, "require": { - "league/uri-interfaces": "^7.6", + "league/uri-interfaces": "^7.7", "php": "^8.1", "psr/http-factory": "^1" }, @@ -7907,7 +7907,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri/tree/7.6.0" + "source": "https://github.com/thephpleague/uri/tree/7.7.0" }, "funding": [ { @@ -7915,20 +7915,20 @@ "type": "github" } ], - "time": "2025-11-18T12:17:23+00:00" + "time": "2025-12-07T16:02:06+00:00" }, { "name": "league/uri-interfaces", - "version": "7.6.0", + "version": "7.7.0", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "ccbfb51c0445298e7e0b7f4481b942f589665368" + "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/ccbfb51c0445298e7e0b7f4481b942f589665368", - "reference": "ccbfb51c0445298e7e0b7f4481b942f589665368", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/62ccc1a0435e1c54e10ee6022df28d6c04c2946c", + "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c", "shasum": "" }, "require": { @@ -7991,7 +7991,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri-interfaces/tree/7.6.0" + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.7.0" }, "funding": [ { @@ -7999,7 +7999,7 @@ "type": "github" } ], - "time": "2025-11-18T12:17:23+00:00" + "time": "2025-12-07T16:03:21+00:00" }, { "name": "masterminds/html5", @@ -8236,16 +8236,16 @@ }, { "name": "nikic/php-parser", - "version": "v5.6.2", + "version": "v5.7.0", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "3a454ca033b9e06b63282ce19562e892747449bb" + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb", - "reference": "3a454ca033b9e06b63282ce19562e892747449bb", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82", + "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82", "shasum": "" }, "require": { @@ -8288,9 +8288,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2" + "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0" }, - "time": "2025-10-21T19:32:17+00:00" + "time": "2025-12-06T11:56:16+00:00" }, { "name": "phar-io/manifest", @@ -8577,16 +8577,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.5", + "version": "5.6.6", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761" + "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/90614c73d3800e187615e2dd236ad0e2a01bf761", - "reference": "90614c73d3800e187615e2dd236ad0e2a01bf761", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/5cee1d3dfc2d2aa6599834520911d246f656bcb8", + "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8", "shasum": "" }, "require": { @@ -8596,7 +8596,7 @@ "phpdocumentor/reflection-common": "^2.2", "phpdocumentor/type-resolver": "^1.7", "phpstan/phpdoc-parser": "^1.7|^2.0", - "webmozart/assert": "^1.9.1" + "webmozart/assert": "^1.9.1 || ^2" }, "require-dev": { "mockery/mockery": "~1.3.5 || ~1.6.0", @@ -8635,9 +8635,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.5" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.6" }, - "time": "2025-11-27T19:50:05+00:00" + "time": "2025-12-22T21:13:58+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -9067,16 +9067,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.58", + "version": "10.5.60", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "e24fb46da450d8e6a5788670513c1af1424f16ca" + "reference": "f2e26f52f80ef77832e359205f216eeac00e320c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e24fb46da450d8e6a5788670513c1af1424f16ca", - "reference": "e24fb46da450d8e6a5788670513c1af1424f16ca", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f2e26f52f80ef77832e359205f216eeac00e320c", + "reference": "f2e26f52f80ef77832e359205f216eeac00e320c", "shasum": "" }, "require": { @@ -9148,7 +9148,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.58" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.60" }, "funding": [ { @@ -9172,20 +9172,20 @@ "type": "tidelift" } ], - "time": "2025-09-28T12:04:46+00:00" + "time": "2025-12-06T07:50:42+00:00" }, { "name": "psalm/plugin-symfony", - "version": "v5.2.7", + "version": "v5.2.8", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-symfony.git", - "reference": "56dd7ba14c4ac9796e06077f00e45fbbecc640af" + "reference": "603010dd920df45a924acdf0376bffa604ffa97a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/56dd7ba14c4ac9796e06077f00e45fbbecc640af", - "reference": "56dd7ba14c4ac9796e06077f00e45fbbecc640af", + "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/603010dd920df45a924acdf0376bffa604ffa97a", + "reference": "603010dd920df45a924acdf0376bffa604ffa97a", "shasum": "" }, "require": { @@ -9235,9 +9235,9 @@ "description": "Psalm Plugin for Symfony", "support": { "issues": "https://github.com/psalm/psalm-plugin-symfony/issues", - "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.7" + "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.8" }, - "time": "2025-01-26T10:27:48+00:00" + "time": "2025-12-18T11:18:29+00:00" }, { "name": "revolt/event-loop", @@ -10266,16 +10266,16 @@ }, { "name": "spatie/array-to-xml", - "version": "3.4.3", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/spatie/array-to-xml.git", - "reference": "7b9202dccfe18d4e3a13303156d6bbcc1c61dabf" + "reference": "88b2f3852a922dd73177a68938f8eb2ec70c7224" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/7b9202dccfe18d4e3a13303156d6bbcc1c61dabf", - "reference": "7b9202dccfe18d4e3a13303156d6bbcc1c61dabf", + "url": "https://api.github.com/repos/spatie/array-to-xml/zipball/88b2f3852a922dd73177a68938f8eb2ec70c7224", + "reference": "88b2f3852a922dd73177a68938f8eb2ec70c7224", "shasum": "" }, "require": { @@ -10318,7 +10318,7 @@ "xml" ], "support": { - "source": "https://github.com/spatie/array-to-xml/tree/3.4.3" + "source": "https://github.com/spatie/array-to-xml/tree/3.4.4" }, "funding": [ { @@ -10330,7 +10330,7 @@ "type": "github" } ], - "time": "2025-11-27T09:08:26+00:00" + "time": "2025-12-15T09:00:41+00:00" }, { "name": "squizlabs/php_codesniffer", @@ -10413,16 +10413,16 @@ }, { "name": "symfony/browser-kit", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "3bb26dafce31633b1f699894c86379eefc8af5bb" + "reference": "d5b5c731005f224fbc25289587a8538e4f62c762" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/3bb26dafce31633b1f699894c86379eefc8af5bb", - "reference": "3bb26dafce31633b1f699894c86379eefc8af5bb", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d5b5c731005f224fbc25289587a8538e4f62c762", + "reference": "d5b5c731005f224fbc25289587a8538e4f62c762", "shasum": "" }, "require": { @@ -10462,7 +10462,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v7.4.0" + "source": "https://github.com/symfony/browser-kit/tree/v7.4.3" }, "funding": [ { @@ -10482,20 +10482,20 @@ "type": "tidelift" } ], - "time": "2025-11-05T14:29:59+00:00" + "time": "2025-12-16T08:02:06+00:00" }, { "name": "symfony/cache", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "a7a1325a5de2e54ddb45fda002ff528162e48293" + "reference": "642117d18bc56832e74b68235359ccefab03dd11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/a7a1325a5de2e54ddb45fda002ff528162e48293", - "reference": "a7a1325a5de2e54ddb45fda002ff528162e48293", + "url": "https://api.github.com/repos/symfony/cache/zipball/642117d18bc56832e74b68235359ccefab03dd11", + "reference": "642117d18bc56832e74b68235359ccefab03dd11", "shasum": "" }, "require": { @@ -10566,7 +10566,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.4.0" + "source": "https://github.com/symfony/cache/tree/v7.4.3" }, "funding": [ { @@ -10586,7 +10586,7 @@ "type": "tidelift" } ], - "time": "2025-11-16T10:14:42+00:00" + "time": "2025-12-28T10:45:24+00:00" }, { "name": "symfony/cache-contracts", @@ -10735,16 +10735,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v7.4.0", + "version": "v7.4.1", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "8f3e7464fe7e77294686e935956a6a8ccf7442c4" + "reference": "0c5e8f20c74c78172a8ee72b125909b505033597" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/8f3e7464fe7e77294686e935956a6a8ccf7442c4", - "reference": "8f3e7464fe7e77294686e935956a6a8ccf7442c4", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0c5e8f20c74c78172a8ee72b125909b505033597", + "reference": "0c5e8f20c74c78172a8ee72b125909b505033597", "shasum": "" }, "require": { @@ -10783,7 +10783,7 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v7.4.0" + "source": "https://github.com/symfony/dom-crawler/tree/v7.4.1" }, "funding": [ { @@ -10803,20 +10803,20 @@ "type": "tidelift" } ], - "time": "2025-10-31T09:30:03+00:00" + "time": "2025-12-06T15:47:47+00:00" }, { "name": "symfony/framework-bundle", - "version": "v7.4.0", + "version": "v7.4.3", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "3c62a3437267ac55bcd40175689c74772250e943" + "reference": "df908e8f9e5f6cc3c9e0d0172e030a5c1c280582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/3c62a3437267ac55bcd40175689c74772250e943", - "reference": "3c62a3437267ac55bcd40175689c74772250e943", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/df908e8f9e5f6cc3c9e0d0172e030a5c1c280582", + "reference": "df908e8f9e5f6cc3c9e0d0172e030a5c1c280582", "shasum": "" }, "require": { @@ -10824,7 +10824,7 @@ "ext-xml": "*", "php": ">=8.2", "symfony/cache": "^6.4.12|^7.0|^8.0", - "symfony/config": "^7.4|^8.0", + "symfony/config": "^7.4.3|^8.0.3", "symfony/dependency-injection": "^7.4|^8.0", "symfony/deprecation-contracts": "^2.5|^3", "symfony/error-handler": "^7.3|^8.0", @@ -10941,7 +10941,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v7.4.0" + "source": "https://github.com/symfony/framework-bundle/tree/v7.4.3" }, "funding": [ { @@ -10961,7 +10961,7 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2025-12-29T09:31:36+00:00" }, { "name": "theseer/tokenizer", @@ -11015,16 +11015,16 @@ }, { "name": "vimeo/psalm", - "version": "6.13.1", + "version": "6.14.3", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51" + "reference": "d0b040a91f280f071c1abcb1b77ce3822058725a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51", - "reference": "1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/d0b040a91f280f071c1abcb1b77ce3822058725a", + "reference": "d0b040a91f280f071c1abcb1b77ce3822058725a", "shasum": "" }, "require": { @@ -11047,11 +11047,11 @@ "fidry/cpu-core-counter": "^0.4.1 || ^0.5.1 || ^1.0.0", "netresearch/jsonmapper": "^5.0", "nikic/php-parser": "^5.0.0", - "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3", + "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3 || ~8.5.0", "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", - "symfony/console": "^6.0 || ^7.0", - "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3", + "symfony/console": "^6.0 || ^7.0 || ^8.0", + "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3 || ^8.0", "symfony/polyfill-php84": "^1.31.0" }, "provide": { @@ -11073,7 +11073,7 @@ "psalm/plugin-phpunit": "^0.19", "slevomat/coding-standard": "^8.4", "squizlabs/php_codesniffer": "^3.6", - "symfony/process": "^6.0 || ^7.0" + "symfony/process": "^6.0 || ^7.0 || ^8.0" }, "suggest": { "ext-curl": "In order to send data to shepherd", @@ -11129,27 +11129,27 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2025-08-06T10:10:28+00:00" + "time": "2025-12-23T15:36:48+00:00" }, { "name": "webmozart/assert", - "version": "1.12.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" + "reference": "1b34b004e35a164bc5bb6ebd33c844b2d8069a54" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", - "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/1b34b004e35a164bc5bb6ebd33c844b2d8069a54", + "reference": "1b34b004e35a164bc5bb6ebd33c844b2d8069a54", "shasum": "" }, "require": { "ext-ctype": "*", "ext-date": "*", "ext-filter": "*", - "php": "^7.2 || ^8.0" + "php": "^8.2" }, "suggest": { "ext-intl": "", @@ -11159,7 +11159,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.10-dev" + "dev-feature/2-0": "2.0-dev" } }, "autoload": { @@ -11175,6 +11175,10 @@ { "name": "Bernhard Schussek", "email": "bschussek@gmail.com" + }, + { + "name": "Woody Gilk", + "email": "woody.gilk@gmail.com" } ], "description": "Assertions to validate method input/output with nice error messages.", @@ -11185,9 +11189,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.12.1" + "source": "https://github.com/webmozarts/assert/tree/2.0.0" }, - "time": "2025-10-29T15:56:20+00:00" + "time": "2025-12-16T21:36:00+00:00" } ], "aliases": [], @@ -11206,5 +11210,5 @@ "platform-overrides": { "php": "8.2.27" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } From 781793d3d6417b1b55dc55cf44afb145fc590538 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Dec 2025 22:38:51 +0100 Subject: [PATCH 1078/1214] [ticket/17599] Update npm packages to latest versions PHPBB-17599 --- package-lock.json | 7131 ++++++++++----------------------------------- 1 file changed, 1485 insertions(+), 5646 deletions(-) diff --git a/package-lock.json b/package-lock.json index cbc41696cca..cd31fac7891 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,7 +1,7 @@ { "name": "phpbb", "version": "4.0.0-dev", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -25,113 +25,53 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "dependencies": { - "@babel/highlight": "^7.10.4" - } - }, - "node_modules/@babel/helper-validator-identifier": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", - "dev": true, - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", + "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" + "@babel/helper-validator-identifier": "^7.27.1", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/highlight/node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "node_modules/@babel/highlight/node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "node_modules/@babel/helper-validator-identifier": { + "version": "7.28.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", + "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "dev": true, + "license": "MIT", "engines": { - "node": ">=0.8.0" + "node": ">=6.9.0" } }, - "node_modules/@babel/highlight/node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "node_modules/@csstools/selector-specificity": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz", + "integrity": "sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==", "dev": true, + "license": "CC0-1.0", "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/highlight/node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "dependencies": { - "has-flag": "^3.0.0" + "node": "^14 || ^16 || >=18" }, - "engines": { - "node": ">=4" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + }, + "peerDependencies": { + "postcss-selector-parser": "^6.0.10" } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.1.tgz", + "integrity": "sha512-phrYmNiYppR7znFEdqgfWHXR6NCkZEK7hwWDHZUjit/2/U0r6XvkDl0SYnoM51Hq7FhCGdLDT6zxCCOY1hexsQ==", "dev": true, + "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" }, @@ -145,22 +85,37 @@ "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, + "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, "node_modules/@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", + "version": "4.12.2", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", + "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, + "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/config-array": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", - "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", + "version": "0.21.1", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", + "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.6", + "@eslint/object-schema": "^2.1.7", "debug": "^4.3.1", "minimatch": "^3.1.2" }, @@ -169,19 +124,24 @@ } }, "node_modules/@eslint/config-helpers": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", - "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", + "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", "dev": true, + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.17.0" + }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/core": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", - "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", + "version": "0.17.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", + "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, @@ -190,10 +150,11 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", - "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz", + "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -201,7 +162,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", + "js-yaml": "^4.1.1", "minimatch": "^3.1.2", "strip-json-comments": "^3.1.1" }, @@ -217,6 +178,7 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -225,10 +187,11 @@ } }, "node_modules/@eslint/js": { - "version": "9.28.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz", - "integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==", + "version": "9.39.2", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.2.tgz", + "integrity": "sha512-q1mjIoW1VX4IvSocvM/vbTiveKC4k9eLrajNEuSsmjymSDEbpGddtpfOoN7YGAqBK3NG+uqo8ia4PDTt8buCYA==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -237,21 +200,23 @@ } }, "node_modules/@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", + "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", - "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", + "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.14.0", + "@eslint/core": "^0.17.0", "levn": "^0.4.1" }, "engines": { @@ -263,6 +228,7 @@ "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz", "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -272,6 +238,7 @@ "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz", "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==", "dev": true, + "license": "MIT", "dependencies": { "is-negated-glob": "^1.0.0" }, @@ -284,41 +251,31 @@ "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18.0" } }, "node_modules/@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" + "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, - "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true, - "engines": { - "node": ">=18.18" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" - } - }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -332,6 +289,7 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -345,6 +303,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -358,6 +317,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -367,6 +327,7 @@ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -380,45 +341,52 @@ "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10.13.0" } }, "node_modules/@types/estree": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", - "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", - "dev": true + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", + "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "dev": true, + "license": "MIT" }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/minimist": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz", - "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", - "dev": true + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==", + "dev": true, + "license": "MIT" }, "node_modules/@types/normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", - "dev": true + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", + "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", + "dev": true, + "license": "MIT" }, "node_modules/@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", + "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", + "dev": true, + "license": "MIT" }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "dev": true, + "license": "MIT", "dependencies": { "mime-types": "~2.1.34", "negotiator": "0.6.3" @@ -428,10 +396,11 @@ } }, "node_modules/acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", + "version": "8.15.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", + "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -444,6 +413,7 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -453,6 +423,7 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -469,6 +440,7 @@ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "^0.1.0" }, @@ -481,6 +453,7 @@ "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==", "dev": true, + "license": "MIT", "dependencies": { "ansi-wrap": "0.1.0" }, @@ -493,6 +466,7 @@ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -502,6 +476,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -517,6 +492,7 @@ "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -526,6 +502,7 @@ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "dev": true, + "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" @@ -538,19 +515,22 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/arr-diff": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -560,6 +540,7 @@ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -569,6 +550,7 @@ "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -577,22 +559,35 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/array-slice": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/arrify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -602,6 +597,7 @@ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -611,6 +607,7 @@ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -620,6 +617,7 @@ "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", "integrity": "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==", "dev": true, + "license": "MIT", "dependencies": { "end-of-stream": "^1.4.4", "once": "^1.4.0", @@ -634,6 +632,7 @@ "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz", "integrity": "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==", "dev": true, + "license": "MIT", "dependencies": { "async-done": "^2.0.0" }, @@ -642,9 +641,9 @@ } }, "node_modules/autoprefixer": { - "version": "10.4.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz", - "integrity": "sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==", + "version": "10.4.23", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.23.tgz", + "integrity": "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==", "dev": true, "funding": [ { @@ -654,14 +653,18 @@ { "type": "tidelift", "url": "https://tidelift.com/funding/github/npm/autoprefixer" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "browserslist": "^4.20.2", - "caniuse-lite": "^1.0.30001317", - "fraction.js": "^4.2.0", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", + "browserslist": "^4.28.1", + "caniuse-lite": "^1.0.30001760", + "fraction.js": "^5.3.4", + "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" }, "bin": { @@ -674,11 +677,27 @@ "postcss": "^8.1.0" } }, + "node_modules/b4a": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz", + "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==", + "dev": true, + "license": "Apache-2.0", + "peerDependencies": { + "react-native-b4a": "*" + }, + "peerDependenciesMeta": { + "react-native-b4a": { + "optional": true + } + } + }, "node_modules/bach": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz", "integrity": "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==", "dev": true, + "license": "MIT", "dependencies": { "async-done": "^2.0.0", "async-settle": "^2.0.0", @@ -692,14 +711,23 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/bare-events": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.2.tgz", - "integrity": "sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==", + "version": "2.8.2", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz", + "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==", "dev": true, - "optional": true + "license": "Apache-2.0", + "peerDependencies": { + "bare-abort-controller": "*" + }, + "peerDependenciesMeta": { + "bare-abort-controller": { + "optional": true + } + } }, "node_modules/base64-js": { "version": "1.5.1", @@ -719,13 +747,25 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" + }, + "node_modules/baseline-browser-mapping": { + "version": "2.9.11", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz", + "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -738,6 +778,7 @@ "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", "dev": true, + "license": "MIT", "dependencies": { "buffer": "^6.0.3", "inherits": "^2.0.4", @@ -749,6 +790,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -759,24 +801,24 @@ } }, "node_modules/body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", + "version": "1.20.4", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", + "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.2", + "bytes": "~3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", + "destroy": "~1.2.0", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "on-finished": "~2.4.1", + "qs": "~6.14.0", + "raw-body": "~2.5.3", "type-is": "~1.6.18", - "unpipe": "1.0.0" + "unpipe": "~1.0.0" }, "engines": { "node": ">= 0.8", @@ -793,6 +835,19 @@ "ms": "2.0.0" } }, + "node_modules/body-parser/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/body-parser/node_modules/ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", @@ -803,14 +858,16 @@ "node_modules/boolbase": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dev": true, + "license": "ISC" }, "node_modules/brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -830,9 +887,9 @@ } }, "node_modules/browserslist": { - "version": "4.25.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz", - "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==", + "version": "4.28.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", + "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", "dev": true, "funding": [ { @@ -848,11 +905,13 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001718", - "electron-to-chromium": "^1.5.160", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.3" + "baseline-browser-mapping": "^2.9.0", + "caniuse-lite": "^1.0.30001759", + "electron-to-chromium": "^1.5.263", + "node-releases": "^2.0.27", + "update-browserslist-db": "^1.2.0" }, "bin": { "browserslist": "cli.js" @@ -880,6 +939,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.2.1" @@ -889,7 +949,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/bytes": { "version": "3.1.2", @@ -906,6 +967,7 @@ "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -919,6 +981,7 @@ "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "get-intrinsic": "^1.3.0" @@ -935,6 +998,7 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -944,6 +1008,7 @@ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -953,6 +1018,7 @@ "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", "dev": true, + "license": "MIT", "dependencies": { "camelcase": "^5.3.1", "map-obj": "^4.0.0", @@ -970,6 +1036,7 @@ "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "dev": true, + "license": "MIT", "dependencies": { "browserslist": "^4.0.0", "caniuse-lite": "^1.0.0", @@ -978,9 +1045,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001720", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz", - "integrity": "sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==", + "version": "1.0.30001762", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001762.tgz", + "integrity": "sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==", "dev": true, "funding": [ { @@ -995,13 +1062,15 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -1018,6 +1087,7 @@ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "dev": true, + "license": "MIT", "dependencies": { "anymatch": "~3.1.2", "braces": "~3.0.2", @@ -1042,6 +1112,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -1054,6 +1125,7 @@ "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -1065,6 +1137,7 @@ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8" } @@ -1074,33 +1147,24 @@ "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } }, - "node_modules/clone-regexp": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", - "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==", - "dev": true, - "dependencies": { - "is-regexp": "^2.0.0" - }, - "engines": { - "node": ">=6" - } - }, "node_modules/clone-stats": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cloneable-readable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.1", "process-nextick-args": "^2.0.0", @@ -1112,6 +1176,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -1123,28 +1188,32 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true, + "license": "ISC", "bin": { "color-support": "bin.js" } }, "node_modules/colord": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", - "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", - "dev": true + "version": "2.9.3", + "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", + "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", + "dev": true, + "license": "MIT" }, "node_modules/commander": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10" } @@ -1152,14 +1221,16 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true, + "license": "MIT" }, "node_modules/concat-with-sourcemaps": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz", "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==", "dev": true, + "license": "ISC", "dependencies": { "source-map": "^0.6.1" } @@ -1168,13 +1239,15 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz", "integrity": "sha512-lHlohUiJxlpunvDag2Y0pO20bnvarMjnrdciZeuJUqRwrf/5JHNhdpiPIr5GQ8IkqrFj5TDMQwcCjblGo1oeuA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/content-disposition": { "version": "0.5.4", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" }, @@ -1200,7 +1273,8 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/content-type": { "version": "1.0.5", @@ -1212,10 +1286,17 @@ "node": ">= 0.6" } }, + "node_modules/convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "license": "MIT" + }, "node_modules/cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", + "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", "dev": true, "license": "MIT", "engines": { @@ -1223,16 +1304,18 @@ } }, "node_modules/cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", + "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", + "dev": true, + "license": "MIT" }, "node_modules/copy-props": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz", "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==", "dev": true, + "license": "MIT", "dependencies": { "each-props": "^3.0.0", "is-plain-object": "^5.0.0" @@ -1245,13 +1328,15 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/cosmiconfig": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", + "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", "dev": true, + "license": "MIT", "dependencies": { "@types/parse-json": "^4.0.0", "import-fresh": "^3.2.1", @@ -1268,6 +1353,7 @@ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -1278,10 +1364,11 @@ } }, "node_modules/css-declaration-sorter": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", + "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==", "dev": true, + "license": "ISC", "engines": { "node": "^10 || ^12 || >=14" }, @@ -1290,12 +1377,13 @@ } }, "node_modules/css-functions-list": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz", - "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz", + "integrity": "sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==", "dev": true, + "license": "MIT", "engines": { - "node": ">=12.22" + "node": ">=12 || >=16" } }, "node_modules/css-select": { @@ -1303,6 +1391,7 @@ "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", "css-what": "^6.0.1", @@ -1319,6 +1408,7 @@ "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", "dev": true, + "license": "MIT", "dependencies": { "mdn-data": "2.0.14", "source-map": "^0.6.1" @@ -1328,10 +1418,11 @@ } }, "node_modules/css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", + "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">= 6" }, @@ -1344,6 +1435,7 @@ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "dev": true, + "license": "MIT", "bin": { "cssesc": "bin/cssesc" }, @@ -1352,12 +1444,13 @@ } }, "node_modules/cssnano": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.7.tgz", - "integrity": "sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==", + "version": "5.1.15", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz", + "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==", "dev": true, + "license": "MIT", "dependencies": { - "cssnano-preset-default": "^5.2.7", + "cssnano-preset-default": "^5.2.14", "lilconfig": "^2.0.3", "yaml": "^1.10.2" }, @@ -1373,37 +1466,38 @@ } }, "node_modules/cssnano-preset-default": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz", - "integrity": "sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==", + "version": "5.2.14", + "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz", + "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==", "dev": true, + "license": "MIT", "dependencies": { - "css-declaration-sorter": "^6.2.2", + "css-declaration-sorter": "^6.3.1", "cssnano-utils": "^3.1.0", "postcss-calc": "^8.2.3", - "postcss-colormin": "^5.3.0", - "postcss-convert-values": "^5.1.0", - "postcss-discard-comments": "^5.1.1", + "postcss-colormin": "^5.3.1", + "postcss-convert-values": "^5.1.3", + "postcss-discard-comments": "^5.1.2", "postcss-discard-duplicates": "^5.1.0", "postcss-discard-empty": "^5.1.1", "postcss-discard-overridden": "^5.1.0", - "postcss-merge-longhand": "^5.1.4", - "postcss-merge-rules": "^5.1.1", + "postcss-merge-longhand": "^5.1.7", + "postcss-merge-rules": "^5.1.4", "postcss-minify-font-values": "^5.1.0", "postcss-minify-gradients": "^5.1.1", - "postcss-minify-params": "^5.1.2", - "postcss-minify-selectors": "^5.2.0", + "postcss-minify-params": "^5.1.4", + "postcss-minify-selectors": "^5.2.1", "postcss-normalize-charset": "^5.1.0", "postcss-normalize-display-values": "^5.1.0", - "postcss-normalize-positions": "^5.1.0", - "postcss-normalize-repeat-style": "^5.1.0", + "postcss-normalize-positions": "^5.1.1", + "postcss-normalize-repeat-style": "^5.1.1", "postcss-normalize-string": "^5.1.0", "postcss-normalize-timing-functions": "^5.1.0", - "postcss-normalize-unicode": "^5.1.0", + "postcss-normalize-unicode": "^5.1.1", "postcss-normalize-url": "^5.1.0", "postcss-normalize-whitespace": "^5.1.1", - "postcss-ordered-values": "^5.1.1", - "postcss-reduce-initial": "^5.1.0", + "postcss-ordered-values": "^5.1.3", + "postcss-reduce-initial": "^5.1.2", "postcss-reduce-transforms": "^5.1.0", "postcss-svgo": "^5.1.0", "postcss-unique-selectors": "^5.1.1" @@ -1420,6 +1514,7 @@ "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -1432,6 +1527,7 @@ "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", "dev": true, + "license": "MIT", "dependencies": { "css-tree": "^1.1.2" }, @@ -1440,12 +1536,13 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, + "license": "MIT", "dependencies": { - "ms": "2.1.2" + "ms": "^2.1.3" }, "engines": { "node": ">=6.0" @@ -1459,30 +1556,36 @@ "node_modules/decamelize": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/decamelize-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz", + "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==", "dev": true, + "license": "MIT", "dependencies": { "decamelize": "^1.1.0", "map-obj": "^1.0.0" }, "engines": { "node": ">=0.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/decamelize-keys/node_modules/map-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", + "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1491,7 +1594,8 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/depd": { "version": "2.0.0", @@ -1519,6 +1623,7 @@ "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1528,6 +1633,7 @@ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, + "license": "MIT", "dependencies": { "path-type": "^4.0.0" }, @@ -1540,6 +1646,7 @@ "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", "dev": true, + "license": "MIT", "dependencies": { "domelementtype": "^2.0.1", "domhandler": "^4.2.0", @@ -1559,13 +1666,15 @@ "type": "github", "url": "https://github.com/sponsors/fb55" } - ] + ], + "license": "BSD-2-Clause" }, "node_modules/domhandler": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.2.0" }, @@ -1581,6 +1690,7 @@ "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^1.0.1", "domelementtype": "^2.2.0", @@ -1595,6 +1705,7 @@ "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", "dev": true, + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -1609,6 +1720,7 @@ "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz", "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^5.0.0", "object.defaults": "^1.1.0" @@ -1622,6 +1734,7 @@ "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "safe-buffer": "^5.0.1" } @@ -1634,16 +1747,18 @@ "license": "MIT" }, "node_modules/electron-to-chromium": { - "version": "1.5.161", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz", - "integrity": "sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==", - "dev": true + "version": "1.5.267", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz", + "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==", + "dev": true, + "license": "ISC" }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", @@ -1656,10 +1771,11 @@ } }, "node_modules/end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", + "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", "dev": true, + "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -1669,15 +1785,17 @@ "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", "dev": true, + "license": "BSD-2-Clause", "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } @@ -1687,6 +1805,7 @@ "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1706,6 +1825,7 @@ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -1718,6 +1838,7 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -1734,6 +1855,7 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -1742,32 +1864,32 @@ } }, "node_modules/eslint": { - "version": "9.28.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz", - "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==", + "version": "9.39.2", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.2.tgz", + "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.20.0", - "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.14.0", + "@eslint/config-array": "^0.21.1", + "@eslint/config-helpers": "^0.4.2", + "@eslint/core": "^0.17.0", "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.28.0", - "@eslint/plugin-kit": "^0.3.1", + "@eslint/js": "9.39.2", + "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -1802,10 +1924,11 @@ } }, "node_modules/eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -1818,22 +1941,11 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1841,114 +1953,17 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "dependencies": { - "flat-cache": "^4.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/eslint/node_modules/find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "dependencies": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "dependencies": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/eslint/node_modules/locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "dependencies": { - "p-locate": "^5.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "dependencies": { - "yocto-queue": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/eslint/node_modules/p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "dependencies": { - "p-limit": "^3.0.2" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.14.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "eslint-visitor-keys": "^4.2.1" }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/espree/node_modules/eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -1957,10 +1972,11 @@ } }, "node_modules/esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", + "integrity": "sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -1973,6 +1989,7 @@ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -1985,6 +2002,7 @@ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } @@ -1994,6 +2012,7 @@ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } @@ -2008,16 +2027,14 @@ "node": ">= 0.6" } }, - "node_modules/execall": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz", - "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==", + "node_modules/events-universal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz", + "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==", "dev": true, + "license": "Apache-2.0", "dependencies": { - "clone-regexp": "^2.1.0" - }, - "engines": { - "node": ">=8" + "bare-events": "^2.7.0" } }, "node_modules/expand-tilde": { @@ -2025,6 +2042,7 @@ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", "dev": true, + "license": "MIT", "dependencies": { "homedir-polyfill": "^1.0.1" }, @@ -2033,39 +2051,40 @@ } }, "node_modules/express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", + "version": "4.22.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", + "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "dev": true, + "license": "MIT", "dependencies": { "accepts": "~1.3.8", "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", + "body-parser": "~1.20.3", + "content-disposition": "~0.5.4", "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", + "cookie": "~0.7.1", + "cookie-signature": "~1.0.6", "debug": "2.6.9", "depd": "2.0.0", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", + "finalhandler": "~1.3.1", + "fresh": "~0.5.2", + "http-errors": "~2.0.0", "merge-descriptors": "1.0.3", "methods": "~1.1.2", - "on-finished": "2.4.1", + "on-finished": "~2.4.1", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", + "path-to-regexp": "~0.1.12", "proxy-addr": "~2.0.7", - "qs": "6.13.0", + "qs": "~6.14.0", "range-parser": "~1.2.1", "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", + "send": "~0.19.0", + "serve-static": "~1.16.2", "setprototypeof": "1.2.0", - "statuses": "2.0.1", + "statuses": "~2.0.1", "type-is": "~1.6.18", "utils-merge": "1.0.1", "vary": "~1.1.2" @@ -2083,6 +2102,7 @@ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.0.0" } @@ -2091,7 +2111,8 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/express/node_modules/safe-buffer": { "version": "5.2.1", @@ -2111,19 +2132,22 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/extend": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/extend-shallow": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", "dev": true, + "license": "MIT", "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -2137,6 +2161,7 @@ "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", "dev": true, + "license": "MIT", "dependencies": { "ansi-gray": "^0.1.1", "color-support": "^1.1.3", @@ -2151,19 +2176,22 @@ "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-fifo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -2180,6 +2208,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -2191,39 +2220,64 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/fast-uri": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", + "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" }, "node_modules/fastest-levenshtein": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", - "dev": true + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.9.1" + } }, "node_modules/fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", + "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, + "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/fill-range": { @@ -2240,18 +2294,18 @@ } }, "node_modules/finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", + "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", "dev": true, "license": "MIT", "dependencies": { "debug": "2.6.9", "encodeurl": "~2.0.0", "escape-html": "~1.0.3", - "on-finished": "2.4.1", + "on-finished": "~2.4.1", "parseurl": "~1.3.3", - "statuses": "2.0.1", + "statuses": "~2.0.2", "unpipe": "~1.0.0" }, "engines": { @@ -2276,16 +2330,20 @@ "license": "MIT" }, "node_modules/find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { - "locate-path": "^5.0.0", + "locate-path": "^6.0.0", "path-exists": "^4.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/findup-sync": { @@ -2293,6 +2351,7 @@ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", "dev": true, + "license": "MIT", "dependencies": { "detect-file": "^1.0.0", "is-glob": "^4.0.3", @@ -2308,6 +2367,7 @@ "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz", "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", "dev": true, + "license": "MIT", "dependencies": { "expand-tilde": "^2.0.2", "is-plain-object": "^5.0.0", @@ -2324,34 +2384,38 @@ "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz", "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, + "license": "MIT", "dependencies": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" + "flatted": "^3.2.9", + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16" } }, "node_modules/flatted": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -2361,6 +2425,7 @@ "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", "dev": true, + "license": "MIT", "dependencies": { "for-in": "^1.0.1" }, @@ -2373,21 +2438,23 @@ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "5.3.4", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz", + "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==", "dev": true, + "license": "MIT", "engines": { "node": "*" }, "funding": { - "type": "patreon", - "url": "https://www.patreon.com/infusion" + "type": "github", + "url": "https://github.com/sponsors/rawify" } }, "node_modules/fresh": { @@ -2405,6 +2472,7 @@ "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz", "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==", "dev": true, + "license": "MIT", "dependencies": { "graceful-fs": "^4.2.8", "streamx": "^2.12.0" @@ -2416,8 +2484,9 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", @@ -2425,6 +2494,7 @@ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -2438,6 +2508,7 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -2447,6 +2518,7 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -2456,6 +2528,7 @@ "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -2480,6 +2553,7 @@ "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "dev": true, + "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -2488,16 +2562,26 @@ "node": ">= 0.4" } }, - "node_modules/get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", + "node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, - "engines": { - "node": ">=10" - }, + "license": "ISC", + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/glob-parent": { @@ -2505,6 +2589,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -2513,10 +2598,11 @@ } }, "node_modules/glob-stream": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz", - "integrity": "sha512-R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz", + "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==", "dev": true, + "license": "MIT", "dependencies": { "@gulpjs/to-absolute-glob": "^4.0.0", "anymatch": "^3.1.3", @@ -2536,6 +2622,7 @@ "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz", "integrity": "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==", "dev": true, + "license": "MIT", "dependencies": { "async-done": "^2.0.0", "chokidar": "^3.5.3" @@ -2549,6 +2636,7 @@ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, + "license": "MIT", "dependencies": { "global-prefix": "^1.0.1", "is-windows": "^1.0.1", @@ -2563,6 +2651,7 @@ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", "dev": true, + "license": "MIT", "dependencies": { "expand-tilde": "^2.0.2", "homedir-polyfill": "^1.0.1", @@ -2579,6 +2668,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -2587,10 +2677,11 @@ } }, "node_modules/globals": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz", - "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==", + "version": "16.5.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", + "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=18" }, @@ -2598,17 +2689,40 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "license": "MIT", + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/globjoin": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", - "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", - "dev": true + "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==", + "dev": true, + "license": "MIT" }, "node_modules/glogg": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz", "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==", "dev": true, + "license": "MIT", "dependencies": { "sparkles": "^2.1.0" }, @@ -2621,6 +2735,7 @@ "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2632,18 +2747,20 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/gulp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz", - "integrity": "sha512-S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz", + "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==", "dev": true, + "license": "MIT", "dependencies": { "glob-watcher": "^6.0.0", - "gulp-cli": "^3.0.0", + "gulp-cli": "^3.1.0", "undertaker": "^2.0.0", - "vinyl-fs": "^4.0.0" + "vinyl-fs": "^4.0.2" }, "bin": { "gulp": "bin/gulp.js" @@ -2653,17 +2770,18 @@ } }, "node_modules/gulp-cli": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz", - "integrity": "sha512-RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz", + "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==", "dev": true, + "license": "MIT", "dependencies": { "@gulpjs/messages": "^1.1.0", "chalk": "^4.1.2", "copy-props": "^4.0.0", "gulplog": "^2.2.0", "interpret": "^3.1.1", - "liftoff": "^5.0.0", + "liftoff": "^5.0.1", "mute-stdout": "^2.0.0", "replace-homedir": "^2.0.0", "semver-greatest-satisfied-range": "^2.0.0", @@ -2683,6 +2801,7 @@ "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==", "dev": true, + "license": "MIT", "dependencies": { "concat-with-sourcemaps": "^1.0.0", "through2": "^2.0.0", @@ -2692,37 +2811,12 @@ "node": ">= 0.10" } }, - "node_modules/gulp-concat/node_modules/replace-ext": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", - "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", - "dev": true, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/gulp-concat/node_modules/vinyl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", - "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", - "dev": true, - "dependencies": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/gulp-postcss": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz", "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==", "dev": true, + "license": "MIT", "dependencies": { "fancy-log": "^1.3.3", "plugin-error": "^1.0.1", @@ -2737,10 +2831,11 @@ } }, "node_modules/gulp-rename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz", - "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.1.0.tgz", + "integrity": "sha512-dGuzuH8jQGqCMqC544IEPhs5+O2l+IkdoSZsgd4kY97M1CxQeI3qrmweQBIrxLBbjbe/8uEWK8HHcNBc3OCy4g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -2750,6 +2845,7 @@ "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz", "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==", "dev": true, + "license": "MIT", "dependencies": { "glogg": "^2.2.0" }, @@ -2762,6 +2858,7 @@ "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -2771,6 +2868,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2780,6 +2878,7 @@ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -2805,6 +2904,7 @@ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, + "license": "MIT", "dependencies": { "parse-passwd": "^1.0.0" }, @@ -2813,10 +2913,11 @@ } }, "node_modules/hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", + "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==", "dev": true, + "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2825,10 +2926,11 @@ } }, "node_modules/html-tags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz", - "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz", + "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -2837,42 +2939,44 @@ } }, "node_modules/http_ece": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz", - "integrity": "sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.2.1.tgz", + "integrity": "sha512-+tzLoMYgXvicu60sVFoswTiu6BiQ6EX3DORRJQ3W2dNpNWCyZ3tcmRFZZ3jgVyw8ziWUCeUARKCkYDY6JgFx+w==", "dev": true, - "dependencies": { - "urlsafe-base64": "~1.0.0" - }, + "license": "MIT", "engines": { - "node": ">=4" + "node": ">=16" } }, "node_modules/http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", + "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", "dev": true, "license": "MIT", "dependencies": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" + "depd": "~2.0.0", + "inherits": "~2.0.4", + "setprototypeof": "~1.2.0", + "statuses": "~2.0.2", + "toidentifier": "~1.0.1" }, "engines": { "node": ">= 0.8" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3" + "safer-buffer": ">= 2.1.2 < 3.0.0" }, "engines": { "node": ">=0.10.0" @@ -2896,22 +3000,25 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", + "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -2928,6 +3035,7 @@ "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2935,8 +3043,9 @@ "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.19" } @@ -2946,6 +3055,7 @@ "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -2953,8 +3063,10 @@ "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -2964,19 +3076,22 @@ "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/ini": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/interpret": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -2986,6 +3101,7 @@ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -2995,6 +3111,7 @@ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, + "license": "MIT", "dependencies": { "is-relative": "^1.0.0", "is-windows": "^1.0.1" @@ -3006,14 +3123,16 @@ "node_modules/is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true, + "license": "MIT" }, "node_modules/is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, + "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" }, @@ -3026,6 +3145,7 @@ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "dev": true, + "license": "MIT", "dependencies": { "hasown": "^2.0.2" }, @@ -3041,6 +3161,7 @@ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, + "license": "MIT", "dependencies": { "is-plain-object": "^2.0.4" }, @@ -3053,6 +3174,7 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dev": true, + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -3063,8 +3185,9 @@ "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3074,6 +3197,7 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -3083,6 +3207,7 @@ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -3095,6 +3220,7 @@ "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3112,8 +3238,9 @@ "node_modules/is-plain-obj": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", + "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3123,24 +3250,17 @@ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/is-regexp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz", - "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", - "dev": true, - "engines": { - "node": ">=6" - } - }, "node_modules/is-relative": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, + "license": "MIT", "dependencies": { "is-unc-path": "^1.0.0" }, @@ -3153,6 +3273,7 @@ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, + "license": "MIT", "dependencies": { "unc-path-regex": "^0.1.2" }, @@ -3165,6 +3286,7 @@ "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3174,6 +3296,7 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3182,19 +3305,22 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true, + "license": "ISC" }, "node_modules/isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -3203,13 +3329,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -3221,33 +3349,38 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true, + "license": "MIT" }, "node_modules/jsonwebtoken": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", - "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.3.tgz", + "integrity": "sha512-MT/xP0CrubFRNLNKvxJ2BYfy53Zkm++5bX9dtuPbqAeQpTVe0MQTFhao8+Cp//EmJp244xt6Drw/GVEGCUj40g==", "dev": true, + "license": "MIT", "dependencies": { - "jws": "^3.2.2", + "jws": "^4.0.1", "lodash.includes": "^4.3.0", "lodash.isboolean": "^3.0.3", "lodash.isinteger": "^4.0.4", @@ -3264,23 +3397,25 @@ } }, "node_modules/jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", + "integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==", "dev": true, + "license": "MIT", "dependencies": { - "buffer-equal-constant-time": "1.0.1", + "buffer-equal-constant-time": "^1.0.1", "ecdsa-sig-formatter": "1.0.11", "safe-buffer": "^5.0.1" } }, "node_modules/jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz", + "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==", "dev": true, + "license": "MIT", "dependencies": { - "jwa": "^1.4.1", + "jwa": "^2.0.1", "safe-buffer": "^5.0.1" } }, @@ -3289,21 +3424,34 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/known-css-properties": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", - "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", - "dev": true + "version": "0.26.0", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.26.0.tgz", + "integrity": "sha512-5FZRzrZzNTBruuurWpvZnvP9pum+fe0HcK8z/ooo+U+Hmp4vtbyp1/QDsqmufirXy4egGzbaH/y2uCZf+6W5Kg==", + "dev": true, + "license": "MIT" }, "node_modules/last-run": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", "integrity": "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -3313,6 +3461,7 @@ "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz", "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.13.0" } @@ -3322,6 +3471,7 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -3331,10 +3481,11 @@ } }, "node_modules/liftoff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.0.tgz", - "integrity": "sha512-a5BQjbCHnB+cy+gsro8lXJ4kZluzOijzJ1UVVfyJYZC+IP2pLv1h4+aysQeKuTmyO8NAqfyQAk4HWaP/HjcKTg==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz", + "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==", "dev": true, + "license": "MIT", "dependencies": { "extend": "^3.0.2", "findup-sync": "^5.0.0", @@ -3349,103 +3500,121 @@ } }, "node_modules/lilconfig": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", - "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", + "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" } }, "node_modules/lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true, + "license": "MIT" }, "node_modules/locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { - "p-locate": "^4.1.0" + "p-locate": "^5.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/lodash.includes": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isboolean": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isinteger": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isnumber": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isplainobject": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.isstring": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.memoize": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true + "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", + "dev": true, + "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.once": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.truncate": { "version": "4.4.2", "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true + "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==", + "dev": true, + "license": "MIT" }, "node_modules/lodash.uniq": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true + "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", + "dev": true, + "license": "MIT" }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, + "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -3458,15 +3627,17 @@ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/map-obj": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", - "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", + "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -3479,6 +3650,7 @@ "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -3488,6 +3660,7 @@ "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", "dev": true, + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/wooorm" @@ -3497,7 +3670,8 @@ "version": "2.0.14", "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true + "dev": true, + "license": "CC0-1.0" }, "node_modules/media-typer": { "version": "0.3.0", @@ -3514,6 +3688,7 @@ "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", "dev": true, + "license": "MIT", "dependencies": { "@types/minimist": "^1.2.0", "camelcase-keys": "^6.2.2", @@ -3535,18 +3710,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/meow/node_modules/type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/merge-descriptors": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", @@ -3562,6 +3725,7 @@ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } @@ -3571,6 +3735,7 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3607,6 +3772,7 @@ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3616,6 +3782,7 @@ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -3628,6 +3795,7 @@ "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -3637,6 +3805,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -3645,16 +3814,21 @@ } }, "node_modules/minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/minimist-options": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", "dev": true, + "license": "MIT", "dependencies": { "arrify": "^1.0.1", "is-plain-obj": "^1.1.0", @@ -3664,20 +3838,12 @@ "node": ">= 6" } }, - "node_modules/minimist-options/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/mkdirp": { "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.6" }, @@ -3686,16 +3852,18 @@ } }, "node_modules/ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "dev": true, + "license": "MIT" }, "node_modules/mute-stdout": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz", "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -3711,6 +3879,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -3721,14 +3890,16 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true, + "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -3738,6 +3909,7 @@ "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz", "integrity": "sha512-NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w==", "dev": true, + "license": "MIT", "dependencies": { "is-absolute": "^0.2.6", "mkdirp": "~0.5.1", @@ -3749,6 +3921,7 @@ "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", "integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==", "dev": true, + "license": "MIT", "dependencies": { "is-relative": "^0.2.1", "is-windows": "^0.2.0" @@ -3762,6 +3935,7 @@ "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", "integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==", "dev": true, + "license": "MIT", "dependencies": { "is-unc-path": "^0.1.1" }, @@ -3774,6 +3948,7 @@ "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", "integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==", "dev": true, + "license": "MIT", "dependencies": { "unc-path-regex": "^0.1.0" }, @@ -3786,24 +3961,27 @@ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true + "version": "2.0.27", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", + "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", + "dev": true, + "license": "MIT" }, "node_modules/normalize-package-data": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", - "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", + "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "hosted-git-info": "^4.0.1", - "resolve": "^1.20.0", + "is-core-module": "^2.5.0", "semver": "^7.3.4", "validate-npm-package-license": "^3.0.1" }, @@ -3816,30 +3994,17 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, - "node_modules/normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/normalize-selector": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", - "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", - "dev": true - }, "node_modules/normalize-url": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -3852,6 +4017,7 @@ "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz", "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==", "dev": true, + "license": "MIT", "dependencies": { "once": "^1.4.0" }, @@ -3860,10 +4026,11 @@ } }, "node_modules/nth-check": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", - "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" }, @@ -3876,6 +4043,7 @@ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3888,6 +4056,7 @@ "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", "dev": true, + "license": "MIT", "dependencies": { "array-each": "^1.0.1", "array-slice": "^1.0.0", @@ -3903,6 +4072,7 @@ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", "dev": true, + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -3926,8 +4096,9 @@ "node_modules/once": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -3937,6 +4108,7 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, + "license": "MIT", "dependencies": { "deep-is": "^0.1.3", "fast-levenshtein": "^2.0.6", @@ -3950,30 +4122,35 @@ } }, "node_modules/p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { - "p-try": "^2.0.0" + "yocto-queue": "^0.1.0" }, "engines": { - "node": ">=6" + "node": ">=10" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { - "p-limit": "^2.2.0" + "p-limit": "^3.0.2" }, "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/p-try": { @@ -3981,6 +4158,7 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -3990,6 +4168,7 @@ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -4002,6 +4181,7 @@ "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "dev": true, + "license": "MIT", "dependencies": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -4016,6 +4196,7 @@ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -4034,6 +4215,7 @@ "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.10" } @@ -4043,6 +4225,7 @@ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4062,6 +4245,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4069,8 +4253,9 @@ "node_modules/path-is-absolute": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4080,6 +4265,7 @@ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4088,13 +4274,15 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-root": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "dev": true, + "license": "MIT", "dependencies": { "path-root-regex": "^0.1.0" }, @@ -4107,6 +4295,7 @@ "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4115,13 +4304,15 @@ "version": "0.1.12", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4130,13 +4321,15 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -4149,6 +4342,7 @@ "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", "dev": true, + "license": "MIT", "dependencies": { "ansi-colors": "^1.0.1", "arr-diff": "^4.0.0", @@ -4160,9 +4354,9 @@ } }, "node_modules/postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", "dev": true, "funding": [ { @@ -4178,10 +4372,11 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" @@ -4192,6 +4387,7 @@ "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", "dev": true, + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.9", "postcss-value-parser": "^4.2.0" @@ -4201,12 +4397,13 @@ } }, "node_modules/postcss-colormin": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz", - "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz", + "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==", "dev": true, + "license": "MIT", "dependencies": { - "browserslist": "^4.16.6", + "browserslist": "^4.21.4", "caniuse-api": "^3.0.0", "colord": "^2.9.1", "postcss-value-parser": "^4.2.0" @@ -4219,11 +4416,13 @@ } }, "node_modules/postcss-convert-values": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz", - "integrity": "sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz", + "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==", "dev": true, + "license": "MIT", "dependencies": { + "browserslist": "^4.21.4", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -4234,10 +4433,11 @@ } }, "node_modules/postcss-discard-comments": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz", - "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", + "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -4250,6 +4450,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -4262,6 +4463,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -4274,6 +4476,7 @@ "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -4286,6 +4489,7 @@ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", "dev": true, + "license": "MIT", "dependencies": { "lilconfig": "^2.0.5", "yaml": "^1.10.2" @@ -4313,17 +4517,19 @@ "node_modules/postcss-media-query-parser": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", - "dev": true + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true, + "license": "MIT" }, "node_modules/postcss-merge-longhand": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz", - "integrity": "sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==", + "version": "5.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz", + "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", - "stylehacks": "^5.1.0" + "stylehacks": "^5.1.1" }, "engines": { "node": "^10 || ^12 || >=14.0" @@ -4333,12 +4539,13 @@ } }, "node_modules/postcss-merge-rules": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz", - "integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz", + "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==", "dev": true, + "license": "MIT", "dependencies": { - "browserslist": "^4.16.6", + "browserslist": "^4.21.4", "caniuse-api": "^3.0.0", "cssnano-utils": "^3.1.0", "postcss-selector-parser": "^6.0.5" @@ -4355,6 +4562,7 @@ "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4370,6 +4578,7 @@ "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", "dev": true, + "license": "MIT", "dependencies": { "colord": "^2.9.1", "cssnano-utils": "^3.1.0", @@ -4383,12 +4592,13 @@ } }, "node_modules/postcss-minify-params": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz", - "integrity": "sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==", + "version": "5.1.4", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz", + "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==", "dev": true, + "license": "MIT", "dependencies": { - "browserslist": "^4.16.6", + "browserslist": "^4.21.4", "cssnano-utils": "^3.1.0", "postcss-value-parser": "^4.2.0" }, @@ -4400,10 +4610,11 @@ } }, "node_modules/postcss-minify-selectors": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz", - "integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz", + "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==", "dev": true, + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.5" }, @@ -4419,6 +4630,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", "dev": true, + "license": "MIT", "engines": { "node": "^10 || ^12 || >=14.0" }, @@ -4431,6 +4643,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4442,10 +4655,11 @@ } }, "node_modules/postcss-normalize-positions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz", - "integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz", + "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4457,10 +4671,11 @@ } }, "node_modules/postcss-normalize-repeat-style": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz", - "integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz", + "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4476,6 +4691,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4491,6 +4707,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4502,12 +4719,13 @@ } }, "node_modules/postcss-normalize-unicode": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz", - "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz", + "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==", "dev": true, + "license": "MIT", "dependencies": { - "browserslist": "^4.16.6", + "browserslist": "^4.21.4", "postcss-value-parser": "^4.2.0" }, "engines": { @@ -4522,6 +4740,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", "dev": true, + "license": "MIT", "dependencies": { "normalize-url": "^6.0.1", "postcss-value-parser": "^4.2.0" @@ -4538,6 +4757,7 @@ "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4549,10 +4769,11 @@ } }, "node_modules/postcss-ordered-values": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz", - "integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz", + "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==", "dev": true, + "license": "MIT", "dependencies": { "cssnano-utils": "^3.1.0", "postcss-value-parser": "^4.2.0" @@ -4565,12 +4786,13 @@ } }, "node_modules/postcss-reduce-initial": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz", - "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz", + "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==", "dev": true, + "license": "MIT", "dependencies": { - "browserslist": "^4.16.6", + "browserslist": "^4.21.4", "caniuse-api": "^3.0.0" }, "engines": { @@ -4585,6 +4807,7 @@ "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" }, @@ -4596,16 +4819,18 @@ } }, "node_modules/postcss-resolve-nested-selector": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", - "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=", - "dev": true + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", + "integrity": "sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==", + "dev": true, + "license": "MIT" }, "node_modules/postcss-safe-parser": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12.0" }, @@ -4618,10 +4843,11 @@ } }, "node_modules/postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "dev": true, + "license": "MIT", "dependencies": { "cssesc": "^3.0.0", "util-deprecate": "^1.0.2" @@ -4635,6 +4861,7 @@ "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz", "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==", "dev": true, + "license": "MIT", "peerDependencies": { "postcss": "^8.3.9" } @@ -4644,6 +4871,7 @@ "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", "svgo": "^2.7.0" @@ -4660,6 +4888,7 @@ "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", "dev": true, + "license": "MIT", "dependencies": { "postcss-selector-parser": "^6.0.5" }, @@ -4674,13 +4903,15 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } @@ -4689,13 +4920,15 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "dev": true, + "license": "MIT", "dependencies": { "forwarded": "0.2.0", "ipaddr.js": "1.9.1" @@ -4709,15 +4942,17 @@ "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz", "integrity": "sha512-w7QJhUTbu70hpDso0YXDRNKCPNuchV8UTUZsAv0m7Qj5g85oHOJfr9drA1EjvK4nQK/bG8P97W4L6PJ3IQLoOA==", "dev": true, + "license": "MIT", "dependencies": { "table-parser": "^0.1.3" } }, "node_modules/punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } @@ -4726,20 +4961,22 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/q/-/q-1.1.2.tgz", "integrity": "sha512-ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA==", + "deprecated": "You or someone you depend on is using Q, the JavaScript Promise library that gave JavaScript developers strong feelings about promises. They can almost certainly migrate to the native JavaScript promise now. Thank you literally everyone for joining me in this bet against the odds. Be excellent to each other.\n\n(For a CapTP with native promises, see @endo/eventual-send and @endo/captp)", "dev": true, + "license": "MIT", "engines": { "node": ">=0.6.0", "teleport": ">=0.2.0" } }, "node_modules/qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", + "version": "6.14.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", + "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">=0.6" @@ -4766,19 +5003,15 @@ "type": "consulting", "url": "https://feross.org/support" } - ] - }, - "node_modules/queue-tick": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", - "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", - "dev": true + ], + "license": "MIT" }, "node_modules/quick-lru": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -4794,26 +5027,40 @@ } }, "node_modules/raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", + "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", "dev": true, "license": "MIT", "dependencies": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "bytes": "~3.1.2", + "http-errors": "~2.0.1", + "iconv-lite": "~0.4.24", + "unpipe": "~1.0.0" }, "engines": { "node": ">= 0.8" } }, + "node_modules/raw-body/node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/read-pkg": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", "dev": true, + "license": "MIT", "dependencies": { "@types/normalize-package-data": "^2.4.0", "normalize-package-data": "^2.5.0", @@ -4829,6 +5076,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", "dev": true, + "license": "MIT", "dependencies": { "find-up": "^4.1.0", "read-pkg": "^5.2.0", @@ -4841,29 +5089,88 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/read-pkg-up/node_modules/type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "node_modules/read-pkg-up/node_modules/find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", + "dependencies": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + }, "engines": { "node": ">=8" } }, - "node_modules/read-pkg/node_modules/hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "node_modules/read-pkg/node_modules/normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "node_modules/read-pkg-up/node_modules/locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", + "p-locate": "^4.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-try": "^2.0.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/read-pkg-up/node_modules/p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "license": "MIT", + "dependencies": { + "p-limit": "^2.2.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg-up/node_modules/type-fest": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=8" + } + }, + "node_modules/read-pkg/node_modules/hosted-git-info": { + "version": "2.8.9", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", + "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", + "dev": true, + "license": "ISC" + }, + "node_modules/read-pkg/node_modules/normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", "semver": "2 || 3 || 4 || 5", "validate-npm-package-license": "^3.0.1" } @@ -4873,6 +5180,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver" } @@ -4882,6 +5190,7 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=8" } @@ -4891,6 +5200,7 @@ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, + "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -4906,6 +5216,7 @@ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "dev": true, + "license": "MIT", "dependencies": { "picomatch": "^2.2.1" }, @@ -4918,6 +5229,7 @@ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", "dev": true, + "license": "MIT", "dependencies": { "resolve": "^1.20.0" }, @@ -4930,6 +5242,7 @@ "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", "dev": true, + "license": "MIT", "dependencies": { "indent-string": "^4.0.0", "strip-indent": "^3.0.0" @@ -4941,16 +5254,18 @@ "node_modules/remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true + "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", + "dev": true, + "license": "ISC" }, "node_modules/replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", + "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", "dev": true, + "license": "MIT", "engines": { - "node": ">= 10" + "node": ">= 0.10" } }, "node_modules/replace-homedir": { @@ -4958,6 +5273,7 @@ "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz", "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -4967,6 +5283,7 @@ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -4976,17 +5293,19 @@ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", + "version": "1.22.11", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", + "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", "dev": true, + "license": "MIT", "dependencies": { - "is-core-module": "^2.16.0", + "is-core-module": "^2.16.1", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5005,6 +5324,7 @@ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", "dev": true, + "license": "MIT", "dependencies": { "expand-tilde": "^2.0.0", "global-modules": "^1.0.0" @@ -5018,6 +5338,7 @@ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -5027,6 +5348,7 @@ "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz", "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==", "dev": true, + "license": "MIT", "dependencies": { "value-or-function": "^4.0.0" }, @@ -5035,10 +5357,11 @@ } }, "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", + "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -5048,7 +5371,9 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -5059,26 +5384,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/rimraf/node_modules/glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "dependencies": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - }, - "engines": { - "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -5098,6 +5403,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } @@ -5106,19 +5412,22 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "dev": true, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -5131,6 +5440,7 @@ "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==", "dev": true, + "license": "MIT", "dependencies": { "sver": "^1.8.3" }, @@ -5139,25 +5449,25 @@ } }, "node_modules/send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", + "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", "dev": true, "license": "MIT", "dependencies": { "debug": "2.6.9", "depd": "2.0.0", "destroy": "1.2.0", - "encodeurl": "~1.0.2", + "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", + "fresh": "~0.5.2", + "http-errors": "~2.0.1", "mime": "1.6.0", "ms": "2.1.3", - "on-finished": "2.4.1", + "on-finished": "~2.4.1", "range-parser": "~1.2.1", - "statuses": "2.0.1" + "statuses": "~2.0.2" }, "engines": { "node": ">= 0.8.0" @@ -5180,34 +5490,17 @@ "dev": true, "license": "MIT" }, - "node_modules/send/node_modules/encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/send/node_modules/ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true, - "license": "MIT" - }, "node_modules/serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", + "version": "1.16.3", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", + "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", "dev": true, "license": "MIT", "dependencies": { "encodeurl": "~2.0.0", "escape-html": "~1.0.3", "parseurl": "~1.3.3", - "send": "0.19.0" + "send": "~0.19.1" }, "engines": { "node": ">= 0.8.0" @@ -5225,6 +5518,7 @@ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -5237,6 +5531,7 @@ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5246,6 +5541,7 @@ "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3", @@ -5265,6 +5561,7 @@ "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", "dev": true, + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "object-inspect": "^1.13.3" @@ -5281,6 +5578,7 @@ "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", "dev": true, + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -5299,6 +5597,7 @@ "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", "dev": true, + "license": "MIT", "dependencies": { "call-bound": "^1.0.2", "es-errors": "^1.3.0", @@ -5317,13 +5616,15 @@ "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5333,6 +5634,7 @@ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -5350,15 +5652,17 @@ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } @@ -5368,61 +5672,59 @@ "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz", "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } }, "node_modules/spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", + "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", "spdx-license-ids": "^3.0.0" } }, "node_modules/spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, + "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", "spdx-license-ids": "^3.0.0" } }, "node_modules/spdx-license-ids": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz", - "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==", - "dev": true - }, - "node_modules/specificity": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", - "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", + "version": "3.0.22", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", + "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", "dev": true, - "bin": { - "specificity": "bin/specificity" - } + "license": "CC0-1.0" }, "node_modules/stable": { "version": "0.1.8", "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true + "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility", + "dev": true, + "license": "MIT" }, "node_modules/statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", "dev": true, "license": "MIT", "engines": { @@ -5434,6 +5736,7 @@ "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==", "dev": true, + "license": "MIT", "dependencies": { "streamx": "^2.13.2" } @@ -5442,19 +5745,19 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/streamx": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.16.1.tgz", - "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==", + "version": "2.23.0", + "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", + "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", "dev": true, + "license": "MIT", "dependencies": { - "fast-fifo": "^1.1.0", - "queue-tick": "^1.0.1" - }, - "optionalDependencies": { - "bare-events": "^2.2.0" + "events-universal": "^1.0.0", + "fast-fifo": "^1.3.2", + "text-decoder": "^1.1.0" } }, "node_modules/string_decoder": { @@ -5462,6 +5765,7 @@ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -5471,6 +5775,7 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -5485,6 +5790,7 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -5497,6 +5803,7 @@ "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", "dev": true, + "license": "MIT", "dependencies": { "min-indent": "^1.0.0" }, @@ -5509,6 +5816,7 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -5519,16 +5827,18 @@ "node_modules/style-search": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", - "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=", - "dev": true + "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==", + "dev": true, + "license": "ISC" }, "node_modules/stylehacks": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz", - "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", + "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==", "dev": true, + "license": "MIT", "dependencies": { - "browserslist": "^4.16.6", + "browserslist": "^4.21.4", "postcss-selector-parser": "^6.0.4" }, "engines": { @@ -5539,52 +5849,50 @@ } }, "node_modules/stylelint": { - "version": "14.7.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.0.tgz", - "integrity": "sha512-vAVPAYaHhcexOiuvym0S64UWIIonMKgYz1Eh+SZgXKkKFLL+wwBzzWGH7Bdnk/HLyH3KlrX+tlisFdEG8ik+Lw==", + "version": "14.16.1", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz", + "integrity": "sha512-ErlzR/T3hhbV+a925/gbfc3f3Fep9/bnspMiJPorfGEmcBbXdS+oo6LrVtoUZ/w9fqD6o6k7PtUlCOsCRdjX/A==", "dev": true, + "license": "MIT", "dependencies": { + "@csstools/selector-specificity": "^2.0.2", "balanced-match": "^2.0.0", - "colord": "^2.9.2", - "cosmiconfig": "^7.0.1", - "css-functions-list": "^3.0.1", + "colord": "^2.9.3", + "cosmiconfig": "^7.1.0", + "css-functions-list": "^3.1.0", "debug": "^4.3.4", - "execall": "^2.0.0", - "fast-glob": "^3.2.11", - "fastest-levenshtein": "^1.0.12", + "fast-glob": "^3.2.12", + "fastest-levenshtein": "^1.0.16", "file-entry-cache": "^6.0.1", - "get-stdin": "^8.0.0", "global-modules": "^2.0.0", "globby": "^11.1.0", "globjoin": "^0.1.4", "html-tags": "^3.2.0", - "ignore": "^5.2.0", + "ignore": "^5.2.1", "import-lazy": "^4.0.0", "imurmurhash": "^0.1.4", "is-plain-object": "^5.0.0", - "known-css-properties": "^0.24.0", + "known-css-properties": "^0.26.0", "mathml-tag-names": "^2.1.3", "meow": "^9.0.0", "micromatch": "^4.0.5", "normalize-path": "^3.0.0", - "normalize-selector": "^0.2.0", "picocolors": "^1.0.0", - "postcss": "^8.4.12", + "postcss": "^8.4.19", "postcss-media-query-parser": "^0.2.3", "postcss-resolve-nested-selector": "^0.1.1", "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.10", + "postcss-selector-parser": "^6.0.11", "postcss-value-parser": "^4.2.0", "resolve-from": "^5.0.0", - "specificity": "^0.4.1", "string-width": "^4.2.3", "strip-ansi": "^6.0.1", "style-search": "^0.1.0", - "supports-hyperlinks": "^2.2.0", + "supports-hyperlinks": "^2.3.0", "svg-tags": "^1.0.0", - "table": "^6.8.0", + "table": "^6.8.1", "v8-compile-cache": "^2.3.0", - "write-file-atomic": "^4.0.1" + "write-file-atomic": "^4.0.2" }, "bin": { "stylelint": "bin/stylelint.js" @@ -5602,6 +5910,7 @@ "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz", "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==", "dev": true, + "license": "MIT", "dependencies": { "postcss": "^8.3.11", "postcss-sorting": "^7.0.1" @@ -5610,26 +5919,47 @@ "stylelint": "^14.0.0" } }, - "node_modules/stylelint/node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/stylelint/node_modules/balanced-match": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/stylelint/node_modules/file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "license": "MIT", + "dependencies": { + "flat-cache": "^3.0.4" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } + }, + "node_modules/stylelint/node_modules/flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "license": "MIT", + "dependencies": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + }, + "engines": { + "node": "^10.12.0 || >=12.0.0" + } }, "node_modules/stylelint/node_modules/global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", "dev": true, + "license": "MIT", "dependencies": { "global-prefix": "^3.0.0" }, @@ -5642,6 +5972,7 @@ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", "dev": true, + "license": "MIT", "dependencies": { "ini": "^1.3.5", "kind-of": "^6.0.2", @@ -5651,40 +5982,12 @@ "node": ">=6" } }, - "node_modules/stylelint/node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/stylelint/node_modules/kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/stylelint/node_modules/resolve-from": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5694,6 +5997,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -5706,6 +6010,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -5714,10 +6019,11 @@ } }, "node_modules/supports-hyperlinks": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", - "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz", + "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^4.0.0", "supports-color": "^7.0.0" @@ -5731,6 +6037,7 @@ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5743,6 +6050,7 @@ "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz", "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==", "dev": true, + "license": "MIT", "optionalDependencies": { "semver": "^6.3.0" } @@ -5752,6 +6060,7 @@ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, + "license": "ISC", "optional": true, "bin": { "semver": "bin/semver.js" @@ -5760,7 +6069,7 @@ "node_modules/svg-tags": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", + "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", "dev": true }, "node_modules/svgo": { @@ -5768,6 +6077,7 @@ "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", "dev": true, + "license": "MIT", "dependencies": { "@trysound/sax": "0.2.0", "commander": "^7.2.0", @@ -5785,10 +6095,11 @@ } }, "node_modules/table": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz", - "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", + "integrity": "sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "ajv": "^8.0.1", "lodash.truncate": "^4.4.2", @@ -5805,20 +6116,22 @@ "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz", "integrity": "sha512-LCYeuvqqoPII3lzzYaXKbC3Forb+d2u4bNwhk/9FlivuGRxPE28YEWAYcujeSlLLDlMfvy29+WPybFJZFiKMYg==", "dev": true, + "license": "MIT", "dependencies": { "connected-domain": "^1.0.0" } }, "node_modules/table/node_modules/ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, + "license": "MIT", "dependencies": { - "fast-deep-equal": "^3.1.1", + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" + "require-from-string": "^2.0.2" }, "funding": { "type": "github", @@ -5829,22 +6142,35 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/teex": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", "dev": true, + "license": "MIT", "dependencies": { "streamx": "^2.12.5" } }, + "node_modules/text-decoder": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", + "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "b4a": "^1.6.4" + } + }, "node_modules/through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, + "license": "MIT", "dependencies": { "readable-stream": "~2.3.6", "xtend": "~4.0.1" @@ -5855,6 +6181,7 @@ "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5877,6 +6204,7 @@ "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz", "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==", "dev": true, + "license": "MIT", "dependencies": { "streamx": "^2.12.5" }, @@ -5899,6 +6227,7 @@ "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } @@ -5908,6 +6237,7 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -5915,6 +6245,19 @@ "node": ">= 0.8.0" } }, + "node_modules/type-fest": { + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", + "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", @@ -5932,8 +6275,9 @@ "node_modules/unc-path-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -5943,6 +6287,7 @@ "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz", "integrity": "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==", "dev": true, + "license": "MIT", "dependencies": { "bach": "^2.0.1", "fast-levenshtein": "^3.0.0", @@ -5958,6 +6303,7 @@ "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz", "integrity": "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -5967,6 +6313,7 @@ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz", "integrity": "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==", "dev": true, + "license": "MIT", "dependencies": { "fastest-levenshtein": "^1.0.7" } @@ -5982,9 +6329,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", + "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", "dev": true, "funding": [ { @@ -6000,6 +6347,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "escalade": "^3.2.0", "picocolors": "^1.1.1" @@ -6016,6 +6364,7 @@ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } @@ -6029,29 +6378,33 @@ "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true, + "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4.0" } }, "node_modules/v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz", + "integrity": "sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==", + "dev": true, + "license": "MIT" }, "node_modules/v8flags": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz", "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -6061,6 +6414,7 @@ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "dev": true, + "license": "Apache-2.0", "dependencies": { "spdx-correct": "^3.0.0", "spdx-expression-parse": "^3.0.0" @@ -6071,6 +6425,7 @@ "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz", "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 10.13.0" } @@ -6080,24 +6435,27 @@ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/vinyl": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz", - "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", + "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", "dev": true, + "license": "MIT", "dependencies": { - "clone": "^2.1.2", + "clone": "^2.1.1", + "clone-buffer": "^1.0.0", "clone-stats": "^1.0.0", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" + "cloneable-readable": "^1.0.0", + "remove-trailing-separator": "^1.0.1", + "replace-ext": "^1.0.0" }, "engines": { - "node": ">=10.13.0" + "node": ">= 0.10" } }, "node_modules/vinyl-contents": { @@ -6105,6 +6463,7 @@ "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz", "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==", "dev": true, + "license": "MIT", "dependencies": { "bl": "^5.0.0", "vinyl": "^3.0.0" @@ -6113,14 +6472,41 @@ "node": ">=10.13.0" } }, + "node_modules/vinyl-contents/node_modules/replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/vinyl-contents/node_modules/vinyl": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", + "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clone": "^2.1.2", + "remove-trailing-separator": "^1.1.0", + "replace-ext": "^2.0.0", + "teex": "^1.0.1" + }, + "engines": { + "node": ">=10.13.0" + } + }, "node_modules/vinyl-fs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz", - "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz", + "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==", "dev": true, + "license": "MIT", "dependencies": { "fs-mkdirp-stream": "^2.0.1", - "glob-stream": "^8.0.0", + "glob-stream": "^8.0.3", "graceful-fs": "^4.2.11", "iconv-lite": "^0.6.3", "is-valid-glob": "^1.0.0", @@ -6131,23 +6517,37 @@ "streamx": "^2.14.0", "to-through": "^3.0.0", "value-or-function": "^4.0.0", - "vinyl": "^3.0.0", + "vinyl": "^3.0.1", "vinyl-sourcemap": "^2.0.0" }, "engines": { "node": ">=10.13.0" } }, - "node_modules/vinyl-fs/node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", + "node_modules/vinyl-fs/node_modules/replace-ext": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/vinyl-fs/node_modules/vinyl": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", + "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", "dev": true, + "license": "MIT", "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" + "clone": "^2.1.2", + "remove-trailing-separator": "^1.1.0", + "replace-ext": "^2.0.0", + "teex": "^1.0.1" }, "engines": { - "node": ">=0.10.0" + "node": ">=10.13.0" } }, "node_modules/vinyl-sourcemap": { @@ -6155,6 +6555,7 @@ "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz", "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==", "dev": true, + "license": "MIT", "dependencies": { "convert-source-map": "^2.0.0", "graceful-fs": "^4.2.10", @@ -6167,17 +6568,38 @@ "node": ">=10.13.0" } }, - "node_modules/vinyl-sourcemap/node_modules/convert-source-map": { + "node_modules/vinyl-sourcemap/node_modules/replace-ext": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", + "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 10" + } + }, + "node_modules/vinyl-sourcemap/node_modules/vinyl": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", + "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", + "dev": true, + "license": "MIT", + "dependencies": { + "clone": "^2.1.2", + "remove-trailing-separator": "^1.1.0", + "replace-ext": "^2.0.0", + "teex": "^1.0.1" + }, + "engines": { + "node": ">=10.13.0" + } }, "node_modules/vinyl-sourcemaps-apply": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", - "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", + "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==", "dev": true, + "license": "ISC", "dependencies": { "source-map": "^0.5.1" } @@ -6185,17 +6607,19 @@ "node_modules/vinyl-sourcemaps-apply/node_modules/source-map": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/web-push-testing": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.1.tgz", - "integrity": "sha512-q+FcdmPeePLI7kwxIngl9jzOfqnbp8t5DD17tQ8j1VxdEtsYb8HAbaieZH5q7uudQn+LFniAn0V9xsOnFctV7Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.2.1.tgz", + "integrity": "sha512-3fYaXTvivNWTU+viL7QtMmAdHWJd9eJt1da8mbY42Kg7aDfIQ9x6lZwdGqXCm1OtmqGt8M9awLEHaEHD8GFv3A==", "dev": true, + "license": "MIT", "dependencies": { "arg": "^5.0.1", "express": "^4.17.2", @@ -6209,7 +6633,7 @@ "web-push-testing": "src/bin/cli.js" }, "engines": { - "node": ">=15.0.0" + "node": ">=20.0.0" } }, "node_modules/which": { @@ -6217,6 +6641,7 @@ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -6232,6 +6657,7 @@ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -6241,6 +6667,7 @@ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -6256,20 +6683,22 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true, + "license": "ISC" }, "node_modules/write-file-atomic": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz", - "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", + "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==", "dev": true, + "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", "signal-exit": "^3.0.7" }, "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16" + "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, "node_modules/xtend": { @@ -6277,6 +6706,7 @@ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.4" } @@ -6286,6 +6716,7 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -6294,13 +6725,15 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yaml": { "version": "1.10.2", "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "dev": true, + "license": "ISC", "engines": { "node": ">= 6" } @@ -6310,6 +6743,7 @@ "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^7.0.2", "escalade": "^3.1.1", @@ -6324,10 +6758,11 @@ } }, "node_modules/yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } @@ -6337,6 +6772,7 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -6344,4602 +6780,5 @@ "url": "https://github.com/sponsors/sindresorhus" } } - }, - "dependencies": { - "@babel/code-frame": { - "version": "7.12.11", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", - "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.10.4" - } - }, - "@babel/helper-validator-identifier": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", - "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", - "dev": true - }, - "@babel/highlight": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.14.5.tgz", - "integrity": "sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==", - "dev": true, - "requires": { - "@babel/helper-validator-identifier": "^7.14.5", - "chalk": "^2.0.0", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } - } - }, - "@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", - "dev": true, - "requires": { - "eslint-visitor-keys": "^3.4.3" - } - }, - "@eslint-community/regexpp": { - "version": "4.12.1", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz", - "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==", - "dev": true - }, - "@eslint/config-array": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz", - "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==", - "dev": true, - "requires": { - "@eslint/object-schema": "^2.1.6", - "debug": "^4.3.1", - "minimatch": "^3.1.2" - } - }, - "@eslint/config-helpers": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz", - "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==", - "dev": true - }, - "@eslint/core": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz", - "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==", - "dev": true, - "requires": { - "@types/json-schema": "^7.0.15" - } - }, - "@eslint/eslintrc": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", - "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", - "dev": true, - "requires": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "dependencies": { - "globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true - } - } - }, - "@eslint/js": { - "version": "9.28.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.28.0.tgz", - "integrity": "sha512-fnqSjGWd/CoIp4EXIxWVK/sHA6DOHN4+8Ix2cX5ycOY7LG0UY8nHCU5pIp2eaE1Mc7Qd8kHspYNzYXT2ojPLzg==", - "dev": true - }, - "@eslint/object-schema": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", - "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", - "dev": true - }, - "@eslint/plugin-kit": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz", - "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==", - "dev": true, - "requires": { - "@eslint/core": "^0.14.0", - "levn": "^0.4.1" - } - }, - "@gulpjs/messages": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz", - "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==", - "dev": true - }, - "@gulpjs/to-absolute-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz", - "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==", - "dev": true, - "requires": { - "is-negated-glob": "^1.0.0" - } - }, - "@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", - "dev": true - }, - "@humanfs/node": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz", - "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==", - "dev": true, - "requires": { - "@humanfs/core": "^0.19.1", - "@humanwhocodes/retry": "^0.3.0" - }, - "dependencies": { - "@humanwhocodes/retry": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", - "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", - "dev": true - } - } - }, - "@humanwhocodes/module-importer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true - }, - "@humanwhocodes/retry": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", - "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", - "dev": true - }, - "@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - } - }, - "@trysound/sax": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", - "dev": true - }, - "@types/estree": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.7.tgz", - "integrity": "sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==", - "dev": true - }, - "@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, - "@types/minimist": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz", - "integrity": "sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==", - "dev": true - }, - "@types/normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==", - "dev": true - }, - "@types/parse-json": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz", - "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==", - "dev": true - }, - "accepts": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "dev": true, - "requires": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" - } - }, - "acorn": { - "version": "8.14.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz", - "integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==", - "dev": true - }, - "acorn-jsx": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, - "requires": {} - }, - "ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "requires": { - "ansi-wrap": "^0.1.0" - } - }, - "ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==", - "dev": true, - "requires": { - "ansi-wrap": "0.1.0" - } - }, - "ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true - }, - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==", - "dev": true - }, - "anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "arg": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "dev": true - }, - "argparse": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true - }, - "array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", - "dev": true - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", - "dev": true - }, - "array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", - "dev": true - }, - "astral-regex": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", - "dev": true - }, - "async-done": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", - "integrity": "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==", - "dev": true, - "requires": { - "end-of-stream": "^1.4.4", - "once": "^1.4.0", - "stream-exhaust": "^1.0.2" - } - }, - "async-settle": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz", - "integrity": "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==", - "dev": true, - "requires": { - "async-done": "^2.0.0" - } - }, - "autoprefixer": { - "version": "10.4.4", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.4.tgz", - "integrity": "sha512-Tm8JxsB286VweiZ5F0anmbyGiNI3v3wGv3mz9W+cxEDYB/6jbnj6GM9H9mK3wIL8ftgl+C07Lcwb8PG5PCCPzA==", - "dev": true, - "requires": { - "browserslist": "^4.20.2", - "caniuse-lite": "^1.0.30001317", - "fraction.js": "^4.2.0", - "normalize-range": "^0.1.2", - "picocolors": "^1.0.0", - "postcss-value-parser": "^4.2.0" - } - }, - "bach": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz", - "integrity": "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==", - "dev": true, - "requires": { - "async-done": "^2.0.0", - "async-settle": "^2.0.0", - "now-and-later": "^3.0.0" - } - }, - "balanced-match": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true - }, - "bare-events": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.2.2.tgz", - "integrity": "sha512-h7z00dWdG0PYOQEvChhOSWvOfkIKsdZGkWr083FgN/HyoQuebSew/cgirYqh9SCuy/hRvxc5Vy6Fw8xAmYHLkQ==", - "dev": true, - "optional": true - }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true - }, - "binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true - }, - "bl": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", - "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", - "dev": true, - "requires": { - "buffer": "^6.0.3", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - }, - "dependencies": { - "readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - } - } - } - }, - "body-parser": { - "version": "1.20.3", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz", - "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "content-type": "~1.0.5", - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "on-finished": "2.4.1", - "qs": "6.13.0", - "raw-body": "2.5.2", - "type-is": "~1.6.18", - "unpipe": "1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", - "dev": true, - "requires": { - "fill-range": "^7.1.1" - } - }, - "browserslist": { - "version": "4.25.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.0.tgz", - "integrity": "sha512-PJ8gYKeS5e/whHBh8xrwYK+dAvEj7JXtz6uTucnMRB8OiGTsKccFekoRrjajPBHV8oOY+2tI4uxeceSimKwMFA==", - "dev": true, - "requires": { - "caniuse-lite": "^1.0.30001718", - "electron-to-chromium": "^1.5.160", - "node-releases": "^2.0.19", - "update-browserslist-db": "^1.1.3" - } - }, - "buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "requires": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==", - "dev": true - }, - "bytes": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", - "dev": true - }, - "call-bind-apply-helpers": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "function-bind": "^1.1.2" - } - }, - "call-bound": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", - "dev": true, - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "get-intrinsic": "^1.3.0" - } - }, - "callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true - }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - }, - "camelcase-keys": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.2.2.tgz", - "integrity": "sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==", - "dev": true, - "requires": { - "camelcase": "^5.3.1", - "map-obj": "^4.0.0", - "quick-lru": "^4.0.1" - } - }, - "caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "requires": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, - "caniuse-lite": { - "version": "1.0.30001720", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001720.tgz", - "integrity": "sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==", - "dev": true - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "requires": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "fsevents": "~2.3.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "dependencies": { - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - } - } - }, - "cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "dev": true - }, - "clone-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", - "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==", - "dev": true - }, - "clone-regexp": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz", - "integrity": "sha512-beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==", - "dev": true, - "requires": { - "is-regexp": "^2.0.0" - } - }, - "clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==", - "dev": true - }, - "cloneable-readable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", - "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true - }, - "colord": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.2.tgz", - "integrity": "sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==", - "dev": true - }, - "commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-with-sourcemaps": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz", - "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==", - "dev": true, - "requires": { - "source-map": "^0.6.1" - } - }, - "connected-domain": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz", - "integrity": "sha512-lHlohUiJxlpunvDag2Y0pO20bnvarMjnrdciZeuJUqRwrf/5JHNhdpiPIr5GQ8IkqrFj5TDMQwcCjblGo1oeuA==", - "dev": true - }, - "content-disposition": { - "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", - "dev": true, - "requires": { - "safe-buffer": "5.2.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "content-type": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", - "dev": true - }, - "cookie": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", - "dev": true - }, - "copy-props": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz", - "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==", - "dev": true, - "requires": { - "each-props": "^3.0.0", - "is-plain-object": "^5.0.0" - } - }, - "core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true - }, - "cosmiconfig": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz", - "integrity": "sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==", - "dev": true, - "requires": { - "@types/parse-json": "^4.0.0", - "import-fresh": "^3.2.1", - "parse-json": "^5.0.0", - "path-type": "^4.0.0", - "yaml": "^1.10.0" - } - }, - "cross-spawn": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, - "css-declaration-sorter": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.2.2.tgz", - "integrity": "sha512-Ufadglr88ZLsrvS11gjeu/40Lw74D9Am/Jpr3LlYm5Q4ZP5KdlUhG+6u2EjyXeZcxmZ2h1ebCKngDjolpeLHpg==", - "dev": true, - "requires": {} - }, - "css-functions-list": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.0.1.tgz", - "integrity": "sha512-PriDuifDt4u4rkDgnqRCLnjfMatufLmWNfQnGCq34xZwpY3oabwhB9SqRBmuvWUgndbemCFlKqg+nO7C2q0SBw==", - "dev": true - }, - "css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "requires": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - } - }, - "css-tree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, - "requires": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" - } - }, - "css-what": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz", - "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==", - "dev": true - }, - "cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", - "dev": true - }, - "cssnano": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.7.tgz", - "integrity": "sha512-pVsUV6LcTXif7lvKKW9ZrmX+rGRzxkEdJuVJcp5ftUjWITgwam5LMZOgaTvUrWPkcORBey6he7JKb4XAJvrpKg==", - "dev": true, - "requires": { - "cssnano-preset-default": "^5.2.7", - "lilconfig": "^2.0.3", - "yaml": "^1.10.2" - } - }, - "cssnano-preset-default": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.7.tgz", - "integrity": "sha512-JiKP38ymZQK+zVKevphPzNSGHSlTI+AOwlasoSRtSVMUU285O7/6uZyd5NbW92ZHp41m0sSHe6JoZosakj63uA==", - "dev": true, - "requires": { - "css-declaration-sorter": "^6.2.2", - "cssnano-utils": "^3.1.0", - "postcss-calc": "^8.2.3", - "postcss-colormin": "^5.3.0", - "postcss-convert-values": "^5.1.0", - "postcss-discard-comments": "^5.1.1", - "postcss-discard-duplicates": "^5.1.0", - "postcss-discard-empty": "^5.1.1", - "postcss-discard-overridden": "^5.1.0", - "postcss-merge-longhand": "^5.1.4", - "postcss-merge-rules": "^5.1.1", - "postcss-minify-font-values": "^5.1.0", - "postcss-minify-gradients": "^5.1.1", - "postcss-minify-params": "^5.1.2", - "postcss-minify-selectors": "^5.2.0", - "postcss-normalize-charset": "^5.1.0", - "postcss-normalize-display-values": "^5.1.0", - "postcss-normalize-positions": "^5.1.0", - "postcss-normalize-repeat-style": "^5.1.0", - "postcss-normalize-string": "^5.1.0", - "postcss-normalize-timing-functions": "^5.1.0", - "postcss-normalize-unicode": "^5.1.0", - "postcss-normalize-url": "^5.1.0", - "postcss-normalize-whitespace": "^5.1.1", - "postcss-ordered-values": "^5.1.1", - "postcss-reduce-initial": "^5.1.0", - "postcss-reduce-transforms": "^5.1.0", - "postcss-svgo": "^5.1.0", - "postcss-unique-selectors": "^5.1.1" - } - }, - "cssnano-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "dev": true, - "requires": {} - }, - "csso": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, - "requires": { - "css-tree": "^1.1.2" - } - }, - "debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "decamelize-keys": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.0.tgz", - "integrity": "sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk=", - "dev": true, - "requires": { - "decamelize": "^1.1.0", - "map-obj": "^1.0.0" - }, - "dependencies": { - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - } - } - }, - "deep-is": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true - }, - "depd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", - "dev": true - }, - "destroy": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", - "dev": true - }, - "detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", - "dev": true - }, - "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "dev": true, - "requires": { - "path-type": "^4.0.0" - } - }, - "dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "requires": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - } - }, - "domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true - }, - "domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "requires": { - "domelementtype": "^2.2.0" - } - }, - "domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "requires": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - } - }, - "dunder-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "dev": true, - "requires": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" - } - }, - "each-props": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz", - "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==", - "dev": true, - "requires": { - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0" - } - }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.5.161", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.161.tgz", - "integrity": "sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==", - "dev": true - }, - "emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true - }, - "encodeurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", - "dev": true - }, - "end-of-stream": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", - "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "^0.2.1" - } - }, - "es-define-property": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "dev": true - }, - "es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "dev": true - }, - "es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "dev": true, - "requires": { - "es-errors": "^1.3.0" - } - }, - "escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", - "dev": true - }, - "escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true - }, - "eslint": { - "version": "9.28.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.28.0.tgz", - "integrity": "sha512-ocgh41VhRlf9+fVpe7QKzwLj9c92fDiqOj8Y3Sd4/ZmVA4Btx4PlUYPq4pp9JDyupkf1upbEXecxL2mwNV7jPQ==", - "dev": true, - "requires": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.20.0", - "@eslint/config-helpers": "^0.2.1", - "@eslint/core": "^0.14.0", - "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.28.0", - "@eslint/plugin-kit": "^0.3.1", - "@humanfs/node": "^0.16.6", - "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.4.2", - "@types/estree": "^1.0.6", - "@types/json-schema": "^7.0.15", - "ajv": "^6.12.4", - "chalk": "^4.0.0", - "cross-spawn": "^7.0.6", - "debug": "^4.3.2", - "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.3.0", - "eslint-visitor-keys": "^4.2.0", - "espree": "^10.3.0", - "esquery": "^1.5.0", - "esutils": "^2.0.2", - "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^8.0.0", - "find-up": "^5.0.0", - "glob-parent": "^6.0.2", - "ignore": "^5.2.0", - "imurmurhash": "^0.1.4", - "is-glob": "^4.0.0", - "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", - "natural-compare": "^1.4.0", - "optionator": "^0.9.3" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true - }, - "file-entry-cache": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", - "dev": true, - "requires": { - "flat-cache": "^4.0.0" - } - }, - "find-up": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, - "requires": { - "locate-path": "^6.0.0", - "path-exists": "^4.0.0" - } - }, - "flat-cache": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", - "dev": true, - "requires": { - "flatted": "^3.2.9", - "keyv": "^4.5.4" - } - }, - "locate-path": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, - "requires": { - "p-locate": "^5.0.0" - } - }, - "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, - "requires": { - "yocto-queue": "^0.1.0" - } - }, - "p-locate": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, - "requires": { - "p-limit": "^3.0.2" - } - } - } - }, - "eslint-scope": { - "version": "8.3.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz", - "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==", - "dev": true, - "requires": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - } - }, - "eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true - }, - "espree": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz", - "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==", - "dev": true, - "requires": { - "acorn": "^8.14.0", - "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.0" - }, - "dependencies": { - "eslint-visitor-keys": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz", - "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==", - "dev": true - } - } - }, - "esquery": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", - "dev": true, - "requires": { - "estraverse": "^5.1.0" - } - }, - "esrecurse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, - "requires": { - "estraverse": "^5.2.0" - } - }, - "estraverse": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", - "dev": true - }, - "execall": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz", - "integrity": "sha512-0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==", - "dev": true, - "requires": { - "clone-regexp": "^2.1.0" - } - }, - "expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "dev": true, - "requires": { - "homedir-polyfill": "^1.0.1" - } - }, - "express": { - "version": "4.21.2", - "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz", - "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==", - "dev": true, - "requires": { - "accepts": "~1.3.8", - "array-flatten": "1.1.1", - "body-parser": "1.20.3", - "content-disposition": "0.5.4", - "content-type": "~1.0.4", - "cookie": "0.7.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "2.0.0", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "1.3.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "merge-descriptors": "1.0.3", - "methods": "~1.1.2", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "path-to-regexp": "0.1.12", - "proxy-addr": "~2.0.7", - "qs": "6.13.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.2.1", - "send": "0.19.0", - "serve-static": "1.16.2", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - }, - "safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "dev": true - } - } - }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", - "dev": true, - "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - } - }, - "fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "dev": true, - "requires": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - } - }, - "fast-deep-equal": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true - }, - "fast-fifo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", - "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "dev": true - }, - "fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "dependencies": { - "glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - } - } - }, - "fast-json-stable-stringify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true - }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true - }, - "fastest-levenshtein": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz", - "integrity": "sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==", - "dev": true - }, - "fastq": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz", - "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, - "file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, - "requires": { - "flat-cache": "^3.0.4" - } - }, - "fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "finalhandler": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "on-finished": "2.4.1", - "parseurl": "~1.3.3", - "statuses": "2.0.1", - "unpipe": "~1.0.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "findup-sync": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", - "dev": true, - "requires": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.3", - "micromatch": "^4.0.4", - "resolve-dir": "^1.0.1" - } - }, - "fined": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz", - "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0", - "object.pick": "^1.3.0", - "parse-filepath": "^1.0.2" - } - }, - "flagged-respawn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz", - "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==", - "dev": true - }, - "flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", - "dev": true, - "requires": { - "flatted": "^3.1.0", - "rimraf": "^3.0.2" - } - }, - "flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", - "dev": true - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true - }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, - "forwarded": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", - "dev": true - }, - "fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", - "dev": true - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", - "dev": true - }, - "fs-mkdirp-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz", - "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==", - "dev": true, - "requires": { - "graceful-fs": "^4.2.8", - "streamx": "^2.12.0" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "optional": true - }, - "function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true - }, - "get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true - }, - "get-intrinsic": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "dev": true, - "requires": { - "call-bind-apply-helpers": "^1.0.2", - "es-define-property": "^1.0.1", - "es-errors": "^1.3.0", - "es-object-atoms": "^1.1.1", - "function-bind": "^1.1.2", - "get-proto": "^1.0.1", - "gopd": "^1.2.0", - "has-symbols": "^1.1.0", - "hasown": "^2.0.2", - "math-intrinsics": "^1.1.0" - } - }, - "get-proto": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "dev": true, - "requires": { - "dunder-proto": "^1.0.1", - "es-object-atoms": "^1.0.0" - } - }, - "get-stdin": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz", - "integrity": "sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==", - "dev": true - }, - "glob-parent": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, - "requires": { - "is-glob": "^4.0.3" - } - }, - "glob-stream": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz", - "integrity": "sha512-R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==", - "dev": true, - "requires": { - "@gulpjs/to-absolute-glob": "^4.0.0", - "anymatch": "^3.1.3", - "fastq": "^1.13.0", - "glob-parent": "^6.0.2", - "is-glob": "^4.0.3", - "is-negated-glob": "^1.0.0", - "normalize-path": "^3.0.0", - "streamx": "^2.12.5" - } - }, - "glob-watcher": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz", - "integrity": "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==", - "dev": true, - "requires": { - "async-done": "^2.0.0", - "chokidar": "^3.5.3" - } - }, - "global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "requires": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - } - }, - "global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "dependencies": { - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "globals": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.2.0.tgz", - "integrity": "sha512-O+7l9tPdHCU320IigZZPj5zmRCFG9xHmx9cU8FqU2Rp+JN714seHV+2S9+JslCpY4gJwU2vOGox0wzgae/MCEg==", - "dev": true - }, - "globjoin": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", - "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", - "dev": true - }, - "glogg": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz", - "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==", - "dev": true, - "requires": { - "sparkles": "^2.1.0" - } - }, - "gopd": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "dev": true - }, - "graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true - }, - "gulp": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz", - "integrity": "sha512-S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg==", - "dev": true, - "requires": { - "glob-watcher": "^6.0.0", - "gulp-cli": "^3.0.0", - "undertaker": "^2.0.0", - "vinyl-fs": "^4.0.0" - } - }, - "gulp-cli": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz", - "integrity": "sha512-RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA==", - "dev": true, - "requires": { - "@gulpjs/messages": "^1.1.0", - "chalk": "^4.1.2", - "copy-props": "^4.0.0", - "gulplog": "^2.2.0", - "interpret": "^3.1.1", - "liftoff": "^5.0.0", - "mute-stdout": "^2.0.0", - "replace-homedir": "^2.0.0", - "semver-greatest-satisfied-range": "^2.0.0", - "string-width": "^4.2.3", - "v8flags": "^4.0.0", - "yargs": "^16.2.0" - } - }, - "gulp-concat": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", - "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==", - "dev": true, - "requires": { - "concat-with-sourcemaps": "^1.0.0", - "through2": "^2.0.0", - "vinyl": "^2.0.0" - }, - "dependencies": { - "replace-ext": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", - "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", - "dev": true - }, - "vinyl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", - "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", - "dev": true, - "requires": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - } - } - } - }, - "gulp-postcss": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz", - "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==", - "dev": true, - "requires": { - "fancy-log": "^1.3.3", - "plugin-error": "^1.0.1", - "postcss-load-config": "^3.0.0", - "vinyl-sourcemaps-apply": "^0.2.1" - } - }, - "gulp-rename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz", - "integrity": "sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==", - "dev": true - }, - "gulplog": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz", - "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==", - "dev": true, - "requires": { - "glogg": "^2.2.0" - } - }, - "hard-rejection": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", - "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==", - "dev": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true - }, - "has-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "dev": true - }, - "hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, - "requires": { - "function-bind": "^1.1.2" - } - }, - "homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "requires": { - "parse-passwd": "^1.0.0" - } - }, - "hosted-git-info": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.0.2.tgz", - "integrity": "sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==", - "dev": true, - "requires": { - "lru-cache": "^6.0.0" - } - }, - "html-tags": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.2.0.tgz", - "integrity": "sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==", - "dev": true - }, - "http_ece": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/http_ece/-/http_ece-1.1.0.tgz", - "integrity": "sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==", - "dev": true, - "requires": { - "urlsafe-base64": "~1.0.0" - } - }, - "http-errors": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", - "dev": true, - "requires": { - "depd": "2.0.0", - "inherits": "2.0.4", - "setprototypeof": "1.2.0", - "statuses": "2.0.1", - "toidentifier": "1.0.1" - } - }, - "iconv-lite": { - "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true - }, - "ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "dev": true - }, - "import-fresh": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", - "dev": true, - "requires": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - } - }, - "import-lazy": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz", - "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==", - "dev": true - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indent-string": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "^1.3.0", - "wrappy": "1" - } - }, - "inherits": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true - }, - "ini": { - "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", - "dev": true - }, - "interpret": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", - "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", - "dev": true - }, - "ipaddr.js": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", - "dev": true - }, - "is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "requires": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "dev": true, - "requires": { - "hasown": "^2.0.2" - } - }, - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - }, - "dependencies": { - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - } - } - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true - }, - "is-glob": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, - "requires": { - "is-extglob": "^2.1.1" - } - }, - "is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==", - "dev": true - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, - "is-plain-object": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", - "dev": true - }, - "is-regexp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz", - "integrity": "sha512-OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==", - "dev": true - }, - "is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, - "requires": { - "is-unc-path": "^1.0.0" - } - }, - "is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "requires": { - "unc-path-regex": "^0.1.2" - } - }, - "is-valid-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", - "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - }, - "js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, - "requires": { - "argparse": "^2.0.1" - } - }, - "json-buffer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true - }, - "json-parse-even-better-errors": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", - "dev": true - }, - "jsonwebtoken": { - "version": "9.0.2", - "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-9.0.2.tgz", - "integrity": "sha512-PRp66vJ865SSqOlgqS8hujT5U4AOgMfhrwYIuIhfKaoSCZcirrmASQr8CX7cUg+RMih+hgznrjp99o+W4pJLHQ==", - "dev": true, - "requires": { - "jws": "^3.2.2", - "lodash.includes": "^4.3.0", - "lodash.isboolean": "^3.0.3", - "lodash.isinteger": "^4.0.4", - "lodash.isnumber": "^3.0.3", - "lodash.isplainobject": "^4.0.6", - "lodash.isstring": "^4.0.1", - "lodash.once": "^4.0.0", - "ms": "^2.1.1", - "semver": "^7.5.4" - } - }, - "jwa": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jwa/-/jwa-1.4.1.tgz", - "integrity": "sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==", - "dev": true, - "requires": { - "buffer-equal-constant-time": "1.0.1", - "ecdsa-sig-formatter": "1.0.11", - "safe-buffer": "^5.0.1" - } - }, - "jws": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz", - "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==", - "dev": true, - "requires": { - "jwa": "^1.4.1", - "safe-buffer": "^5.0.1" - } - }, - "keyv": { - "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, - "requires": { - "json-buffer": "3.0.1" - } - }, - "known-css-properties": { - "version": "0.24.0", - "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.24.0.tgz", - "integrity": "sha512-RTSoaUAfLvpR357vWzAz/50Q/BmHfmE6ETSWfutT0AJiw10e6CmcdYRQJlLRd95B53D0Y2aD1jSxD3V3ySF+PA==", - "dev": true - }, - "last-run": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", - "integrity": "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==", - "dev": true - }, - "lead": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz", - "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==", - "dev": true - }, - "levn": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1", - "type-check": "~0.4.0" - } - }, - "liftoff": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.0.tgz", - "integrity": "sha512-a5BQjbCHnB+cy+gsro8lXJ4kZluzOijzJ1UVVfyJYZC+IP2pLv1h4+aysQeKuTmyO8NAqfyQAk4HWaP/HjcKTg==", - "dev": true, - "requires": { - "extend": "^3.0.2", - "findup-sync": "^5.0.0", - "fined": "^2.0.0", - "flagged-respawn": "^2.0.0", - "is-plain-object": "^5.0.0", - "rechoir": "^0.8.0", - "resolve": "^1.20.0" - } - }, - "lilconfig": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.0.5.tgz", - "integrity": "sha512-xaYmXZtTHPAw5m+xLN8ab9C+3a8YmV3asNSPOATITbtwrfbwaLJj8h66H1WMIpALCkqsIzK3h7oQ+PdX+LQ9Eg==", - "dev": true - }, - "lines-and-columns": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", - "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=", - "dev": true - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "lodash.includes": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.includes/-/lodash.includes-4.3.0.tgz", - "integrity": "sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==", - "dev": true - }, - "lodash.isboolean": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz", - "integrity": "sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==", - "dev": true - }, - "lodash.isinteger": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz", - "integrity": "sha512-DBwtEWN2caHQ9/imiNeEA5ys1JoRtRfY3d7V9wkqtbycnAmTvRRmbHKDV4a0EYc678/dia0jrte4tjYwVBaZUA==", - "dev": true - }, - "lodash.isnumber": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz", - "integrity": "sha512-QYqzpfwO3/CWf3XP+Z+tkQsfaLL/EnUlXWVkIk5FUPc4sBdTehEqZONuyRt2P67PXAk+NXmTBcc97zw9t1FQrw==", - "dev": true - }, - "lodash.isplainobject": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", - "dev": true - }, - "lodash.isstring": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz", - "integrity": "sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true - }, - "lodash.once": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz", - "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==", - "dev": true - }, - "lodash.truncate": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", - "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "requires": { - "yallist": "^4.0.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true - }, - "map-obj": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.2.1.tgz", - "integrity": "sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==", - "dev": true - }, - "math-intrinsics": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "dev": true - }, - "mathml-tag-names": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz", - "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==", - "dev": true - }, - "mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", - "dev": true - }, - "meow": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-9.0.0.tgz", - "integrity": "sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==", - "dev": true, - "requires": { - "@types/minimist": "^1.2.0", - "camelcase-keys": "^6.2.2", - "decamelize": "^1.2.0", - "decamelize-keys": "^1.1.0", - "hard-rejection": "^2.1.0", - "minimist-options": "4.1.0", - "normalize-package-data": "^3.0.0", - "read-pkg-up": "^7.0.1", - "redent": "^3.0.0", - "trim-newlines": "^3.0.0", - "type-fest": "^0.18.0", - "yargs-parser": "^20.2.3" - }, - "dependencies": { - "type-fest": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.18.1.tgz", - "integrity": "sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==", - "dev": true - } - } - }, - "merge-descriptors": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", - "dev": true - }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", - "dev": true - }, - "micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "dev": true, - "requires": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "mime-db": { - "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "dev": true - }, - "mime-types": { - "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "dev": true, - "requires": { - "mime-db": "1.52.0" - } - }, - "min-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz", - "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==", - "dev": true - }, - "minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", - "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", - "dev": true - }, - "minimist-options": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz", - "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==", - "dev": true, - "requires": { - "arrify": "^1.0.1", - "is-plain-obj": "^1.1.0", - "kind-of": "^6.0.3" - }, - "dependencies": { - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - } - } - }, - "mkdirp": { - "version": "0.5.6", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", - "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", - "dev": true, - "requires": { - "minimist": "^1.2.6" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "mute-stdout": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz", - "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==", - "dev": true - }, - "nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "dev": true - }, - "natural-compare": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", - "dev": true - }, - "negotiator": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "dev": true - }, - "node-persist": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-persist/-/node-persist-2.1.0.tgz", - "integrity": "sha512-NI30KmynAIpKtvl3XaLE/Q/hPUNfh2bFM0U9zgWyIVzBUL/fh1EMk2/rTAqWY6KXrX8jqusVA6avPJ6I2S9B4w==", - "dev": true, - "requires": { - "is-absolute": "^0.2.6", - "mkdirp": "~0.5.1", - "q": "~1.1.1" - }, - "dependencies": { - "is-absolute": { - "version": "0.2.6", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz", - "integrity": "sha512-7Kr05z5LkcOpoMvxHN1PC11WbPabdNFmMYYo0eZvWu3BfVS0T03yoqYDczoCBx17xqk2x1XAZrcKiFVL88jxlQ==", - "dev": true, - "requires": { - "is-relative": "^0.2.1", - "is-windows": "^0.2.0" - } - }, - "is-relative": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz", - "integrity": "sha512-9AMzjRmLqcue629b4ezEVSK6kJsYJlUIhMcygmYORUgwUNJiavHcC3HkaGx0XYpyVKQSOqFbMEZmW42cY87sYw==", - "dev": true, - "requires": { - "is-unc-path": "^0.1.1" - } - }, - "is-unc-path": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.2.tgz", - "integrity": "sha512-HhLc5VDMH4pu3oMtIuunz/DFQUIoR561kMME3U3Afhj8b7vH085vkIkemrz1kLXCEIuoMAmO3yVmafWdSbGW8w==", - "dev": true, - "requires": { - "unc-path-regex": "^0.1.0" - } - }, - "is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha512-n67eJYmXbniZB7RF4I/FTjK1s6RPOCTxhYrVYLRaCt3lF0mpWZPKr3T2LSZAqyjQsxR2qMmGYXXzK0YWwcPM1Q==", - "dev": true - } - } - }, - "node-releases": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz", - "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==", - "dev": true - }, - "normalize-package-data": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.2.tgz", - "integrity": "sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==", - "dev": true, - "requires": { - "hosted-git-info": "^4.0.1", - "resolve": "^1.20.0", - "semver": "^7.3.4", - "validate-npm-package-license": "^3.0.1" - } - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true - }, - "normalize-selector": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", - "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", - "dev": true - }, - "normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true - }, - "now-and-later": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz", - "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==", - "dev": true, - "requires": { - "once": "^1.4.0" - } - }, - "nth-check": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz", - "integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==", - "dev": true, - "requires": { - "boolbase": "^1.0.0" - } - }, - "object-inspect": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", - "dev": true - }, - "object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "dev": true, - "requires": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "requires": { - "isobject": "^3.0.1" - } - }, - "on-finished": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1" - } - }, - "optionator": { - "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", - "dev": true, - "requires": { - "deep-is": "^0.1.3", - "fast-levenshtein": "^2.0.6", - "levn": "^0.4.1", - "prelude-ls": "^1.2.1", - "type-check": "^0.4.0", - "word-wrap": "^1.2.5" - } - }, - "p-limit": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", - "dev": true, - "requires": { - "p-try": "^2.0.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "p-try": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", - "dev": true - }, - "parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "requires": { - "callsites": "^3.0.0" - } - }, - "parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "dev": true, - "requires": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - } - }, - "parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - } - }, - "parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true - }, - "parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true - }, - "parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true - }, - "path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true - }, - "path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "dev": true, - "requires": { - "path-root-regex": "^0.1.0" - } - }, - "path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "dev": true - }, - "path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true - }, - "picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true - }, - "picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true - }, - "plugin-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", - "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", - "dev": true, - "requires": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" - } - }, - "postcss": { - "version": "8.4.31", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", - "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==", - "dev": true, - "requires": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" - } - }, - "postcss-calc": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", - "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.9", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-colormin": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.0.tgz", - "integrity": "sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0", - "colord": "^2.9.1", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-convert-values": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz", - "integrity": "sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-discard-comments": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.1.tgz", - "integrity": "sha512-5JscyFmvkUxz/5/+TB3QTTT9Gi9jHkcn8dcmmuN68JQcv3aQg4y88yEHHhwFB52l/NkaJ43O0dbksGMAo49nfQ==", - "dev": true, - "requires": {} - }, - "postcss-discard-duplicates": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "dev": true, - "requires": {} - }, - "postcss-discard-empty": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", - "dev": true, - "requires": {} - }, - "postcss-discard-overridden": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "dev": true, - "requires": {} - }, - "postcss-load-config": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", - "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", - "dev": true, - "requires": { - "lilconfig": "^2.0.5", - "yaml": "^1.10.2" - } - }, - "postcss-media-query-parser": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", - "dev": true - }, - "postcss-merge-longhand": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.4.tgz", - "integrity": "sha512-hbqRRqYfmXoGpzYKeW0/NCZhvNyQIlQeWVSao5iKWdyx7skLvCfQFGIUsP9NUs3dSbPac2IC4Go85/zG+7MlmA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0", - "stylehacks": "^5.1.0" - } - }, - "postcss-merge-rules": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.1.tgz", - "integrity": "sha512-8wv8q2cXjEuCcgpIB1Xx1pIy8/rhMPIQqYKNzEdyx37m6gpq83mQQdCxgIkFgliyEnKvdwJf/C61vN4tQDq4Ww==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0", - "cssnano-utils": "^3.1.0", - "postcss-selector-parser": "^6.0.5" - } - }, - "postcss-minify-font-values": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", - "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-minify-gradients": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", - "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", - "dev": true, - "requires": { - "colord": "^2.9.1", - "cssnano-utils": "^3.1.0", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-minify-params": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.2.tgz", - "integrity": "sha512-aEP+p71S/urY48HWaRHasyx4WHQJyOYaKpQ6eXl8k0kxg66Wt/30VR6/woh8THgcpRbonJD5IeD+CzNhPi1L8g==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "cssnano-utils": "^3.1.0", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-minify-selectors": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz", - "integrity": "sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.5" - } - }, - "postcss-normalize-charset": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "dev": true, - "requires": {} - }, - "postcss-normalize-display-values": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", - "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-positions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz", - "integrity": "sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-repeat-style": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz", - "integrity": "sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-string": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", - "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-timing-functions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", - "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-unicode": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz", - "integrity": "sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", - "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", - "dev": true, - "requires": { - "normalize-url": "^6.0.1", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-normalize-whitespace": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", - "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-ordered-values": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.1.tgz", - "integrity": "sha512-7lxgXF0NaoMIgyihL/2boNAEZKiW0+HkMhdKMTD93CjW8TdCy2hSdj8lsAo+uwm7EDG16Da2Jdmtqpedl0cMfw==", - "dev": true, - "requires": { - "cssnano-utils": "^3.1.0", - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-reduce-initial": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz", - "integrity": "sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "caniuse-api": "^3.0.0" - } - }, - "postcss-reduce-transforms": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", - "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0" - } - }, - "postcss-resolve-nested-selector": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", - "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=", - "dev": true - }, - "postcss-safe-parser": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz", - "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==", - "dev": true, - "requires": {} - }, - "postcss-selector-parser": { - "version": "6.0.10", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz", - "integrity": "sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==", - "dev": true, - "requires": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - } - }, - "postcss-sorting": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-7.0.1.tgz", - "integrity": "sha512-iLBFYz6VRYyLJEJsBJ8M3TCqNcckVzz4wFounSc5Oez35ogE/X+aoC5fFu103Ot7NyvjU3/xqIXn93Gp3kJk4g==", - "dev": true, - "requires": {} - }, - "postcss-svgo": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", - "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", - "dev": true, - "requires": { - "postcss-value-parser": "^4.2.0", - "svgo": "^2.7.0" - } - }, - "postcss-unique-selectors": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", - "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", - "dev": true, - "requires": { - "postcss-selector-parser": "^6.0.5" - } - }, - "postcss-value-parser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", - "dev": true - }, - "prelude-ls": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true - }, - "proxy-addr": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", - "dev": true, - "requires": { - "forwarded": "0.2.0", - "ipaddr.js": "1.9.1" - } - }, - "ps-node": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/ps-node/-/ps-node-0.1.6.tgz", - "integrity": "sha512-w7QJhUTbu70hpDso0YXDRNKCPNuchV8UTUZsAv0m7Qj5g85oHOJfr9drA1EjvK4nQK/bG8P97W4L6PJ3IQLoOA==", - "dev": true, - "requires": { - "table-parser": "^0.1.3" - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "q": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/q/-/q-1.1.2.tgz", - "integrity": "sha512-ROtylwux7Vkc4C07oKE/ReigUmb33kVoLtcR4SJ1QVqwaZkBEDL3vX4/kwFzIERQ5PfCl0XafbU8u2YUhyGgVA==", - "dev": true - }, - "qs": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz", - "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==", - "dev": true, - "requires": { - "side-channel": "^1.0.6" - } - }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, - "queue-tick": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz", - "integrity": "sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==", - "dev": true - }, - "quick-lru": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz", - "integrity": "sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==", - "dev": true - }, - "range-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true - }, - "raw-body": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz", - "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==", - "dev": true, - "requires": { - "bytes": "3.1.2", - "http-errors": "2.0.0", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" - } - }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "hosted-git-info": { - "version": "2.8.9", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz", - "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==", - "dev": true - }, - "normalize-package-data": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", - "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", - "dev": true, - "requires": { - "hosted-git-info": "^2.1.4", - "resolve": "^1.10.0", - "semver": "2 || 3 || 4 || 5", - "validate-npm-package-license": "^3.0.1" - } - }, - "semver": { - "version": "5.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz", - "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==", - "dev": true - }, - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "requires": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - }, - "dependencies": { - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } - } - }, - "readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "requires": { - "picomatch": "^2.2.1" - } - }, - "rechoir": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "dev": true, - "requires": { - "resolve": "^1.20.0" - } - }, - "redent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", - "integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==", - "dev": true, - "requires": { - "indent-string": "^4.0.0", - "strip-indent": "^3.0.0" - } - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "dev": true - }, - "replace-homedir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz", - "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==", - "dev": true - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true - }, - "require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true - }, - "resolve": { - "version": "1.22.10", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz", - "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==", - "dev": true, - "requires": { - "is-core-module": "^2.16.0", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - } - }, - "resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "dev": true, - "requires": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - } - }, - "resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", - "dev": true - }, - "resolve-options": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz", - "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==", - "dev": true, - "requires": { - "value-or-function": "^4.0.0" - } - }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - }, - "dependencies": { - "glob": { - "version": "7.1.7", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz", - "integrity": "sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - } - } - }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true - }, - "semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", - "dev": true - }, - "semver-greatest-satisfied-range": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", - "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==", - "dev": true, - "requires": { - "sver": "^1.8.3" - } - }, - "send": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "2.0.0", - "destroy": "1.2.0", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "2.0.0", - "mime": "1.6.0", - "ms": "2.1.3", - "on-finished": "2.4.1", - "range-parser": "~1.2.1", - "statuses": "2.0.1" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", - "dev": true - } - } - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", - "dev": true - }, - "ms": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", - "dev": true - } - } - }, - "serve-static": { - "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", - "dev": true, - "requires": { - "encodeurl": "~2.0.0", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.19.0" - } - }, - "setprototypeof": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", - "dev": true - }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true - }, - "side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", - "side-channel-map": "^1.0.1", - "side-channel-weakmap": "^1.0.2" - } - }, - "side-channel-list": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", - "dev": true, - "requires": { - "es-errors": "^1.3.0", - "object-inspect": "^1.13.3" - } - }, - "side-channel-map": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", - "dev": true, - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3" - } - }, - "side-channel-weakmap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", - "dev": true, - "requires": { - "call-bound": "^1.0.2", - "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.5", - "object-inspect": "^1.13.3", - "side-channel-map": "^1.0.1" - } - }, - "signal-exit": { - "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "slice-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" - } - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", - "dev": true - }, - "sparkles": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz", - "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==", - "dev": true - }, - "spdx-correct": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", - "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", - "dev": true, - "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", - "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", - "dev": true, - "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz", - "integrity": "sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==", - "dev": true - }, - "specificity": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz", - "integrity": "sha512-1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==", - "dev": true - }, - "stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "dev": true - }, - "statuses": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", - "dev": true - }, - "stream-composer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", - "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==", - "dev": true, - "requires": { - "streamx": "^2.13.2" - } - }, - "stream-exhaust": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", - "dev": true - }, - "streamx": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.16.1.tgz", - "integrity": "sha512-m9QYj6WygWyWa3H1YY69amr4nVgy61xfjys7xO7kviL5rfIEc2naf+ewFiOA+aEJD7y0JO3h2GoiUv4TDwEGzQ==", - "dev": true, - "requires": { - "bare-events": "^2.2.0", - "fast-fifo": "^1.1.0", - "queue-tick": "^1.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.0" - } - }, - "string-width": { - "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, - "requires": { - "emoji-regex": "^8.0.0", - "is-fullwidth-code-point": "^3.0.0", - "strip-ansi": "^6.0.1" - } - }, - "strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.1" - } - }, - "strip-indent": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz", - "integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==", - "dev": true, - "requires": { - "min-indent": "^1.0.0" - } - }, - "strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true - }, - "style-search": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", - "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=", - "dev": true - }, - "stylehacks": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.0.tgz", - "integrity": "sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==", - "dev": true, - "requires": { - "browserslist": "^4.16.6", - "postcss-selector-parser": "^6.0.4" - } - }, - "stylelint": { - "version": "14.7.0", - "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.7.0.tgz", - "integrity": "sha512-vAVPAYaHhcexOiuvym0S64UWIIonMKgYz1Eh+SZgXKkKFLL+wwBzzWGH7Bdnk/HLyH3KlrX+tlisFdEG8ik+Lw==", - "dev": true, - "requires": { - "balanced-match": "^2.0.0", - "colord": "^2.9.2", - "cosmiconfig": "^7.0.1", - "css-functions-list": "^3.0.1", - "debug": "^4.3.4", - "execall": "^2.0.0", - "fast-glob": "^3.2.11", - "fastest-levenshtein": "^1.0.12", - "file-entry-cache": "^6.0.1", - "get-stdin": "^8.0.0", - "global-modules": "^2.0.0", - "globby": "^11.1.0", - "globjoin": "^0.1.4", - "html-tags": "^3.2.0", - "ignore": "^5.2.0", - "import-lazy": "^4.0.0", - "imurmurhash": "^0.1.4", - "is-plain-object": "^5.0.0", - "known-css-properties": "^0.24.0", - "mathml-tag-names": "^2.1.3", - "meow": "^9.0.0", - "micromatch": "^4.0.5", - "normalize-path": "^3.0.0", - "normalize-selector": "^0.2.0", - "picocolors": "^1.0.0", - "postcss": "^8.4.12", - "postcss-media-query-parser": "^0.2.3", - "postcss-resolve-nested-selector": "^0.1.1", - "postcss-safe-parser": "^6.0.0", - "postcss-selector-parser": "^6.0.10", - "postcss-value-parser": "^4.2.0", - "resolve-from": "^5.0.0", - "specificity": "^0.4.1", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1", - "style-search": "^0.1.0", - "supports-hyperlinks": "^2.2.0", - "svg-tags": "^1.0.0", - "table": "^6.8.0", - "v8-compile-cache": "^2.3.0", - "write-file-atomic": "^4.0.1" - }, - "dependencies": { - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "dev": true - }, - "balanced-match": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz", - "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==", - "dev": true - }, - "global-modules": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", - "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==", - "dev": true, - "requires": { - "global-prefix": "^3.0.0" - } - }, - "global-prefix": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", - "dev": true, - "requires": { - "ini": "^1.3.5", - "kind-of": "^6.0.2", - "which": "^1.3.1" - } - }, - "globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "dev": true, - "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - } - }, - "kind-of": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "dev": true - }, - "resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - } - } - }, - "stylelint-order": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-5.0.0.tgz", - "integrity": "sha512-OWQ7pmicXufDw5BlRqzdz3fkGKJPgLyDwD1rFY3AIEfIH/LQY38Vu/85v8/up0I+VPiuGRwbc2Hg3zLAsJaiyw==", - "dev": true, - "requires": { - "postcss": "^8.3.11", - "postcss-sorting": "^7.0.1" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "requires": { - "has-flag": "^4.0.0" - } - }, - "supports-hyperlinks": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz", - "integrity": "sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ==", - "dev": true, - "requires": { - "has-flag": "^4.0.0", - "supports-color": "^7.0.0" - } - }, - "supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "dev": true - }, - "sver": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz", - "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==", - "dev": true, - "requires": { - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "optional": true - } - } - }, - "svg-tags": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", - "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", - "dev": true - }, - "svgo": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", - "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", - "dev": true, - "requires": { - "@trysound/sax": "0.2.0", - "commander": "^7.2.0", - "css-select": "^4.1.3", - "css-tree": "^1.1.3", - "csso": "^4.2.0", - "picocolors": "^1.0.0", - "stable": "^0.1.8" - } - }, - "table": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/table/-/table-6.8.0.tgz", - "integrity": "sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==", - "dev": true, - "requires": { - "ajv": "^8.0.1", - "lodash.truncate": "^4.4.2", - "slice-ansi": "^4.0.0", - "string-width": "^4.2.3", - "strip-ansi": "^6.0.1" - }, - "dependencies": { - "ajv": { - "version": "8.11.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz", - "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==", - "dev": true, - "requires": { - "fast-deep-equal": "^3.1.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2", - "uri-js": "^4.2.2" - } - }, - "json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true - } - } - }, - "table-parser": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/table-parser/-/table-parser-0.1.3.tgz", - "integrity": "sha512-LCYeuvqqoPII3lzzYaXKbC3Forb+d2u4bNwhk/9FlivuGRxPE28YEWAYcujeSlLLDlMfvy29+WPybFJZFiKMYg==", - "dev": true, - "requires": { - "connected-domain": "^1.0.0" - } - }, - "teex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", - "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", - "dev": true, - "requires": { - "streamx": "^2.12.5" - } - }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - }, - "to-through": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz", - "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==", - "dev": true, - "requires": { - "streamx": "^2.12.5" - } - }, - "toidentifier": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "dev": true - }, - "trim-newlines": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-3.0.1.tgz", - "integrity": "sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==", - "dev": true - }, - "type-check": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, - "requires": { - "prelude-ls": "^1.2.1" - } - }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" - } - }, - "unc-path-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=", - "dev": true - }, - "undertaker": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz", - "integrity": "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==", - "dev": true, - "requires": { - "bach": "^2.0.1", - "fast-levenshtein": "^3.0.0", - "last-run": "^2.0.0", - "undertaker-registry": "^2.0.0" - }, - "dependencies": { - "fast-levenshtein": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz", - "integrity": "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==", - "dev": true, - "requires": { - "fastest-levenshtein": "^1.0.7" - } - } - } - }, - "undertaker-registry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz", - "integrity": "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", - "dev": true - }, - "update-browserslist-db": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", - "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", - "dev": true, - "requires": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - } - }, - "uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, - "requires": { - "punycode": "^2.1.0" - } - }, - "urlsafe-base64": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz", - "integrity": "sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==", - "dev": true - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", - "dev": true - }, - "v8-compile-cache": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", - "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", - "dev": true - }, - "v8flags": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz", - "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "dev": true, - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "value-or-function": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz", - "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==", - "dev": true - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "dev": true - }, - "vinyl": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz", - "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==", - "dev": true, - "requires": { - "clone": "^2.1.2", - "clone-stats": "^1.0.0", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" - } - }, - "vinyl-contents": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz", - "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==", - "dev": true, - "requires": { - "bl": "^5.0.0", - "vinyl": "^3.0.0" - } - }, - "vinyl-fs": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz", - "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==", - "dev": true, - "requires": { - "fs-mkdirp-stream": "^2.0.1", - "glob-stream": "^8.0.0", - "graceful-fs": "^4.2.11", - "iconv-lite": "^0.6.3", - "is-valid-glob": "^1.0.0", - "lead": "^4.0.0", - "normalize-path": "3.0.0", - "resolve-options": "^2.0.0", - "stream-composer": "^1.0.2", - "streamx": "^2.14.0", - "to-through": "^3.0.0", - "value-or-function": "^4.0.0", - "vinyl": "^3.0.0", - "vinyl-sourcemap": "^2.0.0" - }, - "dependencies": { - "iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - } - } - } - }, - "vinyl-sourcemap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz", - "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==", - "dev": true, - "requires": { - "convert-source-map": "^2.0.0", - "graceful-fs": "^4.2.10", - "now-and-later": "^3.0.0", - "streamx": "^2.12.5", - "vinyl": "^3.0.0", - "vinyl-contents": "^2.0.0" - }, - "dependencies": { - "convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true - } - } - }, - "vinyl-sourcemaps-apply": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", - "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=", - "dev": true, - "requires": { - "source-map": "^0.5.1" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "web-push-testing": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.1.1.tgz", - "integrity": "sha512-q+FcdmPeePLI7kwxIngl9jzOfqnbp8t5DD17tQ8j1VxdEtsYb8HAbaieZH5q7uudQn+LFniAn0V9xsOnFctV7Q==", - "dev": true, - "requires": { - "arg": "^5.0.1", - "express": "^4.17.2", - "http_ece": "^1.1.0", - "jsonwebtoken": "^9.0.0", - "node-persist": "^2.1.0", - "ps-node": "^0.1.6", - "urlsafe-base64": "^1.0.0" - } - }, - "which": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, - "requires": { - "isexe": "^2.0.0" - } - }, - "word-wrap": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", - "dev": true - }, - "wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "write-file-atomic": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.1.tgz", - "integrity": "sha512-nSKUxgAbyioruk6hU87QzVbY279oYT6uiwgDoujth2ju4mJ+TZau7SQBhtbTmUyuNYTuXnSyRn66FV0+eCgcrQ==", - "dev": true, - "requires": { - "imurmurhash": "^0.1.4", - "signal-exit": "^3.0.7" - } - }, - "xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true - }, - "y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, - "yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", - "dev": true - }, - "yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "requires": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - } - }, - "yargs-parser": { - "version": "20.2.7", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.7.tgz", - "integrity": "sha512-FiNkvbeHzB/syOjIUxFDCnhSfzAL8R5vs40MgLFBorXACCOAEaWu0gRZl14vG8MR9AOJIZbmkjhusqBYZ3HTHw==", - "dev": true - }, - "yocto-queue": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true - } } } From f8aa4cd828df4243153f18a42af8e692dc6b9d6c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 31 Dec 2025 22:42:47 +0100 Subject: [PATCH 1079/1214] [ticket/17599] Update setup-node to v6 PHPBB-17599 --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ddb18790600..319ddaf4edd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -226,7 +226,7 @@ jobs: .github/setup-ldap.sh - name: Setup node - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 20 - name: Setup node dependencies @@ -364,7 +364,7 @@ jobs: .github/setup-database.sh $DB $MYISAM - name: Setup node - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 20 - name: Setup node dependencies @@ -477,7 +477,7 @@ jobs: .github/setup-database.sh $DB $MYISAM - name: Setup node - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 20 - name: Setup node dependencies @@ -622,7 +622,7 @@ jobs: Set-MpPreference -ExclusionPath "${env:PGDATA}" # Exclude PGDATA directory from Windows Defender - name: Setup node - uses: actions/setup-node@v4 + uses: actions/setup-node@v6 with: node-version: 20 - name: Setup node dependencies From f37c21f9a170adca515e5359a22ae3d970eeb18a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 1 Jan 2026 11:04:45 +0100 Subject: [PATCH 1080/1214] [ticket/17599] Update web-push-testing to 1.2.2 PHPBB-17599 --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cd31fac7891..7394c87029a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6615,9 +6615,9 @@ } }, "node_modules/web-push-testing": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.2.1.tgz", - "integrity": "sha512-3fYaXTvivNWTU+viL7QtMmAdHWJd9eJt1da8mbY42Kg7aDfIQ9x6lZwdGqXCm1OtmqGt8M9awLEHaEHD8GFv3A==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.2.2.tgz", + "integrity": "sha512-UnrbIfg3Vjounhlqo4Ko30ZKXEdytK9r1a2l0Drrj4CjxqLE7v3nzfTX6aTKhtqwrO3i7uFTgvwY6l0Lr4aXMw==", "dev": true, "license": "MIT", "dependencies": { From a4ec8667f0e2d72155afa3c17785581f6ee5fa0f Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 1 Jan 2026 20:28:48 +0100 Subject: [PATCH 1081/1214] [ticket/17597] Remove not needed AVATAR after submit PHPBB-17597 --- phpBB/includes/acp/acp_users.php | 1 - phpBB/includes/ucp/ucp_profile.php | 1 - 2 files changed, 2 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 42680017131..a4b1e88d99b 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1908,7 +1908,6 @@ function main($id, $mode) 'MESSAGE_TITLE' => $language->lang('INFORMATION'), 'MESSAGE_TEXT' => $language->lang('USER_AVATAR_UPDATED'), - 'AVATAR' => $avatar_helper->get_template_vars($avatar), 'REFRESH_DATA' => [ 'time' => 3, 'url' => $this->u_action . '&u=' . $user_id, diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 93f98d613f2..cd950c7400d 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -676,7 +676,6 @@ function main($id, $mode) 'MESSAGE_TITLE' => $language->lang('INFORMATION'), 'MESSAGE_TEXT' => $language->lang('PROFILE_UPDATED'), - 'AVATAR' => $avatar_helper->get_template_vars($avatar), 'REFRESH_DATA' => [ 'time' => 3, 'url' => $this->u_action, From b314143fb9ac2ce0a7ee437ac2369f3a59e3879d Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 08:12:22 +0100 Subject: [PATCH 1082/1214] [ticket/17602] Remove unused calls to avatar_helper PHPBB-17602 --- phpBB/includes/acp/acp_users.php | 5 ----- phpBB/includes/ucp/ucp_profile.php | 5 ----- 2 files changed, 10 deletions(-) diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index a4b1e88d99b..358504ebb29 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1897,11 +1897,6 @@ function main($id, $mode) if ($request->is_ajax()) { - /** @var \phpbb\avatar\helper $avatar_helper */ - $avatar_helper = $phpbb_container->get('avatar.helper'); - - $avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true); - $json_response = new \phpbb\json_response; $json_response->send([ 'success' => true, diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index cd950c7400d..a8caee71214 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -665,11 +665,6 @@ function main($id, $mode) if ($request->is_ajax()) { - /** @var \phpbb\avatar\helper $avatar_helper */ - $avatar_helper = $phpbb_container->get('avatar.helper'); - - $avatar = $avatar_helper->get_user_avatar($user->data, 'USER_AVATAR', true); - $json_response = new \phpbb\json_response; $json_response->send(array( 'success' => true, From be075f9d1df2f80657d075fb3564f13ef7f4ff12 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 08:48:01 +0100 Subject: [PATCH 1083/1214] [ticket/17602] Ensure path ends with slash PHPBB-17602 --- tests/functional/manifest_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php index 0d94be0debf..57551a67e22 100644 --- a/tests/functional/manifest_test.php +++ b/tests/functional/manifest_test.php @@ -18,7 +18,7 @@ class phpbb_functional_manifest_test extends phpbb_functional_test_case { public function test_manifest() { - $url_path = preg_replace('#^(/.+)/$#', '$1', parse_url(self::$root_url, PHP_URL_PATH)); + $url_path = preg_replace('#^(/.+)/$#', '$1/', parse_url(self::$root_url, PHP_URL_PATH)); $expected = [ 'name' => 'yourdomain.com', From 902a91bc6d0bacf6a366021cc86045cbe261e938 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 08:48:13 +0100 Subject: [PATCH 1084/1214] [ticket/17602] Use dummy cache in check_ban_test to prevent caching issue PHPBB-17602 --- tests/session/check_ban_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/session/check_ban_test.php b/tests/session/check_ban_test.php index d89201638bb..9efaaf0a42d 100644 --- a/tests/session/check_ban_test.php +++ b/tests/session/check_ban_test.php @@ -75,7 +75,7 @@ protected function setUp(): void // the mock cache object does not hit the database as is needed // for this test. $cache = new \phpbb\cache\service( - new \phpbb\cache\driver\file(), + new \phpbb\cache\driver\dummy(), $config, $this->db, $phpbb_dispatcher, From 6ebd8cdfcd34e1687591d9c0c49f9e9d90a9a548 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 08:50:24 +0100 Subject: [PATCH 1085/1214] [ticket/17602] Do not rely on rewrite in functional tests PHPBB-17602 --- tests/functional/viewonline_test.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php index f6b1ad7f707..5887d36c5ba 100644 --- a/tests/functional/viewonline_test.php +++ b/tests/functional/viewonline_test.php @@ -57,7 +57,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'members/online'); + $crawler = self::request('GET', 'app.php/members/online'); // Make sure posting reply page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text()); @@ -72,7 +72,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'members/online'); + $crawler = self::request('GET', 'app.php/members/online'); // Make sure posting message page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); @@ -88,7 +88,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'members/online'); + $crawler = self::request('GET', 'app.php/members/online'); // Make sure posting message page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); @@ -102,7 +102,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'members/online'); + $crawler = self::request('GET', 'app.php/members/online'); // Make sure reading topic page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text()); @@ -116,7 +116,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'members/online'); + $crawler = self::request('GET', 'app.php/members/online'); // Make sure reading forum page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text()); From 953426b7529fd8cbe68a5313361322dc8b0297a4 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 09:01:03 +0100 Subject: [PATCH 1086/1214] [ticket/17602] Add sanity check to avatar twig extension PHPBB-17602 --- phpBB/phpbb/template/twig/extension/avatar.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/template/twig/extension/avatar.php b/phpBB/phpbb/template/twig/extension/avatar.php index 5a1678cdc88..753fa07b257 100644 --- a/phpBB/phpbb/template/twig/extension/avatar.php +++ b/phpBB/phpbb/template/twig/extension/avatar.php @@ -73,13 +73,19 @@ public function get_avatar(environment $environment, array $row): string { try { + // Quickly return if required data is missing + if (!isset($row['src'], $row['width'], $row['height'], $row['title'])) + { + return ''; + } + return $environment->render('macros/avatar.twig', [ - 'SRC' => $row['lazy'] ? $this->avatar_helper->get_no_avatar_source() : $row['src'], - 'DATA_SRC' => $row['lazy'] ? $row['src'] : '', + 'SRC' => !empty($row['lazy']) ? $this->avatar_helper->get_no_avatar_source() : $row['src'], + 'DATA_SRC' => !empty($row['lazy']) ? $row['src'] : '', 'WIDTH' => $row['width'], 'HEIGHT' => $row['height'], 'TITLE' => $row['title'], - 'LAZY' => $row['lazy'], + 'LAZY' => $row['lazy'] ?? false, ]); } catch (Error $e) From a6ee14e0663fa080630ea3b786674c6d10c579d1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 09:11:55 +0100 Subject: [PATCH 1087/1214] [ticket/17603] Remove unused gulpfile PHPBB-17603 --- gulpfile.js | 69 ----------------------------------------------------- 1 file changed, 69 deletions(-) delete mode 100644 gulpfile.js diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 42f56a1305c..00000000000 --- a/gulpfile.js +++ /dev/null @@ -1,69 +0,0 @@ -'use strict'; - -const gulp = require('gulp'); -const rename = require('gulp-rename'); -const concat = require('gulp-concat'); -const postcss = require('gulp-postcss'); -const autoprefixer = require('autoprefixer'); -const cssnano = require('cssnano'); -const sorting = require('postcss-sorting'); -const sortOrder = require('./.postcss-sorting.json'); - -// Config -const paths = { - styles: { - src: './phpBB/styles/prosilver/theme/*.css', - css: './phpBB/styles/prosilver/theme/', - }, -}; - -function styles() { - return gulp.src(paths.styles.src, { sourcemaps: true }) - .pipe( - postcss([ - autoprefixer(), - sorting(sortOrder), - ]), - ) - .pipe(gulp.dest(paths.styles.css, { sourcemaps: './' })); -} - -function minify() { - return gulp.src([ - paths.styles.css + 'normalize.css', - paths.styles.css + 'base.css', - paths.styles.css + 'utilities.css', - paths.styles.css + 'icons.css', - paths.styles.css + 'common.css', - paths.styles.css + 'buttons.css', - paths.styles.css + 'links.css', - paths.styles.css + 'mentions.css', - paths.styles.css + 'content.css', - paths.styles.css + 'cp.css', - paths.styles.css + 'forms.css', - paths.styles.css + 'colours.css', - paths.styles.css + 'responsive.css', - paths.styles.css + 'bidi.css', - ], { sourcemaps: true }) - .pipe(concat('stylesheet.css')) - .pipe( - postcss([ - cssnano(), - ]), - ) - .pipe(rename({ - suffix: '.min', - extname: '.css', - })) - .pipe(gulp.dest(paths.styles.css, { sourcemaps: './' })); -} - -function watch() { - gulp.watch(paths.styles.src, styles); -} - -exports.style = styles; -exports.minify = minify; -exports.watch = watch; - -exports.default = gulp.series(styles, minify, watch); From 27eb92547850aadaa5d24da2b00e783854de3f96 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 09:20:31 +0100 Subject: [PATCH 1088/1214] [ticket/17603] Remove unused packages and update globals PHPBB-17603 --- package-lock.json | 2969 ++------------------------------------------- package.json | 10 +- 2 files changed, 118 insertions(+), 2861 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7394c87029a..add3d4534d4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,16 +9,8 @@ "version": "4.0.0-dev", "license": "GPL-2.0", "devDependencies": { - "autoprefixer": "^10.4.4", - "cssnano": "^5.1.7", "eslint": "^9.28.0", - "globals": "^16.2.0", - "gulp": "^5.0.0", - "gulp-concat": "^2.6.1", - "gulp-postcss": "^9.0.1", - "gulp-rename": "^2.0.0", - "postcss": "^8.4.31", - "postcss-sorting": "^7.0.1", + "globals": "^17.0.0", "stylelint": "^14.7.0", "stylelint-order": "^5.0.0", "web-push-testing": "^1.1.1" @@ -223,29 +215,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/@gulpjs/messages": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@gulpjs/messages/-/messages-1.1.0.tgz", - "integrity": "sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/@gulpjs/to-absolute-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz", - "integrity": "sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-negated-glob": "^1.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/@humanfs/core": { "version": "0.19.1", "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", @@ -336,16 +305,6 @@ "node": ">= 8" } }, - "node_modules/@trysound/sax": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", - "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -435,32 +394,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ansi-colors": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ansi-gray": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", - "integrity": "sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-wrap": "0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -487,30 +420,6 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/ansi-wrap": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", - "integrity": "sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "dev": true, - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/arg": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", @@ -525,36 +434,6 @@ "dev": true, "license": "Python-2.0" }, - "node_modules/arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/array-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -562,16 +441,6 @@ "dev": true, "license": "MIT" }, - "node_modules/array-slice": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz", - "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/array-union": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", @@ -592,16 +461,6 @@ "node": ">=0.10.0" } }, - "node_modules/assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/astral-regex": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", @@ -612,101 +471,6 @@ "node": ">=8" } }, - "node_modules/async-done": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz", - "integrity": "sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==", - "dev": true, - "license": "MIT", - "dependencies": { - "end-of-stream": "^1.4.4", - "once": "^1.4.0", - "stream-exhaust": "^1.0.2" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/async-settle": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz", - "integrity": "sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==", - "dev": true, - "license": "MIT", - "dependencies": { - "async-done": "^2.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/autoprefixer": { - "version": "10.4.23", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.23.tgz", - "integrity": "sha512-YYTXSFulfwytnjAPlw8QHncHJmlvFKtczb8InXaAx9Q0LbfDnfEYDE55omerIJKihhmU61Ft+cAOSzQVaBUmeA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/autoprefixer" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "browserslist": "^4.28.1", - "caniuse-lite": "^1.0.30001760", - "fraction.js": "^5.3.4", - "picocolors": "^1.1.1", - "postcss-value-parser": "^4.2.0" - }, - "bin": { - "autoprefixer": "bin/autoprefixer" - }, - "engines": { - "node": "^10 || ^12 || >=14" - }, - "peerDependencies": { - "postcss": "^8.1.0" - } - }, - "node_modules/b4a": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.7.3.tgz", - "integrity": "sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==", - "dev": true, - "license": "Apache-2.0", - "peerDependencies": { - "react-native-b4a": "*" - }, - "peerDependenciesMeta": { - "react-native-b4a": { - "optional": true - } - } - }, - "node_modules/bach": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz", - "integrity": "sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==", - "dev": true, - "license": "MIT", - "dependencies": { - "async-done": "^2.0.0", - "async-settle": "^2.0.0", - "now-and-later": "^3.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -714,92 +478,6 @@ "dev": true, "license": "MIT" }, - "node_modules/bare-events": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz", - "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==", - "dev": true, - "license": "Apache-2.0", - "peerDependencies": { - "bare-abort-controller": "*" - }, - "peerDependenciesMeta": { - "bare-abort-controller": { - "optional": true - } - } - }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, - "node_modules/baseline-browser-mapping": { - "version": "2.9.11", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.9.11.tgz", - "integrity": "sha512-Sg0xJUNDU1sJNGdfGWhVHX0kkZ+HWcvmVymJbj6NSgZZmW/8S9Y2HQ5euytnIgakgxN6papOAWiwDo1ctFDcoQ==", - "dev": true, - "license": "Apache-2.0", - "bin": { - "baseline-browser-mapping": "dist/cli.js" - } - }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/bl": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz", - "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "buffer": "^6.0.3", - "inherits": "^2.0.4", - "readable-stream": "^3.4.0" - } - }, - "node_modules/bl/node_modules/readable-stream": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/body-parser": { "version": "1.20.4", "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", @@ -855,13 +533,6 @@ "dev": true, "license": "MIT" }, - "node_modules/boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", - "dev": true, - "license": "ISC" - }, "node_modules/brace-expansion": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", @@ -886,65 +557,6 @@ "node": ">=8" } }, - "node_modules/browserslist": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", - "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "baseline-browser-mapping": "^2.9.0", - "caniuse-lite": "^1.0.30001759", - "electron-to-chromium": "^1.5.263", - "node-releases": "^2.0.27", - "update-browserslist-db": "^1.2.0" - }, - "bin": { - "browserslist": "cli.js" - }, - "engines": { - "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" - } - }, - "node_modules/buffer": { - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", - "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" - } - }, "node_modules/buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -1031,44 +643,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/caniuse-api": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.0.0", - "caniuse-lite": "^1.0.0", - "lodash.memoize": "^4.1.2", - "lodash.uniq": "^4.5.0" - } - }, - "node_modules/caniuse-lite": { - "version": "1.0.30001762", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001762.tgz", - "integrity": "sha512-PxZwGNvH7Ak8WX5iXzoK1KPZttBXNPuaOvI2ZYU7NrlM+d9Ov+TUvlLOBNGzVXAntMSMMlJPd+jY6ovrVjSmUw==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/caniuse-lite" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "CC-BY-4.0" - }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", "dependencies": { @@ -1082,95 +660,6 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, - "node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "dev": true, - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "dev": true, - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/cliui": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^7.0.0" - } - }, - "node_modules/clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8" - } - }, - "node_modules/clone-buffer": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", - "integrity": "sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/clone-stats": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", - "integrity": "sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==", - "dev": true, - "license": "MIT" - }, - "node_modules/cloneable-readable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz", - "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "inherits": "^2.0.1", - "process-nextick-args": "^2.0.0", - "readable-stream": "^2.3.5" - } - }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -1191,16 +680,6 @@ "dev": true, "license": "MIT" }, - "node_modules/color-support": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", - "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", - "dev": true, - "license": "ISC", - "bin": { - "color-support": "bin.js" - } - }, "node_modules/colord": { "version": "2.9.3", "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", @@ -1208,16 +687,6 @@ "dev": true, "license": "MIT" }, - "node_modules/commander": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", - "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -1225,16 +694,6 @@ "dev": true, "license": "MIT" }, - "node_modules/concat-with-sourcemaps": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz", - "integrity": "sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==", - "dev": true, - "license": "ISC", - "dependencies": { - "source-map": "^0.6.1" - } - }, "node_modules/connected-domain": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/connected-domain/-/connected-domain-1.0.0.tgz", @@ -1286,13 +745,6 @@ "node": ">= 0.6" } }, - "node_modules/convert-source-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", - "dev": true, - "license": "MIT" - }, "node_modules/cookie": { "version": "0.7.2", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", @@ -1310,27 +762,6 @@ "dev": true, "license": "MIT" }, - "node_modules/copy-props": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-4.0.0.tgz", - "integrity": "sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==", - "dev": true, - "license": "MIT", - "dependencies": { - "each-props": "^3.0.0", - "is-plain-object": "^5.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/core-util-is": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", - "dev": true, - "license": "MIT" - }, "node_modules/cosmiconfig": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", @@ -1363,19 +794,6 @@ "node": ">= 8" } }, - "node_modules/css-declaration-sorter": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz", - "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==", - "dev": true, - "license": "ISC", - "engines": { - "node": "^10 || ^12 || >=14" - }, - "peerDependencies": { - "postcss": "^8.0.9" - } - }, "node_modules/css-functions-list": { "version": "3.2.3", "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.3.tgz", @@ -1386,50 +804,6 @@ "node": ">=12 || >=16" } }, - "node_modules/css-select": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz", - "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "boolbase": "^1.0.0", - "css-what": "^6.0.1", - "domhandler": "^4.3.1", - "domutils": "^2.8.0", - "nth-check": "^2.0.1" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, - "node_modules/css-tree": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz", - "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "mdn-data": "2.0.14", - "source-map": "^0.6.1" - }, - "engines": { - "node": ">=8.0.0" - } - }, - "node_modules/css-what": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", - "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", - "dev": true, - "license": "BSD-2-Clause", - "engines": { - "node": ">= 6" - }, - "funding": { - "url": "https://github.com/sponsors/fb55" - } - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -1443,98 +817,6 @@ "node": ">=4" } }, - "node_modules/cssnano": { - "version": "5.1.15", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz", - "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==", - "dev": true, - "license": "MIT", - "dependencies": { - "cssnano-preset-default": "^5.2.14", - "lilconfig": "^2.0.3", - "yaml": "^1.10.2" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/cssnano" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/cssnano-preset-default": { - "version": "5.2.14", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz", - "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==", - "dev": true, - "license": "MIT", - "dependencies": { - "css-declaration-sorter": "^6.3.1", - "cssnano-utils": "^3.1.0", - "postcss-calc": "^8.2.3", - "postcss-colormin": "^5.3.1", - "postcss-convert-values": "^5.1.3", - "postcss-discard-comments": "^5.1.2", - "postcss-discard-duplicates": "^5.1.0", - "postcss-discard-empty": "^5.1.1", - "postcss-discard-overridden": "^5.1.0", - "postcss-merge-longhand": "^5.1.7", - "postcss-merge-rules": "^5.1.4", - "postcss-minify-font-values": "^5.1.0", - "postcss-minify-gradients": "^5.1.1", - "postcss-minify-params": "^5.1.4", - "postcss-minify-selectors": "^5.2.1", - "postcss-normalize-charset": "^5.1.0", - "postcss-normalize-display-values": "^5.1.0", - "postcss-normalize-positions": "^5.1.1", - "postcss-normalize-repeat-style": "^5.1.1", - "postcss-normalize-string": "^5.1.0", - "postcss-normalize-timing-functions": "^5.1.0", - "postcss-normalize-unicode": "^5.1.1", - "postcss-normalize-url": "^5.1.0", - "postcss-normalize-whitespace": "^5.1.1", - "postcss-ordered-values": "^5.1.3", - "postcss-reduce-initial": "^5.1.2", - "postcss-reduce-transforms": "^5.1.0", - "postcss-svgo": "^5.1.0", - "postcss-unique-selectors": "^5.1.1" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/cssnano-utils": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz", - "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/csso": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz", - "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==", - "dev": true, - "license": "MIT", - "dependencies": { - "css-tree": "^1.1.2" - }, - "engines": { - "node": ">=8.0.0" - } - }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -1618,16 +900,6 @@ "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/detect-file": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/dir-glob": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", @@ -1641,65 +913,6 @@ "node": ">=8" } }, - "node_modules/dom-serializer": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz", - "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==", - "dev": true, - "license": "MIT", - "dependencies": { - "domelementtype": "^2.0.1", - "domhandler": "^4.2.0", - "entities": "^2.0.0" - }, - "funding": { - "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1" - } - }, - "node_modules/domelementtype": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/fb55" - } - ], - "license": "BSD-2-Clause" - }, - "node_modules/domhandler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz", - "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "domelementtype": "^2.2.0" - }, - "engines": { - "node": ">= 4" - }, - "funding": { - "url": "https://github.com/fb55/domhandler?sponsor=1" - } - }, - "node_modules/domutils": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz", - "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "dom-serializer": "^1.0.1", - "domelementtype": "^2.2.0", - "domhandler": "^4.2.0" - }, - "funding": { - "url": "https://github.com/fb55/domutils?sponsor=1" - } - }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -1715,20 +928,6 @@ "node": ">= 0.4" } }, - "node_modules/each-props": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/each-props/-/each-props-3.0.0.tgz", - "integrity": "sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/ecdsa-sig-formatter": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", @@ -1746,13 +945,6 @@ "dev": true, "license": "MIT" }, - "node_modules/electron-to-chromium": { - "version": "1.5.267", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.267.tgz", - "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==", - "dev": true, - "license": "ISC" - }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -1770,26 +962,6 @@ "node": ">= 0.8" } }, - "node_modules/end-of-stream": { - "version": "1.4.5", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz", - "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - } - }, - "node_modules/entities": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true, - "license": "BSD-2-Clause", - "funding": { - "url": "https://github.com/fb55/entities?sponsor=1" - } - }, "node_modules/error-ex": { "version": "1.3.4", "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", @@ -1833,16 +1005,6 @@ "node": ">= 0.4" } }, - "node_modules/escalade": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -2027,29 +1189,6 @@ "node": ">= 0.6" } }, - "node_modules/events-universal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz", - "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "bare-events": "^2.7.0" - } - }, - "node_modules/expand-tilde": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", - "dev": true, - "license": "MIT", - "dependencies": { - "homedir-polyfill": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/express": { "version": "4.22.1", "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", @@ -2135,43 +1274,6 @@ ], "license": "MIT" }, - "node_modules/extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true, - "license": "MIT" - }, - "node_modules/extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/fancy-log": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz", - "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-gray": "^0.1.1", - "color-support": "^1.1.3", - "parse-node-version": "^1.0.0", - "time-stamp": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -2179,13 +1281,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-fifo": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", - "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", - "dev": true, - "license": "MIT" - }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", @@ -2346,49 +1441,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/findup-sync": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "detect-file": "^1.0.0", - "is-glob": "^4.0.3", - "micromatch": "^4.0.4", - "resolve-dir": "^1.0.1" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/fined": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fined/-/fined-2.0.0.tgz", - "integrity": "sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==", - "dev": true, - "license": "MIT", - "dependencies": { - "expand-tilde": "^2.0.2", - "is-plain-object": "^5.0.0", - "object.defaults": "^1.1.0", - "object.pick": "^1.3.0", - "parse-filepath": "^1.0.2" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/flagged-respawn": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-2.0.0.tgz", - "integrity": "sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/flat-cache": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", @@ -2410,29 +1462,6 @@ "dev": true, "license": "ISC" }, - "node_modules/for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", - "dev": true, - "license": "MIT", - "dependencies": { - "for-in": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/forwarded": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", @@ -2443,20 +1472,6 @@ "node": ">= 0.6" } }, - "node_modules/fraction.js": { - "version": "5.3.4", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz", - "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "*" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/rawify" - } - }, "node_modules/fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", @@ -2467,20 +1482,6 @@ "node": ">= 0.6" } }, - "node_modules/fs-mkdirp-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz", - "integrity": "sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.8", - "streamx": "^2.12.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -2488,21 +1489,6 @@ "dev": true, "license": "ISC" }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -2513,16 +1499,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "dev": true, - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" - } - }, "node_modules/get-intrinsic": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", @@ -2597,89 +1573,10 @@ "node": ">=10.13.0" } }, - "node_modules/glob-stream": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.3.tgz", - "integrity": "sha512-fqZVj22LtFJkHODT+M4N1RJQ3TjnnQhfE9GwZI8qXscYarnhpip70poMldRnP8ipQ/w0B621kOhfc53/J9bd/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "@gulpjs/to-absolute-glob": "^4.0.0", - "anymatch": "^3.1.3", - "fastq": "^1.13.0", - "glob-parent": "^6.0.2", - "is-glob": "^4.0.3", - "is-negated-glob": "^1.0.0", - "normalize-path": "^3.0.0", - "streamx": "^2.12.5" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/glob-watcher": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz", - "integrity": "sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==", - "dev": true, - "license": "MIT", - "dependencies": { - "async-done": "^2.0.0", - "chokidar": "^3.5.3" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/global-modules": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", - "dev": true, - "license": "MIT", - "dependencies": { - "global-prefix": "^1.0.1", - "is-windows": "^1.0.1", - "resolve-dir": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/global-prefix": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", - "dev": true, - "license": "MIT", - "dependencies": { - "expand-tilde": "^2.0.2", - "homedir-polyfill": "^1.0.1", - "ini": "^1.3.4", - "is-windows": "^1.0.1", - "which": "^1.2.14" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/global-prefix/node_modules/which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "isexe": "^2.0.0" - }, - "bin": { - "which": "bin/which" - } - }, "node_modules/globals": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", - "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", + "version": "17.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.0.0.tgz", + "integrity": "sha512-gv5BeD2EssA793rlFWVPMMCqefTlpusw6/2TbAVMy0FzcG8wKJn4O+NqJ4+XWmmwrayJgw5TzrmWjFgmz1XPqw==", "dev": true, "license": "MIT", "engines": { @@ -2717,19 +1614,6 @@ "dev": true, "license": "MIT" }, - "node_modules/glogg": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz", - "integrity": "sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==", - "dev": true, - "license": "MIT", - "dependencies": { - "sparkles": "^2.1.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/gopd": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", @@ -2743,116 +1627,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/gulp": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/gulp/-/gulp-5.0.1.tgz", - "integrity": "sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==", - "dev": true, - "license": "MIT", - "dependencies": { - "glob-watcher": "^6.0.0", - "gulp-cli": "^3.1.0", - "undertaker": "^2.0.0", - "vinyl-fs": "^4.0.2" - }, - "bin": { - "gulp": "bin/gulp.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/gulp-cli": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.1.0.tgz", - "integrity": "sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@gulpjs/messages": "^1.1.0", - "chalk": "^4.1.2", - "copy-props": "^4.0.0", - "gulplog": "^2.2.0", - "interpret": "^3.1.1", - "liftoff": "^5.0.1", - "mute-stdout": "^2.0.0", - "replace-homedir": "^2.0.0", - "semver-greatest-satisfied-range": "^2.0.0", - "string-width": "^4.2.3", - "v8flags": "^4.0.0", - "yargs": "^16.2.0" - }, - "bin": { - "gulp": "bin/gulp.js" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/gulp-concat": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz", - "integrity": "sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==", - "dev": true, - "license": "MIT", - "dependencies": { - "concat-with-sourcemaps": "^1.0.0", - "through2": "^2.0.0", - "vinyl": "^2.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/gulp-postcss": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/gulp-postcss/-/gulp-postcss-9.0.1.tgz", - "integrity": "sha512-9QUHam5JyXwGUxaaMvoFQVT44tohpEFpM8xBdPfdwTYGM0AItS1iTQz0MpsF8Jroh7GF5Jt2GVPaYgvy8qD2Fw==", - "dev": true, - "license": "MIT", - "dependencies": { - "fancy-log": "^1.3.3", - "plugin-error": "^1.0.1", - "postcss-load-config": "^3.0.0", - "vinyl-sourcemaps-apply": "^0.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - }, - "peerDependencies": { - "postcss": "^8.0.0" - } - }, - "node_modules/gulp-rename": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.1.0.tgz", - "integrity": "sha512-dGuzuH8jQGqCMqC544IEPhs5+O2l+IkdoSZsgd4kY97M1CxQeI3qrmweQBIrxLBbjbe/8uEWK8HHcNBc3OCy4g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/gulplog": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-2.2.0.tgz", - "integrity": "sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==", - "dev": true, - "license": "MIT", - "dependencies": { - "glogg": "^2.2.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/hard-rejection": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", @@ -2899,19 +1673,6 @@ "node": ">= 0.4" } }, - "node_modules/homedir-polyfill": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", - "dev": true, - "license": "MIT", - "dependencies": { - "parse-passwd": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/hosted-git-info": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz", @@ -2969,40 +1730,6 @@ "url": "https://opencollective.com/express" } }, - "node_modules/iconv-lite": { - "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "dev": true, - "license": "MIT", - "dependencies": { - "safer-buffer": ">= 2.1.2 < 3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "BSD-3-Clause" - }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -3086,16 +1813,6 @@ "dev": true, "license": "ISC" }, - "node_modules/interpret": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-3.1.1.tgz", - "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", @@ -3106,40 +1823,13 @@ "node": ">= 0.10" } }, - "node_modules/is-absolute": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-relative": "^1.0.0", - "is-windows": "^1.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "node_modules/is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true, "license": "MIT" }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", @@ -3156,32 +1846,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-plain-object": "^2.0.4" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-extendable/node_modules/is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -3215,16 +1879,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-negated-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz", - "integrity": "sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", @@ -3255,59 +1909,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-relative": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-unc-path": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-unc-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "unc-path-regex": "^0.1.2" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-valid-glob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz", - "integrity": "sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", - "dev": true, - "license": "MIT" - }, "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", @@ -3315,16 +1916,6 @@ "dev": true, "license": "ISC" }, - "node_modules/isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -3446,26 +2037,6 @@ "dev": true, "license": "MIT" }, - "node_modules/last-run": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz", - "integrity": "sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/lead": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz", - "integrity": "sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -3480,35 +2051,6 @@ "node": ">= 0.8.0" } }, - "node_modules/liftoff": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-5.0.1.tgz", - "integrity": "sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "extend": "^3.0.2", - "findup-sync": "^5.0.0", - "fined": "^2.0.0", - "flagged-respawn": "^2.0.0", - "is-plain-object": "^5.0.0", - "rechoir": "^0.8.0", - "resolve": "^1.20.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/lilconfig": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz", - "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - } - }, "node_modules/lines-and-columns": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", @@ -3574,13 +2116,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", - "dev": true, - "license": "MIT" - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -3602,13 +2137,6 @@ "dev": true, "license": "MIT" }, - "node_modules/lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", - "dev": true, - "license": "MIT" - }, "node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -3622,16 +2150,6 @@ "node": ">=10" } }, - "node_modules/map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/map-obj": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz", @@ -3666,13 +2184,6 @@ "url": "https://github.com/sponsors/wooorm" } }, - "node_modules/mdn-data": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz", - "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==", - "dev": true, - "license": "CC0-1.0" - }, "node_modules/media-typer": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", @@ -3858,16 +2369,6 @@ "dev": true, "license": "MIT" }, - "node_modules/mute-stdout": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-2.0.0.tgz", - "integrity": "sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/nanoid": { "version": "3.3.11", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", @@ -3966,13 +2467,6 @@ "node": ">=0.10.0" } }, - "node_modules/node-releases": { - "version": "2.0.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", - "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", - "dev": true, - "license": "MIT" - }, "node_modules/normalize-package-data": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz", @@ -3999,45 +2493,6 @@ "node": ">=0.10.0" } }, - "node_modules/normalize-url": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz", - "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/now-and-later": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz", - "integrity": "sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==", - "dev": true, - "license": "MIT", - "dependencies": { - "once": "^1.4.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/nth-check": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "boolbase": "^1.0.0" - }, - "funding": { - "url": "https://github.com/fb55/nth-check?sponsor=1" - } - }, "node_modules/object-inspect": { "version": "1.13.4", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", @@ -4051,35 +2506,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/object.defaults": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", - "dev": true, - "license": "MIT", - "dependencies": { - "array-each": "^1.0.1", - "array-slice": "^1.0.0", - "for-own": "^1.0.0", - "isobject": "^3.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "isobject": "^3.0.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -4164,660 +2590,157 @@ } }, "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", - "dev": true, - "license": "MIT", - "dependencies": { - "callsites": "^3.0.0" - }, - "engines": { - "node": ">=6" - } - }, - "node_modules/parse-filepath": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "is-absolute": "^1.0.0", - "map-cache": "^0.2.0", - "path-root": "^0.1.1" - }, - "engines": { - "node": ">=0.8" - } - }, - "node_modules/parse-json": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/code-frame": "^7.0.0", - "error-ex": "^1.3.1", - "json-parse-even-better-errors": "^2.3.0", - "lines-and-columns": "^1.1.6" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/parse-node-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz", - "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/parse-passwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/parseurl": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-root": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", - "dev": true, - "license": "MIT", - "dependencies": { - "path-root-regex": "^0.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-root-regex": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", - "dev": true, - "license": "MIT" - }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8.6" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/plugin-error": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz", - "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-colors": "^1.0.1", - "arr-diff": "^4.0.0", - "arr-union": "^3.1.0", - "extend-shallow": "^3.0.2" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/postcss-calc": { - "version": "8.2.4", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz", - "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-selector-parser": "^6.0.9", - "postcss-value-parser": "^4.2.0" - }, - "peerDependencies": { - "postcss": "^8.2.2" - } - }, - "node_modules/postcss-colormin": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz", - "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "caniuse-api": "^3.0.0", - "colord": "^2.9.1", - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-convert-values": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz", - "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-comments": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz", - "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-duplicates": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz", - "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-empty": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz", - "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-discard-overridden": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz", - "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-load-config": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-3.1.4.tgz", - "integrity": "sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==", - "dev": true, - "license": "MIT", - "dependencies": { - "lilconfig": "^2.0.5", - "yaml": "^1.10.2" - }, - "engines": { - "node": ">= 10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - "peerDependencies": { - "postcss": ">=8.0.9", - "ts-node": ">=9.0.0" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "ts-node": { - "optional": true - } - } - }, - "node_modules/postcss-media-query-parser": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", - "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", - "dev": true, - "license": "MIT" - }, - "node_modules/postcss-merge-longhand": { - "version": "5.1.7", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz", - "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0", - "stylehacks": "^5.1.1" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-merge-rules": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz", - "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "caniuse-api": "^3.0.0", - "cssnano-utils": "^3.1.0", - "postcss-selector-parser": "^6.0.5" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-font-values": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz", - "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-gradients": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz", - "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==", - "dev": true, - "license": "MIT", - "dependencies": { - "colord": "^2.9.1", - "cssnano-utils": "^3.1.0", - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-params": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz", - "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "cssnano-utils": "^3.1.0", - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-minify-selectors": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz", - "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-selector-parser": "^6.0.5" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-charset": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz", - "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-display-values": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz", - "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-positions": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz", - "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-normalize-repeat-style": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz", - "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "license": "MIT", "dependencies": { - "postcss-value-parser": "^4.2.0" + "callsites": "^3.0.0" }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": ">=6" } }, - "node_modules/postcss-normalize-string": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz", - "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==", + "node_modules/parse-json": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, "license": "MIT", "dependencies": { - "postcss-value-parser": "^4.2.0" + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" }, "engines": { - "node": "^10 || ^12 || >=14.0" + "node": ">=8" }, - "peerDependencies": { - "postcss": "^8.2.15" + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/postcss-normalize-timing-functions": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz", - "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==", + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true, "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": ">= 0.8" } }, - "node_modules/postcss-normalize-unicode": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz", - "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==", + "node_modules/path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "postcss-value-parser": "^4.2.0" - }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": ">=8" } }, - "node_modules/postcss-normalize-url": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz", - "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==", + "node_modules/path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, "license": "MIT", - "dependencies": { - "normalize-url": "^6.0.1", - "postcss-value-parser": "^4.2.0" - }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": ">=0.10.0" } }, - "node_modules/postcss-normalize-whitespace": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz", - "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==", + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0" - }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": ">=8" } }, - "node_modules/postcss-ordered-values": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz", - "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==", + "node_modules/path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-to-regexp": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", + "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "dev": true, + "license": "MIT" + }, + "node_modules/path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, "license": "MIT", - "dependencies": { - "cssnano-utils": "^3.1.0", - "postcss-value-parser": "^4.2.0" - }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": ">=8" } }, - "node_modules/postcss-reduce-initial": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz", - "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==", + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "caniuse-api": "^3.0.0" - }, "engines": { - "node": "^10 || ^12 || >=14.0" + "node": ">=8.6" }, - "peerDependencies": { - "postcss": "^8.2.15" + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/postcss-reduce-transforms": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz", - "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==", + "node_modules/postcss": { + "version": "8.5.6", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", + "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], "license": "MIT", "dependencies": { - "postcss-value-parser": "^4.2.0" + "nanoid": "^3.3.11", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" + "node": "^10 || ^12 || >=14" } }, + "node_modules/postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==", + "dev": true, + "license": "MIT" + }, "node_modules/postcss-resolve-nested-selector": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz", @@ -4866,39 +2789,6 @@ "postcss": "^8.3.9" } }, - "node_modules/postcss-svgo": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz", - "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.2.0", - "svgo": "^2.7.0" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, - "node_modules/postcss-unique-selectors": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz", - "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==", - "dev": true, - "license": "MIT", - "dependencies": { - "postcss-selector-parser": "^6.0.5" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", @@ -4916,13 +2806,6 @@ "node": ">= 0.8.0" } }, - "node_modules/process-nextick-args": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", - "dev": true, - "license": "MIT" - }, "node_modules/proxy-addr": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", @@ -5195,48 +3078,6 @@ "node": ">=8" } }, - "node_modules/readable-stream": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", - "dev": true, - "license": "MIT", - "dependencies": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" - } - }, - "node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "dev": true, - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, - "node_modules/rechoir": { - "version": "0.8.0", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.8.0.tgz", - "integrity": "sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "resolve": "^1.20.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/redent": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz", @@ -5251,43 +3092,6 @@ "node": ">=8" } }, - "node_modules/remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", - "dev": true, - "license": "ISC" - }, - "node_modules/replace-ext": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz", - "integrity": "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/replace-homedir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-2.0.0.tgz", - "integrity": "sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/require-from-string": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", @@ -5319,20 +3123,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/resolve-dir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", - "dev": true, - "license": "MIT", - "dependencies": { - "expand-tilde": "^2.0.0", - "global-modules": "^1.0.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/resolve-from": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", @@ -5343,19 +3133,6 @@ "node": ">=4" } }, - "node_modules/resolve-options": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz", - "integrity": "sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==", - "dev": true, - "license": "MIT", - "dependencies": { - "value-or-function": "^4.0.0" - }, - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/reusify": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", @@ -5435,19 +3212,6 @@ "node": ">=10" } }, - "node_modules/semver-greatest-satisfied-range": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz", - "integrity": "sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==", - "dev": true, - "license": "MIT", - "dependencies": { - "sver": "^1.8.3" - }, - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/send": { "version": "0.19.2", "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", @@ -5647,16 +3411,6 @@ "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, - "node_modules/source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/source-map-js": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", @@ -5667,16 +3421,6 @@ "node": ">=0.10.0" } }, - "node_modules/sparkles": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-2.1.0.tgz", - "integrity": "sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", @@ -5711,63 +3455,16 @@ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", "dev": true, - "license": "CC0-1.0" - }, - "node_modules/stable": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz", - "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==", - "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility", - "dev": true, - "license": "MIT" - }, - "node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/stream-composer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz", - "integrity": "sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==", - "dev": true, - "license": "MIT", - "dependencies": { - "streamx": "^2.13.2" - } - }, - "node_modules/stream-exhaust": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz", - "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==", - "dev": true, - "license": "MIT" - }, - "node_modules/streamx": { - "version": "2.23.0", - "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", - "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", - "dev": true, - "license": "MIT", - "dependencies": { - "events-universal": "^1.0.0", - "fast-fifo": "^1.3.2", - "text-decoder": "^1.1.0" - } + "license": "CC0-1.0" }, - "node_modules/string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "node_modules/statuses": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", + "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", "dev": true, "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" + "engines": { + "node": ">= 0.8" } }, "node_modules/string-width": { @@ -5831,23 +3528,6 @@ "dev": true, "license": "ISC" }, - "node_modules/stylehacks": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz", - "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==", - "dev": true, - "license": "MIT", - "dependencies": { - "browserslist": "^4.21.4", - "postcss-selector-parser": "^6.0.4" - }, - "engines": { - "node": "^10 || ^12 || >=14.0" - }, - "peerDependencies": { - "postcss": "^8.2.15" - } - }, "node_modules/stylelint": { "version": "14.16.1", "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-14.16.1.tgz", @@ -6045,55 +3725,12 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/sver": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/sver/-/sver-1.8.4.tgz", - "integrity": "sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==", - "dev": true, - "license": "MIT", - "optionalDependencies": { - "semver": "^6.3.0" - } - }, - "node_modules/sver/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "license": "ISC", - "optional": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/svg-tags": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==", "dev": true }, - "node_modules/svgo": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz", - "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@trysound/sax": "0.2.0", - "commander": "^7.2.0", - "css-select": "^4.1.3", - "css-tree": "^1.1.3", - "csso": "^4.2.0", - "picocolors": "^1.0.0", - "stable": "^0.1.8" - }, - "bin": { - "svgo": "bin/svgo" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/table": { "version": "6.9.0", "resolved": "https://registry.npmjs.org/table/-/table-6.9.0.tgz", @@ -6145,47 +3782,6 @@ "dev": true, "license": "MIT" }, - "node_modules/teex": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", - "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", - "dev": true, - "license": "MIT", - "dependencies": { - "streamx": "^2.12.5" - } - }, - "node_modules/text-decoder": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.3.tgz", - "integrity": "sha512-3/o9z3X0X0fTupwsYvR03pJ/DjWuqqrfwBgTQzdWDiQSm9KitAyz/9WqsT2JQW7KV2m+bC2ol/zqpW37NHxLaA==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "b4a": "^1.6.4" - } - }, - "node_modules/through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" - } - }, - "node_modules/time-stamp": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", - "integrity": "sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -6199,19 +3795,6 @@ "node": ">=8.0" } }, - "node_modules/to-through": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz", - "integrity": "sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==", - "dev": true, - "license": "MIT", - "dependencies": { - "streamx": "^2.12.5" - }, - "engines": { - "node": ">=10.13.0" - } - }, "node_modules/toidentifier": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", @@ -6282,42 +3865,6 @@ "node": ">=0.10.0" } }, - "node_modules/undertaker": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz", - "integrity": "sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "bach": "^2.0.1", - "fast-levenshtein": "^3.0.0", - "last-run": "^2.0.0", - "undertaker-registry": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/undertaker-registry": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz", - "integrity": "sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, - "node_modules/undertaker/node_modules/fast-levenshtein": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz", - "integrity": "sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "fastest-levenshtein": "^1.0.7" - } - }, "node_modules/unpipe": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", @@ -6328,37 +3875,6 @@ "node": ">= 0.8" } }, - "node_modules/update-browserslist-db": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", - "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "escalade": "^3.2.0", - "picocolors": "^1.1.1" - }, - "bin": { - "update-browserslist-db": "cli.js" - }, - "peerDependencies": { - "browserslist": ">= 4.21.0" - } - }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -6399,16 +3915,6 @@ "dev": true, "license": "MIT" }, - "node_modules/v8flags": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz", - "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -6420,16 +3926,6 @@ "spdx-expression-parse": "^3.0.0" } }, - "node_modules/value-or-function": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz", - "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10.13.0" - } - }, "node_modules/vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -6440,180 +3936,6 @@ "node": ">= 0.8" } }, - "node_modules/vinyl": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz", - "integrity": "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^2.1.1", - "clone-buffer": "^1.0.0", - "clone-stats": "^1.0.0", - "cloneable-readable": "^1.0.0", - "remove-trailing-separator": "^1.0.1", - "replace-ext": "^1.0.0" - }, - "engines": { - "node": ">= 0.10" - } - }, - "node_modules/vinyl-contents": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz", - "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "bl": "^5.0.0", - "vinyl": "^3.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vinyl-contents/node_modules/replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/vinyl-contents/node_modules/vinyl": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", - "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^2.1.2", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vinyl-fs": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.2.tgz", - "integrity": "sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fs-mkdirp-stream": "^2.0.1", - "glob-stream": "^8.0.3", - "graceful-fs": "^4.2.11", - "iconv-lite": "^0.6.3", - "is-valid-glob": "^1.0.0", - "lead": "^4.0.0", - "normalize-path": "3.0.0", - "resolve-options": "^2.0.0", - "stream-composer": "^1.0.2", - "streamx": "^2.14.0", - "to-through": "^3.0.0", - "value-or-function": "^4.0.0", - "vinyl": "^3.0.1", - "vinyl-sourcemap": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vinyl-fs/node_modules/replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/vinyl-fs/node_modules/vinyl": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", - "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^2.1.2", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vinyl-sourcemap": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz", - "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "convert-source-map": "^2.0.0", - "graceful-fs": "^4.2.10", - "now-and-later": "^3.0.0", - "streamx": "^2.12.5", - "vinyl": "^3.0.0", - "vinyl-contents": "^2.0.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vinyl-sourcemap/node_modules/replace-ext": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz", - "integrity": "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 10" - } - }, - "node_modules/vinyl-sourcemap/node_modules/vinyl": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.1.tgz", - "integrity": "sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==", - "dev": true, - "license": "MIT", - "dependencies": { - "clone": "^2.1.2", - "remove-trailing-separator": "^1.1.0", - "replace-ext": "^2.0.0", - "teex": "^1.0.1" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/vinyl-sourcemaps-apply": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz", - "integrity": "sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==", - "dev": true, - "license": "ISC", - "dependencies": { - "source-map": "^0.5.1" - } - }, - "node_modules/vinyl-sourcemaps-apply/node_modules/source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/web-push-testing": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/web-push-testing/-/web-push-testing-1.2.2.tgz", @@ -6662,24 +3984,6 @@ "node": ">=0.10.0" } }, - "node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" - } - }, "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", @@ -6701,26 +4005,6 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, - "node_modules/xtend": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", - "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.4" - } - }, - "node_modules/y18n": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "dev": true, - "license": "ISC", - "engines": { - "node": ">=10" - } - }, "node_modules/yallist": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", @@ -6738,25 +4022,6 @@ "node": ">= 6" } }, - "node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", - "dev": true, - "license": "MIT", - "dependencies": { - "cliui": "^7.0.2", - "escalade": "^3.1.1", - "get-caller-file": "^2.0.5", - "require-directory": "^2.1.1", - "string-width": "^4.2.0", - "y18n": "^5.0.5", - "yargs-parser": "^20.2.2" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/yargs-parser": { "version": "20.2.9", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", diff --git a/package.json b/package.json index 3a3121230c5..7947d041537 100644 --- a/package.json +++ b/package.json @@ -40,16 +40,8 @@ }, "homepage": "https://www.phpbb.com", "devDependencies": { - "autoprefixer": "^10.4.4", - "cssnano": "^5.1.7", "eslint": "^9.28.0", - "globals": "^16.2.0", - "gulp": "^5.0.0", - "gulp-concat": "^2.6.1", - "gulp-postcss": "^9.0.1", - "gulp-rename": "^2.0.0", - "postcss": "^8.4.31", - "postcss-sorting": "^7.0.1", + "globals": "^17.0.0", "stylelint": "^14.7.0", "stylelint-order": "^5.0.0", "web-push-testing": "^1.1.1" From 840ea44ac4606e89e1d64654361244b1f3bfd518 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 09:23:47 +0100 Subject: [PATCH 1089/1214] [ticket/17603] Clean up eslint code PHPBB-17603 --- .github/check-js.sh | 1 - eslint.config.mjs | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/check-js.sh b/.github/check-js.sh index 2e66ec7c624..85518ca5010 100755 --- a/.github/check-js.sh +++ b/.github/check-js.sh @@ -16,4 +16,3 @@ npm ci > /dev/null set -x node_modules/eslint/bin/eslint.js "phpBB/**/*.js" --ignore-pattern "phpBB/ext/" node_modules/eslint/bin/eslint.js "phpBB/**/*.js.twig" --ignore-pattern "phpBB/ext/" -node_modules/eslint/bin/eslint.js "gulpfile.js" diff --git a/eslint.config.mjs b/eslint.config.mjs index bb634eccbed..0f2f72bf69a 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,4 +1,4 @@ -const { browser: browserGlobals, node: nodeGlobals, jquery: jqueryGlobals } = (await import('globals')).default; +import globals from 'globals'; // File patterns to ignore const IGNORED_FILES = [ @@ -49,9 +49,9 @@ const mainConfig = { ecmaVersion: 'latest', sourceType: 'module', globals: { - ...browserGlobals, - ...nodeGlobals, - ...jqueryGlobals, + ...globals.browser, + ...globals.node, + ...globals.jquery, }, }, rules: { From 66e151d9a6c070fe6f331c861317681c0278bc8b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 09:24:08 +0100 Subject: [PATCH 1090/1214] [ticket/17603] Remove unused postcss sorting info PHPBB-17603 --- .postcss-sorting.json | 206 ------------------------------------------ 1 file changed, 206 deletions(-) delete mode 100644 .postcss-sorting.json diff --git a/.postcss-sorting.json b/.postcss-sorting.json deleted file mode 100644 index 4a738f4fa73..00000000000 --- a/.postcss-sorting.json +++ /dev/null @@ -1,206 +0,0 @@ -{ - "order": [ - "custom-properties", - "dollar-variables", - { - "type": "at-rule", - "name": "include" - }, - "declarations", - "rules", - { - "type": "at-rule", - "name": "media" - } - ], - "properties-order": [ - "font", - "font-family", - "font-size", - "font-weight", - "font-style", - "font-variant", - "font-size-adjust", - "font-stretch", - "font-effect", - "font-emphasize", - "font-emphasize-position", - "font-emphasize-style", - "font-smooth", - "font-smoothing", - "line-height", - "text-align", - "text-align-last", - "vertical-align", - "white-space", - "text-decoration", - "text-emphasis", - "text-emphasis-color", - "text-emphasis-style", - "text-emphasis-position", - "text-indent", - "text-justify", - "letter-spacing", - "word-spacing", - "writing-mode", - "text-outline", - "text-transform", - "text-size-adjust", - "text-wrap", - "text-overflow", - "text-overflow-ellipsis", - "text-overflow-mode", - "word-wrap", - "word-break", - "tab-size", - "hyphens", - - "background", - "background-color", - "background-image", - "background-repeat", - "background-attachment", - "background-position", - "background-position-x", - "background-position-y", - "background-clip", - "background-origin", - "background-size", - "interpolation-mode", - "filter", - "border", - "border-width", - "border-style", - "border-color", - "border-top", - "border-top-width", - "border-top-style", - "border-top-color", - "border-right", - "border-right-width", - "border-right-style", - "border-right-color", - "border-bottom", - "border-bottom-width", - "border-bottom-style", - "border-bottom-color", - "border-left", - "border-left-width", - "border-left-style", - "border-left-color", - "border-radius", - "border-top-left-radius", - "border-top-right-radius", - "border-bottom-right-radius", - "border-bottom-left-radius", - "border-image", - "border-image-source", - "border-image-slice", - "border-image-width", - "border-image-outset", - "border-image-repeat", - "outline", - "outline-width", - "outline-style", - "outline-color", - "outline-offset", - "tap-highlight-color", - - "box-decoration-break", - "box-shadow", - "text-shadow", - - "color", - "opacity", - - "position", - "z-index", - "top", - "right", - "bottom", - "left", - - "display", - "visibility", - "float", - "clear", - "overflow", - "overflow-x", - "overflow-y", - "overflow-scrolling", - "clip", - "zoom", - "flex", - "flex-direction", - "flex-order", - "flex-pack", - "flex-align", - "flex-grow", - "flex-shrink", - "flex-basis", - "flex-wrap", - "justify-content", - "align-items", - "align-self", - - "box-sizing", - "width", - "min-width", - "max-width", - "height", - "min-height", - "max-height", - "margin", - "margin-top", - "margin-right", - "margin-bottom", - "margin-left", - "padding", - "padding-top", - "padding-right", - "padding-bottom", - "padding-left", - - "table-layout", - "empty-cells", - "caption-side", - "border-spacing", - "border-collapse", - "list-style", - "list-style-position", - "list-style-type", - "list-style-image", - - "content", - "quotes", - "counter-reset", - "counter-increment", - "resize", - "cursor", - "touch-callout", - "touch-action", - "user-select", - "nav-index", - "nav-up", - "nav-right", - "nav-down", - "nav-left", - "transition", - "transition-delay", - "transition-timing-function", - "transition-duration", - "transition-property", - "transform", - "transform-origin", - "animation", - "animation-name", - "animation-duration", - "animation-play-state", - "animation-timing-function", - "animation-delay", - "animation-iteration-count", - "animation-direction", - "pointer-events" - ], - "unspecified-properties-position": "bottomAlphabetical" -} From 5ce66570d3b20bc20f59daafaf36f1fdf1142f96 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 2 Jan 2026 09:45:44 +0100 Subject: [PATCH 1091/1214] [ticket/17602] Replace invalid timezone identifier PHPBB-17602 --- tests/wrapper/gmgetdate_test.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/wrapper/gmgetdate_test.php b/tests/wrapper/gmgetdate_test.php index 08ee491c0f1..8ef3991e2eb 100644 --- a/tests/wrapper/gmgetdate_test.php +++ b/tests/wrapper/gmgetdate_test.php @@ -13,15 +13,15 @@ class phpbb_wrapper_gmgetdate_test extends phpbb_test_case { - public static function phpbb_gmgetdate_data() + public static function phpbb_gmgetdate_data(): array { - return array( - array(''), - array('UTC'), - array('Europe/Berlin'), - array('America/Los_Angeles'), - array('Antarctica/South_Pole'), - ); + return [ + [''], + ['UTC'], + ['Europe/Berlin'], + ['America/Los_Angeles'], + ['Pacific/Auckland'], + ]; } /** From 933e74c791142bd3a2d291f7c978295a923b7ab2 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 3 Jan 2026 08:31:03 -0800 Subject: [PATCH 1092/1214] [ticket/17604] Add migration to disable extensions PHPBB-17604 fix migration --- .../data/v400/disable_extensions.php | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v400/disable_extensions.php diff --git a/phpBB/phpbb/db/migration/data/v400/disable_extensions.php b/phpBB/phpbb/db/migration/data/v400/disable_extensions.php new file mode 100644 index 00000000000..377f72fbd80 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/disable_extensions.php @@ -0,0 +1,57 @@ + +* @license GNU General Public License, version 2 (GPL-2.0) +* +* For full copyright and license information, please see +* the docs/CREDITS.txt file. +* +*/ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\container_aware_migration; + +class disable_extensions extends container_aware_migration +{ + /** + * @var array List of extensions included with phpBB + */ + public static array $default_extensions = [ + 'phpbb/viglink', + ]; + + public static function depends_on(): array + { + return ['\phpbb\db\migration\data\v400\v400a1']; + } + + public function update_data(): array + { + return [ + ['custom', [[$this, 'disable_enabled_extensions']]], + ]; + } + + /** + * Disable all enabled extensions except those included with phpBB. + * This is a safety measure to prevent possible PHP fatal errors + * caused by extensions that are not compatible with the changes + * introduced with phpBB 4.0.0-a2. + */ + public function disable_enabled_extensions(): void + { + $ext_manager = $this->container->get('ext.manager'); + + $enabled_extensions = array_keys($ext_manager->all_enabled()); + $enabled_extensions = array_diff($enabled_extensions, self::$default_extensions); + + foreach ($enabled_extensions as $extension) + { + $ext_manager->disable($extension); + } + } +} From e06d2207d44c322a4bc8e1270f769e3024f14cb9 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 3 Jan 2026 08:33:25 -0800 Subject: [PATCH 1093/1214] [ticket/17604] Add install task to disable extensions PHPBB-17604 Fix task --- .../container/services_update_database.yml | 10 ++ phpBB/language/en/install.php | 1 + .../task/disable_extensions.php | 122 ++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 phpBB/phpbb/install/module/update_database/task/disable_extensions.php diff --git a/phpBB/config/installer/container/services_update_database.yml b/phpBB/config/installer/container/services_update_database.yml index 836b9436706..d10f3c576d4 100644 --- a/phpBB/config/installer/container/services_update_database.yml +++ b/phpBB/config/installer/container/services_update_database.yml @@ -22,6 +22,16 @@ services: tags: - { name: update_database_task, order: 20 } + installer.update_database.disable_extensions: + class: phpbb\install\module\update_database\task\disable_extensions + arguments: + - '@installer.helper.container_factory' + - '@installer.helper.config' + - '@installer.helper.iohandler' + - '@installer.helper.update_helper' + tags: + - { name: update_database_task, order: 30 } + installer.module.update_database_collection: class: phpbb\di\ordered_service_collection arguments: diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index d62b124adf5..6674f07e2ed 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -499,6 +499,7 @@ 'INLINE_UPDATE_SUCCESSFUL' => 'The database update was successful.', 'TASK_UPDATE_EXTENSIONS' => 'Updating extensions', + 'TASK_DISABLE_EXTENSIONS' => 'Disabling extensions', )); // Converter diff --git a/phpBB/phpbb/install/module/update_database/task/disable_extensions.php b/phpBB/phpbb/install/module/update_database/task/disable_extensions.php new file mode 100644 index 00000000000..1a68396d224 --- /dev/null +++ b/phpBB/phpbb/install/module/update_database/task/disable_extensions.php @@ -0,0 +1,122 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\install\module\update_database\task; + +use phpbb\extension\manager; +use phpbb\install\exception\resource_limit_reached_exception; +use phpbb\install\helper\container_factory; +use phpbb\install\helper\config; +use phpbb\install\helper\iohandler\iohandler_interface; +use phpbb\install\helper\update_helper; +use phpbb\install\task_base; +use Symfony\Component\DependencyInjection\ContainerInterface; + +/** + * Disables all extensions during the installation process + */ +class disable_extensions extends task_base +{ + /** @var config */ + protected config $install_config; + + /** @var iohandler_interface */ + protected iohandler_interface $iohandler; + + /** @var ContainerInterface|manager */ + protected ContainerInterface|manager $extension_manager; + + /** @var ContainerInterface|\phpbb\config\config */ + protected ContainerInterface|\phpbb\config\config $config; + + /** @var update_helper */ + protected update_helper $update_helper; + + /** + * @var array List of extensions included with phpBB + */ + public static array $default_extensions = [ + 'phpbb/viglink', + ]; + + /** + * Constructor + * + * @param container_factory $container + * @param config $install_config + * @param iohandler_interface $iohandler + * @param update_helper $update_helper + */ + public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler, update_helper $update_helper) + { + $this->install_config = $install_config; + $this->iohandler = $iohandler; + $this->extension_manager = $container->get('ext.manager'); + $this->config = $container->get('config'); + $this->update_helper = $update_helper; + + parent::__construct(); + } + + /** + * {@inheritdoc} + */ + public function run(): void + { + $update_info = $this->install_config->get('update_info_unprocessed', []); + $version_from = !empty($update_info) ? $update_info['version']['from'] : $this->config['version_update_from']; + + // Only run when updating to 4.0.0-a2 + if (!empty($version_from) && $this->update_helper->phpbb_version_compare($version_from, '4.0.0-a2', '<')) + { + $all_enabled_extensions = array_keys($this->extension_manager->all_enabled()); + $all_enabled_extensions = array_diff($all_enabled_extensions, self::$default_extensions); + $i = $this->install_config->get('disable_extensions_index', 0); + $enabled_extensions = array_slice($all_enabled_extensions, $i, null, true); + + foreach ($enabled_extensions as $extension) + { + $this->extension_manager->disable($extension); + $i++; + + if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0) + { + break; + } + } + + $this->install_config->set('disable_extensions_index', $i); + + if ($i < count($all_enabled_extensions)) + { + throw new resource_limit_reached_exception(); + } + } + } + + /** + * {@inheritdoc} + */ + public static function get_step_count(): int + { + return 1; + } + + /** + * {@inheritdoc} + */ + public function get_task_lang_name(): string + { + return 'TASK_DISABLE_EXTENSIONS'; + } +} From 4689feb27fb8ba3b5266d17475f905c301693e30 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sat, 3 Jan 2026 09:39:00 -0800 Subject: [PATCH 1094/1214] [ticket/17604] Revert Add install task to disable extensions PHPBB-17604 --- .../container/services_update_database.yml | 10 -- phpBB/language/en/install.php | 1 - .../task/disable_extensions.php | 122 ------------------ 3 files changed, 133 deletions(-) delete mode 100644 phpBB/phpbb/install/module/update_database/task/disable_extensions.php diff --git a/phpBB/config/installer/container/services_update_database.yml b/phpBB/config/installer/container/services_update_database.yml index d10f3c576d4..836b9436706 100644 --- a/phpBB/config/installer/container/services_update_database.yml +++ b/phpBB/config/installer/container/services_update_database.yml @@ -22,16 +22,6 @@ services: tags: - { name: update_database_task, order: 20 } - installer.update_database.disable_extensions: - class: phpbb\install\module\update_database\task\disable_extensions - arguments: - - '@installer.helper.container_factory' - - '@installer.helper.config' - - '@installer.helper.iohandler' - - '@installer.helper.update_helper' - tags: - - { name: update_database_task, order: 30 } - installer.module.update_database_collection: class: phpbb\di\ordered_service_collection arguments: diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 6674f07e2ed..d62b124adf5 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -499,7 +499,6 @@ 'INLINE_UPDATE_SUCCESSFUL' => 'The database update was successful.', 'TASK_UPDATE_EXTENSIONS' => 'Updating extensions', - 'TASK_DISABLE_EXTENSIONS' => 'Disabling extensions', )); // Converter diff --git a/phpBB/phpbb/install/module/update_database/task/disable_extensions.php b/phpBB/phpbb/install/module/update_database/task/disable_extensions.php deleted file mode 100644 index 1a68396d224..00000000000 --- a/phpBB/phpbb/install/module/update_database/task/disable_extensions.php +++ /dev/null @@ -1,122 +0,0 @@ - - * @license GNU General Public License, version 2 (GPL-2.0) - * - * For full copyright and license information, please see - * the docs/CREDITS.txt file. - * - */ - -namespace phpbb\install\module\update_database\task; - -use phpbb\extension\manager; -use phpbb\install\exception\resource_limit_reached_exception; -use phpbb\install\helper\container_factory; -use phpbb\install\helper\config; -use phpbb\install\helper\iohandler\iohandler_interface; -use phpbb\install\helper\update_helper; -use phpbb\install\task_base; -use Symfony\Component\DependencyInjection\ContainerInterface; - -/** - * Disables all extensions during the installation process - */ -class disable_extensions extends task_base -{ - /** @var config */ - protected config $install_config; - - /** @var iohandler_interface */ - protected iohandler_interface $iohandler; - - /** @var ContainerInterface|manager */ - protected ContainerInterface|manager $extension_manager; - - /** @var ContainerInterface|\phpbb\config\config */ - protected ContainerInterface|\phpbb\config\config $config; - - /** @var update_helper */ - protected update_helper $update_helper; - - /** - * @var array List of extensions included with phpBB - */ - public static array $default_extensions = [ - 'phpbb/viglink', - ]; - - /** - * Constructor - * - * @param container_factory $container - * @param config $install_config - * @param iohandler_interface $iohandler - * @param update_helper $update_helper - */ - public function __construct(container_factory $container, config $install_config, iohandler_interface $iohandler, update_helper $update_helper) - { - $this->install_config = $install_config; - $this->iohandler = $iohandler; - $this->extension_manager = $container->get('ext.manager'); - $this->config = $container->get('config'); - $this->update_helper = $update_helper; - - parent::__construct(); - } - - /** - * {@inheritdoc} - */ - public function run(): void - { - $update_info = $this->install_config->get('update_info_unprocessed', []); - $version_from = !empty($update_info) ? $update_info['version']['from'] : $this->config['version_update_from']; - - // Only run when updating to 4.0.0-a2 - if (!empty($version_from) && $this->update_helper->phpbb_version_compare($version_from, '4.0.0-a2', '<')) - { - $all_enabled_extensions = array_keys($this->extension_manager->all_enabled()); - $all_enabled_extensions = array_diff($all_enabled_extensions, self::$default_extensions); - $i = $this->install_config->get('disable_extensions_index', 0); - $enabled_extensions = array_slice($all_enabled_extensions, $i, null, true); - - foreach ($enabled_extensions as $extension) - { - $this->extension_manager->disable($extension); - $i++; - - if ($this->install_config->get_time_remaining() <= 0 || $this->install_config->get_memory_remaining() <= 0) - { - break; - } - } - - $this->install_config->set('disable_extensions_index', $i); - - if ($i < count($all_enabled_extensions)) - { - throw new resource_limit_reached_exception(); - } - } - } - - /** - * {@inheritdoc} - */ - public static function get_step_count(): int - { - return 1; - } - - /** - * {@inheritdoc} - */ - public function get_task_lang_name(): string - { - return 'TASK_DISABLE_EXTENSIONS'; - } -} From 290c1b907727e825d5f2441feeb7dc0dd301a751 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 5 Jan 2026 17:40:49 +0100 Subject: [PATCH 1095/1214] [ticket/17605] Fix vagrant in 3.3.x and and use svpernova09 homestead fork PHPBB-17605 --- .gitignore | 4 ++- phpBB/composer.json | 1 - phpBB/composer.lock | 57 +----------------------------- phpBB/docs/vagrant.md | 16 +++++---- Vagrantfile => vagrant/Vagrantfile | 14 ++++---- vagrant/after.sh | 2 +- vagrant/bootstrap.yaml | 4 +-- vagrant/composer.json | 5 +++ vagrant/phpbb-install-config.yml | 2 +- 9 files changed, 29 insertions(+), 76 deletions(-) rename Vagrantfile => vagrant/Vagrantfile (56%) create mode 100644 vagrant/composer.json diff --git a/.gitignore b/.gitignore index eda70c06051..e34d8db26a0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,9 @@ /tests/tmp/* /tests/vendor /vagrant/phpbb-install-config.yml -.vagrant +/vagrant/.vagrant +/vagrant/composer.lock +/vagrant/vendor node_modules # Excludes IDE / editors files diff --git a/phpBB/composer.json b/phpBB/composer.json index 42271c2da05..0c1a20278c5 100644 --- a/phpBB/composer.json +++ b/phpBB/composer.json @@ -58,7 +58,6 @@ "require-dev": { "fabpot/goutte": "~3.2", "php-webdriver/webdriver": "~1.8", - "laravel/homestead": "~7.0", "phing/phing": "~2.4", "phpunit/dbunit": "~4.0", "phpunit/phpunit": "^7.0", diff --git a/phpBB/composer.lock b/phpBB/composer.lock index ff18af9dd2d..d8266dd4d7a 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b63d9eb2d41744fe5532d47955802f7e", + "content-hash": "f0cffe69a7d759aef2ca92118e93a3c1", "packages": [ { "name": "bantu/ini-get-wrapper", @@ -2970,61 +2970,6 @@ "abandoned": "symfony/browser-kit", "time": "2018-06-29T15:13:57+00:00" }, - { - "name": "laravel/homestead", - "version": "v7.20.0", - "source": { - "type": "git", - "url": "https://github.com/laravel/homestead.git", - "reference": "cae38adcfdde1de1c4581e7a33872adaf9fbf926" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laravel/homestead/zipball/cae38adcfdde1de1c4581e7a33872adaf9fbf926", - "reference": "cae38adcfdde1de1c4581e7a33872adaf9fbf926", - "shasum": "" - }, - "require": { - "php": "^5.6 || ^7.0", - "symfony/console": "~3.3|~4.0", - "symfony/process": "~3.3|~4.0", - "symfony/yaml": "~3.3|~4.0" - }, - "require-dev": { - "phly/changelog-generator": "^2.2", - "phpunit/phpunit": "^5.7 || ^6.0" - }, - "bin": [ - "bin/homestead" - ], - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.0-dev" - } - }, - "autoload": { - "psr-4": { - "Laravel\\Homestead\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Taylor Otwell", - "email": "taylorotwell@gmail.com" - } - ], - "description": "A virtual machine for web artisans.", - "support": { - "issues": "https://github.com/laravel/homestead/issues", - "source": "https://github.com/laravel/homestead/tree/master" - }, - "time": "2018-12-11T02:04:35+00:00" - }, { "name": "myclabs/deep-copy", "version": "1.12.0", diff --git a/phpBB/docs/vagrant.md b/phpBB/docs/vagrant.md index ac318270c1f..6c888ff7fd9 100644 --- a/phpBB/docs/vagrant.md +++ b/phpBB/docs/vagrant.md @@ -2,19 +2,21 @@ phpBB includes support for Vagrant. This allows developers and contributors to run phpBB without the need to set up their own local web server with traditional WAMP/MAMP stacks. It also provides a consistent environment between developers for writing and debugging code changes more productively. -phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu 14.04, PHP 5.6, Nginx, SQLite3, MySQL, and a whole lot more (complete specs below). +phpBB uses the [Laravel/Homestead](https://laravel.com/docs/5.1/homestead) Vagrant box. It runs a Linux server with Ubuntu, PHP 7.2, Apache, SQLite3, MySQL, and a whole lot more (complete specs below). ## Get Started * Download and Install [Vagrant](https://www.vagrantup.com/downloads.html) * Download and Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads) -* Run `vagrant up` from the root of your cloned fork of the phpBB Git repository +* Run `vagrant up` from the `vagrant` directory of your cloned fork of the phpBB Git repository ```sh +$ cd vagrant +$ ../composer.phar install $ vagrant up ``` -* Access phpBB at `http://192.168.10.10/` +* Access phpBB at `http://192.168.56.56/` * Username: **admin** * Password: **adminadmin** @@ -52,7 +54,7 @@ By default, phpBB is pre-configured to install with a MySQL database. You can, h If you prefer to access phpBB from the more friendly URL `http://phpbb.app` then you must update your computer's hosts file. This file is typically located at `/etc/hosts` for Mac/Linux or `C:\Windows\System32\drivers\etc\hosts` for Windows. Open this file and add the following line to it, at the very bottom, and save. ``` -192.168.10.10 phpbb.app +192.168.56.56 phpbb.app ``` ## How it all works @@ -91,11 +93,11 @@ $ mysql -uhomestead -psecret phpbb < /home/vagrant/phpbb/phpBB/store/phpbb.sql ### Included Software -* Ubuntu 14.04 +* Ubuntu * Git -* PHP 5.6 +* PHP 7.2 * HHVM -* Nginx +* Apache * MySQL * Sqlite3 * Postgres diff --git a/Vagrantfile b/vagrant/Vagrantfile similarity index 56% rename from Vagrantfile rename to vagrant/Vagrantfile index ab225c9ad91..419c533335e 100644 --- a/Vagrantfile +++ b/vagrant/Vagrantfile @@ -2,24 +2,24 @@ require 'json' require 'yaml' VAGRANTFILE_API_VERSION ||= "2" -confDir = $confDir ||= File.expand_path("phpBB/vendor/laravel/homestead", File.dirname(__FILE__)) +confDir = $confDir ||= File.expand_path("vendor/svpernova09/homestead", File.dirname(__FILE__)) -homesteadYamlPath = "vagrant/bootstrap.yaml" -afterScriptPath = "vagrant/after.sh" -aliasesPath = "vagrant/aliases" +homesteadYamlPath = "bootstrap.yaml" +afterScriptPath = "after.sh" +aliasesPath = "aliases" require File.expand_path(confDir + '/scripts/homestead.rb') Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - if File.exists? aliasesPath then + if File.exist? aliasesPath then config.vm.provision "file", source: aliasesPath, destination: "~/.bash_aliases" end - if File.exists? homesteadYamlPath then + if File.exist? homesteadYamlPath then Homestead.configure(config, YAML::load(File.read(homesteadYamlPath))) end - if File.exists? afterScriptPath then + if File.exist? afterScriptPath then config.vm.provision "shell", path: afterScriptPath end end diff --git a/vagrant/after.sh b/vagrant/after.sh index 5980e5c334a..d3bfccea6f5 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -34,4 +34,4 @@ sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/${PHP_VERSION}/fpm/p # Restart php-fpm to apply php.ini changes systemctl restart php${PHP_VERSION}-fpm.service -echo "Your board is ready at http://192.168.10.10/" +echo "Your board is ready at http://192.168.56.56/" diff --git a/vagrant/bootstrap.yaml b/vagrant/bootstrap.yaml index 02cf9086922..bb0b92b2521 100644 --- a/vagrant/bootstrap.yaml +++ b/vagrant/bootstrap.yaml @@ -1,5 +1,5 @@ --- -ip: "192.168.10.10" +ip: "192.168.56.56" memory: 2048 cpus: 1 hostname: phpbb @@ -12,7 +12,7 @@ keys: - ~/.ssh/id_rsa folders: - - map: "." + - map: ".." to: "/home/vagrant/phpbb" sites: - map: phpbb.app diff --git a/vagrant/composer.json b/vagrant/composer.json new file mode 100644 index 00000000000..c2cd51c5a54 --- /dev/null +++ b/vagrant/composer.json @@ -0,0 +1,5 @@ +{ + "require": { + "svpernova09/homestead": "dev-main" + } +} diff --git a/vagrant/phpbb-install-config.yml b/vagrant/phpbb-install-config.yml index 023d7b1a9d8..c9e49ee52df 100644 --- a/vagrant/phpbb-install-config.yml +++ b/vagrant/phpbb-install-config.yml @@ -46,6 +46,6 @@ installer: cookie_secure: false server_protocol: http:// force_server_vars: false - server_name: 192.168.10.10 + server_name: 192.168.56.56 server_port: 80 script_path: / From ca6f89d6fa09dc135b195ef99ee1fd299a5c6b83 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sat, 29 Nov 2025 21:45:08 +0100 Subject: [PATCH 1096/1214] [ticket/17588] Move index page to controller PHPBB-17588 --- phpBB/app.php | 3 - phpBB/config/default/container/services.yml | 1 + .../default/container/services_forum.yml | 27 ++++ phpBB/config/default/routing/routing.yml | 4 + phpBB/index.php | 135 +--------------- phpBB/phpbb/forum/birthday_helper.php | 129 ++++++++++++++++ phpBB/phpbb/forum/controller/index.php | 146 ++++++++++++++++++ 7 files changed, 315 insertions(+), 130 deletions(-) create mode 100644 phpBB/config/default/container/services_forum.yml create mode 100644 phpBB/phpbb/forum/birthday_helper.php create mode 100644 phpBB/phpbb/forum/controller/index.php diff --git a/phpBB/app.php b/phpBB/app.php index 4873fb10c3d..3781bfe0f0e 100644 --- a/phpBB/app.php +++ b/phpBB/app.php @@ -11,9 +11,6 @@ * */ -/** -*/ - /** * @ignore */ diff --git a/phpBB/config/default/container/services.yml b/phpBB/config/default/container/services.yml index 0e3a74447bf..3f42684e567 100644 --- a/phpBB/config/default/container/services.yml +++ b/phpBB/config/default/container/services.yml @@ -15,6 +15,7 @@ imports: - { resource: services_files.yml } - { resource: services_filesystem.yml } - { resource: services_finder.yml } + - { resource: services_forum.yml } - { resource: services_help.yml } - { resource: services_http.yml } - { resource: services_language.yml } diff --git a/phpBB/config/default/container/services_forum.yml b/phpBB/config/default/container/services_forum.yml new file mode 100644 index 00000000000..befbca270b5 --- /dev/null +++ b/phpBB/config/default/container/services_forum.yml @@ -0,0 +1,27 @@ +services: + + phpbb.birthday.helper: + class: phpbb\forum\birthday_helper + arguments: + - '@auth' + - '@config' + - '@dbal.conn' + - '@dispatcher' + - '@language' + - '@template' + - '@user' + + forum.controller.index: + class: phpbb\forum\controller\index + arguments: + - '@auth' + - '@phpbb.birthday.helper' + - '@config' + - '@controller.helper' + - '@dispatcher' + - '@group_helper' + - '@language' + - '@user' + - '@template' + - '%core.root_path%' + - '%core.php_ext%' diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 2e2638741c3..371cd23a251 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -8,6 +8,10 @@ # instantiate the 'foo_service' service and call the 'method' method. # +phpbb_index_controller: + path: / + defaults: { _controller: forum.controller.index:handle } + phpbb_cron_routing: resource: cron.yml prefix: /cron diff --git a/phpBB/index.php b/phpBB/index.php index e64a5614e05..3781bfe0f0e 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -18,136 +18,17 @@ $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); -include($phpbb_root_path . 'includes/functions_display.' . $phpEx); // Start session management $user->session_begin(); $auth->acl($user->data); -$user->setup('viewforum'); +$user->setup('app'); -display_forums('', $config['load_moderators']); +/* @var $http_kernel \Symfony\Component\HttpKernel\HttpKernel */ +$http_kernel = $phpbb_container->get('http_kernel'); -/** @var \phpbb\group\helper $group_helper */ -$group_helper = $phpbb_container->get('group_helper'); - -// This is shown only if display_online_list is true -$group_helper->display_legend(); - -// Generate birthday list if required ... -$show_birthdays = ($config['load_birthdays'] && $config['allow_birthdays'] && $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')); - -$birthdays = $birthday_list = array(); -if ($show_birthdays) -{ - $time = $user->create_datetime(); - $now = phpbb_gmgetdate($time->getTimestamp() + $time->getOffset()); - - // Display birthdays of 29th february on 28th february in non-leap-years - $leap_year_birthdays = ''; - if ($now['mday'] == 28 && $now['mon'] == 2 && !$time->format('L')) - { - $leap_year_birthdays = " OR u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'"; - } - - $sql_ary = array( - 'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_birthday', - 'FROM' => array( - USERS_TABLE => 'u', - ), - 'LEFT_JOIN' => array( - array( - 'FROM' => array(BANS_TABLE => 'b'), - 'ON' => 'u.user_id = b.ban_userid', - ), - ), - 'WHERE' => 'b.ban_id IS NULL - AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ") - AND (u.user_birthday LIKE '" . $db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)", - ); - - /** - * Event to modify the SQL query to get birthdays data - * - * @event core.index_modify_birthdays_sql - * @var array now The assoc array with the 'now' local timestamp data - * @var array sql_ary The SQL array to get the birthdays data - * @var object time The user related Datetime object - * @since 3.1.7-RC1 - */ - $vars = array('now', 'sql_ary', 'time'); - extract($phpbb_dispatcher->trigger_event('core.index_modify_birthdays_sql', compact($vars))); - - $sql = $db->sql_build_query('SELECT', $sql_ary); - $result = $db->sql_query($sql); - $rows = $db->sql_fetchrowset($result); - $db->sql_freeresult($result); - - foreach ($rows as $row) - { - $birthday_username = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); - $birthday_year = (int) substr($row['user_birthday'], -4); - $birthday_age = ($birthday_year) ? max(0, $now['year'] - $birthday_year) : ''; - - $birthdays[] = array( - 'USERNAME' => $birthday_username, - 'AGE' => $birthday_age, - ); - - // For 3.0 compatibility - $birthday_list[] = $birthday_username . (($birthday_age) ? " ({$birthday_age})" : ''); - } - - /** - * Event to modify the birthdays list - * - * @event core.index_modify_birthdays_list - * @var array birthdays Array with the users birthdays data - * @var array rows Array with the birthdays SQL query result - * @since 3.1.7-RC1 - */ - $vars = array('birthdays', 'rows'); - extract($phpbb_dispatcher->trigger_event('core.index_modify_birthdays_list', compact($vars))); - - $template->assign_block_vars_array('birthdays', $birthdays); -} - -$controller_helper = $phpbb_container->get('controller.helper'); -// Assign index specific vars -$template->assign_vars(array( - 'TOTAL_POSTS' => $user->lang('TOTAL_POSTS_COUNT', (int) $config['num_posts']), - 'TOTAL_TOPICS' => $user->lang('TOTAL_TOPICS', (int) $config['num_topics']), - 'TOTAL_USERS' => $user->lang('TOTAL_USERS', (int) $config['num_users']), - 'NEWEST_USER' => $user->lang('NEWEST_USER', get_username_string('full', $config['newest_user_id'], $config['newest_username'], $config['newest_user_colour'])), - - 'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode($user->lang['COMMA_SEPARATOR'], $birthday_list), - - 'S_LOGIN_ACTION' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), - 'U_SEND_PASSWORD' => ($config['email_enable'] && $config['allow_password_reset']) ? $controller_helper->route('phpbb_ucp_forgot_password_controller') : '', - 'S_DISPLAY_BIRTHDAY_LIST' => $show_birthdays, - 'S_INDEX' => true, - - 'U_CANONICAL' => generate_board_url() . '/', - 'U_MARK_FORUMS' => ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : '', - 'U_MCP' => ($auth->acl_get('m_') || $auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=main&mode=front') : '') -); - -$page_title = ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['INDEX']; - -/** -* You can use this event to modify the page title and load data for the index -* -* @event core.index_modify_page_title -* @var string page_title Title of the index page -* @since 3.1.0-a1 -*/ -$vars = array('page_title'); -extract($phpbb_dispatcher->trigger_event('core.index_modify_page_title', compact($vars))); - -// Output page -page_header($page_title, true); - -$template->set_filenames(array( - 'body' => 'index_body.html') -); - -page_footer(); +/* @var $symfony_request \phpbb\symfony_request */ +$symfony_request = $phpbb_container->get('symfony_request'); +$response = $http_kernel->handle($symfony_request); +$response->send(); +$http_kernel->terminate($symfony_request, $response); diff --git a/phpBB/phpbb/forum/birthday_helper.php b/phpBB/phpbb/forum/birthday_helper.php new file mode 100644 index 00000000000..a189c73d889 --- /dev/null +++ b/phpBB/phpbb/forum/birthday_helper.php @@ -0,0 +1,129 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\forum; + +use phpbb\auth\auth; +use phpbb\config\config; +use phpbb\db\driver\driver_interface; +use phpbb\event\dispatcher; +use phpbb\language\language; +use phpbb\template\template; +use phpbb\user; + +class birthday_helper +{ + protected $auth; + protected $config; + protected $db; + protected $dispatcher; + protected $language; + protected $template; + protected $user; + + public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, language $language, template $template, user $user) + { + $this->auth = $auth; + $this->config = $config; + $this->db = $db; + $this->dispatcher = $dispatcher; + $this->language = $language; + $this->template = $template; + $this->user = $user; + } + + public function display_birthdays() + { + $show_birthdays = ($this->config['load_birthdays'] && $this->config['allow_birthdays'] && $this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')); + + $birthdays = $birthday_list = array(); + if ($show_birthdays) + { + $time = $this->user->create_datetime(); + $now = phpbb_gmgetdate($time->getTimestamp() + $time->getOffset()); + + // Display birthdays of 29th february on 28th february in non-leap-years + $leap_year_birthdays = ''; + if ($now['mday'] == 28 && $now['mon'] == 2 && !$time->format('L')) + { + $leap_year_birthdays = " OR u.user_birthday LIKE '" . $this->db->sql_escape(sprintf('%2d-%2d-', 29, 2)) . "%'"; + } + + $sql_ary = array( + 'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_birthday', + 'FROM' => array( + USERS_TABLE => 'u', + ), + 'LEFT_JOIN' => array( + array( + 'FROM' => array(BANS_TABLE => 'b'), + 'ON' => 'u.user_id = b.ban_userid', + ), + ), + 'WHERE' => 'b.ban_id IS NULL + AND u.user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ") + AND (u.user_birthday LIKE '" . $this->db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' $leap_year_birthdays)", + ); + + /** + * Event to modify the SQL query to get birthdays data + * + * @event core.index_modify_birthdays_sql + * @var array now The assoc array with the 'now' local timestamp data + * @var array sql_ary The SQL array to get the birthdays data + * @var object time The user related Datetime object + * @since 3.1.7-RC1 + */ + $vars = array('now', 'sql_ary', 'time'); + extract($this->dispatcher->trigger_event('core.index_modify_birthdays_sql', compact($vars))); + + $sql = $this->db->sql_build_query('SELECT', $sql_ary); + $result = $this->db->sql_query($sql); + $rows = $this->db->sql_fetchrowset($result); + $this->db->sql_freeresult($result); + + foreach ($rows as $row) + { + $birthday_username = get_username_string('full', $row['user_id'], $row['username'], $row['user_colour']); + $birthday_year = (int) substr($row['user_birthday'], -4); + $birthday_age = ($birthday_year) ? max(0, $now['year'] - $birthday_year) : ''; + + $birthdays[] = array( + 'USERNAME' => $birthday_username, + 'AGE' => $birthday_age, + ); + + // For 3.0 compatibility + $birthday_list[] = $birthday_username . (($birthday_age) ? " ({$birthday_age})" : ''); + } + + /** + * Event to modify the birthdays list + * + * @event core.index_modify_birthdays_list + * @var array birthdays Array with the users birthdays data + * @var array rows Array with the birthdays SQL query result + * @since 3.1.7-RC1 + */ + $vars = array('birthdays', 'rows'); + extract($this->dispatcher->trigger_event('core.index_modify_birthdays_list', compact($vars))); + + $this->template->assign_block_vars_array('birthdays', $birthdays); + } + + $this->template->assign_vars([ + 'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode($this->language->lang('COMMA_SEPARATOR'), $birthday_list), + 'S_DISPLAY_BIRTHDAY_LIST' => $show_birthdays, + ]); + } +} diff --git a/phpBB/phpbb/forum/controller/index.php b/phpBB/phpbb/forum/controller/index.php new file mode 100644 index 00000000000..4273142bf5c --- /dev/null +++ b/phpBB/phpbb/forum/controller/index.php @@ -0,0 +1,146 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\forum\controller; + +use phpbb\auth\auth; +use phpbb\config\config; +use phpbb\controller\helper as controller_helper; +use phpbb\event\dispatcher; +use phpbb\forum\birthday_helper; +use phpbb\group\helper as group_helper; +use phpbb\language\language; +use phpbb\template\template; +use phpbb\user; +use Symfony\Component\HttpFoundation\Response; + +class index +{ + /** @var auth */ + protected $auth; + + /** @var birthday_helper */ + protected $birthday_helper; + + /** @var config */ + protected $config; + + /** @var controller_helper */ + protected $controller_helper; + + /** @var dispatcher */ + protected $dispatcher; + + /** @var group_helper */ + protected $group_helper; + + /** @var language */ + protected $language; + + /** @var user */ + protected $user; + + /** @var template */ + protected $template; + + /** @var string */ + protected $phpbb_root_path; + + /** @var string */ + protected $phpEx; + + /** + * Constructor + * + * @param auth $auth + * @param birthday_helper $birthday_helper + * @param config $config + * @param controller_helper $controller_helper + * @param dispatcher $dispatcher + * @param group_helper $group_helper + * @param language $language + * @param user $user + * @param template $template + * @param string $phpbb_root_path + * @param string $phpEx + */ + public function __construct(auth $auth, birthday_helper $birthday_helper, config $config, controller_helper $controller_helper, dispatcher $dispatcher, group_helper $group_helper, language $language, user $user, template $template, string $phpbb_root_path, string $phpEx) + { + $this->auth = $auth; + $this->birthday_helper = $birthday_helper; + $this->config = $config; + $this->controller_helper = $controller_helper; + $this->dispatcher = $dispatcher; + $this->group_helper = $group_helper; + $this->language = $language; + $this->user = $user; + $this->phpbb_root_path = $phpbb_root_path; + $this->phpEx = $phpEx; + } + + /** + * Display the index page + * + * @return Response + */ + public function handle(): Response + { + if (!function_exists('display_forums')) + { + include($this->phpbb_root_path . 'includes/functions_display.' . $this->phpEx); + } + + if (!function_exists('get_username_string')) + { + include($this->phpbb_root_path . 'includes/functions_content.' . $this->phpEx); + } + + $this->language->add_lang('viewforum'); + + display_forums('', $this->config['load_moderators']); + + // This is shown only if display_online_list is true + $this->group_helper->display_legend(); + + $this->birthday_helper->display_birthdays(); + + $this->template->assign_vars(array( + 'TOTAL_POSTS' => $this->language->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']), + 'TOTAL_TOPICS' => $this->language->lang('TOTAL_TOPICS', (int) $this->config['num_topics']), + 'TOTAL_USERS' => $this->language->lang('TOTAL_USERS', (int) $this->config['num_users']), + 'NEWEST_USER' => $this->language->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])), + + 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp.$this->phpEx", 'mode=login'), + 'U_SEND_PASSWORD' => ($this->config['email_enable'] && $this->config['allow_password_reset']) ? $this->controller_helper->route('phpbb_ucp_forgot_password_controller') : '', + 'S_INDEX' => true, + + 'U_CANONICAL' => generate_board_url() . '/', + 'U_MARK_FORUMS' => ($this->user->data['is_registered'] || $this->config['load_anon_lastread']) ? append_sid("{$this->phpbb_root_path}index.$this->phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : '', + 'U_MCP' => ($this->auth->acl_get('m_') || $this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->phpEx", 'i=main&mode=front') : '') + ); + + $page_title = ($this->config['board_index_text'] !== '') ? $this->config['board_index_text'] : $this->language->lang('INDEX'); + + /** + * You can use this event to modify the page title and load data for the index + * + * @event core.index_modify_page_title + * @var string page_title Title of the index page + * @since 3.1.0-a1 + */ + $vars = array('page_title'); + extract($this->dispatcher->trigger_event('core.index_modify_page_title', compact($vars))); + + return $this->controller_helper->render('index_body.html', $page_title, 200, true); + } +} From a0e3b4f56a7e83962095cffd2d39aa301096b81f Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 29 Dec 2025 16:51:29 +0100 Subject: [PATCH 1097/1214] [ticket/17588] Use router for index page PHPBB-17588 --- .../default/container/services_content.yml | 3 ++ .../default/container/services_mention.yml | 1 + .../config/default/container/services_ucp.yml | 1 + phpBB/includes/functions.php | 2 +- phpBB/includes/ucp/ucp_activate.php | 7 +++- phpBB/includes/ucp/ucp_login_link.php | 6 ++- phpBB/includes/ucp/ucp_profile.php | 7 +++- phpBB/includes/ucp/ucp_register.php | 5 ++- phpBB/includes/ucp/ucp_resend.php | 7 +++- phpBB/mcp.php | 4 +- phpBB/phpbb/forum/birthday_helper.php | 37 +++++++++++++++--- phpBB/phpbb/forum/controller/index.php | 25 ++++++------ phpBB/phpbb/members/viewonline_helper.php | 10 ++--- phpBB/phpbb/mention/controller/mention.php | 10 ++++- phpBB/phpbb/message/admin_form.php | 5 ++- phpBB/phpbb/message/form.php | 10 +++-- phpBB/phpbb/ucp/controller/delete_cookies.php | 16 ++++++-- phpBB/phpbb/ucp/controller/reset_password.php | 6 +-- phpBB/posting.php | 9 +++-- phpBB/search.php | 5 ++- phpBB/ucp.php | 39 ++++++++----------- tests/console/user/base.php | 5 +-- tests/functional/acp_attachments_test.php | 2 +- tests/mention/controller_test.php | 11 +++--- .../phpbb_functional_test_case.php | 10 +---- .../s9e/mention_helper_test.php | 5 +-- tests/viewonline/helper_test.php | 13 +++---- 27 files changed, 158 insertions(+), 103 deletions(-) diff --git a/phpBB/config/default/container/services_content.yml b/phpBB/config/default/container/services_content.yml index 53592a4d0c7..f1ff60c9574 100644 --- a/phpBB/config/default/container/services_content.yml +++ b/phpBB/config/default/container/services_content.yml @@ -32,6 +32,7 @@ services: - '@config' - '@config_text' - '@dbal.conn' + - '@controller.helper' - '@user' - '@event_dispatcher' - '%core.root_path%' @@ -43,6 +44,7 @@ services: - '@auth' - '@config' - '@dbal.conn' + - '@controller.helper' - '@user' - '%core.root_path%' - '%core.php_ext%' @@ -53,6 +55,7 @@ services: - '@auth' - '@config' - '@dbal.conn' + - '@controller.helper' - '@user' - '%core.root_path%' - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_mention.yml b/phpBB/config/default/container/services_mention.yml index e2861b984cd..39e6c8521a4 100644 --- a/phpBB/config/default/container/services_mention.yml +++ b/phpBB/config/default/container/services_mention.yml @@ -5,6 +5,7 @@ services: arguments: - '@mention.source_collection' - '@request' + - '@controller.helper' - '%core.root_path%' - '%core.php_ext%' diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index bbe5d35f2b4..dcf8c8af9fa 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -4,6 +4,7 @@ services: arguments: - '@config' - '@dispatcher' + - '@controller.helper' - '@language' - '@request' - '@user' diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f89644dce88..373e725e157 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3851,7 +3851,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'U_MEMBERLIST' => append_sid("{$phpbb_root_path}memberlist.$phpEx"), 'U_VIEWONLINE' => $auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel') ? $controller_helper->route('phpbb_members_online') : '', 'U_LOGIN_LOGOUT' => $u_login_logout, - 'U_INDEX' => append_sid("{$phpbb_root_path}index.$phpEx"), + 'U_INDEX' => $controller_helper->route('phpbb_index_controller'), 'U_SEARCH' => append_sid("{$phpbb_root_path}search.$phpEx"), 'U_SITE_HOME' => $config['site_home_url'], 'U_REGISTER' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=register'), diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 5351e7c5182..9b478b120ad 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -32,6 +32,9 @@ function main($id, $mode) global $config, $phpbb_root_path, $phpEx, $request; global $db, $user, $auth, $phpbb_container, $phpbb_log, $phpbb_dispatcher; + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + $user_id = $request->variable('u', 0); $key = $request->variable('k', ''); @@ -49,7 +52,7 @@ function main($id, $mode) if ($user_row['user_type'] <> USER_INACTIVE && !$user_row['user_newpasswd']) { - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, $controller_helper->route('phpbb_index_controller')); trigger_error('ALREADY_ACTIVATED'); } @@ -171,7 +174,7 @@ function main($id, $mode) $vars = array('user_row', 'message'); extract($phpbb_dispatcher->trigger_event('core.ucp_activate_after', compact($vars))); - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, $controller_helper->route('phpbb_index_controller')); trigger_error($user->lang[$message]); } } diff --git a/phpBB/includes/ucp/ucp_login_link.php b/phpBB/includes/ucp/ucp_login_link.php index b31457aa8cd..f5e90a0e309 100644 --- a/phpBB/includes/ucp/ucp_login_link.php +++ b/phpBB/includes/ucp/ucp_login_link.php @@ -257,8 +257,10 @@ protected function process_login_result($result) */ protected function perform_redirect() { - global $phpbb_root_path, $phpEx; - $url = append_sid($phpbb_root_path . 'index.' . $phpEx); + global $phpbb_container; + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + $url = $controller_helper->route('phpbb_index_controller'); redirect($url); } } diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index a8caee71214..5608a1138d2 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -36,6 +36,9 @@ function main($id, $mode) global $config, $db, $user, $auth, $template, $phpbb_root_path, $phpEx; global $request, $phpbb_container, $phpbb_log, $phpbb_dispatcher, $language; + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + $user->add_lang('posting'); $submit = $request->variable('submit', false, false, \phpbb\request\request_interface::POST); @@ -233,8 +236,8 @@ function main($id, $mode) // Now, we can remove the user completely (kill the session) - NOT BEFORE!!! if (!empty($sql_ary['user_actkey'])) { - meta_refresh(5, append_sid($phpbb_root_path . 'index.' . $phpEx)); - $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '    ', ''); + meta_refresh(5, $controller_helper->route('phpbb_index_controller')); + $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); // Because the user gets deactivated we log him out too, killing his session $user->session_kill(); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index e5319f1dbbc..1dbec8e3f67 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -32,6 +32,9 @@ function main($id, $mode) global $config, $db, $user, $template, $phpbb_root_path, $phpEx; global $request, $phpbb_container, $phpbb_dispatcher; + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + // if ($config['require_activation'] == USER_ACTIVATION_DISABLE || (in_array($config['require_activation'], array(USER_ACTIVATION_SELF, USER_ACTIVATION_ADMIN)) && !$config['email_enable'])) @@ -558,7 +561,7 @@ function main($id, $mode) ); extract($phpbb_dispatcher->trigger_event('core.ucp_register_register_after', compact($vars))); - $message = $message . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = $message . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); trigger_error($message); } } diff --git a/phpBB/includes/ucp/ucp_resend.php b/phpBB/includes/ucp/ucp_resend.php index c2debbbe27b..699e67b22af 100644 --- a/phpBB/includes/ucp/ucp_resend.php +++ b/phpBB/includes/ucp/ucp_resend.php @@ -32,6 +32,9 @@ function main($id, $mode) global $config, $phpbb_root_path, $phpEx; global $db, $user, $auth, $template, $request, $phpbb_container; + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + $username = $request->variable('username', '', true); $email = strtolower($request->variable('email', '')); $submit = (isset($_POST['submit'])) ? true : false; @@ -157,10 +160,10 @@ function main($id, $mode) $this->update_activation_expiration(); - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, $controller_helper->route('phpbb_index_controller')); $message = ($config['require_activation'] == USER_ACTIVATION_ADMIN) ? $user->lang['ACTIVATION_EMAIL_SENT_ADMIN'] : $user->lang['ACTIVATION_EMAIL_SENT']; - $message .= '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message .= '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); trigger_error($message); } diff --git a/phpBB/mcp.php b/phpBB/mcp.php index 582c8ed10bf..f42a79451ae 100644 --- a/phpBB/mcp.php +++ b/phpBB/mcp.php @@ -43,7 +43,9 @@ { if ($user->data['is_bot']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + /** @var \phpbb\controller\helper $controller_helper */ + $controller_helper = $phpbb_container->get('controller.helper'); + redirect($controller_helper->route('phpbb_index_controller')); } login_box('', $user->lang['LOGIN_EXPLAIN_MCP']); diff --git a/phpBB/phpbb/forum/birthday_helper.php b/phpBB/phpbb/forum/birthday_helper.php index a189c73d889..d6721d1556e 100644 --- a/phpBB/phpbb/forum/birthday_helper.php +++ b/phpBB/phpbb/forum/birthday_helper.php @@ -23,14 +23,38 @@ class birthday_helper { + /** @var auth */ protected $auth; + + /** @var config */ protected $config; + + /** @var driver_interface */ protected $db; + + /** @var dispatcher */ protected $dispatcher; + + /** @var language */ protected $language; + + /** @var template */ protected $template; + + /** @var user */ protected $user; + /** + * Constructor + * + * @param auth $auth + * @param config $config + * @param driver_interface $db + * @param dispatcher $dispatcher + * @param language $language + * @param template $template + * @param user $user + */ public function __construct(auth $auth, config $config, driver_interface $db, dispatcher $dispatcher, language $language, template $template, user $user) { $this->auth = $auth; @@ -42,7 +66,14 @@ public function __construct(auth $auth, config $config, driver_interface $db, di $this->user = $user; } - public function display_birthdays() + /** + * Display birthdays in index page + * + * @return void + * + * @psalm-suppress InvalidArgument + */ + public function display_birthdays(): void { $show_birthdays = ($this->config['load_birthdays'] && $this->config['allow_birthdays'] && $this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')); @@ -102,9 +133,6 @@ public function display_birthdays() 'USERNAME' => $birthday_username, 'AGE' => $birthday_age, ); - - // For 3.0 compatibility - $birthday_list[] = $birthday_username . (($birthday_age) ? " ({$birthday_age})" : ''); } /** @@ -122,7 +150,6 @@ public function display_birthdays() } $this->template->assign_vars([ - 'BIRTHDAY_LIST' => (empty($birthday_list)) ? '' : implode($this->language->lang('COMMA_SEPARATOR'), $birthday_list), 'S_DISPLAY_BIRTHDAY_LIST' => $show_birthdays, ]); } diff --git a/phpBB/phpbb/forum/controller/index.php b/phpBB/phpbb/forum/controller/index.php index 4273142bf5c..58651154c18 100644 --- a/phpBB/phpbb/forum/controller/index.php +++ b/phpBB/phpbb/forum/controller/index.php @@ -84,6 +84,7 @@ public function __construct(auth $auth, birthday_helper $birthday_helper, config $this->group_helper = $group_helper; $this->language = $language; $this->user = $user; + $this->template = $template; $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; } @@ -115,18 +116,18 @@ public function handle(): Response $this->birthday_helper->display_birthdays(); $this->template->assign_vars(array( - 'TOTAL_POSTS' => $this->language->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']), - 'TOTAL_TOPICS' => $this->language->lang('TOTAL_TOPICS', (int) $this->config['num_topics']), - 'TOTAL_USERS' => $this->language->lang('TOTAL_USERS', (int) $this->config['num_users']), - 'NEWEST_USER' => $this->language->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])), - - 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp.$this->phpEx", 'mode=login'), - 'U_SEND_PASSWORD' => ($this->config['email_enable'] && $this->config['allow_password_reset']) ? $this->controller_helper->route('phpbb_ucp_forgot_password_controller') : '', - 'S_INDEX' => true, - - 'U_CANONICAL' => generate_board_url() . '/', - 'U_MARK_FORUMS' => ($this->user->data['is_registered'] || $this->config['load_anon_lastread']) ? append_sid("{$this->phpbb_root_path}index.$this->phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : '', - 'U_MCP' => ($this->auth->acl_get('m_') || $this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->phpEx", 'i=main&mode=front') : '') + 'TOTAL_POSTS' => $this->language->lang('TOTAL_POSTS_COUNT', (int) $this->config['num_posts']), + 'TOTAL_TOPICS' => $this->language->lang('TOTAL_TOPICS', (int) $this->config['num_topics']), + 'TOTAL_USERS' => $this->language->lang('TOTAL_USERS', (int) $this->config['num_users']), + 'NEWEST_USER' => $this->language->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])), + + 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp.$this->phpEx", 'mode=login'), + 'U_SEND_PASSWORD' => ($this->config['email_enable'] && $this->config['allow_password_reset']) ? $this->controller_helper->route('phpbb_ucp_forgot_password_controller') : '', + 'S_INDEX' => true, + + 'U_CANONICAL' => generate_board_url() . '/', + 'U_MARK_FORUMS' => ($this->user->data['is_registered'] || $this->config['load_anon_lastread']) ? $this->controller_helper->route('phpbb_index_controller', ['hash' => generate_link_hash('global'), 'mark' => 'forums', 'mark_time' => time()]) : '', + 'U_MCP' => ($this->auth->acl_get('m_') || $this->auth->acl_getf_global('m_')) ? append_sid("{$this->phpbb_root_path}mcp.$this->phpEx", 'i=main&mode=front') : '') ); $page_title = ($this->config['board_index_text'] !== '') ? $this->config['board_index_text'] : $this->language->lang('INDEX'); diff --git a/phpBB/phpbb/members/viewonline_helper.php b/phpBB/phpbb/members/viewonline_helper.php index a8c9dac627b..8ead6c0e42d 100644 --- a/phpBB/phpbb/members/viewonline_helper.php +++ b/phpBB/phpbb/members/viewonline_helper.php @@ -184,6 +184,11 @@ public function get_location(string $session_page, int $forum_id): array switch ($match['_route']) { + case 'phpbb_index_controller': + $location = $this->language->lang('INDEX'); + $location_url = $this->helper->route('phpbb_index_controller'); + break; + case 'phpbb_help_bbcode_controller': case 'phpbb_help_faq_controller': $location = $this->language->lang('VIEWING_FAQ'); @@ -219,11 +224,6 @@ public function get_location(string $session_page, int $forum_id): array switch ($on_page[1]) { - case 'index': - $location = $this->language->lang('INDEX'); - $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); - break; - case $this->phpbb_adm_relative_path . 'index': $location = $this->language->lang('ACP'); $location_url = append_sid($this->phpbb_root_path . "index." . $this->php_ex); diff --git a/phpBB/phpbb/mention/controller/mention.php b/phpBB/phpbb/mention/controller/mention.php index 37a5cfd3238..f7f9951327d 100644 --- a/phpBB/phpbb/mention/controller/mention.php +++ b/phpBB/phpbb/mention/controller/mention.php @@ -13,6 +13,7 @@ namespace phpbb\mention\controller; +use phpbb\controller\helper; use phpbb\di\service_collection; use phpbb\request\request_interface; use Symfony\Component\HttpFoundation\JsonResponse; @@ -26,6 +27,9 @@ class mention /** @var request_interface */ protected $request; + /** @var helper */ + protected $helper; + /** @var string */ protected $phpbb_root_path; @@ -37,13 +41,15 @@ class mention * * @param service_collection|array $mention_sources * @param request_interface $request + * @param helper $helper * @param string $phpbb_root_path * @param string $phpEx */ - public function __construct($mention_sources, request_interface $request, string $phpbb_root_path, string $phpEx) + public function __construct($mention_sources, request_interface $request, helper $helper, string $phpbb_root_path, string $phpEx) { $this->mention_sources = $mention_sources; $this->request = $request; + $this->helper = $helper; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $phpEx; } @@ -57,7 +63,7 @@ public function handle() { if (!$this->request->is_ajax()) { - return new RedirectResponse(append_sid($this->phpbb_root_path . 'index.' . $this->php_ext)); + return new RedirectResponse($this->helper->route('phpbb_index_controller')); } $keyword = $this->request->variable('keyword', '', true); diff --git a/phpBB/phpbb/message/admin_form.php b/phpBB/phpbb/message/admin_form.php index 30c863bb7ff..dde80bea752 100644 --- a/phpBB/phpbb/message/admin_form.php +++ b/phpBB/phpbb/message/admin_form.php @@ -39,14 +39,15 @@ class admin_form extends form * @param \phpbb\config\config $config * @param \phpbb\config\db_text $config_text * @param \phpbb\db\driver\driver_interface $db + * @param \phpbb\controller\helper $controller_helper * @param \phpbb\user $user * @param \phpbb\event\dispatcher_interface $dispatcher * @param string $phpbb_root_path * @param string $phpEx */ - public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, \phpbb\event\dispatcher_interface $dispatcher, $phpbb_root_path, $phpEx) + public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\config\db_text $config_text, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $controller_helper, \phpbb\user $user, \phpbb\event\dispatcher_interface $dispatcher, $phpbb_root_path, $phpEx) { - parent::__construct($auth, $config, $db, $user, $phpbb_root_path, $phpEx); + parent::__construct($auth, $config, $db, $controller_helper, $user, $phpbb_root_path, $phpEx); $this->config_text = $config_text; $this->dispatcher = $dispatcher; } diff --git a/phpBB/phpbb/message/form.php b/phpBB/phpbb/message/form.php index 479d6872121..5e942473cc2 100644 --- a/phpBB/phpbb/message/form.php +++ b/phpBB/phpbb/message/form.php @@ -22,6 +22,8 @@ abstract class form protected $auth; /** @var \phpbb\config\config */ protected $config; + /** @var \phpbb\controller\helper */ + protected $controller_helper; /** @var \phpbb\db\driver\driver_interface */ protected $db; /** @var \phpbb\message\message */ @@ -47,17 +49,19 @@ abstract class form * @param \phpbb\auth\auth $auth * @param \phpbb\config\config $config * @param \phpbb\db\driver\driver_interface $db + * @param \phpbb\controller\helper $controller_helper * @param \phpbb\user $user * @param string $phpbb_root_path * @param string $phpEx */ - public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\user $user, $phpbb_root_path, $phpEx) + public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config, \phpbb\db\driver\driver_interface $db, \phpbb\controller\helper $controller_helper, \phpbb\user $user, $phpbb_root_path, $phpEx) { $this->phpbb_root_path = $phpbb_root_path; $this->phpEx = $phpEx; $this->user = $user; $this->auth = $auth; $this->config = $config; + $this->controller_helper = $controller_helper; $this->db = $db; $this->message = new message($config['server_name']); @@ -111,7 +115,7 @@ public function check_allow() */ public function get_return_message() { - return sprintf($this->user->lang['RETURN_INDEX'], '', ''); + return sprintf($this->user->lang['RETURN_INDEX'], '', ''); } /** @@ -153,7 +157,7 @@ public function submit(\phpbb\di\service_collection $messenger) $this->message->send($messenger, phpbb_get_board_contact($this->config, $this->phpEx)); - meta_refresh(3, append_sid($this->phpbb_root_path . 'index.' . $this->phpEx)); + meta_refresh(3, $this->controller_helper->route('phpbb_index_controller')); trigger_error($this->user->lang['EMAIL_SENT'] . '

    ' . $this->get_return_message()); } } diff --git a/phpBB/phpbb/ucp/controller/delete_cookies.php b/phpBB/phpbb/ucp/controller/delete_cookies.php index 869227abea0..3ab0b3ee3dc 100644 --- a/phpBB/phpbb/ucp/controller/delete_cookies.php +++ b/phpBB/phpbb/ucp/controller/delete_cookies.php @@ -14,6 +14,7 @@ namespace phpbb\ucp\controller; use phpbb\config\config; +use phpbb\controller\helper; use phpbb\event\dispatcher_interface; use phpbb\language\language; use phpbb\request\request_interface; @@ -27,6 +28,9 @@ class delete_cookies /** @var dispatcher_interface */ private $dispatcher; + /** @var helper */ + private $helper; + /** @var language */ private $language; @@ -47,14 +51,18 @@ class delete_cookies * * @param config $config * @param dispatcher_interface $dispatcher + * @param helper $helper * @param language $language * @param request_interface $request * @param user $user + * @param string $phpbb_root_path + * @param string $php_ext */ - public function __construct(config $config, dispatcher_interface $dispatcher, language $language, request_interface $request, user $user, string $phpbb_root_path, string $php_ext) + public function __construct(config $config, dispatcher_interface $dispatcher, helper $helper, language $language, request_interface $request, user $user, string $phpbb_root_path, string $php_ext) { $this->config = $config; $this->dispatcher = $dispatcher; + $this->helper = $helper; $this->language = $language; $this->request = $request; $this->user = $user; @@ -119,9 +127,9 @@ public function handle() $this->user->session_kill(); $this->user->session_begin(); - meta_refresh(3, append_sid("{$this->phpbb_root_path}index.$this->php_ext")); + meta_refresh(3, $this->helper->route('phpbb_index_controller')); - $message = $this->language->lang('COOKIES_DELETED') . '

    ' . $this->language->lang('RETURN_INDEX', 'phpbb_root_path}index.$this->php_ext") . '">', ''); + $message = $this->language->lang('COOKIES_DELETED') . '

    ' . $this->language->lang('RETURN_INDEX', '', ''); trigger_error($message); } else @@ -129,6 +137,6 @@ public function handle() confirm_box(false, 'DELETE_COOKIES', ''); } - redirect(append_sid("{$this->phpbb_root_path}index.$this->php_ext")); + redirect($this->helper->route('phpbb_index_controller')); } } diff --git a/phpBB/phpbb/ucp/controller/reset_password.php b/phpBB/phpbb/ucp/controller/reset_password.php index 790e00138c1..5d8feb8f787 100644 --- a/phpBB/phpbb/ucp/controller/reset_password.php +++ b/phpBB/phpbb/ucp/controller/reset_password.php @@ -214,7 +214,7 @@ public function request() } else { - $message = $this->language->lang('PASSWORD_RESET_LINK_SENT') . '

    ' . $this->language->lang('RETURN_INDEX', 'root_path}index.{$this->php_ext}") . '">', ''); + $message = $this->language->lang('PASSWORD_RESET_LINK_SENT') . '

    ' . $this->language->lang('RETURN_INDEX', '', ''); if (empty($rowset)) { @@ -335,7 +335,7 @@ public function reset() $user_row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); - $message = $this->language->lang('RESET_TOKEN_EXPIRED_OR_INVALID') . '

    ' . $this->language->lang('RETURN_INDEX', 'root_path}index.{$this->php_ext}") . '">', ''); + $message = $this->language->lang('RESET_TOKEN_EXPIRED_OR_INVALID') . '

    ' . $this->language->lang('RETURN_INDEX', '', ''); if (empty($user_row)) { @@ -416,7 +416,7 @@ public function reset() 'reportee_id' => $user_row['user_id'], $user_row['username'] ]); - meta_refresh(3, append_sid("{$this->root_path}index.{$this->php_ext}")); + meta_refresh(3, $this->helper->route('phpbb_index_controller')); return $this->helper->message($this->language->lang('PASSWORD_RESET')); } } diff --git a/phpBB/posting.php b/phpBB/posting.php index 9f8cce0ead1..f5d134e06f6 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -41,6 +41,9 @@ $submit = $request->is_set_post('post') && !$refresh && !$preview; $mode = $request->variable('mode', ''); +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); + // Only assign required URL parameters $forum_id = 0; $topic_id = 0; @@ -178,7 +181,7 @@ // Was cancel pressed? If so then redirect to the appropriate page if ($cancel) { - $redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : append_sid("{$phpbb_root_path}index.$phpEx"))); + $redirect = ($post_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 'p=' . $post_id) . '#p' . $post_id : (($topic_id) ? append_sid("{$phpbb_root_path}viewtopic.$phpEx", 't=' . $topic_id) : (($forum_id) ? append_sid("{$phpbb_root_path}viewforum.$phpEx", 'f=' . $forum_id) : $controller_helper->route('phpbb_index_controller'))); redirect($redirect); } @@ -306,7 +309,7 @@ // Check permissions if ($user->data['is_bot']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } // Is the user able to read within this forum? @@ -1916,8 +1919,6 @@ $form_enctype = (@ini_get('file_uploads') == '0' || strtolower(@ini_get('file_uploads')) == 'off' || !$config['allow_attachments'] || !$auth->acl_get('u_attach') || !$auth->acl_get('f_attach', $forum_id)) ? '' : ' enctype="multipart/form-data"'; add_form_key('posting'); -/** @var \phpbb\controller\helper $controller_helper */ -$controller_helper = $phpbb_container->get('controller.helper'); // Build array of variables for main posting page $page_data = array( diff --git a/phpBB/search.php b/phpBB/search.php index c6379d28559..92d431c9362 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -19,6 +19,9 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); + // Start session management $user->session_begin(); $auth->acl($user->data); @@ -483,7 +486,7 @@ gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param); $s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = ''; - $template->assign_var('U_MARK_ALL_READ', ($user->data['is_registered'] || $config['load_anon_lastread']) ? append_sid("{$phpbb_root_path}index.$phpEx", 'hash=' . generate_link_hash('global') . '&mark=forums&mark_time=' . time()) : ''); + $template->assign_var('U_MARK_ALL_READ', ($user->data['is_registered'] || $config['load_anon_lastread']) ? $controller_helper->route('phpbb_index_controller', ['hash' => generate_link_hash('global'), 'mark' => 'forums', 'mark_time' => time()]) : ''); break; case 'newposts': diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 45593ffb4e5..d549674df9b 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -47,6 +47,9 @@ $module = new p_master(); $default = false; +/** @var \phpbb\controller\helper $controller_helper */ +$controller_helper = $phpbb_container->get('controller.helper'); + // Basic "global" modes switch ($mode) { @@ -54,7 +57,7 @@ $module->load('ucp', 'activate'); $module->display($user->lang['UCP_ACTIVATE']); - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); break; case 'resend_act': @@ -63,16 +66,13 @@ break; case 'sendpassword': - /** @var \phpbb\controller\helper $controller_helper */ - $controller_helper = $phpbb_container->get('controller.helper'); - redirect($controller_helper->route('phpbb_ucp_forgot_password_controller')); break; case 'register': if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $module->load('ucp', 'register'); @@ -86,7 +86,7 @@ case 'login': if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } login_box($request->variable('redirect', "index.$phpEx")); @@ -95,7 +95,7 @@ case 'login_link': if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $module->load('ucp', 'login_link'); @@ -109,13 +109,13 @@ } else if ($user->data['user_id'] != ANONYMOUS) { - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, $controller_helper->route('phpbb_index_controller')); - $message = $user->lang['LOGOUT_FAILED'] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ' '); + $message = $user->lang['LOGOUT_FAILED'] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ' '); trigger_error($message); } - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); break; case 'terms': @@ -128,7 +128,7 @@ { if ($user->data['is_registered']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } login_box(); @@ -154,15 +154,11 @@ break; case 'delete_cookies': - /** @var \phpbb\controller\helper $controller_helper */ - $controller_helper = $phpbb_container->get('controller.helper'); - // Redirect to controller redirect($controller_helper->route('phpbb_ucp_delete_cookies_controller')); break; case 'switch_perm': - $user_id = $request->variable('u', 0); $sql = 'SELECT * @@ -174,7 +170,7 @@ if (!$auth->acl_get('a_switchperm') || !$user_row || $user_id == $user->data['user_id'] || !check_link_hash($request->variable('hash', ''), 'switchperm')) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } include($phpbb_root_path . 'includes/acp/auth.' . $phpEx); @@ -182,12 +178,12 @@ $auth_admin = new auth_admin(); if (!$auth_admin->ghost_permissions($user_id, $user->data['user_id'])) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ACL_TRANSFER_PERMISSIONS', false, array($user_row['username'])); - $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = sprintf($user->lang['PERMISSIONS_TRANSFERRED'], $user_row['username']) . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); /** * Event to run code after permissions are switched @@ -206,10 +202,9 @@ break; case 'restore_perm': - if (!$user->data['user_perm_from'] || !$auth->acl_get('a_switchperm')) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } $auth->acl_cache($user->data); @@ -223,7 +218,7 @@ $phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_ACL_RESTORE_PERMISSIONS', false, array($username)); - $message = $user->lang['PERMISSIONS_RESTORED'] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $message = $user->lang['PERMISSIONS_RESTORED'] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); /** * Event to run code after permissions are restored @@ -256,7 +251,7 @@ { if ($user->data['is_bot']) { - redirect(append_sid("{$phpbb_root_path}index.$phpEx")); + redirect($controller_helper->route('phpbb_index_controller')); } if ($id == 'pm' && $mode == 'view' && isset($_GET['p'])) diff --git a/tests/console/user/base.php b/tests/console/user/base.php index 06e80200b52..3e26d5ad5a7 100644 --- a/tests/console/user/base.php +++ b/tests/console/user/base.php @@ -64,10 +64,7 @@ protected function setUp(): void ->method('lang') ->will($this->returnArgument(0)); - $user = $this->user = $this->createMock('\phpbb\user', array(), array( - $this->language, - '\phpbb\datetime' - )); + $user = $this->user = $this->createMock('\phpbb\user'); $user->data['user_email'] = ''; $avatar_helper = $this->getMockBuilder('\phpbb\avatar\helper') diff --git a/tests/functional/acp_attachments_test.php b/tests/functional/acp_attachments_test.php index 099a38c3292..b4de2f2beec 100644 --- a/tests/functional/acp_attachments_test.php +++ b/tests/functional/acp_attachments_test.php @@ -46,7 +46,7 @@ protected function tearDown(): void private function upload_file($filename, $mimetype) { - $crawler = self::$client->request( + $crawler = self::request( 'GET', 'posting.php?mode=reply&f=2&t=1&sid=' . $this->sid ); diff --git a/tests/mention/controller_test.php b/tests/mention/controller_test.php index 1cb2c2f789f..468a81bcf69 100644 --- a/tests/mention/controller_test.php +++ b/tests/mention/controller_test.php @@ -76,10 +76,7 @@ public function setUp(): void $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); // User - $user = $this->createMock('\phpbb\user', array(), array( - $lang, - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->ip = ''; $user->data = array( 'user_id' => 2, @@ -100,6 +97,9 @@ public function setUp(): void $user_loader = new \phpbb\user_loader($avatar_helper, $db, $phpbb_root_path, $phpEx, USERS_TABLE); + // Controller helper + $controller_helper = $this->createMock('\phpbb\controller\helper'); + // Container $phpbb_container = new ContainerBuilder(); @@ -114,6 +114,7 @@ public function setUp(): void $phpbb_container->set('cache.driver', $cache_driver); $phpbb_container->set('cache', $cache); $phpbb_container->set('request', $request); + $phpbb_container->set('controller.helper', $controller_helper); $phpbb_container->set('group_helper', new \phpbb\group\helper( $this->getMockBuilder('\phpbb\auth\auth')->disableOriginalConstructor()->getMock(), $avatar_helper, @@ -160,7 +161,7 @@ public function setUp(): void $mention_sources_array['mention.source.' . $source] = $class; } - $this->controller = new \phpbb\mention\controller\mention($mention_sources_array, $request, $phpbb_root_path, $phpEx); + $this->controller = new \phpbb\mention\controller\mention($mention_sources_array, $request, $controller_helper, $phpbb_root_path, $phpEx); } public static function handle_data() diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 0651ec321ee..6ed579ad2c0 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -968,10 +968,7 @@ protected function remove_user_group($group_name, $usernames) $db = $this->get_db(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->data['user_id'] = 2; // admin $user->ip = ''; @@ -1009,10 +1006,7 @@ protected function add_user_group($group_name, $usernames, $default = false, $le $db = $this->get_db(); $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); - $user = $this->createMock('\phpbb\user', array(), array( - new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)), - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->data['user_id'] = 2; // admin $user->ip = ''; diff --git a/tests/text_formatter/s9e/mention_helper_test.php b/tests/text_formatter/s9e/mention_helper_test.php index 356dbb59160..bebfd2c4aa9 100644 --- a/tests/text_formatter/s9e/mention_helper_test.php +++ b/tests/text_formatter/s9e/mention_helper_test.php @@ -52,10 +52,7 @@ public function setUp(): void $lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx)); // User - $user = $this->createMock('\phpbb\user', array(), array( - $lang, - '\phpbb\datetime' - )); + $user = $this->createMock('\phpbb\user'); $user->ip = ''; $user->data = array( 'user_id' => 2, diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php index 01a9c96edc3..d383f9b2f2b 100644 --- a/tests/viewonline/helper_test.php +++ b/tests/viewonline/helper_test.php @@ -111,6 +111,12 @@ public static function get_location_data() { return array( // Route-based pages - routes have prefixes as defined in routing.yml + // index + array('', 0, true, 'Index page', './'), + array('/', 0, true, 'Index page', './'), + array('/app.php/', 0, true, 'Index page', './'), + array('index.php', 0, true, 'Index page', './index.php'), + array('./index.php', 0, true, 'Index page', './index.php'), // help.yml routes have prefix /help array('/help/bbcode', 0, true, 'Viewing FAQ', './help/faq'), array('/help/faq', 0, true, 'Viewing FAQ', './help/faq'), @@ -122,10 +128,6 @@ public static function get_location_data() array('/pm/5/report', 0, true, 'Reporting post', './index.php'), array('/post/10/report', 0, true, 'Reporting post', './index.php'), - // Legacy pages - index - array('index.php', 0, true, 'Index page', './index.php'), - array('./index.php', 0, true, 'Index page', './index.php'), - // Legacy pages - admin array('adm/index.php', 0, true, 'Administration Control Panel', './index.php'), @@ -162,9 +164,6 @@ public static function get_location_data() // Unknown route array('/unknown/route', 0, true, 'Index page', './index.php'), - - // Empty page - array('', 0, true, 'Index page', './index.php'), ); } From 4c5f138212de7769ffcbeb4f400f94a9cc89bdd1 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Mon, 5 Jan 2026 17:57:02 +0100 Subject: [PATCH 1098/1214] [ticket/17588] Code style improvements PHPBB-17588 --- phpBB/includes/ucp/ucp_profile.php | 23 ++++++++++++----------- phpBB/phpbb/forum/birthday_helper.php | 2 +- phpBB/phpbb/forum/controller/index.php | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 5608a1138d2..7802ade5d0a 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -236,8 +236,9 @@ function main($id, $mode) // Now, we can remove the user completely (kill the session) - NOT BEFORE!!! if (!empty($sql_ary['user_actkey'])) { - meta_refresh(5, $controller_helper->route('phpbb_index_controller')); - $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_INDEX'], '', ''); + $index_route = $controller_helper->route('phpbb_index_controller'); + meta_refresh(5, $index_route); + $message = $language->lang($message) . '

    ' . sprintf($language->lang('RETURN_INDEX'), '', ''); // Because the user gets deactivated we log him out too, killing his session $user->session_kill(); @@ -245,7 +246,7 @@ function main($id, $mode) else { meta_refresh(3, $this->u_action); - $message = $user->lang[$message] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); + $message = $language->lang($message) . '

    ' . sprintf($language->lang('RETURN_UCP'), '', ''); } trigger_error($message); @@ -392,7 +393,7 @@ function main($id, $mode) $cp->update_profile_field_data($user->data['user_id'], $cp_data); meta_refresh(3, $this->u_action); - $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); + $message = $language->lang('PROFILE_UPDATED') . '

    ' . sprintf($language->lang('RETURN_UCP'), '', ''); trigger_error($message); } @@ -566,7 +567,7 @@ function main($id, $mode) WHERE user_id = ' . $user->data['user_id']; $db->sql_query($sql); - $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); + $message = $language->lang('PROFILE_UPDATED') . '

    ' . sprintf($language->lang('RETURN_UCP'), '', ''); trigger_error($message); } } @@ -592,9 +593,9 @@ function main($id, $mode) 'S_MAGIC_URL_CHECKED' => (!$enable_urls) ? ' checked="checked"' : '', 'BBCODE_STATUS' => $user->lang(($config['allow_sig_bbcode'] ? 'BBCODE_IS_ON' : 'BBCODE_IS_OFF'), '', ''), - 'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $user->lang['SMILIES_ARE_ON'] : $user->lang['SMILIES_ARE_OFF'], - 'IMG_STATUS' => ($config['allow_sig_img']) ? $user->lang['IMAGES_ARE_ON'] : $user->lang['IMAGES_ARE_OFF'], - 'URL_STATUS' => ($config['allow_sig_links']) ? $user->lang['URL_IS_ON'] : $user->lang['URL_IS_OFF'], + 'SMILIES_STATUS' => ($config['allow_sig_smilies']) ? $language->lang('SMILIES_ARE_ON') : $language->lang('SMILIES_ARE_OFF'), + 'IMG_STATUS' => ($config['allow_sig_img']) ? $language->lang('IMAGES_ARE_ON') : $language->lang('IMAGES_ARE_OFF'), + 'URL_STATUS' => ($config['allow_sig_links']) ? $language->lang('URL_IS_ON') : $language->lang('URL_IS_OFF'), 'MAX_FONT_SIZE' => (int) $config['max_sig_font_size'], 'L_SIGNATURE_EXPLAIN' => $user->lang('SIGNATURE_EXPLAIN', (int) $config['max_sig_chars']), @@ -725,7 +726,7 @@ function main($id, $mode) $phpbb_avatar_manager->handle_avatar_delete($db, $user, $avatar_data, USERS_TABLE, 'user_'); meta_refresh(3, $this->u_action); - $message = $user->lang['PROFILE_UPDATED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); + $message = $language->lang('PROFILE_UPDATED') . '

    ' . sprintf($language->lang('RETURN_UCP'), '', ''); trigger_error($message); } } @@ -815,7 +816,7 @@ function main($id, $mode) $db->sql_query($sql); meta_refresh(3, $this->u_action); - $message = $user->lang['AUTOLOGIN_SESSION_KEYS_DELETED'] . '

    ' . sprintf($user->lang['RETURN_UCP'], '', ''); + $message = $language->lang('AUTOLOGIN_SESSION_KEYS_DELETED') . '

    ' . sprintf($language->lang('RETURN_UCP'), '', ''); trigger_error($message); } } @@ -875,7 +876,7 @@ function main($id, $mode) $template->assign_vars(array( 'ERROR' => (count($error)) ? implode('
    ', $error) : '', - 'L_TITLE' => $user->lang['UCP_PROFILE_' . strtoupper($mode)], + 'L_TITLE' => $language->lang('UCP_PROFILE_' . strtoupper($mode)), 'S_HIDDEN_FIELDS' => $s_hidden_fields, 'S_UCP_ACTION' => $this->u_action) diff --git a/phpBB/phpbb/forum/birthday_helper.php b/phpBB/phpbb/forum/birthday_helper.php index d6721d1556e..4c93f387bc1 100644 --- a/phpBB/phpbb/forum/birthday_helper.php +++ b/phpBB/phpbb/forum/birthday_helper.php @@ -77,7 +77,7 @@ public function display_birthdays(): void { $show_birthdays = ($this->config['load_birthdays'] && $this->config['allow_birthdays'] && $this->auth->acl_gets('u_viewprofile', 'a_user', 'a_useradd', 'a_userdel')); - $birthdays = $birthday_list = array(); + $birthdays = array(); if ($show_birthdays) { $time = $this->user->create_datetime(); diff --git a/phpBB/phpbb/forum/controller/index.php b/phpBB/phpbb/forum/controller/index.php index 58651154c18..a074c609fb6 100644 --- a/phpBB/phpbb/forum/controller/index.php +++ b/phpBB/phpbb/forum/controller/index.php @@ -122,7 +122,7 @@ public function handle(): Response 'NEWEST_USER' => $this->language->lang('NEWEST_USER', get_username_string('full', $this->config['newest_user_id'], $this->config['newest_username'], $this->config['newest_user_colour'])), 'S_LOGIN_ACTION' => append_sid("{$this->phpbb_root_path}ucp.$this->phpEx", 'mode=login'), - 'U_SEND_PASSWORD' => ($this->config['email_enable'] && $this->config['allow_password_reset']) ? $this->controller_helper->route('phpbb_ucp_forgot_password_controller') : '', + 'U_SEND_PASSWORD' => ($this->config['email_enable'] && $this->config['allow_password_reset']) ? $this->controller_helper->route('phpbb_ucp_forgot_password_controller') : '', 'S_INDEX' => true, 'U_CANONICAL' => generate_board_url() . '/', From 799a8fe7d3e333b173dfe653ab46b1e982a7a013 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Fri, 26 Dec 2025 20:28:01 +0100 Subject: [PATCH 1099/1214] [ticket/17590] Use index.php as frontend controller PHPBB-17590 --- phpBB/.htaccess | 6 +- phpBB/app.php | 17 ++ phpBB/assets/javascript/installer.js | 2 +- phpBB/config/default/routing/routing.yml | 2 +- phpBB/docs/INSTALL.html | 14 +- phpBB/docs/lighttpd.sample.conf | 8 +- phpBB/docs/nginx.sample.conf | 8 +- phpBB/includes/acp/acp_board.php | 6 +- phpBB/includes/acp/acp_update.php | 4 +- phpBB/includes/functions.php | 2 +- phpBB/install/index.html | 11 -- phpBB/install/{app.php => index.php} | 0 phpBB/install/startup.php | 2 +- phpBB/language/en/acp/board.php | 2 +- phpBB/phpbb/feed/helper.php | 2 +- .../obtain_data/task/obtain_server_data.php | 2 +- phpBB/phpbb/members/controller/online.php | 2 +- phpBB/phpbb/path_helper.php | 54 +++---- phpBB/phpbb/routing/helper.php | 12 +- phpBB/phpbb/routing/router.php | 4 +- phpBB/web.config | 2 +- tests/controller/common_helper_route.php | 148 +++++++++--------- tests/controller/helper_route_other_app.php | 4 +- tests/controller/helper_route_root_test.php | 4 +- tests/controller/helper_route_slash_test.php | 4 +- tests/cron/wrapper_test.php | 4 +- tests/functional/browse_test.php | 6 +- .../controllers_compatibility_test.php | 30 ++-- tests/functional/download_test.php | 10 +- .../functional/extension_controller_test.php | 20 +-- tests/functional/feed_test.php | 46 +++--- .../ext/foo/bar/controller/controller.php | 2 +- tests/functional/forgot_password_test.php | 4 +- tests/functional/manifest_test.php | 2 +- tests/functional/memberlist_test.php | 2 +- tests/functional/prune_shadow_topic_test.php | 2 +- tests/functional/report_post_captcha_test.php | 6 +- tests/functional/ucp_attachments_test.php | 2 +- tests/functional/user_password_reset_test.php | 12 +- tests/functional/viewonline_test.php | 10 +- tests/functional/visit_installer_test.php | 7 +- .../phpbb_get_install_redirect_test.php | 14 +- tests/pagination/pagination_test.php | 6 +- tests/path_helper/path_helper_test.php | 42 +++-- tests/security/redirect_test.php | 22 +-- tests/session/extract_page_test.php | 12 +- tests/viewonline/helper_test.php | 2 +- vagrant/after.sh | 2 +- 48 files changed, 293 insertions(+), 294 deletions(-) delete mode 100644 phpBB/install/index.html rename phpBB/install/{app.php => index.php} (100%) diff --git a/phpBB/.htaccess b/phpBB/.htaccess index e55375e58be..7dc06167b8d 100644 --- a/phpBB/.htaccess +++ b/phpBB/.htaccess @@ -20,13 +20,13 @@ RewriteEngine on # # The following 3 lines will rewrite URLs passed through the front controller -# to not require app.php in the actual URL. In other words, a controller is -# by default accessed at /app.php/my/controller, but can also be accessed at +# to not require index.php in the actual URL. In other words, a controller is +# by default accessed at /index.php/my/controller, but can also be accessed at # /my/controller # RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule ^(.*)$ app.php [QSA,L] +RewriteRule ^(.*)$ index.php [QSA,L] # # If symbolic links are not already being followed, diff --git a/phpBB/app.php b/phpBB/app.php index 3781bfe0f0e..53328f8f02a 100644 --- a/phpBB/app.php +++ b/phpBB/app.php @@ -14,11 +14,28 @@ /** * @ignore */ + +use Symfony\Component\HttpFoundation\RedirectResponse; + define('IN_PHPBB', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './'; $phpEx = substr(strrchr(__FILE__, '.'), 1); include($phpbb_root_path . 'common.' . $phpEx); +if (basename($symfony_request->getScriptName()) === 'app.php') +{ + $base_path = $symfony_request->getBasePath(); + $path_info = $symfony_request->getPathInfo(); + $query_string = $symfony_request->getQueryString(); + + $url = $base_path . '/index.php' . $path_info . ($query_string ? '?' . $query_string : ''); + + $response = new RedirectResponse($url, 301); + $response->send(); + + exit; +} + // Start session management $user->session_begin(); $auth->acl($user->data); diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js index f6579f0d55e..26c62889cd9 100644 --- a/phpBB/assets/javascript/installer.js +++ b/phpBB/assets/javascript/installer.js @@ -375,7 +375,7 @@ */ function queryInstallerStatus() { var url = $(location).attr('pathname'); - var lookUp = 'install/app.php'; + var lookUp = 'install/index.php'; var position = url.indexOf(lookUp); if (position === -1) { diff --git a/phpBB/config/default/routing/routing.yml b/phpBB/config/default/routing/routing.yml index 371cd23a251..513702afe39 100644 --- a/phpBB/config/default/routing/routing.yml +++ b/phpBB/config/default/routing/routing.yml @@ -4,7 +4,7 @@ # path: /foo # defaults: { _controller: foo_sevice:method } # -# The above will be accessed via app.php?controller=foo and it will +# The above will be accessed via index.php?controller=foo and it will # instantiate the 'foo_service' service and call the 'method' method. # diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html index 0752d2c5071..58ebb0ee492 100644 --- a/phpBB/docs/INSTALL.html +++ b/phpBB/docs/INSTALL.html @@ -109,7 +109,7 @@

    Install

  • Change the permissions on config.php to be writable by all (666 or -rw-rw-rw- within your FTP Client)
  • Change the permissions on the following directories to be writable by all (777 or -rwxrwxrwx within your FTP Client):
    store/, cache/, files/ and images/avatars/upload/.
    • -
  • Point your web browser to the location where you uploaded the phpBB files with the addition of install/app.php or simply install/, e.g. http://www.example.com/phpBB/install/app.php, http://www.example.com/forum/install/.
    • +
  • Point your web browser to the location where you uploaded the phpBB files with the addition of install/index.php or simply install/, e.g. http://www.example.com/phpBB/install/index.php, http://www.example.com/forum/install/.
  • Click the INSTALL tab, follow the steps and fill out all the requested information.
  • Change the permissions on config.php to be writable only by yourself (644 or -rw-r--r-- within your FTP Client)
  • phpBB should now be available, please MAKE SURE you read at least Section 6 below for important, security related post-installation instructions, and also take note of Section 7 regarding anti-spam measures.
    • @@ -190,7 +190,7 @@

    Install

    phpBB comes supplied with British English as its standard language. However, a number of separate packs for different languages are available. If you are not a native English speaker you may wish to install one or more of these packages before continuing. The installation process below will allow you to select a default language from those available (you can, of course, change this default at a later stage). For more details on language packs, where to obtain them and how to install them please see the README.

    -

    Once all the files have been uploaded to your site, you should point your browser at this location with the addition of /install/. For example, if your domain name is www.example.com and you placed the phpBB files in the directory /phpBB off your web root you would enter http://www.example.com/phpBB/install/ or (alternatively) http://www.example.com/phpBB/install/app.php into your browser. When you have done this, you should see the phpBB Introduction screen appear.

    +

    Once all the files have been uploaded to your site, you should point your browser at this location with the addition of /install/. For example, if your domain name is www.example.com and you placed the phpBB files in the directory /phpBB off your web root you would enter http://www.example.com/phpBB/install/ or (alternatively) http://www.example.com/phpBB/install/index.php into your browser. When you have done this, you should see the phpBB Introduction screen appear.

    Introduction:

    @@ -272,9 +272,9 @@

    Advanced settings

    First, you should make a copy of your existing config.php file; keep it in a safe place! Next, delete all the existing phpBB files, you should leave your files/, images/ and ext/ directories in place, otherwise you will lose your file attachments, uploaded images and get errors due to missing extension files. You can leave alternative styles in place too. With this complete, you can upload the new phpBB files (see New installation for details if necessary). Once complete, copy back your saved config.php, replacing the new one. Another method is to just replace the existing files with the files from the full package - though make sure you do not overwrite your config.php file.

    -

    You should now got to /install/app.php/update which will display a warning: No valid update directory was found, please make sure you uploaded the relevant files. Beneath that warning you will see a radio button Update database only, just click Submit. Depending on your previous version this will make a number of database changes. You may receive FAILURES during this procedure. They should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

    +

    You should now got to /install/index.php/update which will display a warning: No valid update directory was found, please make sure you uploaded the relevant files. Beneath that warning you will see a radio button Update database only, just click Submit. Depending on your previous version this will make a number of database changes. You may receive FAILURES during this procedure. They should not be a cause for concern unless you see an actual ERROR, in which case the script will stop (in this case you should seek help via our forums or bug tracker). If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

    -

    Once /install/app.php/update has completed, it displays the success message: The database update was successful. You may proceed to the Administration Control Panel and then remove the install directory as advised.

    +

    Once /install/index.php/update has completed, it displays the success message: The database update was successful. You may proceed to the Administration Control Panel and then remove the install directory as advised.

    4.ii. Changed files

    @@ -284,7 +284,7 @@

    Advanced settings

    The directory structure has been preserved, enabling you (if you wish) to simply upload the uncompressed contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any modifications (MODs) these files will overwrite the originals, possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.

    -

    As for the other update procedures, you should go to /install/app.php/update, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

    +

    As for the other update procedures, you should go to /install/index.php/update, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

    4.iii. Patch file

    @@ -296,7 +296,7 @@

    Advanced settings

    If you do get failures, you should look at using the Changed Files package to replace the files which failed to patch. Please note that you will need to manually re-add any MODs to these particular files. Alternatively, if you know how, you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.

    -

    You should, of course, delete the patch file (or files) after use. As for the other update procedures, you should navigate to /install/app.php/update, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

    +

    You should, of course, delete the patch file (or files) after use. As for the other update procedures, you should navigate to /install/index.php/update, select "Update database only" and submit the page after you have finished updating the files. This will update your database schema and data (if appropriate) and increment the version number. If you have shell access to your server, you may wish to update via the command line interface. From your board's root, execute the following command: php bin/phpbbcli.php --safe-mode db:migrate.

    4.iv. Advanced update package (Expert users)

    @@ -356,7 +356,7 @@

    Advanced settings

  • Upload the contents of the 3.3.x Full Package (except for config.php) into your forum's directory. Make sure the root level .htaccess file is included in the upload.
    • -
  • Browse to /install/app.php/update
    • +
  • Browse to /install/index.php/update
  • Read the notice Update database only and press Submit
  • Delete the install/ directory
    • diff --git a/phpBB/docs/lighttpd.sample.conf b/phpBB/docs/lighttpd.sample.conf index a7f617dfab0..f8e2b9ec9cc 100644 --- a/phpBB/docs/lighttpd.sample.conf +++ b/phpBB/docs/lighttpd.sample.conf @@ -48,12 +48,12 @@ $HTTP["host"] == "www.myforums.com" { } # The following 3 lines will rewrite URLs passed through the front controller - # to not require app.php in the actual URL. In other words, a controller is - # by default accessed at /app.php/my/controller, but can also be accessed at + # to not require index.php in the actual URL. In other words, a controller is + # by default accessed at /index.php/my/controller, but can also be accessed at # /my/controller url.rewrite-if-not-file = ( - "^/install/(.*)$" => "/install/app.php/$1", - "^/(.*)$" => "/app.php/$1" + "^/install/(.*)$" => "/install/index.php/$1", + "^/(.*)$" => "/index.php/$1" ) fastcgi.server = ( ".php" => diff --git a/phpBB/docs/nginx.sample.conf b/phpBB/docs/nginx.sample.conf index 64059a38dad..83255b01a00 100644 --- a/phpBB/docs/nginx.sample.conf +++ b/phpBB/docs/nginx.sample.conf @@ -50,7 +50,7 @@ server { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; fastcgi_param DOCUMENT_ROOT $realpath_root; - try_files $uri $uri/ /app.php$is_args$args; + try_files $uri $uri/ /index.php$is_args$args; fastcgi_pass php; } @@ -64,7 +64,7 @@ server { } location @rewriteapp { - rewrite ^(.*)$ /app.php/$1 last; + rewrite ^(.*)$ /index.php/$1 last; } # Correctly pass scripts for installer @@ -78,13 +78,13 @@ server { fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; fastcgi_param DOCUMENT_ROOT $realpath_root; - try_files $uri $uri/ /install/app.php$is_args$args =404; + try_files $uri $uri/ /install/index.php$is_args$args =404; fastcgi_pass php; } } location @rewrite_installapp { - rewrite ^(.*)$ /install/app.php/$1 last; + rewrite ^(.*)$ /install/index.php/$1 last; } # Deny access to version control system directories. diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index b20d0d9753b..145daa33ca7 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -1385,11 +1385,11 @@ function store_feed_forums($option, $key) } /** - * Option to enable/disable removal of 'app.php' from URLs + * Option to enable/disable removal of 'index.php' from URLs * - * Note that if mod_rewrite is on, URLs without app.php will still work, + * Note that if mod_rewrite is on, URLs without index.php will still work, * but any paths generated by the controller helper url() method will not - * contain app.php. + * contain index.php. * * @param int $value The current config value * @param string $key The config key diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index 0c542cad06e..4e8afebf1cd 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -77,7 +77,7 @@ function main($id, $mode) $template->assign_block_vars('updates_available', $updates_available); } - $update_link = $phpbb_root_path . 'install/app.' . $phpEx; + $update_link = $phpbb_root_path . 'install/index.' . $phpEx; $template_ary = [ 'S_UP_TO_DATE' => empty($updates_available), @@ -96,7 +96,7 @@ function main($id, $mode) // Incomplete update? if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<')) { - $database_update_link = $phpbb_root_path . 'install/app.php/update'; + $database_update_link = $phpbb_root_path . 'install/index.php/update'; $template->assign_vars(array( 'S_UPDATE_INCOMPLETE' => true, diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 373e725e157..9d08c19418e 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1825,7 +1825,7 @@ function phpbb_get_install_redirect(string $phpbb_root_path, string $phpEx): str $script_name = substr($script_name, -1) === '/' ? $script_name . '.' : $script_name; // $phpbb_root_path accounts for redirects from e.g. /adm - $script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/app.' . $phpEx; + $script_path = trim(dirname($script_name)) . '/' . $phpbb_root_path . 'install/index.' . $phpEx; // Replace any number of consecutive backslashes and/or slashes with a single slash // (could happen on some proxy setups and/or Windows servers) return preg_replace('#[\\\\/]{2,}#', '/', $script_path); diff --git a/phpBB/install/index.html b/phpBB/install/index.html deleted file mode 100644 index 8f8bfb4fb21..00000000000 --- a/phpBB/install/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/phpBB/install/app.php b/phpBB/install/index.php similarity index 100% rename from phpBB/install/app.php rename to phpBB/install/index.php diff --git a/phpBB/install/startup.php b/phpBB/install/startup.php index 0cff6347950..f2013a70fba 100644 --- a/phpBB/install/startup.php +++ b/phpBB/install/startup.php @@ -160,7 +160,7 @@ function installer_shutdown_function($display_errors) @ini_set('display_errors', $display_errors); // Manually define phpBB root path and phpEx. These will not be passed - // on from app.php + // on from index.php $phpbb_root_path = __DIR__ . '/../'; $phpEx = 'php'; diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 0603d408362..ecadf39ad21 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -451,7 +451,7 @@ 'ICONS_PATH' => 'Post icons storage path', 'ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. images/icons.', 'MOD_REWRITE_ENABLE' => 'Enable URL Rewriting', - 'MOD_REWRITE_ENABLE_EXPLAIN' => 'When enabled, URLs containing ’app.php’ will be rewritten to remove the filename (i.e. app.php/foo will become /foo). Apache server’s mod_rewrite module is required for this functionality to work; if this option is enabled without mod_rewrite support, URLs on your board may be broken.', + 'MOD_REWRITE_ENABLE_EXPLAIN' => 'When enabled, URLs containing ’index.php’ will be rewritten to remove the filename (i.e. index.php/foo will become /foo). Apache server’s mod_rewrite module is required for this functionality to work; if this option is enabled without mod_rewrite support, URLs on your board may be broken.', 'MOD_REWRITE_DISABLED' => 'The mod_rewrite module on your Apache web server is disabled. Enable the module or contact your web hosting provider if you wish to enable this feature.', 'MOD_REWRITE_INFORMATION_UNAVAILABLE' => 'We are unable to determine whether or not this server supports URL rewriting. This setting may be enabled but if URL rewriting is not available, paths generated by this board (such as for use in links) may be broken. Contact your web hosting provider if you are unsure whether or not you can safely enable this feature.', 'PATH_SETTINGS' => 'Path settings', diff --git a/phpBB/phpbb/feed/helper.php b/phpBB/phpbb/feed/helper.php index cc77737c178..aea7e5c96a7 100644 --- a/phpBB/phpbb/feed/helper.php +++ b/phpBB/phpbb/feed/helper.php @@ -167,7 +167,7 @@ public function generate_content($content, $uid, $bitfield, $options, $forum_id, $content .= implode('
    ', $post_attachments); // Convert attachments' relative path to absolute path - $pattern = '#(/app.php)?/download/attachment/#'; + $pattern = '#(/index.php)?/download/attachment/#'; $replacement = $this->get_board_url() . '\1/download/attachment/'; $content = preg_replace($pattern, $replacement, $content); } diff --git a/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php index 5f600764396..f16cd065fca 100644 --- a/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php +++ b/phpBB/phpbb/install/module/obtain_data/task/obtain_server_data.php @@ -73,7 +73,7 @@ public function run() } $script_path = str_replace(array('\\', '//'), '/', $script_path); - $script_path = trim(dirname(dirname(dirname($script_path)))); // Because we are in install/app.php/route_name + $script_path = trim(dirname(dirname(dirname($script_path)))); // Because we are in install/index.php/route_name // Server data $cookie_secure = $this->io_handler->get_input('cookie_secure', $cookie_secure); diff --git a/phpBB/phpbb/members/controller/online.php b/phpBB/phpbb/members/controller/online.php index 164b9804734..32b502a1bb8 100644 --- a/phpBB/phpbb/members/controller/online.php +++ b/phpBB/phpbb/members/controller/online.php @@ -218,7 +218,7 @@ public function handle(): Response list($location, $location_url) = $this->viewonline_helper->get_location($row['session_page'], $row['session_forum_id']); $session_page = parse_url($row['session_page'], PHP_URL_PATH); - $session_page = preg_replace('/^\/app\.php\//', '/', $session_page); + $session_page = preg_replace('/^\/index\.php\//', '/', $session_page); $on_page = $this->viewonline_helper->get_user_page($session_page); $forum_data = $this->viewonline_helper->get_forum_data(); diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index 6ed8e5be5a4..db45faab264 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -103,18 +103,18 @@ public function update_web_root_path($path) $web_root_path = $this->get_web_root_path(); // Removes the web root path if it is already present - if (strpos($path, $web_root_path) === 0) + if (str_starts_with($path, $web_root_path)) { $path = $this->phpbb_root_path . substr($path, strlen($web_root_path)); } - if (strpos($path, $this->phpbb_root_path) === 0) + if (str_starts_with($path, $this->phpbb_root_path)) { $path = substr($path, strlen($this->phpbb_root_path)); - if (substr($web_root_path, -8) === 'app.php/' && substr($path, 0, 7) === 'app.php') + if (str_ends_with($web_root_path, 'index.php/') && str_starts_with($path, 'index.php')) { - $path = substr($path, 8); + $path = substr($path, strlen('index.php/')); } $path = filesystem_helper::clean_path($web_root_path . $path); @@ -171,18 +171,18 @@ public function get_web_root_path() // Path info (e.g. /foo/bar) $path_info = filesystem_helper::clean_path($this->symfony_request->getPathInfo()); - // Full request URI (e.g. phpBB/app.php/foo/bar) + // Full request URI (e.g. phpBB/index.php/foo/bar) $request_uri = $this->symfony_request->getRequestUri(); - // Script name URI (e.g. phpBB/app.php) + // Script name URI (e.g. phpBB/index.php) $script_name = $this->symfony_request->getScriptName(); /* - * If the path info is empty but we're using app.php, then we - * might be using an empty route like app.php/ which is + * If the path info is empty but we're using index.php, then we + * might be using an empty route like index.php/ which is * supported by symfony's routing */ - if ($path_info === '/' && preg_match('/app\.' . $this->php_ext . '\/$/', $request_uri)) + if ($path_info === '/' && preg_match('/index\.' . $this->php_ext . '\/$/', $request_uri)) { return $this->web_root_path = filesystem_helper::clean_path('./../' . $this->phpbb_root_path); } @@ -194,7 +194,7 @@ public function get_web_root_path() /* * If the path info is empty (single /), then we're not using - * a route like app.php/foo/bar + * a route like index.php/foo/bar */ if ($path_info === '/') { @@ -211,10 +211,10 @@ public function get_web_root_path() * intended locations: * Referer desired URL desired relative root path * memberlist.php faq.php ./ - * memberlist.php app.php/foo/bar ./ - * app.php/foo memberlist.php ../ - * app.php/foo app.php/fox ../ - * app.php/foo/bar memberlist.php ../../ + * memberlist.php index.php/foo/bar ./ + * index.php/foo memberlist.php ../ + * index.php/foo index.php/fox ../ + * index.php/foo/bar memberlist.php ../../ * ../page.php memberlist.php ./phpBB/ * ../sub/page.php memberlist.php ./../phpBB/ * @@ -236,11 +236,11 @@ public function get_web_root_path() $corrections = substr_count($path_info, '/'); /* - * If the script name (e.g. phpBB/app.php) does not exists in the - * requestUri (e.g. phpBB/app.php/foo/template), then we are rewriting + * If the script name (e.g. phpBB/index.php) does not exists in the + * requestUri (e.g. phpBB/index.php/foo/template), then we are rewriting * the URL. So we must reduce the slash count by 1. */ - if (strpos($request_uri, $script_name) !== 0) + if (!str_starts_with($request_uri, $script_name)) { $corrections--; } @@ -266,7 +266,7 @@ public function get_web_root_path_from_ajax_referer($absolute_referer_url, $abso // So we just need to count the / (slashes) in the left over part of // the referer and prepend ../ the the current root_path, to get the // web root path of the referer. - if (strpos($absolute_referer_url, $absolute_board_url) === 0) + if (str_starts_with($absolute_referer_url, $absolute_board_url)) { $relative_referer_path = substr($absolute_referer_url, strlen($absolute_board_url)); $has_params = strpos($relative_referer_path, '?'); @@ -295,7 +295,7 @@ public function get_web_root_path_from_ajax_referer($absolute_referer_url, $abso // If we do not find a slash at the end of the referer, we come // from a file. So the first dirname() does not need a traversal // path correction. - if (substr($referer_dir, -1) !== '/') + if (!str_ends_with($referer_dir, '/')) { $referer_dir = dirname($referer_dir); } @@ -377,7 +377,7 @@ public function get_url_parts($url, $is_amp = true) $separator = ($is_amp) ? '&' : '&'; $params = array(); - if (strpos($url, '?') !== false) + if (str_contains($url, '?')) { $base = substr($url, 0, strpos($url, '?')); $args = substr($url, strlen($base) + 1); @@ -391,7 +391,7 @@ public function get_url_parts($url, $is_amp = true) } // some parameters don't have value - if (strpos($argument, '=') !== false) + if (str_contains($argument, '=')) { list($key, $value) = explode('=', $argument, 2); } @@ -493,12 +493,12 @@ public function get_valid_page($page, $mod_rewrite = false) // URL if ($url_parts === false || empty($url_parts['scheme']) || empty($url_parts['host'])) { - // Remove 'app.php/' from the page, when rewrite is enabled. - // Treat app.php as a reserved file name and remove on mod rewrite + // Remove 'index.php/' from the page, when rewrite is enabled. + // Treat index.php as a reserved file name and remove on mod rewrite // even if it might not be in the phpBB root. - if ($mod_rewrite && ($app_position = strpos($page, 'app.' . $this->php_ext . '/')) !== false) + if ($mod_rewrite && ($app_position = strpos($page, 'index.' . $this->php_ext . '/')) !== false) { - $page = substr($page, 0, $app_position) . substr($page, $app_position + strlen('app.' . $this->php_ext . '/')); + $page = substr($page, 0, $app_position) . substr($page, $app_position + strlen('index.' . $this->php_ext . '/')); } // Remove preceding slashes from page name and prepend root path @@ -515,9 +515,9 @@ public function get_valid_page($page, $mod_rewrite = false) */ public function is_router_used() { - // Script name URI (e.g. phpBB/app.php) + // Script name URI (e.g. phpBB/index.php) $script_name = $this->symfony_request->getScriptName(); - return basename($script_name) === 'app.' . $this->php_ext; + return basename($script_name) === 'index.' . $this->php_ext; } } diff --git a/phpBB/phpbb/routing/helper.php b/phpBB/phpbb/routing/helper.php index b26fc3fd93e..989de18db6d 100644 --- a/phpBB/phpbb/routing/helper.php +++ b/phpBB/phpbb/routing/helper.php @@ -118,15 +118,15 @@ public function route($route, array $params = array(), $is_amp = true, $session_ $base_url .= '/' . $page_name; } - // If enable_mod_rewrite is false we need to replace the current front-end by app.php, otherwise we need to remove it. - $base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url); + // If enable_mod_rewrite is false we need to replace the current front-end by index.php, otherwise we need to remove it. + $base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/index.' . $this->php_ext : '', $base_url); - // We need to update the base url to move to the directory of the app.php file if the current script is not app.php - if ($page_name !== 'app.php' && !$this->config['force_server_vars']) + // We need to update the base url to move to the directory of the index.php file if the current script is not index.php + if ((str_starts_with($base_url, '/adm') || $page_name !== 'index.php') && !$this->config['force_server_vars']) { if (empty($this->config['enable_mod_rewrite'])) { - $base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url); + $base_url = str_replace('/index.' . $this->php_ext, '/' . $this->phpbb_root_path . 'index.' . $this->php_ext, $base_url); } else { @@ -148,7 +148,7 @@ public function route($route, array $params = array(), $is_amp = true, $session_ if ($reference_type === UrlGeneratorInterface::RELATIVE_PATH && empty($this->config['enable_mod_rewrite'])) { - $route_url = 'app.' . $this->php_ext . '/' . $route_url; + $route_url = 'index.' . $this->php_ext . '/' . $route_url; } return append_sid($route_url . $anchor, false, $is_amp, $session_id, true); diff --git a/phpBB/phpbb/routing/router.php b/phpBB/phpbb/routing/router.php index a6fbc6a15d3..dfbdea87073 100644 --- a/phpBB/phpbb/routing/router.php +++ b/phpBB/phpbb/routing/router.php @@ -197,8 +197,8 @@ public function match(string $pathinfo): array throw new RuntimeException('Malformed pathinfo given to the router.'); } - // Remove app.php if present - $pathinfo = preg_replace('/^\/app\.php\//', '/', $pathinfo); + // Remove index.php if present + $pathinfo = preg_replace('/^\/index\.php\//', '/', $pathinfo); return $this->get_matcher()->match($pathinfo); } diff --git a/phpBB/web.config b/phpBB/web.config index 86ea774d8ec..529e92c8a7f 100644 --- a/phpBB/web.config +++ b/phpBB/web.config @@ -9,7 +9,7 @@ - + diff --git a/tests/controller/common_helper_route.php b/tests/controller/common_helper_route.php index 61fd9bf3cb1..371d85c294e 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -66,7 +66,7 @@ protected function get_phpbb_root_path() protected function get_uri() { - return '/app.php'; + return '/index.php'; } protected function get_base_uri() @@ -76,7 +76,7 @@ protected function get_base_uri() protected function get_script_name() { - return 'app.php'; + return 'index.php'; } protected static function path_to_app() @@ -169,33 +169,33 @@ protected function generate_route_objects() public static function helper_url_data_no_rewrite() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, '/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, '/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, '/' . static::path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, '/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, '/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, '/' . static::path_to_app() . 'index.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, '/' . static::path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, '/' . static::path_to_app() . 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -295,33 +295,33 @@ public function test_helper_url_with_rewrite($route, $params, $is_amp, $session_ public static function helper_url_data_absolute() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, 'http://localhost/' . static::path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, 'http://localhost/' . static::path_to_app() . 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -358,33 +358,33 @@ public function test_helper_url_absolute($route, $params, $is_amp, $session_id, public static function helper_url_data_relative_path() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'index.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, 'index.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, 'index.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, 'index.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -421,33 +421,33 @@ public function test_helper_url_relative_path($route, $params, $is_amp, $session public static function helper_url_data_network() { return array( - array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller2', array('t' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2', 'parameters in params-argument as array'), // Custom sid parameter - array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid', 'params-argument (array) using session_id'), // Testing anchors - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2#anchor', 'anchor in params-argument (array)'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), - array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller2', array('t' => 1, 'f' => 2, '#' => 'anchor'), false, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), + array('controller3', array('p' => 3, 't' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3?t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), // Empty parameters should not append the & or ? - array('controller2', array(), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller2', array(), false, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar', 'no params using empty array'), - array('controller3', array('p' => 3), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/bar/p-3', 'no params using empty array'), + array('controller2', array(), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'), + array('controller2', array(), false, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar', 'no params using empty array'), + array('controller3', array('p' => 3), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/bar/p-3', 'no params using empty array'), // Resolves DI parameters - array('controller4', array(), true, false, '//localhost/' . static::path_to_app() . 'app.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), + array('controller4', array(), true, false, '//localhost/' . static::path_to_app() . 'index.php/foo/' . PHPBB_ENVIRONMENT, 'di parameter'), ); } @@ -670,13 +670,13 @@ public function test_helper_url_network_with_rewrite($route, $params, $is_amp, $ public static function helper_url_data_force_server_vars() { return array( - array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/app.php/foo'), + array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_URL, 'http://my_server:443/my/board/index.php/foo'), array(true, true, 'my_server', 444, '/my/board', 'https://', UrlGeneratorInterface::ABSOLUTE_URL, 'https://my_server:444/my/board/foo'), - array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/app.php/foo'), + array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:443/my/board/index.php/foo'), array(true, true, 'my_server', 444, '/my/board', 'https://', UrlGeneratorInterface::NETWORK_PATH, '//my_server:444/my/board/foo'), - array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/app.php/foo'), + array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/index.php/foo'), array(true, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::ABSOLUTE_PATH, '/my/board/foo'), - array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'app.php/foo'), + array(false, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'index.php/foo'), array(true, true, 'my_server', 443, '/my/board', 'http://', UrlGeneratorInterface::RELATIVE_PATH, 'foo'), ); } diff --git a/tests/controller/helper_route_other_app.php b/tests/controller/helper_route_other_app.php index 8e9a9ac0af3..27c2dba284f 100644 --- a/tests/controller/helper_route_other_app.php +++ b/tests/controller/helper_route_other_app.php @@ -22,12 +22,12 @@ protected function get_phpbb_root_path() protected function get_uri() { - return '/foo/app.php'; + return '/foo/index.php'; } protected function get_script_name() { - return 'app.php'; + return 'index.php'; } protected static function path_to_app() diff --git a/tests/controller/helper_route_root_test.php b/tests/controller/helper_route_root_test.php index 5162201aaa4..e79e58c8d30 100644 --- a/tests/controller/helper_route_root_test.php +++ b/tests/controller/helper_route_root_test.php @@ -22,11 +22,11 @@ protected function get_phpbb_root_path() protected function get_uri() { - return '/app.php'; + return '/index.php'; } protected function get_script_name() { - return 'app.php'; + return 'index.php'; } } diff --git a/tests/controller/helper_route_slash_test.php b/tests/controller/helper_route_slash_test.php index 1827bc04156..84d1c04b2c1 100644 --- a/tests/controller/helper_route_slash_test.php +++ b/tests/controller/helper_route_slash_test.php @@ -22,7 +22,7 @@ protected function get_phpbb_root_path() protected function get_uri() { - return '/phpBB/app.php'; + return '/phpBB/index.php'; } protected function get_base_uri() @@ -32,7 +32,7 @@ protected function get_base_uri() protected function get_script_name() { - return 'app.php'; + return 'index.php'; } protected static function path_to_app() diff --git a/tests/cron/wrapper_test.php b/tests/cron/wrapper_test.php index 315761ca9db..4b55ebb8f53 100644 --- a/tests/cron/wrapper_test.php +++ b/tests/cron/wrapper_test.php @@ -52,7 +52,7 @@ public function test_generate_template_pagination() $this->routing_helper->expects($this->any()) ->method('route') ->with('phpbb_cron_run', ['cron_type' => 'test_task', 'f' => '5']) - ->willReturn('app.php/cron/foo?f=5'); + ->willReturn('index.php/cron/foo?f=5'); $this->wrapper = new \phpbb\cron\task\wrapper( $this->task, @@ -60,7 +60,7 @@ public function test_generate_template_pagination() $this->template ); - $this->assertEquals('', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag())); + $this->assertEquals('', str_replace(["\n", "\t"], '', $this->wrapper->get_html_tag())); } public function test_is_parametrized_false() diff --git a/tests/functional/browse_test.php b/tests/functional/browse_test.php index 280e814c062..1c186436a92 100644 --- a/tests/functional/browse_test.php +++ b/tests/functional/browse_test.php @@ -36,19 +36,19 @@ public function test_viewtopic() public function test_help_faq() { - $crawler = self::request('GET', 'app.php/help/faq'); + $crawler = self::request('GET', 'index.php/help/faq'); $this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count()); } public function test_help_bbcode() { - $crawler = self::request('GET', 'app.php/help/bbcode'); + $crawler = self::request('GET', 'index.php/help/bbcode'); $this->assertGreaterThan(0, $crawler->filter('h2.faq-title')->count()); } public function test_feed() { - $crawler = self::request('GET', 'app.php/feed', array(), false); + $crawler = self::request('GET', 'index.php/feed', array(), false); self::assert_response_xml(); $this->assertGreaterThan(0, $crawler->filter('entry')->count()); } diff --git a/tests/functional/controllers_compatibility_test.php b/tests/functional/controllers_compatibility_test.php index 03fe6f07ef5..d0152d1d1da 100644 --- a/tests/functional/controllers_compatibility_test.php +++ b/tests/functional/controllers_compatibility_test.php @@ -19,29 +19,29 @@ class phpbb_functional_controllers_compatibility_test extends phpbb_functional_t { public function test_report_compatibility() { - $this->assert301('report.php?f=1&p=1', 'app.php/post/1/report'); - $this->assert301('report.php?p=1', 'app.php/post/1/report'); - $this->assert301('report.php?pm=1', 'app.php/pm/1/report'); + $this->assert301('report.php?f=1&p=1', 'index.php/post/1/report'); + $this->assert301('report.php?p=1', 'index.php/post/1/report'); + $this->assert301('report.php?pm=1', 'index.php/pm/1/report'); } public function test_feed_compatibility() { - $this->assert301('feed.php', 'app.php/feed'); - $this->assert301('feed.php?mode=foobar', 'app.php/feed/foobar'); - $this->assert301('feed.php?mode=news', 'app.php/feed/news'); - $this->assert301('feed.php?mode=topics', 'app.php/feed/topics'); - $this->assert301('feed.php?mode=topics_news', 'app.php/feed/topics_news'); - $this->assert301('feed.php?mode=topics_active', 'app.php/feed/topics_active'); - $this->assert301('feed.php?mode=forums', 'app.php/feed/forums'); - $this->assert301('feed.php?f=1', 'app.php/feed/forum/1'); - $this->assert301('feed.php?t=1', 'app.php/feed/topic/1'); + $this->assert301('feed.php', 'index.php/feed'); + $this->assert301('feed.php?mode=foobar', 'index.php/feed/foobar'); + $this->assert301('feed.php?mode=news', 'index.php/feed/news'); + $this->assert301('feed.php?mode=topics', 'index.php/feed/topics'); + $this->assert301('feed.php?mode=topics_news', 'index.php/feed/topics_news'); + $this->assert301('feed.php?mode=topics_active', 'index.php/feed/topics_active'); + $this->assert301('feed.php?mode=forums', 'index.php/feed/forums'); + $this->assert301('feed.php?f=1', 'index.php/feed/forum/1'); + $this->assert301('feed.php?t=1', 'index.php/feed/topic/1'); } public function test_cron_compatibility() { - $this->assert301('cron.php?cron_type=foo', 'app.php/cron/foo'); - $this->assert301('cron.php?cron_type=foo&bar=foobar', 'app.php/cron/foo?bar=foobar'); - $this->assert301('cron.php?cron_type=foo&bar=foobar&who=me', 'app.php/cron/foo?bar=foobar&who=me'); + $this->assert301('cron.php?cron_type=foo', 'index.php/cron/foo'); + $this->assert301('cron.php?cron_type=foo&bar=foobar', 'index.php/cron/foo?bar=foobar'); + $this->assert301('cron.php?cron_type=foo&bar=foobar&who=me', 'index.php/cron/foo?bar=foobar&who=me'); } protected function assert301($from, $to) diff --git a/tests/functional/download_test.php b/tests/functional/download_test.php index ec67e9e42a5..79fa6d71148 100644 --- a/tests/functional/download_test.php +++ b/tests/functional/download_test.php @@ -83,7 +83,7 @@ public function test_download_accessible() )); // Download attachment as guest - $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_status_code(200); $content = self::$client->getResponse()->getContent(); $finfo = new finfo(FILEINFO_MIME_TYPE); @@ -141,7 +141,7 @@ public function test_download_softdeleted_post() $this->add_lang('viewtopic'); // No download attachment as guest - $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_html(404); $this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text()); @@ -149,7 +149,7 @@ public function test_download_softdeleted_post() $this->login(); // Download attachment as admin - $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_status_code(200); $content = self::$client->getResponse()->getContent(); $finfo = new finfo(FILEINFO_MIME_TYPE); @@ -208,7 +208,7 @@ public function test_download_softdeleted_topic() $this->add_lang('viewtopic'); // No download attachment as guest - $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_html(404); $this->assertContainsLang('ERROR_NO_ATTACHMENT', $crawler->filter('#message')->text()); @@ -216,7 +216,7 @@ public function test_download_softdeleted_topic() $this->login(); // Download attachment as admin - $crawler = self::request('GET', "app.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); + $crawler = self::request('GET', "index.php/download/attachment/{$this->data['attachments'][$this->data['posts']['Re: Download Topic #1-#2']]}", array(), false); self::assert_response_status_code(200); $content = self::$client->getResponse()->getContent(); $finfo = new finfo(FILEINFO_MIME_TYPE); diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php index 8a9d2032627..302c3969626 100644 --- a/tests/functional/extension_controller_test.php +++ b/tests/functional/extension_controller_test.php @@ -54,7 +54,7 @@ protected function setUp(): void */ public function test_foo_bar() { - $crawler = self::request('GET', 'app.php/foo/bar', array(), false); + $crawler = self::request('GET', 'index.php/foo/bar', array(), false); self::assert_response_status_code(); $this->assertStringContainsString("foo/bar controller handle() method", $crawler->filter('body')->text()); } @@ -64,7 +64,7 @@ public function test_foo_bar() */ public function test_routing_resources() { - $crawler = self::request('GET', 'app.php/foo/foo', array(), false); + $crawler = self::request('GET', 'index.php/foo/foo', array(), false); self::assert_response_status_code(); $this->assertStringContainsString("foo/foo controller handle() method", $crawler->filter('body')->text()); } @@ -74,7 +74,7 @@ public function test_routing_resources() */ public function test_controller_with_template() { - $crawler = self::request('GET', 'app.php/foo/template'); + $crawler = self::request('GET', 'index.php/foo/template'); $this->assertStringContainsString("I am a variable", $crawler->filter('#content')->text()); } @@ -83,7 +83,7 @@ public function test_controller_with_template() */ public function test_controller_template_include_js_css() { - $crawler = self::request('GET', 'app.php/help/faq'); + $crawler = self::request('GET', 'index.php/help/faq'); $this->assertStringContainsString("./../../assets/javascript/core.js", $crawler->filter('body')->html()); } @@ -93,7 +93,7 @@ public function test_controller_template_include_js_css() */ public function test_missing_argument() { - $crawler = self::request('GET', 'app.php/foo/baz', array(), false); + $crawler = self::request('GET', 'index.php/foo/baz', array(), false); $this->assert_response_html(500); $this->assertStringContainsString('Controller "foo\bar\controller\controller::baz" requires the "$test" argument that could not be resolved', $crawler->filter('body')->text()); } @@ -103,7 +103,7 @@ public function test_missing_argument() */ public function test_exception_should_result_in_500_status_code() { - $crawler = self::request('GET', 'app.php/foo/exception', array(), false); + $crawler = self::request('GET', 'index.php/foo/exception', array(), false); $this->assert_response_html(500); $this->assertStringContainsString('Exception thrown from foo/exception route', $crawler->filter('body')->text()); } @@ -119,7 +119,7 @@ public function test_exception_should_result_in_500_status_code() */ public function test_error_ext_disabled_or_404() { - $crawler = self::request('GET', 'app.php/does/not/exist', array(), false); + $crawler = self::request('GET', 'index.php/does/not/exist', array(), false); $this->assert_response_html(404); // Since version 5.3.0-BETA1, Symfony shows full URI when route not found. See https://github.com/symfony/symfony/pull/39893 @@ -135,13 +135,13 @@ public function test_login_redirect() $this->markTestIncomplete('Session table contains incorrect data for controllers on CI,' . 'therefore the redirect fails.'); - $crawler = self::request('GET', 'app.php/foo/login_redirect'); + $crawler = self::request('GET', 'index.php/foo/login_redirect'); $this->assertContainsLang('LOGIN', $crawler->filter('h2')->text()); $form = $crawler->selectButton('login')->form(array( 'username' => 'admin', 'password' => 'adminadmin', )); - $this->assertStringStartsWith('./app.php/foo/login_redirect', $form->get('redirect')->getValue()); + $this->assertStringStartsWith('./index.php/foo/login_redirect', $form->get('redirect')->getValue()); $crawler = self::submit($form); $this->assertStringContainsString("I am a variable", $crawler->filter('#content')->text(), 'Unsuccessful redirect after using login_box()'); @@ -152,7 +152,7 @@ public function test_login_redirect() */ public function test_redirect() { - $crawler = self::request('GET', 'app.php/foo/redirect'); + $crawler = self::request('GET', 'index.php/foo/redirect'); $nodes = $crawler->filter('div')->extract(array('id')); diff --git a/tests/functional/feed_test.php b/tests/functional/feed_test.php index 16f4f2f7798..71fd99eb11d 100644 --- a/tests/functional/feed_test.php +++ b/tests/functional/feed_test.php @@ -81,45 +81,45 @@ public function test_setup_config_before_state() public function test_dump_board_state() { - $crawler = self::request('GET', 'app.php/feed/forums', array(), false); + $crawler = self::request('GET', 'index.php/feed/forums', array(), false); self::assert_response_xml(); self::$init_values['disapprove_user']['forums_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/overall', array(), false); + $crawler = self::request('GET', 'index.php/feed/overall', array(), false); self::assert_response_xml(); self::$init_values['disapprove_user']['overall_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/topics', array(), false); + $crawler = self::request('GET', 'index.php/feed/topics', array(), false); self::assert_response_xml(); self::$init_values['disapprove_user']['topics_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/topics_new', array(), false); + $crawler = self::request('GET', 'index.php/feed/topics_new', array(), false); self::assert_response_xml(); self::$init_values['disapprove_user']['topics_new_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/topics_active', array(), false); + $crawler = self::request('GET', 'index.php/feed/topics_active', array(), false); self::assert_response_xml(); self::$init_values['disapprove_user']['topics_active_value'] = $crawler->filterXPath('//entry')->count(); $this->login(); - $crawler = self::request('GET', 'app.php/feed/forums', array(), false); + $crawler = self::request('GET', 'index.php/feed/forums', array(), false); self::assert_response_xml(); self::$init_values['admin']['forums_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/overall', array(), false); + $crawler = self::request('GET', 'index.php/feed/overall', array(), false); self::assert_response_xml(); self::$init_values['admin']['overall_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/topics', array(), false); + $crawler = self::request('GET', 'index.php/feed/topics', array(), false); self::assert_response_xml(); self::$init_values['admin']['topics_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/topics_new', array(), false); + $crawler = self::request('GET', 'index.php/feed/topics_new', array(), false); self::assert_response_xml(); self::$init_values['admin']['topics_new_value'] = $crawler->filterXPath('//entry')->count(); - $crawler = self::request('GET', 'app.php/feed/topics_active', array(), false); + $crawler = self::request('GET', 'index.php/feed/topics_active', array(), false); self::assert_response_xml(); self::$init_values['admin']['topics_active_value'] = $crawler->filterXPath('//entry')->count(); } @@ -169,7 +169,7 @@ public function test_setup_forums() )); self::submit($form); - // 'Feeds #exclude' will not be displayed on app.php/feed/forums + // 'Feeds #exclude' will not be displayed on index.php/feed/forums $crawler = self::request('GET', "adm/index.php?i=acp_forums&mode=manage&sid={$this->sid}"); $form = $crawler->selectButton('addforum')->form(array( 'forum_name' => 'Feeds #exclude', @@ -267,7 +267,7 @@ public function test_feeds_disabled() self::assertContainsLang('CONFIG_UPDATED', $crawler->filter('.successbox')->text()); // Assert that feeds aren't available - $crawler = self::request('GET', 'app.php/feed/overall', array(), false); + $crawler = self::request('GET', 'index.php/feed/overall', array(), false); self::assert_response_status_code(404); $this->assertContainsLang('NO_FEED_ENABLED', $crawler->text()); @@ -1375,19 +1375,19 @@ protected function assert_feeds($data, $username = false) protected function assert_feed($params, $data) { - $crawler = self::request('GET', 'app.php/feed' . $params, array(), false); + $crawler = self::request('GET', 'index.php/feed' . $params, array(), false); if (empty($data['invalid'])) { self::assert_response_xml(); - self::assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'app.php/feed{$params}'"); + self::assertEquals($data['nb_entries'], $crawler->filter('entry')->count(), "Tested feed : 'index.php/feed{$params}'"); if (!empty($data['xpath'])) { foreach($data['xpath'] as $xpath => $count_expected) { - self::assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'app.php/feed{$params}', Search for {$xpath}"); + self::assertCount($count_expected, $crawler->filterXPath($xpath), "Tested feed : 'index.php/feed{$params}', Search for {$xpath}"); } } @@ -1396,7 +1396,7 @@ protected function assert_feed($params, $data) foreach($data['contents'] as $entry_id => $string) { $content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); - self::assertStringContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringContainsString($string, $content, "Tested feed : 'index.php/feed{$params}'"); } } @@ -1405,7 +1405,7 @@ protected function assert_feed($params, $data) foreach($data['contents_lang'] as $entry_id => $string) { $content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); - self::assertContainsLang($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertContainsLang($string, $content, "Tested feed : 'index.php/feed{$params}'"); } } @@ -1416,18 +1416,18 @@ protected function assert_feed($params, $data) $content = $crawler->filterXPath("//entry[{$entry_id}]/content")->text(); foreach ($attachments as $i => $attachment) { - $url = self::$root_url . "app.php/download/attachment/{$attachment['id']}"; + $url = self::$root_url . "index.php/download/attachment/{$attachment['id']}"; $string = "Attachment #{$i}"; if ($attachment['displayed']) { - self::assertStringContainsString($url, $content, "Tested feed : 'app.php/feed{$params}'"); - self::assertStringNotContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringContainsString($url, $content, "Tested feed : 'index.php/feed{$params}'"); + self::assertStringNotContainsString($string, $content, "Tested feed : 'index.php/feed{$params}'"); } else { - self::assertStringContainsString($string, $content, "Tested feed : 'app.php/feed{$params}'"); - self::assertStringNotContainsString($url, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertStringContainsString($string, $content, "Tested feed : 'index.php/feed{$params}'"); + self::assertStringNotContainsString($url, $content, "Tested feed : 'index.php/feed{$params}'"); } } } @@ -1442,7 +1442,7 @@ protected function assert_feed($params, $data) $content = $crawler->filter('html')->text(); foreach($data['contents_lang'] as $string) { - self::assertContainsLang($string, $content, "Tested feed : 'app.php/feed{$params}'"); + self::assertContainsLang($string, $content, "Tested feed : 'index.php/feed{$params}'"); } } } diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index 47d856a5df6..960d1c8530c 100644 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -61,7 +61,7 @@ public function redirect() { $url_root = generate_board_url(); - $rewrite_prefix = (!empty($this->config['enable_mod_rewrite'])) ? '' : 'app.php/'; + $rewrite_prefix = (!empty($this->config['enable_mod_rewrite'])) ? '' : 'index.php/'; $redirects = array( array( diff --git a/tests/functional/forgot_password_test.php b/tests/functional/forgot_password_test.php index 554b503470d..817eeefb101 100644 --- a/tests/functional/forgot_password_test.php +++ b/tests/functional/forgot_password_test.php @@ -19,7 +19,7 @@ class phpbb_functional_forgot_password_test extends phpbb_functional_test_case public function test_forgot_password_enabled() { $this->add_lang('ucp'); - $crawler = self::request('GET', 'app.php/user/forgot_password'); + $crawler = self::request('GET', 'index.php/user/forgot_password'); $this->assertEquals($this->lang('RESET_PASSWORD'), $crawler->filter('h2')->text()); } @@ -39,7 +39,7 @@ public function test_forgot_password_disabled() $this->logout(); - $crawler = self::request('GET', 'app.php/user/forgot_password'); + $crawler = self::request('GET', 'index.php/user/forgot_password'); $this->assertStringContainsString($this->lang('UCP_PASSWORD_RESET_DISABLED', '', ''), $crawler->text()); } diff --git a/tests/functional/manifest_test.php b/tests/functional/manifest_test.php index 57551a67e22..429668e9a2d 100644 --- a/tests/functional/manifest_test.php +++ b/tests/functional/manifest_test.php @@ -42,7 +42,7 @@ public function test_manifest() $crawler = self::submit($form); $this->assertStringContainsString($this->lang('CONFIG_UPDATED'), $crawler->filter('.successbox')->text()); - self::request('GET', 'app.php/manifest', [], false); + self::request('GET', 'index.php/manifest', [], false); $this->assertEquals(json_encode($expected), self::get_content()); } } diff --git a/tests/functional/memberlist_test.php b/tests/functional/memberlist_test.php index b088b67dbb2..a369b82aafa 100644 --- a/tests/functional/memberlist_test.php +++ b/tests/functional/memberlist_test.php @@ -43,7 +43,7 @@ public function test_viewprofile() protected function get_memberlist_leaders_table_crawler() { - $crawler = self::request('GET', 'app.php/members/team'); + $crawler = self::request('GET', 'index.php/members/team'); return $crawler->filter('.forumbg-table'); } diff --git a/tests/functional/prune_shadow_topic_test.php b/tests/functional/prune_shadow_topic_test.php index 125c3b90b9e..c036cfcf47a 100644 --- a/tests/functional/prune_shadow_topic_test.php +++ b/tests/functional/prune_shadow_topic_test.php @@ -129,7 +129,7 @@ public function test_move_topic() $crawler = self::request('GET', "viewforum.php?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}"); $this->assertNotEmpty($crawler->filter('img')->last()->attr('src')); - self::request('GET', "app.php/cron/cron.task.core.prune_shadow_topics?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}", array(), false); + self::request('GET', "index.php/cron/cron.task.core.prune_shadow_topics?f={$this->data['forums']['Prune Shadow']}&sid={$this->sid}", array(), false); // Try to ensure that the cron can actually run before we start to wait for it usleep(100000); diff --git a/tests/functional/report_post_captcha_test.php b/tests/functional/report_post_captcha_test.php index 1c7435fcf31..d58808d6c19 100644 --- a/tests/functional/report_post_captcha_test.php +++ b/tests/functional/report_post_captcha_test.php @@ -18,13 +18,13 @@ class phpbb_functional_report_post_captcha_test extends phpbb_functional_test_ca { public function test_guest_report_post() { - $crawler = self::request('GET', 'app.php/post/1/report', array(), false); + $crawler = self::request('GET', 'index.php/post/1/report', array(), false); $this->assert_response_html(403); $this->add_lang('mcp'); $this->assertStringContainsString($this->lang('USER_CANNOT_REPORT'), $crawler->filter('html')->text()); $this->set_reporting_guest(1); - $crawler = self::request('GET', 'app.php/post/1/report'); + $crawler = self::request('GET', 'index.php/post/1/report'); $this->assertStringContainsString($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text()); $this->set_reporting_guest(-1); } @@ -32,7 +32,7 @@ public function test_guest_report_post() public function test_user_report_post() { $this->login(); - $crawler = self::request('GET', 'app.php/post/1/report'); + $crawler = self::request('GET', 'index.php/post/1/report'); $this->assertStringNotContainsString($this->lang('CONFIRM_CODE'), $crawler->filter('html')->text()); $this->add_lang('mcp'); diff --git a/tests/functional/ucp_attachments_test.php b/tests/functional/ucp_attachments_test.php index fbd352ea28f..2c777aba92d 100644 --- a/tests/functional/ucp_attachments_test.php +++ b/tests/functional/ucp_attachments_test.php @@ -133,7 +133,7 @@ public function test_ucp_list_attachments() $attachment_filename = $crawler->filter('.attachment-filename'); $this->assertEquals('valid.jpg', $attachment_filename->attr('title')); - $this->assertStringContainsString('app.php/download/attachment/' . $attach_id . '/valid.jpg', $attachment_filename->attr('href')); + $this->assertStringContainsString('index.php/download/attachment/' . $attach_id . '/valid.jpg', $attachment_filename->attr('href')); $this->assertFalse($crawler->filter('[name="attachment[' . $attach_id . ']"]')->getNode(0)->hasAttribute('disabled')); } diff --git a/tests/functional/user_password_reset_test.php b/tests/functional/user_password_reset_test.php index f7943a900c5..0e408247963 100644 --- a/tests/functional/user_password_reset_test.php +++ b/tests/functional/user_password_reset_test.php @@ -29,13 +29,13 @@ public function test_password_reset() // test without email $crawler = self::request('GET', "ucp.php?mode=sendpassword&sid={$this->sid}"); - $this->assertStringContainsString('app.php/user/forgot_password', $crawler->getUri()); + $this->assertStringContainsString('index.php/user/forgot_password', $crawler->getUri()); $form = $crawler->selectButton('submit')->form(); $crawler = self::submit($form); $this->assertContainsLang('NO_EMAIL_USER', $crawler->text()); // test with non-existent email - $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( 'email' => 'non-existent@email.com', )); @@ -43,7 +43,7 @@ public function test_password_reset() $this->assertContainsLang('PASSWORD_RESET_LINK_SENT', $crawler->text()); // test with correct email - $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( 'email' => self::TEST_EMAIL, )); @@ -58,7 +58,7 @@ public function test_password_reset() $reset_token_expiration = $this->user_data['reset_token_expiration']; // Check that reset token is only created once per day - $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( 'email' => self::TEST_EMAIL, )); @@ -75,7 +75,7 @@ public function test_password_reset() $this->create_user('reset-password-test-user1', self::TEST_EMAIL); // Test that username is now also required - $crawler = self::request('GET', "app.php/user/forgot_password?sid={$this->sid}"); + $crawler = self::request('GET', "index.php/user/forgot_password?sid={$this->sid}"); $form = $crawler->selectButton('submit')->form(array( 'email' => self::TEST_EMAIL, )); @@ -125,7 +125,7 @@ public function test_reset_user_password($expected, $user_id, $token) $user_id = !$user_id ? $this->user_data['user_id'] : $user_id; $token = !$token ? $this->user_data['reset_token'] : $token; - $crawler = self::request('GET', "app.php/user/reset_password?u=$user_id&token=" . urlencode($token)); + $crawler = self::request('GET', "index.php/user/reset_password?u=$user_id&token=" . urlencode($token)); if ($expected) { diff --git a/tests/functional/viewonline_test.php b/tests/functional/viewonline_test.php index 5887d36c5ba..c71da6daf30 100644 --- a/tests/functional/viewonline_test.php +++ b/tests/functional/viewonline_test.php @@ -57,7 +57,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'app.php/members/online'); + $crawler = self::request('GET', 'index.php/members/online'); // Make sure posting reply page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('REPLYING_MESSAGE', $this->get_forum_name_by_topic_id(1)), $crawler->text()); @@ -72,7 +72,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'app.php/members/online'); + $crawler = self::request('GET', 'index.php/members/online'); // Make sure posting message page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); @@ -88,7 +88,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'app.php/members/online'); + $crawler = self::request('GET', 'index.php/members/online'); // Make sure posting message page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('POSTING_MESSAGE', $this->get_forum_name_by_forum_id(2)), $crawler->text()); @@ -102,7 +102,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'app.php/members/online'); + $crawler = self::request('GET', 'index.php/members/online'); // Make sure reading topic page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('READING_TOPIC', $this->get_forum_name_by_topic_id(1)), $crawler->text()); @@ -116,7 +116,7 @@ public function test_viewonline() $this->login(); // PHP goes faster than DBMS, make sure session data got written to the database sleep(1); - $crawler = self::request('GET', 'app.php/members/online'); + $crawler = self::request('GET', 'index.php/members/online'); // Make sure reading forum page is in the list $this->assertStringContainsString('viewonline-test-user1', $crawler->text()); $this->assertStringContainsString($this->lang('READING_FORUM', $this->get_forum_name_by_forum_id(2)), $crawler->text()); diff --git a/tests/functional/visit_installer_test.php b/tests/functional/visit_installer_test.php index 742007fa5f5..2b08939e541 100644 --- a/tests/functional/visit_installer_test.php +++ b/tests/functional/visit_installer_test.php @@ -19,12 +19,9 @@ class phpbb_functional_visit_installer_test extends phpbb_functional_test_case public function test_visit_installer() { self::request('GET', 'install/', [], false); - $this->assertStringContainsString('', $this->get_content()); - - self::request('GET', 'install/index.html', [], false); - $this->assertStringContainsString('', $this->get_content()); + $this->assertStringContainsString('installation system', $this->get_content()); - self::request('GET', 'install/app.php'); + self::request('GET', 'install/index.php'); $this->assertStringContainsString('installation system', $this->get_content()); } } diff --git a/tests/functions/phpbb_get_install_redirect_test.php b/tests/functions/phpbb_get_install_redirect_test.php index 3b3b65f964f..aa0515dabcd 100644 --- a/tests/functions/phpbb_get_install_redirect_test.php +++ b/tests/functions/phpbb_get_install_redirect_test.php @@ -18,37 +18,37 @@ public static function data_redirect(): array return [ [ ['REQUEST_URI' => '/foo/bar/'], - '/foo/bar/install/app.php', + '/foo/bar/install/index.php', ], [ ['REQUEST_URI' => '/foo/bar/index.php'], - '/foo/bar/install/app.php', + '/foo/bar/install/index.php', ], [ ['REQUEST_URI' => '/foo/bar'], - '/foo/install/app.php', + '/foo/install/index.php', ], [ ['REQUEST_URI' => '/foo/'], - '/foo/install/app.php', + '/foo/install/index.php', ], [ ['REQUEST_URI' => '/foo/index.php'], - '/foo/install/app.php', + '/foo/install/index.php', ], [ [ 'REQUEST_URI' => '/foo/bar/', 'PHP_SELF' => '/foo/bar/index.php' ], - '/foo/bar/install/app.php', + '/foo/bar/install/index.php', ], [ [ 'REQUEST_URI' => '', 'PHP_SELF' => '/foo/bar/index.php' ], - '/foo/bar/install/app.php', + '/foo/bar/install/index.php', ], ]; } diff --git a/tests/pagination/pagination_test.php b/tests/pagination/pagination_test.php index 51b2f8752b3..a7539438354 100644 --- a/tests/pagination/pagination_test.php +++ b/tests/pagination/pagination_test.php @@ -53,9 +53,9 @@ protected function setUp(): void $router = new phpbb_mock_router(new phpbb_mock_container_builder(), $resources_locator, $loader, 'php', __DIR__ . '/', true, true); $request = new phpbb_mock_request(); - $request->overwrite('SCRIPT_NAME', '/app.php', \phpbb\request\request_interface::SERVER); - $request->overwrite('SCRIPT_FILENAME', 'app.php', \phpbb\request\request_interface::SERVER); - $request->overwrite('REQUEST_URI', '/app.php', \phpbb\request\request_interface::SERVER); + $request->overwrite('SCRIPT_NAME', '/index.php', \phpbb\request\request_interface::SERVER); + $request->overwrite('SCRIPT_FILENAME', 'index.php', \phpbb\request\request_interface::SERVER); + $request->overwrite('REQUEST_URI', '/index.php', \phpbb\request\request_interface::SERVER); $symfony_request = new \phpbb\symfony_request( $request diff --git a/tests/path_helper/path_helper_test.php b/tests/path_helper/path_helper_test.php index 09693c1ceb4..e5459e10991 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -115,8 +115,8 @@ public function test_update_web_root_path_app() ->onlyMethods(['get_web_root_path']) ->getMock(); $path_helper->method('get_web_root_path') - ->willReturn('/var/www/phpbb/app.php/'); - $this->assertEquals('/var/www/phpbb/app.php/foo', $path_helper->update_web_root_path(self::$phpbb_root_path . 'app.php/foo')); + ->willReturn('/var/www/phpbb/index.php/'); + $this->assertEquals('/var/www/phpbb/index.php/foo', $path_helper->update_web_root_path(self::$phpbb_root_path . 'index.php/foo')); } public static function update_web_root_path_data() @@ -141,22 +141,22 @@ public static function update_web_root_path_data() array( self::$phpbb_root_path . 'test.php', '/foo/template', - '/phpbb-fork/phpBB/app.php/foo/template', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php/foo/template', + '/phpbb-fork/phpBB/index.php', './../../', ), array( self::$phpbb_root_path . 'test.php', '/foo/template', '/phpbb-fork/phpBB/foo/template', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php', './../', ), array( self::$phpbb_root_path . 'test.php', '/', - '/phpbb-fork/phpBB/app.php/', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php/', + '/phpbb-fork/phpBB/index.php', './../', ), @@ -171,29 +171,29 @@ public static function update_web_root_path_data() array( './../../' . self::$phpbb_root_path . 'test.php', '/foo/template', - '/phpbb-fork/phpBB/app.php/foo/template', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php/foo/template', + '/phpbb-fork/phpBB/index.php', '', ), array( './../' . self::$phpbb_root_path . 'test.php', '/foo/template', '/phpbb-fork/phpBB/foo/template', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php', '', ), array( './../'.self::$phpbb_root_path . 'test.php', '/', - '/phpbb-fork/phpBB/app.php/', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php/', + '/phpbb-fork/phpBB/index.php', '', ), array( './../'.self::$phpbb_root_path . 'test.php', '', '/phpbb-fork/phpBB/foo', - '/phpbb-fork/phpBB/app.php', + '/phpbb-fork/phpBB/index.php', '', ), ); @@ -591,12 +591,12 @@ public static function data_get_valid_page() array('index', false, 'index'), array('foo/index', true, 'foo/index'), array('foo/index', false, 'foo/index'), - array('app.php/foo', true, 'foo'), - array('app.php/foo', false, 'app.php/foo'), - array('/../app.php/foo', true, '../foo'), - array('/../app.php/foo', false, '../app.php/foo'), - array('/../example/app.php/foo/bar', true, '../example/foo/bar'), - array('/../example/app.php/foo/bar', false, '../example/app.php/foo/bar'), + array('index.php/foo', true, 'foo'), + array('index.php/foo', false, 'index.php/foo'), + array('/../index.php/foo', true, '../foo'), + array('/../index.php/foo', false, '../index.php/foo'), + array('/../example/index.php/foo/bar', true, '../example/foo/bar'), + array('/../example/index.php/foo/bar', false, '../example/index.php/foo/bar'), ); } @@ -613,10 +613,6 @@ public static function is_router_used_data() return [ [ 'index.php', - false, - ], - [ - 'app.php', true, ], ]; diff --git a/tests/security/redirect_test.php b/tests/security/redirect_test.php index 8568832600d..b74c3d9d183 100644 --- a/tests/security/redirect_test.php +++ b/tests/security/redirect_test.php @@ -28,19 +28,19 @@ public static function provider() array("http://localhost/phpBB/memberlist.php\n\rConnection: close", false, 'INSECURE_REDIRECT', false), array('javascript:test', false, false, 'http://localhost/phpBB/javascript:test'), array('http://localhost/phpBB/index.php;url=', false, 'INSECURE_REDIRECT', false), - array('http://localhost/phpBB/app.php/foobar', false, false, 'http://localhost/phpBB/app.php/foobar'), - array('./app.php/foobar', false, false, 'http://localhost/phpBB/app.php/foobar'), - array('app.php/foobar', false, false, 'http://localhost/phpBB/app.php/foobar'), - array('./../app.php/foobar', false, false, 'http://localhost/app.php/foobar'), - array('./../app.php/foobar', true, false, 'http://localhost/app.php/foobar'), - array('./../app.php/foo/bar', false, false, 'http://localhost/app.php/foo/bar'), - array('./../app.php/foo/bar', true, false, 'http://localhost/app.php/foo/bar'), + array('http://localhost/phpBB/index.php/foobar', false, false, 'http://localhost/phpBB/index.php/foobar'), + array('./index.php/foobar', false, false, 'http://localhost/phpBB/index.php/foobar'), + array('index.php/foobar', false, false, 'http://localhost/phpBB/index.php/foobar'), + array('./../index.php/foobar', false, false, 'http://localhost/index.php/foobar'), + array('./../index.php/foobar', true, false, 'http://localhost/index.php/foobar'), + array('./../index.php/foo/bar', false, false, 'http://localhost/index.php/foo/bar'), + array('./../index.php/foo/bar', true, false, 'http://localhost/index.php/foo/bar'), array('./../foo/bar', false, false, 'http://localhost/foo/bar'), array('./../foo/bar', true, false, 'http://localhost/foo/bar'), - array('app.php/', false, false, 'http://localhost/phpBB/app.php/'), - array('app.php/a', false, false, 'http://localhost/phpBB/app.php/a'), - array('app.php/a/b', false, false, 'http://localhost/phpBB/app.php/a/b'), - array('./app.php/', false, false, 'http://localhost/phpBB/app.php/'), + array('index.php/', false, false, 'http://localhost/phpBB/index.php/'), + array('index.php/a', false, false, 'http://localhost/phpBB/index.php/a'), + array('index.php/a/b', false, false, 'http://localhost/phpBB/index.php/a/b'), + array('./index.php/', false, false, 'http://localhost/phpBB/index.php/'), array('foobar', false, false, 'http://localhost/phpBB/foobar'), array('./foobar', false, false, 'http://localhost/phpBB/foobar'), array('foo/bar', false, false, 'http://localhost/phpBB/foo/bar'), diff --git a/tests/session/extract_page_test.php b/tests/session/extract_page_test.php index bfcd1838ef4..24e1a7166ac 100644 --- a/tests/session/extract_page_test.php +++ b/tests/session/extract_page_test.php @@ -106,17 +106,17 @@ static public function extract_current_page_data() ), array( './', - '/phpBB/adm/app.php', + '/phpBB/adm/index.php', 'page=1&test=2', '/phpBB/adm/', '/foo/bar', array( - 'page_name' => 'app.php/foo/bar', + 'page_name' => 'index.php/foo/bar', //'page_dir' => '', 'query_string' => 'page=1&test=2', 'script_path' => '/phpBB/adm/', //'root_script_path' => '/phpBB/adm/', - //'page' => 'app.php/foo/bar?page=1&test=2', + //'page' => 'index.php/foo/bar?page=1&test=2', 'forum' => 0, ), ), @@ -138,17 +138,17 @@ static public function extract_current_page_data() ), array( './community', - '/app.php', + '/index.php', '', '/', '/kb', array( - 'page_name' => 'app.php/kb', + 'page_name' => 'index.php/kb', 'page_dir' => '..', 'query_string' => '', 'script_path' => '/', 'root_script_path' => '/community/', - 'page' => '../app.php/kb', + 'page' => '../index.php/kb', 'forum' => 0, ), ), diff --git a/tests/viewonline/helper_test.php b/tests/viewonline/helper_test.php index d383f9b2f2b..65d5fd70156 100644 --- a/tests/viewonline/helper_test.php +++ b/tests/viewonline/helper_test.php @@ -114,7 +114,7 @@ public static function get_location_data() // index array('', 0, true, 'Index page', './'), array('/', 0, true, 'Index page', './'), - array('/app.php/', 0, true, 'Index page', './'), + array('/index.php/', 0, true, 'Index page', './'), array('index.php', 0, true, 'Index page', './index.php'), array('./index.php', 0, true, 'Index page', './index.php'), // help.yml routes have prefix /help diff --git a/vagrant/after.sh b/vagrant/after.sh index a6e23d46dd4..c4ef00e922e 100755 --- a/vagrant/after.sh +++ b/vagrant/after.sh @@ -28,7 +28,7 @@ sed -i '/^.*PHPBB_ENVIRONMENT.*$/s/production/development/' ${PHPBB_CONFIG} # Update the PHP memory limits (enough to allow phpunit tests to run) sed -i "s/memory_limit = .*/memory_limit = 1024M/" /etc/php/${PHP_VERSION}/fpm/php.ini -# Fix for urls with app.php +# Fix for urls with index.php sed -i "s/cgi.fix_pathinfo=.*/cgi.fix_pathinfo=1/" /etc/php/${PHP_VERSION}/fpm/php.ini # Restart php-fpm to apply php.ini changes From a9017f2f0f0763d9b704ced3e20fb685ef6621e6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 8 Feb 2026 16:46:32 +0100 Subject: [PATCH 1100/1214] [ticket/security-258] Default to config if possible SECURITY-258 --- phpBB/phpbb/session.php | 40 +++++++------------------ tests/session/extract_hostname_test.php | 24 ++++++++------- 2 files changed, 23 insertions(+), 41 deletions(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 17a23537892..29a72d6ee36 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -22,6 +22,7 @@ class session var $page = array(); var $data = array(); var $browser = ''; + var $referer = ''; var $forwarded_for = ''; var $host = ''; var $session_id = ''; @@ -171,45 +172,24 @@ function extract_current_hostname() // Should be a string and lowered $host = (string) strtolower($host); - // If host is equal the cookie domain or the server name (if config is set), then we assume it is valid - if ((isset($config['cookie_domain']) && $host === $config['cookie_domain']) || (isset($config['server_name']) && $host === $config['server_name'])) + if (!empty($config['server_name'])) { - return $host; + return $config['server_name']; } - // Is the host actually a IP? If so, we use the IP... (IPv4) - if (long2ip(ip2long($host)) === $host) + if (!empty($config['cookie_domain'])) { - return $host; + return (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain']; } - // Now return the hostname (this also removes any port definition). The http:// is prepended to construct a valid URL, hosts never have a scheme assigned - $host = @parse_url('http://' . $host); - $host = (!empty($host['host'])) ? $host['host'] : ''; - - // Remove any portions not removed by parse_url (#) - $host = str_replace('#', '', $host); - - // If, by any means, the host is now empty, we will use a "best approach" way to guess one - if (empty($host)) + // Use provided host if neither cookie_domain nor server_name are set in config + if (!empty($host)) { - if (!empty($config['server_name'])) - { - $host = $config['server_name']; - } - else if (!empty($config['cookie_domain'])) - { - $host = (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain']; - } - else - { - // Set to OS hostname or localhost - $host = (function_exists('php_uname')) ? php_uname('n') : 'localhost'; - } + return $host; } - // It may be still no valid host, but for sure only a hostname (we may further expand on the cookie domain... if set) - return $host; + // Fallback to OS hostname or localhost + return (function_exists('php_uname')) ? php_uname('n') : 'localhost'; } /** diff --git a/tests/session/extract_hostname_test.php b/tests/session/extract_hostname_test.php index fe2032f547d..b55baff05ef 100644 --- a/tests/session/extract_hostname_test.php +++ b/tests/session/extract_hostname_test.php @@ -20,25 +20,27 @@ public function getDataSet() return $this->createXMLDataSet(__DIR__ . '/fixtures/sessions_empty.xml'); } - static public function extract_current_hostname_data() + static public function extract_current_hostname_data(): array { - return array ( + return [ // [Input] $host, $server_name_config, $cookie_domain_config, [Expected] $output // If host is ip use that // ipv4 - array('127.0.0.1', 'skipped.org', 'skipped.org', '127.0.0.1'), + 'ipv4' => ['127.0.0.1', 'skipped.org', 'skipped.org', 'skipped.org'], // ipv6 - array('::1', 'skipped.org', 'skipped.org', ':'), - array('2002::3235:51f9', 'skipped.org', 'skipped.org', '2002::3235'), + 'ipv6' => ['::1', 'skipped.org', 'skipped.org', 'skipped.org'], + 'ipv6_2' => ['2002::3235:51f9', 'skipped.org', 'skipped.org', 'skipped.org'], // If no host but server name matches cookie_domain use that - array('', 'example.org', 'example.org', 'example.org'), + 'no_host_both_configs' => ['', 'example.org', 'example.org', 'example.org'], // If there is a host uri use that - array('example.org', false, false, 'example.org'), + 'host_no_configs' => ['example.org', false, false, 'example.org'], // 'best approach' guessing - array('', 'example.org', false, 'example.org'), - array('', false, '127.0.0.1', '127.0.0.1'), - array('', false, false, php_uname('n')), - ); + 'no_host_only_server_name' => ['', 'example.org', false, 'example.org'], + 'no_host_only_cookie_domain' => ['', false, '127.0.0.1', '127.0.0.1'], + 'no_host_no_config' => ['', false, false, php_uname('n')], + 'host_is_server_config' => ['example.org', 'example.org', '.example.org', 'example.org'], + 'host_is_cookie_domain' => ['example.org', 'foobar.org', 'example.org', 'foobar.org'], + ]; } /** @dataProvider extract_current_hostname_data */ From 0240dace0a710e896b3104da8686f138ed04d982 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 15 Feb 2026 09:36:34 +0100 Subject: [PATCH 1101/1214] [ticket/17612] Remove no longer needed imageset to css script PHPBB-17612 --- phpBB/develop/imageset_to_css.php | 374 ------------------------------ 1 file changed, 374 deletions(-) delete mode 100644 phpBB/develop/imageset_to_css.php diff --git a/phpBB/develop/imageset_to_css.php b/phpBB/develop/imageset_to_css.php deleted file mode 100644 index 6794823b6d9..00000000000 --- a/phpBB/develop/imageset_to_css.php +++ /dev/null @@ -1,374 +0,0 @@ - $row) -{ - unset($images_global[$key]); -} - -// CSS replacements -$not_compatible = array( - '{T_TEMPLATE_PATH}', - '{T_IMAGESET_PATH}', - '{T_IMAGESET_LANG_PATH}', - '{T_STYLESHEET_NAME}', - '{S_USER_LANG}' -); -$replace = array( - '{T_THEME_PATH}' => '.', -); -// Enable/disable one of lines below to enable/disable replacement of English buttons -// $replace = array_merge($replace, get_replacements($images_global)); -$replace = array_merge($replace, get_replacements($images_global), get_replacements($images_en)); - -// BIDI code -$bidi_code = css($images_global, './images/', true); - -// Get all CSS files, parse them -$files = list_files($theme_path, 'css'); -if ($files === false || !count($files)) -{ - echo 'No CSS files found in theme directory.
    '; -} -else for ($i=0; $i'; - continue; - } - } - if (basename($file) == 'bidi.css' && strpos($data, '/* Former imageset */') === false && strlen($bidi_code)) - { - // Add bidi data - $data .= "\n/* Former imageset */\n" . $bidi_code; - $bidi_code = ''; - echo 'Note: RTL imageset entries were added at the end of file below:
    '; - } - if (md5($data) == $hash) - { - echo 'Nothing to replace in ', $file, '
    '; - } - else - { - echo 'Updated ', $file, ':', dump_code($data, $files[$i]); - } -} - -// Check if there are invalid images in imageset -$list = array_merge($images_global, $images_en); -foreach ($list as $key => $row) -{ - if ($row['skip']) - { - echo 'Unable to generate code to add to CSS files because some images are missing or invalid. See errors above.'; - echo ob_get_clean(); - return; - } -} - -// Code to add to CSS files -$code = ' -/* Former imageset */ -span.imageset { - display: inline-block; - background: transparent none 0 0 no-repeat; - margin: 0; - padding: 0; - width: 0; - height: 0; - overflow: hidden; -} - -/* Global imageset items */ -' . css($images_global, './images/') . ' - -/* English images for fallback */ -' . css($images_en, './en/'); -if (strlen($bidi_code)) -{ - $code .= "\n/* RTL imageset entries */\n" . $bidi_code; -} -echo 'Code to add to CSS file:', dump_code($code, 'imageset.css'); - - -$list = list_languages($imageset_path); -for ($i=0; $i'; - $skip = true; - } - else - { - $size = @getimagesize($filename); - if ($size === false) - { - echo 'Error: file ', $filename, ' is not a valid image
    '; - $skip = true; - } - else - { - if(!$width) $width = intval($size[0]); - if(!$height) $height = intval($size[1]); - } - } - } - $result[$key] = array( - 'lang' => $lang, - 'file' => $file, - 'height' => $height, - 'width' => $width, - 'skip' => $skip - ); - } - return $result; -} - -function get_replacements($list) -{ - $result = array(); - foreach ($list as $key => $row) - { - $key = '{' . strtoupper($key); - $result[$key . '_SRC}'] = strlen($row['file']) ? ($row['lang'] ? './' . $row['lang'] : './images') . '/' . $row['file'] : ''; - $result[$key . '_WIDTH}'] = intval($row['width']); - $result[$key . '_HEIGHT}'] = intval($row['height']); - } - return $result; -} - -function list_files($dir, $ext) -{ - $res = @opendir($dir); - if ($res === false) - { - return false; - } - $files = array(); - while (($file = readdir($res)) !== false) - { - $list = explode('.', $file); - if(count($list) > 1 && strtolower($list[count($list) - 1]) == $ext) - { - $files[] = $file; - } - } - closedir($res); - return $files; -} - -function list_languages($dir) -{ - $res = @opendir($dir); - if ($res === false) - { - return array(); - } - $files = array(); - while (($file = readdir($res)) !== false) - { - if (substr($file, 0, 1) == '.') - { - continue; - } - $filename = $dir . '/' . $file; - if (is_dir($filename) && file_exists($filename . '/imageset.cfg')) - { - $files[] = $file; - } - } - closedir($res); - return $files; -} - -function dump_code($code, $filename = 'file.txt') -{ - $hash = md5($code); - if (isset($_GET['download']) && $_GET['download'] === $hash) - { - // Download file - ob_end_clean(); - header('Pragma: public'); - header('Expires: 0'); - header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); - header('Content-Type: application/force-download'); - header('Content-Disposition: attachment; filename="' . $filename . '";'); - header('Content-Transfer-Encoding: binary'); - header('Content-Length: ' . strlen($code)); - echo $code; - exit; - } - $list = explode("\n", $code); - $height = 15 * count($list); - echo ' [ download expand ]
    '; - echo '
    '; -} - -function css($list, $path = './', $bidi = false) -{ - $code = ''; - // Change value to true if you want images to be grouped up by size - $group = $bidi; - if ($group) - { - // group up images by size - $groups = array(); - foreach ($list as $key => $row) - { - if (!strlen($row['file'])) - { - continue; - } - $groups[$row['width'] . '*' . $row['height']][] = $key; - } - foreach ($groups as $size => $keys) - { - $extra = ''; - for ($i=0; $i $row) - { - if (!strlen($row['file'])) - { - continue; - } - $code .= ($bidi ? '.rtl ' : '') . '.imageset.' . substr($key, 4) . ' {'; - if ($bidi) - { - $code .= ' - padding-right: ' . $row['width'] . 'px; - padding-left: 0; -} -'; - } - else - { - $code .= ' - background-image: url("' . $path . $row['file'] . '"); - padding-left: ' . $row['width'] . 'px; - padding-top: ' . $row['height'] . 'px; -} -'; - } - } - } - return $code; -} - From bdd97457f6a0e952bbdae7b3c14a1cb84e441c14 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 15 Feb 2026 13:06:02 +0100 Subject: [PATCH 1102/1214] [ticket/13481] Extend wording about max image size to include resizing PHPBB-13481 --- phpBB/language/en/acp/attachments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 19fc6b44220..4faa89f12d9 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -118,7 +118,7 @@ 'MAX_ATTACHMENTS_PM' => 'Maximum number of attachments per private message', 'MAX_EXTGROUP_FILESIZE' => 'Maximum file size', 'MAX_IMAGE_SIZE' => 'Maximum image dimensions', - 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. Set both values to 0px by 0px to disable dimension checking.', + 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. phpBB may try to automatically resize images before upload to these maximum image dimensions. Set both values to 0px by 0px to disable dimension checking and automatic resizing.', 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width/height in pixel', 'MAX_THUMB_WIDTH_EXPLAIN' => 'A generated thumbnail will not exceed the width set here.', 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail file size', From 2095b1b26c4dd79409864954c13bfa616125ca7c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 15 Feb 2026 13:29:03 +0100 Subject: [PATCH 1103/1214] [ticket/13481] Replace size with dimension in first part of explain PHPBB-13481 --- phpBB/language/en/acp/attachments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 4faa89f12d9..8a47e498c61 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -118,7 +118,7 @@ 'MAX_ATTACHMENTS_PM' => 'Maximum number of attachments per private message', 'MAX_EXTGROUP_FILESIZE' => 'Maximum file size', 'MAX_IMAGE_SIZE' => 'Maximum image dimensions', - 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum size of image attachments. phpBB may try to automatically resize images before upload to these maximum image dimensions. Set both values to 0px by 0px to disable dimension checking and automatic resizing.', + 'MAX_IMAGE_SIZE_EXPLAIN' => 'Maximum dimensions of image attachments. phpBB may try to automatically resize images before upload to these maximum image dimensions. Set both values to 0px by 0px to disable dimension checking and automatic resizing.', 'MAX_THUMB_WIDTH' => 'Maximum thumbnail width/height in pixel', 'MAX_THUMB_WIDTH_EXPLAIN' => 'A generated thumbnail will not exceed the width set here.', 'MIN_THUMB_FILESIZE' => 'Minimum thumbnail file size', From f992cfa84059fb2ecbca74e2858205ace0aa1af3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 16 Feb 2026 17:22:15 +0100 Subject: [PATCH 1104/1214] [ticket/17613] Remove packaging for webpi PHPBB-17613 --- build/package.php | 6 - build/webpi/install/mssql.sql | 39 ------ build/webpi/install/mysql.sql | 15 -- build/webpi/manifest.xml | 13 -- build/webpi/parameters.xml | 256 ---------------------------------- 5 files changed, 329 deletions(-) delete mode 100644 build/webpi/install/mssql.sql delete mode 100644 build/webpi/install/mysql.sql delete mode 100644 build/webpi/manifest.xml delete mode 100644 build/webpi/parameters.xml diff --git a/build/package.php b/build/package.php index 18798d0602f..ba40f110f97 100755 --- a/build/package.php +++ b/build/package.php @@ -489,12 +489,6 @@ $package->run_command("$compress_command ./release_files/" . $package->get('release_filename') . '.' . $extension . ' ' . $package->get('package_name')); } -// Microsoft Web PI packaging -$package->begin_status('Packaging phpBB for Microsoft WebPI'); -$file = './release_files/' . $package->get('release_filename') . '.webpi.zip'; -$package->run_command('cp -p ./release_files/' . $package->get('release_filename') . ".zip $file"); -$package->run_command('cd ./../webpi && ' . $compress_programs['zip'] . " ./../new_version/$file *"); - // verify results chdir($package->locations['root']); $package->begin_status('********** Verifying packages **********'); diff --git a/build/webpi/install/mssql.sql b/build/webpi/install/mssql.sql deleted file mode 100644 index 9c0b46678a3..00000000000 --- a/build/webpi/install/mssql.sql +++ /dev/null @@ -1,39 +0,0 @@ -/**********************************************************************/ -/* Install.SQL */ -/* Creates a login and makes the user a member of db roles */ -/* */ -/**********************************************************************/ - --- Declare variables for database name, username and password -DECLARE @dbName sysname, - @dbUser sysname, - @dbPwd nvarchar(max); - --- Set variables for database name, username and password -SET @dbName = 'PlaceHolderForDb'; -SET @dbUser = 'PlaceHolderForUser'; -SET @dbPwd = 'PlaceHolderForPassword'; - -DECLARE @cmd nvarchar(max) - --- Create login -IF( SUSER_SID(@dbUser) is null ) -BEGIN - print '-- Creating login ' - SET @cmd = N'CREATE LOGIN ' + quotename(@dbUser) + N' WITH PASSWORD ='''+ replace(@dbPwd, '''', '''''') + N'''' - EXEC(@cmd) -END - --- Create database user and map to login --- and add user to the datareader, datawriter, ddladmin and securityadmin roles --- -SET @cmd = N'USE ' + quotename(@DBName) + N'; -IF( NOT EXISTS (SELECT * FROM sys.database_principals WHERE name = ''' + replace(@dbUser, '''', '''''') + N''')) -BEGIN - print ''-- Creating user''; - CREATE USER ' + quotename(@dbUser) + N' FOR LOGIN ' + quotename(@dbUser) + N'; - print ''-- Adding user''; - EXEC sp_addrolemember ''db_owner'', ''' + replace(@dbUser, '''', '''''') + N'''; -END' -EXEC(@cmd) -GO diff --git a/build/webpi/install/mysql.sql b/build/webpi/install/mysql.sql deleted file mode 100644 index 5c9d8cd9223..00000000000 --- a/build/webpi/install/mysql.sql +++ /dev/null @@ -1,15 +0,0 @@ -USE PlaceHolderForDb$$ - -DROP PROCEDURE IF EXISTS add_user $$ - -CREATE PROCEDURE add_user() -BEGIN -DECLARE EXIT HANDLER FOR 1044 BEGIN END; -GRANT ALL PRIVILEGES ON PlaceHolderForDb.* to 'PlaceHolderForUser'@'PlaceHolderForServer' IDENTIFIED BY 'PlaceHolderForPassword'; -FLUSH PRIVILEGES; -END -$$ - -CALL add_user() $$ - -DROP PROCEDURE IF EXISTS add_user $$ diff --git a/build/webpi/manifest.xml b/build/webpi/manifest.xml deleted file mode 100644 index 947377893ba..00000000000 --- a/build/webpi/manifest.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/build/webpi/parameters.xml b/build/webpi/parameters.xml deleted file mode 100644 index be4d374632a..00000000000 --- a/build/webpi/parameters.xml +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 3ac18438d016a040edd4e1fea25432d3e69e6095 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Tue, 3 Mar 2026 10:51:08 -0800 Subject: [PATCH 1105/1214] [ticket/17593] Allow functional tests on local servers with SSL (master) PHPBB-17593 --- .../phpbb_functional_test_case.php | 42 +++++++++++++------ 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index 6ed579ad2c0..b632e8c1a7b 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -129,25 +129,41 @@ protected function setUp(): void $this->bootstrap(); self::$cookieJar = new CookieJar; + + // Configure SSL verification for local development with self-signed certificates + $http_options = []; + if (isset(self::$config['path_to_ssl_cert'])) + { + if (self::$config['path_to_ssl_cert'] === false) + { + // Disable SSL verification + $http_options['verify_peer'] = false; + $http_options['verify_host'] = false; + } + else + { + // Use custom CA certificate + $http_options['verify_peer'] = true; + $http_options['verify_host'] = true; + $http_options['cafile'] = self::$config['path_to_ssl_cert']; + } + } + // Optimize HTTP client for Windows platform - if (strtolower(substr(PHP_OS, 0, 3)) === 'win') { - self::$http_client = new NativeHttpClient([ + if (stripos(PHP_OS_FAMILY, 'win') === 0) + { + self::$http_client = new NativeHttpClient(array_merge([ 'timeout' => 30, 'max_duration' => 60, - ]); - } else { - self::$http_client = HttpClient::create([ - 'timeout' => 60, - ]); + ], $http_options)); } - self::$client = new HttpBrowser(self::$http_client, null, self::$cookieJar); - - // Disable SSL verification for local development with self-signed certificates - if (isset(self::$config['path_to_ssl_cert'])) + else { - $guzzle_client = new \GuzzleHttp\Client(['verify' => self::$config['path_to_ssl_cert']]); - self::$client->setClient($guzzle_client); + self::$http_client = HttpClient::create(array_merge([ + 'timeout' => 60, + ], $http_options)); } + self::$client = new HttpBrowser(self::$http_client, null, self::$cookieJar); // Clear the language array so that things // that were added in other tests are gone From 979c4691d2be759e1ab96131b3b12c50b25d37e1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 3 Mar 2026 20:22:50 +0100 Subject: [PATCH 1106/1214] [ticket/security-286] Ensure post is visible when quoting it SECURITY-286 --- phpBB/includes/ucp/ucp_pm_compose.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 7cb4c85916d..d7dd87b97d3 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -203,7 +203,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) if ($action == 'quotepost') { - $sql = 'SELECT p.post_id as msg_id, p.forum_id, p.post_text as message_text, p.poster_id as author_id, p.post_time as message_time, p.bbcode_bitfield, p.bbcode_uid, p.enable_sig, p.enable_smilies, p.enable_magic_url, t.topic_title as message_subject, u.username as quote_username + $sql = 'SELECT p.post_id as msg_id, p.forum_id, p.post_text as message_text, p.poster_id as author_id, p.post_time as message_time, p.post_visibility as post_visibility, p.bbcode_bitfield, p.bbcode_uid, p.enable_sig, p.enable_smilies, p.enable_magic_url, t.topic_title as message_subject, u.username as quote_username FROM ' . POSTS_TABLE . ' p, ' . TOPICS_TABLE . ' t, ' . USERS_TABLE . " u WHERE p.post_id = $msg_id AND t.topic_id = p.topic_id @@ -369,6 +369,14 @@ function compose_pm($id, $mode, $action, $user_folders = array()) trigger_error('NOT_AUTHORISED'); } + /* @var $phpbb_content_visibility \phpbb\content_visibility */ + $phpbb_content_visibility = $phpbb_container->get('content.visibility'); + + if (!$phpbb_content_visibility->is_visible('post', $post['forum_id'], $post)) + { + trigger_error('NO_MESSAGE'); + } + /** * Get the result of querying for the post to be quoted in the pm message * From 534e0068185a8b053885fc4314bfe21072c6edea Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Wed, 4 Mar 2026 07:53:42 -0800 Subject: [PATCH 1107/1214] [ticket/17619] Fix UnusedUseSniff to detect property type declarations PHPBB-17619 --- .../Sniffs/Namespaces/UnusedUseSniff.php | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php index 42a0fc5288b..9deb1b4cf7f 100644 --- a/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php +++ b/build/code_sniffer/phpbb/Sniffs/Namespaces/UnusedUseSniff.php @@ -268,6 +268,27 @@ private function findClassUsage(File $phpcsFile, $stackPtr, $tokens, $class_name } } + // Checks in property type declarations + $old_property = $stackPtr; + while (($property = $phpcsFile->findNext(T_VARIABLE, ($old_property + 1))) !== false) + { + $old_property = $property; + + try + { + $property_props = $phpcsFile->getMemberProperties($property); + if (!empty($property_props['type'])) + { + $ok = $this->check($phpcsFile, $property_props['type'], $class_name_full, $class_name_short, $property) || $ok; + } + } + catch (\Exception $e) + { + // Not a class member property, skip it + continue; + } + } + // Checks in catch blocks $old_catch = $stackPtr; while (($catch = $phpcsFile->findNext(T_CATCH, ($old_catch + 1))) !== false) From cea06552c47178252fa31086ff79ab39c2643513 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 14 Feb 2026 11:32:23 +0100 Subject: [PATCH 1108/1214] [ticket/security-285] Don't forget to keep using parse_url at least SECURITY-285 --- phpBB/phpbb/session.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/session.php b/phpBB/phpbb/session.php index 29a72d6ee36..bee1b69e435 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -182,7 +182,9 @@ function extract_current_hostname() return (strpos($config['cookie_domain'], '.') === 0) ? substr($config['cookie_domain'], 1) : $config['cookie_domain']; } - // Use provided host if neither cookie_domain nor server_name are set in config + // Try using provided host if neither cookie_domain nor server_name are set in config + $host = @parse_url('https://' . $host); + $host = (!empty($host['host'])) ? $host['host'] : ''; if (!empty($host)) { return $host; From 538725d74492f8b043cedc3483dec97ba2d7ac3b Mon Sep 17 00:00:00 2001 From: Derky Date: Wed, 4 Mar 2026 23:13:01 +0100 Subject: [PATCH 1109/1214] [ticket/security-287] Add form key to report SECURITY-287 --- .../config/default/container/services_report.yml | 1 + phpBB/phpbb/report/controller/report.php | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/phpBB/config/default/container/services_report.yml b/phpBB/config/default/container/services_report.yml index 2c5b3bf3d52..9ad398912a1 100644 --- a/phpBB/config/default/container/services_report.yml +++ b/phpBB/config/default/container/services_report.yml @@ -7,6 +7,7 @@ services: - '@user' - '@template' - '@controller.helper' + - '@language' - '@request' - '@captcha.factory' - '@phpbb.report.handler_factory' diff --git a/phpBB/phpbb/report/controller/report.php b/phpBB/phpbb/report/controller/report.php index 8f1cf657040..50171d86d51 100644 --- a/phpBB/phpbb/report/controller/report.php +++ b/phpBB/phpbb/report/controller/report.php @@ -38,6 +38,11 @@ class report */ protected $helper; + /** + * @var \phpbb\language\language $language + */ + protected $language; + /** * @var \phpbb\request\request_interface */ @@ -68,13 +73,14 @@ class report */ protected $report_reason_provider; - public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\request\request_interface $request, \phpbb\captcha\factory $captcha_factory, \phpbb\report\handler_factory $report_factory, \phpbb\report\report_reason_list_provider $ui_provider, $phpbb_root_path, $php_ext) + public function __construct(\phpbb\config\config $config, \phpbb\user $user, \phpbb\template\template $template, \phpbb\controller\helper $helper, \phpbb\language\language $language, \phpbb\request\request_interface $request, \phpbb\captcha\factory $captcha_factory, \phpbb\report\handler_factory $report_factory, \phpbb\report\report_reason_list_provider $ui_provider, $phpbb_root_path, $php_ext) { $this->config = $config; $this->user = $user; $this->template = $template; $this->helper = $helper; $this->request = $request; + $this->language = $language; $this->phpbb_root_path = $phpbb_root_path; $this->php_ext = $php_ext; $this->captcha_factory = $captcha_factory; @@ -136,6 +142,8 @@ public function handle($id, $mode) return new RedirectResponse($redirect_url, 302); } + add_form_key('report'); + // Check CAPTCHA, if the form was submited if (!empty($submit) && isset($captcha)) { @@ -144,6 +152,11 @@ public function handle($id, $mode) $s_hidden_fields = $captcha_template_array['hidden_fields']; } + if (!empty($submit) && !check_form_key('report')) + { + $error[] = $this->language->lang('FORM_INVALID'); + } + // Handle request try { From 1b8a132302d57292ac9423cfc245401c17cd3f52 Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 8 Mar 2026 10:20:26 -0700 Subject: [PATCH 1110/1214] [ticket/17620] Skip whois test if daily rate limit is exceeded PHPBB-17620 --- tests/functions_user/whois_test.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/functions_user/whois_test.php b/tests/functions_user/whois_test.php index 70873f6b1a9..ba94f214e6d 100644 --- a/tests/functions_user/whois_test.php +++ b/tests/functions_user/whois_test.php @@ -46,6 +46,16 @@ public function ips_data() public function test_ip_whois($ip) { $ip_whois = user_ipwhois($ip); + + if ( + preg_match('/%ERROR:201:\s*access denied/i', $ip_whois) + || stripos($ip_whois, 'daily limit of controlled objects') !== false + || stripos($ip_whois, 'Access from your host has been temporarily denied') !== false + ) + { + $this->markTestSkipped('WHOIS provider temporarily denied access due to rate limiting (RIPE ERROR:201).'); + } + $this->assertStringNotContainsString('Query terms are ambiguous', $ip_whois); $this->assertStringNotContainsString('no entries found', $ip_whois); $this->assertStringNotContainsString('ERROR', $ip_whois); From 5c01ab29230aa8e1852695b1cdf2ca0722bcb8d1 Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Mon, 9 Mar 2026 14:08:17 -0400 Subject: [PATCH 1111/1214] [ticket/17621] Change U_WARN to use new warn_allowed variable New variable added to allow extensions to force the warn function. PHPBB-17621 --- phpBB/viewtopic.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 47172cfc605..afd8d0a75fd 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1926,7 +1926,7 @@ $s_first_unread = $first_unread = true; } - $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = false; + $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = $force_warn_allowed = false; $s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id; $s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60); @@ -1957,8 +1957,10 @@ * @var bool s_cannot_delete_locked User can not delete the post because it's locked * @var bool s_cannot_delete_time User can not delete the post because edit_time has passed * @var bool force_softdelete_allowed Allow the user to ыoftdelete the post (all permissions and conditions are ignored) + * @var bool force_warn_allowed Allow the user to warn (all permissions and conditions are ignored) * @since 3.1.0-b4 * @changed 3.1.11-RC1 Added force_softdelete_allowed var + * @changed 3.1.16-RC1 Added force_warn_allowed var */ $vars = array( 'row', @@ -1973,6 +1975,7 @@ 's_cannot_delete_locked', 's_cannot_delete_time', 'force_softdelete_allowed', + 'force_warn_allowed', ); extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_action_conditions', compact($vars))); @@ -2000,6 +2003,8 @@ $permanent_delete_allowed = $force_delete_allowed || ($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('f_delete', $forum_id) && $user->data['user_id'] == $poster_id)); + $warn_allowed = $force_warn_allowed || ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS); + // Can this user receive a Private Message? $can_receive_pm = ( // They must be a "normal" user @@ -2081,7 +2086,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '', + 'U_WARN' => ($warn_allowed) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 76eb24f564dfbb5c0ab89f35439c7bfab950f974 Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Mon, 9 Mar 2026 14:37:57 -0400 Subject: [PATCH 1112/1214] [ticket/17621] Master: Change U_WARN to use new warn_allowed variable New variable added to allow extensions to force the warn function. PHPBB-17621 --- phpBB/viewtopic.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 31812042922..a4e11957b0f 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1924,7 +1924,7 @@ $s_first_unread = $first_unread = true; } - $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = false; + $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = $force_warn_allowed = false; $s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id; $s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60); @@ -1955,8 +1955,10 @@ * @var bool s_cannot_delete_locked User can not delete the post because it's locked * @var bool s_cannot_delete_time User can not delete the post because edit_time has passed * @var bool force_softdelete_allowed Allow the user to ыoftdelete the post (all permissions and conditions are ignored) + * @var bool force_warn_allowed Allow the user to warn (all permissions and conditions are ignored) * @since 3.1.0-b4 * @changed 3.1.11-RC1 Added force_softdelete_allowed var + * @changed 3.1.16-RC1 Added force_warn_allowed var */ $vars = array( 'row', @@ -1971,6 +1973,7 @@ 's_cannot_delete_locked', 's_cannot_delete_time', 'force_softdelete_allowed', + 'force_warn_allowed', ); extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_action_conditions', compact($vars))); @@ -1998,6 +2001,8 @@ $permanent_delete_allowed = $force_delete_allowed || ($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('f_delete', $forum_id) && $user->data['user_id'] == $poster_id)); + $warn_allowed = $force_warn_allowed || ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS); + // Can this user receive a Private Message? $can_receive_pm = ( // They must be a "normal" user @@ -2076,7 +2081,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '', - 'U_WARN' => ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '', + 'U_WARN' => ($warn_allowed) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 2843396fc4b70833ac9c1fb26083216891b43713 Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Mon, 9 Mar 2026 21:42:54 -0400 Subject: [PATCH 1113/1214] [ticket/17621] Master: Fix changed version number PHPBB-17621 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index a4e11957b0f..1f30e362ad5 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1958,7 +1958,7 @@ * @var bool force_warn_allowed Allow the user to warn (all permissions and conditions are ignored) * @since 3.1.0-b4 * @changed 3.1.11-RC1 Added force_softdelete_allowed var - * @changed 3.1.16-RC1 Added force_warn_allowed var + * @changed 3.3.16-RC1 Added force_warn_allowed var */ $vars = array( 'row', From 1d791cc8cac0f6ef8d79645d999c2a3cc69efe8d Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Mon, 9 Mar 2026 21:44:19 -0400 Subject: [PATCH 1114/1214] [ticket/17621] Fix changed version number PHPBB-17621 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index afd8d0a75fd..aa3f5622df7 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1960,7 +1960,7 @@ * @var bool force_warn_allowed Allow the user to warn (all permissions and conditions are ignored) * @since 3.1.0-b4 * @changed 3.1.11-RC1 Added force_softdelete_allowed var - * @changed 3.1.16-RC1 Added force_warn_allowed var + * @changed 3.3.16-RC1 Added force_warn_allowed var */ $vars = array( 'row', From b1f9fb44da5c6fec5a298435e15c16245d220633 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 7 Mar 2026 09:48:08 +0100 Subject: [PATCH 1115/1214] [ticket/17622] Improve handling of branches in version helper PHPBB-17622 --- phpBB/includes/acp/acp_main.php | 1 + phpBB/phpbb/version_helper.php | 48 ++++-- tests/version/version_test.php | 293 +++++++++++++++++--------------- 3 files changed, 193 insertions(+), 149 deletions(-) diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 9ed450ca36d..59a86c2a004 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -467,6 +467,7 @@ function main($id, $mode) if ($auth->acl_get('a_board')) { + /** @var \phpbb\version_helper $version_helper */ $version_helper = $phpbb_container->get('version_helper'); try { diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 4844c6e62ec..ffbe1b847c6 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -170,10 +170,10 @@ public function compare($version1, $version2, $operator = null) * @param string $version * @return bool Bool true or false */ - public function is_stable($version) + public function is_stable(string $version): bool { $matches = false; - preg_match('/^[\d\.]+/', $version, $matches); + preg_match('/^[\d.]+/', $version, $matches); if (empty($matches[0])) { @@ -183,6 +183,20 @@ public function is_stable($version) return $this->compare($version, $matches[0], '>='); } + /** + * Get branch for version, e.g. 3.2 for version 3.2.5 + * + * @param string $version Version to get branch from + * @return string Branch for version or empty string if version is not of expected format + */ + protected function get_branch(string $version): string + { + $matches = []; + preg_match('/^(\d+\.\d+).*$/', $version, $matches); + + return $matches[1] ?? ''; + } + /** * Gets the latest version for the current branch the user is on * @@ -191,27 +205,33 @@ public function is_stable($version) * @return string * @throws version_check_exception */ - public function get_latest_on_current_branch($force_update = false, $force_cache = false) + public function get_latest_on_current_branch(bool $force_update = false, bool $force_cache = false): string { $versions = $this->get_versions_matching_stability($force_update, $force_cache); - $self = $this; $current_version = $this->current_version; - // Filter out any versions less than the current version - $versions = array_filter($versions, function($data) use ($self, $current_version) { - return $self->compare($data['current'], $current_version, '>='); - }); + // Get the branch information for the current version + $current_branch = $this->get_branch($current_version); + if (isset($versions[$current_branch]) && !$versions[$current_branch]['eol']) + { + return $versions[$current_branch]['current']; + } - // Get the lowest version from the previous list. - return array_reduce($versions, function($value, $data) use ($self) { - if ($value === null || $self->compare($data['current'], $value, '<')) + // Filter out any branches less than the current branch + $versions = array_filter($versions, function($data, $branch) use ($current_branch) { + return $this->compare($branch, $current_branch, '>='); + }, ARRAY_FILTER_USE_BOTH); + + // Get the lowest version from the previous list that is not EoL + return array_reduce($versions, function($value, $data) { + if (!$data['eol'] && ($value === null || $this->compare($data['current'], $value, '<'))) { return $data['current']; } return $value; - }); + }) ?? ''; } /** @@ -275,9 +295,7 @@ public function get_ext_update_on_branch($force_update = false, $force_cache = f $self = $this; $current_version = $this->current_version; - // Get current phpBB branch from version, e.g.: 3.2 - preg_match('/^(\d+\.\d+).*$/', $this->config['version'], $matches); - $current_branch = $matches[1]; + $current_branch = $this->get_branch($this->config['version']); // Filter out any versions less than the current version $versions = array_filter($versions, function($data) use ($self, $current_version) { diff --git a/tests/version/version_test.php b/tests/version/version_test.php index e5101b3c6e6..dc8f351103a 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -86,111 +86,111 @@ public function test_is_stable($version, $expected) public function get_suggested_updates_data() { - return array( - array( + return [ + [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), - array( - '1.0' => array( + ], + ], + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), - ), - array( + ], + ], + ], + [ '1.0.1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), - array( - '1.1' => array( + ], + ], + [ + '1.1' => [ 'current' => '1.1.1', - ), - ), - ), - array( + ], + ], + ], + [ '1.0.1-a1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1-a2', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0', - ), - ), - array( - '1.0' => array( + ], + ], + [ + '1.0' => [ 'current' => '1.0.1-a2', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0', - ), - ), - ), - array( + ], + ], + ], + [ '1.1.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), - array( - '1.1' => array( + ], + ], + [ + '1.1' => [ 'current' => '1.1.1', - ), - ), - ), - array( + ], + ], + ], + [ '1.1.1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), - array(), - ), - array( + ], + ], + [], + ], + [ '1.1.0-a1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0-a2', - ), - ), - array( - '1.1' => array( + ], + ], + [ + '1.1' => [ 'current' => '1.1.0-a2', - ), - ), - ), - array( + ], + ], + ], + [ '1.1.0', - array(), - array(), - ), - ); + [], + [], + ], + ]; } /** @@ -226,87 +226,112 @@ public function test_get_suggested_updates($current_version, $versions, $expecte $this->assertSame($expected, $version_helper->get_suggested_updates()); } - public function get_latest_on_current_branch_data() + public function get_latest_on_current_branch_data(): array { - return array( - array( + return [ + 'stable1.0_update_same_branch' => [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), + ], + ], '1.0.1', - ), - array( + ], + 'stable1.0_no_update_same_branch' => [ '1.0.1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), + ], + ], '1.0.1', - ), - array( + ], + 'stable1.0_eol_branch' => [ + '1.0.1', + [ + '1.0' => [ + 'current' => '1.0.1', + 'eol' => true, + ], + '1.1' => [ + 'current' => '1.1.1', + ], + ], + '1.1.1', + ], + 'unstable1.0_update_same_branch' => [ '1.0.1-a1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1-a2', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0', - ), - ), + ], + ], '1.0.1-a2', - ), - array( + ], + 'stable1.1_update_same_branch' => [ '1.1.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), + ], + ], '1.1.1', - ), - array( + ], + 'stable1.1_no_update_same_branch' => [ '1.1.1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', - ), - ), + ], + ], '1.1.1', - ), - array( + ], + 'unstable1.1_update_same_branch' => [ '1.1.0-a1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0-a2', - ), - ), + ], + ], '1.1.0-a2', - ), - array( + ], + 'unstable1.0_update_newer_branch' => [ + '1.0.2-a1', + [ + '1.0' => [ + 'current' => '1.0.1', + ], + '1.1' => [ + 'current' => '1.1.0-a2', + ], + ], + '1.0.1', + ], + 'no_update_data' => [ '1.1.0', - array(), - null, - ), - ); + [], + '', + ], + ]; } /** From 13c75883a701c2de8f08a3a37b1ee64c8a163805 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Mar 2026 21:04:05 +0100 Subject: [PATCH 1116/1214] [ticket/17622] Respect actual branch when handling updates on branch PHPBB-17622 --- phpBB/phpbb/version_helper.php | 19 ++- tests/version/version_test.php | 244 ++++++++++++++++++--------------- 2 files changed, 144 insertions(+), 119 deletions(-) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index ffbe1b847c6..e56e47af981 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -245,17 +245,26 @@ public function get_latest_on_current_branch(bool $force_update = false, bool $f * @return array Version info or empty array if there are no updates * @throws \RuntimeException */ - public function get_update_on_branch($force_update = false, $force_cache = false) + public function get_update_on_branch(bool $force_update = false, bool $force_cache = false): array { $versions = $this->get_versions_matching_stability($force_update, $force_cache); $self = $this; $current_version = $this->current_version; - // Filter out any versions less than the current version - $versions = array_filter($versions, function($data) use ($self, $current_version) { - return $self->compare($data['current'], $current_version, '>='); - }); + // Use current branch information if it exists + $current_branch = $this->get_branch($current_version); + $current_branch_data = $versions[$current_branch] ?? null; + if ($current_branch_data && !$current_branch_data['eol'] + && (!$current_branch_data['security'] || $this->compare($current_branch_data['security'], $current_version, '<='))) + { + return ($this->compare($current_branch_data['current'], $current_version, '>')) ? $current_branch_data : []; + } + + // Filter out any branches less than the current branch + $versions = array_filter($versions, function($data, $branch) use ($current_branch) { + return $this->compare($branch, $current_branch, '>='); + }, ARRAY_FILTER_USE_BOTH); // Get the lowest version from the previous list. $update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) { diff --git a/tests/version/version_test.php b/tests/version/version_test.php index dc8f351103a..35379d7a915 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -367,228 +367,244 @@ public function test_get_latest_on_current_branch($current_version, $versions, $ $this->assertSame($expected, $version_helper->get_latest_on_current_branch()); } - public function get_update_on_branch_data() + public function get_update_on_branch_data(): array { - return array( - array( + return [ + '1.0_with_in_branch_update' => [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.0.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + '1.0_without_update' => [ '1.0.1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array(), - ), - array( + ], + ], + [], + ], + '1.0_with_alpha_update' => [ '1.0.1-a1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1-a2', 'eol' => false, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.0.1-a2', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + '1.0_with_alpha_on_newer_branch' => [ + '1.0.2-RC1', + [ + '1.0' => [ + 'current' => '1.0.1', + 'eol' => false, + 'security' => false, + ], + '1.1' => [ + 'current' => '1.1.0', + 'eol' => false, + 'security' => false, + ], + ], + [], + ], + '1.1_with_in_branch_update' => [ '1.1.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + '1.1_without_update' => [ '1.1.1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array(), - ), - array( + ], + ], + [], + ], + '1.1_with_alpha_update' => [ '1.1.0-a1', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.0-a2', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.1.0-a2', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ '1.1.0', - array(), - array(), - ), + [], + [], + ], // Latest safe release is 1.0.1 - array( + [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => '1.0.1', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.0.1', 'eol' => false, 'security' => '1.0.1', - ), - ), + ], + ], // Latest safe release is 1.0.0 - array( + [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => '1.0.0', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.0.1', 'eol' => false, 'security' => '1.0.0', - ), - ), + ], + ], // Latest safe release is 1.1.0 - array( + [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => false, 'security' => '1.1.0', - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), + ], + ], // Latest 1.0 release is EOL - array( + [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => true, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), - array( + ], + ], + [ 'current' => '1.1.1', 'eol' => false, 'security' => false, - ), - ), + ], + ], // All are EOL -- somewhat undefined behavior - array( + [ '1.0.0', - array( - '1.0' => array( + [ + '1.0' => [ 'current' => '1.0.1', 'eol' => true, 'security' => false, - ), - '1.1' => array( + ], + '1.1' => [ 'current' => '1.1.1', 'eol' => true, 'security' => false, - ), - ), - array(), - ), - ); + ], + ], + [], + ], + ]; } /** From a6ab8991e5dfa82ef0377e0c7ffe215e9085eb09 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 10 Mar 2026 21:41:05 +0100 Subject: [PATCH 1117/1214] [ticket/17622] Adjust handling of eol and security in version data PHPBB-17622 --- phpBB/phpbb/version_helper.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index e56e47af981..fb6409f3dc5 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -213,7 +213,7 @@ public function get_latest_on_current_branch(bool $force_update = false, bool $f // Get the branch information for the current version $current_branch = $this->get_branch($current_version); - if (isset($versions[$current_branch]) && !$versions[$current_branch]['eol']) + if (isset($versions[$current_branch]) && empty($versions[$current_branch]['eol'])) { return $versions[$current_branch]['current']; } @@ -255,8 +255,8 @@ public function get_update_on_branch(bool $force_update = false, bool $force_cac // Use current branch information if it exists $current_branch = $this->get_branch($current_version); $current_branch_data = $versions[$current_branch] ?? null; - if ($current_branch_data && !$current_branch_data['eol'] - && (!$current_branch_data['security'] || $this->compare($current_branch_data['security'], $current_version, '<='))) + if ($current_branch_data && empty($current_branch_data['eol']) + && (empty($current_branch_data['security']) || $this->compare($current_branch_data['security'], $current_version, '<='))) { return ($this->compare($current_branch_data['current'], $current_version, '>')) ? $current_branch_data : []; } From 914aca85d86dea306677f46d37497c8522b0b19c Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 00:54:28 -0400 Subject: [PATCH 1118/1214] [ticket/17621] Master: Move acl check back to template var PHPBB-17621 --- phpBB/viewtopic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1f30e362ad5..efbcea998fa 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2001,7 +2001,7 @@ $permanent_delete_allowed = $force_delete_allowed || ($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('f_delete', $forum_id) && $user->data['user_id'] == $poster_id)); - $warn_allowed = $force_warn_allowed || ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS); + $warn_allowed = $force_warn_allowed; // Can this user receive a Private Message? $can_receive_pm = ( @@ -2081,7 +2081,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '', - 'U_WARN' => ($warn_allowed) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '', + 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '') : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 4035d3725a4a20a9d30130720f7ff096815da7ac Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 00:49:18 -0400 Subject: [PATCH 1119/1214] [ticket/17621] Move acl check back to template var PHPBB-17621 --- phpBB/viewtopic.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index aa3f5622df7..c65684639a1 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2003,7 +2003,7 @@ $permanent_delete_allowed = $force_delete_allowed || ($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('f_delete', $forum_id) && $user->data['user_id'] == $poster_id)); - $warn_allowed = $force_warn_allowed || ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS); + $warn_allowed = $force_warn_allowed; // Can this user receive a Private Message? $can_receive_pm = ( @@ -2086,7 +2086,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($warn_allowed) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '', + 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '') : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 886b711efb8cdc40d9d10ca2e0efd5ad2ec8d3ee Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 01:20:17 -0400 Subject: [PATCH 1120/1214] [ticket/17621] Move force_warn_allowed to U_WARN PHPBB-17621 --- phpBB/viewtopic.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index c65684639a1..1e45a264427 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2003,8 +2003,6 @@ $permanent_delete_allowed = $force_delete_allowed || ($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('f_delete', $forum_id) && $user->data['user_id'] == $poster_id)); - $warn_allowed = $force_warn_allowed; - // Can this user receive a Private Message? $can_receive_pm = ( // They must be a "normal" user @@ -2086,7 +2084,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '') : '', + 'U_WARN' => ($force_warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '') : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 09adf3608284c5cecb9208008ace9e3c0c2fbc4d Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 01:23:33 -0400 Subject: [PATCH 1121/1214] [ticket/17621] Master: Move force_warn_allowed to U_WARN PHPBB-17621 --- phpBB/viewtopic.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index efbcea998fa..58546a9bbd8 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2001,8 +2001,6 @@ $permanent_delete_allowed = $force_delete_allowed || ($auth->acl_get('m_delete', $forum_id) || ($auth->acl_get('f_delete', $forum_id) && $user->data['user_id'] == $poster_id)); - $warn_allowed = $force_warn_allowed; - // Can this user receive a Private Message? $can_receive_pm = ( // They must be a "normal" user @@ -2081,7 +2079,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '', - 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '') : '', + 'U_WARN' => ($force_warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '') : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 2f54b5bfbe52cbbf48a36dcc1cc022a8367ea5b7 Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 02:45:43 -0400 Subject: [PATCH 1122/1214] [ticket/17621] Master: Fix warning users in viewtopic PHPBB-17621 --- phpBB/viewtopic.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 58546a9bbd8..2e9ab77d19d 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1924,7 +1924,8 @@ $s_first_unread = $first_unread = true; } - $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = $force_warn_allowed = false; + $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = false; + $warn_allowed = true; $s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id; $s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60); @@ -1955,10 +1956,10 @@ * @var bool s_cannot_delete_locked User can not delete the post because it's locked * @var bool s_cannot_delete_time User can not delete the post because edit_time has passed * @var bool force_softdelete_allowed Allow the user to ыoftdelete the post (all permissions and conditions are ignored) - * @var bool force_warn_allowed Allow the user to warn (all permissions and conditions are ignored) + * @var bool warn_allowed Allow the user to warn (all permissions and conditions are ignored) * @since 3.1.0-b4 * @changed 3.1.11-RC1 Added force_softdelete_allowed var - * @changed 3.3.16-RC1 Added force_warn_allowed var + * @changed 3.3.16-RC1 Added warn_allowed var */ $vars = array( 'row', @@ -1973,7 +1974,7 @@ 's_cannot_delete_locked', 's_cannot_delete_time', 'force_softdelete_allowed', - 'force_warn_allowed', + 'warn_allowed', ); extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_action_conditions', compact($vars))); @@ -2079,7 +2080,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '', - 'U_WARN' => ($force_warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '') : '', + 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '') : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From a4e3eb47782f1c7607a6bc5d06a482310d935b2d Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 02:48:34 -0400 Subject: [PATCH 1123/1214] [ticket/17621] Fix warning users in viewtopic PHPBB-17621 --- phpBB/viewtopic.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 1e45a264427..4ceb9c2061a 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1926,7 +1926,8 @@ $s_first_unread = $first_unread = true; } - $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = $force_warn_allowed = false; + $force_edit_allowed = $force_delete_allowed = $force_softdelete_allowed = false; + $warn_allowed = true; $s_cannot_edit = !$auth->acl_get('f_edit', $forum_id) || $user->data['user_id'] != $poster_id; $s_cannot_edit_time = $config['edit_time'] && $row['post_time'] <= time() - ($config['edit_time'] * 60); @@ -1957,10 +1958,10 @@ * @var bool s_cannot_delete_locked User can not delete the post because it's locked * @var bool s_cannot_delete_time User can not delete the post because edit_time has passed * @var bool force_softdelete_allowed Allow the user to ыoftdelete the post (all permissions and conditions are ignored) - * @var bool force_warn_allowed Allow the user to warn (all permissions and conditions are ignored) + * @var bool warn_allowed Allow the user to warn (all permissions and conditions are ignored) * @since 3.1.0-b4 * @changed 3.1.11-RC1 Added force_softdelete_allowed var - * @changed 3.3.16-RC1 Added force_warn_allowed var + * @changed 3.3.16-RC1 Added warn_allowed var */ $vars = array( 'row', @@ -1975,7 +1976,7 @@ 's_cannot_delete_locked', 's_cannot_delete_time', 'force_softdelete_allowed', - 'force_warn_allowed', + 'warn_allowed', ); extract($phpbb_dispatcher->trigger_event('core.viewtopic_modify_post_action_conditions', compact($vars))); @@ -2084,7 +2085,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($force_warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '') : '', + 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '') : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 0b79e4c450aafad3afc0cc1952eac45925d62920 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 12 Mar 2026 19:17:04 +0100 Subject: [PATCH 1124/1214] [ticket/17622] Use empty to check if value is even set in array PHPBB-17622 --- phpBB/phpbb/version_helper.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index fb6409f3dc5..e201d4055cc 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -225,7 +225,7 @@ public function get_latest_on_current_branch(bool $force_update = false, bool $f // Get the lowest version from the previous list that is not EoL return array_reduce($versions, function($value, $data) { - if (!$data['eol'] && ($value === null || $this->compare($data['current'], $value, '<'))) + if (empty($data['eol']) && ($value === null || $this->compare($data['current'], $value, '<'))) { return $data['current']; } @@ -270,7 +270,7 @@ public function get_update_on_branch(bool $force_update = false, bool $force_cac $update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) { if ($value === null && $self->compare($data['current'], $current_version, '>=')) { - if (!$data['eol'] && (!$data['security'] || $self->compare($data['security'], $data['current'], '<='))) + if (empty($data['eol']) && (empty($data['security']) || $self->compare($data['security'], $data['current'], '<='))) { return ($self->compare($data['current'], $current_version, '>')) ? $data : array(); } From 5f3bd64cea3eb7a70d3b71254e07eacc4198b28f Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 14:37:18 -0400 Subject: [PATCH 1125/1214] [ticket/17621] Fix over-nested ternary PHPBB-17621 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 4ceb9c2061a..c83b3350987 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2085,7 +2085,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id, true, $user->session_id) : '', - 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '') : '', + 'U_WARN' => ($warn_allowed && $auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id'], true, $user->session_id) : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From a188ef1522ddd119185cd9a7034c227953000d65 Mon Sep 17 00:00:00 2001 From: "Kailey M. Snay" Date: Thu, 12 Mar 2026 14:38:49 -0400 Subject: [PATCH 1126/1214] [ticket/17621] Master: Fix over-nested ternary PHPBB-17621 --- phpBB/viewtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 2e9ab77d19d..e3ad9e12c4b 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2080,7 +2080,7 @@ 'U_NEXT_POST_ID' => ($i < $i_total && isset($rowset[$post_list[$i + 1]])) ? $rowset[$post_list[$i + 1]]['post_id'] : '', 'U_PREV_POST_ID' => $prev_post_id, 'U_NOTES' => ($auth->acl_getf_global('m_')) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=notes&mode=user_notes&u=' . $poster_id) : '', - 'U_WARN' => ($warn_allowed) ? ($auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '') : '', + 'U_WARN' => ($warn_allowed && $auth->acl_get('m_warn') && $poster_id != $user->data['user_id'] && $poster_id != ANONYMOUS) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=warn&mode=warn_post&p=' . $row['post_id']) : '', 'POST_ID' => $row['post_id'], 'POST_NUMBER' => $i + $start + 1, From 60594ea1b03625f061ff2d7c0ce4ac4c63fdc0f2 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 13 Mar 2026 20:46:44 +0100 Subject: [PATCH 1127/1214] [ticket/17622] Remove overcomplicated array_reduce PHPBB-17622 --- phpBB/phpbb/version_helper.php | 52 ++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index e201d4055cc..46350e580a8 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -218,20 +218,24 @@ public function get_latest_on_current_branch(bool $force_update = false, bool $f return $versions[$current_branch]['current']; } - // Filter out any branches less than the current branch - $versions = array_filter($versions, function($data, $branch) use ($current_branch) { - return $this->compare($branch, $current_branch, '>='); - }, ARRAY_FILTER_USE_BOTH); - - // Get the lowest version from the previous list that is not EoL - return array_reduce($versions, function($value, $data) { - if (empty($data['eol']) && ($value === null || $this->compare($data['current'], $value, '<'))) + // Sort versions in version ascending order so we can loop from the lowest version to the highest version. + uksort($versions, function($version1, $version2) { + return $this->compare($version1, $version2, '>'); + }); + + // Find next available version from versions info. + // Will suggest newer branches when EoL has been reached for the current branch, and/or version from newer branch + // is needed for having all known security issues fixed ('security' > latest on branch). + foreach ($versions as $branch => $data) + { + if ($this->compare($branch, $current_branch, '>=') && empty($data['eol']) + && (empty($branch['security']) || $this->compare($branch['security'], $data['current'], '<='))) { return $data['current']; } + } - return $value; - }) ?? ''; + return ''; } /** @@ -249,7 +253,6 @@ public function get_update_on_branch(bool $force_update = false, bool $force_cac { $versions = $this->get_versions_matching_stability($force_update, $force_cache); - $self = $this; $current_version = $this->current_version; // Use current branch information if it exists @@ -261,29 +264,28 @@ public function get_update_on_branch(bool $force_update = false, bool $force_cac return ($this->compare($current_branch_data['current'], $current_version, '>')) ? $current_branch_data : []; } - // Filter out any branches less than the current branch - $versions = array_filter($versions, function($data, $branch) use ($current_branch) { - return $this->compare($branch, $current_branch, '>='); - }, ARRAY_FILTER_USE_BOTH); + // Sort versions in version ascending order so we can loop from the lowest version to the highest version. + uksort($versions, function($version1, $version2) { + return $this->compare($version1, $version2, '>'); + }); - // Get the lowest version from the previous list. - $update_info = array_reduce($versions, function($value, $data) use ($self, $current_version) { - if ($value === null && $self->compare($data['current'], $current_version, '>=')) + foreach ($versions as $branch => $data) + { + if ($this->compare($branch, $current_branch, '>=') && empty($data['eol']) + && (empty($data['security']) || $this->compare($data['security'], $data['current'], '<='))) { - if (empty($data['eol']) && (empty($data['security']) || $self->compare($data['security'], $data['current'], '<='))) + if ($this->compare($data['current'], $current_version, '>')) { - return ($self->compare($data['current'], $current_version, '>')) ? $data : array(); + return $data; } else { - return null; + break; } } + } - return $value; - }); - - return $update_info === null ? array() : $update_info; + return []; } /** From 121a5fa63ba6e6fb42e605e969f22b25eb6247e3 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 13 Mar 2026 21:13:45 +0100 Subject: [PATCH 1128/1214] [ticket/17622] Fix naming of test case PHPBB-17622 --- tests/version/version_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/version/version_test.php b/tests/version/version_test.php index 35379d7a915..f0000165ee4 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -426,7 +426,7 @@ public function get_update_on_branch_data(): array 'security' => false, ], ], - '1.0_with_alpha_on_newer_branch' => [ + '1.0rc1_update_on_newer_branch' => [ '1.0.2-RC1', [ '1.0' => [ From b00db023272fb9fb8f7fc68854ffd2b0b4ed71c6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 14 Mar 2026 17:03:59 +0100 Subject: [PATCH 1129/1214] [ticket/17622] Fix incorrect variable usage and extend tests PHPBB-17622 --- phpBB/phpbb/version_helper.php | 2 +- tests/version/version_test.php | 90 ++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 1 deletion(-) diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 46350e580a8..c41afb6e8ba 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -229,7 +229,7 @@ public function get_latest_on_current_branch(bool $force_update = false, bool $f foreach ($versions as $branch => $data) { if ($this->compare($branch, $current_branch, '>=') && empty($data['eol']) - && (empty($branch['security']) || $this->compare($branch['security'], $data['current'], '<='))) + && (empty($data['security']) || $this->compare($data['security'], $data['current'], '<='))) { return $data['current']; } diff --git a/tests/version/version_test.php b/tests/version/version_test.php index f0000165ee4..462e9fb1a31 100644 --- a/tests/version/version_test.php +++ b/tests/version/version_test.php @@ -266,6 +266,36 @@ public function get_latest_on_current_branch_data(): array ], '1.1.1', ], + 'stable1.0_security_update' => [ + '1.0.1', + [ + '1.0' => [ + 'current' => '1.0.2', + 'eol' => false, + 'security' => '1.0.2' + ], + '1.1' => [ + 'current' => '1.1.1', + ], + ], + '1.0.2', + ], + 'stable1.0_security_update_newer_branch' => [ + '1.0.1', + [ + '1.0' => [ + 'current' => '1.0.2', + 'eol' => false, + 'security' => '1.1.1' + ], + '1.1' => [ + 'current' => '1.1.1', + ], + ], + // Special case: Latest on current branch is still 1.0.2, the update will be recommended + // as update either way by get_update_on_branch + '1.0.2', + ], 'unstable1.0_update_same_branch' => [ '1.0.1-a1', [ @@ -406,6 +436,66 @@ public function get_update_on_branch_data(): array ], [], ], + '1.0_eol' => [ + '1.0.1', + [ + '1.0' => [ + 'current' => '1.0.1', + 'eol' => true, + 'security' => false, + ], + '1.1' => [ + 'current' => '1.1.1', + 'eol' => false, + 'security' => false, + ], + ], + [ + 'current' => '1.1.1', + 'eol' => false, + 'security' => false, + ], + ], + '1.0_security_update' => [ + '1.0.1', + [ + '1.0' => [ + 'current' => '1.0.3', + 'eol' => false, + 'security' => '1.0.3', + ], + '1.1' => [ + 'current' => '1.1.1', + 'eol' => false, + 'security' => false, + ], + ], + [ + 'current' => '1.0.3', + 'eol' => false, + 'security' => '1.0.3', + ], + ], + '1.0_security_update_with_1.1' => [ + '1.0.1', + [ + '1.0' => [ + 'current' => '1.0.1', + 'eol' => false, + 'security' => '1.1.0', + ], + '1.1' => [ + 'current' => '1.1.1', + 'eol' => false, + 'security' => false, + ], + ], + [ + 'current' => '1.1.1', + 'eol' => false, + 'security' => false, + ], + ], '1.0_with_alpha_update' => [ '1.0.1-a1', [ From 425664bf404d292c76fbb62d980d976a32e22007 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 18 Mar 2026 21:09:44 +0100 Subject: [PATCH 1130/1214] [ticket/security-288] Verify web push endpoints against known list SECURITY-288 --- phpBB/language/en/common.php | 13 ++++--- phpBB/phpbb/ucp/controller/webpush.php | 53 +++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 6 deletions(-) diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e9225c62742..3cb5913863d 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -511,11 +511,14 @@ ), 'NOTIFY_ADMIN' => 'Please notify the board administrator or webmaster.', 'NOTIFY_ADMIN_EMAIL' => 'Please notify the board administrator or webmaster: %1$s', - 'NOTIFY_WEB_PUSH_DENIED' => 'You have denied notifications from this site. To subscribe, please allow notifications in your browser settings.', - 'NOTIFY_WEB_PUSH_DISABLED' => 'Web Push not supported', - 'NOTIFY_WEB_PUSH_ENABLE' => 'Enable web push notifications', - 'NOTIFY_WEB_PUSH_SUBSCRIBE' => 'Subscribe', - 'NOTIFY_WEB_PUSH_SUBSCRIBED'=> 'Subscribed', + + 'NOTIFY_WEB_PUSH_DENIED' => 'You have denied notifications from this site. To subscribe, please allow notifications in your browser settings.', + 'NOTIFY_WEB_PUSH_DISABLED' => 'Web Push not supported', + 'NOTIFY_WEB_PUSH_ENABLE' => 'Enable web push notifications', + 'NOTIFY_WEB_PUSH_SUBSCRIBE' => 'Subscribe', + 'NOTIFY_WEB_PUSH_SUBSCRIBED' => 'Subscribed', + 'NOTIFY_WEB_PUSH_UNSUPPORTED_SERVICE' => 'The requested web push service is not supported.', + 'NO_ACCESS_ATTACHMENT' => 'You are not allowed to access this file.', 'NO_ACTION' => 'No action specified.', 'NO_ADMINISTRATORS' => 'There are no administrators.', diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 61dd0ce1cf4..50552f0ca51 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -316,7 +316,12 @@ public function subscribe(symfony_request $symfony_request): JsonResponse { $this->check_subscribe_requests(); - $data = json_sanitizer::decode($symfony_request->get('data', '')); + $data = json_sanitizer::decode($symfony_request->attributes->get('data', '')); + + if (!$this->verify_endpoint($data['endpoint'])) + { + throw new http_exception(Response::HTTP_BAD_REQUEST, 'NOTIFY_WEB_PUSH_UNSUPPORTED_SERVICE'); + } $sql = 'INSERT INTO ' . $this->push_subscriptions_table . ' ' . $this->db->sql_build_array('INSERT', [ 'user_id' => $this->user->id(), @@ -333,6 +338,52 @@ public function subscribe(symfony_request $symfony_request): JsonResponse ]); } + /** + * Verify that the endpoint is valid and belongs to a known push service + * + * @param string $endpoint Endpoint URL to verify + * @return bool True if endpoint is valid URL and belongs to a known push service, false otherwise + */ + protected function verify_endpoint(string $endpoint): bool + { + $parts = parse_url($endpoint); + + // Basic URL structural check + if (!$parts || !isset($parts['scheme'], $parts['host'])) + { + return false; + } + + // MUST be HTTPS: https://datatracker.ietf.org/doc/html/rfc8030#section-8 + if (strtolower($parts['scheme']) !== 'https') + { + return false; + } + + // Only allow endpoints for known push services (e.g. Mozilla, Google) + // See https://github.com/pushpad/known-push-services for list of known services + $allowed_services = [ + 'android.googleapis.com', + 'fcm.googleapis.com', + 'updates.push.services.mozilla.com', + 'updates-autopush.stage.mozaws.net', + 'updates-autopush.dev.mozaws.net', + '*.notify.windows.com', + '*.push.apple.com', + ]; + + foreach ($allowed_services as $allowed_host) + { + // Use str_ends_with to support subdomains like 'web.push.apple.com' + if (str_ends_with(strtolower($parts['host']), $allowed_host)) + { + return true; + } + } + + return false; + } + /** * Handle unsubscribe requests * From a07e31c59625f86e3b23d9c615a1a8edb4dc3098 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Thu, 19 Mar 2026 20:52:10 +0100 Subject: [PATCH 1131/1214] [ticket/security-288] Update tests and symfony usage SECURITY-288 --- phpBB/phpbb/ucp/controller/webpush.php | 2 +- tests/ucp/controller_webpush_test.php | 36 +++++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 50552f0ca51..8df23f69262 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -394,7 +394,7 @@ public function unsubscribe(symfony_request $symfony_request): JsonResponse { $this->check_subscribe_requests(); - $data = json_sanitizer::decode($symfony_request->get('data', '')); + $data = json_sanitizer::decode($symfony_request->attributes->get('data', '')); $endpoint = $data['endpoint']; diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index 9641db0a1ad..46d1b6579ea 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -455,8 +455,9 @@ public function test_subscribe_success() $this->user->data['user_type'] = USER_NORMAL; $symfony_request = $this->createMock(\phpbb\symfony_request::class); - $symfony_request->method('get')->willReturn(json_encode([ - 'endpoint' => 'test_endpoint', + $symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class); + $symfony_request->attributes->method('get')->willReturn(json_encode([ + 'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint', 'expiration_time' => 0, 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] ])); @@ -476,7 +477,7 @@ public function test_subscribe_success() $this->assertEquals([ 'user_id' => '2', - 'endpoint' => 'test_endpoint', + 'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint', 'p256dh' => 'test_p256dh', 'auth' => 'test_auth', 'expiration_time' => 0, @@ -484,7 +485,7 @@ public function test_subscribe_success() ], $row); } - public function test_unsubscribe_success() + public function test_subscribe_unsupported_endpoint() { $this->form_helper->method('check_form_tokens')->willReturn(true); $this->request->method('is_ajax')->willReturn(true); @@ -493,12 +494,35 @@ public function test_unsubscribe_success() $this->user->data['user_type'] = USER_NORMAL; $symfony_request = $this->createMock(\phpbb\symfony_request::class); - $symfony_request->method('get')->willReturn(json_encode([ + $symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class); + $symfony_request->attributes->method('get')->willReturn(json_encode([ 'endpoint' => 'test_endpoint', 'expiration_time' => 0, 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] ])); + $this->expectException(http_exception::class); + $this->expectExceptionMessage('NOTIFY_WEB_PUSH_UNSUPPORTED_SERVICE'); + + $this->controller->subscribe($symfony_request); + } + + public function test_unsubscribe_success() + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class); + $symfony_request->attributes->method('get')->willReturn(json_encode([ + 'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + $response = $this->controller->subscribe($symfony_request); $this->assertInstanceOf(JsonResponse::class, $response); @@ -514,7 +538,7 @@ public function test_unsubscribe_success() $this->assertEquals([ 'user_id' => '2', - 'endpoint' => 'test_endpoint', + 'endpoint' => 'https://fcm.googleapis.com/fcm/send/test_endpoint', 'p256dh' => 'test_p256dh', 'auth' => 'test_auth', 'expiration_time' => 0, From cc3e00c871202c2f3136cd03e18d25b418a09a35 Mon Sep 17 00:00:00 2001 From: Derky Date: Thu, 19 Mar 2026 22:08:52 +0100 Subject: [PATCH 1132/1214] [ticket/security-288] Fix subdomain support for web push whitelist SECURITY-288 --- phpBB/phpbb/ucp/controller/webpush.php | 4 ++-- tests/ucp/controller_webpush_test.php | 32 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index 8df23f69262..a33f3b9a3cf 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -368,8 +368,8 @@ protected function verify_endpoint(string $endpoint): bool 'updates.push.services.mozilla.com', 'updates-autopush.stage.mozaws.net', 'updates-autopush.dev.mozaws.net', - '*.notify.windows.com', - '*.push.apple.com', + '.notify.windows.com', + '.push.apple.com', ]; foreach ($allowed_services as $allowed_host) diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index 46d1b6579ea..cbac7d8fb34 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -506,6 +506,38 @@ public function test_subscribe_unsupported_endpoint() $this->controller->subscribe($symfony_request); } + public function data_provider_subscribe_supported_endpoint() + { + return [ + 'fcm' => ['https://fcm.googleapis.com/fcm/send/test_endpoint'], + 'apns' => ['https://api.push.apple.com/3/device/test_endpoint'], + 'apns_sandbox' => ['https://api.sandbox.push.apple.com/3/device/test_endpoint'], + ]; + } + + /** + * @dataProvider data_provider_subscribe_supported_endpoint + */ + public function test_subscribe_supported_endpoint($data_provider) + { + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class); + $symfony_request->attributes->method('get')->willReturn(json_encode([ + 'endpoint' => $data_provider, + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertInstanceOf(JsonResponse::class, $response); + } public function test_unsubscribe_success() { From 3f553cf48feff34c868190dcbc3b853070437cff Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Mar 2026 09:04:51 +0100 Subject: [PATCH 1133/1214] [ticket/security-288] Add event for extending allowed endpoints list SECURTIY-288 --- .../config/default/container/services_ucp.yml | 1 + phpBB/phpbb/ucp/controller/webpush.php | 20 ++++- tests/ucp/controller_webpush_test.php | 81 ++++++++++++++++++- 3 files changed, 99 insertions(+), 3 deletions(-) diff --git a/phpBB/config/default/container/services_ucp.yml b/phpBB/config/default/container/services_ucp.yml index dcf8c8af9fa..adec3d6769d 100644 --- a/phpBB/config/default/container/services_ucp.yml +++ b/phpBB/config/default/container/services_ucp.yml @@ -35,6 +35,7 @@ services: - '@config' - '@controller.helper' - '@dbal.conn' + - '@event_dispatcher' - '@form_helper' - '@language' - '@notification_manager' diff --git a/phpBB/phpbb/ucp/controller/webpush.php b/phpBB/phpbb/ucp/controller/webpush.php index a33f3b9a3cf..28b2cc65da8 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -16,6 +16,7 @@ use phpbb\config\config; use phpbb\controller\helper as controller_helper; use phpbb\db\driver\driver_interface; +use phpbb\event\dispatcher_interface; use phpbb\exception\http_exception; use phpbb\form\form_helper; use phpbb\json\sanitizer as json_sanitizer; @@ -47,6 +48,9 @@ class webpush /** @var driver_interface */ protected $db; + /** @var dispatcher_interface */ + protected $dispatcher; + /** @var form_helper */ protected $form_helper; @@ -83,6 +87,7 @@ class webpush * @param config $config * @param controller_helper $controller_helper * @param driver_interface $db + * @param dispatcher_interface $dispatcher * @param form_helper $form_helper * @param language $language * @param manager $notification_manager @@ -94,12 +99,13 @@ class webpush * @param string $notification_webpush_table * @param string $push_subscriptions_table */ - public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, form_helper $form_helper, language $language, manager $notification_manager, + public function __construct(config $config, controller_helper $controller_helper, driver_interface $db, dispatcher_interface $dispatcher, form_helper $form_helper, language $language, manager $notification_manager, path_helper $path_helper, request_interface $request, user_loader $user_loader, user $user, Environment $template, string $notification_webpush_table, string $push_subscriptions_table) { $this->config = $config; $this->controller_helper = $controller_helper; $this->db = $db; + $this->dispatcher = $dispatcher; $this->form_helper = $form_helper; $this->language = $language; $this->notification_manager = $notification_manager; @@ -372,6 +378,18 @@ protected function verify_endpoint(string $endpoint): bool '.push.apple.com', ]; + /** + * Event to modify allowed services for web push notifications + * + * @event core.ucp_webpush_controller_verify_endpoint + * @var array allowed_services Allowed service URLs + * @since 4.0.0-a2 + */ + $vars = [ + 'allowed_services', + ]; + extract($this->dispatcher->trigger_event('core.ucp_webpush_controller_verify_endpoint', compact($vars))); + foreach ($allowed_services as $allowed_host) { // Use str_ends_with to support subdomains like 'web.push.apple.com' diff --git a/tests/ucp/controller_webpush_test.php b/tests/ucp/controller_webpush_test.php index cbac7d8fb34..1fc63d4ed4c 100644 --- a/tests/ucp/controller_webpush_test.php +++ b/tests/ucp/controller_webpush_test.php @@ -26,6 +26,7 @@ class test_ucp_controller_webpush_test extends phpbb_database_test_case protected $controller; protected $controller_helper; protected $db; + protected $dispatcher; protected $form_helper; protected $language; protected $notification_manager; @@ -60,6 +61,7 @@ protected function setUp(): void $config = $this->config; $this->controller_helper = $this->createMock(\phpbb\controller\helper::class); $this->db = $this->new_dbal(); + $this->dispatcher = $this->createMock(\phpbb\event\dispatcher::class); $this->form_helper = $this->createMock(\phpbb\form\form_helper::class); $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $this->language = new \phpbb\language\language($lang_loader); @@ -79,6 +81,7 @@ protected function setUp(): void $this->config, $this->controller_helper, $this->db, + $this->dispatcher, $this->form_helper, $this->language, $this->notification_manager, @@ -448,6 +451,14 @@ public function test_check_subscribe_requests_anonymous_user() public function test_subscribe_success() { + $this->dispatcher->method('trigger_event') + ->with( + $this->equalTo('core.ucp_webpush_controller_verify_endpoint'), + $this->anything() + ) + ->willReturnCallback(function($event_name, $args) { + return $args; + }); $this->form_helper->method('check_form_tokens')->willReturn(true); $this->request->method('is_ajax')->willReturn(true); $this->user->data['user_id'] = 2; @@ -506,7 +517,7 @@ public function test_subscribe_unsupported_endpoint() $this->controller->subscribe($symfony_request); } - public function data_provider_subscribe_supported_endpoint() + public static function data_provider_subscribe_supported_endpoint(): array { return [ 'fcm' => ['https://fcm.googleapis.com/fcm/send/test_endpoint'], @@ -520,6 +531,14 @@ public function data_provider_subscribe_supported_endpoint() */ public function test_subscribe_supported_endpoint($data_provider) { + $this->dispatcher->method('trigger_event') + ->with( + $this->equalTo('core.ucp_webpush_controller_verify_endpoint'), + $this->anything() + ) + ->willReturnCallback(function($event_name, $args) { + return $args; + }); $this->form_helper->method('check_form_tokens')->willReturn(true); $this->request->method('is_ajax')->willReturn(true); $this->user->data['user_id'] = 2; @@ -539,8 +558,65 @@ public function test_subscribe_supported_endpoint($data_provider) $this->assertInstanceOf(JsonResponse::class, $response); } + public function test_subscribe_success_event_endpoint() + { + // Mock triggering of expected event and add new valid endpoint + $this->dispatcher->method('trigger_event') + ->with( + $this->equalTo('core.ucp_webpush_controller_verify_endpoint'), + $this->anything() + ) + ->willReturnCallback(function($event_name, $args) { + $args['allowed_services'][] = 'test.endpoint.com'; + return $args; + }); + $this->form_helper->method('check_form_tokens')->willReturn(true); + $this->request->method('is_ajax')->willReturn(true); + $this->user->data['user_id'] = 2; + $this->user->data['is_bot'] = false; + $this->user->data['user_type'] = USER_NORMAL; + + $symfony_request = $this->createMock(\phpbb\symfony_request::class); + $symfony_request->attributes = $this->createMock(\Symfony\Component\HttpFoundation\ParameterBag::class); + $symfony_request->attributes->method('get')->willReturn(json_encode([ + 'endpoint' => 'https://test.endpoint.com/send/candy/test_endpoint', + 'expiration_time' => 0, + 'keys' => ['p256dh' => 'test_p256dh', 'auth' => 'test_auth'] + ])); + + $response = $this->controller->subscribe($symfony_request); + + $this->assertEquals(['success' => true, 'form_tokens' => $this->form_helper->get_form_tokens(webpush::FORM_TOKEN_UCP)], json_decode($response->getContent(), true)); + + // Get subscription data from database + $sql = 'SELECT * + FROM phpbb_push_subscriptions + WHERE user_id = 2 + ORDER BY subscription_id DESC'; + $result = $this->db->sql_query_limit($sql, 1); + $row = $this->db->sql_fetchrow($result); + $this->db->sql_freeresult($result); + + $this->assertEquals([ + 'user_id' => '2', + 'endpoint' => 'https://test.endpoint.com/send/candy/test_endpoint', + 'p256dh' => 'test_p256dh', + 'auth' => 'test_auth', + 'expiration_time' => 0, + 'subscription_id' => $row['subscription_id'] ?? 0, // will have to take ID from database + ], $row); + } + public function test_unsubscribe_success() { + $this->dispatcher->method('trigger_event') + ->with( + $this->equalTo('core.ucp_webpush_controller_verify_endpoint'), + $this->anything() + ) + ->willReturnCallback(function($event_name, $args) { + return $args; + }); $this->form_helper->method('check_form_tokens')->willReturn(true); $this->request->method('is_ajax')->willReturn(true); $this->user->data['user_id'] = 2; @@ -586,7 +662,8 @@ public function test_unsubscribe_success() // Get subscription data from database $sql = 'SELECT * FROM phpbb_push_subscriptions - WHERE user_id = 2'; + WHERE user_id = 2 + AND subscription_id = 1'; $result = $this->db->sql_query($sql); $row = $this->db->sql_fetchrow($result); $this->db->sql_freeresult($result); From 8043e3afc24e23307afb39b65114681755f927de Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 21 Mar 2026 09:40:07 +0100 Subject: [PATCH 1134/1214] [ticket/security-289] Harden security of serving files to browser SECURITY-289 --- phpBB/download/file.php | 8 ++++++-- phpBB/includes/functions_download.php | 14 +++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/phpBB/download/file.php b/phpBB/download/file.php index 77367a7afdc..f2d76a175a3 100644 --- a/phpBB/download/file.php +++ b/phpBB/download/file.php @@ -252,9 +252,13 @@ $download_mode = (int) $extensions[$attachment['extension']]['download_mode']; $display_cat = $extensions[$attachment['extension']]['display_cat']; - if (($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) && !$user->optionget('viewimg')) + if ($display_cat == ATTACHMENT_CATEGORY_IMAGE || $display_cat == ATTACHMENT_CATEGORY_THUMB) { - $display_cat = ATTACHMENT_CATEGORY_NONE; + // Do not display if either display inline is disabled or user is not allowed to view images + if (!$config['img_display_inlined'] || !$user->optionget('viewimg')) + { + $display_cat = ATTACHMENT_CATEGORY_NONE; + } } /** diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index 5b0ac2bea4c..f285160dea6 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -201,6 +201,9 @@ function send_file_to_browser($attachment, $upload_dir, $category) // Send out the Headers. Do not set Content-Disposition to inline please, it is a security measure for users using the Internet Explorer. header('Content-Type: ' . $attachment['mimetype']); + // Send restrictive CSP for file served to browser + header("Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self'; script-src 'none'; object-src 'none'; frame-src 'none';"); + if (phpbb_is_greater_ie_version($user->browser, 7)) { header('X-Content-Type-Options: nosniff'); @@ -216,7 +219,16 @@ function send_file_to_browser($attachment, $upload_dir, $category) } else { - header('Content-Disposition: ' . ((strpos($attachment['mimetype'], 'image') === 0) ? 'inline' : 'attachment') . '; ' . header_filename(html_entity_decode($attachment['real_filename'], ENT_COMPAT))); + // Only set inline if category is set to image (= displayed inside ) and mimetype says it's an image + if ($category == ATTACHMENT_CATEGORY_IMAGE && strpos($attachment['mimetype'], 'image') === 0) + { + $disposition = 'inline'; + } + else + { + $disposition = 'attachment'; + } + header('Content-Disposition: ' . $disposition . '; ' . header_filename(html_entity_decode($attachment['real_filename'], ENT_COMPAT))); if (phpbb_is_greater_ie_version($user->browser, 7) && (strpos($attachment['mimetype'], 'image') !== 0)) { header('X-Download-Options: noopen'); From 0f385e5ccb29a94189a4b813626ac2d7d059e1a1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 27 Mar 2026 20:57:55 +0100 Subject: [PATCH 1135/1214] [ticket/security-289] Add extra handling of Sec-Fetch-Dest header SECURITY-289 --- phpBB/includes/functions_download.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/includes/functions_download.php b/phpBB/includes/functions_download.php index f285160dea6..6f1c4b954f4 100644 --- a/phpBB/includes/functions_download.php +++ b/phpBB/includes/functions_download.php @@ -219,8 +219,10 @@ function send_file_to_browser($attachment, $upload_dir, $category) } else { - // Only set inline if category is set to image (= displayed inside ) and mimetype says it's an image - if ($category == ATTACHMENT_CATEGORY_IMAGE && strpos($attachment['mimetype'], 'image') === 0) + $sec_fetch_dest = $request->header('Sec-Fetch-Dest'); + + // Only set inline if category is set to image, mimetype says it's an image, and browser either sends no Sec-Fetch-Dest header or explicitly marks the request as an image + if ($category == ATTACHMENT_CATEGORY_IMAGE && strpos($attachment['mimetype'], 'image') === 0 && (empty($sec_fetch_dest) || $sec_fetch_dest === 'image')) { $disposition = 'inline'; } From ddcf8f16d2dd254e5c74fb568d9ce83334f74db0 Mon Sep 17 00:00:00 2001 From: Andy Vandenberghe Date: Mon, 23 Mar 2026 15:49:48 +0100 Subject: [PATCH 1136/1214] [ticket/17624] Fix datetime edge case tests failing in non-UTC timezones The edge case test data used strtotime('yesterday'/'today'/'tomorrow') which computes timestamps in the local timezone, then formatted them with gmdate() which outputs in UTC. When the local timezone is ahead of UTC, this shifts the date by one day, causing consistent failures. Replace with time() arithmetic (time() - 86400, time(), time() + 86400) which is timezone-agnostic and matches the pattern used by the other test cases in the same data provider. Co-Authored-By: Claude Opus 4.6 (1M context) PHPBB-17624 --- tests/datetime/from_format_test.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 8b4b39eb906..b5dfb48b661 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -120,16 +120,18 @@ public static function relative_format_date_data() ], // Test edge cases: Yesterday 00:00, Today 00:00, Tomorrow 00:00 + // Use time() arithmetic instead of strtotime() to avoid local + // timezone shifting the date when formatted with gmdate(). [ - gmdate('Y-m-d', strtotime('yesterday')) . ' 00:00', false, + gmdate('Y-m-d', time() - 86400) . ' 00:00', false, 'Yesterday 00:00', ], [ - gmdate('Y-m-d', strtotime('today')) . ' 00:00', false, + gmdate('Y-m-d', time()) . ' 00:00', false, 'Today 00:00', ], [ - gmdate('Y-m-d', strtotime('tomorrow')) . ' 00:00', false, + gmdate('Y-m-d', time() + 86400) . ' 00:00', false, 'Tomorrow 00:00', ], ]; From 4754b5f23b11fce75dc433a16a44d76f5dda9d80 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 10:30:57 +0100 Subject: [PATCH 1137/1214] [ticket/17624] Use time equivalent strtotime calls instead of time PHPBB-17624 --- tests/datetime/from_format_test.php | 30 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index b5dfb48b661..62272b46932 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -44,7 +44,7 @@ protected function setUp(): void 0 => 'less than a minute ago', 1 => '%d minute ago', 2 => '%d minutes ago', - ], + ], ], ]); @@ -87,16 +87,16 @@ public static function relative_format_date_data() return [ [ - gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, false, - gmdate('Y-m-d', time() + 2 * 86400) . ' ' . $testing_time, + gmdate('Y-m-d', strtotime('+2day')) . ' ' . $testing_time, false, + gmdate('Y-m-d', strtotime('+2day')) . ' ' . $testing_time, ], [ - gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, false, + gmdate('Y-m-d', strtotime('+1day')) . ' ' . $testing_time, false, 'Tomorrow ' . $testing_time, ], [ - gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, true, - gmdate('Y-m-d', time() + 86400) . ' ' . $testing_time, + gmdate('Y-m-d', strtotime('+1day')) . ' ' . $testing_time, true, + gmdate('Y-m-d', strtotime('+1day')) . ' ' . $testing_time, ], [ gmdate('Y-m-d') . ' ' . $testing_time, false, @@ -107,31 +107,29 @@ public static function relative_format_date_data() gmdate('Y-m-d') . ' ' . $testing_time, ], [ - gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, false, + gmdate('Y-m-d', strtotime('-1day')) . ' ' . $testing_time, false, 'Yesterday ' . $testing_time, ], [ - gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, true, - gmdate('Y-m-d', time() - 86400) . ' ' . $testing_time, + gmdate('Y-m-d', strtotime('-1day')) . ' ' . $testing_time, true, + gmdate('Y-m-d', strtotime('-1day')) . ' ' . $testing_time, ], [ - gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, false, - gmdate('Y-m-d', time() - 2 * 86400) . ' ' . $testing_time, + gmdate('Y-m-d', strtotime('-2day')) . ' ' . $testing_time, false, + gmdate('Y-m-d', strtotime('-2day')) . ' ' . $testing_time, ], // Test edge cases: Yesterday 00:00, Today 00:00, Tomorrow 00:00 - // Use time() arithmetic instead of strtotime() to avoid local - // timezone shifting the date when formatted with gmdate(). [ - gmdate('Y-m-d', time() - 86400) . ' 00:00', false, + gmdate('Y-m-d', strtotime('-1day')) . ' 00:00', false, 'Yesterday 00:00', ], [ - gmdate('Y-m-d', time()) . ' 00:00', false, + gmdate('Y-m-d', strtotime('now')) . ' 00:00', false, 'Today 00:00', ], [ - gmdate('Y-m-d', time() + 86400) . ' 00:00', false, + gmdate('Y-m-d', strtotime('+1day')) . ' 00:00', false, 'Tomorrow 00:00', ], ]; From a3b8cf4c8688396d4ce35b60b3396c40e30ee06b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 10:31:24 +0100 Subject: [PATCH 1138/1214] [ticket/17624] Ensure test can be run independently PHPBB-17624 --- tests/datetime/from_format_test.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/datetime/from_format_test.php b/tests/datetime/from_format_test.php index 62272b46932..4d327a5c5b2 100644 --- a/tests/datetime/from_format_test.php +++ b/tests/datetime/from_format_test.php @@ -23,10 +23,11 @@ class phpbb_datetime_from_format_test extends phpbb_test_case protected function setUp(): void { - global $phpbb_root_path, $phpEx; + global $phpbb_dispatcher, $phpbb_root_path, $phpEx; $lang_loader = new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx); $this->lang = new \phpbb\language\language($lang_loader); + $phpbb_dispatcher = new phpbb_mock_event_dispatcher(); // Set up language data for testing $reflection_class = new ReflectionClass('\phpbb\language\language'); From d10aba2db0df0ebd600f0c11516847accdd2ab39 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 10:43:31 +0100 Subject: [PATCH 1139/1214] [ticket/17628] Update composer dependencies for 3.3.x PHPBB-17628 --- phpBB/composer.lock | 320 +++++++++++++++++++++++++------------------- 1 file changed, 184 insertions(+), 136 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index d8266dd4d7a..51633ace478 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -42,21 +42,24 @@ }, { "name": "carlos-mg89/oauth", - "version": "0.8.15", + "version": "0.8.17", "source": { "type": "git", "url": "https://github.com/carlos-mg89/PHPoAuthLib.git", - "reference": "c14c44e4f8993009a10d56a41e61c19291824a29" + "reference": "7003d50bbb90383408abc1450d943657d087fc70" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/c14c44e4f8993009a10d56a41e61c19291824a29", - "reference": "c14c44e4f8993009a10d56a41e61c19291824a29", + "url": "https://api.github.com/repos/carlos-mg89/PHPoAuthLib/zipball/7003d50bbb90383408abc1450d943657d087fc70", + "reference": "7003d50bbb90383408abc1450d943657d087fc70", "shasum": "" }, "require": { "php": "^7.2 || ^8.0" }, + "replace": { + "lusitanian/oauth": "~0.3" + }, "require-dev": { "ext-curl": "*", "ext-dom": "*", @@ -104,9 +107,9 @@ ], "support": { "issues": "https://github.com/carlos-mg89/PHPoAuthLib/issues", - "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.15" + "source": "https://github.com/carlos-mg89/PHPoAuthLib/tree/0.8.17" }, - "time": "2022-07-15T08:38:14+00:00" + "time": "2025-02-08T12:14:07+00:00" }, { "name": "composer/package-versions-deprecated", @@ -534,29 +537,29 @@ }, { "name": "marc1706/fast-image-size", - "version": "v1.1.7", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/marc1706/fast-image-size.git", - "reference": "aea6934a273182208bced600953f19a3d2eaeca0" + "reference": "276b374bab892440448eb5fb8604b52c480b45ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/aea6934a273182208bced600953f19a3d2eaeca0", - "reference": "aea6934a273182208bced600953f19a3d2eaeca0", + "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/276b374bab892440448eb5fb8604b52c480b45ee", + "reference": "276b374bab892440448eb5fb8604b52c480b45ee", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=5.3.0" + "php": ">=7.2" }, "require-dev": { - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -588,9 +591,9 @@ ], "support": { "issues": "https://github.com/marc1706/fast-image-size/issues", - "source": "https://github.com/marc1706/fast-image-size/tree/v1.1.7" + "source": "https://github.com/marc1706/fast-image-size/tree/v1.3.0" }, - "time": "2022-01-12T16:29:39+00:00" + "time": "2026-03-22T10:04:04+00:00" }, { "name": "ocramius/proxy-manager", @@ -1712,20 +1715,20 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638", + "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "provide": { "ext-ctype": "*" @@ -1736,8 +1739,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1771,7 +1774,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0" }, "funding": [ { @@ -1782,31 +1785,34 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-intl-idn", - "version": "v1.29.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "a287ed7475f85bf6f61890146edbc932c0fff919" + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919", - "reference": "a287ed7475f85bf6f61890146edbc932c0fff919", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/9614ac4d8061dc257ecc64cba1b140873dce8ad3", + "reference": "9614ac4d8061dc257ecc64cba1b140873dce8ad3", "shasum": "" }, "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" + "php": ">=7.2", + "symfony/polyfill-intl-normalizer": "^1.10" }, "suggest": { "ext-intl": "For best performance" @@ -1814,8 +1820,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1855,7 +1861,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.33.0" }, "funding": [ { @@ -1866,29 +1872,33 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-10T14:38:51+00:00" }, { "name": "symfony/polyfill-intl-normalizer", - "version": "v1.29.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d" + "reference": "3833d7255cc303546435cb650316bff708a1c75c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d", - "reference": "bc45c394692b948b4d383a08d7753968bed9a83d", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c", + "reference": "3833d7255cc303546435cb650316bff708a1c75c", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, "suggest": { "ext-intl": "For best performance" @@ -1896,8 +1906,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -1936,7 +1946,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0" }, "funding": [ { @@ -1947,29 +1957,34 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.33.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493", + "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493", "shasum": "" }, "require": { - "php": ">=7.1" + "ext-iconv": "*", + "php": ">=7.2" }, "provide": { "ext-mbstring": "*" @@ -1980,8 +1995,8 @@ "type": "library", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "autoload": { @@ -2016,7 +2031,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0" }, "funding": [ { @@ -2027,12 +2042,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-12-23T08:48:59+00:00" }, { "name": "symfony/polyfill-php56", @@ -2053,12 +2072,12 @@ }, "type": "metapackage", "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + }, "branch-alias": { "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" } }, "notification-url": "https://packagist.org/downloads/", @@ -2121,12 +2140,12 @@ }, "type": "metapackage", "extra": { + "thanks": { + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" + }, "branch-alias": { "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" } }, "notification-url": "https://packagist.org/downloads/", @@ -2172,34 +2191,26 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.29.0", + "version": "v1.31.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25" + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25", - "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", + "reference": "fa2ae56c44f03bed91a39bfc9822e31e7c5c38ce", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.2" }, - "type": "library", + "type": "metapackage", "extra": { "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "files": [ - "bootstrap.php" - ], - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" + "url": "https://github.com/symfony/polyfill", + "name": "symfony/polyfill" } }, "notification-url": "https://packagist.org/downloads/", @@ -2225,7 +2236,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.31.0" }, "funding": [ { @@ -2241,7 +2252,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-09-09T11:45:10+00:00" }, { "name": "symfony/process", @@ -2635,16 +2646,16 @@ }, { "name": "twig/twig", - "version": "v2.16.0", + "version": "v2.16.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "0c9cc7ef2e0ec6d20c5af1200522a89ba101f623" + "reference": "19185947ec75d433a3ac650af32fc05649b95ee1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/0c9cc7ef2e0ec6d20c5af1200522a89ba101f623", - "reference": "0c9cc7ef2e0ec6d20c5af1200522a89ba101f623", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/19185947ec75d433a3ac650af32fc05649b95ee1", + "reference": "19185947ec75d433a3ac650af32fc05649b95ee1", "shasum": "" }, "require": { @@ -2699,7 +2710,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.16.0" + "source": "https://github.com/twigphp/Twig/tree/v2.16.1" }, "funding": [ { @@ -2711,7 +2722,7 @@ "type": "tidelift" } ], - "time": "2023-12-22T07:22:15+00:00" + "time": "2024-09-09T17:53:56+00:00" }, { "name": "zendframework/zend-code", @@ -2972,16 +2983,16 @@ }, { "name": "myclabs/deep-copy", - "version": "1.12.0", + "version": "1.13.4", "source": { "type": "git", "url": "https://github.com/myclabs/DeepCopy.git", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c" + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", - "reference": "3a6b9a42cd8f8771bd4295d13e1423fa7f3d942c", + "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a", + "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a", "shasum": "" }, "require": { @@ -3020,7 +3031,7 @@ ], "support": { "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.12.0" + "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4" }, "funding": [ { @@ -3028,7 +3039,7 @@ "type": "tidelift" } ], - "time": "2024-06-12T14:39:25+00:00" + "time": "2025-08-01T08:46:24+00:00" }, { "name": "phar-io/manifest", @@ -3479,26 +3490,27 @@ }, { "name": "phpspec/prophecy", - "version": "v1.19.0", + "version": "v1.21.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87" + "reference": "7594ec2f6507dd6a5feaf4fa50c391d5274a5838" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/67a759e7d8746d501c41536ba40cd9c0a07d6a87", - "reference": "67a759e7d8746d501c41536ba40cd9c0a07d6a87", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/7594ec2f6507dd6a5feaf4fa50c391d5274a5838", + "reference": "7594ec2f6507dd6a5feaf4fa50c391d5274a5838", "shasum": "" }, "require": { "doctrine/instantiator": "^1.2 || ^2.0", - "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.*", + "php": "^7.2 || 8.0.* || 8.1.* || 8.2.* || 8.3.* || 8.4.*", "phpdocumentor/reflection-docblock": "^5.2", - "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0", - "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0" + "sebastian/comparator": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0", + "sebastian/recursion-context": "^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0" }, "require-dev": { + "friendsofphp/php-cs-fixer": "^3.40", "phpspec/phpspec": "^6.0 || ^7.0", "phpstan/phpstan": "^1.9", "phpunit/phpunit": "^8.0 || ^9.0 || ^10.0" @@ -3542,9 +3554,9 @@ ], "support": { "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/v1.19.0" + "source": "https://github.com/phpspec/prophecy/tree/v1.21.0" }, - "time": "2024-02-29T11:52:51+00:00" + "time": "2025-04-29T11:13:33+00:00" }, { "name": "phpunit/dbunit", @@ -4039,16 +4051,16 @@ }, { "name": "sebastian/comparator", - "version": "3.0.5", + "version": "3.0.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770" + "reference": "bc7d8ac2fe1cce229bff9b5fd4efe65918a1ff52" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dc7ceb4a24aede938c7af2a9ed1de09609ca770", - "reference": "1dc7ceb4a24aede938c7af2a9ed1de09609ca770", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/bc7d8ac2fe1cce229bff9b5fd4efe65918a1ff52", + "reference": "bc7d8ac2fe1cce229bff9b5fd4efe65918a1ff52", "shasum": "" }, "require": { @@ -4101,15 +4113,27 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.5" + "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.7" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator", + "type": "tidelift" } ], - "time": "2022-09-14T12:31:48+00:00" + "time": "2026-01-24T09:20:25+00:00" }, { "name": "sebastian/diff", @@ -4242,16 +4266,16 @@ }, { "name": "sebastian/exporter", - "version": "3.1.6", + "version": "3.1.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "1939bc8fd1d39adcfa88c5b35335910869214c56" + "reference": "64cfeaa341951ceb2019d7b98232399d57bb2296" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/1939bc8fd1d39adcfa88c5b35335910869214c56", - "reference": "1939bc8fd1d39adcfa88c5b35335910869214c56", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/64cfeaa341951ceb2019d7b98232399d57bb2296", + "reference": "64cfeaa341951ceb2019d7b98232399d57bb2296", "shasum": "" }, "require": { @@ -4307,15 +4331,27 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.6" + "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.8" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter", + "type": "tidelift" } ], - "time": "2024-03-02T06:21:38+00:00" + "time": "2025-09-24T05:55:14+00:00" }, { "name": "sebastian/global-state", @@ -4486,16 +4522,16 @@ }, { "name": "sebastian/recursion-context", - "version": "3.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c" + "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/9bfd3c6f1f08c026f542032dfb42813544f7d64c", - "reference": "9bfd3c6f1f08c026f542032dfb42813544f7d64c", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/8fe7e75986a9d24b4cceae847314035df7703a5a", + "reference": "8fe7e75986a9d24b4cceae847314035df7703a5a", "shasum": "" }, "require": { @@ -4537,15 +4573,27 @@ "homepage": "http://www.github.com/sebastianbergmann/recursion-context", "support": { "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.2" + "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.3" }, "funding": [ { "url": "https://github.com/sebastianbergmann", "type": "github" + }, + { + "url": "https://liberapay.com/sebastianbergmann", + "type": "liberapay" + }, + { + "url": "https://thanks.dev/u/gh/sebastianbergmann", + "type": "thanks_dev" + }, + { + "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context", + "type": "tidelift" } ], - "time": "2024-03-01T14:07:30+00:00" + "time": "2025-08-10T05:25:53+00:00" }, { "name": "sebastian/resource-operations", @@ -4929,16 +4977,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.3", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2" + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", - "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b7489ce515e168639d17feec34b8847c326b0b3c", + "reference": "b7489ce515e168639d17feec34b8847c326b0b3c", "shasum": "" }, "require": { @@ -4967,7 +5015,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.3" + "source": "https://github.com/theseer/tokenizer/tree/1.3.1" }, "funding": [ { @@ -4975,32 +5023,32 @@ "type": "github" } ], - "time": "2024-03-03T12:36:25+00:00" + "time": "2025-11-17T20:03:58+00:00" }, { "name": "webmozart/assert", - "version": "1.11.0", + "version": "1.12.1", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991" + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/11cb2199493b2f8a3b53e7f19068fc6aac760991", - "reference": "11cb2199493b2f8a3b53e7f19068fc6aac760991", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/9be6926d8b485f55b9229203f962b51ed377ba68", + "reference": "9be6926d8b485f55b9229203f962b51ed377ba68", "shasum": "" }, "require": { "ext-ctype": "*", + "ext-date": "*", + "ext-filter": "*", "php": "^7.2 || ^8.0" }, - "conflict": { - "phpstan/phpstan": "<0.12.20", - "vimeo/psalm": "<4.6.1 || 4.6.2" - }, - "require-dev": { - "phpunit/phpunit": "^8.5.13" + "suggest": { + "ext-intl": "", + "ext-simplexml": "", + "ext-spl": "" }, "type": "library", "extra": { @@ -5031,9 +5079,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/1.11.0" + "source": "https://github.com/webmozarts/assert/tree/1.12.1" }, - "time": "2022-06-03T18:03:27+00:00" + "time": "2025-10-29T15:56:20+00:00" } ], "aliases": [], From 83bcbb826b1a0004dc5cf7d3e6caa9d203f14241 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 11:18:46 +0100 Subject: [PATCH 1140/1214] [ticket/17628] Update tests for updated behavior of fast-image-size PHPBB-17628 --- tests/upload/imagesize_test.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/upload/imagesize_test.php b/tests/upload/imagesize_test.php index 654e32054a8..efc55ecd8dd 100644 --- a/tests/upload/imagesize_test.php +++ b/tests/upload/imagesize_test.php @@ -32,45 +32,45 @@ public function data_get_imagesize() return array( array('foobar', 'image/bmp', false), array('png', 'image/png', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), - array('gif', 'image/png', false), + array('gif', 'image/png', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)), array('png', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('gif', 'image/gif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)), - array('jpg', 'image/gif', false), + array('jpg', 'image/gif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)), array('gif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_GIF)), array('jpg', 'image/jpg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)), array('jpg', 'image/jpeg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)), - array('png', 'image/jpg', false), + array('png', 'image/jpg', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('jpg', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)), array('psd', 'image/psd', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)), array('psd', 'image/photoshop', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)), - array('jpg', 'image/psd', false), + array('jpg', 'image/psd', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)), array('psd', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_PSD)), array('bmp', 'image/bmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)), - array('png', 'image/bmp', false), + array('png', 'image/bmp', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('bmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_BMP)), array('tif', 'image/tif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)), - array('png', 'image/tif', false), + array('png', 'image/tif', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('tif', '', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)), array('tif_compressed', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)), - array('png', 'image/tiff', false), + array('png', 'image/tiff', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('tif_compressed', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_II)), array('tif_msb', 'image/tif', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)), array('tif_msb', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_TIFF_MM)), array('wbmp', 'image/wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)), array('wbmp', 'image/vnd.wap.wbmp', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)), - array('png', 'image/vnd.wap.wbmp', false), + array('png', 'image/vnd.wap.wbmp', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('wbmp', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_WBMP)), array('iff', 'image/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)), array('iff', 'image/x-iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)), array('iff_maya', 'iamge/iff', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)), - array('png', 'image/iff', false), - array('png', 'image/x-iff', false), + array('png', 'image/iff', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), + array('png', 'image/x-iff', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_PNG)), array('iff', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)), array('iff_maya', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_IFF)), array('jp2', 'image/jp2', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)), array('jp2', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)), array('jp2', 'image/jpm', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)), - array('jpg', 'image/jp2', false), + array('jpg', 'image/jp2', array('width' => 1, 'height' => 1, 'type' => IMAGETYPE_JPEG)), array('jpx', 'image/jpx', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)), array('jp2', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)), array('jpx', '', array('width' => 2, 'height' => 1, 'type' => IMAGETYPE_JPEG2000)), From a97bd8e102d442974955df1338d6943d51a8f06a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 11:19:56 +0100 Subject: [PATCH 1141/1214] [ticket/17447] Add missing docblocks and small cleanup PHPBB-17447 --- phpBB/phpbb/storage/controller/attachment.php | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/storage/controller/attachment.php b/phpBB/phpbb/storage/controller/attachment.php index 2ac36f839fb..83ecb771752 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -321,6 +321,14 @@ public function handle_attachment(int $id, string $filename): Response return $response; } + /** + * Get attachment data + * + * @param int $attach_id The attach_id of the attachment + * @param string $filename The real filename of the attachment (optional) + * + * @return array|null Array with attachment data or null if the attachment is not found + */ protected function get_attachment(int $attach_id, string $filename): array|null { $sql = 'SELECT attach_id, post_msg_id, topic_id, in_message, poster_id, @@ -336,6 +344,13 @@ protected function get_attachment(int $attach_id, string $filename): array|null return $attachment ?: null; } + /** + * Get post data + * + * @param int $post_id The post_id of the post + * + * @return array|null Array with post data or null if the post is not found + */ protected function get_post(int $post_id): array|null { $sql = 'SELECT forum_id, poster_id, post_visibility @@ -350,12 +365,16 @@ protected function get_post(int $post_id): array|null /** * Remove non valid characters https://github.com/symfony/http-foundation/commit/c7df9082ee7205548a97031683bc6550b5dc9551 + * + * @param string $filename The filename to sanitize + * + * @return string Sanitized filename */ - protected function filenameFallback($filename): string + protected function filenameFallback(string $filename): string { $filename = (string) preg_replace(['/[^\x20-\x7e]/', '/%/', '/\//', '/\\\\/'], '', $filename); - return !empty($filename) ? $filename : 'File'; + return $filename ?: 'File'; } /** From 52dc4e78ef44334110e400aae802543549d2695a Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 16:28:12 +0100 Subject: [PATCH 1142/1214] [ticket/17628] Update composer to latest version PHPBB-17628 --- composer.phar | Bin 2994603 -> 3288946 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/composer.phar b/composer.phar index 15c4a2081c9ec2e651ab7a65ac68349d5f2625ce..3d1b98381898830a673b5922e1a3ebc6b2fe2540 100755 GIT binary patch delta 265854 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 z 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 Date: Sat, 28 Mar 2026 16:32:33 +0100 Subject: [PATCH 1143/1214] [ticket/17628] Update fast-image-size to 1.3.1 PHPBB-17628 --- phpBB/composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index 51633ace478..c7bd88842be 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -537,16 +537,16 @@ }, { "name": "marc1706/fast-image-size", - "version": "v1.3.0", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/marc1706/fast-image-size.git", - "reference": "276b374bab892440448eb5fb8604b52c480b45ee" + "reference": "35c193f56d3a3abaf441918ea4eda7cd5d89d443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/276b374bab892440448eb5fb8604b52c480b45ee", - "reference": "276b374bab892440448eb5fb8604b52c480b45ee", + "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/35c193f56d3a3abaf441918ea4eda7cd5d89d443", + "reference": "35c193f56d3a3abaf441918ea4eda7cd5d89d443", "shasum": "" }, "require": { @@ -591,9 +591,9 @@ ], "support": { "issues": "https://github.com/marc1706/fast-image-size/issues", - "source": "https://github.com/marc1706/fast-image-size/tree/v1.3.0" + "source": "https://github.com/marc1706/fast-image-size/tree/v1.3.1" }, - "time": "2026-03-22T10:04:04+00:00" + "time": "2026-03-28T15:26:03+00:00" }, { "name": "ocramius/proxy-manager", @@ -5086,7 +5086,7 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": {}, "prefer-stable": false, "prefer-lowest": false, "platform": { @@ -5094,9 +5094,9 @@ "ext-json": "*", "ext-mbstring": "*" }, - "platform-dev": [], + "platform-dev": {}, "platform-overrides": { "php": "7.2" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.9.0" } From bb9d2e8923c518710fa8ab56562317850f0c87a7 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 16:48:58 +0100 Subject: [PATCH 1144/1214] [ticket/17628] Update composer dependencies for 4.0 PHPBB-17628 --- phpBB/composer.lock | 719 ++++++++++++++++++++++++-------------------- 1 file changed, 396 insertions(+), 323 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index dd80599dd72..d7d6c13646a 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -314,16 +314,16 @@ }, { "name": "composer/composer", - "version": "2.9.3", + "version": "2.9.5", "source": { "type": "git", "url": "https://github.com/composer/composer.git", - "reference": "fb3bee27676fd852a8a11ebbb1de19b4dada5aba" + "reference": "72a8f8e653710e18d83e5dd531eb5a71fc3223e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/composer/composer/zipball/fb3bee27676fd852a8a11ebbb1de19b4dada5aba", - "reference": "fb3bee27676fd852a8a11ebbb1de19b4dada5aba", + "url": "https://api.github.com/repos/composer/composer/zipball/72a8f8e653710e18d83e5dd531eb5a71fc3223e6", + "reference": "72a8f8e653710e18d83e5dd531eb5a71fc3223e6", "shasum": "" }, "require": { @@ -411,7 +411,7 @@ "irc": "ircs://irc.libera.chat:6697/composer", "issues": "https://github.com/composer/composer/issues", "security": "https://github.com/composer/composer/security/policy", - "source": "https://github.com/composer/composer/tree/2.9.3" + "source": "https://github.com/composer/composer/tree/2.9.5" }, "funding": [ { @@ -423,7 +423,7 @@ "type": "github" } ], - "time": "2025-12-30T12:40:17+00:00" + "time": "2026-01-29T10:40:53+00:00" }, { "name": "composer/installers", @@ -1017,16 +1017,16 @@ }, { "name": "doctrine/dbal", - "version": "3.10.4", + "version": "3.10.5", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868" + "reference": "95d84866bf3c04b2ddca1df7c049714660959aef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/63a46cb5aa6f60991186cc98c1d1b50c09311868", - "reference": "63a46cb5aa6f60991186cc98c1d1b50c09311868", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/95d84866bf3c04b2ddca1df7c049714660959aef", + "reference": "95d84866bf3c04b2ddca1df7c049714660959aef", "shasum": "" }, "require": { @@ -1047,9 +1047,9 @@ "jetbrains/phpstorm-stubs": "2023.1", "phpstan/phpstan": "2.1.30", "phpstan/phpstan-strict-rules": "^2", - "phpunit/phpunit": "9.6.29", - "slevomat/coding-standard": "8.24.0", - "squizlabs/php_codesniffer": "4.0.0", + "phpunit/phpunit": "9.6.34", + "slevomat/coding-standard": "8.27.1", + "squizlabs/php_codesniffer": "4.0.1", "symfony/cache": "^5.4|^6.0|^7.0|^8.0", "symfony/console": "^4.4|^5.4|^6.0|^7.0|^8.0" }, @@ -1111,7 +1111,7 @@ ], "support": { "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/3.10.4" + "source": "https://github.com/doctrine/dbal/tree/3.10.5" }, "funding": [ { @@ -1127,33 +1127,33 @@ "type": "tidelift" } ], - "time": "2025-11-29T10:46:08+00:00" + "time": "2026-02-24T08:03:57+00:00" }, { "name": "doctrine/deprecations", - "version": "1.1.5", + "version": "1.1.6", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38" + "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", - "reference": "459c2f5dd3d6a4633d3b5f46ee2b1c40f57d3f38", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", + "reference": "d4fe3e6fd9bb9e72557a19674f44d8ac7db4c6ca", "shasum": "" }, "require": { "php": "^7.1 || ^8.0" }, "conflict": { - "phpunit/phpunit": "<=7.5 || >=13" + "phpunit/phpunit": "<=7.5 || >=14" }, "require-dev": { - "doctrine/coding-standard": "^9 || ^12 || ^13", - "phpstan/phpstan": "1.4.10 || 2.1.11", + "doctrine/coding-standard": "^9 || ^12 || ^14", + "phpstan/phpstan": "1.4.10 || 2.1.30", "phpstan/phpstan-phpunit": "^1.0 || ^2", - "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12", + "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6 || ^10.5 || ^11.5 || ^12.4 || ^13.0", "psr/log": "^1 || ^2 || ^3" }, "suggest": { @@ -1173,22 +1173,22 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/1.1.5" + "source": "https://github.com/doctrine/deprecations/tree/1.1.6" }, - "time": "2025-04-07T20:06:18+00:00" + "time": "2026-02-07T07:09:04+00:00" }, { "name": "doctrine/event-manager", - "version": "2.0.1", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/doctrine/event-manager.git", - "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e" + "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/event-manager/zipball/b680156fa328f1dfd874fd48c7026c41570b9c6e", - "reference": "b680156fa328f1dfd874fd48c7026c41570b9c6e", + "url": "https://api.github.com/repos/doctrine/event-manager/zipball/dda33921b198841ca8dbad2eaa5d4d34769d18cf", + "reference": "dda33921b198841ca8dbad2eaa5d4d34769d18cf", "shasum": "" }, "require": { @@ -1198,10 +1198,10 @@ "doctrine/common": "<2.9" }, "require-dev": { - "doctrine/coding-standard": "^12", - "phpstan/phpstan": "^1.8.8", - "phpunit/phpunit": "^10.5", - "vimeo/psalm": "^5.24" + "doctrine/coding-standard": "^14", + "phpdocumentor/guides-cli": "^1.4", + "phpstan/phpstan": "^2.1.32", + "phpunit/phpunit": "^10.5.58" }, "type": "library", "autoload": { @@ -1250,7 +1250,7 @@ ], "support": { "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/2.0.1" + "source": "https://github.com/doctrine/event-manager/tree/2.1.1" }, "funding": [ { @@ -1266,7 +1266,7 @@ "type": "tidelift" } ], - "time": "2024-05-22T20:47:39+00:00" + "time": "2026-01-29T07:11:08+00:00" }, { "name": "doctrine/lexer", @@ -1675,16 +1675,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "21dc724a0583619cd1652f673303492272778051" + "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", - "reference": "21dc724a0583619cd1652f673303492272778051", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/7d0ed42f28e42d61352a7a79de682e5e67fec884", + "reference": "7d0ed42f28e42d61352a7a79de682e5e67fec884", "shasum": "" }, "require": { @@ -1700,6 +1700,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", + "jshttp/mime-db": "1.54.0.1", "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { @@ -1771,7 +1772,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.8.0" + "source": "https://github.com/guzzle/psr7/tree/2.9.0" }, "funding": [ { @@ -1787,20 +1788,20 @@ "type": "tidelift" } ], - "time": "2025-08-23T21:21:41+00:00" + "time": "2026-03-10T16:41:02+00:00" }, { "name": "justinrainbow/json-schema", - "version": "6.6.3", + "version": "v6.7.2", "source": { "type": "git", "url": "https://github.com/jsonrainbow/json-schema.git", - "reference": "134e98916fa2f663afa623970af345cd788e8967" + "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/134e98916fa2f663afa623970af345cd788e8967", - "reference": "134e98916fa2f663afa623970af345cd788e8967", + "url": "https://api.github.com/repos/jsonrainbow/json-schema/zipball/6fea66c7204683af437864e7c4e7abf383d14bc0", + "reference": "6fea66c7204683af437864e7c4e7abf383d14bc0", "shasum": "" }, "require": { @@ -1860,9 +1861,9 @@ ], "support": { "issues": "https://github.com/jsonrainbow/json-schema/issues", - "source": "https://github.com/jsonrainbow/json-schema/tree/6.6.3" + "source": "https://github.com/jsonrainbow/json-schema/tree/v6.7.2" }, - "time": "2025-12-02T10:21:33+00:00" + "time": "2026-02-15T15:06:22+00:00" }, { "name": "marc-mabe/php-enum", @@ -1939,29 +1940,29 @@ }, { "name": "marc1706/fast-image-size", - "version": "v1.1.7", + "version": "v1.3.1", "source": { "type": "git", "url": "https://github.com/marc1706/fast-image-size.git", - "reference": "aea6934a273182208bced600953f19a3d2eaeca0" + "reference": "35c193f56d3a3abaf441918ea4eda7cd5d89d443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/aea6934a273182208bced600953f19a3d2eaeca0", - "reference": "aea6934a273182208bced600953f19a3d2eaeca0", + "url": "https://api.github.com/repos/marc1706/fast-image-size/zipball/35c193f56d3a3abaf441918ea4eda7cd5d89d443", + "reference": "35c193f56d3a3abaf441918ea4eda7cd5d89d443", "shasum": "" }, "require": { "ext-mbstring": "*", - "php": ">=5.3.0" + "php": ">=7.2" }, "require-dev": { - "phpunit/phpunit": "^4.8" + "phpunit/phpunit": "^8.5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -1993,9 +1994,9 @@ ], "support": { "issues": "https://github.com/marc1706/fast-image-size/issues", - "source": "https://github.com/marc1706/fast-image-size/tree/v1.1.7" + "source": "https://github.com/marc1706/fast-image-size/tree/v1.3.1" }, - "time": "2022-01-12T16:29:39+00:00" + "time": "2026-03-28T15:26:03+00:00" }, { "name": "minishlink/web-push", @@ -3159,40 +3160,41 @@ }, { "name": "spomky-labs/pki-framework", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/Spomky-Labs/pki-framework.git", - "reference": "f0e9a548df4e3942886adc9b7830581a46334631" + "reference": "aa576cbd07128075bef97ac2f8af9854e67513d8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/f0e9a548df4e3942886adc9b7830581a46334631", - "reference": "f0e9a548df4e3942886adc9b7830581a46334631", + "url": "https://api.github.com/repos/Spomky-Labs/pki-framework/zipball/aa576cbd07128075bef97ac2f8af9854e67513d8", + "reference": "aa576cbd07128075bef97ac2f8af9854e67513d8", "shasum": "" }, "require": { - "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14", + "brick/math": "^0.10|^0.11|^0.12|^0.13|^0.14|^0.15|^0.16|^0.17", "ext-mbstring": "*", - "php": ">=8.1" + "php": ">=8.1", + "psr/clock": "^1.0" }, "require-dev": { "ekino/phpstan-banned-code": "^1.0|^2.0|^3.0", "ext-gmp": "*", "ext-openssl": "*", - "infection/infection": "^0.28|^0.29|^0.31", + "infection/infection": "^0.28|^0.29|^0.31|^0.32", "php-parallel-lint/php-parallel-lint": "^1.3", "phpstan/extension-installer": "^1.3|^2.0", "phpstan/phpstan": "^1.8|^2.0", "phpstan/phpstan-deprecation-rules": "^1.0|^2.0", "phpstan/phpstan-phpunit": "^1.1|^2.0", "phpstan/phpstan-strict-rules": "^1.3|^2.0", - "phpunit/phpunit": "^10.1|^11.0|^12.0", + "phpunit/phpunit": "^10.1|^11.0|^12.0|^13.0", "rector/rector": "^1.0|^2.0", "roave/security-advisories": "dev-latest", "symfony/string": "^6.4|^7.0|^8.0", "symfony/var-dumper": "^6.4|^7.0|^8.0", - "symplify/easy-coding-standard": "^12.0" + "symplify/easy-coding-standard": "^12.0|^13.0" }, "suggest": { "ext-bcmath": "For better performance (or GMP)", @@ -3252,7 +3254,7 @@ ], "support": { "issues": "https://github.com/Spomky-Labs/pki-framework/issues", - "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.1" + "source": "https://github.com/Spomky-Labs/pki-framework/tree/1.4.2" }, "funding": [ { @@ -3264,20 +3266,20 @@ "type": "patreon" } ], - "time": "2025-12-20T12:57:40+00:00" + "time": "2026-03-23T22:56:56+00:00" }, { "name": "symfony/config", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "800ce889e358a53a9678b3212b0c8cecd8c6aace" + "reference": "6c17162555bfb58957a55bb0e43e00035b6ae3d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/800ce889e358a53a9678b3212b0c8cecd8c6aace", - "reference": "800ce889e358a53a9678b3212b0c8cecd8c6aace", + "url": "https://api.github.com/repos/symfony/config/zipball/6c17162555bfb58957a55bb0e43e00035b6ae3d5", + "reference": "6c17162555bfb58957a55bb0e43e00035b6ae3d5", "shasum": "" }, "require": { @@ -3323,7 +3325,7 @@ "description": "Helps you find, load, combine, autofill and validate configuration values of any kind", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/config/tree/v7.4.3" + "source": "https://github.com/symfony/config/tree/v7.4.7" }, "funding": [ { @@ -3343,20 +3345,20 @@ "type": "tidelift" } ], - "time": "2025-12-23T14:24:27+00:00" + "time": "2026-03-06T10:41:14+00:00" }, { "name": "symfony/console", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "732a9ca6cd9dfd940c639062d5edbde2f6727fb6" + "reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/732a9ca6cd9dfd940c639062d5edbde2f6727fb6", - "reference": "732a9ca6cd9dfd940c639062d5edbde2f6727fb6", + "url": "https://api.github.com/repos/symfony/console/zipball/e1e6770440fb9c9b0cf725f81d1361ad1835329d", + "reference": "e1e6770440fb9c9b0cf725f81d1361ad1835329d", "shasum": "" }, "require": { @@ -3421,7 +3423,7 @@ "terminal" ], "support": { - "source": "https://github.com/symfony/console/tree/v7.4.3" + "source": "https://github.com/symfony/console/tree/v7.4.7" }, "funding": [ { @@ -3441,20 +3443,20 @@ "type": "tidelift" } ], - "time": "2025-12-23T14:50:43+00:00" + "time": "2026-03-06T14:06:20+00:00" }, { "name": "symfony/dependency-injection", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "54122901b6d772e94f1e71a75e0533bc16563499" + "reference": "0f651e58f4917fb0e2cd261ccbfe3d71e6e0f5db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/54122901b6d772e94f1e71a75e0533bc16563499", - "reference": "54122901b6d772e94f1e71a75e0533bc16563499", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/0f651e58f4917fb0e2cd261ccbfe3d71e6e0f5db", + "reference": "0f651e58f4917fb0e2cd261ccbfe3d71e6e0f5db", "shasum": "" }, "require": { @@ -3505,7 +3507,7 @@ "description": "Allows you to standardize and centralize the way objects are constructed in your application", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dependency-injection/tree/v7.4.3" + "source": "https://github.com/symfony/dependency-injection/tree/v7.4.7" }, "funding": [ { @@ -3525,7 +3527,7 @@ "type": "tidelift" } ], - "time": "2025-12-28T10:55:46+00:00" + "time": "2026-03-03T07:48:48+00:00" }, { "name": "symfony/deprecation-contracts", @@ -3596,16 +3598,16 @@ }, { "name": "symfony/error-handler", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/error-handler.git", - "reference": "48be2b0653594eea32dcef130cca1c811dcf25c2" + "reference": "8da531f364ddfee53e36092a7eebbbd0b775f6b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/error-handler/zipball/48be2b0653594eea32dcef130cca1c811dcf25c2", - "reference": "48be2b0653594eea32dcef130cca1c811dcf25c2", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/8da531f364ddfee53e36092a7eebbbd0b775f6b8", + "reference": "8da531f364ddfee53e36092a7eebbbd0b775f6b8", "shasum": "" }, "require": { @@ -3654,7 +3656,7 @@ "description": "Provides tools to manage errors and ease debugging PHP code", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/error-handler/tree/v7.4.0" + "source": "https://github.com/symfony/error-handler/tree/v7.4.4" }, "funding": [ { @@ -3674,20 +3676,20 @@ "type": "tidelift" } ], - "time": "2025-11-05T14:29:59+00:00" + "time": "2026-01-20T16:42:42+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v7.4.0", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "9dddcddff1ef974ad87b3708e4b442dc38b2261d" + "reference": "dc2c0eba1af673e736bb851d747d266108aea746" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9dddcddff1ef974ad87b3708e4b442dc38b2261d", - "reference": "9dddcddff1ef974ad87b3708e4b442dc38b2261d", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dc2c0eba1af673e736bb851d747d266108aea746", + "reference": "dc2c0eba1af673e736bb851d747d266108aea746", "shasum": "" }, "require": { @@ -3739,7 +3741,7 @@ "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.0" + "source": "https://github.com/symfony/event-dispatcher/tree/v7.4.4" }, "funding": [ { @@ -3759,7 +3761,7 @@ "type": "tidelift" } ], - "time": "2025-10-28T09:38:46+00:00" + "time": "2026-01-05T11:45:34+00:00" }, { "name": "symfony/event-dispatcher-contracts", @@ -3839,16 +3841,16 @@ }, { "name": "symfony/filesystem", - "version": "v7.4.0", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "d551b38811096d0be9c4691d406991b47c0c630a" + "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/d551b38811096d0be9c4691d406991b47c0c630a", - "reference": "d551b38811096d0be9c4691d406991b47c0c630a", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/3ebc794fa5315e59fd122561623c2e2e4280538e", + "reference": "3ebc794fa5315e59fd122561623c2e2e4280538e", "shasum": "" }, "require": { @@ -3885,7 +3887,7 @@ "description": "Provides basic utilities for the filesystem", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/filesystem/tree/v7.4.0" + "source": "https://github.com/symfony/filesystem/tree/v7.4.6" }, "funding": [ { @@ -3905,20 +3907,20 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2026-02-25T16:50:00+00:00" }, { "name": "symfony/finder", - "version": "v7.4.3", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "fffe05569336549b20a1be64250b40516d6e8d06" + "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/fffe05569336549b20a1be64250b40516d6e8d06", - "reference": "fffe05569336549b20a1be64250b40516d6e8d06", + "url": "https://api.github.com/repos/symfony/finder/zipball/8655bf1076b7a3a346cb11413ffdabff50c7ffcf", + "reference": "8655bf1076b7a3a346cb11413ffdabff50c7ffcf", "shasum": "" }, "require": { @@ -3953,7 +3955,7 @@ "description": "Finds files and directories via an intuitive fluent interface", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/finder/tree/v7.4.3" + "source": "https://github.com/symfony/finder/tree/v7.4.6" }, "funding": [ { @@ -3973,20 +3975,20 @@ "type": "tidelift" } ], - "time": "2025-12-23T14:50:43+00:00" + "time": "2026-01-29T09:40:50+00:00" }, { "name": "symfony/http-client", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "d01dfac1e0dc99f18da48b18101c23ce57929616" + "reference": "1010624285470eb60e88ed10035102c75b4ea6af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/d01dfac1e0dc99f18da48b18101c23ce57929616", - "reference": "d01dfac1e0dc99f18da48b18101c23ce57929616", + "url": "https://api.github.com/repos/symfony/http-client/zipball/1010624285470eb60e88ed10035102c75b4ea6af", + "reference": "1010624285470eb60e88ed10035102c75b4ea6af", "shasum": "" }, "require": { @@ -4054,7 +4056,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v7.4.3" + "source": "https://github.com/symfony/http-client/tree/v7.4.7" }, "funding": [ { @@ -4074,7 +4076,7 @@ "type": "tidelift" } ], - "time": "2025-12-23T14:50:43+00:00" + "time": "2026-03-05T11:16:58+00:00" }, { "name": "symfony/http-client-contracts", @@ -4156,16 +4158,16 @@ }, { "name": "symfony/http-foundation", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "a70c745d4cea48dbd609f4075e5f5cbce453bd52" + "reference": "f94b3e7b7dafd40e666f0c9ff2084133bae41e81" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/a70c745d4cea48dbd609f4075e5f5cbce453bd52", - "reference": "a70c745d4cea48dbd609f4075e5f5cbce453bd52", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/f94b3e7b7dafd40e666f0c9ff2084133bae41e81", + "reference": "f94b3e7b7dafd40e666f0c9ff2084133bae41e81", "shasum": "" }, "require": { @@ -4214,7 +4216,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v7.4.3" + "source": "https://github.com/symfony/http-foundation/tree/v7.4.7" }, "funding": [ { @@ -4234,20 +4236,20 @@ "type": "tidelift" } ], - "time": "2025-12-23T14:23:49+00:00" + "time": "2026-03-06T13:15:18+00:00" }, { "name": "symfony/http-kernel", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "885211d4bed3f857b8c964011923528a55702aa5" + "reference": "3b3fcf386c809be990c922e10e4c620d6367cab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/885211d4bed3f857b8c964011923528a55702aa5", - "reference": "885211d4bed3f857b8c964011923528a55702aa5", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/3b3fcf386c809be990c922e10e4c620d6367cab1", + "reference": "3b3fcf386c809be990c922e10e4c620d6367cab1", "shasum": "" }, "require": { @@ -4289,7 +4291,7 @@ "symfony/config": "^6.4|^7.0|^8.0", "symfony/console": "^6.4|^7.0|^8.0", "symfony/css-selector": "^6.4|^7.0|^8.0", - "symfony/dependency-injection": "^6.4|^7.0|^8.0", + "symfony/dependency-injection": "^6.4.1|^7.0.1|^8.0", "symfony/dom-crawler": "^6.4|^7.0|^8.0", "symfony/expression-language": "^6.4|^7.0|^8.0", "symfony/finder": "^6.4|^7.0|^8.0", @@ -4333,7 +4335,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v7.4.3" + "source": "https://github.com/symfony/http-kernel/tree/v7.4.7" }, "funding": [ { @@ -4353,20 +4355,20 @@ "type": "tidelift" } ], - "time": "2025-12-31T08:43:57+00:00" + "time": "2026-03-06T16:33:18+00:00" }, { "name": "symfony/mailer", - "version": "v7.4.3", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/mailer.git", - "reference": "e472d35e230108231ccb7f51eb6b2100cac02ee4" + "reference": "b02726f39a20bc65e30364f5c750c4ddbf1f58e9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mailer/zipball/e472d35e230108231ccb7f51eb6b2100cac02ee4", - "reference": "e472d35e230108231ccb7f51eb6b2100cac02ee4", + "url": "https://api.github.com/repos/symfony/mailer/zipball/b02726f39a20bc65e30364f5c750c4ddbf1f58e9", + "reference": "b02726f39a20bc65e30364f5c750c4ddbf1f58e9", "shasum": "" }, "require": { @@ -4417,7 +4419,7 @@ "description": "Helps sending emails", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/mailer/tree/v7.4.3" + "source": "https://github.com/symfony/mailer/tree/v7.4.6" }, "funding": [ { @@ -4437,20 +4439,20 @@ "type": "tidelift" } ], - "time": "2025-12-16T08:02:06+00:00" + "time": "2026-02-25T16:50:00+00:00" }, { "name": "symfony/mime", - "version": "v7.4.0", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/mime.git", - "reference": "bdb02729471be5d047a3ac4a69068748f1a6be7a" + "reference": "da5ab4fde3f6c88ab06e96185b9922f48b677cd1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/mime/zipball/bdb02729471be5d047a3ac4a69068748f1a6be7a", - "reference": "bdb02729471be5d047a3ac4a69068748f1a6be7a", + "url": "https://api.github.com/repos/symfony/mime/zipball/da5ab4fde3f6c88ab06e96185b9922f48b677cd1", + "reference": "da5ab4fde3f6c88ab06e96185b9922f48b677cd1", "shasum": "" }, "require": { @@ -4461,15 +4463,15 @@ }, "conflict": { "egulias/email-validator": "~3.0.0", - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/reflection-docblock": "<5.2|>=7", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/mailer": "<6.4", "symfony/serializer": "<6.4.3|>7.0,<7.0.3" }, "require-dev": { "egulias/email-validator": "^2.1.10|^3.1|^4", "league/html-to-markdown": "^5.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "phpdocumentor/reflection-docblock": "^5.2|^6.0", "symfony/dependency-injection": "^6.4|^7.0|^8.0", "symfony/process": "^6.4|^7.0|^8.0", "symfony/property-access": "^6.4|^7.0|^8.0", @@ -4506,7 +4508,7 @@ "mime-type" ], "support": { - "source": "https://github.com/symfony/mime/tree/v7.4.0" + "source": "https://github.com/symfony/mime/tree/v7.4.7" }, "funding": [ { @@ -4526,7 +4528,7 @@ "type": "tidelift" } ], - "time": "2025-11-16T10:14:42+00:00" + "time": "2026-03-05T15:24:09+00:00" }, { "name": "symfony/polyfill-ctype", @@ -5436,16 +5438,16 @@ }, { "name": "symfony/process", - "version": "v7.4.3", + "version": "v7.4.5", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "2f8e1a6cdf590ca63715da4d3a7a3327404a523f" + "reference": "608476f4604102976d687c483ac63a79ba18cc97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/2f8e1a6cdf590ca63715da4d3a7a3327404a523f", - "reference": "2f8e1a6cdf590ca63715da4d3a7a3327404a523f", + "url": "https://api.github.com/repos/symfony/process/zipball/608476f4604102976d687c483ac63a79ba18cc97", + "reference": "608476f4604102976d687c483ac63a79ba18cc97", "shasum": "" }, "require": { @@ -5477,7 +5479,7 @@ "description": "Executes commands in sub-processes", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/process/tree/v7.4.3" + "source": "https://github.com/symfony/process/tree/v7.4.5" }, "funding": [ { @@ -5497,20 +5499,20 @@ "type": "tidelift" } ], - "time": "2025-12-19T10:00:43+00:00" + "time": "2026-01-26T15:07:59+00:00" }, { "name": "symfony/routing", - "version": "v7.4.3", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "5d3fd7adf8896c2fdb54e2f0f35b1bcbd9e45090" + "reference": "238d749c56b804b31a9bf3e26519d93b65a60938" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/5d3fd7adf8896c2fdb54e2f0f35b1bcbd9e45090", - "reference": "5d3fd7adf8896c2fdb54e2f0f35b1bcbd9e45090", + "url": "https://api.github.com/repos/symfony/routing/zipball/238d749c56b804b31a9bf3e26519d93b65a60938", + "reference": "238d749c56b804b31a9bf3e26519d93b65a60938", "shasum": "" }, "require": { @@ -5562,7 +5564,7 @@ "url" ], "support": { - "source": "https://github.com/symfony/routing/tree/v7.4.3" + "source": "https://github.com/symfony/routing/tree/v7.4.6" }, "funding": [ { @@ -5582,7 +5584,7 @@ "type": "tidelift" } ], - "time": "2025-12-19T10:00:43+00:00" + "time": "2026-02-25T16:50:00+00:00" }, { "name": "symfony/service-contracts", @@ -5673,16 +5675,16 @@ }, { "name": "symfony/string", - "version": "v7.4.0", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003" + "reference": "9f209231affa85aa930a5e46e6eb03381424b30b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/d50e862cb0a0e0886f73ca1f31b865efbb795003", - "reference": "d50e862cb0a0e0886f73ca1f31b865efbb795003", + "url": "https://api.github.com/repos/symfony/string/zipball/9f209231affa85aa930a5e46e6eb03381424b30b", + "reference": "9f209231affa85aa930a5e46e6eb03381424b30b", "shasum": "" }, "require": { @@ -5740,7 +5742,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v7.4.0" + "source": "https://github.com/symfony/string/tree/v7.4.6" }, "funding": [ { @@ -5760,7 +5762,7 @@ "type": "tidelift" } ], - "time": "2025-11-27T13:27:24+00:00" + "time": "2026-02-09T09:33:46+00:00" }, { "name": "symfony/translation-contracts", @@ -5846,16 +5848,16 @@ }, { "name": "symfony/twig-bridge", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "43c922fce020060c65b0fd54bfd8def3b38949b6" + "reference": "c67219ca6b79a57b64e36bbb2cd8ba741286587e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/43c922fce020060c65b0fd54bfd8def3b38949b6", - "reference": "43c922fce020060c65b0fd54bfd8def3b38949b6", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/c67219ca6b79a57b64e36bbb2cd8ba741286587e", + "reference": "c67219ca6b79a57b64e36bbb2cd8ba741286587e", "shasum": "" }, "require": { @@ -5865,10 +5867,10 @@ "twig/twig": "^3.21" }, "conflict": { - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/reflection-docblock": "<5.2|>=7", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/console": "<6.4", - "symfony/form": "<6.4", + "symfony/form": "<6.4.32|>7,<7.3.10|>7.4,<7.4.4|>8.0,<8.0.4", "symfony/http-foundation": "<6.4", "symfony/http-kernel": "<6.4", "symfony/mime": "<6.4", @@ -5879,7 +5881,7 @@ "require-dev": { "egulias/email-validator": "^2.1.10|^3|^4", "league/html-to-markdown": "^5.0", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "phpdocumentor/reflection-docblock": "^5.2|^6.0", "symfony/asset": "^6.4|^7.0|^8.0", "symfony/asset-mapper": "^6.4|^7.0|^8.0", "symfony/console": "^6.4|^7.0|^8.0", @@ -5887,7 +5889,7 @@ "symfony/emoji": "^7.1|^8.0", "symfony/expression-language": "^6.4|^7.0|^8.0", "symfony/finder": "^6.4|^7.0|^8.0", - "symfony/form": "^6.4.30|~7.3.8|^7.4.1|^8.0.1", + "symfony/form": "^6.4.32|~7.3.10|^7.4.4|^8.0.4", "symfony/html-sanitizer": "^6.4|^7.0|^8.0", "symfony/http-foundation": "^7.3|^8.0", "symfony/http-kernel": "^6.4|^7.0|^8.0", @@ -5937,7 +5939,7 @@ "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/twig-bridge/tree/v7.4.3" + "source": "https://github.com/symfony/twig-bridge/tree/v7.4.7" }, "funding": [ { @@ -5957,20 +5959,20 @@ "type": "tidelift" } ], - "time": "2025-12-16T08:02:06+00:00" + "time": "2026-03-04T15:37:05+00:00" }, { "name": "symfony/var-dumper", - "version": "v7.4.3", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "7e99bebcb3f90d8721890f2963463280848cba92" + "reference": "045321c440ac18347b136c63d2e9bf28a2dc0291" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/7e99bebcb3f90d8721890f2963463280848cba92", - "reference": "7e99bebcb3f90d8721890f2963463280848cba92", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/045321c440ac18347b136c63d2e9bf28a2dc0291", + "reference": "045321c440ac18347b136c63d2e9bf28a2dc0291", "shasum": "" }, "require": { @@ -6024,7 +6026,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v7.4.3" + "source": "https://github.com/symfony/var-dumper/tree/v7.4.6" }, "funding": [ { @@ -6044,7 +6046,7 @@ "type": "tidelift" } ], - "time": "2025-12-18T07:04:31+00:00" + "time": "2026-02-15T10:53:20+00:00" }, { "name": "symfony/var-exporter", @@ -6129,16 +6131,16 @@ }, { "name": "symfony/yaml", - "version": "v7.4.1", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "24dd4de28d2e3988b311751ac49e684d783e2345" + "reference": "58751048de17bae71c5aa0d13cb19d79bca26391" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/24dd4de28d2e3988b311751ac49e684d783e2345", - "reference": "24dd4de28d2e3988b311751ac49e684d783e2345", + "url": "https://api.github.com/repos/symfony/yaml/zipball/58751048de17bae71c5aa0d13cb19d79bca26391", + "reference": "58751048de17bae71c5aa0d13cb19d79bca26391", "shasum": "" }, "require": { @@ -6181,7 +6183,7 @@ "description": "Loads and dumps YAML files", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/yaml/tree/v7.4.1" + "source": "https://github.com/symfony/yaml/tree/v7.4.6" }, "funding": [ { @@ -6201,20 +6203,20 @@ "type": "tidelift" } ], - "time": "2025-12-04T18:11:45+00:00" + "time": "2026-02-09T09:33:46+00:00" }, { "name": "twig/twig", - "version": "v3.22.2", + "version": "v3.24.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2" + "reference": "a6769aefb305efef849dc25c9fd1653358c148f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/946ddeafa3c9f4ce279d1f34051af041db0e16f2", - "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6769aefb305efef849dc25c9fd1653358c148f0", + "reference": "a6769aefb305efef849dc25c9fd1653358c148f0", "shasum": "" }, "require": { @@ -6224,7 +6226,8 @@ "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "phpstan/phpstan": "^2.0", + "php-cs-fixer/shim": "^3.0@stable", + "phpstan/phpstan": "^2.0@stable", "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, @@ -6268,7 +6271,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.22.2" + "source": "https://github.com/twigphp/Twig/tree/v3.24.0" }, "funding": [ { @@ -6280,7 +6283,7 @@ "type": "tidelift" } ], - "time": "2025-12-14T11:28:47+00:00" + "time": "2026-03-17T21:31:11+00:00" }, { "name": "web-token/jwt-key-mgmt", @@ -7457,22 +7460,22 @@ }, { "name": "danog/advanced-json-rpc", - "version": "v3.2.2", + "version": "v3.2.3", "source": { "type": "git", "url": "https://github.com/danog/php-advanced-json-rpc.git", - "reference": "aadb1c4068a88c3d0530cfe324b067920661efcb" + "reference": "ae703ea7b4811797a10590b6078de05b3b33dd91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/danog/php-advanced-json-rpc/zipball/aadb1c4068a88c3d0530cfe324b067920661efcb", - "reference": "aadb1c4068a88c3d0530cfe324b067920661efcb", + "url": "https://api.github.com/repos/danog/php-advanced-json-rpc/zipball/ae703ea7b4811797a10590b6078de05b3b33dd91", + "reference": "ae703ea7b4811797a10590b6078de05b3b33dd91", "shasum": "" }, "require": { "netresearch/jsonmapper": "^5", "php": ">=8.1", - "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0" + "phpdocumentor/reflection-docblock": "^4.3.4 || ^5.0.0 || ^6" }, "replace": { "felixfbecker/php-advanced-json-rpc": "^3" @@ -7503,9 +7506,9 @@ "description": "A more advanced JSONRPC implementation", "support": { "issues": "https://github.com/danog/php-advanced-json-rpc/issues", - "source": "https://github.com/danog/php-advanced-json-rpc/tree/v3.2.2" + "source": "https://github.com/danog/php-advanced-json-rpc/tree/v3.2.3" }, - "time": "2025-02-14T10:55:15+00:00" + "time": "2026-01-12T21:07:10+00:00" }, { "name": "daverandom/libdns", @@ -7765,20 +7768,20 @@ }, { "name": "league/uri", - "version": "7.7.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807" + "reference": "08cf38e3924d4f56238125547b5720496fac8fd4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/8d587cddee53490f9b82bf203d3a9aa7ea4f9807", - "reference": "8d587cddee53490f9b82bf203d3a9aa7ea4f9807", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/08cf38e3924d4f56238125547b5720496fac8fd4", + "reference": "08cf38e3924d4f56238125547b5720496fac8fd4", "shasum": "" }, "require": { - "league/uri-interfaces": "^7.7", + "league/uri-interfaces": "^7.8.1", "php": "^8.1", "psr/http-factory": "^1" }, @@ -7792,11 +7795,11 @@ "ext-gmp": "to improve IPV4 host parsing", "ext-intl": "to handle IDN host with the best performance", "ext-uri": "to use the PHP native URI class", - "jeremykendall/php-domain-parser": "to resolve Public Suffix and Top Level Domain", - "league/uri-components": "Needed to easily manipulate URI objects components", - "league/uri-polyfill": "Needed to backport the PHP URI extension for older versions of PHP", + "jeremykendall/php-domain-parser": "to further parse the URI host and resolve its Public Suffix and Top Level Domain", + "league/uri-components": "to provide additional tools to manipulate URI objects components", + "league/uri-polyfill": "to backport the PHP URI extension for older versions of PHP", "php-64bit": "to improve IPV4 host parsing", - "rowbot/url": "to handle WHATWG URL", + "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification", "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", @@ -7851,7 +7854,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri/tree/7.7.0" + "source": "https://github.com/thephpleague/uri/tree/7.8.1" }, "funding": [ { @@ -7859,20 +7862,20 @@ "type": "github" } ], - "time": "2025-12-07T16:02:06+00:00" + "time": "2026-03-15T20:22:25+00:00" }, { "name": "league/uri-interfaces", - "version": "7.7.0", + "version": "7.8.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri-interfaces.git", - "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c" + "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/62ccc1a0435e1c54e10ee6022df28d6c04c2946c", - "reference": "62ccc1a0435e1c54e10ee6022df28d6c04c2946c", + "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/85d5c77c5d6d3af6c54db4a78246364908f3c928", + "reference": "85d5c77c5d6d3af6c54db4a78246364908f3c928", "shasum": "" }, "require": { @@ -7885,7 +7888,7 @@ "ext-gmp": "to improve IPV4 host parsing", "ext-intl": "to handle IDN host with the best performance", "php-64bit": "to improve IPV4 host parsing", - "rowbot/url": "to handle WHATWG URL", + "rowbot/url": "to handle URLs using the WHATWG URL Living Standard specification", "symfony/polyfill-intl-idn": "to handle IDN host via the Symfony polyfill if ext-intl is not present" }, "type": "library", @@ -7935,7 +7938,7 @@ "docs": "https://uri.thephpleague.com", "forum": "https://thephpleague.slack.com", "issues": "https://github.com/thephpleague/uri-src/issues", - "source": "https://github.com/thephpleague/uri-interfaces/tree/7.7.0" + "source": "https://github.com/thephpleague/uri-interfaces/tree/7.8.1" }, "funding": [ { @@ -7943,7 +7946,7 @@ "type": "github" } ], - "time": "2025-12-07T16:03:21+00:00" + "time": "2026-03-08T20:05:35+00:00" }, { "name": "masterminds/html5", @@ -8129,16 +8132,16 @@ }, { "name": "netresearch/jsonmapper", - "version": "v5.0.0", + "version": "v5.0.1", "source": { "type": "git", "url": "https://github.com/cweiske/jsonmapper.git", - "reference": "8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c" + "reference": "980674efdda65913492d29a8fd51c82270dd37bb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c", - "reference": "8c64d8d444a5d764c641ebe97e0e3bc72b25bf6c", + "url": "https://api.github.com/repos/cweiske/jsonmapper/zipball/980674efdda65913492d29a8fd51c82270dd37bb", + "reference": "980674efdda65913492d29a8fd51c82270dd37bb", "shasum": "" }, "require": { @@ -8174,9 +8177,9 @@ "support": { "email": "cweiske@cweiske.de", "issues": "https://github.com/cweiske/jsonmapper/issues", - "source": "https://github.com/cweiske/jsonmapper/tree/v5.0.0" + "source": "https://github.com/cweiske/jsonmapper/tree/v5.0.1" }, - "time": "2024-09-08T10:20:00+00:00" + "time": "2026-02-22T16:28:03+00:00" }, { "name": "nikic/php-parser", @@ -8521,16 +8524,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.6.6", + "version": "6.0.3", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8" + "reference": "7bae67520aa9f5ecc506d646810bd40d9da54582" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/5cee1d3dfc2d2aa6599834520911d246f656bcb8", - "reference": "5cee1d3dfc2d2aa6599834520911d246f656bcb8", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/7bae67520aa9f5ecc506d646810bd40d9da54582", + "reference": "7bae67520aa9f5ecc506d646810bd40d9da54582", "shasum": "" }, "require": { @@ -8538,8 +8541,8 @@ "ext-filter": "*", "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.2", - "phpdocumentor/type-resolver": "^1.7", - "phpstan/phpdoc-parser": "^1.7|^2.0", + "phpdocumentor/type-resolver": "^2.0", + "phpstan/phpdoc-parser": "^2.0", "webmozart/assert": "^1.9.1 || ^2" }, "require-dev": { @@ -8549,7 +8552,8 @@ "phpstan/phpstan-mockery": "^1.1", "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^9.5", - "psalm/phar": "^5.26" + "psalm/phar": "^5.26", + "shipmonk/dead-code-detector": "^0.5.1" }, "type": "library", "extra": { @@ -8579,44 +8583,44 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.6.6" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/6.0.3" }, - "time": "2025-12-22T21:13:58+00:00" + "time": "2026-03-18T20:49:53+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "1.12.0", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195" + "reference": "327a05bbee54120d4786a0dc67aad30226ad4cf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/92a98ada2b93d9b201a613cb5a33584dde25f195", - "reference": "92a98ada2b93d9b201a613cb5a33584dde25f195", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/327a05bbee54120d4786a0dc67aad30226ad4cf9", + "reference": "327a05bbee54120d4786a0dc67aad30226ad4cf9", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.3 || ^8.0", + "php": "^7.4 || ^8.0", "phpdocumentor/reflection-common": "^2.0", - "phpstan/phpdoc-parser": "^1.18|^2.0" + "phpstan/phpdoc-parser": "^2.0" }, "require-dev": { "ext-tokenizer": "*", "phpbench/phpbench": "^1.2", - "phpstan/extension-installer": "^1.1", - "phpstan/phpstan": "^1.8", - "phpstan/phpstan-phpunit": "^1.1", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^2.1", + "phpstan/phpstan-phpunit": "^2.0", "phpunit/phpunit": "^9.5", - "rector/rector": "^0.13.9", - "vimeo/psalm": "^4.25" + "psalm/phar": "^4" }, "type": "library", "extra": { "branch-alias": { - "dev-1.x": "1.x-dev" + "dev-1.x": "1.x-dev", + "dev-2.x": "2.x-dev" } }, "autoload": { @@ -8637,22 +8641,22 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.12.0" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/2.0.0" }, - "time": "2025-11-21T15:09:14+00:00" + "time": "2026-01-06T21:53:42+00:00" }, { "name": "phpstan/phpdoc-parser", - "version": "2.3.0", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495" + "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495", - "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a", + "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a", "shasum": "" }, "require": { @@ -8684,9 +8688,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2" }, - "time": "2025-08-30T15:50:23+00:00" + "time": "2026-01-25T14:56:51+00:00" }, { "name": "phpunit/php-code-coverage", @@ -9011,16 +9015,16 @@ }, { "name": "phpunit/phpunit", - "version": "10.5.60", + "version": "10.5.63", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f2e26f52f80ef77832e359205f216eeac00e320c" + "reference": "33198268dad71e926626b618f3ec3966661e4d90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f2e26f52f80ef77832e359205f216eeac00e320c", - "reference": "f2e26f52f80ef77832e359205f216eeac00e320c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/33198268dad71e926626b618f3ec3966661e4d90", + "reference": "33198268dad71e926626b618f3ec3966661e4d90", "shasum": "" }, "require": { @@ -9041,7 +9045,7 @@ "phpunit/php-timer": "^6.0.0", "sebastian/cli-parser": "^2.0.1", "sebastian/code-unit": "^2.0.0", - "sebastian/comparator": "^5.0.4", + "sebastian/comparator": "^5.0.5", "sebastian/diff": "^5.1.1", "sebastian/environment": "^6.1.0", "sebastian/exporter": "^5.1.4", @@ -9092,7 +9096,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", "security": "https://github.com/sebastianbergmann/phpunit/security/policy", - "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.60" + "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.63" }, "funding": [ { @@ -9116,38 +9120,39 @@ "type": "tidelift" } ], - "time": "2025-12-06T07:50:42+00:00" + "time": "2026-01-27T05:48:37+00:00" }, { "name": "psalm/plugin-symfony", - "version": "v5.2.8", + "version": "v5.3.0", "source": { "type": "git", "url": "https://github.com/psalm/psalm-plugin-symfony.git", - "reference": "603010dd920df45a924acdf0376bffa604ffa97a" + "reference": "df874ff48ae3b1833ea17fba7c21b31a4d682614" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/603010dd920df45a924acdf0376bffa604ffa97a", - "reference": "603010dd920df45a924acdf0376bffa604ffa97a", + "url": "https://api.github.com/repos/psalm/psalm-plugin-symfony/zipball/df874ff48ae3b1833ea17fba7c21b31a4d682614", + "reference": "df874ff48ae3b1833ea17fba7c21b31a4d682614", "shasum": "" }, "require": { "ext-simplexml": "*", "php": ">=8.1", - "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0", + "symfony/expression-language": "^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/framework-bundle": "^5.0 || ^6.0 || ^7.0 || ^8.0", "vimeo/psalm": "^6 || dev-master" }, "require-dev": { "doctrine/annotations": "^1.8|^2", - "doctrine/orm": "^2.9", + "doctrine/orm": "^2.9 || ^3.6", "phpunit/phpunit": "~7.5 || ~9.5", - "symfony/cache-contracts": "^1.0 || ^2.0", + "symfony/cache-contracts": "^1.0 || ^2.0 || ^3.0", "symfony/console": "*", - "symfony/form": "^5.0 || ^6.0 || ^7.0", - "symfony/messenger": "^5.0 || ^6.0 || ^7.0", + "symfony/form": "^5.0 || ^6.0 || ^7.0 || ^8.0", + "symfony/messenger": "^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/security-core": "*", - "symfony/serializer": "^5.0 || ^6.0 || ^7.0", + "symfony/serializer": "^5.0 || ^6.0 || ^7.0 || ^8.0", "symfony/validator": "*", "twig/twig": "^2.10 || ^3.0", "weirdan/codeception-psalm-module": "dev-master" @@ -9179,9 +9184,9 @@ "description": "Psalm Plugin for Symfony", "support": { "issues": "https://github.com/psalm/psalm-plugin-symfony/issues", - "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.2.8" + "source": "https://github.com/psalm/psalm-plugin-symfony/tree/v5.3.0" }, - "time": "2025-12-18T11:18:29+00:00" + "time": "2026-02-12T11:24:16+00:00" }, { "name": "revolt/event-loop", @@ -9425,16 +9430,16 @@ }, { "name": "sebastian/comparator", - "version": "5.0.4", + "version": "5.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e" + "reference": "55dfef806eb7dfeb6e7a6935601fef866f8ca48d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/e8e53097718d2b53cfb2aa859b06a41abf58c62e", - "reference": "e8e53097718d2b53cfb2aa859b06a41abf58c62e", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55dfef806eb7dfeb6e7a6935601fef866f8ca48d", + "reference": "55dfef806eb7dfeb6e7a6935601fef866f8ca48d", "shasum": "" }, "require": { @@ -9490,7 +9495,7 @@ "support": { "issues": "https://github.com/sebastianbergmann/comparator/issues", "security": "https://github.com/sebastianbergmann/comparator/security/policy", - "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.4" + "source": "https://github.com/sebastianbergmann/comparator/tree/5.0.5" }, "funding": [ { @@ -9510,7 +9515,7 @@ "type": "tidelift" } ], - "time": "2025-09-07T05:25:07+00:00" + "time": "2026-01-24T09:25:16+00:00" }, { "name": "sebastian/complexity", @@ -10357,16 +10362,16 @@ }, { "name": "symfony/browser-kit", - "version": "v7.4.3", + "version": "v7.4.4", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "d5b5c731005f224fbc25289587a8538e4f62c762" + "reference": "bed167eadaaba641f51fc842c9227aa5e251309e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/d5b5c731005f224fbc25289587a8538e4f62c762", - "reference": "d5b5c731005f224fbc25289587a8538e4f62c762", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/bed167eadaaba641f51fc842c9227aa5e251309e", + "reference": "bed167eadaaba641f51fc842c9227aa5e251309e", "shasum": "" }, "require": { @@ -10406,7 +10411,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v7.4.3" + "source": "https://github.com/symfony/browser-kit/tree/v7.4.4" }, "funding": [ { @@ -10426,20 +10431,20 @@ "type": "tidelift" } ], - "time": "2025-12-16T08:02:06+00:00" + "time": "2026-01-13T10:40:19+00:00" }, { "name": "symfony/cache", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/cache.git", - "reference": "642117d18bc56832e74b68235359ccefab03dd11" + "reference": "665522ec357540e66c294c08583b40ee576574f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/cache/zipball/642117d18bc56832e74b68235359ccefab03dd11", - "reference": "642117d18bc56832e74b68235359ccefab03dd11", + "url": "https://api.github.com/repos/symfony/cache/zipball/665522ec357540e66c294c08583b40ee576574f0", + "reference": "665522ec357540e66c294c08583b40ee576574f0", "shasum": "" }, "require": { @@ -10510,7 +10515,7 @@ "psr6" ], "support": { - "source": "https://github.com/symfony/cache/tree/v7.4.3" + "source": "https://github.com/symfony/cache/tree/v7.4.7" }, "funding": [ { @@ -10530,7 +10535,7 @@ "type": "tidelift" } ], - "time": "2025-12-28T10:45:24+00:00" + "time": "2026-03-06T08:14:57+00:00" }, { "name": "symfony/cache-contracts", @@ -10610,16 +10615,16 @@ }, { "name": "symfony/css-selector", - "version": "v7.4.0", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135" + "reference": "2e7c52c647b406e2107dd867db424a4dbac91864" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/ab862f478513e7ca2fe9ec117a6f01a8da6e1135", - "reference": "ab862f478513e7ca2fe9ec117a6f01a8da6e1135", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/2e7c52c647b406e2107dd867db424a4dbac91864", + "reference": "2e7c52c647b406e2107dd867db424a4dbac91864", "shasum": "" }, "require": { @@ -10655,7 +10660,7 @@ "description": "Converts CSS selectors to XPath expressions", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/css-selector/tree/v7.4.0" + "source": "https://github.com/symfony/css-selector/tree/v7.4.6" }, "funding": [ { @@ -10675,20 +10680,20 @@ "type": "tidelift" } ], - "time": "2025-10-30T13:39:42+00:00" + "time": "2026-02-17T07:53:42+00:00" }, { "name": "symfony/dom-crawler", - "version": "v7.4.1", + "version": "v7.4.6", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "0c5e8f20c74c78172a8ee72b125909b505033597" + "reference": "487ba8fa43da9a8e6503fe939b45ecd96875410e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/0c5e8f20c74c78172a8ee72b125909b505033597", - "reference": "0c5e8f20c74c78172a8ee72b125909b505033597", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/487ba8fa43da9a8e6503fe939b45ecd96875410e", + "reference": "487ba8fa43da9a8e6503fe939b45ecd96875410e", "shasum": "" }, "require": { @@ -10727,7 +10732,75 @@ "description": "Eases DOM navigation for HTML and XML documents", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v7.4.1" + "source": "https://github.com/symfony/dom-crawler/tree/v7.4.6" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2026-02-17T07:53:42+00:00" + }, + { + "name": "symfony/expression-language", + "version": "v7.4.4", + "source": { + "type": "git", + "url": "https://github.com/symfony/expression-language.git", + "reference": "f3a6497eb6573e185f2ec41cd3b3f0cd68ddf667" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/expression-language/zipball/f3a6497eb6573e185f2ec41cd3b3f0cd68ddf667", + "reference": "f3a6497eb6573e185f2ec41cd3b3f0cd68ddf667", + "shasum": "" + }, + "require": { + "php": ">=8.2", + "symfony/cache": "^6.4|^7.0|^8.0", + "symfony/deprecation-contracts": "^2.5|^3", + "symfony/service-contracts": "^2.5|^3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\ExpressionLanguage\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides an engine that can compile and evaluate expressions", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/expression-language/tree/v7.4.4" }, "funding": [ { @@ -10747,20 +10820,20 @@ "type": "tidelift" } ], - "time": "2025-12-06T15:47:47+00:00" + "time": "2026-01-05T08:47:25+00:00" }, { "name": "symfony/framework-bundle", - "version": "v7.4.3", + "version": "v7.4.7", "source": { "type": "git", "url": "https://github.com/symfony/framework-bundle.git", - "reference": "df908e8f9e5f6cc3c9e0d0172e030a5c1c280582" + "reference": "c94bc78c85d76af67918404a95d44940f66a7c2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/df908e8f9e5f6cc3c9e0d0172e030a5c1c280582", - "reference": "df908e8f9e5f6cc3c9e0d0172e030a5c1c280582", + "url": "https://api.github.com/repos/symfony/framework-bundle/zipball/c94bc78c85d76af67918404a95d44940f66a7c2f", + "reference": "c94bc78c85d76af67918404a95d44940f66a7c2f", "shasum": "" }, "require": { @@ -10768,8 +10841,8 @@ "ext-xml": "*", "php": ">=8.2", "symfony/cache": "^6.4.12|^7.0|^8.0", - "symfony/config": "^7.4.3|^8.0.3", - "symfony/dependency-injection": "^7.4|^8.0", + "symfony/config": "^7.4.4|^8.0.4", + "symfony/dependency-injection": "^7.4.4|^8.0.4", "symfony/deprecation-contracts": "^2.5|^3", "symfony/error-handler": "^7.3|^8.0", "symfony/event-dispatcher": "^6.4|^7.0|^8.0", @@ -10783,8 +10856,8 @@ }, "conflict": { "doctrine/persistence": "<1.3", - "phpdocumentor/reflection-docblock": "<3.2.2", - "phpdocumentor/type-resolver": "<1.4.0", + "phpdocumentor/reflection-docblock": "<5.2|>=7", + "phpdocumentor/type-resolver": "<1.5.1", "symfony/asset": "<6.4", "symfony/asset-mapper": "<6.4", "symfony/clock": "<6.4", @@ -10816,7 +10889,7 @@ "require-dev": { "doctrine/persistence": "^1.3|^2|^3", "dragonmantank/cron-expression": "^3.1", - "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "phpdocumentor/reflection-docblock": "^5.2|^6.0", "seld/jsonlint": "^1.10", "symfony/asset": "^6.4|^7.0|^8.0", "symfony/asset-mapper": "^6.4|^7.0|^8.0", @@ -10885,7 +10958,7 @@ "description": "Provides a tight integration between Symfony components and the Symfony full-stack framework", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/framework-bundle/tree/v7.4.3" + "source": "https://github.com/symfony/framework-bundle/tree/v7.4.7" }, "funding": [ { @@ -10905,7 +10978,7 @@ "type": "tidelift" } ], - "time": "2025-12-29T09:31:36+00:00" + "time": "2026-03-06T15:39:55+00:00" }, { "name": "theseer/tokenizer", @@ -10959,16 +11032,16 @@ }, { "name": "vimeo/psalm", - "version": "6.14.3", + "version": "6.16.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "d0b040a91f280f071c1abcb1b77ce3822058725a" + "reference": "f1f5de594dc76faf8784e02d3dc4716c91c6f6ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/d0b040a91f280f071c1abcb1b77ce3822058725a", - "reference": "d0b040a91f280f071c1abcb1b77ce3822058725a", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/f1f5de594dc76faf8784e02d3dc4716c91c6f6ac", + "reference": "f1f5de594dc76faf8784e02d3dc4716c91c6f6ac", "shasum": "" }, "require": { @@ -10992,7 +11065,7 @@ "netresearch/jsonmapper": "^5.0", "nikic/php-parser": "^5.0.0", "php": "~8.1.31 || ~8.2.27 || ~8.3.16 || ~8.4.3 || ~8.5.0", - "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0", + "sebastian/diff": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0", "spatie/array-to-xml": "^2.17.0 || ^3.0", "symfony/console": "^6.0 || ^7.0 || ^8.0", "symfony/filesystem": "~6.3.12 || ~6.4.3 || ^7.0.3 || ^8.0", @@ -11073,20 +11146,20 @@ "issues": "https://github.com/vimeo/psalm/issues", "source": "https://github.com/vimeo/psalm" }, - "time": "2025-12-23T15:36:48+00:00" + "time": "2026-03-19T10:56:09+00:00" }, { "name": "webmozart/assert", - "version": "2.0.0", + "version": "2.1.6", "source": { "type": "git", "url": "https://github.com/webmozarts/assert.git", - "reference": "1b34b004e35a164bc5bb6ebd33c844b2d8069a54" + "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozarts/assert/zipball/1b34b004e35a164bc5bb6ebd33c844b2d8069a54", - "reference": "1b34b004e35a164bc5bb6ebd33c844b2d8069a54", + "url": "https://api.github.com/repos/webmozarts/assert/zipball/ff31ad6efc62e66e518fbab1cde3453d389bcdc8", + "reference": "ff31ad6efc62e66e518fbab1cde3453d389bcdc8", "shasum": "" }, "require": { @@ -11133,9 +11206,9 @@ ], "support": { "issues": "https://github.com/webmozarts/assert/issues", - "source": "https://github.com/webmozarts/assert/tree/2.0.0" + "source": "https://github.com/webmozarts/assert/tree/2.1.6" }, - "time": "2025-12-16T21:36:00+00:00" + "time": "2026-02-27T10:28:38+00:00" } ], "aliases": [], From 5e5103175af793484316d4fece0d0ade79b7ee13 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 28 Mar 2026 16:50:31 +0100 Subject: [PATCH 1145/1214] [ticket/17628] Update node dependencies for 4.0 PHPBB-17628 --- package-lock.json | 54 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package-lock.json b/package-lock.json index add3d4534d4..b8c0658742c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -378,9 +378,9 @@ } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, "license": "MIT", "dependencies": { @@ -534,9 +534,9 @@ "license": "MIT" }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz", + "integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==", "dev": true, "license": "MIT", "dependencies": { @@ -1456,9 +1456,9 @@ } }, "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", "dev": true, "license": "ISC" }, @@ -2312,9 +2312,9 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, "license": "ISC", "dependencies": { @@ -2669,9 +2669,9 @@ "license": "MIT" }, "node_modules/path-to-regexp": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", + "version": "0.1.13", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz", + "integrity": "sha512-A/AGNMFN3c8bOlvV9RreMdrv7jsmF9XIfDeCd87+I8RNg6s78BhJxMu69NEMHBSJFxKidViTEdruRwEk/WIKqA==", "dev": true, "license": "MIT" }, @@ -2693,9 +2693,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, "license": "MIT", "engines": { @@ -2853,9 +2853,9 @@ } }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.14.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", + "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -3759,9 +3759,9 @@ } }, "node_modules/table/node_modules/ajv": { - "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "version": "8.18.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.18.0.tgz", + "integrity": "sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==", "dev": true, "license": "MIT", "dependencies": { @@ -4013,9 +4013,9 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz", + "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==", "dev": true, "license": "ISC", "engines": { From a8609f7986d4a6f24a111e227d481ba9a790c10b Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 29 Mar 2026 09:18:13 +0200 Subject: [PATCH 1146/1214] [ticket/17628] Move back to twig 3.22.2 to prevent bc breaks PHPBB-17628 --- phpBB/composer.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/phpBB/composer.lock b/phpBB/composer.lock index d7d6c13646a..a21e11e3a9d 100644 --- a/phpBB/composer.lock +++ b/phpBB/composer.lock @@ -6207,16 +6207,16 @@ }, { "name": "twig/twig", - "version": "v3.24.0", + "version": "v3.22.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a6769aefb305efef849dc25c9fd1653358c148f0" + "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6769aefb305efef849dc25c9fd1653358c148f0", - "reference": "a6769aefb305efef849dc25c9fd1653358c148f0", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/946ddeafa3c9f4ce279d1f34051af041db0e16f2", + "reference": "946ddeafa3c9f4ce279d1f34051af041db0e16f2", "shasum": "" }, "require": { @@ -6226,8 +6226,7 @@ "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "php-cs-fixer/shim": "^3.0@stable", - "phpstan/phpstan": "^2.0@stable", + "phpstan/phpstan": "^2.0", "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, @@ -6271,7 +6270,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.24.0" + "source": "https://github.com/twigphp/Twig/tree/v3.22.2" }, "funding": [ { @@ -6283,7 +6282,7 @@ "type": "tidelift" } ], - "time": "2026-03-17T21:31:11+00:00" + "time": "2025-12-14T11:28:47+00:00" }, { "name": "web-token/jwt-key-mgmt", From 3e883346d4f104d5368f98f06ec8acfbc8f07675 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Mar 2026 20:11:20 +0200 Subject: [PATCH 1147/1214] [prep-release-3.3.16] Update version numbers to 3.3.16-RC1 --- build/build.xml | 4 ++-- phpBB/includes/constants.php | 2 +- phpBB/install/phpbbcli.php | 2 +- phpBB/install/schemas/schema_data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/build.xml b/build/build.xml index f8ea1db2dc5..6daf5651649 100644 --- a/build/build.xml +++ b/build/build.xml @@ -2,9 +2,9 @@ - + - + diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index 89ace2e439e..f24ef2083a0 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ */ // phpBB Version -@define('PHPBB_VERSION', '3.3.16-dev'); +@define('PHPBB_VERSION', '3.3.16-RC1'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/phpbbcli.php b/phpBB/install/phpbbcli.php index 6291bbbad59..e1a765c9934 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ define('IN_PHPBB', true); define('IN_INSTALL', true); define('PHPBB_ENVIRONMENT', 'production'); -define('PHPBB_VERSION', '3.3.15'); +define('PHPBB_VERSION', '3.3.16-RC1'); $phpbb_root_path = __DIR__ . '/../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index f6938204c7e..a27ab5f5983 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -316,7 +316,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('update_hashes_lock INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.16-dev'); +INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.3.16-RC1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); From 84e64556b1f5e55b4d37900e32c02c01cb0f1aa6 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Mar 2026 20:11:21 +0200 Subject: [PATCH 1148/1214] [prep-release-3.3.16] Update version numbers to 3.3.16 --- phpBB/install/convertors/convert_phpbb20.php | 2 +- phpBB/styles/prosilver/style.cfg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index 7d4ed05bd9f..c47f04f6561 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $convertor_data = array( 'forum_name' => 'phpBB 2.0.x', 'version' => '1.0.3', - 'phpbb_version' => '3.3.15', + 'phpbb_version' => '3.3.16', 'author' => 'phpBB Limited', 'dbms' => $dbms, 'dbhost' => $dbhost, diff --git a/phpBB/styles/prosilver/style.cfg b/phpBB/styles/prosilver/style.cfg index cf175b6d25e..77336cbb76f 100644 --- a/phpBB/styles/prosilver/style.cfg +++ b/phpBB/styles/prosilver/style.cfg @@ -21,8 +21,8 @@ # General Information about this style name = prosilver copyright = © phpBB Limited, 2007 -style_version = 3.3.15 -phpbb_version = 3.3.15 +style_version = 3.3.16 +phpbb_version = 3.3.16 # Defining a different template bitfield # template_bitfield = //g= From 08dd03e3a76bae9b91b14ec0e2bc32d2d570c8fa Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Mar 2026 20:11:24 +0200 Subject: [PATCH 1149/1214] [prep-release-3.3.16] Add migration for 3.3.16-RC1 --- .../phpbb/db/migration/data/v33x/v3316rc1.php | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 phpBB/phpbb/db/migration/data/v33x/v3316rc1.php diff --git a/phpBB/phpbb/db/migration/data/v33x/v3316rc1.php b/phpBB/phpbb/db/migration/data/v33x/v3316rc1.php new file mode 100644 index 00000000000..1f9a83e7ea2 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v33x/v3316rc1.php @@ -0,0 +1,36 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v33x; + +class v3316rc1 extends \phpbb\db\migration\migration +{ + public function effectively_installed() + { + return version_compare($this->config['version'], '3.3.16-RC1', '>='); + } + + public static function depends_on() + { + return [ + '\phpbb\db\migration\data\v33x\v3315', + ]; + } + + public function update_data() + { + return [ + ['config.update', ['version', '3.3.16-RC1']], + ]; + } +} From d00ae7c6e14d9c97bc4ef650dd823e9ee9cbeb89 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Mar 2026 20:11:24 +0200 Subject: [PATCH 1150/1214] [prep-release-3.3.16] Update stylesheet hashes for 3.3.16-RC1 --- phpBB/styles/prosilver/theme/stylesheet.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/styles/prosilver/theme/stylesheet.css b/phpBB/styles/prosilver/theme/stylesheet.css index 0171d646dae..56b7710b9b1 100644 --- a/phpBB/styles/prosilver/theme/stylesheet.css +++ b/phpBB/styles/prosilver/theme/stylesheet.css @@ -12,7 +12,7 @@ @import url("utilities.css?hash=d8f72c42"); @import url("common.css?hash=843d5d5f"); @import url("links.css?hash=18286e16"); -@import url("content.css?hash=d0e24377"); +@import url("content.css?hash=d6d1338b"); @import url("buttons.css?hash=56f0d25f"); @import url("cp.css?hash=50d868ab"); @import url("forms.css?hash=9016b55c"); From e1c74212f031a7d15c9a96f7832d3ecdd0a64dd9 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Mon, 30 Mar 2026 20:11:30 +0200 Subject: [PATCH 1151/1214] [prep-release-3.3.16] Update changelog for 3.3.16-RC1 --- phpBB/docs/CHANGELOG.html | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 3b4a42bed33..1d84f553727 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@

    Changelog

    1. Changelog