Удаление IN_FORUM

Лишние определения констант.

admin/pagestart.php

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

callseed.php

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

common.php

@@ -12,7 +12,6 @@ if (empty($_SERVER['HTTP_REFERER']))    $_SERVER['HTTP_REFERER'] = '';
 if (empty($_SERVER['SERVER_NAME']))     $_SERVER['SERVER_NAME'] = '';
 
 if (!defined('BB_ROOT')) define('BB_ROOT', './');
-if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true);
 
 header('X-Frame-Options: SAMEORIGIN');
 
@@ -476,7 +475,7 @@ function log_request ($file = '', $prepend_str = false, $add_post = true)
 }
 
 // Board init
-if (defined('IN_FORUM'))
+if (!defined('IN_TRACKER'))
 {
 	require(INC_DIR .'init_bb.php');
 }

dl.php

@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'dl');
 define('NO_GZIP', true);
 define('BB_ROOT',  './');

dl_list.php

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

feed.php

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

group.php

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

group_edit.php

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

index.php

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

install/upgrade/r496-user_birthday.php

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

install/upgrade/r571-dl_upgrade.php

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

install/upgrade/r575-poll_upgrade.php

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

install/upgrade/r583-convert_avatars.php

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

install/upgrade/r588-short_lang.php

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

install/upgrade/r600-stable.php

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

library/attach_mod/attachment_mod.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 require(ATTACH_DIR .'includes/functions_includes.php');
 require(ATTACH_DIR .'includes/functions_attach.php');
 require(ATTACH_DIR .'includes/functions_delete.php');

library/attach_mod/displaying.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 $allowed_extensions = array();
 $display_categories = array();
 $download_modes = array();

library/attach_mod/displaying_torrent.php

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

library/attach_mod/includes/functions_thumbs.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 $imagick = '';
 
 /**

library/attach_mod/posting_attachments.php

@@ -1,7 +1,5 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
-
 define('FILENAME_PREFIX',         false);
 define('FILENAME_PREFIX_LENGTH',  6);
 define('FILENAME_MAX_LENGTH',     180);

library/includes/ucp/activate.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die('Hacking attempt');
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 if (empty($_GET['u']) || empty($_GET['act_key']))
 {

library/includes/ucp/email.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 // Is send through board enabled? No, return to index
 if (!$bb_cfg['board_email_form'])

library/includes/ucp/sendpasswd.php

@@ -1,6 +1,6 @@
 <?php
 
-if (!defined('IN_FORUM')) die("Hacking attempt");
+if (!defined('BB_ROOT')) die(basename(__FILE__));
 
 set_die_append_msg();
 

login.php

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

memberlist.php

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

modcp.php

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

posting.php

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

privmsg.php

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

viewforum.php

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

viewtopic.php

@@ -1,6 +1,5 @@
 <?php
 
-define('IN_FORUM', true);
 define('BB_SCRIPT', 'topic');
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
@@ -61,32 +60,6 @@ if (!$topic_id && !$post_id)
 $tracking_topics = get_tracks('topic');
 $tracking_forums = get_tracks('forum');
 
-// Find topic id if user requested a newer or older topic
-if ($topic_id && isset($_GET['view']) && ($_GET['view'] == 'next' || $_GET['view'] == 'previous'))
-{
-	$sql_condition = ($_GET['view'] == 'next') ? '>' : '<';
-	$sql_ordering = ($_GET['view'] == 'next') ? 'ASC' : 'DESC';
-
-	$sql = "SELECT t.topic_id
-		FROM ". BB_TOPICS ." t, ". BB_TOPICS ." t2
-		WHERE t2.topic_id = $topic_id
-			AND t.forum_id = t2.forum_id
-			AND t.topic_moved_id = 0
-			AND t.topic_last_post_id $sql_condition t2.topic_last_post_id
-		ORDER BY t.topic_last_post_id $sql_ordering
-		LIMIT 1";
-
-	if ($row = DB()->fetch_row($sql))
-	{
-		$next_topic_id = $topic_id = $row['topic_id'];
-	}
-	else
-	{
-		$message = ($_GET['view'] == 'next') ? $lang['NO_NEWER_TOPICS'] : $lang['NO_OLDER_TOPICS'];
-		bb_die($message);
-	}
-}
-
 // Get forum/topic data
 if ($topic_id)
 {