Замена переменной IN_PHPBB на IN_FORUM, для логического соответствия имеющейся переменной IN_TRACKER. Существование данной переменной в целом вызывает определенные вопросы, возможно в дальнейшем она будет удалена вовсе. git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@515 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
glix08 2013-07-26 21:06:15 +00:00
commit 1bb73649f0
46 changed files with 54 additions and 50 deletions

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,6 @@
<?php <?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; if(defined('XS_INCLUDED')) return;
define('XS_INCLUDED', true); define('XS_INCLUDED', true);

View file

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

View file

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

View file

@ -1,6 +1,6 @@
<?php <?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; global $bb_cfg, $t_data, $poster_id, $is_auth, $dl_link_css, $dl_status_css, $lang, $images;

View file

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

View file

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

View file

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

View file

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

View file

@ -56,8 +56,8 @@ $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $do
// Increase number of revision after update // Increase number of revision after update
$bb_cfg['tp_version'] = '2.5 pre-stable'; $bb_cfg['tp_version'] = '2.5 pre-stable';
$bb_cfg['tp_release_date'] = '26-07-2013'; $bb_cfg['tp_release_date'] = '27-07-2013';
$bb_cfg['tp_release_state'] = 'R514'; $bb_cfg['tp_release_state'] = 'R515';
// Database // Database
$charset = 'utf8'; $charset = 'utf8';

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -1,6 +1,6 @@
<?php <?php
define('IN_PHPBB', true); define('IN_FORUM', true);
define('BB_SCRIPT', 'gallery'); define('BB_SCRIPT', 'gallery');
define('BB_ROOT', './'); define('BB_ROOT', './');
require(BB_ROOT .'common.php'); 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"); require(LANG_ROOT_DIR ."lang_{$userdata['user_lang']}/lang_gallery.php");
if(bf($userdata['user_opt'], 'user_opt', 'allow_gallery')) 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'] : ''; $go = isset($_GET['go']) ? $_GET['go'] : '';
$max_size = $bb_cfg['pic_max_size']*1024*1024; $max_size = $bb_cfg['pic_max_size']*1024*1024;

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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