aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordougk_ff7 <dougk_ff7@users.sourceforge.net>2001-09-06 02:21:24 +0000
committerdougk_ff7 <dougk_ff7@users.sourceforge.net>2001-09-06 02:21:24 +0000
commit8a37c2bd5e5774b313673df29750ca2534b20c89 (patch)
tree0bf5c0d346f4120a8ba7798c35df323d501a4c73
parentca233d7fa37e66214b3cac6877f1ea9fed2179ea (diff)
downloadforums-8a37c2bd5e5774b313673df29750ca2534b20c89.tar
forums-8a37c2bd5e5774b313673df29750ca2534b20c89.tar.gz
forums-8a37c2bd5e5774b313673df29750ca2534b20c89.tar.bz2
forums-8a37c2bd5e5774b313673df29750ca2534b20c89.tar.xz
forums-8a37c2bd5e5774b313673df29750ca2534b20c89.zip
oops, a few bugs. :)
git-svn-id: file:///svn/phpbb/trunk@991 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/admin/admin_users.php79
1 files changed, 39 insertions, 40 deletions
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 7368949291..6f10c40e18 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -306,30 +306,29 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id'])
$error_msg = $lang['Password_mismatch'];
}
- if($username != $userdata['username'] || $mode == "register")
+ if($username != $userdata['username'] || $mode == "register")
+ {
+ if(!validate_username($username))
{
- if(!validate_username($username))
- {
- $error = TRUE;
- if(isset($error_msg))
- {
- $error_msg .= "<br />";
- }
- $error_msg .= $lang['Invalid_username'];
- }
- else
+ $error = TRUE;
+ if(isset($error_msg))
{
- $username_sql = "username = '$username', ";
+ $error_msg .= "<br />";
}
+ $error_msg .= $lang['Invalid_username'];
}
+ else
+ {
+ $username_sql = "username = '$username', ";
+ }
+ }
- if(isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile")
+ if(isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile")
+ {
+ if(file_exists("./".$board_config['avatar_path']."/".$userdata['user_avatar']))
{
- if(file_exists("./".$board_config['avatar_path']."/".$userdata['user_avatar']))
- {
- @unlink("./".$board_config['avatar_path']."/".$userdata['user_avatar']);
- $avatar_sql = ", user_avatar = ''";
- }
+ @unlink("./".$board_config['avatar_path']."/".$userdata['user_avatar']);
+ $avatar_sql = ", user_avatar = ''";
}
}
@@ -353,7 +352,7 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id'])
{
$sql = "DELETE FROM " . USER_GROUP_TABLE . "
WHERE user_id = $user_id";
- $result = @$db->sql_query($sql)
+ $result = @$db->sql_query($sql);
include('page_header_admin.'. $phpEx);
$template->set_filenames(array(
"body" => "admin/admin_message_body.tpl")
@@ -382,16 +381,16 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id'])
if( $error == TRUE )
{
- include('page_header_admin.' . $phpEx);
- $template->set_filenames(array(
- "body" => "admin/admin_message_body.tpl")
- );
-
- $template->assign_vars(array(
- "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
- "MESSAGE_TEXT" => "Could not update user table")
- );
- $template->pparse("body");
+ include('page_header_admin.' . $phpEx);
+ $template->set_filenames(array(
+ "body" => "admin/admin_message_body.tpl")
+ );
+
+ $template->assign_vars(array(
+ "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
+ "MESSAGE_TEXT" => "Could not update user table")
+ );
+ $template->pparse("body");
}
}
else
@@ -429,16 +428,16 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id'])
}
else
{
- include('page_header_admin.' . $phpEx);
- $template->set_filenames(array(
- "body" => "admin/admin_message_body.tpl")
- );
-
- $template->assign_vars(array(
- "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
- "MESSAGE_TEXT" => $error_msg)
- );
- $template->pparse("body");
+ include('page_header_admin.' . $phpEx);
+ $template->set_filenames(array(
+ "body" => "admin/admin_message_body.tpl")
+ );
+
+ $template->assign_vars(array(
+ "MESSAGE_TITLE" => $lang['User'] . $lang['User_admin'],
+ "MESSAGE_TEXT" => $error_msg)
+ );
+ $template->pparse("body");
}
}
else
@@ -483,4 +482,4 @@ else
include('page_footer_admin.'.$phpEx);
-?> \ No newline at end of file
+?>