X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=cb0ef8bcc711f856581a6eeb5fccdb0b65662cd5;hb=5dfc928820613b6e3eeee7e97e60b1af577aa575;hp=2241c22559893a84d42fc82842c4ddd8afdf5ec0;hpb=3611f529a88722cb81b819da87af4582de2cd479;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Wiki.php b/includes/Wiki.php index 2241c22559..cb0ef8bcc7 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -1,6 +1,8 @@ preliminaryChecks( $title, $output, $request ) ; - if ( !$this->initializeSpecialCases( $title, $output, $request ) ) { - $new_article = $this->initializeArticle( $title, $request ); + + $output->setTitle( $title ); + + wfRunHooks( 'BeforeInitialize', array( &$title, &$article, &$output, &$user, $request, $this ) ); + + if( !$this->preliminaryChecks( $title, $output, $request ) ) { + 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" ); } } @@ -70,13 +85,13 @@ class MediaWiki { * Check if the maximum lag of database slaves is higher that $maxLag, and * if it's the case, output an error message * - * @param int $maxLag maximum lag allowed for the request, as supplied by - * the client + * @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 ) { + if( $lag > $maxLag ) { wfMaxlagError( $host, $lag, $maxLag ); return false; } else { @@ -84,42 +99,41 @@ class MediaWiki { } } - /** * Checks some initial queries * Note that $title here is *not* a Title object, but a string! * - * @param String $title - * @param String $action + * @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' ){ + if( $wgRequest->getVal( 'printable' ) === 'yes' ) { $wgOut->setPrintable(); } - - $ret = NULL; - - if ( '' == $title && 'delete' != $action ) { - $ret = Title::newMainPage(); - } elseif ( $curid = $wgRequest->getInt( 'curid' ) ) { + $ret = null; + if( $curid = $wgRequest->getInt( 'curid' ) ) { # URLs like this are generated by RC, because rc_title isn't always accurate $ret = Title::newFromID( $curid ); + } elseif( $title == '' && $action != '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 ) $wgContLang->findVariantLink( $title, $ret ); - } - if ( ( $oldid = $wgRequest->getInt( 'oldid' ) ) - && ( is_null( $ret ) || $ret->getNamespace() != NS_SPECIAL ) ) { - // Allow oldid to override a changed or missing title. - $rev = Revision::newFromId( $oldid ); - if( $rev ) { - $ret = $rev->getTitle(); + # For non-special titles, check for implicit titles + 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' ); + // Allow oldid to override a changed or missing title + if( $oldid ) { + $rev = Revision::newFromId( $oldid ); + $ret = $rev ? $rev->getTitle() : $ret; } } return $ret; @@ -128,12 +142,12 @@ class MediaWiki { /** * Checks for search query and anon-cannot-read case * - * @param Title $title - * @param OutputPage $output - * @param WebRequest $request + * @param $title Title + * @param $output OutputPage + * @param $request WebRequest + * @return boolean true if successful */ function preliminaryChecks( &$title, &$output, $request ) { - if( $request->getCheck( 'search' ) ) { // Compatibility with old search URLs which didn't use Special:Search // Just check for presence here, so blank requests still @@ -142,16 +156,17 @@ class MediaWiki { // Do this above the read whitelist check for security... $title = SpecialPage::getTitleFor( 'Search' ); } - # 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() ) { + if( !is_null( $title ) && !$title->userCanRead() ) { + global $wgDeferredUpdateList; $output->loginToUse(); - $output->output(); - exit; + $this->finalCleanup( $wgDeferredUpdateList, $output ); + $output->disable(); + return false; } - + return true; } /** @@ -161,37 +176,55 @@ class MediaWiki { * - redirect loop * - special pages * - * @param Title $title - * @param OutputPage $output - * @param WebRequest $request + * @param $title Title + * @param $output OutputPage + * @param $request WebRequest * @return bool true if the request is already executed */ - function initializeSpecialCases( &$title, &$output, $request ) { + function handleSpecialCases( &$title, &$output, $request ) { wfProfileIn( __METHOD__ ); - + global $wgContLang, $wgUser; $action = $this->getVal( 'Action' ); - if( !$title || $title->getDBkey() == '' ) { + $perferred = $wgContLang->getPreferredVariant( false ); + + // 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' ); # Die now before we mess up $wgArticle and the skin stops working throw new ErrorPageError( 'badtitle', 'badtitletext' ); - } else if ( $title->getInterwiki() != '' ) { + + // Interwiki redirects + } else if( $title->getInterwiki() != '' ) { if( $rdfrom = $request->getVal( 'rdfrom' ) ) { $url = $title->getFullURL( 'rdfrom=' . urlencode( $rdfrom ) ); } else { - $url = $title->getFullURL(); + $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() ) { + if( !preg_match( '/^' . preg_quote( $this->getVal('Server'), '/' ) . '/', $url ) && $title->isLocal() ) { $output->redirect( $url ); } else { $title = SpecialPage::getTitleFor( 'Badtitle' ); + $output->setTitle( $title ); // bug 21456 + wfProfileOut( __METHOD__ ); throw new ErrorPageError( 'badtitle', 'badtitletext' ); } - } else if ( ( $action == 'view' ) && !$request->wasPosted() && - (!isset( $this->GET['title'] ) || $title->getPrefixedDBKey() != $this->GET['title'] ) && + // Redirect loops, no title in URL, $wgUsePathInfo URLs, and URLs with a variant + } else if( $action == 'view' && !$request->wasPosted() && + ( ( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) || + // No valid variant in URL (if the main-language has multi-variants), to ensure + // anonymous access would always be redirect to a URL with 'variant' parameter + ( !isset($this->GET['variant']) && $wgContLang->hasVariants() && !$wgUser->isLoggedIn() ) ) && !count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) ) { - $targetUrl = $title->getFullURL(); + if( !$wgUser->isLoggedIn() ) { + $pref = $wgContLang->getPreferredVariant( false, $fromHeader = true ); + $targetUrl = $title->getFullURL( '', $variant = $pref ); + } + else + $targetUrl = $title->getFullURL(); // Redirect to canonical url, make it a 301 to allow caching if( $targetUrl == $request->getFullRequestURL() ) { $message = "Redirect loop detected!\n\n" . @@ -214,12 +247,14 @@ class MediaWiki { "to true."; } wfHttpError( 500, "Internal error", $message ); + wfProfileOut( __METHOD__ ); return false; } else { $output->setSquidMaxage( 1200 ); $output->redirect( $targetUrl, '301' ); } - } else if ( NS_SPECIAL == $title->getNamespace() ) { + // Special pages + } else if( NS_SPECIAL == $title->getNamespace() ) { /* actions that need to be made when we have a special pages */ SpecialPage::executePath( $title ); } else { @@ -235,13 +270,13 @@ class MediaWiki { /** * Create an Article object of the appropriate class for the given page. * - * @param Title $title + * @param $title Title * @return Article object */ static function articleFromTitle( &$title ) { if( NS_MEDIA == $title->getNamespace() ) { // FIXME: where should this go? - $title = Title::makeTitle( NS_IMAGE, $title->getDBkey() ); + $title = Title::makeTitle( NS_FILE, $title->getDBkey() ); } $article = null; @@ -251,12 +286,12 @@ class MediaWiki { } switch( $title->getNamespace() ) { - case NS_IMAGE: - return new ImagePage( $title ); - case NS_CATEGORY: - return new CategoryPage( $title ); - default: - return new Article( $title ); + case NS_FILE: + return new ImagePage( $title ); + case NS_CATEGORY: + return new CategoryPage( $title ); + default: + return new Article( $title ); } } @@ -264,51 +299,66 @@ class MediaWiki { * Initialize the object to be known as $wgArticle for "standard" actions * Create an Article object for the page, following redirects if needed. * - * @param Title $title - * @param Request $request + * @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, $request ) { + function initializeArticle( &$title, &$output, $request ) { wfProfileIn( __METHOD__ ); - $action = $this->getVal( 'action' ); + $action = $this->getVal( 'action', 'view' ); $article = self::articleFromTitle( $title ); - - wfDebug("Article: ".$title->getPrefixedText()."\n"); - + # 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; + } // 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 - && !$request->getVal( 'oldid' ) && // ... and are not old revisions - $request->getVal( 'redirect' ) != 'no' && // ... unless explicitly told not to - // ... and the article is not an image page with associated file - !( $title->getNamespace() == NS_IMAGE && wfFindFile( $title->getText(), false, - FileRepo::FIND_IGNORE_REDIRECT ) ) ) { // ... unless it is really an image redirect - + && !$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 + // ... and the article is not a non-redirect image page with associated file + !( is_object( $file ) && $file->exists() && !$file->getRedirected() ) ) + { + # Give extensions a change to ignore/handle redirects as needed + $ignoreRedirect = $target = false; + $dbr = wfGetDB( DB_SLAVE ); $article->loadPageData( $article->pageDataFromTitle( $dbr, $title ) ); - // Follow redirects only for... redirects - if( $article->mIsRedirect ) { - $target = $article->followRedirect(); + wfRunHooks( 'InitializeArticleMaybeRedirect', + 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()) ) { + # Is the target already set by an extension? + $target = $target ? $target : $article->followRedirect(); if( is_string( $target ) ) { if( !$this->getVal( 'DisableHardRedirects' ) ) { // 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->mTitle->exists() ) { + if( $rarticle->exists() || ( is_object( $file ) && !$file->isLocal() ) ) { $rarticle->setRedirectedFrom( $title ); $article = $rarticle; $title = $target; + $output->setTitle( $title ); } } } else { - $title = $article->mTitle; + $title = $article->getTitle(); } } wfProfileOut( __METHOD__ ); @@ -316,19 +366,23 @@ class MediaWiki { } /** - * Cleaning up by doing deferred updates, calling LBFactory and doing the output + * Cleaning up request by doing: + ** deferred updates, DB transaction, and the output * - * @param Array $deferredUpdates array of updates to do - * @param OutputPage $output + * @param $deferredUpdates array of updates to do + * @param $output OutputPage */ - function finalCleanup ( &$deferredUpdates, &$output ) { + function finalCleanup( &$deferredUpdates, &$output ) { wfProfileIn( __METHOD__ ); - $this->doUpdates( $deferredUpdates ); - $this->doJobs(); - # Now commit any transactions, so that unreported errors after output() don't roll back the whole thing + # Now commit any transactions, so that unreported errors after + # output() don't roll back the whole DB transaction $factory = wfGetLBFactory(); - $factory->shutdown(); + $factory->commitMasterChanges(); + # Output everything! $output->output(); + # Do any deferred jobs + $this->doUpdates( $deferredUpdates ); + $this->doJobs(); wfProfileOut( __METHOD__ ); } @@ -338,7 +392,7 @@ class MediaWiki { * Note that for page saves, the client will wait until the script exits * anyway before following the redirect. * - * @param Array $updates array of objects that hold an update to do + * @param $updates array of objects that hold an update to do */ function doUpdates( &$updates ) { wfProfileIn( __METHOD__ ); @@ -353,7 +407,7 @@ class MediaWiki { $up->doUpdate(); # Commit after every update to prevent lock contention - if ( $dbw->trxLevel() ) { + if( $dbw->trxLevel() ) { $dbw->commit(); } } @@ -366,12 +420,12 @@ class MediaWiki { function doJobs() { $jobRunRate = $this->getVal( 'JobRunRate' ); - if ( $jobRunRate <= 0 || wfReadOnly() ) { + if( $jobRunRate <= 0 || wfReadOnly() ) { return; } - if ( $jobRunRate < 1 ) { + if( $jobRunRate < 1 ) { $max = mt_getrandmax(); - if ( mt_rand( 0, $max ) > $max * $jobRunRate ) { + if( mt_rand( 0, $max ) > $max * $jobRunRate ) { return; } $n = 1; @@ -385,7 +439,7 @@ class MediaWiki { $success = $job->run(); $t += wfTime(); $t = round( $t*1000 ); - if ( !$success ) { + if( !$success ) { $output .= "Error: " . $job->getLastError() . ", Time: $t ms\n"; } else { $output .= "Success, Time: $t ms\n"; @@ -399,22 +453,26 @@ class MediaWiki { */ function restInPeace() { wfLogProfilingData(); + # Commit and close up! + $factory = wfGetLBFactory(); + $factory->commitMasterChanges(); + $factory->shutdown(); wfDebug( "Request ended normally\n" ); } /** * Perform one of the "standard" actions * - * @param OutputPage $output - * @param Article $article - * @param Title $title - * @param User $user - * @param WebRequest $request + * @param $output OutputPage + * @param $article Article + * @param $title Title + * @param $user User + * @param $request WebRequest */ function performAction( &$output, &$article, &$title, &$user, &$request ) { wfProfileIn( __METHOD__ ); - if ( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request ) ) ) { + if( !wfRunHooks( 'MediaWikiPerformAction', array( $output, $article, $title, $user, $request, $this ) ) ) { wfProfileOut( __METHOD__ ); return; } @@ -425,11 +483,29 @@ class MediaWiki { $action = 'nosuchaction'; } + # 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'; + } elseif ( $request->getBool( 'revisionmove' ) ) { + $action = 'revisionmove'; + } else { + $action = 'view'; + } + } + switch( $action ) { case 'view': $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) ); $article->view(); break; + case 'raw': // includes JS/CSS + wfProfileIn( __METHOD__.'-raw' ); + $raw = new RawPage( $article ); + $raw->view(); + wfProfileOut( __METHOD__.'-raw' ); + break; case 'watch': case 'unwatch': case 'delete': @@ -451,21 +527,20 @@ class MediaWiki { if( !$this->getVal( 'EnableDublinCoreRdf' ) ) { wfHttpError( 403, 'Forbidden', wfMsg( 'nodublincore' ) ); } else { - require_once( 'includes/Metadata.php' ); - wfDublinCoreRdf( $article ); + $rdf = new DublinCoreRdf( $article ); + $rdf->show(); } break; case 'creativecommons': if( !$this->getVal( 'EnableCreativeCommonsRdf' ) ) { wfHttpError( 403, 'Forbidden', wfMsg( 'nocreativecommons' ) ); } else { - require_once( 'includes/Metadata.php' ); - wfCreativeCommonsRdf( $article ); + $rdf = new CreativeCommonsRdf( $article ); + $rdf->show(); } break; case 'credits': - require_once( 'includes/Credits.php' ); - showCreditsPage( $article ); + Credits::showPage( $article ); break; case 'submit': if( session_id() == '' ) { @@ -495,12 +570,18 @@ class MediaWiki { if( $request->getFullRequestURL() == $title->getInternalURL( 'action=history' ) ) { $output->setSquidMaxage( $this->getVal( 'SquidMaxage' ) ); } - $history = new PageHistory( $article ); + $history = new HistoryPage( $article ); $history->history(); break; - case 'raw': - $raw = new RawPage( $article ); - $raw->view(); + case 'revisiondelete': + # For show/hide submission from history page + $special = SpecialPage::getPage( 'Revisiondelete' ); + $special->execute( '' ); + break; + case 'revisionmove': + # For revision move submission from history page + $special = SpecialPage::getPage( 'RevisionMove' ); + $special->execute( '' ); break; default: if( wfRunHooks( 'UnknownAction', array( $action, $article ) ) ) {