X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWebStart.php;h=fa92fc7213901c29bd942cbf0c6d2a7cff9aebef;hb=bbd225e01312fd56845d8fbf650aa3cd184bb731;hp=a9a6ad5fe90eab3390bc8d725749e8daa7dc14e3;hpb=a15c419b3d130248f2556b9d00643ba9666a4189;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/WebStart.php b/includes/WebStart.php
index a9a6ad5fe9..fa92fc7213 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -1,24 +1,32 @@
 <?php
+/**
+ * This does the initial setup for a web request.
+ * It does some security checks, starts the profiler and loads the
+ * configuration, and optionally loads Setup.php depending on whether
+ * MW_NO_SETUP is defined.
+ *
+ * @file
+ */
 
-# This does the initial setup for a web request. It does some security checks, 
-# starts the profiler and loads the configuration, and optionally loads 
-# Setup.php depending on whether MW_NO_SETUP is defined.
-
-# Test for PHP bug which breaks PHP 5.0.x on 64-bit...
-# As of 1.8 this breaks lots of common operations instead
-# of just some rare ones like export.
-$borked = str_replace( 'a', 'b', array( -1 => -1 ) );
-if( !isset( $borked[-1] ) ) {
-	echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" .
-	     "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n";
-	die( -1 );
+/**
+ * Detect compiled mode by looking for a function that only exists if compiled 
+ * in. Note that we can't use function_exists(), because it is terribly broken 
+ * under HipHop due to the "volatile" feature.
+ */
+function wfDetectCompiledMode() {
+	try {
+		$r = new ReflectionFunction( 'wfHipHopCompilerVersion' );
+	} catch ( ReflectionException $e ) {
+		$r = false;
+	}
+	return $r !== false;
 }
 
 # Protect against register_globals
 # This must be done before any globals are set by the code
 if ( ini_get( 'register_globals' ) ) {
 	if ( isset( $_REQUEST['GLOBALS'] ) ) {
-		die( '<a href="http://www.hardened-php.net/index.76.html">$GLOBALS overwrite vulnerability</a>');
+		die( '<a href="http://www.hardened-php.net/globals-problem">$GLOBALS overwrite vulnerability</a>');
 	}
 	$verboten = array(
 		'GLOBALS',
@@ -40,7 +48,7 @@ if ( ini_get( 'register_globals' ) ) {
 	);
 	foreach ( $_REQUEST as $name => $value ) {
 		if( in_array( $name, $verboten ) ) {
-			header( "HTTP/1.x 500 Internal Server Error" );
+			header( "HTTP/1.1 500 Internal Server Error" );
 			echo "register_globals security paranoia: trying to overwrite superglobals, aborting.";
 			die( -1 );
 		}
@@ -56,7 +64,6 @@ if ( function_exists ( 'getrusage' ) ) {
 	$wgRUstart = array();
 }
 unset( $IP );
-@ini_set( 'allow_url_fopen', 0 ); # For security
 
 # Valid web server entry point, enable includes.
 # Please don't move this line to includes/Defines.php. This line essentially
@@ -65,40 +72,100 @@ unset( $IP );
 # its purpose.
 define( 'MEDIAWIKI', true );
 
-# Start profiler
-require_once( './StartProfiler.php' );
+# Full path to working directory.
+# Makes it possible to for example to have effective exclude path in apc.
+# Also doesn't break installations using symlinked includes, like
+# dirname( __FILE__ ) would do.
+$IP = getenv( 'MW_INSTALL_PATH' );
+if ( $IP === false ) {
+	$IP = realpath( '.' );
+}
+
+if ( wfDetectCompiledMode() ) {
+	define( 'MW_COMPILED', 1 );
+}
+
+if ( !defined( 'MW_COMPILED' ) ) {
+	# Get MWInit class
+	require_once( "$IP/includes/Init.php" );
+
+	# Start the autoloader, so that extensions can derive classes from core files
+	require_once( "$IP/includes/AutoLoader.php" );
+
+	# Start profiler
+	# FIXME: rewrite wfProfileIn/wfProfileOut so that they can work in compiled mode
+	require_once( "$IP/includes/profiler/Profiler.php" );
+	if ( file_exists( "$IP/StartProfiler.php" ) ) {
+		require_once( "$IP/StartProfiler.php" );
+	}
+
+	# Load up some global defines.
+	require_once( "$IP/includes/Defines.php" );
+}
+
 wfProfileIn( 'WebStart.php-conf' );
 
-# Load up some global defines.
-require_once( './includes/Defines.php' );
-
-# LocalSettings.php is the per site customization file. If it does not exit
-# the wiki installer need to be launched or the generated file moved from
-# ./config/ to ./
-if( !file_exists( './LocalSettings.php' ) ) {
-	$IP = '.';
-	require_once( './includes/DefaultSettings.php' ); # used for printing the version
-	require_once( './includes/templates/NoLocalSettings.php' );
-	die();
+# Load default settings
+require_once( MWInit::compiledPath( "includes/DefaultSettings.php" ) );
+
+if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
+	# Use a callback function to configure MediaWiki
+	MWFunction::call( MW_CONFIG_CALLBACK );
+} else {
+	if ( !defined( 'MW_CONFIG_FILE' ) ) {
+		define('MW_CONFIG_FILE', MWInit::interpretedPath( 'LocalSettings.php' ) );
+	}
+
+	# LocalSettings.php is the per site customization file. If it does not exist
+	# the wiki installer needs to be launched or the generated file uploaded to
+	# the root wiki directory
+	if( !file_exists( MW_CONFIG_FILE ) ) {
+		$script = $_SERVER['SCRIPT_NAME'];
+		$path = htmlspecialchars( str_replace( '//', '/', pathinfo( $script, PATHINFO_DIRNAME ) ) );
+		$ext = htmlspecialchars( pathinfo( $script, PATHINFO_EXTENSION ) );
+
+		# Check to see if the installer is running
+		if ( !function_exists( 'session_name' ) ) {
+			$installerStarted = false;
+		} else {
+			session_name( 'mw_installer_session' );
+			$oldReporting = error_reporting( E_ALL & ~E_NOTICE );
+			$success = session_start();
+			error_reporting( $oldReporting );
+			$installerStarted = ( $success && isset( $_SESSION['installData'] ) );
+		}
+
+		$please = $installerStarted
+			? "Please <a href=\"$path/mw-config/index.$ext\"> complete the installation</a> and download LocalSettings.php."
+			: "Please <a href=\"$path/mw-config/index.$ext\"> set up the wiki</a> first.";
+
+		wfDie( "<p>LocalSettings.php not found.</p><p>$please</p>" );
+	}
+
+	# Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
+	require_once( MW_CONFIG_FILE );
+}
+
+if ( $wgEnableSelenium ) {
+	require_once( MWInit::compiledPath( "includes/SeleniumWebSettings.php" ) );
 }
 
-# Include this site setttings
-require_once( './LocalSettings.php' );
 wfProfileOut( 'WebStart.php-conf' );
-wfProfileIn( 'WebStart.php-ob_start' );
 
+wfProfileIn( 'WebStart.php-ob_start' );
 # Initialise output buffering
-if ( ob_get_level() ) {
-	# Someone's been mixing configuration data with code!
-	# How annoying.
-} elseif ( !defined( 'MW_NO_OUTPUT_BUFFER' ) ) {
-	require_once( './includes/OutputHandler.php' );
+# Check that there is no previous output or previously set up buffers, because
+# that would cause us to potentially mix gzip and non-gzip output, creating a
+# big mess.
+if ( !defined( 'MW_NO_OUTPUT_BUFFER' ) && ob_get_level() == 0 ) {
+	if ( !defined( 'MW_COMPILED' ) ) {
+		require_once( "$IP/includes/OutputHandler.php" );
+	}
 	ob_start( 'wfOutputHandler' );
 }
-
 wfProfileOut( 'WebStart.php-ob_start' );
 
 if ( !defined( 'MW_NO_SETUP' ) ) {
-	require_once( './includes/Setup.php' );
+	require_once( MWInit::compiledPath( "includes/Setup.php" ) );
 }