github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r263

Browse source 
Кол-во неверных попыток ввода пароля, перед выводом проверки капчи git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@263 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2011-08-29 07:49:31 +00:00
commit 18e4ef9d5d
8 changed files with 63 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

3
upload/config.php
View file

@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1;
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.1 Stable'; $bb_cfg['tp_version'] = '2.1 Stable';
$bb_cfg['tp_release_state'] = 'R262'; $bb_cfg['tp_release_state'] = 'R263';
$bb_cfg['tp_release_date'] = '29-08-2011'; $bb_cfg['tp_release_date'] = '29-08-2011';
$bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
@ -277,6 +277,7 @@ $bb_cfg['max_last_visit_days'] = 14; // days
$bb_cfg['last_visit_update_intrv'] = 3600; // sec $bb_cfg['last_visit_update_intrv'] = 3600; // sec
// Registration // Registration
$bb_cfg['invalid_logins'] = 5; // Кол-во неверных попыток ввода пароля, перед выводом проверки капчи
$bb_cfg['new_user_reg_disabled'] = false; // Disable new user registrations $bb_cfg['new_user_reg_disabled'] = false; // Disable new user registrations
$bb_cfg['unique_ip'] = false; // Deny registration of several accounts by one ip $bb_cfg['unique_ip'] = false; // Deny registration of several accounts by one ip
$bb_cfg['new_user_reg_restricted'] = false; $bb_cfg['new_user_reg_restricted'] = false;

15
upload/includes/ucp/usercp_viewprofile.php
View file

@ -166,11 +166,16 @@ if (IS_ADMIN)
'EMAIL_ADDRESS' => htmlCHR($profiledata['user_email']), 'EMAIL_ADDRESS' => htmlCHR($profiledata['user_email']),
)); ));
} }
else
{
$user_restrictions = array();
$template->assign_var('USER_RESTRICTIONS', join('</li><li>', $user_restrictions)); $user_restrictions = array();
}
if (bf($profiledata['user_opt'], 'user_opt', 'allow_avatar')) $user_restrictions[] = $lang['HIDE_AVATARS'];
if (bf($profiledata['user_opt'], 'user_opt', 'allow_passkey')) $user_restrictions[] = $lang['DOWNLOAD_TORRENT'];
if (bf($profiledata['user_opt'], 'user_opt', 'allow_pm')) $user_restrictions[] = $lang['SEND_PM'];
if (bf($profiledata['user_opt'], 'user_opt', 'allow_post')) $user_restrictions[] = $lang['SEND_MESSAGE'];
if (bf($profiledata['user_opt'], 'user_opt', 'allow_post_edit')) $user_restrictions[] = $lang['EDIT_POST'];
if (bf($profiledata['user_opt'], 'user_opt', 'allow_topic')) $user_restrictions[] = $lang['NEW_THREADS'];
$template->assign_var('USER_RESTRICTIONS', join('</li><li>', $user_restrictions));
print_page('usercp_viewprofile.tpl'); print_page('usercp_viewprofile.tpl');

6
upload/language/lang_english/lang_main.php
View file

@ -1578,9 +1578,9 @@ $lang['INVALID_DATE'] = 'Error date ';
$lang['PROFILE_USER'] = 'Viewing profile'; $lang['PROFILE_USER'] = 'Viewing profile';
$lang['GOOD_UPDATE'] = 'was successfully changed'; $lang['GOOD_UPDATE'] = 'was successfully changed';
$lang['FORBADE_VIEWING'] = 'forbade visitors viewing your profile'; $lang['FORBADE_VIEWING'] = 'forbade visitors viewing your profile';
$lang['DENY_VISITORS'] = 'Deny visitors viewing your profile:'; $lang['DENY_VISITORS'] = 'Deny visitors viewing your profile';
$lang['BAN_USER'] = 'To prevent a user:'; $lang['BAN_USER'] = 'To prevent a user';
$lang['USER_NOT_ALLOWED'] = 'Users are not permitted:'; $lang['USER_NOT_ALLOWED'] = 'Users are not permitted';
$lang['HIDE_AVATARS'] = 'Show avatars'; $lang['HIDE_AVATARS'] = 'Show avatars';
$lang['SHOW_CAPTION'] = 'Show your signature'; $lang['SHOW_CAPTION'] = 'Show your signature';
$lang['DOWNLOAD_TORRENT'] = 'Download torrent'; $lang['DOWNLOAD_TORRENT'] = 'Download torrent';

