X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRawPage.php;h=b1e2539a261d200ad60984270785561129bdd30c;hb=160de68802e3b60802bf1f8425f771ead9846ee1;hp=3cdabfd991bf21778e18b9930fe0a491d3494409;hpb=958aa1aef8ad785ff8b7327430707de84e6baf32;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 3cdabfd991..b1e2539a26 100644
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -7,21 +7,21 @@
  * License: GPL (http://www.gnu.org/copyleft/gpl.html)
  *
  * @author Gabriel Wicke <wicke@wikidev.net>
- * @package MediaWiki
+ * @file
  */
 
 /**
- * @todo document
- * @package MediaWiki
+ * A simple method to retrieve the plain source of an article,
+ * using "action=raw" in the GET request string.
  */
 class RawPage {
 	var $mArticle, $mTitle, $mRequest;
-	var $mOldId, $mGen, $mCharset;
+	var $mOldId, $mGen, $mCharset, $mSection;
 	var $mSmaxage, $mMaxage;
 	var $mContentType, $mExpandTemplates;
 
-	function RawPage( &$article, $request = false ) {
-		global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
+	function __construct( &$article, $request = false ) {
+		global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType, $wgForcedRawSMaxage, $wgGroupPermissions;
 
 		$allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
 		$this->mArticle =& $article;
@@ -36,9 +36,14 @@ class RawPage {
 		$ctype = $this->mRequest->getVal( 'ctype' );
 		$smaxage = $this->mRequest->getIntOrNull( 'smaxage', $wgSquidMaxage );
 		$maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage );
+
 		$this->mExpandTemplates = $this->mRequest->getVal( 'templates' ) === 'expand';
-		
+		$this->mUseMessageCache = $this->mRequest->getBool( 'usemsgcache' );
+
+		$this->mSection = $this->mRequest->getIntOrNull( 'section' );
+
 		$oldid = $this->mRequest->getInt( 'oldid' );
+
 		switch ( $wgRequest->getText( 'direction' ) ) {
 			case 'next':
 				# output next revision, or nothing if there isn't one
@@ -62,7 +67,7 @@ class RawPage {
 				break;
 		}
 		$this->mOldId = $oldid;
-		
+
 		# special case for 'generated' raw things: user css/js
 		$gen = $this->mRequest->getVal( 'gen' );
 
@@ -78,8 +83,24 @@ class RawPage {
 			$this->mGen = false;
 		}
 		$this->mCharset = $wgInputEncoding;
-		$this->mSmaxage = intval( $smaxage );
+
+		# Force caching for CSS and JS raw content, default: 5 minutes
+		if (is_null($smaxage) and ($ctype=='text/css' or $ctype==$wgJsMimeType)) {
+			$this->mSmaxage = intval($wgForcedRawSMaxage);
+		} else {
+			$this->mSmaxage = intval( $smaxage );
+		}
 		$this->mMaxage = $maxage;
+
+		# Output may contain user-specific data;
+		# vary generated content for open sessions and private wikis
+		if ($this->mGen or !$wgGroupPermissions['*']['read']) {
+			$this->mPrivateCache = ( $this->mSmaxage == 0 ) ||
+				( session_id() != '' );
+		} else {
+			$this->mPrivateCache = false;
+		}
+
 		if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
 			$this->mContentType = 'text/x-wiki';
 		} else {
@@ -105,9 +126,8 @@ class RawPage {
 		} else {
 			$url = $_SERVER['PHP_SELF'];
 		}
-		
-		$ua = @$_SERVER['HTTP_USER_AGENT'];
-		if( strcmp( $wgScript, $url ) && strpos( $ua, 'MSIE' ) !== false ) {
+
+		if( strcmp( $wgScript, $url ) ) {
 			# Internet Explorer will ignore the Content-Type header if it
 			# thinks it sees a file extension it recognizes. Make sure that
 			# all raw requests are done through the script node, which will
@@ -127,13 +147,20 @@ class RawPage {
 
 		header( "Content-type: ".$this->mContentType.'; charset='.$this->mCharset );
 		# allow the client to cache this for 24 hours
-		header( 'Cache-Control: s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
-		echo $this->getRawText();
+		$mode = $this->mPrivateCache ? 'private' : 'public';
+		header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
+		$text = $this->getRawText();
+
+		if( !wfRunHooks( 'RawPageViewBeforeOutput', array( &$this, &$text ) ) ) {
+			wfDebug( __METHOD__ . ': RawPageViewBeforeOutput hook broke raw page output.' );
+		}
+
+		echo $text;
 		$wgOut->disable();
 	}
 
 	function getRawText() {
-		global $wgUser, $wgOut;
+		global $wgUser, $wgOut, $wgRequest;
 		if($this->mGen) {
 			$sk = $wgUser->getSkin();
 			$sk->initPage($wgOut);
@@ -152,11 +179,11 @@ class RawPage {
 		$text = '';
 		if( $this->mTitle ) {
 			// If it's a MediaWiki message we can just hit the message cache
-			if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+			if ( $this->mUseMessageCache && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
 				$key = $this->mTitle->getDBkey();
 				$text = wfMsgForContentNoTrans( $key );
 				# If the message doesn't exist, return a blank
-				if( $text == '&lt;' . $key . '&gt;' )
+				if( wfEmptyMsg( $key, $text ) )
 					$text = '';
 				$found = true;
 			} else {
@@ -165,7 +192,12 @@ class RawPage {
 				if ( $rev ) {
 					$lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() );
 					header( "Last-modified: $lastmod" );
-					$text = $rev->getText();
+
+					if ( !is_null($this->mSection ) ) {
+						global $wgParser;
+						$text = $wgParser->getSection ( $rev->getText(), $this->mSection );
+					} else
+						$text = $rev->getText();
 					$found = true;
 				}
 			}
@@ -179,7 +211,21 @@ class RawPage {
 			# have the pages.
 			header( "HTTP/1.0 404 Not Found" );
 		}
-		
+
+		// Special-case for empty CSS/JS
+		//
+		// Internet Explorer for Mac handles empty files badly;
+		// particularly so when keep-alive is active. It can lead
+		// to long timeouts as it seems to sit there waiting for
+		// more data that never comes.
+		//
+		// Give it a comment...
+		if( strlen( $text ) == 0 &&
+			($this->mContentType == 'text/css' ||
+				$this->mContentType == 'text/javascript' ) ) {
+			return "/* Empty */";
+		}
+
 		return $this->parseArticleText( $text );
 	}
 
@@ -188,16 +234,9 @@ class RawPage {
 			return '';
 		else
 			if ( $this->mExpandTemplates ) {
-				global $wgTitle;
-
-				$parser = new Parser();
-				$parser->Options( new ParserOptions() ); // We don't want this to be user-specific
-				$parser->Title( $wgTitle );
-				$parser->OutputType( OT_HTML );
-
-				return $parser->replaceVariables( $text );
+				global $wgParser;
+				return $wgParser->preprocess( $text, $this->mTitle, new ParserOptions() );
 			} else
 				return $text;
 	}
 }
-?>