mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-08 16:45:19 +02:00
A few updates
git-svn-id: file:///svn/phpbb/trunk@4168 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
7661a5d040
commit
464f8871fb
@ -219,7 +219,7 @@ class ucp_profile extends ucp
|
||||
'ICQ' => (isset($icq)) ? $icq : $user->data['user_icq'],
|
||||
'YIM' => (isset($yim)) ? $yim : $user->data['user_yim'],
|
||||
'AIM' => (isset($aim)) ? $aim : $user->data['user_aim'],
|
||||
'MSNM' => (isset($msnm)) ? $msnm : $user->data['user_msnm'],
|
||||
'MSN' => (isset($msn)) ? $msn : $user->data['user_msnm'],
|
||||
'JABBER' => (isset($jabber)) ? $jabber : $user->data['user_jabber'],
|
||||
'WEBSITE' => (isset($website)) ? $website : $user->data['user_website'],
|
||||
'LOCATION' => (isset($location)) ? $location : $user->data['user_from'],
|
||||
@ -452,7 +452,7 @@ class ucp_profile extends ucp
|
||||
|
||||
'L_AVATAR_EXPLAIN' => sprintf($user->lang['AVATAR_EXPLAIN'], $config['avatar_max_width'], $config['avatar_max_height'], round($config['avatar_filesize'] / 1024)),
|
||||
|
||||
'S_FORM_ENCTYPE' => $can_upload ? ' enctype="multipart/form-data"' : '',
|
||||
'S_FORM_ENCTYPE' => ($can_upload) ? ' enctype="multipart/form-data"' : '',
|
||||
'S_UPLOAD_AVATAR_FILE' => $can_upload,
|
||||
'S_UPLOAD_AVATAR_URL' => $can_upload,
|
||||
'S_LINK_AVATAR' => ($auth->acl_get('u_chgavatar') && $config['allow_avatar_remote']) ? true : false,
|
||||
|
@ -218,7 +218,7 @@ class ucp_register extends ucp
|
||||
include($phpbb_root_path . 'includes/emailer.'.$phpEx);
|
||||
$emailer = new emailer($config['smtp_delivery']);
|
||||
|
||||
$emailer->use_template($email_template, $user->data['user_lang']);
|
||||
$emailer->template($email_template, $user->data['user_lang']);
|
||||
$emailer->replyto($config['board_contact']);
|
||||
$emailer->to($data['user_email'], $data['username']);
|
||||
|
||||
@ -319,7 +319,7 @@ class ucp_register extends ucp
|
||||
{
|
||||
if ($row['attempts'] > 3)
|
||||
{
|
||||
trigger_error($user->lang['TOO_MANY_REGISTERS']);
|
||||
// trigger_error($user->lang['TOO_MANY_REGISTERS']);
|
||||
}
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
@ -8,11 +8,11 @@
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_FILENAME}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_FILENAME}</b></td>
|
||||
<td class="row2"><input class="post" type="file" name="fileupload" size="40" maxlength="{FILESIZE}" value="{FILENAME}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_FILE_COMMENT}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td>
|
||||
<td class="row2"><textarea class="post" name="filecomment" rows="3" cols="35" wrap="virtual" size="40">{FILE_COMMENT}</textarea>
|
||||
<input class="liteoption" type="submit" name="add_file" value="{L_ADD_FILE}" /></td>
|
||||
</tr>
|
||||
@ -24,11 +24,11 @@
|
||||
|
||||
<!-- BEGIN attach_row -->
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_FILENAME}</b></td>
|
||||
<td class="row2"><a class="gen" href="{attach_row.U_VIEW_ATTACHMENT}" target="_blank">{attach_row.FILENAME}</a></td>
|
||||
<td class="row1"><b class="genmed">{L_FILENAME}</b></td>
|
||||
<td class="row2"><a class="genmed" href="{attach_row.U_VIEW_ATTACHMENT}" target="_blank">{attach_row.FILENAME}</a></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_FILE_COMMENT}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_FILE_COMMENT}</b></td>
|
||||
<td class="row2"><textarea class="post" name="comment_list[{attach_row.ASSOC_INDEX}]" rows="3" cols="35" wrap="virtual" size=40>{attach_row.FILE_COMMENT}</textarea>
|
||||
<input class="liteoption" type="submit" name="edit_comment[{attach_row.ASSOC_INDEX}]" value="{L_UPDATE_COMMENT}" />
|
||||
<input class="liteoption" type="submit" name="delete_file[{attach_row.ASSOC_INDEX}]" value="{L_DELETE_FILE}" /></td>
|
||||
|
@ -116,24 +116,24 @@ function checkForm()
|
||||
</tr>
|
||||
<!-- IF ERROR_MESSAGE neq '' -->
|
||||
<tr>
|
||||
<td class="row2" colspan="2" align="center"><span class="gen" style="color:red;font-weight:bold">{ERROR_MESSAGE}</span></td>
|
||||
<td class="row2" colspan="2" align="center"><span class="genmed" style="color:red;font-weight:bold">{ERROR_MESSAGE}</span></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF S_DELETE_ALLOWED -->
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_DELETE_POST}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_DELETE_POST}</b></td>
|
||||
<td class="row2"><input type="checkbox" name="delete" /> <span class="gensmall">[ {L_DELETE_POST_WARN} ]</span></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF S_DISPLAY_USERNAME -->
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_USERNAME}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_USERNAME}</b></td>
|
||||
<td class="row2"><input class="post" type="text" tabindex="1" name="username" size="25" maxlength="25" value="{USERNAME}" /></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<!-- IF S_SHOW_TOPIC_ICONS -->
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_ICON}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_ICON}</b></td>
|
||||
<td class="row2"><table width="100%" cellspacing="0" cellpadding="0" border="0">
|
||||
<tr>
|
||||
<td><input type="radio" name="icon" value="1" checked="checked" /><span class="genmed">{L_NONE}</span> <!-- BEGIN topic_icon --><input type="radio" name="icon" value="{topic_icon.ICON_ID}"{topic_icon.S_ICON_CHECKED} /><img src="{topic_icon.ICON_IMG}" width="{topic_icon.ICON_WIDTH}" height="{topic_icon.ICON_HEIGHT}" alt="" title="" hspace="2" vspace="2" /> <!-- END topic_icon --></td>
|
||||
@ -142,11 +142,11 @@ function checkForm()
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
<tr>
|
||||
<td class="row1" width="22%"><b class="gen">{L_SUBJECT}</b></td>
|
||||
<td class="row1" width="22%"><b class="genmed">{L_SUBJECT}</b></td>
|
||||
<td class="row2" width="78%"><input class="post" style="width:450px" type="text" name="subject" size="45" maxlength="60" tabindex="2" value="{SUBJECT}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" valign="top"><b class="gen">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /><table width="80%" cellspacing="5" cellpadding="0" border="0" align="center">
|
||||
<td class="row1" valign="top"><b class="genmed">{L_MESSAGE_BODY}</b><br /><span class="gensmall">{L_MESSAGE_BODY_EXPLAIN}</span><br /><br /><table width="80%" cellspacing="5" cellpadding="0" border="0" align="center">
|
||||
<tr>
|
||||
<td class="gensmall" align="center"><b>{L_EMOTICONS}</b></td>
|
||||
</tr>
|
||||
@ -204,7 +204,7 @@ function checkForm()
|
||||
</table></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1" valign="top"><b class="gen">{L_OPTIONS}</b><br /><table cellspacing="2" cellpadding="0" border="0">
|
||||
<td class="row1" valign="top"><b class="genmed">{L_OPTIONS}</b><br /><table cellspacing="2" cellpadding="0" border="0">
|
||||
<tr>
|
||||
<td class="gensmall">{HTML_STATUS}</td>
|
||||
</tr>
|
||||
@ -266,7 +266,7 @@ function checkForm()
|
||||
</tr>
|
||||
<!-- IF S_LOCK_TOPIC_ALLOWED or S_LOCK_POST_ALLOWED -->
|
||||
<tr>
|
||||
<td class="row1" valign="top"><b class="gen">{L_MOD_OPTIONS}</b></td>
|
||||
<td class="row1" valign="top"><b class="genmed">{L_MOD_OPTIONS}</b></td>
|
||||
<td class="row2"><table cellspacing="0" cellpadding="1" border="0">
|
||||
<!-- IF S_LOCK_TOPIC_ALLOWED -->
|
||||
<tr>
|
||||
|
@ -7,24 +7,24 @@
|
||||
<td class="row3" colspan="2"><span class="gensmall">{L_ADD_POLL_EXPLAIN}</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_POLL_QUESTION}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_POLL_QUESTION}</b></td>
|
||||
<td class="row2"><input class="post" type="text" name="poll_title" size="50" maxlength="255" value="{POLL_TITLE}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_POLL_OPTIONS}</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td>
|
||||
<td class="row1"><b class="genmed">{L_POLL_OPTIONS}</b><br /><span class="gensmall">{L_POLL_OPTIONS_EXPLAIN}</span></td>
|
||||
<td class="row2"><textarea style="width:450px" name="poll_option_text" rows="5" cols="35">{POLL_OPTIONS}</textarea></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_POLL_MAX_OPTIONS}</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>
|
||||
<td class="row1"><b class="genmed">{L_POLL_MAX_OPTIONS}</b><br /><span class="gensmall">{L_POLL_MAX_OPTIONS_EXPLAIN}</span></td>
|
||||
<td class="row2"><input class="post" type="text" name="poll_max_options" size="3" maxlength="3" value="{POLL_MAX_OPTIONS}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="gen">{L_POLL_FOR}</b></td>
|
||||
<td class="row1"><b class="genmed">{L_POLL_FOR}</b></td>
|
||||
<td class="row2"><input class="post" type="text" name="poll_length" size="3" maxlength="3" value="{POLL_LENGTH}" /> <b class="gen">{L_DAYS}</b> <span class="gensmall">{L_POLL_FOR_EXPLAIN}</span></td>
|
||||
</tr>
|
||||
<!-- IF S_POLL_DELETE -->
|
||||
<tr>
|
||||
<td class="row1"><span class="gen"><b>{L_POLL_DELETE}</b></span></td>
|
||||
<td class="row1"><span class="genmed"><b>{L_POLL_DELETE}</b></span></td>
|
||||
<td class="row2"><input type="checkbox" name="poll_delete" /></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
|
@ -27,23 +27,23 @@
|
||||
|
||||
<tr>
|
||||
<td class="row1" width="38%"><b class="genmed">{L_USERNAME}: </b><br /><span class="gensmall">{L_USERNAME_EXPLAIN}</span></td>
|
||||
<td class="row2"><input type="text" class="post" name="username" size="25" maxlength="40" value="{USERNAME}" /></td>
|
||||
<td class="row2"><input class="post" type="text" name="username" size="25" maxlength="40" value="{USERNAME}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
|
||||
<td class="row2"><input type="text" class="post" name="email" size="25" maxlength="255" value="{EMAIL}" /></td>
|
||||
<td class="row2"><input class="post" type="text" name="email" size="25" maxlength="255" value="{EMAIL}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td>
|
||||
<td class="row2"><input type="text" class="post" name="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" /></td>
|
||||
<td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="255" value="{EMAIL_CONFIRM}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_NEW_PASSWORD}: </b><br /><span class="gensmall">{L_NEW_PASSWORD_EXPLAIN}</span></td>
|
||||
<td class="row2"><input type="password" class="post" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td>
|
||||
<td class="row2"><input class="post" type="password" name="new_password" size="25" maxlength="100" value="{PASSWORD}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_CONFIRM_PASSWORD}: </b></td>
|
||||
<td class="row2"><input type="password" class="post" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
|
||||
<td class="row2"><input class="post" type="password" name="password_confirm" size="25" maxlength="100" value="{PASSWORD_CONFIRM}" /></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_LANGUAGE}: </b></td>
|
||||
@ -66,7 +66,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td>
|
||||
<td class="row2"><input type="text" class="post" name="confirm_code" size="6" maxlength="6" /></td>
|
||||
<td class="row2"><input class="post" type="text" name="confirm_code" size="6" maxlength="6" /></td>
|
||||
</tr>
|
||||
<!-- ENDIF -->
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user