6
upload/language/lang_russian/lang_main.php
View file

@ -1584,9 +1584,9 @@ $lang['INVALID_DATE'] = 'Ошибка даты ';
$lang['PROFILE_USER'] = 'Профиль пользователя'; $lang['PROFILE_USER'] = 'Профиль пользователя';
$lang['GOOD_UPDATE'] = 'был успешно изменён'; $lang['GOOD_UPDATE'] = 'был успешно изменён';
$lang['FORBADE_VIEWING'] = 'запретил гостям просмотр своего профиля'; $lang['FORBADE_VIEWING'] = 'запретил гостям просмотр своего профиля';
$lang['DENY_VISITORS'] = 'Запретить гостям просмотр вашего профиля:'; $lang['DENY_VISITORS'] = 'Запретить гостям просмотр вашего профиля';
$lang['BAN_USER'] = 'Запретить пользователю:'; $lang['BAN_USER'] = 'Запретить пользователю';
$lang['USER_NOT_ALLOWED'] = 'Пользователю запрещено:'; $lang['USER_NOT_ALLOWED'] = 'Пользователю запрещено';
$lang['HIDE_AVATARS'] = 'Показывать аватар'; $lang['HIDE_AVATARS'] = 'Показывать аватар';
$lang['SHOW_CAPTION'] = 'Показывать подпись'; $lang['SHOW_CAPTION'] = 'Показывать подпись';
$lang['DOWNLOAD_TORRENT'] = 'Скачивать торренты'; $lang['DOWNLOAD_TORRENT'] = 'Скачивать торренты';

24
upload/login.php
View file

