X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FRawPage.php;h=f7791f467d47d8857eac3100af7563dd275f78a2;hb=66ea0f1c7a3f0aba311560fc0a0a61dd0f3121ee;hp=56662faaa8c8d14244204397c8448e48618e6f5c;hpb=3527404731dd86e6c7a0ad363c5a48935bac513e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 56662faaa8..f7791f467d 100644
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -1,59 +1,113 @@
 <?php
-# Copyright (C) 2004 Gabriel Wicke <gw@wikidev.net>
-# http://www.aulinx.de/
-# Based on PageHistory and SpecialExport
-# 
-# License: GPL (http://www.gnu.org/copyleft/gpl.html)
+/**
+ * Copyright (C) 2004 Gabriel Wicke <gw@wikidev.net>
+ * http://www.aulinx.de/
+ * Based on PageHistory and SpecialExport
+ * 
+ * License: GPL (http://www.gnu.org/copyleft/gpl.html)
+ *
+ * @author Gabriel Wicke <gw@wikidev.net>
+ * @package MediaWiki
+ */
 
+/** */
+require_once( 'Revision.php' );
+
+/**
+ * @todo document
+ * @package MediaWiki
+ */
 class RawPage {
 
 	function RawPage( $article ) {
-		global $wgRequest, $wgInputEncoding;
-		$allowedCTypes = array('text/plain', 'text/javascript', 'text/css');
+		global $wgRequest, $wgInputEncoding, $wgSquidMaxage;
+		$allowedCTypes = array('text/x-wiki', 'text/javascript', 'text/css', 'application/x-zope-edit');
 		$this->mArticle =& $article;
 		$this->mTitle =& $article->mTitle;
+			
 		$ctype = $wgRequest->getText( 'ctype' );
+		$smaxage = $wgRequest->getInt( 'smaxage', $wgSquidMaxage );
+		$maxage = $wgRequest->getInt( 'maxage', $wgSquidMaxage );
+		$this->mOldId = $wgRequest->getInt( 'oldid' );
+		# special case for 'generated' raw things: user css/js
+		$gen = $wgRequest->getText( 'gen' );
+		if($gen == 'css') {
+			$this->mGen = $gen;
+			if($smaxage == '') $smaxage = $wgSquidMaxage;
+			if($ctype == '') $ctype = 'text/css';
+		} else if ($gen == 'js') {
+			$this->mGen = $gen;
+			if($smaxage == '') $smaxage = $wgSquidMaxage;
+			if($ctype == '') $ctype = 'text/javascript';
+		} else {
+			$this->mGen = false;
+		}
+		$this->mCharset = $wgInputEncoding;
+		$this->mSmaxage = $smaxage;
+		$this->mMaxage = $maxage;
 		if(empty($ctype) or !in_array($ctype, $allowedCTypes)) {
-			$this->mContentType = 'text/plain';
+			$this->mContentType = 'text/x-wiki';
 		} else {
 			$this->mContentType = $ctype;
 		}
-			
-		$charset = $wgRequest->getText( 'charset' );
-		$this->mCharset = !empty($charset) ? $charset : $wgInputEncoding;
-		$this->mOldId = $wgRequest->getInt( 'oldid' );
 	}
+	
 	function view() {
+		global $wgUser, $wgOut, $wgScript;
+
+		if( strcmp( $wgScript, $_SERVER['PHP_SELF'] ) ) {
+			# 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
+			# have eg '.php' and should remain safe.
+			
+			$destUrl = $this->mTitle->getFullUrl(
+				'action=raw' .
+				'&ctype=' . urlencode( $this->mContentType ) .
+				'&smaxage=' . urlencode( $this->mSmaxage ) .
+				'&maxage=' . urlencode( $this->mMaxage ) .
+				'&gen=' . urlencode( $this->mGen ) .
+				'&oldid=' . urlencode( $this->mOldId ) );
+			header( 'Location: ' . $destUrl );
+			$wgOut->disable();
+			return;
+		}
+		
 		header( "Content-type: ".$this->mContentType.'; charset='.$this->mCharset );
 		# allow the client to cache this for 24 hours
-		header( 'Cache-Control: s-maxage=0, max-age=86400' );
-		$parser=new Parser();
-		$raw = $this->getrawtext();
-		echo $parser->removeHTMLtags( $raw );
-		wfAbruptExit();
+		header( 'Cache-Control: s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
+		if($this->mGen) {
+			$sk = $wgUser->getSkin();
+			$sk->initPage($wgOut);
+			if($this->mGen == 'css') {
+				echo $sk->getUserStylesheet();
+			} else if($this->mGen == 'js') {
+				echo $sk->getUserJs();
+			}
+		} else {
+			echo $this->getrawtext();
+		}
+		$wgOut->disable();
 	}
-
-
 	
 	function getrawtext () {
-		global $wgInputEncoding, $wgLang;
+		global $wgInputEncoding, $wgContLang;
+		$fname = 'RawPage::getrawtext';
+		
 		if( !$this->mTitle ) return '';
-		$t = wfStrencode( $this->mTitle->getDBKey() );
-		$ns = $this->mTitle->getNamespace();
-		if(!empty($this->mOldId)) {
-			$sql = "SELECT old_text as text,old_timestamp as timestamp,old_user as user,old_flags as flags FROM old " .
-			"WHERE old_id={$this->mOldId}";
-		} else {
-			$sql = "SELECT cur_id as id,cur_timestamp as timestamp,cur_user as user,cur_user_text as user_text," .
-			"cur_restrictions as restrictions,cur_comment as comment,cur_text as text FROM cur " .
-			"WHERE cur_namespace=$ns AND cur_title='$t'";
-		}
-		$res = wfQuery( $sql, DB_READ );
-		if( $s = wfFetchObject( $res ) ) {
-			$rawtext = Article::getRevisionText( $s, "" );
-			if($wgInputEncoding != $this->mCharset)
-			$rawtext = $wgLang->iconv( $wgInputEncoding, $this->mCharset, $rawtext );
+		
+		# Special case for MediaWiki: messages; we can hit the message cache.
+		if( $this->mTitle->getNamespace() == NS_MEDIAWIKI) {
+			$rawtext = wfMsg( $this->mTitle->getDbkey() );
 			return $rawtext;
+		}
+		
+		# else get it from the DB
+		$rev = Revision::newFromTitle( $this->mTitle, $this->mOldId );
+		if( $rev ) {
+			$lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() );
+			header( 'Last-modified: ' . $lastmod );
+			return $rev->getText();
 		} else {
 			return '';
 		}