From ab5b86e9d0a4a5d81dd04926a24d61273e198345 Mon Sep 17 00:00:00 2001
From: nanosimbiot <nanosimbiot@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Thu, 2 Feb 2012 03:57:20 +0000
Subject: [PATCH] r351
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

фикс Бета-тестер или не зря их держем (: git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@351 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/admin/admin_board.php | 23 +++++++++++------------
 upload/config.php            |  2 +-
 upload/modcp.php             |  6 +++---
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/upload/admin/admin_board.php b/upload/admin/admin_board.php
index 88707deef..ed6aa6f62 100644
--- a/upload/admin/admin_board.php
+++ b/upload/admin/admin_board.php
@@ -3,8 +3,8 @@
 // ACP Header - START
 if (!empty($setmodules))
 {
-	$module['General']['Configuration'] = basename(__FILE__) .'?mode=config';;
-	$module['Mods']['Configuration'] = basename(__FILE__) .'?mode=config_mods';;
+	$module['General']['Configuration'] = basename(__FILE__) .'?mode=config';
+	$module['Mods']['Configuration'] = basename(__FILE__) .'?mode=config_mods';
 	return;
 }
 require('./pagestart.php');
@@ -15,8 +15,8 @@ require(INC_DIR .'functions_selects.php');
 $mode = isset($_GET['mode']) ? $_GET['mode'] : '';
 
 $return_links = array(
-	'index' => '<br /><br />'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="'. append_sid('index.php?pane=right') . '">', '</a>'),	
-	'config' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG'], '<a href="' . append_sid('admin_board.php?mode=config') . '">', '</a>'),	
+	'index' => '<br /><br />'. sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="'. append_sid('index.php?pane=right') . '">', '</a>'),
+	'config' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG'], '<a href="' . append_sid('admin_board.php?mode=config') . '">', '</a>'),
 	'config_mods' => '<br /><br />'. sprintf($lang['CLICK_RETURN_CONFIG_MODS'], '<a href="'. append_sid('admin_board.php?mode=config_mods') . '">', '</a>')
 );
 
@@ -53,7 +53,7 @@ else
 			bb_update_config(array($config_name => $new[$config_name]));
 		}
 	}
-    
+
 	if( isset($_POST['submit']) )
 	{
 		if ($mode == 'config')
@@ -73,7 +73,7 @@ switch($mode)
 	    $template->assign_vars(array(
 	        'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config_mods'),
 			'CONFIG_MODS' => true,
-			
+
 		    'REPORTS_ENABLED' => $new['reports_enabled'],
 		    'GOLD_SILVER_ENABLED' => $new['gold_silver_enabled'],
 		    'GALLERY_ENABLED' => $new['gallery_enabled'],
@@ -95,23 +95,23 @@ switch($mode)
 		    'WHOIS_INFO' => $new['whois_info'],
 	    ));
 	break;
-	
+
 	default:
 		$template->assign_vars(array(
 	        'S_CONFIG_ACTION' => append_sid('admin_board.php?mode=config'),
 			'CONFIG' => true,
-			
+
 	        'SITENAME' => htmlCHR($new['sitename']),
 		    'CONFIG_SITE_DESCRIPTION' => htmlCHR($new['site_desc']),
 		    'DISABLE_BOARD' => ($new['board_disable']) ? true : false,
-	
+
 		    'ACTIVATION_NONE' => USER_ACTIVATION_NONE,
 		    'ACTIVATION_NONE_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_NONE) ? 'checked="checked"' : '',
 		    'ACTIVATION_USER' => USER_ACTIVATION_SELF,
 		    'ACTIVATION_USER_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_SELF) ? 'checked="checked"' : '',
 		    'ACTIVATION_ADMIN' => USER_ACTIVATION_ADMIN,
 		    'ACTIVATION_ADMIN_CHECKED' => ($new['require_activation'] == USER_ACTIVATION_ADMIN) ? 'checked="checked"' : '',
-	
+
 		    'VISUAL_CONFIRM' => ($new['enable_confirm']) ? true : false,
 		    'ALLOW_AUTOLOGIN' => ($new['allow_autologin']) ? true : false,
 		    'AUTOLOGIN_TIME' => (int) $new['max_autologin_time'],
@@ -158,6 +158,5 @@ switch($mode)
 	    ));
     break;
 }
-		
+
 print_page('admin_board.tpl', 'admin');
-	
\ No newline at end of file
diff --git a/upload/config.php b/upload/config.php
index e31115f46..57d4faed0 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -63,7 +63,7 @@ $bb_cfg = $tr_cfg = $page_cfg = array();
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.4 (beta)';
-$bb_cfg['tp_release_state'] = 'R350';
+$bb_cfg['tp_release_state'] = 'R351';
 $bb_cfg['tp_release_date'] = '02-02-2012';
 
 // Database
diff --git a/upload/modcp.php b/upload/modcp.php
index 7f94fac91..cc79db463 100644
--- a/upload/modcp.php
+++ b/upload/modcp.php
@@ -255,7 +255,7 @@ switch ($mode)
 			    $datastore->enqueue('latest_news');
 			    $datastore->update('latest_news');
 		    }
-		
+
 			$net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id']));
 			if(isset($net_forums[$forum_id]) && $bb_cfg['show_network_news'] && $result)
 			{
@@ -291,7 +291,7 @@ switch ($mode)
 				$datastore->enqueue('latest_news');
 				$datastore->update('latest_news');
 			}
-		
+
 			$net_forums = array_flip(explode(',', $bb_cfg['network_news_forum_id']));
 			if((isset($news_forums[$forum_id]) || isset($news_forums[$new_forum_id])) && $bb_cfg['show_network_news'] && $result)
 			{
@@ -474,7 +474,7 @@ switch ($mode)
 				do
 				{
 					$user_id_sql .= (($user_id_sql != '') ? ', ' : '') . intval($row['poster_id']);
-					$post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($row['post_id']);;
+					$post_id_sql .= (($post_id_sql != '') ? ', ' : '') . intval($row['post_id']);
 				}
 				while ($row = DB()->sql_fetchrow($result));