From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 3 Dec 2011 13:29:22 +0100 Subject: Update to MediaWiki 1.18.0 * also update ArchLinux skin to chagnes in MonoBook * Use only css to hide our menu bar when printing --- includes/Wiki.php | 639 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 354 insertions(+), 285 deletions(-) (limited to 'includes/Wiki.php') diff --git a/includes/Wiki.php b/includes/Wiki.php index 4c3af0f7..173fcd94 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -1,241 +1,206 @@ params[$key] =& $value; - } + private $context; - /** - * Retrieves key/value pairs to circumvent global variables - * Note that keys are case-insensitive! - * - * @param $key String: key to get - * @param $default string default value, defaults to empty string - * @return $default Mixed: default value if if the key doesn't exist - */ - function getVal( $key, $default = '' ) { - $key = strtolower( $key ); - if( isset( $this->params[$key] ) ) { - return $this->params[$key]; - } - return $default; + public function request( WebRequest $x = null ){ + $old = $this->context->getRequest(); + $this->context->setRequest( $x ); + return $old; } - /** - * Initialization of ... everything - * Performs the request too - * - * @param $title Title ($wgTitle) - * @param $article Article - * @param $output OutputPage - * @param $user User - * @param $request WebRequest - */ - function performRequestForTitle( &$title, &$article, &$output, &$user, $request ) { - wfProfileIn( __METHOD__ ); - - $output->setTitle( $title ); - - wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) ); - - if( !$this->preliminaryChecks( $title, $output ) ) { - wfProfileOut( __METHOD__ ); - return; - } - // Call handleSpecialCases() to deal with all special requests... - if( !$this->handleSpecialCases( $title, $output, $request ) ) { - // ...otherwise treat it as an article view. The article - // may be a redirect to another article or URL. - $new_article = $this->initializeArticle( $title, $output, $request ); - if( is_object( $new_article ) ) { - $article = $new_article; - $this->performAction( $output, $article, $title, $user, $request ); - } elseif( is_string( $new_article ) ) { - $output->redirect( $new_article ); - } else { - wfProfileOut( __METHOD__ ); - throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" ); - } - } - wfProfileOut( __METHOD__ ); + public function output( OutputPage $x = null ){ + $old = $this->context->getOutput(); + $this->context->setOutput( $x ); + return $old; } - /** - * Check if the maximum lag of database slaves is higher that $maxLag, and - * if it's the case, output an error message - * - * @param $maxLag int: maximum lag allowed for the request, as supplied by - * the client - * @return bool true if the request can continue - */ - function checkMaxLag( $maxLag ) { - list( $host, $lag ) = wfGetLB()->getMaxLag(); - if( $lag > $maxLag ) { - wfMaxlagError( $host, $lag, $maxLag ); - return false; - } else { - return true; + public function __construct( IContextSource $context = null ) { + if ( !$context ) { + $context = RequestContext::getMain(); } + + $this->context = $context; + $this->context->setTitle( $this->parseTitle() ); } /** - * Checks some initial queries - * Note that $title here is *not* a Title object, but a string! + * Parse the request to get the Title object * - * @param $title String - * @param $action String * @return Title object to be $wgTitle */ - function checkInitialQueries( $title, $action ) { - global $wgOut, $wgRequest, $wgContLang; - if( $wgRequest->getVal( 'printable' ) === 'yes' ) { - $wgOut->setPrintable(); - } + private function parseTitle() { + global $wgContLang; - $curid = $wgRequest->getInt( 'curid' ); - if( $wgRequest->getCheck( 'search' ) ) { + $request = $this->context->getRequest(); + $curid = $request->getInt( 'curid' ); + $title = $request->getVal( 'title' ); + + if ( $request->getCheck( 'search' ) ) { // Compatibility with old search URLs which didn't use Special:Search // Just check for presence here, so blank requests still // show the search page when using ugly URLs (bug 8054). $ret = SpecialPage::getTitleFor( 'Search' ); - } elseif( $curid ) { + } elseif ( $curid ) { // URLs like this are generated by RC, because rc_title isn't always accurate $ret = Title::newFromID( $curid ); - } elseif( $title == '' && $action != 'delete' ) { + } elseif ( $title == '' && $this->getAction() != 'delete' ) { $ret = Title::newMainPage(); } else { $ret = Title::newFromURL( $title ); // check variant links so that interwiki links don't have to worry // about the possible different language variants - if( count( $wgContLang->getVariants() ) > 1 && !is_null( $ret ) && $ret->getArticleID() == 0 ) + if ( count( $wgContLang->getVariants() ) > 1 + && !is_null( $ret ) && $ret->getArticleID() == 0 ) + { $wgContLang->findVariantLink( $title, $ret ); + } } // For non-special titles, check for implicit titles - if( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) { + if ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) { // We can have urls with just ?diff=,?oldid= or even just ?diff= - $oldid = $wgRequest->getInt( 'oldid' ); - $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' ); + $oldid = $request->getInt( 'oldid' ); + $oldid = $oldid ? $oldid : $request->getInt( 'diff' ); // Allow oldid to override a changed or missing title - if( $oldid ) { + if ( $oldid ) { $rev = Revision::newFromId( $oldid ); $ret = $rev ? $rev->getTitle() : $ret; } } + + if ( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ) { + $ret = SpecialPage::getTitleFor( 'Badtitle' ); + } + return $ret; } /** - * Checks for anon-cannot-read case - * - * @param $title Title - * @param $output OutputPage - * @return boolean true if successful + * Get the Title object that we'll be acting on, as specified in the WebRequest + * @return Title */ - function preliminaryChecks( &$title, &$output ) { - global $wgTitle; - // If the user is not logged in, the Namespace:title of the article must be in - // the Read array in order for the user to see it. (We have to check here to - // catch special pages etc. We check again in Article::view()) - if( !is_null( $title ) && !$title->userCanRead() ) { - // Bug 32276: allowing the skin to generate output with $wgTitle - // set to the input title would allow anonymous users to - // determine whether a page exists, potentially leaking private data. In fact, the - // curid and oldid request parameters would allow page titles to be enumerated even - // when they are not guessable. So we reset the title to Special:Badtitle before the - // permissions error is displayed. - $badtitle = SpecialPage::getTitleFor( 'Badtitle' ); - $output->setTitle( $badtitle ); - $wgTitle = $badtitle; - - $output->loginToUse(); - $this->finalCleanup( $output ); - $output->disable(); - return false; + public function getTitle(){ + if( $this->context->getTitle() === null ){ + $this->context->setTitle( $this->parseTitle() ); } - return true; + return $this->context->getTitle(); } /** - * Initialize some special cases: + * Performs the request. * - bad titles + * - read restriction * - local interwiki redirects * - redirect loop * - special pages + * - normal pages * - * @param $title Title - * @param $output OutputPage - * @param $request WebRequest - * @return bool true if the request is already executed + * @return void */ - function handleSpecialCases( &$title, &$output, $request ) { + private function performRequest() { + global $wgServer, $wgUsePathInfo; + wfProfileIn( __METHOD__ ); - $action = $this->getVal( 'Action' ); + $request = $this->context->getRequest(); + $title = $this->context->getTitle(); + $output = $this->context->getOutput(); + $user = $this->context->getUser(); + + if ( $request->getVal( 'printable' ) === 'yes' ) { + $output->setPrintable(); + } + + $pageView = false; // was an article or special page viewed? + + wfRunHooks( 'BeforeInitialize', + array( &$title, null, &$output, &$user, $request, $this ) ); // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty. - if( is_null($title) || ( ( $title->getDBkey() == '' ) && ( $title->getInterwiki() == '' ) ) ) { - $title = SpecialPage::getTitleFor( 'Badtitle' ); - $output->setTitle( $title ); // bug 21456 + if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) || + $title->isSpecial( 'Badtitle' ) ) + { + $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) ); // Die now before we mess up $wgArticle and the skin stops working throw new ErrorPageError( 'badtitle', 'badtitletext' ); - + // If the user is not logged in, the Namespace:title of the article must be in + // the Read array in order for the user to see it. (We have to check here to + // catch special pages etc. We check again in Article::view()) + } elseif ( !$title->userCanRead() ) { + $output->loginToUse(); // Interwiki redirects - } else if( $title->getInterwiki() != '' ) { + } elseif ( $title->getInterwiki() != '' ) { $rdfrom = $request->getVal( 'rdfrom' ); - if( $rdfrom ) { + if ( $rdfrom ) { $url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) ); } else { $query = $request->getValues(); unset( $query['title'] ); $url = $title->getFullURL( $query ); } - /* Check for a redirect loop */ - if( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) { + // Check for a redirect loop + if ( !preg_match( '/^' . preg_quote( $wgServer, '/' ) . '/', $url ) + && $title->isLocal() ) + { // 301 so google et al report the target as the actual url. $output->redirect( $url, 301 ); } else { - $title = SpecialPage::getTitleFor( 'Badtitle' ); - $output->setTitle( $title ); // bug 21456 + $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) ); wfProfileOut( __METHOD__ ); throw new ErrorPageError( 'badtitle', 'badtitletext' ); } // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant - } else if ( $action == 'view' && !$request->wasPosted() - && ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getVal( 'title' ) ) - && !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) ) + } elseif ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted() + && ( $request->getVal( 'title' ) === null || + $title->getPrefixedDBKey() != $request->getVal( 'title' ) ) + && !count( $request->getValueNames( array( 'action', 'title' ) ) ) + && wfRunHooks( 'TestCanonicalRedirect', array( $request, $title, $output ) ) ) { if ( $title->getNamespace() == NS_SPECIAL ) { - list( $name, $subpage ) = SpecialPage::resolveAliasWithSubpage( $title->getDBkey() ); + list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() ); if ( $name ) { $title = SpecialPage::getTitleFor( $name, $subpage ); } } - $targetUrl = $title->getFullURL(); + $targetUrl = wfExpandUrl( $title->getFullURL(), PROTO_CURRENT ); // Redirect to canonical url, make it a 301 to allow caching - if( $targetUrl == $request->getFullRequestURL() ) { + if ( $targetUrl == $request->getFullRequestURL() ) { $message = "Redirect loop detected!\n\n" . "This means the wiki got confused about what page was " . "requested; this sometimes happens when moving a wiki " . "to a new server or changing the server configuration.\n\n"; - if( $this->getVal( 'UsePathInfo' ) ) { + if ( $wgUsePathInfo ) { $message .= "The wiki is trying to interpret the page " . "title from the URL path portion (PATH_INFO), which " . "sometimes fails depending on the web server. Try " . @@ -250,78 +215,117 @@ class MediaWiki { "to true."; } wfHttpError( 500, "Internal error", $message ); - wfProfileOut( __METHOD__ ); - return false; } else { $output->setSquidMaxage( 1200 ); $output->redirect( $targetUrl, '301' ); } // Special pages - } else if( NS_SPECIAL == $title->getNamespace() ) { - /* actions that need to be made when we have a special pages */ - SpecialPage::executePath( $title ); + } elseif ( NS_SPECIAL == $title->getNamespace() ) { + $pageView = true; + // Actions that need to be made when we have a special pages + SpecialPageFactory::executePath( $title, $this->context ); } else { - /* No match to special cases */ - wfProfileOut( __METHOD__ ); - return false; + // ...otherwise treat it as an article view. The article + // may be a redirect to another article or URL. + $article = $this->initializeArticle(); + if ( is_object( $article ) ) { + $pageView = true; + /** + * $wgArticle is deprecated, do not use it. This will possibly be removed + * entirely in 1.20 or 1.21 + * @deprecated since 1.18 + */ + global $wgArticle; + $wgArticle = $article; + + $this->performAction( $article ); + } elseif ( is_string( $article ) ) { + $output->redirect( $article ); + } else { + wfProfileOut( __METHOD__ ); + throw new MWException( "Shouldn't happen: MediaWiki::initializeArticle() returned neither an object nor a URL" ); + } + } + + if ( $pageView ) { + // Promote user to any groups they meet the criteria for + $user->addAutopromoteOnceGroups( 'onView' ); } - /* Did match a special case */ + wfProfileOut( __METHOD__ ); - return true; } /** * Create an Article object of the appropriate class for the given page. * + * @deprecated in 1.18; use Article::newFromTitle() instead * @param $title Title + * @param $context IContextSource * @return Article object */ - static function articleFromTitle( &$title ) { - if( NS_MEDIA == $title->getNamespace() ) { - // FIXME: where should this go? - $title = Title::makeTitle( NS_FILE, $title->getDBkey() ); - } + public static function articleFromTitle( $title, IContextSource $context ) { + return Article::newFromTitle( $title, $context ); + } - $article = null; - wfRunHooks( 'ArticleFromTitle', array( &$title, &$article ) ); - if( $article ) { - return $article; + /** + * Returns the action that will be executed, not necessarily the one passed + * passed through the "action" parameter. Actions disabled in + * $wgDisabledActions will be replaced by "nosuchaction" + * + * @return String: action + */ + public function getAction() { + global $wgDisabledActions; + + $request = $this->context->getRequest(); + $action = $request->getVal( 'action', 'view' ); + + // Check for disabled actions + if ( in_array( $action, $wgDisabledActions ) ) { + return 'nosuchaction'; } - switch( $title->getNamespace() ) { - case NS_FILE: - return new ImagePage( $title ); - case NS_CATEGORY: - return new CategoryPage( $title ); - default: - return new Article( $title ); + // Workaround for bug #20966: inability of IE to provide an action dependent + // on which submit button is clicked. + if ( $action === 'historysubmit' ) { + if ( $request->getBool( 'revisiondelete' ) ) { + return 'revisiondelete'; + } else { + return 'view'; + } + } elseif ( $action == 'editredlink' ) { + return 'edit'; } + + return $action; } /** - * Initialize the object to be known as $wgArticle for "standard" actions + * Initialize the main Article object for "standard" actions (view, etc) * Create an Article object for the page, following redirects if needed. * - * @param $title Title ($wgTitle) - * @param $output OutputPage ($wgOut) - * @param $request WebRequest ($wgRequest) * @return mixed an Article, or a string to redirect to another URL */ - function initializeArticle( &$title, &$output, $request ) { + private function initializeArticle() { + global $wgDisableHardRedirects; + wfProfileIn( __METHOD__ ); - $action = $this->getVal( 'action', 'view' ); - $article = self::articleFromTitle( $title ); + $request = $this->context->getRequest(); + $title = $this->context->getTitle(); + + $action = $request->getVal( 'action', 'view' ); + $article = Article::newFromTitle( $title, $this->context ); // NS_MEDIAWIKI has no redirects. // It is also used for CSS/JS, so performance matters here... - if( $title->getNamespace() == NS_MEDIAWIKI ) { + if ( $title->getNamespace() == NS_MEDIAWIKI ) { wfProfileOut( __METHOD__ ); return $article; } // Namespace might change when using redirects // Check for redirects ... - $file = ($title->getNamespace() == NS_FILE) ? $article->getFile() : null; - if( ( $action == 'view' || $action == 'render' ) // ... for actions that show content + $file = ( $title->getNamespace() == NS_FILE ) ? $article->getFile() : null; + if ( ( $action == 'view' || $action == 'render' ) // ... for actions that show content && !$request->getVal( 'oldid' ) && // ... and are not old revisions !$request->getVal( 'diff' ) && // ... and not when showing diff $request->getVal( 'redirect' ) != 'no' && // ... unless explicitly told not to @@ -331,59 +335,53 @@ class MediaWiki { // Give extensions a change to ignore/handle redirects as needed $ignoreRedirect = $target = false; - $dbr = wfGetDB( DB_SLAVE ); - $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) ); - wfRunHooks( 'InitializeArticleMaybeRedirect', - array(&$title,&$request,&$ignoreRedirect,&$target,&$article) ); + array( &$title, &$request, &$ignoreRedirect, &$target, &$article ) ); // Follow redirects only for... redirects. // If $target is set, then a hook wanted to redirect. - if( !$ignoreRedirect && ($target || $article->isRedirect()) ) { + if ( !$ignoreRedirect && ( $target || $article->isRedirect() ) ) { // Is the target already set by an extension? $target = $target ? $target : $article->followRedirect(); - if( is_string( $target ) ) { - if( !$this->getVal( 'DisableHardRedirects' ) ) { + if ( is_string( $target ) ) { + if ( !$wgDisableHardRedirects ) { // we'll need to redirect wfProfileOut( __METHOD__ ); return $target; } } - if( is_object($target) ) { + if ( is_object( $target ) ) { // Rewrite environment to redirected article - $rarticle = self::articleFromTitle( $target ); - $rarticle->loadPageData( $rarticle->pageDataFromTitle( $dbr, $target ) ); - if( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) { + $rarticle = Article::newFromTitle( $target, $this->context ); + $rarticle->loadPageData(); + if ( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) { $rarticle->setRedirectedFrom( $title ); $article = $rarticle; - $title = $target; - $output->setTitle( $title ); + $this->context->setTitle( $target ); } } } else { - $title = $article->getTitle(); + $this->context->setTitle( $article->getTitle() ); } } + wfProfileOut( __METHOD__ ); return $article; } /** - * Cleaning up request by doing: - ** deferred updates, DB transaction, and the output - * - * @param $output OutputPage + * Cleaning up request by doing deferred updates, DB transaction, and the output */ - function finalCleanup( &$output ) { + public function finalCleanup() { wfProfileIn( __METHOD__ ); // Now commit any transactions, so that unreported errors after // output() don't roll back the whole DB transaction $factory = wfGetLBFactory(); $factory->commitMasterChanges(); // Output everything! - $output->output(); + $this->context->getOutput()->output(); // Do any deferred jobs - wfDoUpdates( true ); + wfDoUpdates( 'commit' ); $this->doJobs(); wfProfileOut( __METHOD__ ); } @@ -391,20 +389,20 @@ class MediaWiki { /** * Do a job from the job queue */ - function doJobs() { - $jobRunRate = $this->getVal( 'JobRunRate' ); + private function doJobs() { + global $wgJobRunRate; - if( $jobRunRate <= 0 || wfReadOnly() ) { + if ( $wgJobRunRate <= 0 || wfReadOnly() ) { return; } - if( $jobRunRate < 1 ) { + if ( $wgJobRunRate < 1 ) { $max = mt_getrandmax(); - if( mt_rand( 0, $max ) > $max * $jobRunRate ) { + if ( mt_rand( 0, $max ) > $max * $wgJobRunRate ) { return; } $n = 1; } else { - $n = intval( $jobRunRate ); + $n = intval( $wgJobRunRate ); } while ( $n-- && false != ( $job = Job::pop() ) ) { @@ -412,8 +410,8 @@ class MediaWiki { $t = -wfTime(); $success = $job->run(); $t += wfTime(); - $t = round( $t*1000 ); - if( !$success ) { + $t = round( $t * 1000 ); + if ( !$success ) { $output .= "Error: " . $job->getLastError() . ", Time: $t ms\n"; } else { $output .= "Success, Time: $t ms\n"; @@ -425,7 +423,8 @@ class MediaWiki { /** * Ends this task peacefully */ - function restInPeace() { + public function restInPeace() { + MessageCache::logMessages(); wfLogProfilingData(); // Commit and close up! $factory = wfGetLBFactory(); @@ -437,126 +436,196 @@ class MediaWiki { /** * Perform one of the "standard" actions * - * @param $output OutputPage * @param $article Article - * @param $title Title - * @param $user User - * @param $request WebRequest */ - function performAction( &$output, &$article, &$title, &$user, &$request ) { + private function performAction( Page $article ) { + global $wgSquidMaxage, $wgUseExternalEditor; + wfProfileIn( __METHOD__ ); - if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) { + $request = $this->context->getRequest(); + $output = $this->context->getOutput(); + $title = $this->context->getTitle(); + $user = $this->context->getUser(); + + if ( !wfRunHooks( 'MediaWikiPerformAction', + array( $output, $article, $title, $user, $request, $this ) ) ) + { wfProfileOut( __METHOD__ ); return; } - $action = $this->getVal( 'Action' ); - if( in_array( $action, $this->getVal( 'DisabledActions', array() ) ) ) { - /* No such action; this will switch to the default case */ - $action = 'nosuchaction'; - } + $act = $this->getAction(); - // Workaround for bug #20966: inability of IE to provide an action dependent - // on which submit button is clicked. - if ( $action === 'historysubmit' ) { - if ( $request->getBool( 'revisiondelete' ) ) { - $action = 'revisiondelete'; - } else { - $action = 'view'; - } + $action = Action::factory( $act, $article ); + if ( $action instanceof Action ) { + $action->show(); + wfProfileOut( __METHOD__ ); + return; } - switch( $action ) { + switch( $act ) { case 'view': - $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) ); + $output->setSquidMaxage( $wgSquidMaxage ); $article->view(); break; case 'raw': // includes JS/CSS - wfProfileIn( __METHOD__.'-raw' ); + wfProfileIn( __METHOD__ . '-raw' ); $raw = new RawPage( $article ); $raw->view(); - wfProfileOut( __METHOD__.'-raw' ); + wfProfileOut( __METHOD__ . '-raw' ); break; - case 'watch': - case 'unwatch': case 'delete': - case 'revert': - case 'rollback': case 'protect': case 'unprotect': - case 'info': - case 'markpatrolled': case 'render': - case 'deletetrackback': - case 'purge': - $article->$action(); - break; - case 'print': - $article->view(); - break; - case 'dublincore': - if( !$this->getVal( 'EnableDublinCoreRdf' ) ) { - wfHttpError( 403, 'Forbidden', wfMsg( 'nodublincore' ) ); - } else { - $rdf = new DublinCoreRdf( $article ); - $rdf->show(); - } - break; - case 'creativecommons': - if( !$this->getVal( 'EnableCreativeCommonsRdf' ) ) { - wfHttpError( 403, 'Forbidden', wfMsg( 'nocreativecommons' ) ); - } else { - $rdf = new CreativeCommonsRdf( $article ); - $rdf->show(); - } - break; - case 'credits': - Credits::showPage( $article ); + $article->$act(); break; case 'submit': - if( session_id() == '' ) { - /* Send a cookie so anons get talk message notifications */ + if ( session_id() == '' ) { + // Send a cookie so anons get talk message notifications wfSetupSession(); } - /* Continue... */ + // Continue... case 'edit': - case 'editredlink': - if( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) { + if ( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) { $internal = $request->getVal( 'internaledit' ); $external = $request->getVal( 'externaledit' ); $section = $request->getVal( 'section' ); $oldid = $request->getVal( 'oldid' ); - if( !$this->getVal( 'UseExternalEditor' ) || $action=='submit' || $internal || - $section || $oldid || ( !$user->getOption( 'externaleditor' ) && !$external ) ) { + if ( !$wgUseExternalEditor || $act == 'submit' || $internal || + $section || $oldid || + ( !$user->getOption( 'externaleditor' ) && !$external ) ) + { $editor = new EditPage( $article ); $editor->submit(); - } elseif( $this->getVal( 'UseExternalEditor' ) && ( $external || $user->getOption( 'externaleditor' ) ) ) { + } elseif ( $wgUseExternalEditor + && ( $external || $user->getOption( 'externaleditor' ) ) ) + { $mode = $request->getVal( 'mode' ); - $extedit = new ExternalEdit( $article, $mode ); + $extedit = new ExternalEdit( $article->getTitle(), $mode ); $extedit->edit(); } } break; case 'history': - if( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) { - $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) ); + if ( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) { + $output->setSquidMaxage( $wgSquidMaxage ); } $history = new HistoryPage( $article ); $history->history(); break; - case 'revisiondelete': - // For show/hide submission from history page - $special = SpecialPage::getPage( 'Revisiondelete' ); - $special->execute( '' ); - break; default: - if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) { + if ( wfRunHooks( 'UnknownAction', array( $act, $article ) ) ) { $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); } } wfProfileOut( __METHOD__ ); + } + /** + * Run the current MediaWiki instance + * index.php just calls this + */ + public function run() { + try { + $this->checkMaxLag( true ); + $this->main(); + $this->restInPeace(); + } catch ( Exception $e ) { + MWExceptionHandler::handle( $e ); + } } + /** + * Checks if the request should abort due to a lagged server, + * for given maxlag parameter. + * + * @param boolean $abort True if this class should abort the + * script execution. False to return the result as a boolean. + * @return boolean True if we passed the check, false if we surpass the maxlag + */ + private function checkMaxLag( $abort ) { + global $wgShowHostnames; + + wfProfileIn( __METHOD__ ); + $maxLag = $this->context->getRequest()->getVal( 'maxlag' ); + if ( !is_null( $maxLag ) ) { + $lb = wfGetLB(); // foo()->bar() is not supported in PHP4 + list( $host, $lag ) = $lb->getMaxLag(); + if ( $lag > $maxLag ) { + if ( $abort ) { + $resp = $this->context->getRequest()->response(); + $resp->header( 'HTTP/1.1 503 Service Unavailable' ); + $resp->header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) ); + $resp->header( 'X-Database-Lag: ' . intval( $lag ) ); + $resp->header( 'Content-Type: text/plain' ); + if( $wgShowHostnames ) { + echo "Waiting for $host: $lag seconds lagged\n"; + } else { + echo "Waiting for a database server: $lag seconds lagged\n"; + } + } + + wfProfileOut( __METHOD__ ); + + if ( !$abort ) { + return false; + } + exit; + } + } + wfProfileOut( __METHOD__ ); + return true; + } + + private function main() { + global $wgUseFileCache, $wgTitle, $wgUseAjax; + + wfProfileIn( __METHOD__ ); + + # Set title from request parameters + $wgTitle = $this->getTitle(); + $action = $this->getAction(); + $user = $this->context->getUser(); + + # Send Ajax requests to the Ajax dispatcher. + if ( $wgUseAjax && $action == 'ajax' ) { + $dispatcher = new AjaxDispatcher(); + $dispatcher->performAction(); + wfProfileOut( __METHOD__ ); + return; + } + + if ( $wgUseFileCache && $wgTitle->getNamespace() != NS_SPECIAL ) { + wfProfileIn( 'main-try-filecache' ); + // Raw pages should handle cache control on their own, + // even when using file cache. This reduces hits from clients. + if ( 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 */ + $timestamp = $cache->fileCacheTime(); + if ( !$this->context->getOutput()->checkLastModified( $timestamp ) ) { + $cache->loadFromFileCache(); + } + # Do any stats increment/watchlist stuff + $article = WikiPage::factory( $wgTitle ); + $article->doViewUpdates( $user ); + # Tell OutputPage that output is taken care of + $this->context->getOutput()->disable(); + wfProfileOut( 'main-try-filecache' ); + wfProfileOut( __METHOD__ ); + return; + } + } + wfProfileOut( 'main-try-filecache' ); + } + + $this->performRequest(); + $this->finalCleanup(); + + wfProfileOut( __METHOD__ ); + } } -- cgit v1.2.2