diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-04 20:35:46 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-09-04 20:35:46 +0000 |
| commit | 8ab85ebdb03105bffbd30e9ac374068a92972752 (patch) | |
| tree | bec45c963c9d8c334b0180dddedb19007dbe8116 /phpBB/includes/functions_user.php | |
| parent | 8c567e8c68a3106c94c140f732904b7b5b6eab1a (diff) | |
| download | forums-8ab85ebdb03105bffbd30e9ac374068a92972752.tar forums-8ab85ebdb03105bffbd30e9ac374068a92972752.tar.gz forums-8ab85ebdb03105bffbd30e9ac374068a92972752.tar.bz2 forums-8ab85ebdb03105bffbd30e9ac374068a92972752.tar.xz forums-8ab85ebdb03105bffbd30e9ac374068a92972752.zip | |
- fix security issue in download.php
- fixing some phpdocumentor warnings/errors
- adjust pop-before-smtp "auth" (nowadays no one should rely on it)
- add backtrace for smtp email errors if DEBUG_EXTRA is enabled
git-svn-id: file:///svn/phpbb/trunk@6352 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 9e198540af..1e688e8ab0 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -601,9 +601,14 @@ function user_ban($mode, $ban, $ban_len, $ban_len_other, $ban_exclude, $ban_reas FROM ' . USERS_TABLE . ' WHERE ' . $db->sql_in_set('LOWER(username)', $sql_usernames); + // Do not allow banning yourself if (sizeof($founder)) { - $sql .= ' AND ' . $db->sql_in_set('user_id', array_keys($founder), true); + $sql .= ' AND ' . $db->sql_in_set('user_id', array_merge(array_keys($founder), array($user->data['user_id'])), true); + } + else + { + $sql .= ' AND user_id <> ' . $user->data['user_id']; } $result = $db->sql_query($sql); |