aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2002-03-18 14:54:25 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2002-03-18 14:54:25 +0000
commit9ec9adec4d77430ac776c5b0fd7b963fd1064ca5 (patch)
tree7801270ec3ef8462c98d9a385166a1ddc4402fa8
parenta30d780877bf89873065077c0f661d54c86704a7 (diff)
downloadforums-9ec9adec4d77430ac776c5b0fd7b963fd1064ca5.tar
forums-9ec9adec4d77430ac776c5b0fd7b963fd1064ca5.tar.gz
forums-9ec9adec4d77430ac776c5b0fd7b963fd1064ca5.tar.bz2
forums-9ec9adec4d77430ac776c5b0fd7b963fd1064ca5.tar.xz
forums-9ec9adec4d77430ac776c5b0fd7b963fd1064ca5.zip
Security updates + a few updates for chopped up functions compatibility
git-svn-id: file:///svn/phpbb/trunk@2310 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/admin/admin_board.php5
-rw-r--r--phpBB/admin/admin_db_utilities.php2
-rw-r--r--phpBB/admin/admin_disallow.php2
-rw-r--r--phpBB/admin/admin_forum_prune.php2
-rw-r--r--phpBB/admin/admin_forumauth.php2
-rw-r--r--phpBB/admin/admin_forums.php3
-rw-r--r--phpBB/admin/admin_groups.php2
-rw-r--r--phpBB/admin/admin_mass_email.php2
-rw-r--r--phpBB/admin/admin_ranks.php2
-rw-r--r--phpBB/admin/admin_smilies.php2
-rw-r--r--phpBB/admin/admin_styles.php2
-rw-r--r--phpBB/admin/admin_ug_auth.php2
-rw-r--r--phpBB/admin/admin_user_ban.php2
-rw-r--r--phpBB/admin/admin_users.php2
-rw-r--r--phpBB/admin/admin_words.php2
-rw-r--r--phpBB/admin/index.php2
-rw-r--r--phpBB/admin/page_footer_admin.php5
-rw-r--r--phpBB/admin/page_header_admin.php7
-rw-r--r--phpBB/admin/pagestart.inc5
19 files changed, 51 insertions, 2 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php
index 714d1b05f0..f22ac1ba9d 100644
--- a/phpBB/admin/admin_board.php
+++ b/phpBB/admin/admin_board.php
@@ -11,6 +11,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$file = basename(__FILE__);
@@ -23,9 +25,10 @@ if( !empty($setmodules) )
//
$phpbb_root_dir = "./../";
require('pagestart.inc');
+include($phpbb_root_dir . 'includes/functions_selects.'.$phpEx);
//
-//
+// Pull all config data
//
$sql = "SELECT *
FROM " . CONFIG_TABLE;
diff --git a/phpBB/admin/admin_db_utilities.php b/phpBB/admin/admin_db_utilities.php
index 72b019b56f..84f1527957 100644
--- a/phpBB/admin/admin_db_utilities.php
+++ b/phpBB/admin/admin_db_utilities.php
@@ -28,6 +28,8 @@
* adapted from the unoficial phpMyAdmin 2.2.0.
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_disallow.php b/phpBB/admin/admin_disallow.php
index d1f5d6f381..d9e86ffd2f 100644
--- a/phpBB/admin/admin_disallow.php
+++ b/phpBB/admin/admin_disallow.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_forum_prune.php b/phpBB/admin/admin_forum_prune.php
index b51325dee6..293c8334ab 100644
--- a/phpBB/admin/admin_forum_prune.php
+++ b/phpBB/admin/admin_forum_prune.php
@@ -19,6 +19,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_forumauth.php b/phpBB/admin/admin_forumauth.php
index 0b60cf3cb4..15b0bfac41 100644
--- a/phpBB/admin/admin_forumauth.php
+++ b/phpBB/admin/admin_forumauth.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_forums.php b/phpBB/admin/admin_forums.php
index faf51852af..230a7e1b91 100644
--- a/phpBB/admin/admin_forums.php
+++ b/phpBB/admin/admin_forums.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$file = basename(__FILE__);
@@ -32,6 +34,7 @@ if( !empty($setmodules) )
//
$phpbb_root_dir = "./../";
require('pagestart.inc');
+include($phpbb_root_dir . 'includes/functions_admin.'.$phpEx);
$forum_auth_ary = array(
"auth_view" => AUTH_ALL,
diff --git a/phpBB/admin/admin_groups.php b/phpBB/admin/admin_groups.php
index 2ee6768374..1e6bed8b26 100644
--- a/phpBB/admin/admin_groups.php
+++ b/phpBB/admin/admin_groups.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_mass_email.php b/phpBB/admin/admin_mass_email.php
index b9b707a406..02562c0ad2 100644
--- a/phpBB/admin/admin_mass_email.php
+++ b/phpBB/admin/admin_mass_email.php
@@ -19,6 +19,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_ranks.php b/phpBB/admin/admin_ranks.php
index 9fed7ea367..27287b9bec 100644
--- a/phpBB/admin/admin_ranks.php
+++ b/phpBB/admin/admin_ranks.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$file = basename(__FILE__);
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index dcf05c0200..00de33ac66 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -23,6 +23,8 @@
* This file will be used for modifying the smiley settings for a board.
**************************************************************************/
+define('IN_PHPBB', 1);
+
//
// First we do the setmodules stuff for the admin cp.
//
diff --git a/phpBB/admin/admin_styles.php b/phpBB/admin/admin_styles.php
index 805ae93617..75ac5d318d 100644
--- a/phpBB/admin/admin_styles.php
+++ b/phpBB/admin/admin_styles.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$file = basename(__FILE__);
diff --git a/phpBB/admin/admin_ug_auth.php b/phpBB/admin/admin_ug_auth.php
index 7de085c6c1..f39f9fde43 100644
--- a/phpBB/admin/admin_ug_auth.php
+++ b/phpBB/admin/admin_ug_auth.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_user_ban.php b/phpBB/admin/admin_user_ban.php
index 18ae912624..eea621dbb8 100644
--- a/phpBB/admin/admin_user_ban.php
+++ b/phpBB/admin/admin_user_ban.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_users.php b/phpBB/admin/admin_users.php
index 191bc2b496..715d684e9d 100644
--- a/phpBB/admin/admin_users.php
+++ b/phpBB/admin/admin_users.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$filename = basename(__FILE__);
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index c5698820a5..4e6894ab1a 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
if( !empty($setmodules) )
{
$file = basename(__FILE__);
diff --git a/phpBB/admin/index.php b/phpBB/admin/index.php
index a0a87431cd..99b616c4dd 100644
--- a/phpBB/admin/index.php
+++ b/phpBB/admin/index.php
@@ -20,6 +20,8 @@
*
***************************************************************************/
+define('IN_PHPBB', 1);
+
//
// Load default header
//
diff --git a/phpBB/admin/page_footer_admin.php b/phpBB/admin/page_footer_admin.php
index b0b3cbad2d..8ee1123113 100644
--- a/phpBB/admin/page_footer_admin.php
+++ b/phpBB/admin/page_footer_admin.php
@@ -20,6 +20,11 @@
*
***************************************************************************/
+if ( !defined('IN_PHPBB') )
+{
+ die("Hacking attempt");
+}
+
//
// Show the overall footer.
//
diff --git a/phpBB/admin/page_header_admin.php b/phpBB/admin/page_header_admin.php
index 7be3e34fff..1d5112559b 100644
--- a/phpBB/admin/page_header_admin.php
+++ b/phpBB/admin/page_header_admin.php
@@ -20,7 +20,12 @@
*
***************************************************************************/
-define(HEADER_INC, TRUE);
+if ( !defined('IN_PHPBB') )
+{
+ die("Hacking attempt");
+}
+
+define('HEADER_INC', true);
//
// gzip_compression
diff --git a/phpBB/admin/pagestart.inc b/phpBB/admin/pagestart.inc
index ddb642124e..f8eb9e7583 100644
--- a/phpBB/admin/pagestart.inc
+++ b/phpBB/admin/pagestart.inc
@@ -20,6 +20,11 @@
*
***************************************************************************/
+if ( !defined('IN_PHPBB') )
+{
+ die("Hacking attempt");
+}
+
define('IN_ADMIN', true);
$phpbb_root_path = "../";