X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=4984b5f0ca3f8c64493dec9b3a4b3c116fd38394;hb=957850f0da357337c24291a29d5ea0f08b5050a9;hp=1ba71a5f7a22454d584238350229ebc0585acd74;hpb=2d93c5c8af37d4e7a3110caf0fefab18a268b538;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Wiki.php b/includes/Wiki.php index 1ba71a5f7a..4984b5f0ca 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -29,7 +29,7 @@ class MediaWiki { /** * TODO: fold $output, etc, into this - * @var RequestContext + * @var IContextSource */ private $context; @@ -45,7 +45,7 @@ class MediaWiki { return $old; } - public function __construct( RequestContext $context = null ) { + public function __construct( IContextSource $context = null ) { if ( !$context ) { $context = RequestContext::getMain(); } @@ -78,7 +78,12 @@ class MediaWiki { $ret = Title::newMainPage(); } else { $ret = Title::newFromURL( $title ); - // check variant links so that interwiki links don't have to worry + // Alias NS_MEDIA page URLs to NS_FILE...we only use NS_MEDIA + // in wikitext links to tell Parser to make a direct file link + if ( !is_null( $ret ) && $ret->getNamespace() == NS_MEDIA ) { + $ret = Title::makeTitle( NS_FILE, $ret->getDBkey() ); + } + // 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 ) @@ -87,7 +92,7 @@ class MediaWiki { } } // For non-special titles, check for implicit titles - if ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) { + if ( is_null( $ret ) || !$ret->isSpecialPage() ) { // We can have urls with just ?diff=,?oldid= or even just ?diff= $oldid = $request->getInt( 'oldid' ); $oldid = $oldid ? $oldid : $request->getInt( 'diff' ); @@ -99,7 +104,7 @@ class MediaWiki { } if ( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ) { - $ret = new BadTitle; + $ret = SpecialPage::getTitleFor( 'Badtitle' ); } return $ret; @@ -128,7 +133,7 @@ class MediaWiki { * @return void */ private function performRequest() { - global $wgServer, $wgUsePathInfo; + global $wgServer, $wgUsePathInfo, $wgTitle; wfProfileIn( __METHOD__ ); @@ -141,21 +146,45 @@ class MediaWiki { $output->setPrintable(); } - $pageView = false; // was an article or special page viewed? - - wfRunHooks( 'BeforeInitialize', - array( &$title, null, &$output, &$user, $request, $this ) ); + $unused = null; // To pass it by reference + wfRunHooks( 'BeforeInitialize', array( &$title, &$unused, &$output, &$user, $request, $this ) ); // Invalid titles. Bug 21776: The interwikis must redirect even if the page name is empty. - if ( $title instanceof BadTitle ) { + if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) || + $title->isSpecial( 'Badtitle' ) ) + { + $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) ); + wfProfileOut( __METHOD__ ); 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(); + } + + // Check user's permissions to read this page. + // We have to check here to catch special pages etc. + // We will check again in Article::view(). + $permErrors = $title->getUserPermissionsErrors( 'read', $user ); + if ( count( $permErrors ) ) { + // Bug 32276: allowing the skin to generate output with $wgTitle or + // $this->context->title 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. + // + // The skin mostly uses $this->context->getTitle() these days, but some extensions + // still use $wgTitle. + + $badTitle = SpecialPage::getTitleFor( 'Badtitle' ); + $this->context->setTitle( $badTitle ); + $wgTitle = $badTitle; + + wfProfileOut( __METHOD__ ); + throw new PermissionsError( 'read', $permErrors ); + } + + $pageView = false; // was an article or special page viewed? + // Interwiki redirects - } elseif ( $title->getInterwiki() != '' ) { + if ( $title->getInterwiki() != '' ) { $rdfrom = $request->getVal( 'rdfrom' ); if ( $rdfrom ) { $url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) ); @@ -171,7 +200,7 @@ class MediaWiki { // 301 so google et al report the target as the actual url. $output->redirect( $url, 301 ); } else { - $this->context->setTitle( new BadTitle ); + $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) ); wfProfileOut( __METHOD__ ); throw new ErrorPageError( 'badtitle', 'badtitletext' ); } @@ -179,15 +208,16 @@ class MediaWiki { } elseif ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted() && ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getVal( 'title' ) ) - && !count( $request->getValueNames( array( 'action', 'title' ) ) ) ) + && !count( $request->getValueNames( array( 'action', 'title' ) ) ) + && wfRunHooks( 'TestCanonicalRedirect', array( $request, $title, $output ) ) ) { - if ( $title->getNamespace() == NS_SPECIAL ) { + if ( $title->isSpecialPage() ) { 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() ) { $message = "Redirect loop detected!\n\n" . @@ -209,7 +239,7 @@ class MediaWiki { "\$wgArticlePath setting and/or toggle \$wgUsePathInfo " . "to true."; } - wfHttpError( 500, "Internal error", $message ); + throw new HttpError( 500, $message ); } else { $output->setSquidMaxage( 1200 ); $output->redirect( $targetUrl, '301' ); @@ -255,10 +285,11 @@ class MediaWiki { * * @deprecated in 1.18; use Article::newFromTitle() instead * @param $title Title - * @param $context RequestContext + * @param $context IContextSource * @return Article object */ - public static function articleFromTitle( $title, RequestContext $context ) { + public static function articleFromTitle( $title, IContextSource $context ) { + wfDeprecated( __METHOD__, '1.18' ); return Article::newFromTitle( $title, $context ); } @@ -376,7 +407,7 @@ class MediaWiki { // Output everything! $this->context->getOutput()->output(); // Do any deferred jobs - wfDoUpdates( 'commit' ); + DeferredUpdates::doUpdates( 'commit' ); $this->doJobs(); wfProfileOut( __METHOD__ ); } @@ -434,7 +465,7 @@ class MediaWiki { * @param $article Article */ private function performAction( Page $article ) { - global $wgSquidMaxage, $wgUseExternalEditor; + global $wgSquidMaxage; wfProfileIn( __METHOD__ ); @@ -464,12 +495,6 @@ class MediaWiki { $output->setSquidMaxage( $wgSquidMaxage ); $article->view(); break; - case 'raw': // includes JS/CSS - wfProfileIn( __METHOD__ . '-raw' ); - $raw = new RawPage( $article ); - $raw->view(); - wfProfileOut( __METHOD__ . '-raw' ); - break; case 'delete': case 'protect': case 'unprotect': @@ -484,32 +509,18 @@ class MediaWiki { // Continue... case 'edit': if ( wfRunHooks( 'CustomEditor', array( $article, $user ) ) ) { - $internal = $request->getVal( 'internaledit' ); - $external = $request->getVal( 'externaledit' ); - $section = $request->getVal( 'section' ); - $oldid = $request->getVal( 'oldid' ); - if ( !$wgUseExternalEditor || $act == 'submit' || $internal || - $section || $oldid || - ( !$user->getOption( 'externaleditor' ) && !$external ) ) + if ( ExternalEdit::useExternalEngine( $this->context, 'edit' ) + && $act == 'edit' && !$request->getVal( 'section' ) + && !$request->getVal( 'oldid' ) ) { + $extedit = new ExternalEdit( $this->context ); + $extedit->execute(); + } else { $editor = new EditPage( $article ); - $editor->submit(); - } elseif ( $wgUseExternalEditor - && ( $external || $user->getOption( 'externaleditor' ) ) ) - { - $mode = $request->getVal( 'mode' ); - $extedit = new ExternalEdit( $article->getTitle(), $mode ); - $extedit->edit(); + $editor->edit(); } } break; - case 'history': - if ( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) { - $output->setSquidMaxage( $wgSquidMaxage ); - } - $history = new HistoryPage( $article ); - $history->history(); - break; default: if ( wfRunHooks( 'UnknownAction', array( $act, $article ) ) ) { $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); @@ -524,7 +535,7 @@ class MediaWiki { */ public function run() { try { - $this->checkMaxLag( true ); + $this->checkMaxLag(); $this->main(); $this->restInPeace(); } catch ( Exception $e ) { @@ -535,38 +546,28 @@ class MediaWiki { /** * 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 ) { + private function checkMaxLag() { 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(); + list( $host, $lag ) = wfGetLB()->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"; - } + $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; } } @@ -582,7 +583,6 @@ class MediaWiki { # 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' ) { @@ -592,22 +592,20 @@ class MediaWiki { return; } - if ( $wgUseFileCache && $wgTitle->getNamespace() != NS_SPECIAL ) { + if ( $wgUseFileCache && $this->getTitle()->getNamespace() >= 0 ) { 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() ) { + if ( HTMLFileCache::useFileCache( $this->context ) ) { /* Try low-level file cache hit */ - $cache = new HTMLFileCache( $wgTitle, $action ); - if ( $cache->isFileCacheGood( /* Assume up to date */ ) ) { + $cache = HTMLFileCache::newFromTitle( $this->getTitle(), $action ); + if ( $cache->isCacheGood( /* Assume up to date */ ) ) { /* Check incoming headers to see if client has this cached */ - $timestamp = $cache->fileCacheTime(); + $timestamp = $cache->cacheTimestamp(); if ( !$this->context->getOutput()->checkLastModified( $timestamp ) ) { - $cache->loadFromFileCache(); + $cache->loadFromFileCache( $this->context ); } # Do any stats increment/watchlist stuff - $article = WikiPage::factory( $wgTitle ); - $article->doViewUpdates( $user ); + $page = WikiPage::factory( $this->getTitle() ); + $page->doViewUpdates( $this->context->getUser() ); # Tell OutputPage that output is taken care of $this->context->getOutput()->disable(); wfProfileOut( 'main-try-filecache' );