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/ucp | |
| 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/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 1fb026167a..4673912aed 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -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,13 +1057,27 @@ class ucp_groups if (confirm_box(true)) { + $return_manage_page = '<br /><br />' . $language->lang('RETURN_PAGE', '<a href="' . $this->u_action . '&action=list&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)) { - trigger_error($user->lang[$error] . $return_page); + $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 . $return_manage_page); } - trigger_error($user->lang['GROUP_USERS_ADDED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); + trigger_error($language->lang('GROUP_USERS_ADDED') . $return_manage_page); } else { |