aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-04-29 13:14:33 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-04-29 13:14:33 +0000
commit859902ea243824b48d2b67d806cd622746bed00f (patch)
treef2b3d40656d471499fdf61389166f0818f88a168 /phpBB/common.php
parent7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c (diff)
downloadforums-859902ea243824b48d2b67d806cd622746bed00f.tar
forums-859902ea243824b48d2b67d806cd622746bed00f.tar.gz
forums-859902ea243824b48d2b67d806cd622746bed00f.tar.bz2
forums-859902ea243824b48d2b67d806cd622746bed00f.tar.xz
forums-859902ea243824b48d2b67d806cd622746bed00f.zip
reverting changes to the installer
do not introduce a function we never call outside of common.php git-svn-id: file:///svn/phpbb/trunk@5859 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php181
1 files changed, 81 insertions, 100 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index b037d87ea9..d8307713fe 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -23,61 +23,8 @@ if (!defined('IN_PHPBB'))
$starttime = explode(' ', microtime());
$starttime = $starttime[1] + $starttime[0];
-//error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
-error_reporting(E_ALL);
-
-/**
-* Remove variables created by register_globals from the global scope
-* Thanks to Matt Kavanagh
-*/
-function deregister_globals()
-{
- $not_unset = array(
- 'GLOBALS' => true,
- '_GET' => true,
- '_POST' => true,
- '_COOKIE' => true,
- '_REQUEST' => true,
- '_SERVER' => true,
- '_SESSION' => true,
- '_ENV' => true,
- '_FILES' => true,
- 'phpEx' => true,
- 'phpbb_root_path' => true);
-
- // Not only will array_merge and array_keys give a warning if
- // a parameter is not an array, array_merge will actually fail.
- // So we check if _SESSION has been initialised.
- if (!isset($_SESSION) || !is_array($_SESSION))
- {
- $_SESSION = array();
- }
-
- // Merge all into one extremely huge array; unset
- // this later
- $input = array_merge(
- array_keys($_GET),
- array_keys($_POST),
- array_keys($_COOKIE),
- array_keys($_SERVER),
- array_keys($_SESSION),
- array_keys($_ENV),
- array_keys($_FILES)
- );
-
- foreach ($input as $varname)
- {
- if (isset($not_unset[$varname]))
- {
- // Hacking attempt. No point in continuing.
- exit;
- }
-
- unset($GLOBALS[$varname]);
- }
-
- unset($input);
-}
+error_reporting(E_ERROR | E_WARNING | E_PARSE); // This will NOT report uninitialized variables
+//error_reporting(E_ALL);
// If we are on PHP >= 6.0.0 we do not need some code
if (version_compare(phpversion(), '6.0.0-dev', '>='))
@@ -91,7 +38,54 @@ else
// Be paranoid with passed vars
if (@ini_get('register_globals') == '1' || strtolower(@ini_get('register_globals')) == 'on')
{
- deregister_globals();
+ // Remove variables created by register_globals from the global scope
+ // Thanks to Matt Kavanagh
+ $not_unset = array(
+ 'GLOBALS' => true,
+ '_GET' => true,
+ '_POST' => true,
+ '_COOKIE' => true,
+ '_REQUEST' => true,
+ '_SERVER' => true,
+ '_SESSION' => true,
+ '_ENV' => true,
+ '_FILES' => true,
+ 'phpEx' => true,
+ 'phpbb_root_path' => true
+ );
+
+ // Not only will array_merge and array_keys give a warning if
+ // a parameter is not an array, array_merge will actually fail.
+ // So we check if _SESSION has been initialised.
+ if (!isset($_SESSION) || !is_array($_SESSION))
+ {
+ $_SESSION = array();
+ }
+
+ // Merge all into one extremely huge array; unset
+ // this later
+ $input = array_merge(
+ array_keys($_GET),
+ array_keys($_POST),
+ array_keys($_COOKIE),
+ array_keys($_SERVER),
+ array_keys($_SESSION),
+ array_keys($_ENV),
+ array_keys($_FILES)
+ );
+
+ foreach ($input as $varname)
+ {
+ if (isset($not_unset[$varname]))
+ {
+ // Hacking attempt. No point in continuing.
+ exit;
+ }
+
+ unset($GLOBALS[$varname]);
+ }
+
+ unset($input);
}
define('STRIP', (get_magic_quotes_gpc()) ? true : false);
@@ -103,41 +97,33 @@ if (defined('IN_CRON'))
$phpbb_root_path = getcwd() . '/';
}
-// Run the following code if not currently installing
-if (!defined('IN_INSTALL'))
+require($phpbb_root_path . 'config.'.$phpEx);
+
+if (!defined('PHPBB_INSTALLED'))
{
- require($phpbb_root_path . 'config.'.$phpEx);
+ header('Location: install/index.'.$phpEx);
+ exit;
+}
- if (!defined('PHPBB_INSTALLED'))
+if (defined('DEBUG_EXTRA'))
+{
+ $base_memory_usage = 0;
+ if (function_exists('memory_get_usage'))
{
- header('Location: install/index.'.$phpEx);
- exit;
+ $base_memory_usage = memory_get_usage();
}
+}
- if (defined('DEBUG_EXTRA'))
- {
- $base_memory_usage = 0;
- if (function_exists('memory_get_usage'))
- {
- $base_memory_usage = memory_get_usage();
- }
- }
+// Load Extensions
+if (!empty($load_extensions))
+{
+ $load_extensions = explode(',', $load_extensions);
- // Load Extensions
- if (!empty($load_extensions))
+ foreach ($load_extensions as $extension)
{
- $load_extensions = explode(',', $load_extensions);
-
- foreach ($load_extensions as $extension)
- {
- @dl(trim($extension));
- }
+ @dl(trim($extension));
}
}
-else
-{
- $acm_type = 'file';
-}
// Include files
require($phpbb_root_path . 'includes/acm/acm_' . $acm_type . '.' . $phpEx);
@@ -147,6 +133,7 @@ require($phpbb_root_path . 'includes/session.' . $phpEx);
require($phpbb_root_path . 'includes/auth.' . $phpEx);
require($phpbb_root_path . 'includes/functions.' . $phpEx);
require($phpbb_root_path . 'includes/constants.' . $phpEx);
+require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
// Set PHP error handler to ours
set_error_handler('msg_handler');
@@ -156,28 +143,22 @@ $user = new user();
$auth = new auth();
$template = new template();
$cache = new cache();
+$db = new $sql_db();
-// Initiate DBAL if not installing
-if (!defined('IN_INSTALL'))
-{
- require($phpbb_root_path . 'includes/db/' . $dbms . '.' . $phpEx);
- $db = new $sql_db();
-
- // Connect to DB
- $db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
+// Connect to DB
+$db->sql_connect($dbhost, $dbuser, $dbpasswd, $dbname, $dbport, false);
- // We do not need this any longer, unset for safety purposes
- unset($dbpasswd);
+// We do not need this any longer, unset for safety purposes
+unset($dbpasswd);
- // Grab global variables, re-cache if necessary
- $config = $cache->obtain_config();
- $dss_seeded = false;
+// Grab global variables, re-cache if necessary
+$config = $cache->obtain_config();
+$dss_seeded = false;
- // Warn about install/ directory
- if (file_exists('install'))
- {
- // trigger_error('REMOVE_INSTALL');
- }
+// Warn about install/ directory
+if (file_exists('install'))
+{
+// trigger_error('REMOVE_INSTALL');
}
?> \ No newline at end of file
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-28 11:14:33 +0000