fix typo, DieDebug -> DebugDie

[lhc/web/wiklou.git] / includes / RawPage.php

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 4116f00..f7791f4 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -1,10 +1,22 @@
 <?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 ) {
@@ -14,9 +26,8 @@ class RawPage {
                $this->mTitle =& $article->mTitle;
                        
                $ctype = $wgRequest->getText( 'ctype' );
-               $charset = $wgRequest->getText( 'charset' );
-               $smaxage = $wgRequest->getText( 'smaxage' );
-               $maxage = $wgRequest->getText( 'maxage' );
+               $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' );
@@ -31,17 +42,37 @@ class RawPage {
                } else {
                        $this->mGen = false;
                }
-               $this->mCharset = !empty($charset) ? $charset : $wgInputEncoding;
-               $this->mSmaxage = ($smaxage != '') ? $smaxage : 0;
-               $this->mMaxage = ($maxage != '') ? $maxage : 86400;
+               $this->mCharset = $wgInputEncoding;
+               $this->mSmaxage = $smaxage;
+               $this->mMaxage = $maxage;
                if(empty($ctype) or !in_array($ctype, $allowedCTypes)) {
                        $this->mContentType = 'text/x-wiki';
                } else {
                        $this->mContentType = $ctype;
                }
        }
+       
        function view() {
-               global $wgUser, $wgOut;
+               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='.$this->mSmaxage.', max-age='.$this->mMaxage );
@@ -56,38 +87,27 @@ class RawPage {
                } else {
                        echo $this->getrawtext();
                }
-               wfAbruptExit();
+               $wgOut->disable();
        }
        
        function getrawtext () {
-               global $wgInputEncoding, $wgLang, $wgIsPg;
+               global $wgInputEncoding, $wgContLang;
+               $fname = 'RawPage::getrawtext';
+               
                if( !$this->mTitle ) return '';
-               $t = wfStrencode( $this->mTitle->getDBKey() );
-               $ns = $this->mTitle->getNamespace();
-               # special case
-               if($ns == NS_MEDIAWIKI) {
-                       $rawtext = wfMsg($t);
-                       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
-               if(!empty($this->mOldId)) {
-                       $oldtable=$wgIsPg?'"old"':'old';
-                       $sql = "SELECT old_text AS text,old_timestamp AS timestamp,".
-                                   "old_user AS user,old_flags AS flags FROM $oldtable " .
-                       "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 );
-                       return $rawtext;
+               $rev = Revision::newFromTitle( $this->mTitle, $this->mOldId );
+               if( $rev ) {
+                       $lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() );
+                       header( 'Last-modified: ' . $lastmod );
+                       return $rev->getText();
                } else {
                        return '';
                }