From cf2f63e5337a8975fb2688269ff0462a60a13068 Mon Sep 17 00:00:00 2001
From: glix08 <glix08@a8ac35ab-4ca4-ca47-4c2d-a49a94f06293>
Date: Fri, 2 Aug 2013 20:40:30 +0000
Subject: [PATCH] r533
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Море мелких исправлений и недоработок, найденных анализатором кода. Продолжение. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@533 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
---
 upload/attach_mod/attachment_mod.php          |  7 +--
 upload/attach_mod/displaying.php              |  6 +--
 .../attach_mod/includes/functions_thumbs.php  |  6 +--
 upload/attach_mod/posting_attachments.php     |  6 +--
 upload/config.php                             | 50 ++++++++++++++++++-
 upload/develop/functions_debug.php            |  1 -
 upload/includes/ucp/usercp_activate.php       |  6 +--
 upload/includes/ucp/usercp_attachcp.php       |  6 +--
 upload/includes/ucp/usercp_avatar.php         |  6 +--
 upload/includes/ucp/usercp_email.php          |  6 +--
 upload/includes/ucp/usercp_sendpasswd.php     |  6 +--
 11 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/upload/attach_mod/attachment_mod.php b/upload/attach_mod/attachment_mod.php
index 3fa2d036c..7d7e9e3f9 100644
--- a/upload/attach_mod/attachment_mod.php
+++ b/upload/attach_mod/attachment_mod.php
@@ -1,10 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM'))
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 require(BB_ROOT .'attach_mod/includes/functions_includes.php');
 require(BB_ROOT .'attach_mod/includes/functions_attach.php');
@@ -20,7 +16,6 @@ if (defined('ATTACH_INSTALL'))
 /**
 * wrapper function for determining the correct language directory
 */
-/** @noinspection PhpInconsistentReturnPointsInspection */
 function attach_mod_get_lang($language_file)
 {
 	global $attach_config, $bb_cfg;
diff --git a/upload/attach_mod/displaying.php b/upload/attach_mod/displaying.php
index c8db7dfe2..2bafe6486 100644
--- a/upload/attach_mod/displaying.php
+++ b/upload/attach_mod/displaying.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 $allowed_extensions = array();
 $display_categories = array();
diff --git a/upload/attach_mod/includes/functions_thumbs.php b/upload/attach_mod/includes/functions_thumbs.php
index 6af6ea4ed..3ebccee35 100644
--- a/upload/attach_mod/includes/functions_thumbs.php
+++ b/upload/attach_mod/includes/functions_thumbs.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 $imagick = '';
 
diff --git a/upload/attach_mod/posting_attachments.php b/upload/attach_mod/posting_attachments.php
index b8bf2299c..1a0f69a2c 100644
--- a/upload/attach_mod/posting_attachments.php
+++ b/upload/attach_mod/posting_attachments.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 define('FILENAME_PREFIX',         false);
 define('FILENAME_PREFIX_LENGTH',  6);
diff --git a/upload/config.php b/upload/config.php
index 6167ab469..b79909743 100644
--- a/upload/config.php
+++ b/upload/config.php
@@ -1,5 +1,51 @@
 <?php
 
+/**
+  * Database
+  * Cache
+    - Tracker Cache
+    - Forum Cache
+    - Session Cache
+    - Datastore
+  * Tracker
+  * Torrents
+    - Ratio limits
+    - Seeding torrents limit
+    - DL-Status (days to keep)
+    - Tor-Stats (days to keep)
+    - Tor-Help
+  * Path
+  * Language
+  * Templates
+  * Cookie
+  * Server
+    - Server load
+    - Backup
+    - GZip
+  * Sessions
+  * Registration
+  * Email
+  * AJAX
+  * Debug
+  * Special users (dbg_users, unlimited_users, super_admins)
+  * LOG
+  * Error reporting
+
+  * Subforums
+  * Forums
+  * Topics
+  * Posts
+  * Search
+  * Actions log
+  * Users
+  * GroupCP
+
+  * Ads
+  * Misc
+  * Captcha
+
+**/
+
 if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 $bb_cfg = $tr_cfg = $page_cfg = array();
@@ -10,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
 
 // Increase number of revision after update
 $bb_cfg['tp_version'] = '2.5 (unstable)';
-$bb_cfg['tp_release_date'] = '02-08-2013';
-$bb_cfg['tp_release_state'] = 'R532';
+$bb_cfg['tp_release_date'] = '03-08-2013';
+$bb_cfg['tp_release_state'] = 'R533';
 
 // Database
 $charset  = 'utf8';
diff --git a/upload/develop/functions_debug.php b/upload/develop/functions_debug.php
index ecc968111..89f04b22b 100644
--- a/upload/develop/functions_debug.php
+++ b/upload/develop/functions_debug.php
@@ -36,7 +36,6 @@ function showSource ($file, $line, $prev = 10, $next = 10, $add_view_full_link =
 	if (!(file_exists($file) && is_file($file)))
 	{
 		return trigger_error("showSource() failed, file does not exist `$file`", E_USER_ERROR);
-		return false;
 	}
 	ob_start();
 
diff --git a/upload/includes/ucp/usercp_activate.php b/upload/includes/ucp/usercp_activate.php
index 2c7c60f12..3389c3da5 100644
--- a/upload/includes/ucp/usercp_activate.php
+++ b/upload/includes/ucp/usercp_activate.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die('Hacking attempt');
 
 if (empty($_GET['u']) || empty($_GET['act_key']))
 {
diff --git a/upload/includes/ucp/usercp_attachcp.php b/upload/includes/ucp/usercp_attachcp.php
index d0102ab69..2d937b23b 100644
--- a/upload/includes/ucp/usercp_attachcp.php
+++ b/upload/includes/ucp/usercp_attachcp.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die("Hacking attempt");
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 require(BB_ROOT .'attach_mod/attachment_mod.php');
 
diff --git a/upload/includes/ucp/usercp_avatar.php b/upload/includes/ucp/usercp_avatar.php
index 7a4d4bc12..9b2c4a3ba 100644
--- a/upload/includes/ucp/usercp_avatar.php
+++ b/upload/includes/ucp/usercp_avatar.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 function check_image_type(&$type, &$errors)
 {
diff --git a/upload/includes/ucp/usercp_email.php b/upload/includes/ucp/usercp_email.php
index f550835d1..d882a1c51 100644
--- a/upload/includes/ucp/usercp_email.php
+++ b/upload/includes/ucp/usercp_email.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die("Hacking attempt");
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 // Is send through board enabled? No, return to index
 if (!$bb_cfg['board_email_form'])
diff --git a/upload/includes/ucp/usercp_sendpasswd.php b/upload/includes/ucp/usercp_sendpasswd.php
index 46ccb4679..c96c36a5e 100644
--- a/upload/includes/ucp/usercp_sendpasswd.php
+++ b/upload/includes/ucp/usercp_sendpasswd.php
@@ -1,10 +1,6 @@
 <?php
 
-if ( !defined('IN_FORUM') )
-{
-	die('Hacking attempt');
-	exit;
-}
+if (!defined('IN_FORUM')) die("Hacking attempt");
 
 if ($bb_cfg['emailer_disabled']) bb_die($lang['EMAILER_DISABLED']);