From c2d91650bd5e8e7f9e2ba005e47934292faaafb0 Mon Sep 17 00:00:00 2001 From: rxu Date: Tue, 11 Jun 2024 16:08:39 +0700 Subject: [PATCH 001/276] [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 e474b2584e..6182801da6 100644 --- a/phpBB/phpbb/db/driver/mysqli.php +++ b/phpBB/phpbb/db/driver/mysqli.php @@ -155,7 +155,9 @@ class mysqli extends \phpbb\db\driver\mysql_base 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 f98f2c5896fb4594e20d4f0ee77988fddfd6319c Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Tue, 11 Jun 2024 20:12:01 +0200 Subject: [PATCH 002/276] [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 a07b9a9701..768e314b18 100644 --- a/phpBB/phpbb/cache/driver/file.php +++ b/phpBB/phpbb/cache/driver/file.php @@ -330,6 +330,27 @@ class file extends \phpbb\cache\driver\base 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 @@ class file extends \phpbb\cache\driver\base 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 @@ class file extends \phpbb\cache\driver\base } $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 10c9aec182..cf36cda2bb 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 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case } $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 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case 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 003/276] [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 cf36cda2bb..56a1b28073 100644 --- a/tests/cache/file_driver_test.php +++ b/tests/cache/file_driver_test.php @@ -55,6 +55,11 @@ class phpbb_cache_file_driver_test extends phpbb_cache_common_test_case 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 d66d4a0c6ab5d9ac4d4dd1a37a90d8b3ea2e9889 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 12 Jun 2024 22:16:41 +0200 Subject: [PATCH 004/276] [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 0000000000..f87dadf9e7 --- /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 4d2d18bdc6..700503f97d 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 @@ class webpush extends messenger_base implements extended_method_interface '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 @@ class webpush extends messenger_base implements extended_method_interface $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 @@ class webpush extends messenger_base implements extended_method_interface '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 b60fa437b3..15e54956fb 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -100,10 +100,37 @@ class webpush * @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 @@ class webpush $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 f2807cb43a..cf0ca568ac 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 005/276] [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 611e72a9b8..80089c2717 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1088,7 +1088,7 @@ class acp_users $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 d995676e8f..26f2d43cb5 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 dbdfe80618..c846bdde05 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1722,7 +1722,7 @@ switch ($mode) { $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 006/276] [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 af39ecf2fa..46e82d03ba 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -987,7 +987,7 @@ class session // 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 @@ class session 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 @@ class session 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 59a2dc2ebe..16971428a7 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 9080478a28..32c4db3f85 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -65,11 +65,13 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case [ '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 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case [ '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 deb76d4e5e..15b5d44eb5 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -50,7 +50,7 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case 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 007/276] [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 46e82d03ba..a1d7df511a 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -903,7 +903,8 @@ class session } $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 @@ class session 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 b6c2961568b6e93e21a1740f23e63e8b0bf9912b Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Sun, 9 Jun 2024 12:19:47 -0700 Subject: [PATCH 008/276] [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 | 39 +++++++++++++++------------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/phpBB/adm/style/acp_ext_list.html b/phpBB/adm/style/acp_ext_list.html index bb22ac861c..dd006bc2cc 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -99,25 +99,26 @@
- - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + +
{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 c6eb147b86..3a8322ae0b 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -36,14 +36,15 @@ if (empty($lang) || !is_array($lang)) $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 @@ $lang = array_merge($lang, array( '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 @@ $lang = array_merge($lang, array( '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. +
      3. Delete the extension’s files from the filesystem
        4. +
      ', + 'EXTENSION_UPDATING_HEADLINE' => 'Updating an extension', + 'EXTENSION_UPDATING_EXPLAIN' => '
      1. Disable the extension
      2. Delete the extension’s files from the filesystem
      3. Upload the new files
      4. Enable the extension
      ', - 'EXTENSION_REMOVE_HEADLINE' => 'Completely removing an extension from your board', - 'EXTENSION_REMOVE_EXPLAIN' => '
        -
      1. Disable the extension
        2. -
      2. Delete the extension’s data
        3. -
      3. Delete the extension’s files from the filesystem
        4. -
      ', + '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 009/276] [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 dd006bc2cc..b8b3d2c68a 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -104,19 +104,38 @@ {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 3a8322ae0b..311cfa74f3 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -89,25 +89,25 @@ $lang = array_merge($lang, array( '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 010/276] [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 2e920dbe4b..7fde9e2cac 100644 --- a/phpBB/phpbb/template/twig/extension.php +++ b/phpBB/phpbb/template/twig/extension.php @@ -93,6 +93,7 @@ class extension extends \Twig\Extension\AbstractExtension 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 @@ class extension extends \Twig\Extension\AbstractExtension 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 8faa52d8ac..4fc9858366 100644 --- a/tests/template/template_test.php +++ b/tests/template/template_test.php @@ -365,15 +365,15 @@ class phpbb_template_template_test extends phpbb_template_template_test_case 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 bf31012819..a331c7f506 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 011/276] [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 b8b3d2c68a..dc6dcf1797 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -106,9 +106,9 @@
        -
      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 @@
        -
      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 @@
        -
      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 311cfa74f3..bf854cdb7b 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -91,22 +91,22 @@ $lang = array_merge($lang, array( '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 012/276] [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 cbf31fc288..9dd53fafa5 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 013/276] [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 c326fe1cff..94e542d2ae 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 5933cc8f5c..43269679bf 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -515,6 +515,7 @@ $lang = array_merge($lang, array( '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 ff52543d0a..abd5c85bfd 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 b3be983f16..27981581ff 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -10,7 +10,7 @@

      {{ 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 014/276] [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 2300f9c611..f679df7c9f 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 5deb7224a6..481b1a23d3 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 015/276] [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 abd5c85bfd..de5a8c79e6 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 fda72c8613..cf15eb394f 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 e803a3f6cf..4980cd89f2 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 f679df7c9f..cddbc364bc 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 481b1a23d3..9b1e1e379b 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 61478cec98..acd15a261d 100644 --- a/tests/functional/notification_webpush_test.php +++ b/tests/functional/notification_webpush_test.php @@ -99,19 +99,19 @@ class phpbb_functional_notification_webpush_test extends phpbb_functional_test_c // 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 016/276] [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 8f241abac7..c7da3df4fa 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 017/276] [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 edf41633b2..4b5a58a30f 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 018/276] [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 a1d7df511a..aa4841316f 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -441,7 +441,7 @@ class session $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 @@ class session } $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 @@ class session // 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 @@ class session 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 @@ class session 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 @@ class session 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 @@ class session { $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 @@ class session { 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 16971428a7..59a2dc2ebe 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 32c4db3f85..9080478a28 100644 --- a/tests/session/garbage_collection_test.php +++ b/tests/session/garbage_collection_test.php @@ -65,13 +65,11 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case [ '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 @@ class phpbb_session_garbage_collection_test extends phpbb_session_test_case [ '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 15b5d44eb5..deb76d4e5e 100644 --- a/tests/test_framework/phpbb_session_test_case.php +++ b/tests/test_framework/phpbb_session_test_case.php @@ -50,7 +50,7 @@ abstract class phpbb_session_test_case extends phpbb_database_test_case 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 019/276] [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 2a62543c2f..b7288e2ec7 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 ce81039809..a0c2f3693a 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -155,10 +155,13 @@ $lang = array_merge($lang, array( '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 0000000000..cdd7ef544e --- /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 020/276] [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 a0c2f3693a..e271380a2f 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -159,7 +159,7 @@ $lang = array_merge($lang, array( '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 cdd7ef544e..3ecd43b314 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 @@ use Symfony\Component\Console\Style\SymfonyStyle; 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 @@ class delete_ids extends command { 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 @@ class delete_ids extends command 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 0000000000..0595271b6b --- /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 021/276] [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 3ecd43b314..ee5bfe8c6f 100644 --- a/phpBB/phpbb/console/command/user/delete_ids.php +++ b/phpBB/phpbb/console/command/user/delete_ids.php @@ -108,6 +108,8 @@ class delete_ids extends command 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 @@ class delete_ids extends command 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 022/276] [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 b7288e2ec7..8b9dcbc5f0 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 e271380a2f..b2fdbebd3a 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -108,6 +108,8 @@ $lang = array_merge($lang, array( '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 ee5bfe8c6f..2dda64e7d7 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\Output\OutputInterface; 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 @@ class delete_ids extends command { $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 @@ class delete_ids extends command { 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 @@ class delete_ids extends command } } } + + /** + * 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 0595271b6b..a579312552 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 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base $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 a988ba463f..eba2eba637 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 023/276] [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 b2fdbebd3a..b1cbe80f4d 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -159,8 +159,9 @@ $lang = array_merge($lang, array( '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 2dda64e7d7..dfb389aca1 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -132,6 +132,10 @@ class delete_id extends command { $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 @@ class delete_id extends command // 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']); + + $this->log->add('admin', ANONYMOUS, '', 'LOG_USER_DELETED', false, array($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'])); + $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 @@ class delete_id extends command 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 a579312552..293bb56b9d 100644 --- a/tests/console/user/delete_id_test.php +++ b/tests/console/user/delete_id_test.php @@ -86,7 +86,7 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base $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 024/276] [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 293bb56b9d..46db028eaf 100644 --- a/tests/console/user/delete_id_test.php +++ b/tests/console/user/delete_id_test.php @@ -56,7 +56,7 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base $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 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base $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 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base '--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 025/276] [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 dfb389aca1..f189fe72cc 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -94,7 +94,7 @@ class delete_id extends command 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 46db028eaf..fb5b60ba0e 100644 --- a/tests/console/user/delete_id_test.php +++ b/tests/console/user/delete_id_test.php @@ -35,7 +35,7 @@ class phpbb_console_user_delete_ids_test extends phpbb_console_user_base $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 026/276] [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 f189fe72cc..ac00138a17 100644 --- a/phpBB/phpbb/console/command/user/delete_id.php +++ b/phpBB/phpbb/console/command/user/delete_id.php @@ -216,11 +216,7 @@ class delete_id extends command */ 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 027/276] [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 f0093ff869..6e76e08802 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -73,6 +73,47 @@ class phpbb_dbal_write_test extends phpbb_database_test_case $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 c46bbe11c3..a7054d5635 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -285,7 +285,7 @@ abstract class phpbb_database_test_case extends TestCase 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 028/276] [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 6e76e08802..f94aebd85b 100644 --- a/tests/dbal/write_test.php +++ b/tests/dbal/write_test.php @@ -77,6 +77,13 @@ class phpbb_dbal_write_test extends phpbb_database_test_case { $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 @@ class phpbb_dbal_write_test extends phpbb_database_test_case $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 029/276] [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 debf64cba2..0ad1c80edb 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -9,7 +9,7 @@
      -
      +
      {AVATAR_IMG}
      {RANK_TITLE}
      diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index e184557a89..693a5147ba 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 5a3041fe0c..78897be19c 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 030/276] [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 9f970de6a5..4287fa6187 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 @@ class install_extensions extends \phpbb\install\task_base 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 0195b9c661..e9922068ed 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 @@ class update_extensions extends task_base 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 031/276] [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 8a2ef60771..5a9c12f2a5 100644 --- a/phpBB/phpbb/console/command/fixup/update_hashes.php +++ b/phpBB/phpbb/console/command/fixup/update_hashes.php @@ -100,7 +100,15 @@ class update_hashes extends \phpbb\console\command\command 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 3348a4576e..78221bb35f 100644 --- a/phpBB/phpbb/cron/task/core/update_hashes.php +++ b/phpBB/phpbb/cron/task/core/update_hashes.php @@ -107,7 +107,15 @@ class update_hashes extends \phpbb\cron\task\base 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 032/276] [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 1ca315275b..3a034bc7ab 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 0f2b1a60a0..c0405ac097 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 033/276] [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 eaeb529918..f5c70c3a52 100644 --- a/phpBB/phpbb/cache/driver/redis.php +++ b/phpBB/phpbb/cache/driver/redis.php @@ -129,6 +129,10 @@ class redis extends \phpbb\cache\driver\memory /** * 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 @@ class redis extends \phpbb\cache\driver\memory */ 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 034/276] [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 496c30de5d..4ff6f96ae3 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 0d66dfde4f..b0e086e65c 100644 --- a/phpBB/includes/acp/acp_attachments.php +++ b/phpBB/includes/acp/acp_attachments.php @@ -173,8 +173,6 @@ class acp_attachments '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 @@ class acp_attachments '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 941b2eb246..ae992b4828 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 8ab18ad8c8..24a4ce53b4 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -361,8 +361,6 @@ class phpbb_questionnaire_phpbb_data_provider '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 75a0b8def4..4063c2d01f 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 ba8f654a90..a9db639b9e 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 351f61dbef..630977b5ce 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -111,8 +111,6 @@ $lang = array_merge($lang, array( '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 0000000000..172bea5e1d --- /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 725b954c2d..d7fcd77bcb 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 @@ interface adapter_interface 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 48722cf5b2..72d92096d5 100644 --- a/phpBB/phpbb/storage/adapter/local.php +++ b/phpBB/phpbb/storage/adapter/local.php @@ -18,8 +18,6 @@ use phpbb\storage\exception\storage_exception; 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 @@ class local implements adapter_interface, stream_interface } /** - * 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 @@ class local implements adapter_interface, stream_interface 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 d9e108e098..9d84fceb45 100644 --- a/phpBB/phpbb/storage/controller/attachment.php +++ b/phpBB/phpbb/storage/controller/attachment.php @@ -22,6 +22,7 @@ use phpbb\db\driver\driver_interface; 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 7055961230..720745e2cc 100644 --- a/phpBB/phpbb/storage/controller/avatar.php +++ b/phpBB/phpbb/storage/controller/avatar.php @@ -16,6 +16,7 @@ namespace phpbb\storage\controller; 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 d1ea9f29f7..94af901eed 100644 --- a/phpBB/phpbb/storage/controller/controller.php +++ b/phpBB/phpbb/storage/controller/controller.php @@ -16,6 +16,7 @@ namespace phpbb\storage\controller; 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 @@ class controller */ 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 @@ class controller { 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 3bb6b28131..0000000000 --- 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 a4c652f40a..fa1ca0d204 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 @@ class storage * * @return string */ - public function get_name() + public function get_name(): string { return $this->storage_name; } @@ -87,7 +87,7 @@ class storage * * @return adapter_interface */ - protected function get_adapter() + protected function get_adapter(): mixed { if ($this->adapter === null) { @@ -106,7 +106,7 @@ class storage * @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 @@ class storage * 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 @@ class storage * * @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 @@ class storage /** * 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 @@ class storage /** * 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 @@ class storage /** * 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 @@ class storage /** * 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 @@ class storage /** * 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 @@ class storage /** * 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 @@ class storage 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 @@ class storage /** * 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 @@ class storage $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 @@ class storage } /** - * 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 @@ class storage * * @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 @@ class storage * * @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 @@ class storage { 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 2c008120e7..dff331c694 100644 --- a/tests/storage/adapter/local_test_case.php +++ b/tests/storage/adapter/local_test_case.php @@ -33,8 +33,6 @@ class phpbb_local_test_case extends phpbb_test_case $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 035/276] [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 9e019fa1c2..0cfd21dc7e 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -95,6 +95,34 @@ + + + + {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 17281a111a..f481f764d1 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -575,7 +575,7 @@ class acp_extensions 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 @@ class acp_extensions $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 a96a7a2a2b..16668b5161 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -47,6 +47,7 @@ $lang = array_merge($lang, array( '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 036/276] [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 7acac28f33..e92319c078 100644 --- a/tests/attachment/delete_test.php +++ b/tests/attachment/delete_test.php @@ -86,16 +86,16 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case 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 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case 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 037/276] [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 2f26c53ce5..3ecdd6e05c 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -84,7 +84,8 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $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 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $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 038/276] [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 0cfd21dc7e..526c1eb3c4 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -98,11 +98,11 @@ - {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 07e3b83beb..c0f313f540 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 039/276] [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 526c1eb3c4..0984214c6f 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -42,87 +42,52 @@ - - - {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 040/276] [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 0a9f00c77c..2fb9ba881a 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 041/276] [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 ac00138a17..07d98e7616 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\language\language; 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 @@ class delete_id extends command 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 042/276] [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 14c0d40263..253a70342a 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 7fff9204f0..46d20e4527 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 d2076ce086..a632253c52 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -78,6 +78,7 @@ class acp_board '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 @@ class acp_board // 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 0e52fb37d6..8cee5a6ba0 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 ba8f654a90..40240213d3 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 3228db126b..def1b01c60 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -69,6 +69,8 @@ $lang = array_merge($lang, array( '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 0000000000..e5808c4c9a --- /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 790f793d8f..49f2d3bff6 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 043/276] [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 0000000000..f100d9bdff --- /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 044/276] [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 e5808c4c9a..1a7d0148e5 100644 --- a/phpBB/phpbb/manifest.php +++ b/phpBB/phpbb/manifest.php @@ -62,7 +62,7 @@ class manifest */ 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 @@ class manifest * 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 045/276] [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 3e4e7ff98b..3a9b80a16d 100644 --- a/phpBB/phpbb/avatar/driver/gravatar.php +++ b/phpBB/phpbb/avatar/driver/gravatar.php @@ -53,7 +53,7 @@ class gravatar extends \phpbb\avatar\driver\driver { $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 0000000000..29417a508a --- /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 046/276] [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 3a9b80a16d..25e5bfb6e5 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 29417a508a..383664fe9c 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -72,6 +72,14 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case $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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case $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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case ]; $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 047/276] [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 25e5bfb6e5..c49e29c20c 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 @@ class gravatar extends \phpbb\avatar\driver\driver 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 383664fe9c..a79e0d5115 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -207,7 +207,7 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case ]; $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 048/276] [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 a79e0d5115..fbc50d5623 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -194,7 +194,7 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case '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 049/276] [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 fbc50d5623..d0a83c2f22 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -48,25 +48,27 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case $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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case 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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case $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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case '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 050/276] [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 d0a83c2f22..27ab847ff7 100644 --- a/tests/avatar/driver_gravatar_test.php +++ b/tests/avatar/driver_gravatar_test.php @@ -48,27 +48,25 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case $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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case 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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case $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 @@ class phpbb_avatar_driver_gravatar_test extends \phpbb_database_test_case '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 051/276] [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 613a054b32..d030d2e587 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -181,7 +181,14 @@
      -
      +
      + +
      From 51c424b93d549359db65f09f9f5d66176f1368ca Mon Sep 17 00:00:00 2001 From: Matt Friedman Date: Fri, 5 Jul 2024 19:22:29 -0700 Subject: [PATCH 052/276] [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 a632253c52..d457b13cb4 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -393,7 +393,7 @@ class acp_board '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 053/276] [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 25363ad34d..a4a08ae805 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 054/276] [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 f5b509e002..5411719fee 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 055/276] [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 d0a3cb33fe..86ea774d8e 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 056/276] [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 b3562b48f0..c11284975c 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -848,6 +848,7 @@ if ($save && $user->data['is_registered'] && $auth->acl_get('u_savedrafts') && ( '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 057/276] [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 1fcf2f62a4..0000000000 --- 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 6aafce12bc..920214448d 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -213,13 +213,7 @@ class acp_forums 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 058/276] [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 6afa18691f..814b962e31 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha_v3.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha_v3.php @@ -359,6 +359,7 @@ class recaptcha_v3 extends captcha_abstract 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 059/276] [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 e01e7eb4d4..dc3f08e450 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 d3b2ecd68e..12790360d6 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 060/276] [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 f1d51350b4..c1a7b274b9 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 0000000000..92e78ba1a7 --- /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 061/276] [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 d1eae7bd98..cf294e547e 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 0000000000..92e78ba1a7 --- /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 062/276] [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 1b57dd370c..fef922c2da 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 8ee31b6d5e..ed1f25e023 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 063/276] [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 7fc5e002ba..a2d4dab98e 100644 --- a/phpBB/phpbb/search/fulltext_native.php +++ b/phpBB/phpbb/search/fulltext_native.php @@ -299,7 +299,11 @@ class fulltext_native extends \phpbb\search\base ); $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 064/276] [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 bdc28731d7..47172cfc60 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2071,7 +2071,7 @@ for ($i = 0, $end = count($post_list); $i < $end; ++$i) '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 065/276] [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 0aceeb90e1..4e3fd5a85e 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 066/276] [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 40e1b64239..33bc8daa1f 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; + // Size of the fragment of text per word + $characters_per_word = (int) ($length / $wordnum); - // cycle through every character in the original text - for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++) + // 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; - } - - // stop context generation and wait for the next word - if ($j > $sequence_length) - { - $j = 0; - } - } - } + // End fragment at the end of a word + $substring = utf8_substr($text, $start, $end-$start); + $end = $start+utf8_strrpos($substring, ' '); } - return str_replace($characters, $entities, $final_text); - } + + $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) + { + $fragment = '... ' . $fragment; + } + if ($end < $text_length) + { + $fragment .= ' ...'; + } + + // Get the last fragment + $fragments[] = $fragment; + + $output = htmlentities(implode($fragments, '')); } - if (!count($words) || !count($word_indizes)) - { - return str_replace($characters, $entities, ((utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text)); - } + return $output; } /** diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index 5a1ca5b6fe..4ed9c72bb1 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 067/276] [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 033c31c396..0e3aa80fa3 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -146,7 +146,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case 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 068/276] [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 33bc8daa1f..7731d63a48 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 069/276] [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 7731d63a48..5b1d6244b3 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 070/276] [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 5b1d6244b3..e536c5ad24 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 071/276] [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 0000000000..b5d5b2ef73 --- /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 072/276] [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 e536c5ad24..94de0b7849 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 073/276] [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 943334d959..f3393225f4 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -25,19 +25,24 @@ class phpbb_search_native_test extends phpbb_search_test_case 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 @@ class phpbb_search_native_test extends phpbb_search_test_case } $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 074/276] [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 85ec1bd449..a6b5d26d3f 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,196 +19,6 @@ if (!defined('IN_PHPBB')) 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 6e4c224e39..48e9284f69 100644 --- a/phpBB/phpbb/files/filespec.php +++ b/phpBB/phpbb/files/filespec.php @@ -398,7 +398,7 @@ class filespec * @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 db5a1d6dd9..18fdfe588d 100644 --- a/phpBB/phpbb/plupload/plupload.php +++ b/phpBB/phpbb/plupload/plupload.php @@ -344,8 +344,9 @@ class plupload } $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 c0330d01f8..0000000000 --- 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 bcb4db0705..8d89c15ab8 100644 --- a/tests/log/function_add_log_test.php +++ b/tests/log/function_add_log_test.php @@ -172,19 +172,63 @@ class phpbb_log_function_add_log_test extends phpbb_database_test_case 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 de88c281ff..02a811b539 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -224,4 +224,65 @@ class version_helper_remote_test extends \phpbb_test_case $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 075/276] [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 49eefa3411..3c99a70200 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -40,16 +40,26 @@ class phpbb_security_hash_test extends phpbb_test_case 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 076/276] [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 6ac9459331..0000000000 --- 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 077/276] [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 df152c81ab..f1f5dd8321 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 a6b5d26d3f..13563d79ef 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,66 +19,6 @@ if (!defined('IN_PHPBB')) 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 9a909a007c..7d96152c21 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 @@ class phpbb_text_processing_generate_text_for_display_test extends phpbb_test_ca $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 c47c9b9f5e..86c257a9f6 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 @@ class phpbb_text_processing_generate_text_for_storage_test extends phpbb_test_ca 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 078/276] [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 f1f5dd8321..ca0394e88f 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 13563d79ef..df74abe308 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,67 +19,6 @@ if (!defined('IN_PHPBB')) 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 c95dce46d0..ea1a1ac89e 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 @@ class phpbb_request_var_test extends phpbb_test_case $_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 @@ class phpbb_request_var_test extends phpbb_test_case $_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 @@ class phpbb_request_var_test extends phpbb_test_case $_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 @@ class phpbb_request_var_test extends phpbb_test_case ), ); - $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 079/276] [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 df74abe308..d2e3979216 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,32 +19,6 @@ if (!defined('IN_PHPBB')) 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 cf81dc42c6..a28b9df541 100644 --- a/phpBB/phpbb/request/request.php +++ b/phpBB/phpbb/request/request.php @@ -184,7 +184,7 @@ class request implements 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 @@ class request implements 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 untrimmed_variable($var_name, $default, $multibyte = false, $super_global = request_interface::REQUEST) @@ -401,7 +401,7 @@ class request implements request_interface * 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 9ebd4c25e3..add58736ea 100644 --- a/phpBB/phpbb/request/request_interface.php +++ b/phpBB/phpbb/request/request_interface.php @@ -59,7 +59,7 @@ interface 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 @@ interface 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 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 080/276] [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 d2e3979216..38b9cb40dc 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,104 +19,6 @@ if (!defined('IN_PHPBB')) 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 aee7a569d4..0000000000 --- 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 a50240aae3..e618d7c2e6 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -97,7 +97,7 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case // 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 081/276] [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 38b9cb40dc..1efc8c9c2e 100644 --- a/phpBB/includes/functions_compatibility.php +++ b/phpBB/includes/functions_compatibility.php @@ -19,21 +19,6 @@ if (!defined('IN_PHPBB')) 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 441e3ff7f6..0000000000 --- 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 082/276] [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 d0ced55823..b98fe1e6b3 100644 --- a/phpBB/includes/bbcode.php +++ b/phpBB/includes/bbcode.php @@ -651,38 +651,4 @@ class bbcode 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 083/276] [ticket/15403] Refactor get_context PHPBB-15403 --- phpBB/includes/functions_content.php | 122 +++++++++++-------- tests/functions_content/get_context_test.php | 6 +- 2 files changed, 73 insertions(+), 55 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 94de0b7849..148421880f 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) + // 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; + + // Check if we can merge this fragment into the previous fragment + $last_element = array_pop($fragments); + if ($last_element !== null) { - // Check if the next word can be inside the current fragment of text - if ($end + $characters_per_word + utf8_strlen($word) < $indize) + [$prev_start, $prev_end] = $last_element; + + if ($prev_end + $characters_per_word >= $index + $word_length) { - $fragment = utf8_substr($text, $start, $end-$start); - - if ($start != 0) - { - $fragment = '... ' . $fragment; - } - - $fragments[] = $fragment; - - $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; + $start = $prev_start; + $end = $prev_end + $characters_per_word; + } + else + { + $fragments[] = $last_element; } - - $end += $characters_per_word; - - // End fragment at the end of a word - $substring = utf8_substr($text, $start, $end - $start); - $end = $start + utf8_strrpos($substring, ' '); } - $fragment = utf8_substr($text, $start, $end-$start); - if ($start != 0) - { - $fragment = '... ' . $fragment; - } - if ($end < $text_length) - { - $fragment .= ' ...'; - } - - // Get the last fragment - $fragments[] = $fragment; - - return htmlentities(implode('', $fragments)); + $fragments[] = [$start, $end]; + } + } + else + { + // There is no coincidences, so we just create a fragment with the first $length characters + $fragments[] = [0, $length]; + $end = $length; } - return htmlentities($text_length >= $length + 3 ? utf8_substr($text, 0, $length) . ' ...' : $text); + $output = []; + foreach ($fragments as [$start, $end]) + { + $fragment = utf8_substr($text, $start, $end - $start + 1); + + $offset = $start; + + // 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 + } + + $output[] = utf8_substr($text, $start, $end - $start + 1); + } + + 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 b5d5b2ef73..4da1be8ed1 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -39,7 +39,7 @@ class phpbb_functions_content_get_context_test extends TestCase '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 @@ class phpbb_functions_content_get_context_test extends TestCase '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 084/276] [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 5b7c558365..53ea967fac 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -480,7 +480,7 @@ class p_master */ function set_active($id = false, $mode = false) { - global $request; + global $auth, $request, $user; $icat = false; $this->active_module = false; @@ -502,6 +502,14 @@ class p_master $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 0000000000..d83d303f5d --- /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 085/276] [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 148421880f..0ef52b1b81 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 086/276] [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 d83d303f5d..a8c64422f3 100644 --- a/tests/functional/switch_permissions_test.php +++ b/tests/functional/switch_permissions_test.php @@ -42,7 +42,7 @@ class phpbb_functional_switch_permissions_test extends phpbb_functional_test_cas // 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 @@ class phpbb_functional_switch_permissions_test extends phpbb_functional_test_cas $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 087/276] [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 0ef52b1b81..6a360fc4a2 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 4da1be8ed1..cce72c6652 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -89,6 +89,24 @@ class phpbb_functions_content_get_context_test extends TestCase '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 @@ class phpbb_functions_content_get_context_test extends TestCase { $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 088/276] [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 cce72c6652..59f6cdf846 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -107,6 +107,12 @@ class phpbb_functions_content_get_context_test extends TestCase '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 089/276] [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 861fa4ac75..f6ca5fa5e7 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 06bd7c3a58..51bdcb9497 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 3a034bc7ab..389b31bb8c 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 0000000000..869227abea --- /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 090/276] [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 817ea72111..998cfb57ab 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -154,68 +154,11 @@ switch ($mode) 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 091/276] [ticket/15043] Rewrite get_context() PHPBB3-15043 --- phpBB/includes/functions_content.php | 145 ++++++++++----------------- phpBB/includes/utf/utf_tools.php | 16 +++ 2 files changed, 69 insertions(+), 92 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 941b2eb246..c400c52891 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; + // Size of the fragment of text per word + $characters_per_word = (int) ($length / $wordnum); - // cycle through every character in the original text - for ($i = $word_indizes[$word], $n = utf8_strlen($text); $i < $n; $i++) + // 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; - } - - // stop context generation and wait for the next word - if ($j > $sequence_length) - { - $j = 0; - } - } - } + // End fragment at the end of a word + $substring = utf8_substr($text, $start, $end-$start); + $end = $start+utf8_strrpos($substring, ' '); } - return str_replace($characters, $entities, $final_text); - } + + $fragment = utf8_substr($text, $start, $end-$start); + if ($start != 0) + { + $fragment = '... ' . $fragment; + } + if ($end < $text_length) + { + $fragment .= ' ...'; + } + + // Get the last fragment + $fragments[] = $fragment; + + $output = htmlentities(implode($fragments, '')); } - if (!count($words) || !count($word_indizes)) - { - return str_replace($characters, $entities, ((utf8_strlen($text) >= $length + 3) ? utf8_substr($text, 0, $length) . '...' : $text)); - } - - return ''; + return $output; } /** diff --git a/phpBB/includes/utf/utf_tools.php b/phpBB/includes/utf/utf_tools.php index b8c35a5048..ed86829b97 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 092/276] [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 c3f3f6f7dd..1b2087adc0 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -165,7 +165,7 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case 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 093/276] [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 c400c52891..e99d0a4800 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 094/276] [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 e99d0a4800..a207fc28e9 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 095/276] [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 a207fc28e9..25144f5af3 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 096/276] [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 0000000000..b5d5b2ef73 --- /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 097/276] [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 25144f5af3..530b26ae75 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 098/276] [ticket/15403] Refactor get_context PHPBB-15403 --- phpBB/includes/functions_content.php | 122 +++++++++++-------- tests/functions_content/get_context_test.php | 6 +- 2 files changed, 73 insertions(+), 55 deletions(-) diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 530b26ae75..2687a31bce 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) + // 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; + + // Check if we can merge this fragment into the previous fragment + $last_element = array_pop($fragments); + if ($last_element !== null) { - // Check if the next word can be inside the current fragment of text - if ($end + $characters_per_word + utf8_strlen($word) < $indize) + [$prev_start, $prev_end] = $last_element; + + if ($prev_end + $characters_per_word >= $index + $word_length) { - $fragment = utf8_substr($text, $start, $end-$start); - - if ($start != 0) - { - $fragment = '... ' . $fragment; - } - - $fragments[] = $fragment; - - $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; + $start = $prev_start; + $end = $prev_end + $characters_per_word; + } + else + { + $fragments[] = $last_element; } - - $end += $characters_per_word; - - // End fragment at the end of a word - $substring = utf8_substr($text, $start, $end - $start); - $end = $start + utf8_strrpos($substring, ' '); } - $fragment = utf8_substr($text, $start, $end-$start); - if ($start != 0) - { - $fragment = '... ' . $fragment; - } - if ($end < $text_length) - { - $fragment .= ' ...'; - } - - // Get the last fragment - $fragments[] = $fragment; - - return htmlentities(implode('', $fragments)); + $fragments[] = [$start, $end]; + } + } + else + { + // There is no coincidences, so we just create a fragment with the first $length characters + $fragments[] = [0, $length]; + $end = $length; } - return htmlentities($text_length >= $length + 3 ? utf8_substr($text, 0, $length) . ' ...' : $text); + $output = []; + foreach ($fragments as [$start, $end]) + { + $fragment = utf8_substr($text, $start, $end - $start + 1); + + $offset = $start; + + // 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 + } + + $output[] = utf8_substr($text, $start, $end - $start + 1); + } + + 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 b5d5b2ef73..4da1be8ed1 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -39,7 +39,7 @@ class phpbb_functions_content_get_context_test extends TestCase '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 @@ class phpbb_functions_content_get_context_test extends TestCase '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 099/276] [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 2687a31bce..4a8420d0a3 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 100/276] [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 4a8420d0a3..bb2ac3e8a7 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 4da1be8ed1..cce72c6652 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -89,6 +89,24 @@ class phpbb_functions_content_get_context_test extends TestCase '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 @@ class phpbb_functions_content_get_context_test extends TestCase { $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 101/276] [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 cce72c6652..59f6cdf846 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -107,6 +107,12 @@ class phpbb_functions_content_get_context_test extends TestCase '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 102/276] [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 9d4f28689c..0a04cde181 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 103/276] [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 bb2ac3e8a7..2950fe762a 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 104/276] [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 6a360fc4a2..2e52863ef0 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 105/276] [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 2220d5cbaa..7bfbe5163f 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -110,6 +110,7 @@ class acp_bbcodes ); $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 3bff6b9185..f252864eb6 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -88,6 +88,20 @@ $lang = array_merge($lang, array( '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 106/276] [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 cdccd2a358..bc211b4ed5 100644 --- a/tests/auth/provider_apache_test.php +++ b/tests/auth/provider_apache_test.php @@ -33,7 +33,7 @@ class phpbb_auth_provider_apache_test extends phpbb_database_test_case $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 11c99435f8..5bed8d405d 100644 --- a/tests/config/db_test.php +++ b/tests/config/db_test.php @@ -136,7 +136,7 @@ class phpbb_config_db_test extends phpbb_database_test_case 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 45e0386195..0cd52b7d8b 100644 --- a/tests/controller/common_helper_route.php +++ b/tests/controller/common_helper_route.php @@ -111,7 +111,7 @@ abstract class phpbb_controller_common_helper_route extends phpbb_database_test_ $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 50f2119e7f..0d8d8e6810 100644 --- a/tests/search/native_test.php +++ b/tests/search/native_test.php @@ -36,7 +36,7 @@ class phpbb_search_native_test extends phpbb_search_test_case $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 3c99a70200..203d142cb7 100644 --- a/tests/security/hash_test.php +++ b/tests/security/hash_test.php @@ -40,7 +40,7 @@ class phpbb_security_hash_test extends phpbb_test_case 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 @@ class phpbb_security_hash_test extends phpbb_test_case 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 107/276] [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 0000000000..9bd31a7bf5 --- /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 0000000000..83d2e59c0c --- /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 de5a8c79e6..715f04e1a2 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 4980cd89f2..eb16158cc3 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 a6ad36d22a..d4b7dabefe 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 108/276] [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 94e542d2ae..4adb9ecf10 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 43269679bf..d528ef9b2b 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -512,10 +512,11 @@ $lang = array_merge($lang, array( ), '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 27981581ff..5b953362fe 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications_options.html +++ b/phpBB/styles/prosilver/template/ucp_notifications_options.html @@ -10,7 +10,7 @@

      {{ 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 109/276] [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 15e54956fb..cac2f10291 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -103,7 +103,7 @@ class webpush { 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 @@ class webpush // 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 @@ class webpush } } - throw new http_exception(Response::HTTP_FORBIDDEN, 'Forbidden'); + throw new http_exception(Response::HTTP_FORBIDDEN, 'NO_AUTH_OPERATION'); } /** @@ -251,7 +251,7 @@ class webpush } // 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 110/276] [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 ef6da4ab91..8269f27fa6 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -69,7 +69,6 @@ {% endif %} {% endif %} -
    1. {% EVENT navbar_header_quick_links_after %} diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css index b67011e806..66fff05404 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 111/276] [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 503f6a0f48..bf121f64be 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 112/276] [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 f85c24af09..0244dce66c 100644 --- a/phpBB/includes/acp/acp_logs.php +++ b/phpBB/includes/acp/acp_logs.php @@ -51,7 +51,7 @@ class acp_logs $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 113/276] [ticket/12479] Convert file_downloader to use guzzle instead of fsockopen PHPBB-12479 --- phpBB/phpbb/file_downloader.php | 146 ++++++++------ tests/version/version_helper_remote_test.php | 188 ++++++++++++++++++- 2 files changed, 270 insertions(+), 64 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index 873bccc9e8..bf466c94bc 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"); + $response = $client->request('GET', "$directory/$filename"); - $timer_stop = time() + $timeout; - stream_set_timeout($socket, $timeout); - - $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'); - } - } - @fclose($socket); - } - else - { - if ($this->error_string) - { - $this->error_string = utf8_convert_message($this->error_string); - return false; + return $response->getBody()->getContents(); } else { - throw new \phpbb\exception\runtime_exception('FSOCK_DISABLED'); + $this->error_number = $response->getStatusCode(); + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); } } + catch (RequestException $exception) + { + if ($exception->hasResponse()) + { + $this->error_number = $exception->getResponse()->getStatusCode(); - return $file_info; + if ($this->error_number == self::NOT_FOUND) + { + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); + } + } + else + { + $this->error_number = self::REQUEST_TIMEOUT; + throw new runtime_exception('FSOCK_TIMEOUT'); + } + + $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 @@ class file_downloader * * @return string Error string */ - public function get_error_string() + public function get_error_string(): string { return $this->error_string; } @@ -115,7 +141,7 @@ class file_downloader * * @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 02a811b539..be92a3f977 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 @@ class version_helper_remote_test extends \phpbb_test_case */ 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 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case $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 114/276] [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 be92a3f977..e38f4d7b2c 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -277,15 +277,6 @@ class version_helper_remote_test extends \phpbb_test_case $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 115/276] [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 bf466c94bc..b01f4c7043 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 116/276] [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 e38f4d7b2c..85acfb8fe4 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -257,11 +257,11 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case ->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 117/276] [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 0000000000..f138ad0c83 --- /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 118/276] [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 4b5a58a30f..249595cee4 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 119/276] [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 67a6d0ca6d..2451c10164 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 120/276] [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 aa4841316f..bb544531c1 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -964,8 +964,8 @@ class session } /** - * 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 @@ class session 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 121/276] [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 bb544531c1..de68cb6b66 100644 --- a/phpBB/phpbb/session.php +++ b/phpBB/phpbb/session.php @@ -819,7 +819,7 @@ class session // 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 122/276] [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 c1a7b274b9..8dbe2f5f21 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 e7059af80d..5576aeb0b0 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // 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 07b13ddda0..95802ddf17 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') 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 674b35a17e..714ce05d06 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 123/276] [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 7f9449609e..7a02946f77 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $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 3f6f8a35d6..0b16bfde55 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 124/276] [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 0000000000..4481a53821 --- /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 125/276] [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 e866175bf7..0171d646da 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 126/276] [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 8b20e374b1..67aad9177e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
      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 @@
          +

          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 127/276] [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 e5c9be0517..9334a633d4 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -112,6 +112,7 @@ $lang = array_merge($lang, array( '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 2780d869d2..bc681ec46b 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 128/276] [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 8dbe2f5f21..aa23d9b021 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 5576aeb0b0..9e2924d96c 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // 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 714ce05d06..9da79e77be 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 129/276] [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 c7da3df4fa..893c4c4a28 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 130/276] [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 bc681ec46b..087acce075 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 131/276] [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 d457b13cb4..959388e075 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -260,8 +260,6 @@ class acp_board '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 337b6ccab8..9b381d22f8 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -1179,8 +1179,6 @@ class parse_message extends bbcode_firstpass // 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 8ab18ad8c8..4ada12f15b 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -406,8 +406,6 @@ class phpbb_questionnaire_phpbb_data_provider '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 40240213d3..8760acd684 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 def1b01c60..8401f24e0a 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -208,10 +208,6 @@ $lang = array_merge($lang, array( '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 0000000000..8a5338a454 --- /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 ad611fb5b4..1430bfd5d3 100644 --- a/phpBB/phpbb/textformatter/parser_interface.php +++ b/phpBB/phpbb/textformatter/parser_interface.php @@ -91,8 +91,6 @@ interface parser_interface * 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 7195f95915..79521b753b 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -355,8 +355,6 @@ class factory implements \phpbb\textformatter\cache_interface // 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 0f74eacbe6..93c0bd6652 100644 --- a/tests/text_processing/message_parser_test.php +++ b/tests/text_processing/message_parser_test.php @@ -40,8 +40,6 @@ class phpbb_text_processing_message_parser_test extends phpbb_test_case $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 132/276] [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 f100d9bdff..2099dd7661 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 133/276] [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 e5f96b0c22..c0c5aacd74 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 f560dbfbcb..3304194cf4 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -174,7 +174,7 @@ define('BBCODE_UID_LEN', 8); // 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 096dbbe8fa..ee98cb57ce 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 134/276] [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 6b165da0f8..aebd093865 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -158,7 +158,7 @@ $lang = array_merge($lang, array( '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 135/276] [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 136/276] [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 c0f313f540..2578c967ab 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 137/276] [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 f25ce82b8f..52ac89957c 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1428,7 +1428,7 @@ class smtp_class 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 138/276] [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 52ac89957c..6781ec4e0f 100644 --- a/phpBB/includes/functions_messenger.php +++ b/phpBB/includes/functions_messenger.php @@ -1418,12 +1418,8 @@ class smtp_class 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 @@ class smtp_class } } } + 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 139/276] [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 726f6671ae..cd71fcaf28 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -35,6 +35,8 @@ class phpbb_test_case extends TestCase '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 @@ class phpbb_test_case extends TestCase 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 140/276] [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 8dbe2f5f21..0f8630d2aa 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 5576aeb0b0..dfe4d2a43c 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // 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 95802ddf17..f22a878add 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') 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 714ce05d06..cb757e4811 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 141/276] [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 0000000000..a133213c81 --- /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 142/276] [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 67aad9177e..39d7897d5e 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
            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 @@
                +

                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 143/276] [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 cd71fcaf28..726f6671ae 100644 --- a/tests/test_framework/phpbb_test_case.php +++ b/tests/test_framework/phpbb_test_case.php @@ -35,8 +35,6 @@ class phpbb_test_case extends TestCase '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 @@ class phpbb_test_case extends TestCase 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 144/276] [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 466be97d4c..3bb279c25f 100644 --- a/tests/test_framework/phpbb_test_case_helpers.php +++ b/tests/test_framework/phpbb_test_case_helpers.php @@ -104,7 +104,7 @@ class phpbb_test_case_helpers } } - public function setExpectedTriggerError($errno, $message = '') + public function setExpectedTriggerError($errno, $message = ''): void { set_error_handler( static function ($errno, $errstr) @@ -112,7 +112,7 @@ class phpbb_test_case_helpers 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 145/276] [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 208b2aff75..4a8ccb4a66 100644 --- a/phpBB/phpbb/auth/auth.php +++ b/phpBB/phpbb/auth/auth.php @@ -776,7 +776,7 @@ class auth $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 146/276] [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 92980dbfd7..fbcfa1ab24 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -149,4 +149,26 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case $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 147/276] [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 2e52863ef0..3dded3c6e9 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 148/276] [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 fbcfa1ab24..39ecbf99e2 100644 --- a/tests/functional/acp_permissions_test.php +++ b/tests/functional/acp_permissions_test.php @@ -162,12 +162,12 @@ class phpbb_functional_acp_permissions_test extends phpbb_functional_test_case $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 149/276] [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 3dded3c6e9..a2038d12a6 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 59f6cdf846..be8618dd8a 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -81,13 +81,13 @@ class phpbb_functions_content_get_context_test extends TestCase '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 150/276] [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 a2038d12a6..d24f938238 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 151/276] [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 d24f938238..cdbc4aee09 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 be8618dd8a..d4d087d675 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -112,6 +112,12 @@ class phpbb_functions_content_get_context_test extends TestCase '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 152/276] [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 b184fb901a..d16e8c7415 100644 --- a/phpBB/includes/mcp/mcp_queue.php +++ b/phpBB/includes/mcp/mcp_queue.php @@ -284,6 +284,7 @@ class mcp_queue $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 153/276] [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 cdbc4aee09..9034f785ff 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 d4d087d675..93136d69fb 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -117,7 +117,7 @@ class phpbb_functions_content_get_context_test extends TestCase '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 154/276] [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 9034f785ff..d50a515c87 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 93136d69fb..f2865f31ee 100644 --- a/tests/functions_content/get_context_test.php +++ b/tests/functions_content/get_context_test.php @@ -113,6 +113,107 @@ class phpbb_functions_content_get_context_test extends TestCase '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 @@ class phpbb_functions_content_get_context_test extends TestCase /** * @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 155/276] [ticket/12479] Convert file_downloader to use guzzle instead of fsockopen PHPBB-12479 --- phpBB/phpbb/file_downloader.php | 144 ++++++----- tests/version/version_helper_remote_test.php | 247 ++++++++++++++++++- 2 files changed, 329 insertions(+), 62 deletions(-) diff --git a/phpBB/phpbb/file_downloader.php b/phpBB/phpbb/file_downloader.php index f55b825d2d..b165198399 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"); + $response = $client->request('GET', "$directory/$filename"); - $timer_stop = time() + $timeout; - stream_set_timeout($socket, $timeout); - - $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'); - } - } - @fclose($socket); - } - else - { - if ($this->error_string) - { - $this->error_string = utf8_convert_message($this->error_string); - return false; + return $response->getBody()->getContents(); } else { - throw new \phpbb\exception\runtime_exception('FSOCK_DISABLED'); + $this->error_number = $response->getStatusCode(); + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); } } + catch (RequestException $exception) + { + if ($exception->hasResponse()) + { + $this->error_number = $exception->getResponse()->getStatusCode(); - return $file_info; + if ($this->error_number == self::NOT_FOUND) + { + throw new runtime_exception('FILE_NOT_FOUND', [$filename]); + } + } + else + { + $this->error_number = self::REQUEST_TIMEOUT; + throw new runtime_exception('FSOCK_TIMEOUT'); + } + + $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 @@ class file_downloader * * @return string Error string */ - public function get_error_string() + public function get_error_string(): string { return $this->error_string; } @@ -115,7 +141,7 @@ class file_downloader * * @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 762493986a..ce2d110fdc 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 @@ class version_helper_remote_test extends \phpbb_test_case */ 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 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case $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 156/276] [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 ce2d110fdc..1687abed7f 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -276,15 +276,6 @@ class version_helper_remote_test extends \phpbb_test_case $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 157/276] [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 b165198399..e10bef1e03 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 158/276] [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 1687abed7f..be9f003744 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -256,11 +256,11 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case ->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 159/276] [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 0000000000..f138ad0c83 --- /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 160/276] [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 be9f003744..52909438f4 100644 --- a/tests/version/version_helper_remote_test.php +++ b/tests/version/version_helper_remote_test.php @@ -46,12 +46,11 @@ class version_helper_remote_test extends \phpbb_test_case $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 @@ class version_helper_remote_test extends \phpbb_test_case )); $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 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -325,7 +324,7 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -351,7 +350,7 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -379,7 +378,7 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -406,7 +405,7 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case )); $file_downloader = $this->getMockBuilder(\phpbb\file_downloader::class) - ->onlyMethods(['create_client']) + ->setMethods(['create_client']) ->getMock(); $file_downloader->method('create_client') @@ -433,7 +432,7 @@ class version_helper_remote_test extends \phpbb_test_case 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 @@ class version_helper_remote_test extends \phpbb_test_case )); $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 161/276] [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 893c4c4a28..9b55e69771 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 162/276] [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 9b55e69771..6e9b83993a 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 163/276] [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 6e9b83993a..36cc997d8b 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 164/276] [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 0000000000..aa05026235 --- /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 165/276] [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 0000000000..045436ef94 --- /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 36cc997d8b..893c4c4a28 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 166/276] [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 045436ef94..810cb8021f 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 167/276] [ticket/17396] Only try pushing if merge was successful PHPBB-17396 --- .github/workflows/merge_3.3.x_to_master.yml | 11 +++++++++-- 1 file changed, 9 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 aa05026235..2863fa8c1e 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 + 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 + - 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 168/276] [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 2863fa8c1e..4aec43cded 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 169/276] [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 893c4c4a28..32d8477671 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 170/276] [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 0b010c8e06..3795b00a7e 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 171/276] [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 b1cbe80f4d..84fb92a30e 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,6 +75,7 @@ $lang = array_merge($lang, array( '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 f285977ea2..06511f63b9 100644 --- a/phpBB/phpbb/console/command/reparser/reparse.php +++ b/phpBB/phpbb/console/command/reparser/reparse.php @@ -92,6 +92,12 @@ class reparse extends \phpbb\console\command\command 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 @@ class reparse extends \phpbb\console\command\command // 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 82a59a075d..ebff0bba74 100644 --- a/phpBB/phpbb/textreparser/base.php +++ b/phpBB/phpbb/textreparser/base.php @@ -216,11 +216,11 @@ abstract class base implements reparser_interface /** * {@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 @@ abstract class base implements reparser_interface * 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 @@ abstract class base implements reparser_interface $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 912de10058..99e1c26778 100644 --- a/phpBB/phpbb/textreparser/reparser_interface.php +++ b/phpBB/phpbb/textreparser/reparser_interface.php @@ -41,6 +41,7 @@ interface reparser_interface * * @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 172/276] [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 e10bef1e03..14607ece0c 100644 --- a/phpBB/phpbb/file_downloader.php +++ b/phpBB/phpbb/file_downloader.php @@ -60,7 +60,7 @@ class file_downloader * @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 173/276] [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 810cb8021f..cdae703bd5 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 174/276] [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 0a04cde181..2d75027ff0 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 a8651e11a9..a3c2669f69 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 175/276] [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 d21a035c1f..97fb758d55 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 176/276] [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 af3fb91de7..228d62047f 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 177/276] [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 389b31bb8c..0627fdc8b3 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 178/276] [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 4aec43cded..9aea009c3a 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 179/276] [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 84fb92a30e..80766efe32 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,7 +75,7 @@ $lang = array_merge($lang, array( '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 180/276] [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 aebd093865..c8a0e7e186 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -158,7 +158,7 @@ $lang = array_merge($lang, array( '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 181/276] [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 4930250ba2..046c342f25 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 700503f97d..e3b39bfe70 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -140,13 +140,7 @@ class webpush extends messenger_base implements extended_method_interface { $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 cac2f10291..56a6cc61f6 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -19,6 +19,8 @@ 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\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 @@ class webpush $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 @@ class webpush $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 182/276] [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 046c342f25..acd78f8440 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 56a6cc61f6..27bd1dc049 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -25,6 +25,7 @@ use phpbb\path_helper; 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 @@ class webpush $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 @@ class webpush // 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 183/276] [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 e3b39bfe70..9d19cb2200 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -140,7 +140,10 @@ class webpush extends messenger_base implements extended_method_interface { $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 @@ class webpush extends messenger_base implements extended_method_interface 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 27bd1dc049..313965db63 100644 --- a/phpBB/phpbb/ucp/controller/webpush.php +++ b/phpBB/phpbb/ucp/controller/webpush.php @@ -220,6 +220,13 @@ class webpush 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 @@ class webpush */ 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 @@ class webpush 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 184/276] [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 7b1dc706db..c2f524095f 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -396,7 +396,7 @@ class acp_groups $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 @@ class acp_groups '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 185/276] [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 20f1271011..34cb16b99a 100644 --- a/tests/functional/acp_groups_test.php +++ b/tests/functional/acp_groups_test.php @@ -123,4 +123,20 @@ class phpbb_functional_acp_groups_test extends phpbb_functional_common_groups_te $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 186/276] [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 cdae703bd5..96e0172b8f 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 187/276] [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 96e0172b8f..45288a072a 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 188/276] [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 80766efe32..8b3826da68 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,7 +75,7 @@ $lang = array_merge($lang, array( '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 189/276] [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 0627fdc8b3..40cf689a9f 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 190/276] [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 a11b76b863..cfe685f88b 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 bd3f0852e6..5b9a9da536 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 @@ class add_config_settings extends database_task $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 ba178135b9..7cc5fd4f49 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 @@ class update_user_and_post_data extends database_task . ' 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 @@ class update_user_and_post_data extends database_task '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 0560f2d46d..1175ab8626 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 @@ class obtain_admin_data extends \phpbb\install\task_base implements \phpbb\insta $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 @@ class obtain_admin_data extends \phpbb\install\task_base implements \phpbb\insta $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 191/276] [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 7f5cdd34da..300d57d0c7 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -47,27 +47,45 @@ if (!$forum_id) 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 192/276] [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 40cf689a9f..0627fdc8b3 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 bcfb738144..5954ec163a 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -223,13 +223,13 @@ class path_helper * * 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 8d010c2f06..16c6719288 100644 --- a/tests/path_helper/path_helper_test.php +++ b/tests/path_helper/path_helper_test.php @@ -470,9 +470,6 @@ class phpbb_path_helper_test extends phpbb_test_case ->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 @@ class phpbb_path_helper_test extends phpbb_test_case ->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 193/276] [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 53ea967fac..573c4146d1 100644 --- a/phpBB/includes/functions_module.php +++ b/phpBB/includes/functions_module.php @@ -502,8 +502,8 @@ class p_master $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 a8c64422f3..b7e8819a6e 100644 --- a/tests/functional/switch_permissions_test.php +++ b/tests/functional/switch_permissions_test.php @@ -28,7 +28,7 @@ class phpbb_functional_switch_permissions_test extends phpbb_functional_test_cas $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 @@ class phpbb_functional_switch_permissions_test extends phpbb_functional_test_cas $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 194/276] [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 20127204b3..97b04c2fb7 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -283,7 +283,7 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case ), 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 195/276] [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 8b3826da68..e872df60b2 100644 --- a/phpBB/language/en/cli.php +++ b/phpBB/language/en/cli.php @@ -75,7 +75,7 @@ $lang = array_merge($lang, array( '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 196/276] [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 a81c42e6f0..642bee9c39 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -90,8 +90,21 @@ switch ($search_id) 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 197/276] [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 0000000000..f40745db21 --- /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 0000000000..fb8c6ed090 --- /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 0000000000..75cdf52270 --- /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 198/276] [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 0000000000..90ff01995b --- /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 f40745db21..51c8d3d23d 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 @@ interface plugin_interface * * @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 1388f33012..130949e708 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 199/276] [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 3304194cf4..0ef409767d 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -152,9 +152,13 @@ define('FULL_FOLDER_DELETE', -2); 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 200/276] [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 40b14a9b54..8ad37047cb 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -235,8 +235,10 @@ class ucp_register // 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 @@ class ucp_register } // 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 2e75ce8667..971a7b2118 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 @@ class factory * 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 90ff01995b..bceb771800 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 @@ class legacy_wrapper implements plugin_interface * @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 51c8d3d23d..9d0b0cb4de 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -15,16 +15,17 @@ namespace phpbb\captcha\plugins; 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 @@ interface plugin_interface * @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 63ca4fef97..988b7f03e2 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -455,8 +455,10 @@ if (!$is_authed || !empty($error)) 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 @@ if ($submit || $preview || $refresh) ); 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 201/276] [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 b9bfac33f1..106cedb7c2 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -336,56 +336,6 @@ class qa */ 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 0000000000..69cca2dc15 --- /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 202/276] [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 971a7b2118..d9259d8da9 100644 --- a/phpBB/phpbb/captcha/factory.php +++ b/phpBB/phpbb/captcha/factory.php @@ -54,7 +54,7 @@ class factory 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 203/276] [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 ff9f515d32..69e13463ab 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -128,11 +128,9 @@ class acp_captcha 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 012e28c987..fb8ccc5a70 100644 --- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php +++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php @@ -184,11 +184,6 @@ abstract class captcha_abstract $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 bceb771800..e57abbb967 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -25,8 +25,7 @@ class legacy_wrapper implements plugin_interface } /** - * 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 @@ class legacy_wrapper implements plugin_interface } /** - * 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 @@ class legacy_wrapper implements plugin_interface } /** - * Get the name of the plugin, should be language variable - * - * @return string + * {@inheritDoc} */ public function get_name(): string { @@ -69,10 +64,7 @@ class legacy_wrapper implements plugin_interface } /** - * 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 @@ class legacy_wrapper implements plugin_interface // 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 9d0b0cb4de..41e825fad3 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -80,4 +80,21 @@ interface plugin_interface * @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 106cedb7c2..ffc67a7706 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -331,13 +331,6 @@ class qa $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 @@ class qa $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 ef30baaa9b..a5dcf4efc6 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha.php @@ -184,11 +184,6 @@ class recaptcha extends captcha_abstract $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 204/276] [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 fb8ccc5a70..c6978a1bf1 100644 --- a/phpBB/phpbb/captcha/plugins/captcha_abstract.php +++ b/phpBB/phpbb/captcha/plugins/captcha_abstract.php @@ -179,11 +179,6 @@ abstract class captcha_abstract $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 ffc67a7706..3e48df00b2 100644 --- a/phpBB/phpbb/captcha/plugins/qa.php +++ b/phpBB/phpbb/captcha/plugins/qa.php @@ -323,14 +323,6 @@ class qa $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 a5dcf4efc6..1c080ba67b 100644 --- a/phpBB/phpbb/captcha/plugins/recaptcha.php +++ b/phpBB/phpbb/captcha/plugins/recaptcha.php @@ -179,11 +179,6 @@ class recaptcha extends captcha_abstract 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 205/276] [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 e57abbb967..5f2c701e07 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -74,6 +74,19 @@ class legacy_wrapper implements plugin_interface } } + /** + * {@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 41e825fad3..9286c4867e 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -52,6 +52,13 @@ interface plugin_interface */ 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 206/276] [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 5a3d9420db..b146aacfb9 100644 --- a/phpBB/phpbb/template/twig/extension/forms.php +++ b/phpBB/phpbb/template/twig/extension/forms.php @@ -183,6 +183,7 @@ class forms extends AbstractExtension '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 827ccb1121..1ada063e57 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 207/276] [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 4353becd2f..880adcbe97 100644 --- a/phpBB/adm/style/acp_captcha.html +++ b/phpBB/adm/style/acp_captcha.html @@ -8,12 +8,12 @@

                  {L_ACP_VC_EXT_GET_MORE}

                  - +{% if ERRORS %}
                  -

                  {L_WARNING}

                  -

                  {ERROR_MSG}

                  +

                  {{ lang('WARNING') }}

                  +

                  {{ ERRORS|join('
                  ') }}

                  - +{% endif %}
                  @@ -47,10 +47,10 @@
                  {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 69e13463ab..e03d2a3901 100644 --- a/phpBB/includes/acp/acp_captcha.php +++ b/phpBB/includes/acp/acp_captcha.php @@ -95,7 +95,7 @@ class acp_captcha 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 @@ class acp_captcha { $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 @@ class acp_captcha } 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 @@ class acp_captcha $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 208/276] [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 880adcbe97..0c9d3bf0af 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 @@
                  {% 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 209/276] [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 26598c7c2b..1118a1f32e 100644 --- a/phpBB/adm/style/captcha_qa_acp.html +++ b/phpBB/adm/style/captcha_qa_acp.html @@ -18,11 +18,13 @@ {L_QUESTIONS} + {% if questions %} {L_QUESTION_TEXT} {L_QUESTION_LANG} {L_ACTION} + {% endif %} @@ -33,6 +35,10 @@ {{ 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 637c4e035e..b883166159 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -61,4 +61,5 @@ $lang = array_merge($lang, array( '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 210/276] [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 5f2c701e07..9ce4973827 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -145,6 +145,19 @@ class legacy_wrapper implements plugin_interface 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 9286c4867e..0f668f207e 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -89,7 +89,14 @@ interface plugin_interface 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 211/276] [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 8ad37047cb..3a53148b93 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -293,7 +293,7 @@ class ucp_register 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 ae9d968076..395a48a9a5 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -177,7 +177,7 @@ class db extends base 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 9ce4973827..cc35920c70 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -90,11 +90,11 @@ class legacy_wrapper implements plugin_interface /** * {@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 0f668f207e..dc522ecd7e 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -62,10 +62,9 @@ interface plugin_interface /** * 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 212/276] [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 8e9d829b47..98441f99f8 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 130949e708..3a5e9231eb 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 execute() + public function get_name(): string { - // Perform any necessary initialization or setup + return 'CAPTCHA_TURNSTILE'; } - public function validate() + public function init(int $type): void + { + $this->language->add_lang('captcha_turnstile'); + } + + public function get_hidden_fields(): array + { + $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(): bool { // Implement server-side validation logic here // Example: Validate the submitted CAPTCHA value using Cloudflare API @@ -97,8 +124,39 @@ class turnstile extends captcha_abstract } } - public function get_generator_class() + public function is_solved(): bool { - throw new \Exception('No generator class given.'); + return false; } -} \ No newline at end of file + + 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 + { + // TODO: Implement acp_page() method. + } +} From b55b42d09f3913078c793d78efb9b15eed9aeb67 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sat, 12 Oct 2024 20:36:12 +0200 Subject: [PATCH 213/276] [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 0000000000..5d21532783 --- /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 98441f99f8..b07f842ca8 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 0000000000..c091b440c1 --- /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 cc35920c70..bc317e711a 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -63,6 +63,17 @@ class legacy_wrapper implements plugin_interface 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 dc522ecd7e..f52643544e 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -44,6 +44,13 @@ interface plugin_interface */ 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 3a5e9231eb..2aa4ca3d0c 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 @@ class turnstile implements plugin_interface 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 @@ class turnstile implements plugin_interface 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 @@ class turnstile implements plugin_interface 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 0000000000..06111c9306 --- /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 214/276] [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 0000000000..446a0f436b --- /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 b07f842ca8..09742f2eb8 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 c091b440c1..0b60867dd1 100644 --- a/phpBB/language/en/captcha_turnstile.php +++ b/phpBB/language/en/captcha_turnstile.php @@ -37,5 +37,9 @@ if (empty($lang) || !is_array($lang)) // 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 f52643544e..ee2ba8461d 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -116,5 +116,12 @@ interface plugin_interface */ 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 2aa4ca3d0c..0bb731d147 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -15,23 +15,54 @@ namespace phpbb\captcha\plugins; 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 @@ class turnstile implements plugin_interface // 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 215/276] [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 09742f2eb8..d4f1ad863a 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 0000000000..2b07ccaa64 --- /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 0bb731d147..210ae03610 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 @@ class turnstile implements plugin_interface // 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 216/276] [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 5d21532783..348e96967a 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 217/276] [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 446a0f436b..a187e1e41b 100644 --- a/phpBB/adm/style/captcha_turnstile_acp.html +++ b/phpBB/adm/style/captcha_turnstile_acp.html @@ -23,10 +23,24 @@
                  +
                  +
                  + +
                  {{ 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 348e96967a..757d0a4bcb 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 218/276] [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 3a53148b93..ad2ad79dbe 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -293,10 +293,9 @@ class ucp_register 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 395a48a9a5..6911adfaff 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -176,9 +176,8 @@ class db extends base // 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 b8e2b04583..7d41c1c47f 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 @@ class report 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 @@ class report 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 @@ class report /** * 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 988b7f03e2..fb54f05ff6 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1210,15 +1210,9 @@ if ($submit || $preview || $refresh) 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 219/276] [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 0ef409767d..825a328d39 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -152,13 +152,13 @@ define('FULL_FOLDER_DELETE', -2); 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 ad2ad79dbe..b8d0d78b40 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -238,7 +238,7 @@ class ucp_register /** @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 6911adfaff..5f8ebd6ac3 100644 --- a/phpBB/phpbb/auth/provider/db.php +++ b/phpBB/phpbb/auth/provider/db.php @@ -176,7 +176,7 @@ class db extends base // 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 0000000000..db8bb54bd2 --- /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 bc20b2e703..c6e4e6c6de 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -15,14 +15,6 @@ namespace phpbb\captcha\plugins; 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 @@ interface plugin_interface /** * 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 b3152b2a23..f5bd22602b 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -121,7 +121,7 @@ class turnstile extends base /** * {@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 7d41c1c47f..97dbdbd9bb 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 @@ class report 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 fb54f05ff6..9f8cce0ead 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -458,7 +458,7 @@ if ($config['enable_post_confirm'] && !$user->data['is_registered']) /** @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 220/276] [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 be3b77ade1..a22336b1e5 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 db8bb54bd2..e3e11edf77 100644 --- a/phpBB/phpbb/captcha/plugins/confirm_type.php +++ b/phpBB/phpbb/captcha/plugins/confirm_type.php @@ -17,6 +17,7 @@ namespace phpbb\captcha\plugins; * 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 48b91ef3d2..48575733cc 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 @@ class legacy_wrapper implements plugin_interface /** * {@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 f5bd22602b..1a42c7adbf 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -16,7 +16,6 @@ namespace phpbb\captcha\plugins; 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 @@ class turnstile extends base */ 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 @@ class turnstile extends base $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 @@ class turnstile extends base // 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 f20d53e539..b8c8855502 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 221/276] [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 a22336b1e5..d43fcec31e 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -4,6 +4,7 @@ namespace phpbb\captcha\plugins; 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 @@ abstract class base implements plugin_interface 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 @@ abstract class base implements plugin_interface } } + /** + * {@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 @@ abstract class base implements plugin_interface if ($row) { $this->attempts = $row['attempts']; + $this->code = $row['code']; return true; } @@ -98,22 +148,43 @@ abstract class base implements plugin_interface */ 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 1a42c7adbf..17e4154e8a 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 @@ class turnstile extends base */ 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 @@ class turnstile extends base */ public function init(confirm_type $type): void { + parent::init($type); + $this->language->add_lang('captcha_turnstile'); } @@ -118,10 +120,22 @@ class turnstile extends base */ 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 @@ class turnstile extends base if (isset($result['success']) && $result['success'] === true) { $this->solved = true; + $this->confirm_code = $this->code; return true; } else @@ -162,20 +177,6 @@ class turnstile extends base /** * {@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 @@ class turnstile extends base } $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 @@ class turnstile extends base 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 b8c8855502..aed3f9299c 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 222/276] [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 d43fcec31e..25355bcb53 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -87,6 +87,7 @@ abstract class base implements plugin_interface { 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 17e4154e8a..70c33e6e21 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -189,7 +189,7 @@ class turnstile extends base '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 223/276] [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 70c33e6e21..bf9ada4831 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 @@ class turnstile extends base ]; // Create guzzle client - $client = new Client(); + $client = $this->get_client(); // Check captcha with turnstile API try @@ -174,6 +177,21 @@ class turnstile extends base } } + /** + * 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 0000000000..79e64e1ea0 --- /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 224/276] [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 79e64e1ea0..dd9b1347ed 100644 --- a/tests/captcha/turnstile_test.php +++ b/tests/captcha/turnstile_test.php @@ -15,16 +15,18 @@ use phpbb\captcha\plugins\confirm_type; 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 @@ class phpbb_captcha_turnstile_test extends \phpbb_database_test_case $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 @@ class phpbb_captcha_turnstile_test extends \phpbb_database_test_case $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 225/276] [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 646d2f34d5..a3bae23ab5 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 226/276] [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 d9259d8da9..fc974569bb 100644 --- a/phpBB/phpbb/captcha/factory.php +++ b/phpBB/phpbb/captcha/factory.php @@ -65,7 +65,7 @@ class factory 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 25355bcb53..43d24f7c8d 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -151,6 +151,7 @@ abstract class base implements plugin_interface { $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 @@ abstract class base implements plugin_interface /** * @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 48575733cc..d728a05aba 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -198,11 +198,11 @@ class legacy_wrapper implements plugin_interface /** * {@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 c6e4e6c6de..f9dd9c6402 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -110,10 +110,10 @@ interface plugin_interface /** * 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 d429336104..1c61a7d10c 100644 --- a/tests/captcha/qa_test.php +++ b/tests/captcha/qa_test.php @@ -41,10 +41,6 @@ class phpbb_captcha_qa_test extends \phpbb_database_test_case 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 dd9b1347ed..f78c4d3177 100644 --- a/tests/captcha/turnstile_test.php +++ b/tests/captcha/turnstile_test.php @@ -62,7 +62,7 @@ class phpbb_captcha_turnstile_test extends \phpbb_database_test_case { // 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 @@ class phpbb_captcha_turnstile_test extends \phpbb_database_test_case ); } - 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 @@ class phpbb_captcha_turnstile_test extends \phpbb_database_test_case ]); $this->assertTrue($this->turnstile->is_available()); + + $this->assertEquals(0, $this->turnstile->get_attempt_count()); } - public function test_not_vailable(): void + 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_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 227/276] [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 fb8c6ed090..0000000000 --- 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 75cdf52270..0000000000 --- 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 228/276] [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 43d24f7c8d..1b02d63166 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 d728a05aba..abb26b34ba 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -65,7 +65,7 @@ class legacy_wrapper implements plugin_interface 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 bf9ada4831..edd6832159 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -272,7 +272,7 @@ class turnstile extends base { 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 229/276] [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 642bee9c39..6c908a3451 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -92,7 +92,7 @@ switch ($search_id) $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 230/276] [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 aed3f9299c..1cf4f4c792 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 231/276] [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 abb26b34ba..8f8642b2b2 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -86,7 +86,7 @@ class legacy_wrapper implements plugin_interface { 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 3e48df00b2..6e09aaaf13 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 232/276] [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 8f8642b2b2..cc0609f4b0 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -15,8 +15,10 @@ namespace phpbb\captcha\plugins; 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 @@ class legacy_wrapper implements plugin_interface } } + /** + * {@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 233/276] [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 cc0609f4b0..600683194d 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -64,7 +64,7 @@ class legacy_wrapper implements plugin_interface { 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 0000000000..873012bd6a --- /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 234/276] [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 d4f1ad863a..ea41fefe80 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 1b02d63166..a30e679731 100644 --- a/phpBB/phpbb/captcha/plugins/base.php +++ b/phpBB/phpbb/captcha/plugins/base.php @@ -246,4 +246,11 @@ abstract class base implements plugin_interface } $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 ec3376c0a5..07998a7125 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 @@ class incomplete extends captcha_abstract } /** - * 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 + * {@inheritDoc} */ - public function execute() - { - } - - /** - * 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 + 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 @@ class incomplete extends captcha_abstract } /** - * Validate CAPTCHA - * - * @return false Incomplete CAPTCHA will never validate + * {@inheritDoc} */ public function validate(): bool { @@ -128,12 +110,26 @@ class incomplete extends captcha_abstract } /** - * 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 600683194d..aaabddb48b 100644 --- a/phpBB/phpbb/captcha/plugins/legacy_wrapper.php +++ b/phpBB/phpbb/captcha/plugins/legacy_wrapper.php @@ -211,7 +211,7 @@ class legacy_wrapper implements plugin_interface /** * {@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 f9dd9c6402..41483e45a5 100644 --- a/phpBB/phpbb/captcha/plugins/plugin_interface.php +++ b/phpBB/phpbb/captcha/plugins/plugin_interface.php @@ -122,5 +122,5 @@ interface plugin_interface * @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 edd6832159..afd7a363b2 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -229,7 +229,7 @@ class turnstile extends base /** * {@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 c1da2b6c48..4c5e7c6b27 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 @@ class phpbb_captcha_incomplete_test extends phpbb_test_case $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 @@ class phpbb_captcha_incomplete_test extends phpbb_test_case $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 235/276] [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 d50a515c87..463ee08259 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 236/276] [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 a9ef139e32..96cb8717e8 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -41,6 +41,7 @@ $lang = array_merge($lang, array( '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 @@ $lang = array_merge($lang, array( '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 0f63be5b56..771eb5ef5b 100644 --- a/phpBB/phpbb/help/controller/faq.php +++ b/phpBB/phpbb/help/controller/faq.php @@ -146,6 +146,18 @@ class faq extends controller '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 237/276] [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 96cb8717e8..d5fa8382be 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -187,10 +187,8 @@ $lang = array_merge($lang, array( '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 771eb5ef5b..62a82a3efe 100644 --- a/phpBB/phpbb/help/controller/faq.php +++ b/phpBB/phpbb/help/controller/faq.php @@ -152,7 +152,6 @@ class faq extends controller 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 238/276] [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 d5fa8382be..adfb6e674f 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -185,7 +185,7 @@ $lang = array_merge($lang, array( '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 239/276] [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 c85bc1db0a..773b31897d 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 9e2924d96c..a0cc587663 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // 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 f22a878add..56bee134ba 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') 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 9da79e77be..7192d630c7 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 240/276] [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 7a02946f77..014dc0e370 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -38,7 +38,7 @@ $dbms = $phpbb_config_php_file->convert_30_dbms_to_31($dbms); $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 0b16bfde55..1dfc8230b7 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 241/276] [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 0000000000..1632a65dda --- /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 242/276] [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 39d7897d5e..638bdbdf1c 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
                  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 @@
                      +

                      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 243/276] [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 adfb6e674f..666c0ad0b7 100644 --- a/phpBB/language/en/help/faq.php +++ b/phpBB/language/en/help/faq.php @@ -187,7 +187,7 @@ $lang = array_merge($lang, array( '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 244/276] [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 afd7a363b2..9a235edc3b 100644 --- a/phpBB/phpbb/captcha/plugins/turnstile.php +++ b/phpBB/phpbb/captcha/plugins/turnstile.php @@ -139,8 +139,7 @@ class turnstile extends base $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 245/276] [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 773b31897d..6a72273ff4 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 a0cc587663..3734899352 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // 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 7192d630c7..ed73c1d532 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 246/276] [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 47621b2318..48a835fe02 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 0000000000..4d190756ce --- /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 0000000000..500729316d --- /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 0000000000..e9312f9d7a --- /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 0000000000..6e3803be04 --- /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 0000000000..b9561e3204 --- /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 0000000000..77af7d61f9 --- /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 0000000000..69a323f155 --- /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 0000000000..c273c77f1f --- /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 0000000000..ad5ce8bdc5 --- /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 0000000000..0ae02fcc76 --- /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 0000000000..f07eaf36ac --- /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 0000000000..d3bbc31ae9 --- /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 0000000000..2636a078ec --- /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 0000000000..6d14ccd2e0 --- /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 0000000000..0f5ff849bb --- /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 0000000000..93d0fe7643 --- /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 0000000000..1575f95c14 --- /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 0000000000..a8157d4041 --- /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 0000000000..2363cce865 --- /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 0000000000..caa067b21c --- /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 0000000000..a959ffc79d --- /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 0000000000..0b333e519a --- /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 0000000000..4d737dd4bc --- /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 0000000000..264129041a --- /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 247/276] [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 48a835fe02..9155fc9a2b 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 79521b753b..78f8cbe6c6 100644 --- a/phpBB/phpbb/textformatter/s9e/factory.php +++ b/phpBB/phpbb/textformatter/s9e/factory.php @@ -358,15 +358,7 @@ class factory implements \phpbb\textformatter\cache_interface // 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 66fff05404..59db92a032 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 248/276] [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 0000000000..60f65b5f14 --- /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 249/276] [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 a160057fd2..0238e402ea 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 60f65b5f14..f51810f095 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 @@ class hidpi_smilies extends migration { 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 250/276] [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 97b04c2fb7..3f637676b3 100644 --- a/tests/text_formatter/s9e/default_formatting_test.php +++ b/tests/text_formatter/s9e/default_formatting_test.php @@ -310,11 +310,11 @@ class phpbb_textformatter_s9e_default_formatting_test extends phpbb_test_case ), 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 33336083e3..564e6fda59 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 8b2e5aad8a..04d72697b8 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 251/276] [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 955a00b488..c8aa1d9b7d 100644 --- a/tests/functional/acp_smilies_test.php +++ b/tests/functional/acp_smilies_test.php @@ -24,8 +24,8 @@ class phpbb_functional_acp_smilies_test extends phpbb_functional_test_case // 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 252/276] [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 0000000000..5645475690 --- /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 0000000000..f25d0a3c64 --- /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 0000000000..372c84e423 --- /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 0000000000..e5e88794b9 --- /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 0000000000..b3fdc9fca3 --- /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 0000000000..173ba4d780 --- /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 0000000000..f6e9ef7512 --- /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 0000000000..ef639a5ccd --- /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 0000000000..7a7bf1602a --- /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 0000000000..99693be14b --- /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 253/276] [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 99693be14b..b3fddd7361 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 254/276] [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 b3fddd7361..84fe0db5ef 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 255/276] [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 0000000000..6e91b15ca5 --- /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 256/276] [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 13af5fa304..21b26ee9c8 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 257/276] [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 25d5cb5207..9a5179419e 100644 --- a/phpBB/adm/style/acp_icons.html +++ b/phpBB/adm/style/acp_icons.html @@ -105,7 +105,7 @@ - {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 258/276] [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 0984214c6f..be75eaf317 100644 --- a/phpBB/adm/style/acp_ext_list.html +++ b/phpBB/adm/style/acp_ext_list.html @@ -42,7 +42,7 @@ - {% 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 @@ {% 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 @@ {% 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 2578c967ab..cc37ede34e 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 f481f764d1..277e7bdf48 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -575,7 +575,7 @@ class acp_extensions 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 @@ class acp_extensions $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 16668b5161..05d7049980 100644 --- a/phpBB/language/en/acp/extensions.php +++ b/phpBB/language/en/acp/extensions.php @@ -47,9 +47,9 @@ $lang = array_merge($lang, array( '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 3ecdd6e05c..e5fa455e54 100644 --- a/tests/functional/extension_acp_test.php +++ b/tests/functional/extension_acp_test.php @@ -85,7 +85,7 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $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 @@ class phpbb_functional_extension_acp_test extends phpbb_functional_test_case $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 259/276] [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 e7d0774b6c..e33dfc8f75 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -76,17 +76,10 @@ class base } } - // 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 @@ class base } 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 260/276] [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 0e3aa80fa3..04b69a4934 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -49,6 +49,30 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $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 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $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 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $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 9e4cb364d0..1652be8e44 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1525,7 +1525,7 @@ class phpbb_functional_test_case extends phpbb_test_case * * @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 261/276] [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 d8aac88b49..9614911786 100644 --- a/tests/functional/ucp_attachments_test.php +++ b/tests/functional/ucp_attachments_test.php @@ -24,7 +24,8 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case $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 262/276] [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 04b69a4934..e5ee1feee3 100644 --- a/tests/functional/search/base.php +++ b/tests/functional/search/base.php @@ -117,15 +117,13 @@ abstract class phpbb_functional_search_base extends phpbb_functional_test_case $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 9614911786..d8aac88b49 100644 --- a/tests/functional/ucp_attachments_test.php +++ b/tests/functional/ucp_attachments_test.php @@ -24,8 +24,7 @@ class phpbb_functional_ucp_attachments_test extends phpbb_functional_test_case $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 1652be8e44..6f8bc2d013 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -1523,9 +1523,9 @@ class phpbb_functional_test_case extends phpbb_test_case * @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 @@ class phpbb_functional_test_case extends phpbb_test_case 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 263/276] [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 c846bdde05..dce5eb8d90 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -816,11 +816,26 @@ switch ($mode) * 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 264/276] [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 a3c2669f69..8fe9b37b7e 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 265/276] [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 97fb758d55..102d21cd0a 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 266/276] [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 773b31897d..e758614ddc 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 a0cc587663..e6c44d0ede 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // 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 56bee134ba..58bb984370 100755 --- a/phpBB/install/phpbbcli.php +++ b/phpBB/install/phpbbcli.php @@ -23,7 +23,7 @@ if (php_sapi_name() !== 'cli') 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 7192d630c7..542fe1bd9c 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 267/276] [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 0000000000..ce333dbf5a --- /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 268/276] [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 638bdbdf1c..4674867ecd 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -50,6 +50,7 @@
                        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 @@
                            +

                            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 269/276] [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 b89c086533..85a98ee739 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 270/276] [ticket/17434] Update Vagrantfile ruby syntax PHPBB-17434 --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index ab225c9ad9..c80dfd98f8 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 5dc93ea51e243f48282bd2fe401db95ced7729d5 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 17 Nov 2024 21:22:21 +0700 Subject: [PATCH 271/276] [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 bfc2c0b97f..42832bb906 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -386,7 +386,7 @@ class acp_board '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 834f8b29b6..6f4da2890c 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -494,7 +494,7 @@ $lang = array_merge($lang, array( '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 272/276] [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 6f4da2890c..e99632e442 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -493,8 +493,8 @@ $lang = array_merge($lang, array( '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 91f82f386f4d8729ece8de22c16d971cf9695d53 Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 28 Nov 2024 13:05:01 +0700 Subject: [PATCH 273/276] [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 9d19cb2200..56d280deec 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -93,7 +93,7 @@ class webpush extends messenger_base implements extended_method_interface */ 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 274/276] [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 56d280deec..7110460821 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -94,7 +94,8 @@ class webpush extends messenger_base implements extended_method_interface 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 c2c9e4e6b0d94ac4e9ff2fdd21d24e33e079d31b Mon Sep 17 00:00:00 2001 From: rxu Date: Sat, 30 Nov 2024 11:10:23 +0700 Subject: [PATCH 275/276] [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 7110460821..94e5dfa20f 100644 --- a/phpBB/phpbb/notification/method/webpush.php +++ b/phpBB/phpbb/notification/method/webpush.php @@ -28,7 +28,7 @@ use phpbb\user_loader; * 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 276/276] [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 94e5dfa20f..25b22d54d8 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;