* Reorganised the includes directory, creating subdirectories db, parser and specials

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

diff --git a/includes/Setup.php b/includes/Setup.php
index 7a88fb1..c5d3f1b 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -10,7 +10,7 @@
 if( !defined( 'MEDIAWIKI' ) ) {
        echo "This file is part of MediaWiki, it is not a valid entry point.\n";
        exit( 1 );
-}      
+}
 
 # The main wiki script and things like database
 # conversion and maintenance scripts all share a
@@ -28,8 +28,8 @@ if ( !isset( $wgVersion ) ) {
 }
 
 // Set various default paths sensibly...
-if( $wgScript === false ) $wgScript = "$wgScriptPath/index.php";
-if( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect.php";
+if( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
+if( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
 
 if( $wgArticlePath === false ) {
        if( $wgUsePathInfo ) {
@@ -54,7 +54,69 @@ if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
 if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
 if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
 
-require_once( "$IP/includes/AutoLoader.php" );
+if ( empty( $wgFileStore['deleted']['directory'] ) ) {
+       $wgFileStore['deleted']['directory'] = "{$wgUploadDirectory}/deleted";
+}
+
+/**
+ * Initialise $wgLocalFileRepo from backwards-compatible settings
+ */
+if ( !$wgLocalFileRepo ) {
+       $wgLocalFileRepo = array(
+               'class' => 'LocalRepo',
+               'name' => 'local',
+               'directory' => $wgUploadDirectory,
+               'url' => $wgUploadBaseUrl ? $wgUploadBaseUrl . $wgUploadPath : $wgUploadPath,
+               'hashLevels' => $wgHashedUploadDirectory ? 2 : 0,
+               'thumbScriptUrl' => $wgThumbnailScriptPath,
+               'transformVia404' => !$wgGenerateThumbnailOnParse,
+               'initialCapital' => $wgCapitalLinks,
+               'deletedDir' => $wgFileStore['deleted']['directory'],
+               'deletedHashLevels' => $wgFileStore['deleted']['hash']
+       );
+}
+/**
+ * Initialise shared repo from backwards-compatible settings
+ */
+if ( $wgUseSharedUploads ) {
+       if ( $wgSharedUploadDBname ) {
+               $wgForeignFileRepos[] = array(
+                       'class' => 'ForeignDBRepo',
+                       'name' => 'shared',
+                       'directory' => $wgSharedUploadDirectory,
+                       'url' => $wgSharedUploadPath,
+                       'hashLevels' => $wgHashedSharedUploadDirectory ? 2 : 0,
+                       'thumbScriptUrl' => $wgSharedThumbnailScriptPath,
+                       'transformVia404' => !$wgGenerateThumbnailOnParse,
+                       'dbType' => $wgDBtype,
+                       'dbServer' => $wgDBserver,
+                       'dbUser' => $wgDBuser,
+                       'dbPassword' => $wgDBpassword,
+                       'dbName' => $wgSharedUploadDBname,
+                       'dbFlags' => ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT,
+                       'tablePrefix' => $wgSharedUploadDBprefix,
+                       'hasSharedCache' => $wgCacheSharedUploads,
+                       'descBaseUrl' => $wgRepositoryBaseUrl,
+                       'fetchDescription' => $wgFetchCommonsDescriptions,
+               );
+       } else {
+               $wgForeignFileRepos[] = array(
+                       'class' => 'FSRepo',
+                       'name' => 'shared',
+                       'directory' => $wgSharedUploadDirectory,
+                       'url' => $wgSharedUploadPath,
+                       'hashLevels' => $wgHashedSharedUploadDirectory ? 2 : 0,
+                       'thumbScriptUrl' => $wgSharedThumbnailScriptPath,
+                       'transformVia404' => !$wgGenerateThumbnailOnParse,
+                       'descBaseUrl' => $wgRepositoryBaseUrl,
+                       'fetchDescription' => $wgFetchCommonsDescriptions,
+               );
+       }
+}
+
+if ( !class_exists( 'AutoLoader' ) ) {
+       require_once( "$IP/includes/AutoLoader.php" );
+}
 
 wfProfileIn( $fname.'-exception' );
 require_once( "$IP/includes/Exception.php" );
@@ -98,6 +160,19 @@ if ( $wgCommandLineMode ) {
        wfDebug( $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'] . "\n" );
 }
 
+if( $wgRCFilterByAge ) {
+       ## Trim down $wgRCLinkDays so that it only lists links which are valid
+       ## as determined by $wgRCMaxAge.
+       ## Note that we allow 1 link higher than the max for things like 56 days but a 60 day link.
+       sort($wgRCLinkDays);
+       for( $i = 0; $i < count($wgRCLinkDays); $i++ ) {
+               if( $wgRCLinkDays[$i] >= $wgRCMaxAge / ( 3600 * 24 ) ) {
+                       $wgRCLinkDays = array_slice( $wgRCLinkDays, 0, $i+1, false );
+                       break;
+               }
+       }
+}
+
 if ( $wgSkipSkin ) {
        $wgSkipSkins[] = $wgSkipSkin;
 }
@@ -126,6 +201,9 @@ wfDebug( 'Main cache: ' . get_class( $wgMemc ) .
 wfProfileOut( $fname.'-memcached' );
 wfProfileIn( $fname.'-SetupSession' );
 
+# Set default shared prefix
+if( $wgSharedPrefix === false ) $wgSharedPrefix = $wgDBprefix;
+
 if ( $wgDBprefix ) {
        $wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
 } elseif ( $wgSharedDB ) {
@@ -133,13 +211,14 @@ if ( $wgDBprefix ) {
 } else {
        $wgCookiePrefix = $wgDBname;
 }
+$wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");
 
 # If session.auto_start is there, we can't touch session name
 #
-if( !ini_get( 'session.auto_start' ) )
+if( !wfIniGetBool( 'session.auto_start' ) )
        session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 
-if( !$wgCommandLineMode && ( isset( $_COOKIE[session_name()] ) || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
+if( !$wgCommandLineMode && ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) ) {
        wfIncrStats( 'request_with_session' );
        wfSetupSession();
        $wgSessionStarted = true;
@@ -151,26 +230,17 @@ if( !$wgCommandLineMode && ( isset( $_COOKIE[session_name()] ) || isset( $_COOKI
 wfProfileOut( $fname.'-SetupSession' );
 wfProfileIn( $fname.'-globals' );
 
-if ( !$wgDBservers ) {
-       $wgDBservers = array(array(
-               'host' => $wgDBserver,
-               'user' => $wgDBuser,
-               'password' => $wgDBpassword,
-               'dbname' => $wgDBname,
-               'type' => $wgDBtype,
-               'load' => 1,
-               'flags' => ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT
-       ));
-}
-
-$wgLoadBalancer = new StubObject( 'wgLoadBalancer', 'LoadBalancer', 
-       array( $wgDBservers, false, $wgMasterWaitTimeout, true ) );
 $wgContLang = new StubContLang;
+
+// Now that variant lists may be available...
+$wgRequest->interpolateTitle();
+
 $wgUser = new StubUser;
 $wgLang = new StubUserLang;
 $wgOut = new StubObject( 'wgOut', 'OutputPage' );
-$wgParser = new StubObject( 'wgParser', 'Parser' );
-$wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache', 
+$wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParserConf ) );
+
+$wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
        array( $parserMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry, wfWikiID() ) );
 
 wfProfileOut( $fname.'-globals' );
@@ -179,7 +249,7 @@ wfProfileIn( $fname.'-User' );
 # Skin setup functions
 # Entries can be added to this variable during the inclusion
 # of the extension file. Skins can then perform any necessary initialisation.
-# 
+#
 foreach ( $wgSkinExtensionFunctions as $func ) {
        call_user_func( $func );
 }
@@ -198,7 +268,9 @@ $wgPostCommitUpdateList = array();
 
 if ( $wgAjaxSearch ) $wgAjaxExportList[] = 'wfSajaxSearch';
 if ( $wgAjaxWatch ) $wgAjaxExportList[] = 'wfAjaxWatch';
-if ( $wgAjaxShowEditors ) $wgAjaxExportList[] = 'wfAjaxShowEditors';
+if ( $wgAjaxUploadDestCheck ) $wgAjaxExportList[] = 'UploadForm::ajaxGetExistsWarning';
+if( $wgAjaxLicensePreview )
+       $wgAjaxExportList[] = 'UploadForm::ajaxGetLicensePreview';
 
 wfSeedRandom();
 
@@ -231,5 +303,3 @@ wfDebug( "Fully initialised\n" );
 $wgFullyInitialised = true;
 wfProfileOut( $fname.'-extensions' );
 wfProfileOut( $fname );
-
-?>