Revert r35848 per Brion's WONTFIX of bug 14536: "This would just mean that there...

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 2b2a5ce..b1e2539 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -7,19 +7,21 @@
  * License: GPL (http://www.gnu.org/copyleft/gpl.html)
  *
  * @author Gabriel Wicke <wicke@wikidev.net>
+ * @file
  */
 
 /**
- * @todo document
+ * 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 __construct( &$article, $request = false ) {
-               global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
+               global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType, $wgForcedRawSMaxage, $wgGroupPermissions;
 
                $allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
                $this->mArticle =& $article;
@@ -34,10 +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
@@ -61,7 +67,7 @@ class RawPage {
                                break;
                }
                $this->mOldId = $oldid;
-               
+
                # special case for 'generated' raw things: user css/js
                $gen = $this->mRequest->getVal( 'gen' );
 
@@ -77,13 +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 for open sessions
-               $this->mPrivateCache = ( $this->mSmaxage == 0 ) ||
-                       ( session_id() != '' );
-               
+
+               # 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 {
@@ -109,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
@@ -176,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;
                                }
                        }
@@ -190,7 +211,7 @@ 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;
@@ -204,7 +225,7 @@ class RawPage {
                                $this->mContentType == 'text/javascript' ) ) {
                        return "/* Empty */";
                }
-               
+
                return $this->parseArticleText( $text );
        }
 
@@ -219,4 +240,3 @@ class RawPage {
                                return $text;
        }
 }
-?>