Corrected spelling error

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index b218612..4116f00 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -8,36 +8,74 @@
 class RawPage {
 
        function RawPage( $article ) {
-               global $wgRequest, $wgInputEncoding;
+               global $wgRequest, $wgInputEncoding, $wgSquidMaxage;
                $allowedCTypes = array('text/x-wiki', 'text/javascript', 'text/css', 'application/x-zope-edit');
                $this->mArticle =& $article;
                $this->mTitle =& $article->mTitle;
+                       
                $ctype = $wgRequest->getText( 'ctype' );
+               $charset = $wgRequest->getText( 'charset' );
+               $smaxage = $wgRequest->getText( 'smaxage' );
+               $maxage = $wgRequest->getText( 'maxage' );
+               $this->mOldId = $wgRequest->getInt( 'oldid' );
+               # special case for 'generated' raw things: user css/js
+               $gen = $wgRequest->getText( 'gen' );
+               if($gen == 'css') {
+                       $this->mGen = $gen;
+                       if($smaxage == '') $smaxage = $wgSquidMaxage;
+                       if($ctype == '') $ctype = 'text/css';
+               } else if ($gen == 'js') {
+                       $this->mGen = $gen;
+                       if($smaxage == '') $smaxage = $wgSquidMaxage;
+                       if($ctype == '') $ctype = 'text/javascript';
+               } else {
+                       $this->mGen = false;
+               }
+               $this->mCharset = !empty($charset) ? $charset : $wgInputEncoding;
+               $this->mSmaxage = ($smaxage != '') ? $smaxage : 0;
+               $this->mMaxage = ($maxage != '') ? $maxage : 86400;
                if(empty($ctype) or !in_array($ctype, $allowedCTypes)) {
                        $this->mContentType = 'text/x-wiki';
                } else {
                        $this->mContentType = $ctype;
                }
-                       
-               $charset = $wgRequest->getText( 'charset' );
-               $this->mCharset = !empty($charset) ? $charset : $wgInputEncoding;
-               $this->mOldId = $wgRequest->getInt( 'oldid' );
        }
        function view() {
+               global $wgUser, $wgOut;
                header( "Content-type: ".$this->mContentType.'; charset='.$this->mCharset );
                # allow the client to cache this for 24 hours
-               header( 'Cache-Control: s-maxage=0, max-age=86400' );
-               echo $this->getrawtext();
+               header( 'Cache-Control: s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
+               if($this->mGen) {
+                       $sk = $wgUser->getSkin();
+                       $sk->initPage($wgOut);
+                       if($this->mGen == 'css') {
+                               echo $sk->getUserStylesheet();
+                       } else if($this->mGen == 'js') {
+                               echo $sk->getUserJs();
+                       }
+               } else {
+                       echo $this->getrawtext();
+               }
                wfAbruptExit();
        }
        
        function getrawtext () {
-               global $wgInputEncoding, $wgLang;
+               global $wgInputEncoding, $wgLang, $wgIsPg;
                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 );
+                       return $rawtext;
+               }
+               # else get it from the DB
                if(!empty($this->mOldId)) {
-                       $sql = "SELECT old_text as text,old_timestamp as timestamp,old_user as user,old_flags as flags FROM old " .
+                       $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," .