X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=index.php;h=1d229b0252ef7bdab005c804b9e8aabaf2b7ef55;hb=f44391e2af4a686e1d49b38c98107feef5436f43;hp=2d547fcffcb5e43dc0d31e3156a2b835839b720e;hpb=313c45d5ae5b93e311b5255e0143b41fa8a1539c;p=lhc%2Fweb%2Fwiklou.git
diff --git a/index.php b/index.php
index 2d547fcffc..1d229b0252 100644
--- a/index.php
+++ b/index.php
@@ -1,111 +1,106 @@
$GLOBALS overwrite vulnerability');
-}
-
-# Valid web server entry point, enable includes.
-# Please don't move this line to includes/Defines.php. This line essentially defines
-# a valid entry point. If you put it in includes/Defines.php, then any script that includes
-# it becomes an entry point, thereby defeating its purpose.
-define( 'MEDIAWIKI', true );
-require_once( './includes/Defines.php' );
-
-if( !file_exists( 'LocalSettings.php' ) ) {
- $IP = '.';
- require_once( 'includes/DefaultSettings.php' ); # used for printing the version
-?>
-
-
-
- MediaWiki
-
-
-
-
-
+# Initialize MediaWiki base class
+$mediaWiki = new MediaWiki();
- MediaWiki
-
- config/LocalSettings.php to the parent directory.' );
- } else {
- echo( 'Please
setup the wiki first.' );
- }
- ?>
+wfProfileIn( 'main-misc-setup' );
-
-
-
-getVal( 'maxlag' );
+if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
+ exit;
}
-require_once( './LocalSettings.php' );
-require_once( 'includes/Setup.php' );
-
+# Set title from request parameters
+$wgTitle = $mediaWiki->checkInitialQueries( $wgRequest );
-# Initialize MediaWiki base class
-require_once( "includes/Wiki.php" );
-$mediaWiki = new MediaWiki();
-
-wfProfileIn( 'main-misc-setup' );
-OutputPage::setEncodings(); # Not really used yet
+wfProfileOut( 'main-misc-setup' );
-# Query string fields
-$action = $wgRequest->getVal( 'action', 'view' );
-$title = $wgRequest->getVal( 'title' );
+$action = $wgRequest->getVal( 'action' );
-$wgTitle = $mediaWiki->checkInitialQueries( $title,$action,$wgOut, $wgRequest, $wgContLang );
-if ($wgTitle == NULL) {
- unset( $wgTitle );
+# Send Ajax requests to the Ajax dispatcher.
+if( $wgUseAjax && $action == 'ajax' ) {
+ $dispatcher = new AjaxDispatcher();
+ $dispatcher->performAction();
+ $mediaWiki->restInPeace();
+ exit;
}
-wfProfileOut( 'main-misc-setup' );
+if( $wgUseFileCache && $wgTitle !== null ) {
+ wfProfileIn( 'main-try-filecache' );
+ // Raw pages should handle cache control on their own,
+ // even when using file cache. This reduces hits from clients.
+ if( $action != 'raw' && HTMLFileCache::useFileCache() ) {
+ /* Try low-level file cache hit */
+ $cache = new HTMLFileCache( $wgTitle, $action );
+ if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
+ /* Check incoming headers to see if client has this cached */
+ if( !$wgOut->checkLastModified( $cache->fileCacheTime() ) ) {
+ $cache->loadFromFileCache();
+ }
+ # Do any stats increment/watchlist stuff
+ $wgArticle = MediaWiki::articleFromTitle( $wgTitle );
+ $wgArticle->viewUpdates();
+ # Tell $wgOut that output is taken care of
+ $wgOut->disable();
+ wfProfileOut( 'main-try-filecache' );
+ $mediaWiki->finalCleanup( $wgOut );
+ $mediaWiki->restInPeace();
+ exit;
+ }
+ }
+ wfProfileOut( 'main-try-filecache' );
+}
# Setting global variables in mediaWiki
+$mediaWiki->setVal( 'DisableHardRedirects', $wgDisableHardRedirects );
+$mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
+$mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
$mediaWiki->setVal( 'Server', $wgServer );
-$mediaWiki->setVal( 'DisableInternalSearch', $wgDisableInternalSearch );
-$mediaWiki->setVal( 'action', $action );
$mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
-$mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
-$mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
-$mediaWiki->setVal( 'CommandLineMode', $wgCommandLineMode );
$mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
-$mediaWiki->setVal( 'DisabledActions', $wgDisabledActions );
-
-$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser, $wgRequest );
-$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgLoadBalancer, $wgOut );
-
-# Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
-$mediaWiki->doUpdates( $wgPostCommitUpdateList );
+$mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
-$mediaWiki->restInPeace( $wgLoadBalancer );
-?>
+$mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
+$mediaWiki->finalCleanup( $wgOut );
+$mediaWiki->restInPeace();