[ticket/17609] Remove jumpbox by rubencm · Pull Request #6927 · phpbb/phpbb · GitHub
Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions phpBB/docs/events.md
1 change: 0 additions & 1 deletion phpBB/includes/acp/acp_board.php
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 0 additions & 3 deletions phpBB/includes/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -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();
}

Expand Down
4 changes: 2 additions & 2 deletions phpBB/includes/functions_content.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
1 change: 0 additions & 1 deletion phpBB/includes/questionnaire/questionnaire.php
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 0 additions & 1 deletion phpBB/install/schemas/schema_data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion phpBB/language/en/acp/board.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Expand Down
1 change: 0 additions & 1 deletion phpBB/memberlist.php
Original file line number Diff line number Diff line change
Expand Up @@ -1496,6 +1496,5 @@
$template->set_filenames(array(
'body' => $template_html)
);
make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));

page_footer();
45 changes: 45 additions & 0 deletions phpBB/phpbb/db/migration/data/v400/remove_jumpbox.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @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]],
];
}
}
1 change: 0 additions & 1 deletion phpBB/phpbb/help/controller/controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
1 change: 0 additions & 1 deletion phpBB/phpbb/help/controller/help.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 0 additions & 2 deletions phpBB/phpbb/members/controller/online.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
Expand Down
2 changes: 0 additions & 2 deletions phpBB/phpbb/members/controller/team.php
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
}
Expand Down
2 changes: 0 additions & 2 deletions phpBB/posting.php
Original file line number Diff line number Diff line change
Expand Up @@ -2103,8 +2103,6 @@
'body' => 'posting_body.html')
);

make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));

// Topic review
if ($mode == 'reply' || $mode == 'quote')
{
Expand Down
2 changes: 0 additions & 2 deletions phpBB/search.php
Original file line number Diff line number Diff line change
Expand Up @@ -1390,7 +1390,6 @@
$template->set_filenames(array(
'body' => 'search_results.html')
);
make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));

page_footer();
}
Expand Down Expand Up @@ -1606,6 +1605,5 @@
$template->set_filenames(array(
'body' => 'search_body.html')
);
make_jumpbox(append_sid("{$phpbb_root_path}viewforum.$phpEx"));

page_footer();
1 change: 0 additions & 1 deletion phpBB/styles/prosilver/template/faq_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,4 @@ <h2 class="faq-title">{faq_block.BLOCK_TITLE}</h2>
</a>
</div>

<!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html -->
25 changes: 0 additions & 25 deletions phpBB/styles/prosilver/template/jumpbox.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,5 @@

<div class="action-bar actions-jump">
<!-- IF S_VIEWTOPIC -->
<p class="jumpbox-return">
<a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_FORUM'), false, 'fas c-return-arrow-icon') }}
</a>
</p>
<!-- ELSEIF S_VIEWFORUM -->
<p class="jumpbox-return">
<a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_INDEX'), false, 'fas c-return-arrow-icon') }}
</a>
</p>
<!-- ELSEIF SEARCH_TOPIC -->
<p class="jumpbox-return">
<a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">
{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, 'fas c-return-arrow-icon') }}
</a>
</p>
<!-- ELSEIF S_SEARCH_ACTION -->
<p class="jumpbox-return">
<a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">
{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, 'fas c-return-arrow-icon') }}
</a>
</p>
<!-- ENDIF -->

<!-- IF S_DISPLAY_JUMPBOX -->
<div class="jumpbox dropdown-container dropdown-container-right<!-- IF not S_IN_MCP --> dropdown-up<!-- ENDIF --> dropdown-{S_CONTENT_FLOW_BEGIN} dropdown-button-control" id="jumpbox">
Expand Down
1 change: 0 additions & 1 deletion phpBB/styles/prosilver/template/login_forum.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,4 @@ <h2 class="login-title">{L_LOGIN}</h2>

</form>

<!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html -->
1 change: 0 additions & 1 deletion phpBB/styles/prosilver/template/memberlist_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,5 @@ <h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARC
<!-- IF S_IN_SEARCH_POPUP -->
<!-- INCLUDE simple_footer.html -->
<!-- ELSE -->
<!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html -->
<!-- ENDIF -->
1 change: 0 additions & 1 deletion phpBB/styles/prosilver/template/memberlist_team.html
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,4 @@ <h2 class="solo">{PAGE_TITLE}</h2>

</form>

<!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html -->
2 changes: 0 additions & 2 deletions phpBB/styles/prosilver/template/memberlist_view.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,4 @@ <h3>{L_SIGNATURE}</h3>

<!-- EVENT memberlist_view_content_append -->

<!-- INCLUDE jumpbox.html -->

<!-- INCLUDE overall_footer.html -->
2 changes: 0 additions & 2 deletions phpBB/styles/prosilver/template/search_results.html
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,5 @@ <h3><a href="{searchresults.U_VIEW_POST}">{searchresults.POST_SUBJECT}</a></h3>
<!-- ENDIF -->
</div>
</div>
{% EVENT search_results_jumpbox_before %}
<!-- INCLUDE jumpbox.html -->

<!-- INCLUDE overall_footer.html -->
2 changes: 0 additions & 2 deletions phpBB/styles/prosilver/template/viewforum_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,6 @@ <h3><a href="{U_LOGIN_LOGOUT}">{L_LOGIN_LOGOUT}</a><!-- IF S_REGISTER_ENABLED --
</div>
<!-- ENDIF -->

<!-- INCLUDE jumpbox.html -->

{% EVENT viewforum_body_online_list_before %}

<!-- IF S_DISPLAY_ONLINE_LIST and U_VIEWONLINE -->
Expand Down
1 change: 0 additions & 1 deletion phpBB/styles/prosilver/template/viewonline_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -74,5 +74,4 @@ <h2 class="viewonline-title">{TOTAL_REGISTERED_USERS_ONLINE}</h2>
</div>
</div>

<!-- INCLUDE jumpbox.html -->
<!-- INCLUDE overall_footer.html -->
1 change: 0 additions & 1 deletion phpBB/styles/prosilver/template/viewtopic_body.html
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,6 @@ <h3 {% if postrow.S_FIRST_ROW %}class="first"{% endif %}>
</div>

<!-- EVENT viewtopic_body_footer_before -->
<!-- INCLUDE jumpbox.html -->

{% EVENT viewtopic_body_online_list_before %}

Expand Down
2 changes: 0 additions & 2 deletions phpBB/viewforum.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) ? '' : "&amp;start=$start")),
));
Expand Down
1 change: 0 additions & 1 deletion phpBB/viewtopic.php