* Indenting and formatting.

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 842e7c9..45fd9cd 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -16,40 +16,29 @@ if( defined( 'MEDIAWIKI' ) ) {
 # setting up a few globals.
 #
 
-global $wgProfiling, $wgProfileSampleRate, $wgIP, $wgUseSquid, $IP;
+global $wgProfiling, $wgProfileSampleRate, $wgIP, $IP;
 
 if( !isset( $wgProfiling ) )
        $wgProfiling = false;
 
-if ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {        
-       require_once( 'Profiling.php' );
+if ( $wgProfiling and (0 == rand() % $wgProfileSampleRate ) ) {
+        require_once( 'Profiling.php' );
 } else {
-       function wfProfileIn( $fn = '' ) {}
-       function wfProfileOut( $fn = '' ) {}
-       function wfGetProfilingOutput( $s, $e ) {}
-       function wfProfileClose() {}
-}
-
-/* collect the originating ips */
-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.
-       $hopips = array_map( 'trim', explode( ',', $_SERVER['HTTP_X_FORWARDED_FOR'] ) );
-
-       while(in_array(trim(end($hopips)), $wgSquidServers)){
-               array_pop($hopips);
-       }
-       $wgIP = trim(end($hopips));
-} elseif( isset( $_SERVER['REMOTE_ADDR'] ) ) {
-       $wgIP = $_SERVER['REMOTE_ADDR'];
-} else {
-       # Running on CLI?
-       $wgIP = '127.0.0.1';
-}
-
-if ( $wgUseData ) {
-       $wgExtraNamespaces[20] = 'Data' ;
-       $wgExtraNamespaces[21] = 'Data_talk' ;
+        function wfProfileIn( $fn = '' ) {
+                global $hackwhere, $wgDBname;
+                $hackwhere[] = $fn;
+                if (function_exists("setproctitle"))
+                        setproctitle($fn . " [$wgDBname]");
+        }
+        function wfProfileOut( $fn = '' ) {
+                global $hackwhere, $wgDBname;
+                if (count($hackwhere))
+                        array_pop($hackwhere);
+                if (function_exists("setproctitle") && count($hackwhere))
+                        setproctitle($hackwhere[count($hackwhere)-1] . " [$wgDBname]");
+        }
+        function wfGetProfilingOutput( $s, $e ) {}
+        function wfProfileClose() {}
 }
 
 $fname = 'Setup.php';
@@ -72,13 +61,12 @@ require_once( 'Block.php' );
 require_once( 'MessageCache.php' );
 require_once( 'BlockCache.php' );
 require_once( 'Parser.php' );
-require_once( 'ParserXML.php' );
+require_once( 'Parser.php' );
 require_once( 'ParserCache.php' );
 require_once( 'WebRequest.php' );
 require_once( 'LoadBalancer.php' );
 require_once( 'HistoryBlob.php' );
-
-$wgRequest = new WebRequest();
+require_once( 'ProxyTools.php' );
 
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
@@ -91,10 +79,13 @@ global $wgMsgCacheExpiry, $wgCommandLineMode;
 global $wgBlockCache, $wgParserCache, $wgParser, $wgMsgParserOptions;
 global $wgLoadBalancer, $wgDBservers, $wgDebugDumpSql;
 global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype;
-global $wgUseOldExistenceCheck, $wgEnablePersistentLC;
+global $wgUseOldExistenceCheck, $wgEnablePersistentLC, $wgMasterWaitTimeout;
 
 global $wgFullyInitialised;
 
+$wgIP = wfGetIP();
+$wgRequest = new WebRequest();
+
 # Useful debug output
 if ( $wgCommandLineMode ) {
        # wfDebug( '"' . implode( '"  "', $argv ) . '"' );
@@ -106,7 +97,7 @@ if ( $wgCommandLineMode ) {
                wfDebug( "$name: $value\n" );
        }
        wfDebug( "\n" );
-} else {
+} elseif( isset( $_SERVER['REQUEST_URI'] ) ) {
        wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
 }
 
@@ -138,7 +129,7 @@ if( $wgUseMemCached ) {
                }
        }
 
-       $wgMemc = new MemCachedClientforWiki( array('persistant' => true) );
+       $wgMemc = new MemCachedClientforWiki( array('persistant' => true, 'compress_threshold' => 1500 ) );
        $wgMemc->set_servers( $wgMemCachedServers );
        $wgMemc->set_debug( $wgMemCachedDebug );
 
