X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FWiki.php;h=4984b5f0ca3f8c64493dec9b3a4b3c116fd38394;hb=957850f0da357337c24291a29d5ea0f08b5050a9;hp=1ab94c23b67302139691f308ab4a735613921192;hpb=a44e63967d4f36c7ffd086e977b6484b5370670b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 1ab94c23b6..4984b5f0ca 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -1,6 +1,27 @@
 <?php
 /**
- * MediaWiki is the to-be base class for this whole project
+ * Helper class for the index.php entry point.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
+/**
+ * The MediaWiki class is the helper class for the index.php entry point.
  *
  * @internal documentation reviewed 15 Mar 2010
  */
@@ -8,7 +29,7 @@ class MediaWiki {
 
 	/**
 	 * TODO: fold $output, etc, into this
-	 * @var RequestContext
+	 * @var IContextSource
 	 */
 	private $context;
 
@@ -24,7 +45,7 @@ class MediaWiki {
 		return $old;
 	}
 
-	public function __construct( RequestContext $context = null ) {
+	public function __construct( IContextSource $context = null ) {
 		if ( !$context ) {
 			$context = RequestContext::getMain();
 		}
@@ -34,7 +55,7 @@ class MediaWiki {
 	}
 
 	/**
-	 * Parse $request to get the Title object
+	 * Parse the request to get the Title object
 	 *
 	 * @return Title object to be $wgTitle
 	 */
@@ -57,14 +78,21 @@ 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 ){
+			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->isSpecialPage() ) {
 			// We can have urls with just ?diff=,?oldid= or even just ?diff=
 			$oldid = $request->getInt( 'oldid' );
 			$oldid = $oldid ? $oldid : $request->getInt( 'diff' );
@@ -75,9 +103,10 @@ class MediaWiki {
 			}
 		}
 
-		if( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ){
-			$ret = new BadTitle;
+		if ( $ret === null || ( $ret->getDBkey() == '' && $ret->getInterwiki() == '' ) ) {
+			$ret = SpecialPage::getTitleFor( 'Badtitle' );
 		}
+
 		return $ret;
 	}
 
@@ -101,10 +130,10 @@ class MediaWiki {
 	 * - special pages
 	 * - normal pages
 	 *
-	 * @return Article object
+	 * @return void
 	 */
-	public function performRequest() {
-		global $wgServer, $wgUsePathInfo;
+	private function performRequest() {
+		global $wgServer, $wgUsePathInfo, $wgTitle;
 
 		wfProfileIn( __METHOD__ );
 
@@ -113,32 +142,49 @@ class MediaWiki {
 		$output = $this->context->getOutput();
 		$user = $this->context->getUser();
 
-		# Promote user to any groups they meet the criteria for
-		$user->addAutopromoteOnceGroups( 'onView' );
-
 		if ( $request->getVal( 'printable' ) === 'yes' ) {
 			$output->setPrintable();
 		}
 
-		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 ) );
@@ -148,26 +194,30 @@ class MediaWiki {
 				$url = $title->getFullURL( $query );
 			}
 			// Check for a redirect loop
-			if ( !preg_match( '/^' . preg_quote( $wgServer, '/' ) . '/', $url ) && $title->isLocal() ) {
+			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 {
-				$this->context->setTitle( new BadTitle );
+				$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
 		} elseif ( $request->getVal( 'action', 'view' ) == 'view' && !$request->wasPosted()
-			&& ( $request->getVal( 'title' ) === null || $title->getPrefixedDBKey() != $request->getVal( 'title' ) )
-			&& !count( array_diff( array_keys( $request->getValues() ), array( 'action', 'title' ) ) ) )
+			&& ( $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 ) {
+			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" .
@@ -189,31 +239,31 @@ 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' );
 			}
 		// Special pages
 		} elseif ( NS_SPECIAL == $title->getNamespace() ) {
-			// actions that need to be made when we have a special pages
+			$pageView = true;
+			// Actions that need to be made when we have a special pages
 			SpecialPageFactory::executePath( $title, $this->context );
 		} else {
 			// ...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.19
+				 * @deprecated since 1.18
 				 */
 				global $wgArticle;
 				$wgArticle = $article;
 
 				$this->performAction( $article );
-				wfProfileOut( __METHOD__ );
-				return $article;
 			} elseif ( is_string( $article ) ) {
 				$output->redirect( $article );
 			} else {
@@ -221,23 +271,30 @@ class MediaWiki {
 				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' );
+		}
+
 		wfProfileOut( __METHOD__ );
 	}
 
 	/**
 	 * 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 necesserly the one passed
+	 * 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"
 	 *
@@ -333,6 +390,7 @@ class MediaWiki {
 				$this->context->setTitle( $article->getTitle() );
 			}
 		}
+
 		wfProfileOut( __METHOD__ );
 		return $article;
 	}
@@ -349,7 +407,7 @@ class MediaWiki {
 		// Output everything!
 		$this->context->getOutput()->output();
 		// Do any deferred jobs
-		wfDoUpdates( 'commit' );
+		DeferredUpdates::doUpdates( 'commit' );
 		$this->doJobs();
 		wfProfileOut( __METHOD__ );
 	}
@@ -406,8 +464,8 @@ class MediaWiki {
 	 *
 	 * @param $article Article
 	 */
-	private function performAction( $article ) {
-		global $wgSquidMaxage, $wgUseExternalEditor;
+	private function performAction( Page $article ) {
+		global $wgSquidMaxage;
 
 		wfProfileIn( __METHOD__ );
 
@@ -416,9 +474,8 @@ class MediaWiki {
 		$title = $this->context->getTitle();
 		$user = $this->context->getUser();
 
-		if ( !wfRunHooks( 'MediaWikiPerformAction', array(
-				$output, $article, $title,
-				$user, $request, $this ) ) )
+		if ( !wfRunHooks( 'MediaWikiPerformAction',
+			array( $output, $article, $title, $user, $request, $this ) ) )
 		{
 			wfProfileOut( __METHOD__ );
 			return;
@@ -427,7 +484,7 @@ class MediaWiki {
 		$act = $this->getAction();
 
 		$action = Action::factory( $act, $article );
-		if( $action instanceof Action ){
+		if ( $action instanceof Action ) {
 			$action->show();
 			wfProfileOut( __METHOD__ );
 			return;
@@ -438,15 +495,7 @@ 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 'revert':
-			case 'rollback':
 			case 'protect':
 			case 'unprotect':
 			case 'render':
@@ -460,28 +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, $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' );
@@ -494,9 +533,9 @@ class MediaWiki {
 	 * Run the current MediaWiki instance
 	 * index.php just calls this
 	 */
-	function run() {
+	public function run() {
 		try {
-			$this->checkMaxLag( true );
+			$this->checkMaxLag();
 			$this->main();
 			$this->restInPeace();
 		} catch ( Exception $e ) {
@@ -507,36 +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
 	 */
-	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 ) {
-					header( 'HTTP/1.1 503 Service Unavailable' );
-					header( 'Retry-After: ' . max( intval( $maxLag ), 5 ) );
-					header( 'X-Database-Lag: ' . intval( $lag ) );
-					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;
 			}
 		}
@@ -544,7 +575,7 @@ class MediaWiki {
 		return true;
 	}
 
-	function main() {
+	private function main() {
 		global $wgUseFileCache, $wgTitle, $wgUseAjax;
 
 		wfProfileIn( __METHOD__ );
@@ -561,21 +592,20 @@ class MediaWiki {
 			return;
 		}
 
-		if ( $wgUseFileCache && $wgTitle !== null ) {
+		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 ( $action != 'raw' && 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 */
-					if ( !$this->context->getOutput()->checkLastModified( $cache->fileCacheTime() ) ) {
-						$cache->loadFromFileCache();
+					$timestamp = $cache->cacheTimestamp();
+					if ( !$this->context->getOutput()->checkLastModified( $timestamp ) ) {
+						$cache->loadFromFileCache( $this->context );
 					}
 					# Do any stats increment/watchlist stuff
-					$article = Article::newFromTitle( $wgTitle, $this->context );
-					$article->viewUpdates();
+					$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' );