* (bug 4298) Include rc_id on enhanced RC singleton diff links for patrolling

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 899de6d..67b464a 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -18,19 +18,27 @@ require_once( 'Revision.php' );
  * @package MediaWiki
  */
 class RawPage {
+       var $mArticle, $mTitle, $mRequest;
 
-       function RawPage( $article ) {
-               global $wgRequest, $wgInputEncoding, $wgSquidMaxage;
-               $allowedCTypes = array('text/x-wiki', 'text/javascript', 'text/css', 'application/x-zope-edit');
+       function RawPage( &$article, $request = false ) {
+               global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
+
+               $allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
+
+               if ( $request === false ) { 
+                       $this->mRequest =& $wgRequest;
+               } else {
+                       $this->mRequest = $request;
+               }
                        
-               $ctype = $wgRequest->getText( 'ctype' );
-               $smaxage = $wgRequest->getInt( 'smaxage', $wgSquidMaxage );
-               $maxage = $wgRequest->getInt( 'maxage', $wgSquidMaxage );
-               $this->mOldId = $wgRequest->getInt( 'oldid' );
+               $ctype = $this->mRequest->getText( 'ctype' );
+               $smaxage = $this->mRequest->getInt( 'smaxage', $wgSquidMaxage );
+               $maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage );
+               $this->mOldId = $this->mRequest->getInt( 'oldid' );
                # special case for 'generated' raw things: user css/js
-               $gen = $wgRequest->getText( 'gen' );
+               $gen = $this->mRequest->getText( 'gen' );
                if($gen == 'css') {
                        $this->mGen = $gen;
                        if($smaxage == '') $smaxage = $wgSquidMaxage;
@@ -38,7 +46,7 @@ class RawPage {
                } else if ($gen == 'js') {
                        $this->mGen = $gen;
                        if($smaxage == '') $smaxage = $wgSquidMaxage;
-                       if($ctype == '') $ctype = 'text/javascript';
+                       if($ctype == '') $ctype = $wgJsMimeType;
                } else {
                        $this->mGen = false;
                }
@@ -53,51 +61,68 @@ class RawPage {
        }
        
        function view() {
-               global $wgUser, $wgOut, $wgScript;
+               global $wgOut, $wgScript;
 
-               if( strcmp( $wgScript, $_SERVER['PHP_SELF'] ) ) {
+               if( isset( $_SERVER['SCRIPT_URL'] ) ) {
+                       # Normally we use PHP_SELF to get the URL to the script
+                       # as it was called, minus the query string.
+                       #
+                       # Some sites use Apache rewrite rules to handle subdomains,
+                       # and have PHP set up in a weird way that causes PHP_SELF
+                       # to contain the rewritten URL instead of the one that the
+                       # outside world sees.
+                       #
+                       # If in this mode, use SCRIPT_URL instead, which mod_rewrite
+                       # provides containing the "before" URL.
+                       $url = $_SERVER['SCRIPT_URL'];
+               } else {
+                       $url = $_SERVER['PHP_SELF'];
+               }
+               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
                        # 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();
+                       #
+                       # We used to redirect to a canonical-form URL as a general
+                       # backwards-compatibility / good-citizen nice thing. However
+                       # a lot of servers are set up in buggy ways, resulting in
+                       # redirect loops which hang the browser until the CSS load
+                       # times out.
+                       #
+                       # Just return a 403 Forbidden and get it over with.
+                       wfHttpError( 403, 'Forbidden',
+                               '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 );
+               echo $this->getRawText();
+               $wgOut->disable();
+       }
+
+       function getRawText() {
+               global $wgUser, $wgOut;
                if($this->mGen) {
                        $sk = $wgUser->getSkin();
                        $sk->initPage($wgOut);
                        if($this->mGen == 'css') {
-                               echo $sk->getUserStylesheet();
+                               return $sk->getUserStylesheet();
                        } else if($this->mGen == 'js') {
-                               echo $sk->getUserJs();
+                               return $sk->getUserJs();
                        }
                } else {
-                       echo $this->getrawtext();
+                       return $this->getArticleText();
                }
-               $wgOut->disable();
-       }
-       
-       function getrawtext () {
-               global $wgInputEncoding, $wgContLang;
-               $fname = 'RawPage::getrawtext';
-               
+       }               
+
+       function getArticleText () {
                if( $this->mTitle ) {
                        # Special case for MediaWiki: messages; we can hit the message cache.
                        if( $this->mTitle->getNamespace() == NS_MEDIAWIKI) {
-                               $rawtext = wfMsg( $this->mTitle->getDbkey() );
+                               $rawtext = wfMsgForContent( $this->mTitle->getDbkey() );
                                return $rawtext;
                        }