diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-01-05 16:12:29 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-01-05 16:12:29 +0100 |
| commit | 537ff0c567de293763226390ab9d968ab73d77d5 (patch) | |
| tree | 7480cd41593deff17963ed12ef1a21804f3d8422 /phpBB/includes/acp/acp_groups.php | |
| parent | 409bfafbf088b4ac194c4cc1b89c9c07e3f5ef99 (diff) | |
| parent | 08968bdb60c9ff286cb71901718500c7720f1da4 (diff) | |
| download | forums-537ff0c567de293763226390ab9d968ab73d77d5.tar forums-537ff0c567de293763226390ab9d968ab73d77d5.tar.gz forums-537ff0c567de293763226390ab9d968ab73d77d5.tar.bz2 forums-537ff0c567de293763226390ab9d968ab73d77d5.tar.xz forums-537ff0c567de293763226390ab9d968ab73d77d5.zip | |
Merge pull request #5457 from battye/ticket/15883
[ticket/15883] New error message for when users try adding invalid usernames to a group
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 0e058213e0..7b1dc706db 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -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,19 @@ 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)) { - trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING); + $display_message = $language->lang($error); + + if ($error == 'GROUP_USERS_INVALID') + { + // Find which users don't exist + $actual_name_ary = $name_ary; + $actual_user_id_ary = []; + user_get_id_name($actual_user_id_ary, $actual_name_ary, false, true); + + $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); } $message = ($leader) ? 'GROUP_MODS_ADDED' : 'GROUP_USERS_ADDED'; |