diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-21 19:23:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-03-21 19:23:34 +0000 |
| commit | 21de871aff0392803dd98ab8a895fabac35f4219 (patch) | |
| tree | aa052fe762be977462e92b755e59dacb0c4ea559 /phpBB/includes/acp/acp_users.php | |
| parent | 44c60cff4de351523f950ca7fac114d1a2769b82 (diff) | |
| download | forums-21de871aff0392803dd98ab8a895fabac35f4219.tar forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.gz forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.bz2 forums-21de871aff0392803dd98ab8a895fabac35f4219.tar.xz forums-21de871aff0392803dd98ab8a895fabac35f4219.zip | |
- a bunch of bugfixes. :P
git-svn-id: file:///svn/phpbb/trunk@5678 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 4dcf128452..653c33f5da 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -147,6 +147,17 @@ class acp_users trigger_error($user->lang['NO_ADMIN'] . adm_back_link($this->u_action . '&u=' . $user_id)); } + // Check if the user wants to remove himself or the guest user account + if ($user_id == ANONYMOUS) + { + trigger_error($user->lang['CANNOT_REMOVE_ANONYMOUS'] . adm_back_link($this->u_action . '&u=' . $user_id)); + } + + if ($user_id == $user->data['user_id']) + { + trigger_error($user->lang['CANNOT_REMOVE_YOURSELF'] . adm_back_link($this->u_action . '&u=' . $user_id)); + } + if (confirm_box(true)) { user_delete($delete_type, $user_id); @@ -1225,6 +1236,7 @@ class acp_users $avatar_select = basename(request_var('avatar_select', '')); $category = basename(request_var('category', '')); + $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; $data = array(); @@ -1320,8 +1332,6 @@ class acp_users $error = preg_replace('#^([A-Z_]+)$#e', "(!empty(\$user->lang['\\1'])) ? \$user->lang['\\1'] : '\\1'", $error); } - $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; - // Generate users avatar if ($user_row['user_avatar']) { |