diff options
| author | David M <davidmj@users.sourceforge.net> | 2007-02-17 23:09:58 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2007-02-17 23:09:58 +0000 |
| commit | af4a2033c55d931a2271196537be21fdf649c4f4 (patch) | |
| tree | d8aee47341149c33258a44e5e5d66d61cc2b88c7 /phpBB | |
| parent | e7de77fd8d7bbd5ed176dd82c4b81774e22c4a1d (diff) | |
| download | forums-af4a2033c55d931a2271196537be21fdf649c4f4.tar forums-af4a2033c55d931a2271196537be21fdf649c4f4.tar.gz forums-af4a2033c55d931a2271196537be21fdf649c4f4.tar.bz2 forums-af4a2033c55d931a2271196537be21fdf649c4f4.tar.xz forums-af4a2033c55d931a2271196537be21fdf649c4f4.zip | |
#8160
git-svn-id: file:///svn/phpbb/trunk@7005 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_ban.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_user.php | 16 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_ban.php | 2 |
3 files changed, 15 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_ban.php b/phpBB/includes/acp/acp_ban.php index b85b2d36d4..cf490a4643 100644 --- a/phpBB/includes/acp/acp_ban.php +++ b/phpBB/includes/acp/acp_ban.php @@ -26,7 +26,7 @@ class acp_ban $unbansubmit= (isset($_POST['unbansubmit'])) ? true : false; $current_time = time(); - $user->add_lang('acp/ban'); + $user->add_lang(array('acp/ban', 'acp/users')); $this->tpl_name = 'acp_ban'; // Ban submitted? diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index c78238b25f..6df1b838b2 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -602,12 +602,12 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas $ban_end = 0; } - $founder = array(); + $founder = $founder_names = array(); if (!$ban_exclude) { // Create a list of founder... - $sql = 'SELECT user_id, user_email + $sql = 'SELECT user_id, user_email, username_clean FROM ' . USERS_TABLE . ' WHERE user_type = ' . USER_FOUNDER; $result = $db->sql_query($sql); @@ -615,6 +615,7 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas while ($row = $db->sql_fetchrow($result)) { $founder[$row['user_id']] = $row['user_email']; + $founder_names[$row['user_id']] = $row['username_clean']; } $db->sql_freeresult($result); } @@ -641,7 +642,16 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas $username = trim($username); if ($username != '') { - $sql_usernames[] = utf8_clean_string($username); + $clean_name = utf8_clean_string($username); + if ($clean_name == $user->data['username_clean']) + { + trigger_error($user->lang['CANNOT_BAN_YOURSELF']); + } + if (in_array($clean_name, $founder_names)) + { + trigger_error($user->lang['CANNOT_BAN_FOUNDER']); + } + $sql_usernames[] = $clean_name; } } diff --git a/phpBB/includes/mcp/mcp_ban.php b/phpBB/includes/mcp/mcp_ban.php index aea2466888..5080ae08f2 100644 --- a/phpBB/includes/mcp/mcp_ban.php +++ b/phpBB/includes/mcp/mcp_ban.php @@ -29,7 +29,7 @@ class mcp_ban $unbansubmit = (isset($_POST['unbansubmit'])) ? true : false; $current_time = time(); - $user->add_lang('acp/ban'); + $user->add_lang(array('acp/ban', 'acp/users')); $this->tpl_name = 'mcp_ban'; // Ban submitted? |