From c145fb4fd04fd0bbc02f97d05e98b1bc5e63d5e5 Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Mon, 5 Sep 2011 13:46:41 +0000
Subject: [PATCH] r289

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@289 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/config.php                          |  2 +-
 upload/includes/ucp/usercp_register.php    | 20 +++++++++++++++++---
 upload/language/lang_english/lang_main.php |  2 ++
 upload/language/lang_russian/lang_main.php |  3 +++
 4 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/upload/config.php b/upload/config.php
index 439aaa9f3..7bcbb9dfc 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -53,7 +53,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.1 Stable';
-$bb_cfg['tp_release_state'] = 'R288';
+$bb_cfg['tp_release_state'] = 'R289';
 $bb_cfg['tp_release_date'] = '05-09-2011';
 
 // Database
diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 933f608d1..7223a198c 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -60,7 +60,7 @@ switch ($mode)
 			{
 				if (in_array(date('G'), array(0,/*1,2,3,4,5,6,7,8,11,12,13,14,15,16,*/17,18,19,20,21,22,23)))
 				{
-					bb_die('В данный момент регистрация закрыта<br /><br />Вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас '. date('G:i') .' MSK)<br /><br />Приносим извинения за это временное неудобство');
+					bb_die($lang['REGISTERED_IN_TIME']);
 				}
 
 			}
@@ -102,6 +102,7 @@ switch ($mode)
 
 		// field => can_edit
 		$profile_fields = array(
+			'user_active'      => IS_ADMIN,
 			'username'         => (IS_ADMIN || $bb_cfg['allow_namechange']),
 			'user_password'    => true,
 			'user_email'       => true,      // должен быть после user_password
@@ -143,7 +144,7 @@ switch ($mode)
 		";
 		if (!$pr_data = DB()->fetch_row($sql))
 		{
-			bb_die('Профиль не найден');
+			bb_die($lang['PROFILE_NOT_FOUND']);
 		}
 
 		if (!bf($pr_data['user_opt'], 'user_opt', 'allow_avatar') && ($bb_cfg['allow_avatar_upload'] || $bb_cfg['allow_avatar_local'] || $bb_cfg['allow_avatar_remote']))
@@ -193,7 +194,20 @@ $cur_pass_valid = $adm_edit;
 foreach ($profile_fields as $field => $can_edit)
 {
 	switch ($field)
-	{
	/**
+	{
+	/**
+	*  Активация (edit, reg)
+	*/
+	case 'user_active':
+		$active = isset($_POST['user_active']) ? (int) $_POST['user_active'] : $pr_data['user_active'];
+		if ($submit && $adm_edit)
+		{
+            $pr_data['user_active'] = $active;
+			$db_data['user_active'] = $active;
+		}
+		break;
+		
+	/**
 	*  Имя (edit, reg)
 	*/
 	case 'username':
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 77f08d6f5..6e8f7a074 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -1588,6 +1588,7 @@ $lang['SEND_PM'] = 'Send PM';
 $lang['SEND_MESSAGE'] = 'Send message';
 $lang['EDIT_POST'] = 'Edit Post';
 $lang['NEW_THREADS'] = 'New Threads';
+$lang['PROFILE_NOT_FOUND'] = 'Profile not found';
 
 $lang['USER_DELETE'] = 'Delete';
 $lang['USER_DELETE_EXPLAIN'] = 'Delete this user';
@@ -1622,6 +1623,7 @@ $lang['EMAILER_DISABLED'] = 'Sorry, this feature is temporarily not working';
 $lang['TERMS_ON'] = 'I agree with these terms and conditions';
 $lang['TERMS_OFF'] = 'I do not agree to these terms';
 $lang['JAVASCRIPT_ON_REGISTER'] = 'To register, heads necessary to enable JavaScript';
+$lang['REGISTERED_IN_TIME'] = "At the moment registration is closed<br /><br />You can register from 01:00 to 17:00 MSK (������ ". date('H:i') ." MSK)<br /><br />We apologize for this inconvenience";
 
 // Debug
 $lang['EXECUTION_TIME'] = 'Execution time:';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 1b8882e99..5d456ef08 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -1594,6 +1594,7 @@ $lang['SEND_PM'] = 'Отправлять ЛС';
 $lang['SEND_MESSAGE'] = 'Отправлять сообщения';
 $lang['EDIT_POST'] = 'Редактировать сообщения';
 $lang['NEW_THREADS'] = 'Создавать темы';
+$lang['PROFILE_NOT_FOUND'] = 'Профиль не найден';
 
 $lang['USER_DELETE'] = 'Удаление';
 $lang['USER_DELETE_EXPLAIN'] = 'Удалить этого пользователя';
@@ -1628,6 +1629,7 @@ $lang['EMAILER_DISABLED'] = 'Извините, эта функция време
 $lang['TERMS_ON'] = 'Я <b>согласен</b> с этими условиями';
 $lang['TERMS_OFF'] = 'Я <b>не согласен</b> с этими условиями';
 $lang['JAVASCRIPT_ON_REGISTER'] = 'Для регистрации необходимo включить JavaScript';
+$lang['REGISTERED_IN_TIME'] = "В данный момент регистрация закрыта<br /><br />Вы можете зарегистрироваться с 01:00 до 17:00 MSK (сейчас ". date('H:i') ." MSK)<br /><br />Приносим извинения за это временное неудобство";
 
 
 // Debug
@@ -1686,6 +1688,7 @@ $lang['OLD'] = 'Прочит';
 
 // DL-лист
 $lang['DL_USER'] = 'Пользователь';
+$lang['USER'] = 'Пользователь';
 $lang['DL_PERCENT'] = 'Скачано процентов';
 $lang['DL_UL'] = 'Отдано';
 $lang['DL_DL'] = 'Скачано';