mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Merge pull request #2255 from hafriedlander/fix/flush_30
Split Core.php into Constants.php and Core.php and adjust main.php startup
This commit is contained in:
Sam Minnée
commit
88d0cbea62
202
core/Constants.php
Normal file
202
core/Constants.php
Normal file
@ -0,0 +1,202 @@
|
||||
<?php
|
||||
/**
|
||||
* This file is the Framework constants bootstrap. It will prepare some basic common constants.
|
||||
*
|
||||
* It takes care of:
|
||||
* - Including _ss_environment.php
|
||||
* - Normalisation of $_SERVER values
|
||||
* - Initialisation of necessary constants (mostly paths)
|
||||
*
|
||||
* Initialized constants:
|
||||
* - BASE_URL: Full URL to the webroot, e.g. "http://my-host.com/my-webroot" (no trailing slash).
|
||||
* - BASE_PATH: Absolute path to the webroot, e.g. "/var/www/my-webroot" (no trailing slash).
|
||||
* See Director::baseFolder(). Can be overwritten by Director::setBaseFolder().
|
||||
* - TEMP_FOLDER: Absolute path to temporary folder, used for manifest and template caches. Example: "/var/tmp"
|
||||
* See getTempFolder(). No trailing slash.
|
||||
* - MODULES_DIR: Not used at the moment
|
||||
* - MODULES_PATH: Not used at the moment
|
||||
* - THEMES_DIR: Path relative to webroot, e.g. "themes"
|
||||
* - THEMES_PATH: Absolute filepath, e.g. "/var/www/my-webroot/themes"
|
||||
* - FRAMEWORK_DIR: Path relative to webroot, e.g. "framework"
|
||||
* - FRAMEWORK_PATH:Absolute filepath, e.g. "/var/www/my-webroot/framework"
|
||||
* - FRAMEWORK_ADMIN_DIR: Path relative to webroot, e.g. "framework/admin"
|
||||
* - FRAMEWORK_ADMIN_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/admin"
|
||||
* - THIRDPARTY_DIR: Path relative to webroot, e.g. "framework/thirdparty"
|
||||
* - THIRDPARTY_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/thirdparty"
|
||||
*
|
||||
* @package framework
|
||||
* @subpackage core
|
||||
*/
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ENVIRONMENT CONFIG
|
||||
|
||||
/**
|
||||
* Include _ss_environment.php files
|
||||
*/
|
||||
//define the name of the environment file
|
||||
$envFile = '_ss_environment.php';
|
||||
//define the dir to start scanning from (have to add the trailing slash)
|
||||
$dir = '.';
|
||||
//check this dir and every parent dir (until we hit the base of the drive)
|
||||
do {
|
||||
$dir = realpath($dir) . '/';
|
||||
//if the file exists, then we include it, set relevant vars and break out
|
||||
if (file_exists($dir . $envFile)) {
|
||||
define('SS_ENVIRONMENT_FILE', $dir . $envFile);
|
||||
include_once(SS_ENVIRONMENT_FILE);
|
||||
break;
|
||||
}
|
||||
//here we need to check that the real path of the last dir and the next one are
|
||||
// not the same, if they are, we have hit the root of the drive
|
||||
} while (realpath($dir) != realpath($dir .= '../'));
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// GLOBALS AND DEFINE SETTING
|
||||
|
||||
/**
|
||||
* A blank HTTP_HOST value is used to detect command-line execution.
|
||||
* We update the $_SERVER variable to contain data consistent with the rest of the application.
|
||||
*/
|
||||
if(!isset($_SERVER['HTTP_HOST'])) {
|
||||
// HTTP_HOST, REQUEST_PORT, SCRIPT_NAME, and PHP_SELF
|
||||
if(isset($_FILE_TO_URL_MAPPING)) {
|
||||
$fullPath = $testPath = realpath($_SERVER['SCRIPT_FILENAME']);
|
||||
while($testPath && $testPath != '/' && !preg_match('/^[A-Z]:\\\\$/', $testPath)) {
|
||||
if(isset($_FILE_TO_URL_MAPPING[$testPath])) {
|
||||
$url = $_FILE_TO_URL_MAPPING[$testPath]
|
||||
. str_replace(DIRECTORY_SEPARATOR, '/', substr($fullPath,strlen($testPath)));
|
||||
|
||||
$components = parse_url($url);
|
||||
$_SERVER['HTTP_HOST'] = $components['host'];
|
||||
if(!empty($components['port'])) $_SERVER['HTTP_HOST'] .= ':' . $components['port'];
|
||||
$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'] = $components['path'];
|
||||
if(!empty($components['port'])) $_SERVER['REQUEST_PORT'] = $components['port'];
|
||||
break;
|
||||
}
|
||||
$testPath = dirname($testPath);
|
||||
}
|
||||
}
|
||||
|
||||
// Everything else
|
||||
$serverDefaults = array(
|
||||
'SERVER_PROTOCOL' => 'HTTP/1.1',
|
||||
'HTTP_ACCEPT' => 'text/plain;q=0.5',
|
||||
'HTTP_ACCEPT_LANGUAGE' => '*;q=0.5',
|
||||
'HTTP_ACCEPT_ENCODING' => '',
|
||||
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1;q=0.5',
|
||||
'SERVER_SIGNATURE' => 'Command-line PHP/' . phpversion(),
|
||||
'SERVER_SOFTWARE' => 'PHP/' . phpversion(),
|
||||
'SERVER_ADDR' => '127.0.0.1',
|
||||
'REMOTE_ADDR' => '127.0.0.1',
|
||||
'REQUEST_METHOD' => 'GET',
|
||||
'HTTP_USER_AGENT' => 'CLI',
|
||||
);
|
||||
|
||||
$_SERVER = array_merge($serverDefaults, $_SERVER);
|
||||
|
||||
/**
|
||||
* If we have an HTTP_HOST value, then we're being called from the webserver and there are some things that
|
||||
* need checking
|
||||
*/
|
||||
} else {
|
||||
/**
|
||||
* Fix magic quotes setting
|
||||
*/
|
||||
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
|
||||
if($_REQUEST) stripslashes_recursively($_REQUEST);
|
||||
if($_GET) stripslashes_recursively($_GET);
|
||||
if($_POST) stripslashes_recursively($_POST);
|
||||
if($_COOKIE) stripslashes_recursively($_COOKIE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fix HTTP_HOST from reverse proxies
|
||||
*/
|
||||
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
|
||||
// Get the first host, in case there's multiple separated through commas
|
||||
$_SERVER['HTTP_HOST'] = strtok($_SERVER['HTTP_X_FORWARDED_HOST'], ',');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Define system paths
|
||||
*/
|
||||
if(!defined('BASE_PATH')) {
|
||||
// Assuming that this file is framework/core/Core.php we can then determine the base path
|
||||
$candidateBasePath = rtrim(dirname(dirname(dirname(__FILE__))), DIRECTORY_SEPARATOR);
|
||||
// We can't have an empty BASE_PATH. Making it / means that double-slashes occur in places but that's benign.
|
||||
// This likely only happens on chrooted environemnts
|
||||
if($candidateBasePath == '') $candidateBasePath = DIRECTORY_SEPARATOR;
|
||||
define('BASE_PATH', $candidateBasePath);
|
||||
}
|
||||
if(!defined('BASE_URL')) {
|
||||
// Determine the base URL by comparing SCRIPT_NAME to SCRIPT_FILENAME and getting common elements
|
||||
$path = realpath($_SERVER['SCRIPT_FILENAME']);
|
||||
if(substr($path, 0, strlen(BASE_PATH)) == BASE_PATH) {
|
||||
$urlSegmentToRemove = substr($path, strlen(BASE_PATH));
|
||||
if(substr($_SERVER['SCRIPT_NAME'], -strlen($urlSegmentToRemove)) == $urlSegmentToRemove) {
|
||||
$baseURL = substr($_SERVER['SCRIPT_NAME'], 0, -strlen($urlSegmentToRemove));
|
||||
define('BASE_URL', rtrim($baseURL, DIRECTORY_SEPARATOR));
|
||||
}
|
||||
}
|
||||
|
||||
// If that didn't work, failover to the old syntax. Hopefully this isn't necessary, and maybe
|
||||
// if can be phased out?
|
||||
if(!defined('BASE_URL')) {
|
||||
$dir = (strpos($_SERVER['SCRIPT_NAME'], 'index.php') !== false)
|
||||
? dirname($_SERVER['SCRIPT_NAME'])
|
||||
: dirname(dirname($_SERVER['SCRIPT_NAME']));
|
||||
define('BASE_URL', rtrim($dir, DIRECTORY_SEPARATOR));
|
||||
}
|
||||
}
|
||||
define('MODULES_DIR', 'modules');
|
||||
define('MODULES_PATH', BASE_PATH . '/' . MODULES_DIR);
|
||||
define('THEMES_DIR', 'themes');
|
||||
define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR);
|
||||
// Relies on this being in a subdir of the framework.
|
||||
// If it isn't, or is symlinked to a folder with a different name, you must define FRAMEWORK_DIR
|
||||
if(!defined('FRAMEWORK_DIR')) {
|
||||
define('FRAMEWORK_DIR', basename(dirname(dirname(__FILE__))));
|
||||
}
|
||||
define('FRAMEWORK_PATH', BASE_PATH . '/' . FRAMEWORK_DIR);
|
||||
define('FRAMEWORK_ADMIN_DIR', FRAMEWORK_DIR . '/admin');
|
||||
define('FRAMEWORK_ADMIN_PATH', BASE_PATH . '/' . FRAMEWORK_ADMIN_DIR);
|
||||
|
||||
// These are all deprecated. Use the FRAMEWORK_ versions instead.
|
||||
define('SAPPHIRE_DIR', FRAMEWORK_DIR);
|
||||
define('SAPPHIRE_PATH', FRAMEWORK_PATH);
|
||||
define('SAPPHIRE_ADMIN_DIR', FRAMEWORK_ADMIN_DIR);
|
||||
define('SAPPHIRE_ADMIN_PATH', FRAMEWORK_ADMIN_PATH);
|
||||
|
||||
define('THIRDPARTY_DIR', FRAMEWORK_DIR . '/thirdparty');
|
||||
define('THIRDPARTY_PATH', BASE_PATH . '/' . THIRDPARTY_DIR);
|
||||
define('ASSETS_DIR', 'assets');
|
||||
define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// INCLUDES
|
||||
|
||||
if(defined('CUSTOM_INCLUDE_PATH')) {
|
||||
$includePath = '.' . PATH_SEPARATOR . CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
|
||||
. FRAMEWORK_PATH . PATH_SEPARATOR
|
||||
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
|
||||
. THIRDPARTY_PATH . PATH_SEPARATOR
|
||||
. get_include_path();
|
||||
} else {
|
||||
$includePath = '.' . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
|
||||
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
|
||||
. THIRDPARTY_PATH . PATH_SEPARATOR
|
||||
. get_include_path();
|
||||
}
|
||||
|
||||
set_include_path($includePath);
|
||||
|
||||
/**
|
||||
* Define the temporary folder if it wasn't defined yet
|
||||
*/
|
||||
require_once 'core/TempPath.php';
|
||||
|
||||
if(!defined('TEMP_FOLDER')) {
|
||||
define('TEMP_FOLDER', getTempFolder(BASE_PATH));
|
||||
}
|
||||
206
core/Core.php
206
core/Core.php
@ -3,215 +3,29 @@
|
||||
* This file is the Framework bootstrap. It will get your environment ready to call Director::direct().
|
||||
*
|
||||
* It takes care of:
|
||||
* - Including _ss_environment.php
|
||||
* - Normalisation of $_SERVER values
|
||||
* - Initialisation of necessary constants (mostly paths)
|
||||
* - Including Constants.php to include _ss_environment and initialise necessary constants
|
||||
* - Checking of PHP memory limit
|
||||
* - Including all the files needed to get the manifest built
|
||||
* - Building and including the manifest
|
||||
*
|
||||
* Initialized constants:
|
||||
* - BASE_URL: Full URL to the webroot, e.g. "http://my-host.com/my-webroot" (no trailing slash).
|
||||
* - BASE_PATH: Absolute path to the webroot, e.g. "/var/www/my-webroot" (no trailing slash).
|
||||
* See Director::baseFolder(). Can be overwritten by Director::setBaseFolder().
|
||||
* - TEMP_FOLDER: Absolute path to temporary folder, used for manifest and template caches. Example: "/var/tmp"
|
||||
* See getTempFolder(). No trailing slash.
|
||||
* - MODULES_DIR: Not used at the moment
|
||||
* - MODULES_PATH: Not used at the moment
|
||||
* - THEMES_DIR: Path relative to webroot, e.g. "themes"
|
||||
* - THEMES_PATH: Absolute filepath, e.g. "/var/www/my-webroot/themes"
|
||||
* - FRAMEWORK_DIR: Path relative to webroot, e.g. "framework"
|
||||
* - FRAMEWORK_PATH:Absolute filepath, e.g. "/var/www/my-webroot/framework"
|
||||
* - FRAMEWORK_ADMIN_DIR: Path relative to webroot, e.g. "framework/admin"
|
||||
* - FRAMEWORK_ADMIN_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/admin"
|
||||
* - THIRDPARTY_DIR: Path relative to webroot, e.g. "framework/thirdparty"
|
||||
* - THIRDPARTY_PATH: Absolute filepath, e.g. "/var/www/my-webroot/framework/thirdparty"
|
||||
*
|
||||
*
|
||||
* @todo This file currently contains a lot of bits and pieces, and its various responsibilities should probably be
|
||||
* moved into different subsystems.
|
||||
* @todo A lot of this stuff is very order-independent; for example, the require_once calls have to happen after the
|
||||
* defines.'
|
||||
* This could be decoupled.
|
||||
* @todo A lot of this stuff is very order-dependent. This could be decoupled.
|
||||
*
|
||||
* @package framework
|
||||
* @subpackage core
|
||||
*/
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// ENVIRONMENT CONFIG
|
||||
|
||||
// ALL errors are reported, including E_STRICT by default *unless* the site is in
|
||||
// live mode, where reporting is limited to fatal errors and warnings (see later in this file)
|
||||
/**
|
||||
* All errors are reported, including E_STRICT by default *unless* the site is in
|
||||
* live mode, where reporting is limited to fatal errors and warnings (see later in this file)
|
||||
*/
|
||||
error_reporting(E_ALL | E_STRICT);
|
||||
|
||||
/**
|
||||
* Include _ss_environment.php files
|
||||
* Include Constants (if it hasn't already been included) to pull in BASE_PATH, etc
|
||||
*/
|
||||
//define the name of the environment file
|
||||
$envFile = '_ss_environment.php';
|
||||
//define the dir to start scanning from (have to add the trailing slash)
|
||||
$dir = '.';
|
||||
//check this dir and every parent dir (until we hit the base of the drive)
|
||||
do {
|
||||
$dir = realpath($dir) . '/';
|
||||
//if the file exists, then we include it, set relevant vars and break out
|
||||
if (file_exists($dir . $envFile)) {
|
||||
define('SS_ENVIRONMENT_FILE', $dir . $envFile);
|
||||
include_once(SS_ENVIRONMENT_FILE);
|
||||
break;
|
||||
}
|
||||
//here we need to check that the real path of the last dir and the next one are
|
||||
// not the same, if they are, we have hit the root of the drive
|
||||
} while (realpath($dir) != realpath($dir .= '../'));
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// GLOBALS AND DEFINE SETTING
|
||||
|
||||
/**
|
||||
* A blank HTTP_HOST value is used to detect command-line execution.
|
||||
* We update the $_SERVER variable to contain data consistent with the rest of the application.
|
||||
*/
|
||||
if(!isset($_SERVER['HTTP_HOST'])) {
|
||||
// HTTP_HOST, REQUEST_PORT, SCRIPT_NAME, and PHP_SELF
|
||||
if(isset($_FILE_TO_URL_MAPPING)) {
|
||||
$fullPath = $testPath = realpath($_SERVER['SCRIPT_FILENAME']);
|
||||
while($testPath && $testPath != '/' && !preg_match('/^[A-Z]:\\\\$/', $testPath)) {
|
||||
if(isset($_FILE_TO_URL_MAPPING[$testPath])) {
|
||||
$url = $_FILE_TO_URL_MAPPING[$testPath]
|
||||
. str_replace(DIRECTORY_SEPARATOR, '/', substr($fullPath,strlen($testPath)));
|
||||
|
||||
$components = parse_url($url);
|
||||
$_SERVER['HTTP_HOST'] = $components['host'];
|
||||
if(!empty($components['port'])) $_SERVER['HTTP_HOST'] .= ':' . $components['port'];
|
||||
$_SERVER['SCRIPT_NAME'] = $_SERVER['PHP_SELF'] = $components['path'];
|
||||
if(!empty($components['port'])) $_SERVER['REQUEST_PORT'] = $components['port'];
|
||||
break;
|
||||
}
|
||||
$testPath = dirname($testPath);
|
||||
}
|
||||
}
|
||||
|
||||
// Everything else
|
||||
$serverDefaults = array(
|
||||
'SERVER_PROTOCOL' => 'HTTP/1.1',
|
||||
'HTTP_ACCEPT' => 'text/plain;q=0.5',
|
||||
'HTTP_ACCEPT_LANGUAGE' => '*;q=0.5',
|
||||
'HTTP_ACCEPT_ENCODING' => '',
|
||||
'HTTP_ACCEPT_CHARSET' => 'ISO-8859-1;q=0.5',
|
||||
'SERVER_SIGNATURE' => 'Command-line PHP/' . phpversion(),
|
||||
'SERVER_SOFTWARE' => 'PHP/' . phpversion(),
|
||||
'SERVER_ADDR' => '127.0.0.1',
|
||||
'REMOTE_ADDR' => '127.0.0.1',
|
||||
'REQUEST_METHOD' => 'GET',
|
||||
'HTTP_USER_AGENT' => 'CLI',
|
||||
);
|
||||
|
||||
$_SERVER = array_merge($serverDefaults, $_SERVER);
|
||||
|
||||
/**
|
||||
* If we have an HTTP_HOST value, then we're being called from the webserver and there are some things that
|
||||
* need checking
|
||||
*/
|
||||
} else {
|
||||
/**
|
||||
* Fix magic quotes setting
|
||||
*/
|
||||
if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) {
|
||||
if($_REQUEST) stripslashes_recursively($_REQUEST);
|
||||
if($_GET) stripslashes_recursively($_GET);
|
||||
if($_POST) stripslashes_recursively($_POST);
|
||||
if($_COOKIE) stripslashes_recursively($_COOKIE);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fix HTTP_HOST from reverse proxies
|
||||
*/
|
||||
if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
|
||||
// Get the first host, in case there's multiple separated through commas
|
||||
$_SERVER['HTTP_HOST'] = strtok($_SERVER['HTTP_X_FORWARDED_HOST'], ',');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Define system paths
|
||||
*/
|
||||
if(!defined('BASE_PATH')) {
|
||||
// Assuming that this file is framework/core/Core.php we can then determine the base path
|
||||
$candidateBasePath = rtrim(dirname(dirname(dirname(__FILE__))), DIRECTORY_SEPARATOR);
|
||||
// We can't have an empty BASE_PATH. Making it / means that double-slashes occur in places but that's benign.
|
||||
// This likely only happens on chrooted environemnts
|
||||
if($candidateBasePath == '') $candidateBasePath = DIRECTORY_SEPARATOR;
|
||||
define('BASE_PATH', $candidateBasePath);
|
||||
}
|
||||
if(!defined('BASE_URL')) {
|
||||
// Determine the base URL by comparing SCRIPT_NAME to SCRIPT_FILENAME and getting common elements
|
||||
$path = realpath($_SERVER['SCRIPT_FILENAME']);
|
||||
if(substr($path, 0, strlen(BASE_PATH)) == BASE_PATH) {
|
||||
$urlSegmentToRemove = substr($path, strlen(BASE_PATH));
|
||||
if(substr($_SERVER['SCRIPT_NAME'], -strlen($urlSegmentToRemove)) == $urlSegmentToRemove) {
|
||||
$baseURL = substr($_SERVER['SCRIPT_NAME'], 0, -strlen($urlSegmentToRemove));
|
||||
define('BASE_URL', rtrim($baseURL, DIRECTORY_SEPARATOR));
|
||||
}
|
||||
}
|
||||
|
||||
// If that didn't work, failover to the old syntax. Hopefully this isn't necessary, and maybe
|
||||
// if can be phased out?
|
||||
if(!defined('BASE_URL')) {
|
||||
$dir = (strpos($_SERVER['SCRIPT_NAME'], 'index.php') !== false)
|
||||
? dirname($_SERVER['SCRIPT_NAME'])
|
||||
: dirname(dirname($_SERVER['SCRIPT_NAME']));
|
||||
define('BASE_URL', rtrim($dir, DIRECTORY_SEPARATOR));
|
||||
}
|
||||
}
|
||||
define('MODULES_DIR', 'modules');
|
||||
define('MODULES_PATH', BASE_PATH . '/' . MODULES_DIR);
|
||||
define('THEMES_DIR', 'themes');
|
||||
define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR);
|
||||
// Relies on this being in a subdir of the framework.
|
||||
// If it isn't, or is symlinked to a folder with a different name, you must define FRAMEWORK_DIR
|
||||
if(!defined('FRAMEWORK_DIR')) {
|
||||
define('FRAMEWORK_DIR', basename(dirname(dirname(__FILE__))));
|
||||
}
|
||||
define('FRAMEWORK_PATH', BASE_PATH . '/' . FRAMEWORK_DIR);
|
||||
define('FRAMEWORK_ADMIN_DIR', FRAMEWORK_DIR . '/admin');
|
||||
define('FRAMEWORK_ADMIN_PATH', BASE_PATH . '/' . FRAMEWORK_ADMIN_DIR);
|
||||
|
||||
// These are all deprecated. Use the FRAMEWORK_ versions instead.
|
||||
define('SAPPHIRE_DIR', FRAMEWORK_DIR);
|
||||
define('SAPPHIRE_PATH', FRAMEWORK_PATH);
|
||||
define('SAPPHIRE_ADMIN_DIR', FRAMEWORK_ADMIN_DIR);
|
||||
define('SAPPHIRE_ADMIN_PATH', FRAMEWORK_ADMIN_PATH);
|
||||
|
||||
define('THIRDPARTY_DIR', FRAMEWORK_DIR . '/thirdparty');
|
||||
define('THIRDPARTY_PATH', BASE_PATH . '/' . THIRDPARTY_DIR);
|
||||
define('ASSETS_DIR', 'assets');
|
||||
define('ASSETS_PATH', BASE_PATH . '/' . ASSETS_DIR);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// INCLUDES
|
||||
|
||||
if(defined('CUSTOM_INCLUDE_PATH')) {
|
||||
$includePath = '.' . PATH_SEPARATOR . CUSTOM_INCLUDE_PATH . PATH_SEPARATOR
|
||||
. FRAMEWORK_PATH . PATH_SEPARATOR
|
||||
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
|
||||
. THIRDPARTY_PATH . PATH_SEPARATOR
|
||||
. get_include_path();
|
||||
} else {
|
||||
$includePath = '.' . PATH_SEPARATOR . FRAMEWORK_PATH . PATH_SEPARATOR
|
||||
. FRAMEWORK_PATH . '/parsers' . PATH_SEPARATOR
|
||||
. THIRDPARTY_PATH . PATH_SEPARATOR
|
||||
. get_include_path();
|
||||
}
|
||||
|
||||
set_include_path($includePath);
|
||||
|
||||
/**
|
||||
* Define the temporary folder if it wasn't defined yet
|
||||
*/
|
||||
require_once 'core/TempPath.php';
|
||||
|
||||
if(!defined('TEMP_FOLDER')) {
|
||||
define('TEMP_FOLDER', getTempFolder(BASE_PATH));
|
||||
}
|
||||
require_once dirname(__FILE__).'/Constants.php';
|
||||
|
||||
/**
|
||||
* Priorities definition. These constants are used in calls to _t() as an optional argument
|
||||
|
||||
@ -9,8 +9,6 @@
|
||||
* Normal errors are suppressed even past the end of the chain. Fatal errors are only suppressed until the end
|
||||
* of the chain - the request will then die silently.
|
||||
*
|
||||
* The exception is if an error occurs and BASE_URL is not yet set - in that case the error is never suppressed.
|
||||
*
|
||||
* Usage:
|
||||
*
|
||||
* $chain = new ErrorControlChain();
|
||||
@ -20,6 +18,8 @@
|
||||
* It will likely be heavily refactored before the release of 3.2
|
||||
*/
|
||||
class ErrorControlChain {
|
||||
public static $fatal_errors = null; // Initialised after class definition
|
||||
|
||||
protected $error = false;
|
||||
protected $steps = array();
|
||||
|
||||
@ -68,9 +68,13 @@ class ErrorControlChain {
|
||||
return $this->then($callback, null);
|
||||
}
|
||||
|
||||
public function handleError() {
|
||||
if ($this->suppression && defined('BASE_URL')) throw new Exception('Generic Error');
|
||||
else return false;
|
||||
public function handleError($errno, $errstr) {
|
||||
if ((error_reporting() & self::$fatal_errors & $errno) != 0 && $this->suppression) {
|
||||
throw new Exception('Generic Error');
|
||||
}
|
||||
else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
protected function lastErrorWasFatal() {
|
||||
@ -79,7 +83,7 @@ class ErrorControlChain {
|
||||
}
|
||||
|
||||
public function handleFatalError() {
|
||||
if ($this->handleFatalErrors && $this->suppression && defined('BASE_URL')) {
|
||||
if ($this->handleFatalErrors && $this->suppression) {
|
||||
if ($this->lastErrorWasFatal()) {
|
||||
ob_clean();
|
||||
$this->error = true;
|
||||
@ -89,7 +93,7 @@ class ErrorControlChain {
|
||||
}
|
||||
|
||||
public function execute() {
|
||||
set_error_handler(array($this, 'handleError'), error_reporting());
|
||||
set_error_handler(array($this, 'handleError'));
|
||||
register_shutdown_function(array($this, 'handleFatalError'));
|
||||
$this->handleFatalErrors = true;
|
||||
|
||||
@ -105,7 +109,7 @@ class ErrorControlChain {
|
||||
call_user_func($step['callback'], $this);
|
||||
}
|
||||
catch (Exception $e) {
|
||||
if ($this->suppression && defined('BASE_URL')) $this->error = true;
|
||||
if ($this->suppression) $this->error = true;
|
||||
else throw $e;
|
||||
}
|
||||
}
|
||||
@ -119,3 +123,6 @@ class ErrorControlChain {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ErrorControlChain::$fatal_errors = E_ERROR | E_CORE_ERROR | E_COMPILE_ERROR | E_USER_ERROR;
|
||||
if (defined('E_RECOVERABLE_ERROR')) ErrorControlChain::$fatal_errors |= E_RECOVERABLE_ERROR;
|
||||
|
||||
@ -16,17 +16,7 @@ class ParameterConfirmationToken {
|
||||
protected $token = null;
|
||||
|
||||
protected function pathForToken($token) {
|
||||
if (defined('BASE_PATH')) {
|
||||
$basepath = BASE_PATH;
|
||||
}
|
||||
else {
|
||||
$basepath = rtrim(dirname(dirname(dirname(dirname(__FILE__)))), DIRECTORY_SEPARATOR);
|
||||
}
|
||||
|
||||
require_once(dirname(dirname(__FILE__)).'/TempPath.php');
|
||||
$tempfolder = getTempFolder($basepath ? $basepath : DIRECTORY_SEPARATOR);
|
||||
|
||||
return $tempfolder.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
|
||||
return TEMP_FOLDER.'/token_'.preg_replace('/[^a-z0-9]+/', '', $token);
|
||||
}
|
||||
|
||||
protected function genToken() {
|
||||
|
||||
84
main.php
84
main.php
@ -55,6 +55,43 @@ if (version_compare(phpversion(), '5.3.2', '<')) {
|
||||
* @see Director::direct()
|
||||
*/
|
||||
|
||||
/**
|
||||
* Include the defines that set BASE_PATH, etc
|
||||
*/
|
||||
require_once('core/Constants.php');
|
||||
|
||||
/**
|
||||
* Figure out the request URL
|
||||
*/
|
||||
global $url;
|
||||
|
||||
// IIS will sometimes generate this.
|
||||
if(!empty($_SERVER['HTTP_X_ORIGINAL_URL'])) {
|
||||
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
|
||||
}
|
||||
|
||||
// Apache rewrite rules use this
|
||||
if (isset($_GET['url'])) {
|
||||
$url = $_GET['url'];
|
||||
// IIS includes get variables in url
|
||||
$i = strpos($url, '?');
|
||||
if($i !== false) {
|
||||
$url = substr($url, 0, $i);
|
||||
}
|
||||
|
||||
// Lighttpd uses this
|
||||
} else {
|
||||
if(strpos($_SERVER['REQUEST_URI'],'?') !== false) {
|
||||
list($url, $query) = explode('?', $_SERVER['REQUEST_URI'], 2);
|
||||
parse_str($query, $_GET);
|
||||
if ($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
|
||||
} else {
|
||||
$url = $_SERVER["REQUEST_URI"];
|
||||
}
|
||||
}
|
||||
|
||||
// Remove base folders from the URL if webroot is hosted in a subfolder
|
||||
if (substr(strtolower($url), 0, strlen(BASE_URL)) == strtolower(BASE_URL)) $url = substr($url, strlen(BASE_URL));
|
||||
|
||||
/**
|
||||
* Include SilverStripe's core code
|
||||
@ -66,68 +103,33 @@ $chain = new ErrorControlChain();
|
||||
$token = new ParameterConfirmationToken('flush');
|
||||
|
||||
$chain
|
||||
// First, if $_GET['flush'] was set, but no valid token, suppress the flush
|
||||
->then(function($chain) use ($token){
|
||||
// First, if $_GET['flush'] was set, but no valid token, suppress the flush
|
||||
if (isset($_GET['flush']) && !$token->tokenProvided()) {
|
||||
unset($_GET['flush']);
|
||||
}
|
||||
else {
|
||||
$chain->setSuppression(false);
|
||||
}
|
||||
})
|
||||
// Then load in core
|
||||
->then(function(){
|
||||
|
||||
// Load in core
|
||||
require_once('core/Core.php');
|
||||
})
|
||||
// Then build the URL (even if Core didn't load beyond setting BASE_URL)
|
||||
->thenAlways(function(){
|
||||
global $url;
|
||||
|
||||
// IIS will sometimes generate this.
|
||||
if(!empty($_SERVER['HTTP_X_ORIGINAL_URL'])) {
|
||||
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
|
||||
}
|
||||
|
||||
// Apache rewrite rules use this
|
||||
if (isset($_GET['url'])) {
|
||||
$url = $_GET['url'];
|
||||
// IIS includes get variables in url
|
||||
$i = strpos($url, '?');
|
||||
if($i !== false) {
|
||||
$url = substr($url, 0, $i);
|
||||
}
|
||||
|
||||
// Lighttpd uses this
|
||||
} else {
|
||||
if(strpos($_SERVER['REQUEST_URI'],'?') !== false) {
|
||||
list($url, $query) = explode('?', $_SERVER['REQUEST_URI'], 2);
|
||||
parse_str($query, $_GET);
|
||||
if ($_GET) $_REQUEST = array_merge((array)$_REQUEST, (array)$_GET);
|
||||
} else {
|
||||
$url = $_SERVER["REQUEST_URI"];
|
||||
}
|
||||
}
|
||||
|
||||
// Remove base folders from the URL if webroot is hosted in a subfolder
|
||||
if (substr(strtolower($url), 0, strlen(BASE_URL)) == strtolower(BASE_URL)) $url = substr($url, strlen(BASE_URL));
|
||||
})
|
||||
// Then start up the database
|
||||
->then(function(){
|
||||
if (isset($_GET['debug_profile'])) {
|
||||
Profiler::init();
|
||||
Profiler::mark('all_execution');
|
||||
Profiler::mark('main.php init');
|
||||
}
|
||||
|
||||
// Connect to database
|
||||
require_once('model/DB.php');
|
||||
global $databaseConfig;
|
||||
|
||||
if (isset($_GET['debug_profile'])) Profiler::mark('DB::connect');
|
||||
if ($databaseConfig) DB::connect($databaseConfig);
|
||||
if (isset($_GET['debug_profile'])) Profiler::unmark('DB::connect');
|
||||
})
|
||||
// Then if a flush was requested, redirect to it
|
||||
->then(function($chain) use ($token){
|
||||
|
||||
// Then if a flush was requested, redirect to it
|
||||
if ($token->parameterProvided() && !$token->tokenProvided()) {
|
||||
// First, check if we're in dev mode, or the database doesn't have any security data
|
||||
$canFlush = Director::isDev() || !Security::database_is_ready();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user