@ -60,8 +60,13 @@ $mod_admin_login = (IS_AM && !$user->data['session_admin']);
$login_username = ($mod_admin_login) ? $userdata['username'] : (string) @$_POST['login_username']; $login_username = ($mod_admin_login) ? $userdata['username'] : (string) @$_POST['login_username'];
$login_password = (string) @$_POST['login_password']; $login_password = (string) @$_POST['login_password'];
// Login // Ïðîâåðêà íà íåâåðíóþ êîìáèíàöèþ ëîãèí/ïàðîëü
$need_captcha = (!$mod_admin_login) ? CACHE('bb_login_err')->get('l_err_'. USER_IP) : false; $need_captcha = false;
if(!$mod_admin_login)
{
$need_captcha = CACHE('bb_login_err')->get('l_err_'. USER_IP);
if($need_captcha < $bb_cfg['invalid_logins']) $need_captcha = false;
}
// login // login
if (isset($_POST['login'])) if (isset($_POST['login']))
@ -89,12 +94,23 @@ if (isset($_POST['login']))
if ($user->login($_POST, $mod_admin_login)) if ($user->login($_POST, $mod_admin_login))
{ {
$redirect_url = (defined('FIRST_LOGON')) ? $bb_cfg['first_logon_redirect_url'] : $redirect_url; $redirect_url = (defined('FIRST_LOGON')) ? $bb_cfg['first_logon_redirect_url'] : $redirect_url;
// Îáíóëåíèå ïðè ââåäåíèè ïðàâèëüíî êîìáèíàöèè ëîãèí/ïàðîëü
CACHE('bb_login_err')->set('l_err_'. USER_IP, 0, 3600);
redirect($redirect_url); redirect($redirect_url);
} }
$login_errors[] = $lang['ERROR_LOGIN']; $login_errors[] = $lang['ERROR_LOGIN'];
$need_captcha = (!$mod_admin_login) ? CACHE('bb_login_err')->set('l_err_'. USER_IP, 1, 3600) : false; if(!$mod_admin_login)
{
$login_err = CACHE('bb_login_err')->get('l_err_'. USER_IP);
if($login_err > $bb_cfg['invalid_logins']) $need_captcha = true;
if($login_err > 50) // çàáàíèòü èï :)
CACHE('bb_login_err')->set('l_err_'. USER_IP, ($login_err + 1), 3600);
}
else $need_captcha = false;
} }
} }
@ -104,7 +120,7 @@ if (IS_GUEST || $mod_admin_login)
$template->assign_vars(array( $template->assign_vars(array(
'LOGIN_USERNAME' => htmlCHR($login_username), 'LOGIN_USERNAME' => htmlCHR($login_username),
'LOGIN_PASSWORD' => htmlCHR($login_password), 'LOGIN_PASSWORD' => htmlCHR($login_password),
'LOGIN_ERR_MSG' => join('<br />', $login_errors), 'ERROR_MESSAGE' => join('<br />', $login_errors),
'ADMIN_LOGIN' => $mod_admin_login, 'ADMIN_LOGIN' => $mod_admin_login,
'REDIRECT_URL' => htmlCHR($redirect_url), 'REDIRECT_URL' => htmlCHR($redirect_url),
'CAPTCHA_HTML' => ($need_captcha) ? CAPTCHA()->get_html() : '', 'CAPTCHA_HTML' => ($need_captcha) ? CAPTCHA()->get_html() : '',

4
upload/templates/default/login.tpl
View file

@ -15,9 +15,7 @@
<tr> <tr>
<td class="row1"> <td class="row1">
<!-- IF LOGIN_ERR_MSG --> <!-- IF ADMIN_LOGIN -->
<h4 class="warnColor1 tCenter mrg_16">{LOGIN_ERR_MSG}</h4>
<!-- ELSEIF ADMIN_LOGIN -->
<h4 class="tCenter mrg_16">{L_ADMIN_REAUTHENTICATE}</h4> <h4 class="tCenter mrg_16">{L_ADMIN_REAUTHENTICATE}</h4>
<!-- ELSE --> <!-- ELSE -->
<h4 class="tCenter mrg_16">{L_ENTER_PASSWORD}</h4> <h4 class="tCenter mrg_16">{L_ENTER_PASSWORD}</h4>

2
upload/templates/default/usercp_register.tpl
View file

@ -179,7 +179,7 @@ ajax.callback.posts = function(data){
</td> </td>
</tr> </tr>
<tr> <tr>
<td>{L_DENY_VISITORS}</td> <td>{L_DENY_VISITORS}:</td>
<td> <td>
<label><input type="radio" name="view_profile" value="1" <!-- IF VIEW_PROFILE -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp; <label><input type="radio" name="view_profile" value="1" <!-- IF VIEW_PROFILE -->checked="checked"<!-- ENDIF --> />{L_YES}</label>&nbsp;&nbsp;
<label><input type="radio" name="view_profile" value="0" <!-- IF not VIEW_PROFILE -->checked="checked"<!-- ENDIF --> />{L_NO}</label> <label><input type="radio" name="view_profile" value="0" <!-- IF not VIEW_PROFILE -->checked="checked"<!-- ENDIF --> />{L_NO}</label>

45
upload/templates/default/usercp_viewprofile.tpl
View file

@ -67,7 +67,6 @@ $(document).ready(function(){
$('#user-opt-resp').html('&nbsp;'); $('#user-opt-resp').html('&nbsp;');
ajax.change_user_opt(); ajax.change_user_opt();
}); });
$('#user-opt').show();
}); });
</script> </script>
@ -105,7 +104,25 @@ $(document).ready(function(){
<!-- IF IS_ADMIN --> <!-- IF IS_ADMIN -->
<p class="floatR"> <p class="floatR">
<a href="{U_MANAGE}">{L_PROFILE}</a> &middot; <a href="{U_MANAGE}">{L_PROFILE}</a> &middot;
<a href="{U_PERMISSIONS}">{L_PERMISSIONS}</a>&nbsp;</p> <a href="{U_PERMISSIONS}">{L_PERMISSIONS}</a> &middot;
<a href="#user-opt" class="menu-root menu-alt1">{L_BAN_USER}</a></p>
<div class="menu-sub row1 border bw_TRBL" id="user-opt">
<fieldset class="mrg_6">
<div class="tLeft" style="padding: 2px 6px 6px; display: block;">
<label><input type="checkbox" name="allow_avatar"/>{L_HIDE_AVATARS}</label>
<label><input type="checkbox" name="allow_sig"/>{L_SHOW_CAPTION}</label>
<label><input type="checkbox" name="allow_passkey"/>{L_DOWNLOAD_TORRENT}</label>
<label><input type="checkbox" name="allow_pm"/>{L_SEND_PM}</label>
<label><input type="checkbox" name="allow_post"/>{L_SEND_MESSAGE}</label>
<label><input type="checkbox" name="allow_post_edit"/>{L_EDIT_POST}</label>
<label><input type="checkbox" name="allow_topic"/>{L_NEW_THREADS}</label>
</div>
</fieldset>
<div id="user-opt-save" class="hidden tCenter">
<p><input id="user-opt-save-btn" class="bold long" type="button" value="{L_SUBMIT}" /></p>
<p id="user-opt-resp" class="mrg_6"></p>
</div>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<div class="clear"></div> <div class="clear"></div>
</div> </div>
@ -170,29 +187,9 @@ $(document).ready(function(){
<!-- ENDIF --> <!-- ENDIF -->
</table><!--/user_contacts--> </table><!--/user_contacts-->
<!-- IF IS_ADMIN --> <!-- IF USER_RESTRICTIONS -->
<div id="user-opt" style="display: none;">
<fieldset class="mrg_6"> <fieldset class="mrg_6">
<style type="text/css"> #user-opt label { display: block; } </style> <legend>{L_USER_NOT_ALLOWED}:</legend>
<legend>{L_BAN_USER}</legend>
<div class="tLeft" style="padding: 2px 6px 6px; display: block;">
<label><input type="checkbox" name="allow_avatar"/>{L_HIDE_AVATARS}</label>
<label><input type="checkbox" name="allow_sig"/>{L_SHOW_CAPTION}</label>
<label><input type="checkbox" name="allow_passkey"/>{L_DOWNLOAD_TORRENT}</label>
<label><input type="checkbox" name="allow_pm"/>{L_SEND_PM}</label>
<label><input type="checkbox" name="allow_post"/>{L_SEND_MESSAGE}</label>
<label><input type="checkbox" name="allow_post_edit"/>{L_EDIT_POST}</label>
<label><input type="checkbox" name="allow_topic"/>{L_NEW_THREADS}</label>
</div>
</fieldset>
<div id="user-opt-save" class="hidden">
<p><input id="user-opt-save-btn" class="bold long" type="button" value="{L_SUBMIT}" /></p>
<p id="user-opt-resp" class="mrg_6"></p>
</div>
</div>
<!-- ELSEIF USER_RESTRICTIONS -->
<fieldset class="mrg_6">
<legend>{L_USER_NOT_ALLOWED}</legend>
<div class="tLeft" style="padding: 4px 6px 8px 2px;"> <div class="tLeft" style="padding: 4px 6px 8px 2px;">
<ul><li>{USER_RESTRICTIONS}</li></ul> <ul><li>{USER_RESTRICTIONS}</li></ul>
</div> </div>