Code style tweaks per brion's suggestions on Wikitech-l

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index d7de77c..a0b7688 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -1,18 +1,15 @@
 <?php
 /**
- * Copyright (C) 2004 Gabriel Wicke <gw@wikidev.net>
- * http://www.aulinx.de/
+ * Copyright (C) 2004 Gabriel Wicke <wicke@wikidev.net>
+ * http://wikidev.net/
  * Based on PageHistory and SpecialExport
  *
  * License: GPL (http://www.gnu.org/copyleft/gpl.html)
  *
- * @author Gabriel Wicke <gw@wikidev.net>
+ * @author Gabriel Wicke <wicke@wikidev.net>
  * @package MediaWiki
  */
 
-/** */
-require_once( 'Revision.php' );
-
 /**
  * @todo document
  * @package MediaWiki
@@ -25,6 +22,7 @@ class RawPage {
 
        function RawPage( &$article, $request = false ) {
                global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
+               global $wgUser;
 
                $allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
                $this->mArticle =& $article;
@@ -40,6 +38,7 @@ class RawPage {
                $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' );
                
                $oldid = $this->mRequest->getInt( 'oldid' );
                switch ( $wgRequest->getText( 'direction' ) ) {
@@ -83,6 +82,12 @@ class RawPage {
                $this->mCharset = $wgInputEncoding;
                $this->mSmaxage = intval( $smaxage );
                $this->mMaxage = $maxage;
+               
+               // Output may contain user-specific data; vary for open sessions
+               $this->mPrivateCache = ( $this->mSmaxage == 0 ) ||
+                       ( isset( $_COOKIE[ini_get( 'session.name' )] ) ||
+                       $wgUser->isLoggedIn() );
+               
                if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
                        $this->mContentType = 'text/x-wiki';
                } else {
@@ -130,13 +135,14 @@ 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 );
+               $mode = $this->mPrivateCache ? 'private' : 'public';
+               header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
                echo $this->getRawText();
                $wgOut->disable();
        }
 
        function getRawText() {
-               global $wgUser, $wgOut;
+               global $wgUser, $wgOut, $wgRequest;
                if($this->mGen) {
                        $sk = $wgUser->getSkin();
                        $sk->initPage($wgOut);
@@ -151,12 +157,17 @@ class RawPage {
        }
 
        function getArticleText() {
+               $found = false;
+               $text = '';
                if( $this->mTitle ) {
-                       $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() );
+                       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( wfEmptyMsg( $key, $text ) )
+                                       $text = '';
+                               $found = true;
                        } else {
                                // Get it from the DB
                                $rev = Revision::newFromTitle( $this->mTitle, $this->mOldId );
@@ -164,22 +175,21 @@ class RawPage {
                                        $lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() );
                                        header( "Last-modified: $lastmod" );
                                        $text = $rev->getText();
-                               } else
-                                       $text = '';
+                                       $found = true;
+                               }
                        }
-
-                       return $this->parseArticleText( $text );
                }
 
                # Bad title or page does not exist
-               if( $this->mContentType == 'text/x-wiki' ) {
+               if( !$found && $this->mContentType == 'text/x-wiki' ) {
                        # Don't return a 404 response for CSS or JavaScript;
                        # 404s aren't generally cached and it would create
                        # extra hits when user CSS/JS are on and the user doesn't
                        # have the pages.
                        header( "HTTP/1.0 404 Not Found" );
                }
-               return '';
+               
+               return $this->parseArticleText( $text );
        }
 
        function parseArticleText( $text ) {
@@ -187,14 +197,8 @@ 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;
        }