X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=0c65b4aaa2bf292ccbfc650978a3cfcbb5356b54;hb=1e2199b76bc6641bf0d3827903b45ab35db98bd1;hp=a94d3775feaa2b7b2108d007622c027680cf2bb4;hpb=b48561197be685f89f3b951801c60a3a553d242c;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Wiki.php b/includes/Wiki.php index a94d3775fe..0c65b4aaa2 100644 --- a/includes/Wiki.php +++ b/includes/Wiki.php @@ -1,16 +1,14 @@ GET = $_GET; - } + /** Constructor */ + function __construct() {} /** * Stores key/value pairs to circumvent global variables @@ -29,7 +27,8 @@ class MediaWiki { * Note that keys are case-insensitive! * * @param $key String: key to get - * @param $default Mixed: default value if if the key doesn't exist + * @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 ); @@ -42,7 +41,6 @@ class MediaWiki { /** * Initialization of ... everything * Performs the request too - * FIXME: why is this crap called "initialize" when it performs everything? * * @param $title Title ($wgTitle) * @param $article Article @@ -50,14 +48,22 @@ class MediaWiki { * @param $user User * @param $request WebRequest */ - function initialize( &$title, &$article, &$output, &$user, $request ) { + 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, $request ) ) { wfProfileOut( __METHOD__ ); return; } - if( !$this->initializeSpecialCases( $title, $output, $request ) ) { - $new_article = $this->initializeArticle( $title, $request ); + // 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 ); @@ -102,11 +108,11 @@ class MediaWiki { if( $wgRequest->getVal( 'printable' ) === 'yes' ) { $wgOut->setPrintable(); } - $ret = NULL; + $ret = null; if( $curid = $wgRequest->getInt( 'curid' ) ) { - # URLs like this are generated by RC, because rc_title isn't always accurate + // URLs like this are generated by RC, because rc_title isn't always accurate $ret = Title::newFromID( $curid ); - } elseif( '' == $title && 'delete' != $action ) { + } elseif( $title == '' && $action != 'delete' ) { $ret = Title::newMainPage(); } else { $ret = Title::newFromURL( $title ); @@ -115,13 +121,15 @@ class MediaWiki { 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 ) { + // We can have urls with just ?diff=,?oldid= or even just ?diff= $oldid = $wgRequest->getInt( 'oldid' ); - if( !$oldid ) - $oldid = $wgRequest->getInt( 'diff' ); + $oldid = $oldid ? $oldid : $wgRequest->getInt( 'diff' ); // Allow oldid to override a changed or missing title - if( $oldid && ( $rev = Revision::newFromId( $oldid ) ) ) { - $ret = $rev->getTitle(); + if( $oldid ) { + $rev = Revision::newFromId( $oldid ); + $ret = $rev ? $rev->getTitle() : $ret; } } return $ret; @@ -133,6 +141,7 @@ class MediaWiki { * @param $title Title * @param $output OutputPage * @param $request WebRequest + * @return boolean true if successful */ function preliminaryChecks( &$title, &$output, $request ) { if( $request->getCheck( 'search' ) ) { @@ -143,12 +152,13 @@ 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 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() ) { + global $wgDeferredUpdateList; $output->loginToUse(); - $output->output(); + $this->finalCleanup( $wgDeferredUpdateList, $output ); $output->disable(); return false; } @@ -162,39 +172,56 @@ class MediaWiki { * - redirect loop * - special pages * - * FIXME: why is this crap called "initialize" when it performs everything? - * * @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( is_null($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 + $output->setTitle( $title ); // bug 21456 + // Die now before we mess up $wgArticle and the skin stops working throw new ErrorPageError( 'badtitle', 'badtitletext' ); + + // 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() ) { $output->redirect( $url ); } else { $title = SpecialPage::getTitleFor( 'Badtitle' ); + $output->setTitle( $title ); // bug 21456 + 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() && - ( !isset($this->GET['title']) || $title->getPrefixedDBKey() != $this->GET['title'] ) && - !count( array_diff( array_keys( $this->GET ), array( 'action', 'title' ) ) ) ) + ( ( !$request->getVal( 'title' ) || $title->getPrefixedDBKey() != $request->getText( '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 + ( !$request->getVal( 'variant' ) && $wgContLang->hasVariants() && !$wgUser->isLoggedIn() ) ) && + !count( array_diff( array_keys( $request->getValues() ), 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" . @@ -217,11 +244,13 @@ 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 ); @@ -268,16 +297,17 @@ class MediaWiki { * Create an Article object for the page, following redirects if needed. * * @param $title Title ($wgTitle) - * @param $request WebRequest + * @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', 'view' ); $article = self::articleFromTitle( $title ); - # NS_MEDIAWIKI has no redirects. - # It is also used for CSS/JS, so performance matters here... + // 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; @@ -287,11 +317,12 @@ class MediaWiki { $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 // ... 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 + // Give extensions a change to ignore/handle redirects as needed $ignoreRedirect = $target = false; $dbr = wfGetDB( DB_SLAVE ); @@ -300,13 +331,15 @@ class MediaWiki { wfRunHooks( 'InitializeArticleMaybeRedirect', array(&$title,&$request,&$ignoreRedirect,&$target,&$article) ); - // Follow redirects only for... redirects - if( !$ignoreRedirect && $article->isRedirect() ) { - # Is the target already set by an extension? + // 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; } } @@ -318,6 +351,7 @@ class MediaWiki { $rarticle->setRedirectedFrom( $title ); $article = $rarticle; $title = $target; + $output->setTitle( $title ); } } } else { @@ -329,23 +363,25 @@ 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 $deferredUpdates array of updates to do * @param $output OutputPage */ function finalCleanup( &$deferredUpdates, &$output ) { wfProfileIn( __METHOD__ ); - # 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->commitMasterChanges(); - # Output everything! + // Output everything! $output->output(); - # Do any deferred jobs + // Do any deferred jobs $this->doUpdates( $deferredUpdates ); + // Close the session so that jobs don't access the current session + session_write_close(); $this->doJobs(); - # Commit and close up! - $factory->shutdown(); wfProfileOut( __METHOD__ ); } @@ -369,7 +405,7 @@ class MediaWiki { foreach( $updates as $up ) { $up->doUpdate(); - # Commit after every update to prevent lock contention + // Commit after every update to prevent lock contention if( $dbw->trxLevel() ) { $dbw->commit(); } @@ -415,7 +451,12 @@ class MediaWiki { * Ends this task peacefully */ function restInPeace() { + MessageCache::logMessages(); wfLogProfilingData(); + // Commit and close up! + $factory = wfGetLBFactory(); + $factory->commitMasterChanges(); + $factory->shutdown(); wfDebug( "Request ended normally\n" ); } @@ -442,14 +483,28 @@ 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': @@ -515,9 +570,19 @@ 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 '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 ) ) ) { $output->showErrorPage( 'nosuchaction', 'nosuchactiontext' ); @@ -527,4 +592,4 @@ class MediaWiki { } -}; /* End of class MediaWiki */ +}