Modified Special:Categories to subclass SpecialPage

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 6f310c7..fa3296d 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -39,6 +39,7 @@ if( $wgArticlePath === false ) {
 }
 
 if( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins";
+if( $wgLocalStylePath === false ) $wgLocalStylePath = "$wgScriptPath/skins";
 if( $wgStyleDirectory === false) $wgStyleDirectory   = "$IP/skins";
 if( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions";
 
@@ -53,9 +54,10 @@ if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
 
 if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
 if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
+if( $wgDeletedDirectory === false ) $wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
 
-if ( empty( $wgFileStore['deleted']['directory'] ) ) {
-       $wgFileStore['deleted']['directory'] = "{$wgUploadDirectory}/deleted";
+if( isset( $wgFileStore['deleted']['directory'] ) ) {
+       $wgDeletedDirectory = $wgFileStore['deleted']['directory'];
 }
 
 /**
@@ -79,16 +81,23 @@ $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
+       if( isset( $wgFileStore['deleted']['hash'] ) ) {
+               $deletedHashLevel = $wgFileStore['deleted']['hash'];
+       } else {
+               $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
+       }
        $wgLocalFileRepo = array(
                'class' => 'LocalRepo',
                'name' => 'local',
                'directory' => $wgUploadDirectory,
+               'scriptDirUrl' => $wgScriptPath,
+               'scriptExtension' => $wgScriptExtension,
                'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
                'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
                'thumbScriptUrl' => $wgThumbnailScriptPath,
                'transformVia404' => !$wgGenerateThumbnailOnParse,
-               'deletedDir' => $wgFileStore['deleted']['directory'],
-               'deletedHashLevels' => $wgFileStore['deleted']['hash']
+               'deletedDir' => $wgDeletedDirectory,
+               'deletedHashLevels' => $deletedHashLevel
        );
 }
 /**
@@ -157,7 +166,6 @@ require_once( "$IP/includes/Namespace.php" );
 require_once( "$IP/includes/ProxyTools.php" );
 require_once( "$IP/includes/ObjectCache.php" );
 require_once( "$IP/includes/ImageFunctions.php" );
-require_once( "$IP/includes/StubObject.php" );
 wfProfileOut( $fname.'-includes' );
 wfProfileIn( $fname.'-misc1' );
 
@@ -180,24 +188,33 @@ $wgRequest = new WebRequest;
 # Useful debug output
 if ( $wgCommandLineMode ) {
        wfDebug( "\n\nStart command line script $self\n" );
-} elseif ( function_exists( 'getallheaders' ) ) {
-       wfDebug( "\n\nStart request\n" );
-       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
-       $headers = getallheaders();
-       foreach ($headers as $name => $value) {
-               wfDebug( "$name: $value\n" );
-       }
-       wfDebug( "\n" );
-} elseif( isset( $_SERVER['REQUEST_URI'] ) ) {
-       wfDebug( "\n\nStart request\n" );
-       wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
-       foreach ( $_SERVER as $name => $value ) {
-               if ( substr( $name, 0, 5 ) == 'HTTP_' ) {
-                       $name = substr( $name, 5 );
-                       wfDebug( "$name: $value\n" );
+} else {
+       wfDebug( "Start request\n\n" );
+       # Output the REQUEST_URI. This is not supported by IIS in rewrite mode,
+       # so use an alternative
+       $requestUri = isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : 
+               ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ? $_SERVER['HTTP_X_ORIGINAL_URL'] :
+               $_SERVER['PHP_SELF'] );
+       wfDebug( "{$_SERVER['REQUEST_METHOD']} {$requestUri}\n" );
+
+       if ( $wgDebugPrintHttpHeaders ) {
+               $headerOut = "HTTP HEADERS:\n";
+
+               if ( function_exists( 'getallheaders' ) ) {
+                       $headers = getallheaders();
+                       foreach ( $headers as $name => $value ) {
+                               $headerOut .= "$name: $value\n";
+                       }
+               } else {
+                       $headers = $_SERVER;
+                       foreach ( $headers as $name => $value ) {
+                               if ( substr( $name, 0, 5 ) !== 'HTTP_' ) continue;
+                               $name = substr( $name, 5 );
+                               $headerOut .= "$name: $value\n";
+                       }
                }
+               wfDebug( "$headerOut\n" );
        }
-       wfDebug( "\n" );
 }
 
 if( $wgRCFilterByAge ) {
@@ -255,9 +272,9 @@ $wgMemc =& wfGetMainCache();
 $messageMemc =& wfGetMessageCacheStorage();
 $parserMemc =& wfGetParserCacheStorage();
 
-wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
-       "\nMessage cache: " . get_class( $messageMemc ) .
-       "\nParser cache: " . get_class( $parserMemc ) . "\n" );
+wfDebug( 'CACHES: ' . get_class( $wgMemc ) . '[main] ' .
+       get_class( $messageMemc ) . '[message] ' .
+       get_class( $parserMemc ) . "[parser]\n" );
 
 wfProfileOut( $fname.'-memcached' );
 
@@ -287,13 +304,15 @@ $wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 if( !wfIniGetBool( 'session.auto_start' ) )
        session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 
-if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
-       wfIncrStats( 'request_with_session' );
-       wfSetupSession();
-       $wgSessionStarted = true;
-} else {
-       wfIncrStats( 'request_without_session' );
-       $wgSessionStarted = false;
+if( !defined( 'MW_NO_SESSION' ) ) {
+       if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
+               wfIncrStats( 'request_with_session' );
+               wfSetupSession();
+               $wgSessionStarted = true;
+       } else {
+               wfIncrStats( 'request_without_session' );
+               $wgSessionStarted = false;
+       }
 }
 
 wfProfileOut( $fname.'-SetupSession' );
@@ -303,14 +322,13 @@ $wgContLang = new StubContLang;
 
 // Now that variant lists may be available...
 $wgRequest->interpolateTitle();
-
-$wgUser = new StubUser;
+$wgUser = $wgCommandLineMode ? new User : User::newFromSession();
 $wgLang = new StubUserLang;
 $wgOut = new StubObject( 'wgOut', 'OutputPage' );
 $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
 
 $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
-       array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, wfWikiID() ) );
+       array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry ) );
 
 wfProfileOut( $fname.'-globals' );
 wfProfileIn( $fname.'-User' );
@@ -335,7 +353,6 @@ wfProfileIn( $fname.'-misc2' );
 $wgDeferredUpdateList = array();
 $wgPostCommitUpdateList = array();
 
-if ( $wgAjaxWatch ) $wgAjaxExportList[] = 'wfAjaxWatch';
 if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'SpecialUpload::ajaxGetExistsWarning';
 
 # Placeholders in case of DB error