@@ -149,6 +140,12 @@ if( $wgUseMemCached ) {
        require_once( 'ObjectCache.php' );
        $wgMemc = new TurckBagOStuff;
        $messageMemc = &$wgMemc;
+} elseif ( $wgUseEAccelShm ) {
+       # eAccelerator shared memory
+       #
+       require_once( 'ObjectCache.php' );
+       $wgMemc = new eAccelBagOStuff;
+       $messageMemc = &$wgMemc;
 } else {
        /**
         * No shared memory
@@ -203,7 +200,7 @@ if ( !$wgDBservers ) {
                'flags' => ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT
        ));
 }
-$wgLoadBalancer = LoadBalancer::newFromParams( $wgDBservers );
+$wgLoadBalancer = LoadBalancer::newFromParams( $wgDBservers, false, $wgMasterWaitTimeout );
 $wgLoadBalancer->loadMasterPos();
 
 wfProfileOut( $fname.'-database' );
@@ -230,6 +227,8 @@ if( $wgCommandLineMode ) {
        # Used for some maintenance scripts; user session cookies can screw things up
        # when the database is in an in-between state.
        $wgUser = new User();
+       # Prevent loading User settings from the DB.
+       $wgUser->setLoaded( true );
 } else {
        $wgUser = User::loadFromSession();
 }
@@ -238,13 +237,11 @@ wfProfileOut( $fname.'-User' );
 wfProfileIn( $fname.'-language2' );
 
 function setupLangObj(&$langclass) {
-       global $wgUseLatin1, $IP;
+       global $IP;
 
        if( ! class_exists( $langclass ) ) {
-               # Default to English/UTF-8, or for non-UTF-8, to latin-1
+               # Default to English/UTF-8
                $baseclass = 'LanguageUtf8';
-               if( $wgUseLatin1 )
-                       $baseclass = 'LanguageLatin1';
                require_once( "$IP/languages/$baseclass.php" );
                $lc = strtolower(substr($langclass, 8));
                $snip = "
@@ -254,7 +251,6 @@ function setupLangObj(&$langclass) {
                                }
 
                        }";
-
                eval($snip);
        }
 
@@ -270,6 +266,7 @@ $wgContLanguageCode = $wgLanguageCode;
 $wgContLangClass = 'Language' . str_replace( '-', '_', ucfirst( $wgContLanguageCode ) );
 
 $wgContLang = setupLangObj( $wgContLangClass );
+$wgContLang->initEncoding();
 
 // set default user option from content language
 if( !$wgUser->mDataLoaded ) {
@@ -278,9 +275,8 @@ if( !$wgUser->mDataLoaded ) {
 
 // wgLanguageCode now specifically means the UI language
 $wgLanguageCode = $wgUser->getOption('language');
-if( empty( $wgLanguageCode ) ) {
-       # Quick hack for upgrades where this will be blank,
-       # and it's not handled right. Set to default.
+# Validate $wgLanguageCode, which will soon be sent to an eval()
+if( empty( $wgLanguageCode ) || !preg_match( '/^[a-z\-]*$/', $wgLanguageCode ) ) {
        $wgLanguageCode = $wgContLanguageCode;
 }
 
@@ -349,13 +345,19 @@ wfProfileOut( $fname.'-BlockCache' );
 wfProfileIn( $fname.'-misc2' );
 
 $wgDeferredUpdateList = array();
+$wgPostCommitUpdateList = array();
+
 $wgLinkCache = new LinkCache();
 $wgMagicWords = array();
 $wgMwRedir =& MagicWord::get( MAG_REDIRECT );
 $wgParserCache = new ParserCache( $messageMemc );
 
-if ( $wgUseXMLparser ) $wgParser = new ParserXML();
-else $wgParser = new Parser();
+if ( $wgUseXMLparser ) {
+       require_once( 'ParserXML.php' );
+       $wgParser = new ParserXML();
+} else {
+       $wgParser = new Parser();
+}
 $wgOut->setParserOptions( ParserOptions::newFromUser( $wgUser ) );
 $wgMsgParserOptions = ParserOptions::newFromUser($wgUser);
 wfSeedRandom();