From b294eb93318c409d37318b71a9e92d08fc76f73a Mon Sep 17 00:00:00 2001
From: pherum83 <pherum83@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Thu, 28 Jul 2011 10:18:20 +0000
Subject: [PATCH] r175
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

запрет доступа для простых админов к тех страницам админки, только суперадмин имеет доступ, фикс репортов в админке, xbtt git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@175 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 install/sql/mysql.sql                         |  2 +-
 upload/admin/admin_bt_tracker_cfg.php         |  5 ++++-
 upload/admin/admin_cron.php                   |  5 ++++-
 upload/admin/admin_rebuild_search.php         |  5 ++++-
 upload/admin/admin_reports.php                |  4 ++--
 upload/config.php                             |  2 +-
 upload/includes/functions_torrent.php         | 20 +++++++++----------
 .../templates/default/report_modules_body.tpl |  8 ++++----
 8 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/install/sql/mysql.sql b/install/sql/mysql.sql
index e771d51ce..0a70e6cb5 100644
--- a/install/sql/mysql.sql
+++ b/install/sql/mysql.sql
@@ -567,7 +567,7 @@ INSERT INTO `bb_config` VALUES ('bt_add_comment', '');
 INSERT INTO `bb_config` VALUES ('bt_add_publisher', 'YourSiteName');
 INSERT INTO `bb_config` VALUES ('bt_allow_spmode_change', '1');
 INSERT INTO `bb_config` VALUES ('bt_announce_url', 'http://yourdomain.com/bt/announce.php');
-INSERT INTO `bb_config` VALUES ('bt_disable_dht', '1');
+INSERT INTO `bb_config` VALUES ('bt_disable_dht', '0');
 INSERT INTO `bb_config` VALUES ('bt_check_announce_url', '0');
 INSERT INTO `bb_config` VALUES ('bt_del_addit_ann_urls', '1');
 INSERT INTO `bb_config` VALUES ('bt_dl_list_only_1st_page', '1');
diff --git a/upload/admin/admin_bt_tracker_cfg.php b/upload/admin/admin_bt_tracker_cfg.php
index 379df0ded..ee84b8b68 100644
--- a/upload/admin/admin_bt_tracker_cfg.php
+++ b/upload/admin/admin_bt_tracker_cfg.php
@@ -3,12 +3,15 @@
 // ACP Header - START
 if (!empty($setmodules))
 {
-	$module['TorrentPier']['Tracker_Config'] = basename(__FILE__);
+	if(IS_SUPER_ADMIN){
+	$module['TorrentPier']['Tracker_Config'] = basename(__FILE__);}
 	return;
 }
 require('./pagestart.php');
 // ACP Header - END
 
