* Fix explicit s-maxage=0 on raw pages; should help with proxy issues in

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 67b464a..ee28f47 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -3,7 +3,7 @@
  * 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>
@@ -19,6 +19,9 @@ require_once( 'Revision.php' );
  */
 class RawPage {
        var $mArticle, $mTitle, $mRequest;
+       var $mOldId, $mGen, $mCharset;
+       var $mSmaxage, $mMaxage;
+       var $mContentType, $mExpandTemplates;
 
        function RawPage( &$article, $request = false ) {
                global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
@@ -27,39 +30,41 @@ class RawPage {
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
 
-               if ( $request === false ) { 
+               if ( $request === false ) {
                        $this->mRequest =& $wgRequest;
                } else {
                        $this->mRequest = $request;
                }
-                       
-               $ctype = $this->mRequest->getText( 'ctype' );
-               $smaxage = $this->mRequest->getInt( 'smaxage', $wgSquidMaxage );
+
+               $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->mOldId = $this->mRequest->getInt( 'oldid' );
                # special case for 'generated' raw things: user css/js
-               $gen = $this->mRequest->getText( 'gen' );
+               $gen = $this->mRequest->getVal( 'gen' );
+
                if($gen == 'css') {
                        $this->mGen = $gen;
-                       if($smaxage == '') $smaxage = $wgSquidMaxage;
+                       if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
                        if($ctype == '') $ctype = 'text/css';
-               } else if ($gen == 'js') {
+               } elseif ($gen == 'js') {
                        $this->mGen = $gen;
-                       if($smaxage == '') $smaxage = $wgSquidMaxage;
+                       if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
                        if($ctype == '') $ctype = $wgJsMimeType;
                } else {
                        $this->mGen = false;
                }
                $this->mCharset = $wgInputEncoding;
-               $this->mSmaxage = $smaxage;
+               $this->mSmaxage = intval( $smaxage );
                $this->mMaxage = $maxage;
-               if(empty($ctype) or !in_array($ctype, $allowedCTypes)) {
+               if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
                        $this->mContentType = 'text/x-wiki';
                } else {
                        $this->mContentType = $ctype;
                }
        }
-       
+
        function view() {
                global $wgOut, $wgScript;
 
@@ -78,7 +83,9 @@ class RawPage {
                } else {
                        $url = $_SERVER['PHP_SELF'];
                }
-               if( strcmp( $wgScript, $url ) ) {
+               
+               $ua = @$_SERVER['HTTP_USER_AGENT'];
+               if( strcmp( $wgScript, $url ) && strpos( $ua, 'MSIE' ) !== false ) {
                        # 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
@@ -95,7 +102,7 @@ class RawPage {
                                'Raw pages must be accessed through the primary script entry point.' );
                        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 );
@@ -116,25 +123,31 @@ class RawPage {
                } else {
                        return $this->getArticleText();
                }
-       }               
+       }
+
+       function getArticleText() {
+               global $wgParser;
 
-       function getArticleText () {
                if( $this->mTitle ) {
-                       # Special case for MediaWiki: messages; we can hit the message cache.
-                       if( $this->mTitle->getNamespace() == NS_MEDIAWIKI) {
-                               $rawtext = wfMsgForContent( $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();
+                       $text = '';
+
+                       // If it's a MediaWiki message we can just hit the message cache
+                       if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                               $text = wfMsgForContentNoTrans( $this->mTitle->getDbkey() );
+                       } 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" );
+                                       $text = $rev->isDeleted() ? '' : $rev->getText();
+                               } else
+                                       $text = '';
                        }
+
+                       return $this->parseArticleText( $text );
                }
-               
+
                # Bad title or page does not exist
                if( $this->mContentType == 'text/x-wiki' ) {
                        # Don't return a 404 response for CSS or JavaScript;
@@ -145,5 +158,22 @@ class RawPage {
                }
                return '';
        }
+
+       function parseArticleText( $text ) {
+               if ( $text === '' )
+                       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 );
+                       } else
+                               return $text;
+       }
 }
 ?>