X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=index.php;h=dcea36b5b751ef877a8ccd806ebb0b33dc9f0293;hb=31f239ecb11d328a36127cca688aae807f355f9f;hp=f18fa8a6ed3e16a21b43391b2700fe1659ba1e51;hpb=9aa7ac0d2c8656daf8d328fe8ef1ef02827da641;p=lhc%2Fweb%2Fwiklou.git
diff --git a/index.php b/index.php
index f18fa8a6ed..dcea36b5b7 100644
--- a/index.php
+++ b/index.php
@@ -1,130 +1,122 @@
$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 );
-
-# Load up some global defines.
-require_once( './includes/Defines.php' );
-
-# LocalSettings.php is the per site customization file. If it does not exit
-# the wiki installer need to be launched or the generated file moved from
-# ./config/ to ./
-if( !file_exists( 'LocalSettings.php' ) ) {
- $IP = '.';
- require_once( 'includes/DefaultSettings.php' ); # used for printing the version
-?>
-
-
-
- MediaWiki
-
-
-
-
-
-
- MediaWiki
-
- config/LocalSettings.php to the parent directory.' );
- } else {
- echo( 'Please
setup the wiki first.' );
- }
- ?>
-
-
-
-
-getVal( 'maxlag' );
+if( !is_null( $maxLag ) && !$mediaWiki->checkMaxLag( $maxLag ) ) {
+ exit;
+}
+
# Query string fields
$action = $wgRequest->getVal( 'action', 'view' );
$title = $wgRequest->getVal( 'title' );
+# Set title from request parameters
+$wgTitle = $mediaWiki->checkInitialQueries( $title, $action );
+if( $wgTitle === null ) {
+ unset( $wgTitle );
+}
+
+wfProfileOut( 'main-misc-setup' );
+
#
# Send Ajax requests to the Ajax dispatcher.
#
-if ( $wgUseAjax && $action == 'ajax' ) {
- require_once( 'AjaxDispatcher.php' );
-
+if( $wgUseAjax && $action == 'ajax' ) {
+ require_once( $IP . '/includes/AjaxDispatcher.php' );
$dispatcher = new AjaxDispatcher();
$dispatcher->performAction();
-
+ $mediaWiki->restInPeace();
exit;
}
-$wgTitle = $mediaWiki->checkInitialQueries( $title,$action,$wgOut, $wgRequest, $wgContLang );
-if ($wgTitle == NULL) {
- unset( $wgTitle );
+if( $wgUseFileCache && isset( $wgTitle ) ) {
+ 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
+ wfProfileOut( 'main-try-filecache' );
+ $mediaWiki->restInPeace();
+ exit;
+ }
+ }
+ wfProfileOut( 'main-try-filecache' );
}
-wfProfileOut( 'main-misc-setup' );
-
# Setting global variables in mediaWiki
-$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 );
+$mediaWiki->setVal( 'DisableHardRedirects', $wgDisableHardRedirects );
+$mediaWiki->setVal( 'DisableInternalSearch', $wgDisableInternalSearch );
+$mediaWiki->setVal( 'EnableCreativeCommonsRdf', $wgEnableCreativeCommonsRdf );
+$mediaWiki->setVal( 'EnableDublinCoreRdf', $wgEnableDublinCoreRdf );
+$mediaWiki->setVal( 'JobRunRate', $wgJobRunRate );
+$mediaWiki->setVal( 'Server', $wgServer );
+$mediaWiki->setVal( 'SquidMaxage', $wgSquidMaxage );
+$mediaWiki->setVal( 'UseExternalEditor', $wgUseExternalEditor );
+$mediaWiki->setVal( 'UsePathInfo', $wgUsePathInfo );
-$wgArticle = $mediaWiki->initialize ( $wgTitle, $wgOut, $wgUser, $wgRequest );
-$mediaWiki->finalCleanup ( $wgDeferredUpdateList, $wgLoadBalancer, $wgOut );
+$mediaWiki->performRequestForTitle( $wgTitle, $wgArticle, $wgOut, $wgUser, $wgRequest );
+$mediaWiki->finalCleanup( $wgDeferredUpdateList, $wgOut );
# Not sure when $wgPostCommitUpdateList gets set, so I keep this separate from finalCleanup
$mediaWiki->doUpdates( $wgPostCommitUpdateList );
-$mediaWiki->restInPeace( $wgLoadBalancer );
-?>
+$mediaWiki->restInPeace();
+