diff --git a/upload/config.php b/upload/config.php index dc29275bc..b9babf117 100644 --- a/upload/config.php +++ b/upload/config.php @@ -57,7 +57,7 @@ $bb_cfg['css_ver'] = 1; // Increase number of revision after update $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['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 // Registration +$bb_cfg['invalid_logins'] = 5; // Кол-во неверных попыток ввода пароля, перед выводом проверки капчи $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['new_user_reg_restricted'] = false; diff --git a/upload/includes/ucp/usercp_viewprofile.php b/upload/includes/ucp/usercp_viewprofile.php index d27f01af0..7377bc57d 100644 --- a/upload/includes/ucp/usercp_viewprofile.php +++ b/upload/includes/ucp/usercp_viewprofile.php @@ -166,11 +166,16 @@ if (IS_ADMIN) 'EMAIL_ADDRESS' => htmlCHR($profiledata['user_email']), )); } -else -{ - $user_restrictions = array(); - $template->assign_var('USER_RESTRICTIONS', join('
  • ', $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('
  • ', $user_restrictions)); print_page('usercp_viewprofile.tpl'); diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php index 2df262541..5e4a3aa93 100644 --- a/upload/language/lang_english/lang_main.php +++ b/upload/language/lang_english/lang_main.php @@ -1578,9 +1578,9 @@ $lang['INVALID_DATE'] = 'Error date '; $lang['PROFILE_USER'] = 'Viewing profile'; $lang['GOOD_UPDATE'] = 'was successfully changed'; $lang['FORBADE_VIEWING'] = 'forbade visitors viewing your profile'; -$lang['DENY_VISITORS'] = 'Deny visitors viewing your profile:'; -$lang['BAN_USER'] = 'To prevent a user:'; -$lang['USER_NOT_ALLOWED'] = 'Users are not permitted:'; +$lang['DENY_VISITORS'] = 'Deny visitors viewing your profile'; +$lang['BAN_USER'] = 'To prevent a user'; +$lang['USER_NOT_ALLOWED'] = 'Users are not permitted'; $lang['HIDE_AVATARS'] = 'Show avatars'; $lang['SHOW_CAPTION'] = 'Show your signature'; $lang['DOWNLOAD_TORRENT'] = 'Download torrent'; diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php index 4cc72f5ad..7cec2e105 100644 --- a/upload/language/lang_russian/lang_main.php +++ b/upload/language/lang_russian/lang_main.php @@ -1584,9 +1584,9 @@ $lang['INVALID_DATE'] = 'Ошибка даты '; $lang['PROFILE_USER'] = 'Профиль пользователя'; $lang['GOOD_UPDATE'] = 'был успешно изменён'; $lang['FORBADE_VIEWING'] = 'запретил гостям просмотр своего профиля'; -$lang['DENY_VISITORS'] = 'Запретить гостям просмотр вашего профиля:'; -$lang['BAN_USER'] = 'Запретить пользователю:'; -$lang['USER_NOT_ALLOWED'] = 'Пользователю запрещено:'; +$lang['DENY_VISITORS'] = 'Запретить гостям просмотр вашего профиля'; +$lang['BAN_USER'] = 'Запретить пользователю'; +$lang['USER_NOT_ALLOWED'] = 'Пользователю запрещено'; $lang['HIDE_AVATARS'] = 'Показывать аватар'; $lang['SHOW_CAPTION'] = 'Показывать подпись'; $lang['DOWNLOAD_TORRENT'] = 'Скачивать торренты'; diff --git a/upload/login.php b/upload/login.php index bf453e18c..050f60a34 100644 --- a/upload/login.php +++ b/upload/login.php @@ -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_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 if (isset($_POST['login'])) @@ -89,12 +94,23 @@ if (isset($_POST['login'])) if ($user->login($_POST, $mod_admin_login)) { $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); } $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( 'LOGIN_USERNAME' => htmlCHR($login_username), 'LOGIN_PASSWORD' => htmlCHR($login_password), - 'LOGIN_ERR_MSG' => join('
    ', $login_errors), + 'ERROR_MESSAGE' => join('
    ', $login_errors), 'ADMIN_LOGIN' => $mod_admin_login, 'REDIRECT_URL' => htmlCHR($redirect_url), 'CAPTCHA_HTML' => ($need_captcha) ? CAPTCHA()->get_html() : '', diff --git a/upload/templates/default/login.tpl b/upload/templates/default/login.tpl index 8835a8f07..7f0c4a5ba 100644 --- a/upload/templates/default/login.tpl +++ b/upload/templates/default/login.tpl @@ -15,9 +15,7 @@ - -

    {LOGIN_ERR_MSG}

    - +

    {L_ADMIN_REAUTHENTICATE}

    {L_ENTER_PASSWORD}

    diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl index 01ce1f7d1..ce6b5fdb7 100644 --- a/upload/templates/default/usercp_register.tpl +++ b/upload/templates/default/usercp_register.tpl @@ -179,7 +179,7 @@ ajax.callback.posts = function(data){ - {L_DENY_VISITORS} + {L_DENY_VISITORS}:    diff --git a/upload/templates/default/usercp_viewprofile.tpl b/upload/templates/default/usercp_viewprofile.tpl index 75d2f7740..84aa3c169 100644 --- a/upload/templates/default/usercp_viewprofile.tpl +++ b/upload/templates/default/usercp_viewprofile.tpl @@ -67,7 +67,6 @@ $(document).ready(function(){ $('#user-opt-resp').html(' '); ajax.change_user_opt(); }); - $('#user-opt').show(); }); @@ -104,8 +103,26 @@ $(document).ready(function(){

    {T_INDEX}

    - {L_PROFILE} · - {L_PERMISSIONS} 

    + {L_PROFILE} · + {L_PERMISSIONS} · + {L_BAN_USER}

    +
    @@ -170,29 +187,9 @@ $(document).ready(function(){ - - - +
    - {L_USER_NOT_ALLOWED} + {L_USER_NOT_ALLOWED}:
    • {USER_RESTRICTIONS}
    @@ -233,7 +230,7 @@ $(document).ready(function(){ [ {L_SEARCH_USER_POSTS} ] [ {L_SEARCH_USER_TOPICS} ] [ {L_SEARCH_RELEASES} ] -

    +