Imported the register_globals hack from REL1_2. Also starting work on

[lhc/web/wiklou.git] / includes / Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 4a210d3..f421e05 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -1,4 +1,4 @@
-<?
+<?php
 # The main wiki script and things like database
 # conversion and maintenance scripts all share a
 # common setup of including lots of classes and
@@ -20,11 +20,12 @@ if ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {
 
 
 /* collect the originating ips */
-if ($_SERVER["HTTP_X_FORWARDED_FOR"]) {
-  $wgIP = trim(preg_replace("/^(.*, )?([^,]+)$/", "$2",
-                        $_SERVER['HTTP_X_FORWARDED_FOR']));
-} else {
-  $wgIP = getenv("REMOTE_ADDR");
+$wgIP = getenv("REMOTE_ADDR");
+if( $wgUseSquid && isset( $_SERVER["HTTP_X_FORWARDED_FOR"] ) ) {
+       # If the web server is behind a reverse proxy, we need to find
+       # out where our requests are really coming from.
+       $wgIP = trim( preg_replace( "/^(.*, )?([^,]+)$/", "$2",
+               $_SERVER['HTTP_X_FORWARDED_FOR'] ) );
 }
 
 $fname = "Setup.php";
@@ -47,6 +48,9 @@ include_once( "Block.php" );
 include_once( "SearchEngine.php" );
 include_once( "DifferenceEngine.php" );
 include_once( "MessageCache.php" );
+include_once( "BlockCache.php" );
+include_once( "Parser.php" );
+include_once( "ParserCache.php" );
 
 wfProfileOut( "$fname-includes" );
 wfProfileIn( "$fname-memcached" );
@@ -55,7 +59,23 @@ global $wgArticle, $wgDeferredUpdateList, $wgLinkCache;
 global $wgMemc, $wgMagicWords, $wgMwRedir, $wgDebugLogFile;
 global $wgMessageCache, $wgUseMemCached, $wgUseDatabaseMessages;
 global $wgMsgCacheExpiry, $wgDBname, $wgCommandLineMode;
+global $wgBlockCache, $wgParserCache, $wgParser;
+
+# Useful debug output
+if ( function_exists( "getallheaders" ) ) {
+       wfDebug( "\nStart request\n" );
+       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+       $headers = getallheaders();
+       foreach ($headers as $name => $value) {
+               wfDebug( "$name: $value\n" );
+       }
+       wfDebug( "\n" );
+} else {
+       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
+}
 
+# Set up Memcached
+#
 class MemCachedClientforWiki extends memcached {
        function _debugprint( $text ) {
                wfDebug( "memcached: $text\n" );
@@ -108,9 +128,6 @@ include_once( "Language.php" );
 
 $wgMessageCache = new MessageCache; 
 
-$wgOut = new OutputPage();
-wfDebug( "\n\n" );
-
 $wgLangClass = "Language" . ucfirst( $wgLanguageCode );
 if( ! class_exists( $wgLangClass ) ) {
        include_once( "LanguageUtf8.php" );
@@ -123,6 +140,9 @@ if ( !is_object($wgLang) ) {
 }
 $wgMessageCache->initialise( $wgUseMemCached, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $wgDBname );
 
+$wgOut = new OutputPage();
+wfDebug( "\n\n" );
+
 if ( $wgUseDynamicDates ) {
        include_once( "DateFormatter.php" );
        global $wgDateFormatter;
@@ -133,11 +153,15 @@ if( !$wgCommandLineMode && isset( $_COOKIE[ini_get("session.name")] )  ) {
        User::SetupSession();
 }
 
+$wgBlockCache = new BlockCache( true );
 $wgUser = User::loadFromSession();
 $wgDeferredUpdateList = array();
 $wgLinkCache = new LinkCache();
 $wgMagicWords = array();
 $wgMwRedir =& MagicWord::get( MAG_REDIRECT );
+$wgParserCache = new ParserCache();
+$wgParser = new Parser();
+$wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
 
 wfProfileOut( "$fname-misc" );
 wfProfileOut( $fname );