r515

Замена переменной IN_PHPBB на IN_FORUM, для логического соответствия имеющейся переменной IN_TRACKER. Существование данной переменной в целом вызывает определенные вопросы, возможно в дальнейшем она будет удалена вовсе. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@515 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293

other/converter/TBDevYSE_pre6/root/convert.php

@@ -1,6 +1,6 @@
 <?php
 
-define ('IN_PHPBB', true);
+define ('IN_FORUM', true);
 define ('IN_SERVICE', true);
 define ('BB_ROOT', './');
 require (BB_ROOT .'common.php');

other/converter/TBDevYSE_pre6/root/recover.php

@@ -1,6 +1,6 @@
 <?php
 	
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_SERVICE', true);
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

other/recover/recover.php

@@ -1,6 +1,6 @@
 <?php
 	
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_SERVICE', true);
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/admin/pagestart.php

@@ -1,7 +1,7 @@
 <?php
 
 define('BB_ROOT', './../');
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_ADMIN', true);
 
 require(BB_ROOT .'common.php');

upload/admin/xs_include.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB') || !defined('IN_XS')) die(basename(__FILE__));
+if (!defined('IN_FORUM') || !defined('IN_XS')) die(basename(__FILE__));
 if(defined('XS_INCLUDED')) return;
 
 define('XS_INCLUDED', true);

upload/attach_mod/attachment_mod.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB'))
+if (!defined('IN_FORUM'))
 {
 	die('Hacking attempt');
 	exit;

upload/attach_mod/displaying.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;

upload/attach_mod/displaying_torrent.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 
 global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $images;
 

upload/attach_mod/includes/functions_thumbs.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;

upload/attach_mod/posting_attachments.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;

upload/callseed.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'callseed');
 define('BB_ROOT', './');
 require(BB_ROOT . 'common.php');

upload/common.php

@@ -7,7 +7,7 @@ define('TIMENOW',   time());
 if (isset($_REQUEST['GLOBALS']) || isset($_FILES['GLOBALS'])) die();
 
 if (!defined('BB_ROOT')) define('BB_ROOT', './');
-if (!defined('IN_PHPBB') && !defined('IN_TRACKER')) define('IN_PHPBB', true);
+if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true);
 
 // Get initial config
 require(BB_ROOT .'config.php');
@@ -2247,7 +2247,7 @@ function log_request ($file = '', $prepend_str = false, $add_post = true)
 }
 
 // Board init
-if (defined('IN_PHPBB'))
+if (defined('IN_FORUM'))
 {
 	require(INC_DIR .'init_bb.php');
 }

upload/config.php

@@ -56,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 pre-stable';
-$bb_cfg['tp_release_date'] = '26-07-2013';
-$bb_cfg['tp_release_state'] = 'R514';
+$bb_cfg['tp_release_date'] = '27-07-2013';
+$bb_cfg['tp_release_state'] = 'R515';
 
 // Database
 $charset  = 'utf8';

upload/develop/show_source.php

@@ -3,7 +3,7 @@
 // Comment the following line to enable
 die('Please REMOVE THIS FILE from your production environment!<br /><br />'. basename(__FILE__));
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_ROOT', './../');
 
 require('./dbg_config.php');

upload/dl_list.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'dl_list');
 define('IN_SERVICE', true);
 define('BB_ROOT', './');

upload/donate.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'donate');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");

upload/download.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'download');
 define('IN_SERVICE', true);
 define('NO_GZIP', true);

upload/faq.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'faq');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");

upload/gallery.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'gallery');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
@@ -13,7 +13,9 @@ if (!$bb_cfg['gallery_enabled']) bb_die($lang['GALLERY_DISABLED']);
 require(LANG_ROOT_DIR ."lang_{$userdata['user_lang']}/lang_gallery.php");
 
 if(bf($userdata['user_opt'], 'user_opt', 'allow_gallery'))
-{
	bb_die($lang['USE_GALLERY_OFF']);
}
+{
+	bb_die($lang['USE_GALLERY_OFF']);
+}
 
 $go = isset($_GET['go']) ? $_GET['go'] : '';
 $max_size = $bb_cfg['pic_max_size']*1024*1024;

upload/groupcp.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'groupcp');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");
@@ -176,7 +176,9 @@ if (!$group_id)
 	else
 	{
 		if(IS_ADMIN)
-		{
			redirect('admin/admin_groups.php');
		}
+		{
+			redirect('admin/admin_groups.php');
+		}
 		else bb_die($lang['NO_GROUPS_EXIST']);
 	}
 }

upload/includes/topic_templates/audiobooks.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/topic_templates/books.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/topic_templates/games.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/topic_templates/music.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/topic_templates/progs.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/topic_templates/sport.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/topic_templates/tpl_selects.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 
 $selects = array(
 	'SEL_VIDEO_QUALITY' => array(

upload/includes/topic_templates/video.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB')) die(basename(__FILE__));
+if (!defined('IN_FORUM')) die(basename(__FILE__));
 if (!$topic_tpl) die('$topic_tpl missing');
 
 $img_align = '=right';

upload/includes/ucp/usercp_activate.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;

upload/includes/ucp/usercp_attachcp.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die("Hacking attempt");
 	exit;

upload/includes/ucp/usercp_avatar.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;

upload/includes/ucp/usercp_email.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die("Hacking attempt");
 	exit;

upload/includes/ucp/usercp_sendpasswd.php

@@ -1,6 +1,6 @@
 <?php
 
-if ( !defined('IN_PHPBB') )
+if ( !defined('IN_FORUM') )
 {
 	die('Hacking attempt');
 	exit;

upload/index.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'index');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/login.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'login');
 define('IN_LOGIN', true);
 define('BB_ROOT', './');

upload/memberlist.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'memberlist');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/misc.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'misc');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/modcp.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'modcp');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/posting.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'posting');
 define('BB_ROOT', './');
 require(BB_ROOT ."common.php");

upload/privmsg.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'pm');
 define('IN_PM',     true);
 define('BB_ROOT', './');

upload/profile.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('IN_PROFILE', true);
 define('BB_SCRIPT', 'profile');
 define('BB_ROOT', './');

upload/report.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'report');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/templates/limit_load_exit.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_PHPBB'))	die(basename(__FILE__));
+if (!defined('IN_FORUM'))	die(basename(__FILE__));
 
 global $DBS;
 

upload/viewforum.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB',   true);
+define('IN_FORUM',   true);
 define('BB_SCRIPT', 'forum');
 define('BB_ROOT', './');
 require(BB_ROOT . "common.php");

upload/viewonline.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'online');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');

upload/viewtopic.php

@@ -1,6 +1,6 @@
 <?php
 
-define('IN_PHPBB', true);
+define('IN_FORUM', true);
 define('BB_SCRIPT', 'topic');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');