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

[ticket/15883] Use the new language object

Browse source 
Using the new ->lang() format. Made the username
comparison case insensitive. Also fixed a bug where the return to
previous page link in the UCP was going back to the list of
groups rather than the specific manage group page when an error
occurred.

PHPBB3-15883
This commit is contained in:
battye 2018-11-29 14:37:14 +00:00
parent 101829b4dc
commit 565f692541
2 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/acp/acp_groups.php
View file

@ -29,6 +29,9 @@ class acp_groups
global $phpbb_root_path, $phpbb_admin_path, $phpEx;
global $request, $phpbb_container, $phpbb_dispatcher;
/** @var \phpbb\language\language $language Language object */
$language = $phpbb_container->get('language');
$user->add_lang('acp/groups');
$this->tpl_name = 'acp_groups';
$this->page_title = 'ACP_GROUPS_MANAGE';
@ -293,7 +296,7 @@ class acp_groups
// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, $leader, 0, $group_row))
{
$display_message = $user->lang[$error];
$display_message = $language->lang($error);
if ($error == 'GROUP_USERS_INVALID')
{
@ -302,7 +305,7 @@ class acp_groups
$actual_user_id_ary = false;
user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true);
$display_message = sprintf($user->lang['GROUP_USERS_INVALID'], implode($user->lang['COMMA_SEPARATOR'], array_diff($name_ary, $actual_name_ary)));
$display_message = $language->lang('GROUP_USERS_INVALID', implode($language->lang('COMMA_SEPARATOR'), array_udiff($name_ary, $actual_name_ary, 'strcasecmp')));
}
trigger_error($display_message . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING);

13
phpBB/includes/ucp/ucp_groups.php
View file

@ -32,6 +32,9 @@ class ucp_groups
global $db, $user, $auth, $cache, $template;
global $request, $phpbb_container, $phpbb_log;
/** @var \phpbb\language\language $language Language object */
$language = $phpbb_container->get('language');
$user->add_lang('groups');
$return_page = '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '">', '</a>');
@ -1054,10 +1057,12 @@ class ucp_groups
if (confirm_box(true))
{
$return_manage_page = '<br /><br />' . $language->lang('RETURN_PAGE', '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>');
// Add user/s to group
if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, 0, 0, $group_row))
{
$display_message = $user->lang[$error];
$display_message = $language->lang($error);
if ($error == 'GROUP_USERS_INVALID')
{
@ -1066,13 +1071,13 @@ class ucp_groups
$actual_user_id_ary = false;
user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true);
$display_message = sprintf($user->lang['GROUP_USERS_INVALID'], implode($user->lang['COMMA_SEPARATOR'], array_diff($name_ary, $actual_name_ary)));
$display_message = $language->lang('GROUP_USERS_INVALID', implode($language->lang('COMMA_SEPARATOR'), array_udiff($name_ary, $actual_name_ary, 'strcasecmp')));
}
trigger_error($display_message . $return_page);
trigger_error($display_message . $return_manage_page);
}
trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&amp;action=list&amp;g=' . $group_id . '">', '</a>'));
trigger_error($language->lang('GROUP_USERS_ADDED') . $return_manage_page);
}
else
{