github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-21 22:03:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

r356

Browse source 
Убираем из формы восстановления пароля имя и добавляем каптчу. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@356 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
dimka3210 2012-02-05 20:48:59 +00:00
commit da96fe87a5
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
upload/config.php
View file

@ -53,8 +53,8 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.4 (beta)'; $bb_cfg['tp_version'] = '2.4 (beta)';
$bb_cfg['tp_release_state'] = 'R355'; $bb_cfg['tp_release_state'] = 'R356';
$bb_cfg['tp_release_date'] = '03-02-2012'; $bb_cfg['tp_release_date'] = '06-02-2012';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';

14
upload/includes/ucp/usercp_sendpasswd.php
View file

@ -8,15 +8,15 @@ if ( !defined('IN_PHPBB') )
if ($bb_cfg['emailer_disabled']) bb_die($lang['EMAILER_DISABLED']); if ($bb_cfg['emailer_disabled']) bb_die($lang['EMAILER_DISABLED']);
$need_captcha = ($_GET['mode'] == 'sendpassword' && !IS_ADMIN);
if ( isset($_POST['submit']) ) if ( isset($_POST['submit']) )
{ {
$username = ( !empty($_POST['username']) ) ? clean_username($_POST['username']) : ''; if ($need_captcha && !CAPTCHA()->verify_code()) bb_die($lang['CONFIRM_CODE_WRONG']);
$email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : ''; $email = ( !empty($_POST['email']) ) ? trim(strip_tags(htmlspecialchars($_POST['email']))) : '';
$sql = "SELECT * $sql = "SELECT *
FROM " . BB_USERS . " FROM " . BB_USERS . "
WHERE user_email = '" . DB()->escape($email) . "' WHERE user_email = '" . DB()->escape($email)."'";
AND username = '" . DB()->escape($username) . "'";
if ( $result = DB()->sql_query($sql) ) if ( $result = DB()->sql_query($sql) )
{ {
if ( $row = DB()->sql_fetchrow($result) ) if ( $row = DB()->sql_fetchrow($result) )
@ -30,7 +30,6 @@ if ( isset($_POST['submit']) )
bb_die($lang['NO_SEND_ACCOUNT']); bb_die($lang['NO_SEND_ACCOUNT']);
} }
$username = $row['username'];
$user_id = $row['user_id']; $user_id = $row['user_id'];
$user_actkey = make_rand_str(12); $user_actkey = make_rand_str(12);
@ -56,7 +55,6 @@ if ( isset($_POST['submit']) )
$emailer->assign_vars(array( $emailer->assign_vars(array(
'SITENAME' => $bb_cfg['sitename'], 'SITENAME' => $bb_cfg['sitename'],
'USERNAME' => $username,
'PASSWORD' => $user_password, 'PASSWORD' => $user_password,
'EMAIL_SIG' => (!empty($bb_cfg['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $bb_cfg['board_email_sig']) : '', 'EMAIL_SIG' => (!empty($bb_cfg['board_email_sig'])) ? str_replace('<br />', "\n", "-- \n" . $bb_cfg['board_email_sig']) : '',
@ -81,14 +79,12 @@ if ( isset($_POST['submit']) )
} }
else else
{ {
$username = '';
$email = ''; $email = '';
} }
$template->assign_vars(array( $template->assign_vars(array(
'USERNAME' => $username,
'EMAIL' => $email, 'EMAIL' => $email,
'CAPTCHA_HTML' => ($need_captcha) ? CAPTCHA()->get_html() : '',
'S_HIDDEN_FIELDS' => '', 'S_HIDDEN_FIELDS' => '',
'S_PROFILE_ACTION' => append_sid("profile.php?mode=sendpassword")) 'S_PROFILE_ACTION' => append_sid("profile.php?mode=sendpassword"))
); );

11
upload/templates/default/usercp_sendpasswd.tpl
View file

@ -1,3 +1,8 @@
<script type="text/javascript">
ajax.callback.user_register = function(data){
$('#'+ data.mode).html(data.html);
};
</script>
<p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p> <p class="nav"><a href="{U_INDEX}">{T_INDEX}</a></p>
<form action="{S_PROFILE_ACTION}" method="post"> <form action="{S_PROFILE_ACTION}" method="post">
@ -13,10 +18,12 @@
<tr> <tr>
<td colspan="2" class="row2 small">{L_ITEMS_REQUIRED}</td> <td colspan="2" class="row2 small">{L_ITEMS_REQUIRED}</td>
</tr> </tr>
<!-- IF CAPTCHA_HTML -->
<tr> <tr>
<td width="30%">{L_USERNAME}: *</td> <td>{L_CONFIRM_CODE}:</td>
<td><input type="text" class="post" name="username" size="50" maxlength="25" /></td> <td><span id="refresh_captcha">{CAPTCHA_HTML}</span> <img align="middle" src="/images/pic_loading.gif" title="{L_UPDATE}" onclick="ajax.exec({ action: 'user_register', mode: 'refresh_captcha'}); return false;"></td>
</tr> </tr>
<!-- ENDIF -->
<tr> <tr>
<td>{L_EMAIL_ADDRESS}: *</td> <td>{L_EMAIL_ADDRESS}: *</td>
<td><input type="text" class="post" name="email" size="50" maxlength="255" /></td> <td><input type="text" class="post" name="email" size="50" maxlength="255" /></td>