From 5f96997b3fecad352bcb38769616c67188c22d02 Mon Sep 17 00:00:00 2001 From: Ruben Calvo Date: Sun, 25 Jan 2026 05:28:32 +0100 Subject: [PATCH] [ticket/17609] Remove jumpbox PHPBB-17609 --- phpBB/docs/events.md | 9 +--- phpBB/includes/acp/acp_board.php | 1 - phpBB/includes/functions.php | 3 -- phpBB/includes/functions_content.php | 4 +- .../includes/questionnaire/questionnaire.php | 1 - phpBB/install/schemas/schema_data.sql | 1 - phpBB/language/en/acp/board.php | 1 - phpBB/memberlist.php | 1 - .../db/migration/data/v400/remove_jumpbox.php | 45 +++++++++++++++++++ phpBB/phpbb/help/controller/controller.php | 1 - phpBB/phpbb/help/controller/help.php | 1 - phpBB/phpbb/members/controller/online.php | 2 - phpBB/phpbb/members/controller/team.php | 2 - phpBB/posting.php | 2 - phpBB/search.php | 2 - phpBB/styles/prosilver/template/faq_body.html | 1 - phpBB/styles/prosilver/template/jumpbox.html | 25 ----------- .../prosilver/template/login_forum.html | 1 - .../prosilver/template/memberlist_body.html | 1 - .../prosilver/template/memberlist_team.html | 1 - .../prosilver/template/memberlist_view.html | 2 - .../prosilver/template/search_results.html | 2 - .../prosilver/template/viewforum_body.html | 2 - .../prosilver/template/viewonline_body.html | 1 - .../prosilver/template/viewtopic_body.html | 1 - phpBB/viewforum.php | 2 - phpBB/viewtopic.php | 1 - 27 files changed, 48 insertions(+), 68 deletions(-) create mode 100644 phpBB/phpbb/db/migration/data/v400/remove_jumpbox.php diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 117aa4cb2d5..03769764055 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -2348,13 +2348,6 @@ search_results_header_before * Since: 3.1.4-RC1 * Purpose: Add content before the header of the search results. -search_results_jumpbox_before -=== -* Locations: - + styles/prosilver/template/search_results.html -* Since: 3.3.4-RC1 -* Purpose: Add content before the jumpbox of the search results. - search_results_last_post_author_username_append === * Locations: @@ -3290,7 +3283,7 @@ viewtopic_body_footer_before + styles/prosilver/template/viewtopic_body.html * Since: 3.1.0-a1 * Purpose: Add content to the bottom of the View topic screen below the posts -and quick reply, directly before the jumpbox in Prosilver. +and quick reply in Prosilver. viewtopic_body_online_list_after === diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index b20d0d9753b..b727a907f49 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -367,7 +367,6 @@ function main($id, $mode) 'load_birthdays' => array('lang' => 'YES_BIRTHDAYS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'load_unreads_search' => array('lang' => 'YES_UNREAD_SEARCH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'load_moderators' => array('lang' => 'YES_MODERATORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), - 'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'load_user_activity' => array('lang' => 'LOAD_USER_ACTIVITY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'load_user_activity_limit' => array('lang' => 'LOAD_USER_ACTIVITY_LIMIT', 'validate' => 'int:0:99999999', 'type' => 'number:0:99999999', 'explain' => true), 'load_tplcompile' => array('lang' => 'RECOMPILE_STYLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 373e725e157..3bc39fd73a2 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2537,7 +2537,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa $template->set_filenames(array( 'body' => 'login_body.html') ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); page_footer(); } @@ -2632,8 +2631,6 @@ function login_forum_box($forum_data) 'body' => 'login_forum.html') ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"), $forum_data['forum_id']); - page_footer(); } diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 1e46bf4e9be..33d8eccb2d0 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -151,10 +151,10 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, */ function make_jumpbox($action, $forum_id = false, $select_all = false, $acl_list = false, $force_display = false) { - global $config, $auth, $template, $user, $db, $phpbb_path_helper, $phpbb_dispatcher; + global $auth, $template, $user, $db, $phpbb_path_helper, $phpbb_dispatcher; // We only return if the jumpbox is not forced to be displayed (in case it is needed for functionality) - if (!$config['load_jumpbox'] && $force_display === false) + if ($force_display === false) { return; } diff --git a/phpBB/includes/questionnaire/questionnaire.php b/phpBB/includes/questionnaire/questionnaire.php index 82f435ba35d..0515990106a 100644 --- a/phpBB/includes/questionnaire/questionnaire.php +++ b/phpBB/includes/questionnaire/questionnaire.php @@ -375,7 +375,6 @@ function get_data() 'load_cpf_viewtopic' => true, 'load_db_lastread' => true, 'load_db_track' => true, - 'load_jumpbox' => true, 'load_moderators' => true, 'load_online' => true, 'load_online_guests' => true, diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index 58a04c85b0b..08db12c54a0 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -189,7 +189,6 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_lastread', INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_db_track', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_font_awesome_url', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jquery_url', '//ajax.googleapis.com/ajax/libs/jquery/3.7.1/jquery.min.js'); -INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_jumpbox', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_moderators', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_notifications', '1'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('load_online', '1'); diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 0603d408362..c8f3da6d1eb 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -389,7 +389,6 @@ 'YES_ANON_READ_MARKING_EXPLAIN' => 'Stores read/unread status information for guests. If disabled, posts are always marked read for guests.', 'YES_BIRTHDAYS' => 'Enable birthday listing', 'YES_BIRTHDAYS_EXPLAIN' => 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.', - 'YES_JUMPBOX' => 'Enable display of jumpbox', 'YES_MODERATORS' => 'Enable display of moderators', 'YES_ONLINE' => 'Enable online user listings', 'YES_ONLINE_EXPLAIN' => 'Display online user information on index, forum and topic pages.', diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 4cf4cac950c..b59af9a9e4d 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1496,6 +1496,5 @@ $template->set_filenames(array( 'body' => $template_html) ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); page_footer(); diff --git a/phpBB/phpbb/db/migration/data/v400/remove_jumpbox.php b/phpBB/phpbb/db/migration/data/v400/remove_jumpbox.php new file mode 100644 index 00000000000..224b72f0372 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v400/remove_jumpbox.php @@ -0,0 +1,45 @@ + + * @license GNU General Public License, version 2 (GPL-2.0) + * + * For full copyright and license information, please see + * the docs/CREDITS.txt file. + * + */ + +namespace phpbb\db\migration\data\v400; + +use phpbb\db\migration\migration; + +class remove_jumpbox extends migration +{ + public static function depends_on(): array + { + return [ + '\phpbb\db\migration\data\v400\dev', + ]; + } + + public function effectively_installed() + { + return !isset($this->config['load_jumpbox']); + } + + public function update_data(): array + { + return [ + ['config.remove', ['load_jumpbox']], + ]; + } + + public function revert_data(): array + { + return [ + ['config.add', ['load_jumpbox', 1]], + ]; + } +} diff --git a/phpBB/phpbb/help/controller/controller.php b/phpBB/phpbb/help/controller/controller.php index 29494205a9b..9ec1c03310f 100644 --- a/phpBB/phpbb/help/controller/controller.php +++ b/phpBB/phpbb/help/controller/controller.php @@ -70,7 +70,6 @@ public function handle() 'S_IN_FAQ' => true, )); - make_jumpbox(append_sid("{$this->root_path}viewforum.{$this->php_ext}")); return $this->helper->render('faq_body.html', $title); } } diff --git a/phpBB/phpbb/help/controller/help.php b/phpBB/phpbb/help/controller/help.php index 557b564da4e..69c8d8c3fbd 100644 --- a/phpBB/phpbb/help/controller/help.php +++ b/phpBB/phpbb/help/controller/help.php @@ -116,7 +116,6 @@ public function handle($mode) $this->assign_to_template($this->user->help); - make_jumpbox(append_sid("{$this->root_path}viewforum.{$this->php_ext}")); return $this->helper->render($template_file, $page_title); } diff --git a/phpBB/phpbb/members/controller/online.php b/phpBB/phpbb/members/controller/online.php index 164b9804734..fb5b5a7d613 100644 --- a/phpBB/phpbb/members/controller/online.php +++ b/phpBB/phpbb/members/controller/online.php @@ -302,8 +302,6 @@ public function handle(): Response 'U_BREADCRUMB' => $this->helper->route('phpbb_members_online'), ]); - make_jumpbox(append_sid($this->phpbb_root_path . "viewforum." . $this->php_ex)); - // Render return $this->helper->render('viewonline_body.html', $this->language->lang('WHO_IS_ONLINE')); } diff --git a/phpBB/phpbb/members/controller/team.php b/phpBB/phpbb/members/controller/team.php index 1aac91d70cf..5af16257e4b 100644 --- a/phpBB/phpbb/members/controller/team.php +++ b/phpBB/phpbb/members/controller/team.php @@ -430,8 +430,6 @@ public function handle() : Response 'U_BREADCRUMB' => $this->helper->route('phpbb_members_team'), ]); - make_jumpbox(append_sid("{$this->phpbb_root_path}viewforum.{$this->php_ext}")); - // Render return $this->helper->render('memberlist_team.html', $this->language->lang('THE_TEAM')); } diff --git a/phpBB/posting.php b/phpBB/posting.php index f5d134e06f6..e7019af21be 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -2103,8 +2103,6 @@ 'body' => 'posting_body.html') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); - // Topic review if ($mode == 'reply' || $mode == 'quote') { diff --git a/phpBB/search.php b/phpBB/search.php index 92d431c9362..5edc57d39f3 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1390,7 +1390,6 @@ $template->set_filenames(array( 'body' => 'search_results.html') ); - make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); page_footer(); } @@ -1606,6 +1605,5 @@ $template->set_filenames(array( 'body' => 'search_body.html') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx")); page_footer(); diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html index 2a1c2dfd925..7742de5b453 100644 --- a/phpBB/styles/prosilver/template/faq_body.html +++ b/phpBB/styles/prosilver/template/faq_body.html @@ -49,5 +49,4 @@

