makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/11336] Adds 301 info to redirect
  [ticket/11336] Adds redirect for old "leaders" mode
  [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
  [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
This commit is contained in:
Joas Schilling 2014-03-28 23:32:20 +01:00
commit cff5c8ac38
6 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -4883,7 +4883,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
'U_SEARCH_UNREAD' => append_sid("{$phpbb_root_path}search.$phpEx", 'search_id=unreadposts'), '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_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' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=delete_cookies'),
'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$auth->acl_get('u_viewprofile')) ? '' : append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=leaders'), 'U_TEAM' => ($user->data['user_id'] != ANONYMOUS && !$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'), 'U_TERMS_USE' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=terms'),
'U_PRIVACY' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=privacy'), 'U_PRIVACY' => 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_RESTORE_PERMISSIONS' => ($user->data['user_perm_from'] && $auth->acl_get('a_switchperm')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=restore_perm') : '',

2
phpBB/language/en/memberlist.php
View file

@ -90,7 +90,7 @@ $lang = array_merge($lang, array(
1 => '%d user', 1 => '%d user',
2 => '%d users', 2 => '%d users',
), ),
'LOGIN_EXPLAIN_LEADERS' => 'The board requires you to be registered and logged in to view the team listing.', 'LOGIN_EXPLAIN_TEAM' => 'The board requires you to be registered and logged in to view the team listing.',
'LOGIN_EXPLAIN_MEMBERLIST' => 'The board requires you to be registered and logged in to access the memberlist.', 'LOGIN_EXPLAIN_MEMBERLIST' => 'The board requires you to be registered and logged in to access the memberlist.',
'LOGIN_EXPLAIN_SEARCHUSER' => 'The board requires you to be registered and logged in to search users.', 'LOGIN_EXPLAIN_SEARCHUSER' => 'The board requires you to be registered and logged in to search users.',
'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board requires you to be registered and logged in to view profiles.', 'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board requires you to be registered and logged in to view profiles.',

13
phpBB/memberlist.php
View file

@ -29,8 +29,15 @@ $username = request_var('un', '', true);
$group_id = request_var('g', 0); $group_id = request_var('g', 0);
$topic_id = request_var('t', 0); $topic_id = request_var('t', 0);
// Redirect when old mode is used
if ($mode == 'leaders')
{
send_status_line(301, 'Moved Permanently');
redirect(append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=team'));
}
// Check our mode... // Check our mode...
if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'leaders'))) if (!in_array($mode, array('', 'group', 'viewprofile', 'email', 'contact', 'searchuser', 'team')))
{ {
trigger_error('NO_MODE'); trigger_error('NO_MODE');
} }
@ -64,12 +71,12 @@ $sort_dir = request_var('sd', 'a');
// What do you want to do today? ... oops, I think that line is taken ... // What do you want to do today? ... oops, I think that line is taken ...
switch ($mode) switch ($mode)
{ {
case 'leaders': case 'team':
// Display a listing of board admins, moderators // Display a listing of board admins, moderators
include($phpbb_root_path . 'includes/functions_user.' . $phpEx); include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
$page_title = $user->lang['THE_TEAM']; $page_title = $user->lang['THE_TEAM'];
$template_html = 'memberlist_leaders.html'; $template_html = 'memberlist_team.html';
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . TEAMPAGE_TABLE . ' FROM ' . TEAMPAGE_TABLE . '

0
phpBB/styles/prosilver/template/memberlist_leaders.html → phpBB/styles/prosilver/template/memberlist_team.html
View file

0
phpBB/styles/subsilver2/template/memberlist_leaders.html → phpBB/styles/subsilver2/template/memberlist_team.html
View file

2
tests/functional/memberlist_test.php
View file

@ -39,7 +39,7 @@ class phpbb_functional_memberlist_test extends phpbb_functional_test_case
protected function get_memberlist_leaders_table_crawler() protected function get_memberlist_leaders_table_crawler()
{ {
$crawler = self::request('GET', 'memberlist.php?mode=leaders&sid=' . $this->sid); $crawler = self::request('GET', 'memberlist.php?mode=team&sid=' . $this->sid);
return $crawler->filter('.forumbg-table'); return $crawler->filter('.forumbg-table');
} }