From 1a8d68aa3d227fd03060e340b294db8399198ab6 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 10 Feb 2012 13:24:26 +0000
Subject: [PATCH] r368

 git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@368 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/includes/ucp/usercp_register.php      | 11 +++++++++--
 upload/language/lang_english/lang_main.php   |  1 +
 upload/language/lang_russian/lang_main.php   |  1 +
 upload/templates/admin/index.tpl             |  2 +-
 upload/templates/default/usercp_register.tpl |  1 +
 upload/viewforum.php                         |  2 +-
 upload/viewtopic.php                         |  2 +-
 7 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/upload/includes/ucp/usercp_register.php b/upload/includes/ucp/usercp_register.php
index 746d7cfbe..3f36a104a 100644
--- a/upload/includes/ucp/usercp_register.php
+++ b/upload/includes/ucp/usercp_register.php
@@ -206,7 +206,7 @@ foreach ($profile_fields as $field => $can_edit)
 			$db_data['user_active'] = $active;
 		}
 		break;
-		
+
 	/**
 	*  Имя (edit, reg)
 	*/
@@ -215,7 +215,8 @@ foreach ($profile_fields as $field => $can_edit)
 
 		if ($submit)
 		{
-			if (!$errors AND $err = validate_username($username) && $mode == 'register')
+			$err = validate_username($username);
+			if (!$errors AND $err && $mode == 'register')
 			{
 				$errors[] = $err;
 			}
@@ -962,6 +963,12 @@ if ($mode == 'editprofile' && $userdata['session_logged_in'])
 }
 //bt end
 
+$new_user = (int) request_var('admin', '');
+if($new_user && IS_ADMIN) $gen_simple_header = true;
+$template->assign_vars(array(
+	'NEW_USER'            => $new_user,
+));
+
 require(PAGE_HEADER);
 
 $template->pparse('body');
diff --git a/upload/language/lang_english/lang_main.php b/upload/language/lang_english/lang_main.php
index 320cc43fe..36b596eb9 100644
--- a/upload/language/lang_english/lang_main.php
+++ b/upload/language/lang_english/lang_main.php
@@ -205,6 +205,7 @@ $lang['VIEW_FORUM'] = 'View Forum';
 
 $lang['FORUM_NOT_EXIST'] = 'The forum you selected does not exist.';
 $lang['REACHED_ON_ERROR'] = 'You have reached this page in error.';
+$lang['ERROR_PORNO_FORUM'] = 'This porno-forum is hidden in your profile';
 
 $lang['DISPLAY_TOPICS'] = 'Display topics from previous';
 $lang['ALL_TOPICS'] = 'All Topics';
diff --git a/upload/language/lang_russian/lang_main.php b/upload/language/lang_russian/lang_main.php
index 25a19be1c..7d464198b 100644
--- a/upload/language/lang_russian/lang_main.php
+++ b/upload/language/lang_russian/lang_main.php
@@ -207,6 +207,7 @@ $lang['VIEW_FORUM'] = 'Просмотр форума';
 
 $lang['FORUM_NOT_EXIST'] = 'Форума, который вы выбрали, не существует';
 $lang['REACHED_ON_ERROR'] = 'Вы попали на эту страницу из-за ошибки';
+$lang['ERROR_PORNO_FORUM'] = 'Данный porno-форум скрыт вами в профиле';
 
 $lang['DISPLAY_TOPICS'] = 'Показать';
 $lang['ALL_TOPICS'] = 'все темы';
diff --git a/upload/templates/admin/index.tpl b/upload/templates/admin/index.tpl
index 848cd62f4..193ee6122 100644
--- a/upload/templates/admin/index.tpl
+++ b/upload/templates/admin/index.tpl
@@ -88,7 +88,7 @@ table.forumline { margin: 0 auto; }
 	<tr>
 		<td><b>{L_ADMIN}:</b></td>
 		<td>
-			<a href="../profile.php?mode=register">{L_CREATE_PROFILE}</a>
+			<a href="../profile.php?mode=register&admin=1">{L_CREATE_PROFILE}</a>
 		</td>
 	</tr>
 </table>
diff --git a/upload/templates/default/usercp_register.tpl b/upload/templates/default/usercp_register.tpl
index 459cf3697..bf4a8638a 100644
--- a/upload/templates/default/usercp_register.tpl
+++ b/upload/templates/default/usercp_register.tpl
@@ -12,6 +12,7 @@ ajax.callback.user_register = function(data){
 <form method="post" action="profile.php" class="tokenized" enctype="multipart/form-data">
 <input type="hidden" name="mode" value="{MODE}" />
 <input type="hidden" name="reg_agreed" value="1" />
+<!-- IF NEW_USER --><input type="hidden" name="admin" value="1" /><!-- ENDIF -->
 <!-- IF ADM_EDIT -->
 <input type="hidden" name="u" value="{PR_USER_ID}" />
 <!-- ENDIF -->
diff --git a/upload/viewforum.php b/upload/viewforum.php
index 3198818e9..7f1cea448 100644
--- a/upload/viewforum.php
+++ b/upload/viewforum.php
@@ -133,7 +133,7 @@ if (!$forums = $datastore->get('cat_forums'))
 	$forums = $datastore->get('cat_forums');
 }
 
-if($forums['forum'][$forum_id]['allow_porno_topic']) bb_die('бетатестеры вставте языковые');
+if($forums['forum'][$forum_id]['allow_porno_topic'] && bf($userdata['user_opt'], 'user_opt', 'hide_porn_forums')) bb_die($lang['ERROR_PORNO_FORUM']);
 
 if (!$forum_data['forum_parent'] && isset($forums['f'][$forum_id]['subforums']) && $show_subforums)
 {
diff --git a/upload/viewtopic.php b/upload/viewtopic.php
index e2a69f165..41b81aa9e 100644
--- a/upload/viewtopic.php
+++ b/upload/viewtopic.php
@@ -117,7 +117,7 @@ $forum_topic_data =& $t_data;
 $topic_id = $t_data['topic_id'];
 $forum_id = $t_data['forum_id'];
 
-if($t_data['allow_porno_topic']) bb_die('бетатестеры вставте языковые');
+if($t_data['allow_porno_topic'] && bf($userdata['user_opt'], 'user_opt', 'hide_porn_forums')) bb_die($lang['ERROR_PORNO_FORUM']);
 
 if ($userdata['session_admin'] && !empty($_REQUEST['mod']))
 {