+if(!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
+
 require(INC_DIR .'functions_admin_torrent.php');
 require(LANG_DIR .'lang_admin_bt.php');
 
diff --git a/upload/admin/admin_cron.php b/upload/admin/admin_cron.php
index ef7e7f1dc..b0a809704 100644
--- a/upload/admin/admin_cron.php
+++ b/upload/admin/admin_cron.php
@@ -3,7 +3,8 @@
 // ACP Header - START
 if (!empty($setmodules))
 {
-	$module['TorrentPier']['Cron'] = basename(__FILE__) . '?mode=list';
+	if(IS_SUPER_ADMIN){
+	$module['TorrentPier']['Cron'] = basename(__FILE__) . '?mode=list';}
 	return;
 }
 
@@ -33,6 +34,8 @@ else {
 }
 // ACP Header - END
 
+if(!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
+
 require(LANG_DIR .'lang_admin_cron.php');
 require(INC_DIR .'functions_admin_torrent.php');
 require(INC_DIR .'functions_admin_cron.php');
diff --git a/upload/admin/admin_rebuild_search.php b/upload/admin/admin_rebuild_search.php
index c98b7b745..1c30cdc3c 100644
--- a/upload/admin/admin_rebuild_search.php
+++ b/upload/admin/admin_rebuild_search.php
@@ -5,12 +5,15 @@
 // ACP Header - START
 if (!empty($setmodules))
 {
-	$module['General']['Rebuild_Search_Index'] = basename(__FILE__);
+	if(IS_SUPER_ADMIN){
+	$module['General']['Rebuild_Search_Index'] = basename(__FILE__);}
 	return;
 }
 require('./pagestart.php');
 // ACP Header - END
 
+if(!IS_SUPER_ADMIN) bb_die($lang['NOT_ADMIN']);
+
 require(INC_DIR .'bbcode.php');
 require(DEFAULT_LANG_DIR .'lang_admin_rebuild_search.php');
 
diff --git a/upload/admin/admin_reports.php b/upload/admin/admin_reports.php
index e7c020994..5d5727d57 100644
--- a/upload/admin/admin_reports.php
+++ b/upload/admin/admin_reports.php
@@ -1,11 +1,11 @@
 <?php
 
-if(!$bb_cfg['reports_enabled']) return;
 if (!empty($setmodules))
 {
 	$file = basename(__FILE__);
+	if($bb_cfg['reports_enabled']){
 	$module['Reports']['Modules_reasons'] = $file;
-	$module['Reports']['Configuration'] = "$file?mode=config";
+	$module['Reports']['Configuration'] = "$file?mode=config";}
 	return;
 }
 
diff --git a/upload/config.php b/upload/config.php
index 302c1df4d..057f31d3f 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.0.2';
-$bb_cfg['tp_release_state'] = 'TP II r174';
+$bb_cfg['tp_release_state'] = 'TP II r175';
 $bb_cfg['tp_release_date'] = '28-07-2011';
 
 $bb_cfg['board_disabled_msg'] = 'форум временно отключен'; // 'forums temporarily disabled'; // show this msg if board has been disabled via ON/OFF trigger
diff --git a/upload/includes/functions_torrent.php b/upload/includes/functions_torrent.php
index f80654511..0857b281e 100644
--- a/upload/includes/functions_torrent.php
+++ b/upload/includes/functions_torrent.php
@@ -557,16 +557,16 @@ function send_torrent_with_passkey ($filename)
 	}
 
 	// XBTT unique passkey
-	if($bb_cfg['announce_type'] != 'xbt')
-	{
-		$info_hash = pack('H*', sha1(bencode($tor['info'])));
-		$passkey = substr('00000000'. dechex($userdata['user_id']), -8) . substr(sha1($bb_cfg['torrent_pass_private_key'] .' '. $passkey_val .' '. $userdata['user_id'] .' '. $info_hash), 0, 24);
-		$announce = $bb_cfg['announce_xbt'] .'/'. $passkey .'/announce';
-	}
-	else
-	{
-		$announce = strval($ann_url . "?$passkey_key=$passkey_val&");
-	}
+    if($bb_cfg['announce_type'] == 'xbt')
+    {
+        $info_hash = pack('H*', sha1(bencode($tor['info'])));
+        $passkey = substr('00000000'. dechex($userdata['user_id']), -8) . substr(sha1($bb_cfg['torrent_pass_private_key'] .' '. $passkey_val .' '. $userdata['user_id'] .' '. $info_hash), 0, 24);
+        $announce = $bb_cfg['announce_xbt'] .'/'. $passkey .'/announce';
+    }
+    else
+    {
+        $announce = strval($ann_url . "?$passkey_key=$passkey_val&");
+    }
 
 	// Replace original announce url with tracker default
 	if ($bb_cfg['bt_replace_ann_url'] || !@$tor['announce'])
diff --git a/upload/templates/default/report_modules_body.tpl b/upload/templates/default/report_modules_body.tpl
index 730f7c129..da7155e96 100644
--- a/upload/templates/default/report_modules_body.tpl
+++ b/upload/templates/default/report_modules_body.tpl
@@ -9,8 +9,8 @@
 		<th class="thCornerR" width="50%">{L_ACTION}</th>
 	</tr>
 	<!-- BEGIN installed_modules -->
-	<tr>
-		<td class="catSides" colspan="3"><span class="cattitle">{L_INSTALLED_MODULES}</span></td>
+	<tr class="row3 med">
+	    <td colspan="3" class="catTitle">{L_INSTALLED_MODULES}</td>
 	</tr>
 	<!-- BEGIN modules -->
 	<tr>
@@ -39,8 +39,8 @@
 	<!-- END installed_modules -->
 	
 	<!-- BEGIN inactive_modules -->
-	<tr>
-		<td class="catSides" colspan="3"><span class="cattitle">{L_INACTIVE_MODULES}</span></td>
+	<tr class="row3 med">
+	    <td colspan="3" class="catTitle">{L_INACTIVE_MODULES}</td>
 	</tr>
 	<!-- BEGIN modules -->
 	<tr>