diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php index 1bb118dba1..103783dcd6 100644 --- a/phpBB/admin/admin_users.php +++ b/phpBB/admin/admin_users.php @@ -99,6 +99,7 @@ if ( isset($HTTP_GET_VARS['submit']) ) { $user_timezone = $userdata['user_timezone']; $user_template = $userdata['user_template']; $user_dateformat = $userdata['user_dateformat']; + $user_status = $userdata['user_active']; $user_allowavatar = $userdata['user_allowavatar']; $user_allowpm = $userdata['user_allow_pm']; @@ -309,23 +310,6 @@ else if($HTTP_POST_VARS[submit] && $HTTP_POST_VARS['user_id']) $error_msg = $lang['Password_mismatch']; } - if($username != $userdata['username'] || $mode == "register") - { - if(!validate_username($username)) - { - $error = TRUE; - if(isset($error_msg)) - { - $error_msg .= "
"; - } - $error_msg .= $lang['Invalid_username']; - } - else - { - $username_sql = "username = '$username', "; - } - } - if(isset($HTTP_POST_VARS['avatardel']) && $mode == "editprofile") { if(file_exists("./".$board_config['avatar_path']."/".$userdata['user_avatar'])) diff --git a/phpBB/templates/PSO/admin/user_edit_body.tpl b/phpBB/templates/PSO/admin/user_edit_body.tpl index ddd3510baa..a35787a4c1 100644 --- a/phpBB/templates/PSO/admin/user_edit_body.tpl +++ b/phpBB/templates/PSO/admin/user_edit_body.tpl @@ -10,6 +10,141 @@ {L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED} +<<<<<<< user_edit_body.tpl + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +======= @@ -108,6 +243,7 @@
{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}
{L_USERNAME}: *
{L_EMAIL_ADDRESS}: *
{L_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_CONFIRM} {L_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}
{L_PROFILE_INFO}
{L_PROFILE_INFO_NOTICE}
{L_ICQ_NUMBER}:
{L_AIM}:
{L_MESSENGER}:
{L_YAHOO}:
{L_WEBSITE}:
{L_LOCATION}:
{L_OCCUPATION}:
{L_INTERESTS}:
{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}

{L_HTML_IS} {HTML_STATUS}
{L_BBCODE_IS} {BBCODE_STATUS}
{L_SMILIES_ARE} {SMILIES_STATUS}
{L_PREFERENCES}
{L_PUBLIC_VIEW_EMAIL}: {L_YES}   {L_NO}
{L_HIDE_USER}: {L_YES}   {L_NO}
{L_NOTIFY_ON_PRIVMSG}: {L_YES}   {L_NO}
{L_ALWAYS_ADD_SIGNATURE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_BBCODE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_HTML}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_SMILIES}: {L_YES}   {L_NO}
{L_TIMEZONE}:{TIMEZONE_SELECT}
{L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLAIN}
{L_AVATAR_PANEL}
+ + + + +
{L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}
{L_SPECIAL}
+ {L_SPECIAL_EXPLAIN} +
{L_STATUS}: {L_YES}   {L_NO}
{L_ALLOWPM}: {L_YES}   {L_NO}
{L_ALLOWAVATAR}: {L_YES}   {L_NO}
{L_DELETE_USER}?{L_DELETE_USER_EXPLAIN}
{L_USERNAME}: *
+>>>>>>> 1.4
{L_AVATAR_EXPLAIN} {L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}