mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 14:18:52 +00:00
[ticket/10535] Remove email confirm check on registration form
PHPBB3-10535
This commit is contained in:
parent
72eb1ad8cc
commit
18aa4e4ecd
3 changed files with 0 additions and 17 deletions
|
@ -100,7 +100,6 @@ class ucp_register
|
||||||
$s_hidden_fields = array_merge($s_hidden_fields, array(
|
$s_hidden_fields = array_merge($s_hidden_fields, array(
|
||||||
'username' => utf8_normalize_nfc(request_var('username', '', true)),
|
'username' => utf8_normalize_nfc(request_var('username', '', true)),
|
||||||
'email' => strtolower(request_var('email', '')),
|
'email' => strtolower(request_var('email', '')),
|
||||||
'email_confirm' => strtolower(request_var('email_confirm', '')),
|
|
||||||
'lang' => $user->lang_name,
|
'lang' => $user->lang_name,
|
||||||
'tz' => request_var('tz', (float) $config['board_timezone']),
|
'tz' => request_var('tz', (float) $config['board_timezone']),
|
||||||
));
|
));
|
||||||
|
@ -189,7 +188,6 @@ class ucp_register
|
||||||
'new_password' => request_var('new_password', '', true),
|
'new_password' => request_var('new_password', '', true),
|
||||||
'password_confirm' => request_var('password_confirm', '', true),
|
'password_confirm' => request_var('password_confirm', '', true),
|
||||||
'email' => strtolower(request_var('email', '')),
|
'email' => strtolower(request_var('email', '')),
|
||||||
'email_confirm' => strtolower(request_var('email_confirm', '')),
|
|
||||||
'lang' => basename(request_var('lang', $user->lang_name)),
|
'lang' => basename(request_var('lang', $user->lang_name)),
|
||||||
'tz' => request_var('tz', (float) $timezone),
|
'tz' => request_var('tz', (float) $timezone),
|
||||||
);
|
);
|
||||||
|
@ -208,7 +206,6 @@ class ucp_register
|
||||||
'email' => array(
|
'email' => array(
|
||||||
array('string', false, 6, 60),
|
array('string', false, 6, 60),
|
||||||
array('email')),
|
array('email')),
|
||||||
'email_confirm' => array('string', false, 6, 60),
|
|
||||||
'tz' => array('num', false, -14, 14),
|
'tz' => array('num', false, -14, 14),
|
||||||
'lang' => array('language_iso_name'),
|
'lang' => array('language_iso_name'),
|
||||||
));
|
));
|
||||||
|
@ -253,11 +250,6 @@ class ucp_register
|
||||||
{
|
{
|
||||||
$error[] = $user->lang['NEW_PASSWORD_ERROR'];
|
$error[] = $user->lang['NEW_PASSWORD_ERROR'];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($data['email'] != $data['email_confirm'])
|
|
||||||
{
|
|
||||||
$error[] = $user->lang['NEW_EMAIL_ERROR'];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!sizeof($error))
|
if (!sizeof($error))
|
||||||
|
@ -472,7 +464,6 @@ class ucp_register
|
||||||
'PASSWORD' => $data['new_password'],
|
'PASSWORD' => $data['new_password'],
|
||||||
'PASSWORD_CONFIRM' => $data['password_confirm'],
|
'PASSWORD_CONFIRM' => $data['password_confirm'],
|
||||||
'EMAIL' => $data['email'],
|
'EMAIL' => $data['email'],
|
||||||
'EMAIL_CONFIRM' => $data['email_confirm'],
|
|
||||||
|
|
||||||
'L_REG_COND' => $l_reg_cond,
|
'L_REG_COND' => $l_reg_cond,
|
||||||
'L_USERNAME_EXPLAIN' => $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])),
|
'L_USERNAME_EXPLAIN' => $user->lang($config['allow_name_chars'] . '_EXPLAIN', $user->lang('CHARACTERS', (int) $config['min_name_chars']), $user->lang('CHARACTERS', (int) $config['max_name_chars'])),
|
||||||
|
|
|
@ -38,10 +38,6 @@
|
||||||
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
|
<dt><label for="email">{L_EMAIL_ADDRESS}:</label></dt>
|
||||||
<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
|
<dd><input type="text" tabindex="2" name="email" id="email" size="25" maxlength="100" value="{EMAIL}" class="inputbox autowidth" title="{L_EMAIL_ADDRESS}" /></dd>
|
||||||
</dl>
|
</dl>
|
||||||
<dl>
|
|
||||||
<dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label></dt>
|
|
||||||
<dd><input type="text" tabindex="3" name="email_confirm" id="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" class="inputbox autowidth" title="{L_CONFIRM_EMAIL}" /></dd>
|
|
||||||
</dl>
|
|
||||||
<dl>
|
<dl>
|
||||||
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
|
<dt><label for="new_password">{L_PASSWORD}:</label><br /><span>{L_PASSWORD_EXPLAIN}</span></dt>
|
||||||
<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
|
<dd><input type="password" tabindex="4" name="new_password" id="new_password" size="25" value="{PASSWORD}" class="inputbox autowidth" title="{L_NEW_PASSWORD}" /></dd>
|
||||||
|
|
|
@ -41,10 +41,6 @@
|
||||||
<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
|
<td class="row1"><b class="genmed">{L_EMAIL_ADDRESS}: </b></td>
|
||||||
<td class="row2"><input class="post" type="text" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
|
<td class="row2"><input class="post" type="text" name="email" size="25" maxlength="100" value="{EMAIL}" /></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
|
||||||
<td class="row1"><b class="genmed">{L_CONFIRM_EMAIL}: </b></td>
|
|
||||||
<td class="row2"><input class="post" type="text" name="email_confirm" size="25" maxlength="100" value="{EMAIL_CONFIRM}" /></td>
|
|
||||||
</tr>
|
|
||||||
<tr>
|
<tr>
|
||||||
<td class="row1"><b class="genmed">{L_PASSWORD}: </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td>
|
<td class="row1"><b class="genmed">{L_PASSWORD}: </b><br /><span class="gensmall">{L_PASSWORD_EXPLAIN}</span></td>
|
||||||
<td class="row2"><input class="post" type="password" name="new_password" size="25" value="{PASSWORD}" /></td>
|
<td class="row2"><input class="post" type="password" name="new_password" size="25" value="{PASSWORD}" /></td>
|
||||||
|
|
Loading…
Add table
Reference in a new issue