index.php now fits on a single screen :-)

[lhc/web/wiklou.git] / index.php

diff --git a/index.php b/index.php
index 97b2bf8..eb8531f 100644 (file)
--- a/index.php
+++ b/index.php
@@ -3,21 +3,13 @@
  * Main wiki script; see docs/design.txt
  * @package MediaWiki
  */
-$wgRequestTime = microtime();
-
-# getrusage() does not exist on the Window$ platform, catching this
-if ( function_exists ( 'getrusage' ) ) {
-       $wgRUstart = getrusage();
-} else {
-       $wgRUstart = array();
-}
 
+# In the beginning...
+require_once( "./includes/Wiki.php" );
+$wgRequestTime = microtime();
+$wgRUstart = MediaWiki::getRUsage();
 unset( $IP );
-@ini_set( 'allow_url_fopen', 0 ); # For security...
-
-if ( isset( $_REQUEST['GLOBALS'] ) ) {
-       die( '<a href="http://www.hardened-php.net/index.76.html">$GLOBALS overwrite vulnerability</a>');
-}
+MediaWiki::ckeckGlobalsVulnerability();
 
 # Valid web server entry point, enable includes.
 # Please don't move this line to includes/Defines.php. This line essentially defines
@@ -25,24 +17,26 @@ if ( isset( $_REQUEST['GLOBALS'] ) ) {
 # it becomes an entry point, thereby defeating its purpose.
 define( 'MEDIAWIKI', true );
 require_once( './includes/Defines.php' );
-@include_once( './LocalSettings.php' ); # Will die later if not included anyway
 
 
 # Initialize MediaWiki base class
-require_once( "includes/Wiki.php" );
 $mediaWiki = new MediaWiki();
-
-
 $mediaWiki->checkSetup();
-require_once( 'includes/Setup.php' ); # This can't be done in mdiaWiki.php for some weird reason
+
+# These can't be done in mdiaWiki.php for some weird reason
+require_once( './LocalSettings.php' );
+require_once( 'includes/Setup.php' );
 
 OutputPage::setEncodings(); # Not really used yet
 
+$mediaWiki->setVal( "Request", $wgRequest );
+
 # Query string fields
-$action = $wgRequest->getVal( 'action', 'view' );
-$title = $wgRequest->getVal( 'title' );
+$mediaWiki->initializeActionTitle();
+$action = $mediaWiki->getVal( 'action' ); # Global might be needed somewhere, sadly...
 
-$wgTitle = $mediaWiki->checkInitialQueries( $title,$action,$wgOut, $wgRequest, $wgContLang );
+# Run initial queries
+$wgTitle = $mediaWiki->checkInitialQueries( $wgOut, $wgContLang );
 
 # Is this necessary? Who knows...
 if ($wgTitle == NULL) {
@@ -52,7 +46,6 @@ if ($wgTitle == NULL) {
 # Setting global variables in mediaWiki
 $mediaWiki->setVal( "Server", $wgServer );
 $mediaWiki->setVal( "DisableInternalSearch", $wgDisableInternalSearch );
-$mediaWiki->setVal( "action", $action );
 $mediaWiki->setVal( "SquidMaxage", $wgSquidMaxage );
 $mediaWiki->setVal( "EnableDublinCoreRdf", $wgEnableDublinCoreRdf );
 $mediaWiki->setVal( "EnableCreativeCommonsRdf", $wgEnableCreativeCommonsRdf );
@@ -60,11 +53,8 @@ $mediaWiki->setVal( "CommandLineMode", $wgCommandLineMode );
 $mediaWiki->setVal( "UseExternalEditor", $wgUseExternalEditor );
 $mediaWiki->setVal( "DisabledActions", $wgDisabledActions );
 
-$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser, $wgRequest );
+$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser );
 $mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgLoadBalancer, $wgOut );
-
-# Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
 $mediaWiki->doUpdates( $wgPostCommitUpdateList );
-
 $mediaWiki->restInPeace( $wgLoadBalancer );
 ?>