{faq_block.BLOCK_TITLE}

- diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html index 4edf77a64e4..771cdf7dde4 100644 --- a/phpBB/styles/prosilver/template/jumpbox.html +++ b/phpBB/styles/prosilver/template/jumpbox.html @@ -1,30 +1,5 @@
- -

- - {{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_FORUM'), false, 'fas c-return-arrow-icon') }} - -

- -

- - {{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_INDEX'), false, 'fas c-return-arrow-icon') }} - -

- -

- - {{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, 'fas c-return-arrow-icon') }} - -

- -

- - {{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, 'fas c-return-arrow-icon') }} - -

-
diff --git a/phpBB/styles/prosilver/template/login_forum.html b/phpBB/styles/prosilver/template/login_forum.html index 3128bac7886..be120dbb937 100644 --- a/phpBB/styles/prosilver/template/login_forum.html +++ b/phpBB/styles/prosilver/template/login_forum.html @@ -38,5 +38,4 @@ - diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html index c749a457d96..72a8b9b160e 100644 --- a/phpBB/styles/prosilver/template/memberlist_body.html +++ b/phpBB/styles/prosilver/template/memberlist_body.html @@ -185,6 +185,5 @@

{PAGE_TITLE}{L_COLON} {PAGE_TITLE}

- diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html index 14fb6736eff..0ea09e216b5 100644 --- a/phpBB/styles/prosilver/template/memberlist_view.html +++ b/phpBB/styles/prosilver/template/memberlist_view.html @@ -128,6 +128,4 @@

{L_SIGNATURE}

- - diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html index 9e8a3c3e9bd..e4ed3cc2e8a 100644 --- a/phpBB/styles/prosilver/template/search_results.html +++ b/phpBB/styles/prosilver/template/search_results.html @@ -277,7 +277,5 @@

{searchresults.POST_SUBJECT}

-{% EVENT search_results_jumpbox_before %} - diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html index 63750e32186..b3b7014c578 100644 --- a/phpBB/styles/prosilver/template/viewforum_body.html +++ b/phpBB/styles/prosilver/template/viewforum_body.html @@ -335,8 +335,6 @@

{L_LOGIN_LOGOUT} - - {% EVENT viewforum_body_online_list_before %} diff --git a/phpBB/styles/prosilver/template/viewonline_body.html b/phpBB/styles/prosilver/template/viewonline_body.html index acbfb71ba55..9e87421a725 100644 --- a/phpBB/styles/prosilver/template/viewonline_body.html +++ b/phpBB/styles/prosilver/template/viewonline_body.html @@ -74,5 +74,4 @@

{TOTAL_REGISTERED_USERS_ONLINE}

- diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html index d974ef334bb..186db9e5d41 100644 --- a/phpBB/styles/prosilver/template/viewtopic_body.html +++ b/phpBB/styles/prosilver/template/viewtopic_body.html @@ -501,7 +501,6 @@

- {% EVENT viewtopic_body_online_list_before %} diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 94f967be7b6..a71e7c8fa32 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -200,8 +200,6 @@ 'body' => 'viewforum_body.html') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"), $forum_id); - $template->assign_vars(array( 'U_VIEW_FORUM' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . (($start == 0) ? '' : "&start=$start")), )); diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 31812042922..d5078bbd850 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -2416,6 +2416,5 @@ $template->set_filenames(array( 'body' => ($view == 'print') ? 'viewtopic_print.html' : 'viewtopic_body.html') ); -make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"), $forum_id); page_footer();