aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--phpBB/admin/admin_users.php18
-rw-r--r--phpBB/templates/PSO/admin/user_edit_body.tpl136
2 files changed, 137 insertions, 17 deletions
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 .= "<br />";
- }
- $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 @@
<td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
</tr>
<tr>
+<<<<<<< user_edit_body.tpl
+ <td class="tablebg"><table border="0" cellpadding="3" cellspacing="1" width="100%">
+ <tr>
+ <td class="cat" colspan="2"><span class="cattitle"><b>{L_REGISTRATION_INFO}</b></span><br /><span class="gensmall">{L_ITEMS_REQUIRED}</span></td>
+ </tr>
+ <tr>
+ <td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
+ <td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_EMAIL_ADDRESS}: *</span></td>
+ <td class="row2"><input type="text" name="email" size="35" maxlength="255" value="{EMAIL}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_PASSWORD}: *</span><br /><span class="gensmall">{L_PASSWORD_IF_CHANGED}</span></td>
+ <td class="row2"><input type="password" name="password" size="35" maxlength="100" value="{PASSWORD}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_CONFIRM} {L_PASSWORD}: * </span><br /><span class="gensmall">{L_PASSWORD_CONFIRM_IF_CHANGED}</span></td>
+ <td class="row2"><input type="password" name="password_confirm" size="35" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
+ </tr>
+ <tr>
+ <td class="cat" colspan="2"><span class="cattitle"><b>{L_PROFILE_INFO}</b></span><br /><span class="gensmall">{L_PROFILE_INFO_NOTICE}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ICQ_NUMBER}:</span></td>
+ <td class="row2"><input type="text" name="icq" size="10" maxlength="15" value="{ICQ}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_AIM}:</span></td>
+ <td class="row2"><input type="text" name="aim" size="20" maxlength="255" value="{AIM}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_MESSENGER}:</span></td>
+ <td class="row2"><input type="text" name="msn" size="20" maxlength="255" value="{MSN}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_YAHOO}:</span></td>
+ <td class="row2"><input type="text" name="yim" size="20" maxlength="255" value="{YIM}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_WEBSITE}:</span></td>
+ <td class="row2"><input type="text" name="website" size="35" maxlength="255" value="{WEBSITE}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_LOCATION}:</span></td>
+ <td class="row2"><input type="text" name="location" size="35" maxlength="100" value="{LOCATION}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_OCCUPATION}:</span></td>
+ <td class="row2"><input type="text" name="occupation" size="35" maxlength="100" value="{OCCUPATION}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_INTERESTS}:</span></td>
+ <td class="row2"><input type="text" name="interests" size="35" maxlength="150" value="{INTERESTS}" /></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_SIGNATURE}:</span><br /><span class="gensmall">{L_SIGNATURE_EXPLAIN}<br /><br />{L_HTML_IS} <u>{HTML_STATUS}</u><br />{L_BBCODE_IS} <u>{BBCODE_STATUS}</u><br />{L_SMILIES_ARE} <u>{SMILIES_STATUS}</u></span></td>
+ <td class="row2"><textarea name="signature" rows="6" cols="45">{SIGNATURE}</textarea></td>
+ </tr>
+ <tr>
+ <td class="cat" colspan="2"><span class="cattitle"><b>{L_PREFERENCES}</b></span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_PUBLIC_VIEW_EMAIL}:</span></td>
+ <td class="row2"><input type="radio" name="viewemail" value="1" {VIEW_EMAIL_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="viewemail" value="0" {VIEW_EMAIL_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_HIDE_USER}:</span></td>
+ <td class="row2"><input type="radio" name="hideonline" value="1" {HIDE_USER_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="hideonline" value="0" {HIDE_USER_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_NOTIFY_ON_PRIVMSG}:</span></td>
+ <td class="row2"><input type="radio" name="notifypm" value="1" {NOTIFY_PM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="notifypm" value="0" {NOTIFY_PM_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ALWAYS_ADD_SIGNATURE}:</span></td>
+ <td class="row2"><input type="radio" name="attachsig" value="1" {ALWAYS_ADD_SIGNATURE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="attachsig" value="0" {ALWAYS_ADD_SIGNATURE_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_BBCODE}:</span></td>
+ <td class="row2"><input type="radio" name="allowbbcode" value="1" {ALWAYS_ALLOW_BBCODE_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowbbcode" value="0" {ALWAYS_ALLOW_BBCODE_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_HTML}:</span></td>
+ <td class="row2"><input type="radio" name="allowhtml" value="1" {ALWAYS_ALLOW_HTML_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowhtml" value="0" {ALWAYS_ALLOW_HTML_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ALWAYS_ALLOW_SMILIES}:</span></td>
+ <td class="row2"><input type="radio" name="allowsmilies" value="1" {ALWAYS_ALLOW_SMILIES_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="allowsmilies" value="0" {ALWAYS_ALLOW_SMILIES_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_TIMEZONE}:</span></td>
+ <td class="row2">{TIMEZONE_SELECT}</td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_DATE_FORMAT}:</span><br /><span class="gensmall">{L_DATE_FORMAT_EXPLAIN}</span></td>
+ <td class="row2"><input type="text" name="dateformat" value="{DATE_FORMAT}" maxlength="16" /></td>
+ </tr>
+ <tr>
+ <td class="cat" colspan="2"><span class="cattitle"><b>{L_AVATAR_PANEL}</b></span></td>
+ </tr>
+ <tr>
+ <td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0">
+ <tr>
+ <td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
+ <td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
+ </tr>
+ </table></td>
+ </tr>
+ <tr>
+ <td class="cat" colspan="2"><span class="cattitle"><B>{L_SPECIAL}</b></span></td>
+ </tr>
+ <tr>
+ <td class="row1" colspan="2" align="center">
+ <span class="gensmall">{L_SPECIAL_EXPLAIN}</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_STATUS}:</span></td>
+ <td class="row2"><input type="radio" name="user_status" value="1" {STATUS_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="user_status" value="0" {STATUS_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ALLOWPM}:</span></td>
+ <td class="row2"><input type="radio" name="user_allowpm" value="1" {ALLOWPM_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="user_allowpm" value="0" {ALLOWPM_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_ALLOWAVATAR}:</span></td>
+ <td class="row2"><input type="radio" name="user_allowavatar" value="1" {ALLOWAVATAR_YES} /> <span class="gen">{L_YES}</span>&nbsp;&nbsp;<input type="radio" name="user_allowavatar" value="0" {ALLOWAVATAR_NO} /> <span class="gen">{L_NO}</span></td>
+ </tr>
+ <tr>
+ <td class="row1"><span class="gen">{L_DELETE_USER}?</span></td>
+ <td class="row2"><input type="checkbox" name="deleteuser">{L_DELETE_USER_EXPLAIN}</td>
+ </tr>
+=======
<td class="row1" width="38%"><span class="gen">{L_USERNAME}: *</span></td>
<td class="row2"><input type="text" name="username" size="35" maxlength="40" value="{USERNAME}" /></td>
</tr>
@@ -108,6 +243,7 @@
</tr>
<tr>
<td class="row1" colspan="2" align="center"><table width="70%" cellspacing="2" cellpadding="0" border="0">
+>>>>>>> 1.4
<tr>
<td width="65%"><span class="gensmall">{L_AVATAR_EXPLAIN}</span></td>
<td align="center"><span class="gensmall">{L_CURRENT_IMAGE}</span><br />{AVATAR}<br /><input type="checkbox" name="avatardel" />&nbsp;<span class="gensmall">{L_DELETE_AVATAR}</span></td>
generated by cgit v1.2.1 (git 2.21.0) at 2025-10-12 20:44:42 +0000