X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=b20cb958378b160a182c9c7c30bfe4e61cedb6dd;hb=0c2a0e4d6bbda94f5411fbb13432f8f3dd52eaa3;hp=412fcd6ad1e3d4daea669261743a79594d257606;hpb=5e95c48e285b7125a305f08cf4fd76064134ed74;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Wiki.php b/includes/Wiki.php index 412fcd6ad1..b20cb95837 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -29,23 +29,34 @@ class MediaWiki { /** * TODO: fold $output, etc, into this - * @var RequestContext + * @var IContextSource */ private $context; - public function request( WebRequest $x = null ){ + /** + * @param $x null|WebRequest + * @return WebRequest + */ + public function request( WebRequest $x = null ) { $old = $this->context->getRequest(); $this->context->setRequest( $x ); return $old; } - public function output( OutputPage $x = null ){ + /** + * @param $x null|OutputPage + * @return OutputPage + */ + public function output( OutputPage $x = null ) { $old = $this->context->getOutput(); $this->context->setOutput( $x ); return $old; } - public function __construct( RequestContext $context = null ) { + /** + * @param IContextSource|null $context + */ + public function __construct( IContextSource $context = null ) { if ( !$context ) { $context = RequestContext::getMain(); } @@ -65,6 +76,7 @@ class MediaWiki { $request = $this->context->getRequest(); $curid = $request->getInt( 'curid' ); $title = $request->getVal( 'title' ); + $action = $request->getVal( 'action', 'view' ); if ( $request->getCheck( 'search' ) ) { // Compatibility with old search URLs which didn't use Special:Search @@ -74,11 +86,16 @@ class MediaWiki { } elseif ( $curid ) { // URLs like this are generated by RC, because rc_title isn't always accurate $ret = Title::newFromID( $curid ); - } elseif ( $title == '' && $this->getAction() != 'delete' ) { + } elseif ( $title == '' && $action != 'delete' ) { $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 +104,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 +116,7 @@ class MediaWiki { } if ( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ) { - $ret = new BadTitle; + $ret = SpecialPage::getTitleFor( 'Badtitle' ); } return $ret; @@ -109,7 +126,7 @@ class MediaWiki { * Get the Title object that we'll be acting on, as specified in the WebRequest * @return Title */ - public function getTitle(){ + public function getTitle() { if( $this->context->getTitle() === null ){ $this->context->setTitle( $this->parseTitle() ); } @@ -128,7 +145,7 @@ class MediaWiki { * @return void */ private function performRequest() { - global $wgServer, $wgUsePathInfo; + global $wgServer, $wgUsePathInfo, $wgTitle; wfProfileIn( __METHOD__ ); @@ -141,21 +158,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 ) { - 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(); + if ( is_null( $title ) || ( $title->getDBkey() == '' && $title->getInterwiki() == '' ) || + $title->isSpecial( 'Badtitle' ) ) + { + $this->context->setTitle( SpecialPage::getTitleFor( 'Badtitle' ) ); + wfProfileOut( __METHOD__ ); + throw new BadTitleError(); + } + + // 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,23 +212,24 @@ 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' ); + throw new BadTitleError(); } // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant } 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 +251,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' ); @@ -226,12 +268,11 @@ class MediaWiki { 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.19 + * $wgArticle is deprecated, do not use it. + * @deprecated since 1.18 */ global $wgArticle; - $wgArticle = $article; + $wgArticle = new DeprecatedGlobal( 'wgArticle', $article, '1.18' ); $this->performAction( $article ); } elseif ( is_string( $article ) ) { @@ -253,45 +294,28 @@ class MediaWiki { /** * Create an Article object of the appropriate class for the given page. * - * @deprecated in 1.19; use Article::newFromTitle() instead + * @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 ); } /** - * 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" + * Returns the name of the action that will be executed. * - * @return String: action + * @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 ) ) { - $action = 'nosuchaction'; - } elseif ( $action === 'historysubmit' ) { - // Workaround for bug #20966: inability of IE to provide an action dependent - // on which submit button is clicked. - if ( $request->getBool( 'revisiondelete' ) ) { - $action = 'revisiondelete'; - } else { - $action = 'view'; - } - } elseif ( $action == 'editredlink' ) { - $action = 'edit'; - } + static $action = null; - // Write back the executed action - $request->setVal( 'action', $action ); + if ( $action === null ) { + $action = Action::getActionName( $this->context ); + } + return $action; } @@ -306,19 +330,21 @@ class MediaWiki { wfProfileIn( __METHOD__ ); - $request = $this->context->getRequest(); $title = $this->context->getTitle(); - - $action = $request->getVal( 'action', 'view' ); $article = Article::newFromTitle( $title, $this->context ); + $this->context->setWikiPage( $article->getPage() ); // NS_MEDIAWIKI has no redirects. // It is also used for CSS/JS, so performance matters here... if ( $title->getNamespace() == NS_MEDIAWIKI ) { wfProfileOut( __METHOD__ ); return $article; } + + $request = $this->context->getRequest(); + // Namespace might change when using redirects // Check for redirects ... + $action = $request->getVal( 'action', 'view' ); $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 @@ -353,10 +379,12 @@ class MediaWiki { $rarticle->setRedirectedFrom( $title ); $article = $rarticle; $this->context->setTitle( $target ); + $this->context->setWikiPage( $article->getPage() ); } } } else { $this->context->setTitle( $article->getTitle() ); + $this->context->setWikiPage( $article->getPage() ); } } @@ -376,7 +404,7 @@ class MediaWiki { // Output everything! $this->context->getOutput()->output(); // Do any deferred jobs - wfDoUpdates( 'commit' ); + DeferredUpdates::doUpdates( 'commit' ); $this->doJobs(); wfProfileOut( __METHOD__ ); } @@ -402,9 +430,9 @@ class MediaWiki { while ( $n-- && false != ( $job = Job::pop() ) ) { $output = $job->toString() . "\n"; - $t = -wfTime(); + $t = - microtime( true ); $success = $job->run(); - $t += wfTime(); + $t += microtime( true ); $t = round( $t * 1000 ); if ( !$success ) { $output .= "Error: " . $job->getLastError() . ", Time: $t ms\n"; @@ -431,11 +459,9 @@ class MediaWiki { /** * Perform one of the "standard" actions * - * @param $article Article + * @param $page Page */ - private function performAction( Page $article ) { - global $wgSquidMaxage, $wgUseExternalEditor; - + private function performAction( Page $page ) { wfProfileIn( __METHOD__ ); $request = $this->context->getRequest(); @@ -444,7 +470,7 @@ class MediaWiki { $user = $this->context->getUser(); if ( !wfRunHooks( 'MediaWikiPerformAction', - array( $output, $article, $title, $user, $request, $this ) ) ) + array( $output, $page, $title, $user, $request, $this ) ) ) { wfProfileOut( __METHOD__ ); return; @@ -452,70 +478,17 @@ class MediaWiki { $act = $this->getAction(); - $action = Action::factory( $act, $article ); + $action = Action::factory( $act, $page ); if ( $action instanceof Action ) { $action->show(); wfProfileOut( __METHOD__ ); return; } - switch( $act ) { - case 'view': - $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': - case 'render': - $article->$act(); - break; - case 'submit': - if ( session_id() == '' ) { - // Send a cookie so anons get talk message notifications - wfSetupSession(); - } - // 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 ) ) - { - $editor = new EditPage( $article ); - $editor->submit(); - } elseif ( $wgUseExternalEditor - && ( $external || $user->getOption( 'externaleditor' ) ) ) - { - $mode = $request->getVal( 'mode' ); - $extedit = new ExternalEdit( $article, $mode ); - $extedit->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 ) ) ) { - $request->setVal( 'action', 'nosuchaction' ); - $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); - } + if ( wfRunHooks( 'UnknownAction', array( $request->getVal( 'action', 'view' ), $page ) ) ) { + $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); } + wfProfileOut( __METHOD__ ); } @@ -525,7 +498,7 @@ class MediaWiki { */ public function run() { try { - $this->checkMaxLag( true ); + $this->checkMaxLag(); $this->main(); $this->restInPeace(); } catch ( Exception $e ) { @@ -536,38 +509,29 @@ 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 + * @return bool */ - 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; } } @@ -580,36 +544,42 @@ class MediaWiki { wfProfileIn( __METHOD__ ); - # Set title from request parameters - $wgTitle = $this->getTitle(); - $action = $this->getAction(); - $user = $this->context->getUser(); + $request = $this->context->getRequest(); + + // Send Ajax requests to the Ajax dispatcher. + if ( $wgUseAjax && $request->getVal( 'action', 'view' ) == 'ajax' ) { + + // Set a dummy title, because $wgTitle == null might break things + $title = Title::makeTitle( NS_MAIN, 'AJAX' ); + $this->context->setTitle( $title ); + $wgTitle = $title; - # 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 ) { + // Get title from request parameters, + // is set on the fly by parseTitle the first time. + $title = $this->getTitle(); + $action = $this->getAction(); + $wgTitle = $title; + + if ( $wgUseFileCache && $title->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() ) { - /* 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 ( HTMLFileCache::useFileCache( $this->context ) ) { + // Try low-level file cache hit + $cache = HTMLFileCache::newFromTitle( $title, $action ); + if ( $cache->isCacheGood( /* Assume up to date */ ) ) { + // Check incoming headers to see if client has this cached + $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 ); - # Tell OutputPage that output is taken care of + // Do any stats increment/watchlist stuff + $this->context->getWikiPage()->doViewUpdates( $this->context->getUser() ); + // Tell OutputPage that output is taken care of $this->context->getOutput()->disable(); wfProfileOut( 'main-try-filecache' ); wfProfileOut( __METHOD__ );