rvv: r89398. Tim wants me to wait
authorChad Horohoe <demon@users.mediawiki.org>
Fri, 3 Jun 2011 05:44:28 +0000 (05:44 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Fri, 3 Jun 2011 05:44:28 +0000 (05:44 +0000)
RELEASE-NOTES-1.19
includes/AutoLoader.php
includes/DefaultSettings.php
includes/GlobalFunctions.php
includes/RawPage.php [new file with mode: 0644]
includes/Wiki.php

index 15961ba..5b40da3 100644 (file)
@@ -86,8 +86,6 @@ production.
 
 === API changes in 1.19 ===
 * BREAKING CHANGE: action=watch now requires POST and token.
-* BREAKING CHANGE: index.php?action=raw has been removed. You should be using
-  load.php or api.php for CSS/JS or raw page text requests, respectively.
 * (bug 27790) add query type for querymodules to action=paraminfo
 * (bug 28963) add langbacklinks module to api
 * (bug 27593) API: add error message when sha1/sha1base36 is invalid
index 7fa5dea..edf918f 100644 (file)
@@ -175,6 +175,7 @@ $wgAutoloadLocalClasses = array(
        'ProtectionForm' => 'includes/ProtectionForm.php',
        'QueryPage' => 'includes/QueryPage.php',
        'QuickTemplate' => 'includes/SkinTemplate.php',
+       'RawPage' => 'includes/RawPage.php',
        'RCCacheEntry' => 'includes/ChangesList.php',
        'RdfMetaData' => 'includes/Metadata.php',
        'ReadOnlyError' => 'includes/Exception.php',
index 0e3e7de..58a4d09 100644 (file)
@@ -3824,8 +3824,9 @@ $wgDebugLogPrefix       = '';
 $wgDebugRedirects              = false;
 
 /**
- * If true, log debugging data from and load.php.
- * This is normally false to avoid overlapping debug entries
+ * If true, log debugging data from action=raw and load.php.
+ * This is normally false to avoid overlapping debug entries due to gen=css and
+ * gen=js requests.
  */
 $wgDebugRawPage         = false;
 
index b57bd18..6ce6271 100644 (file)
@@ -318,7 +318,7 @@ function wfUrlencode( $s ) {
  * Controlling globals:
  * $wgDebugLogFile - points to the log file
  * $wgProfileOnly - if set, normal debug messages will not be recorded.
- * $wgDebugRawPage - if false, 'load.php' hits will not result in debug output.
+ * $wgDebugRawPage - if false, 'action=raw' hits will not result in debug output.
  * $wgDebugComments - if on, some debug items may appear in comments in the HTML output.
  *
  * @param $text String
@@ -363,9 +363,12 @@ function wfIsDebugRawPage() {
        if ( $cache !== null ) {
                return $cache;
        }
-
-       if(     isset( $_SERVER['SCRIPT_NAME'] )
-               && substr( $_SERVER['SCRIPT_NAME'], -8 ) == 'load.php' )        
+       # Check for raw action using $_GET not $wgRequest, since the latter might not be initialised yet
+       if ( ( isset( $_GET['action'] ) && $_GET['action'] == 'raw' )
+               || ( 
+                       isset( $_SERVER['SCRIPT_NAME'] ) 
+                       && substr( $_SERVER['SCRIPT_NAME'], -8 ) == 'load.php' 
+               ) )     
        {
                $cache = true;
        } else {
diff --git a/includes/RawPage.php b/includes/RawPage.php
new file mode 100644 (file)
index 0000000..c6c4a66
--- /dev/null
@@ -0,0 +1,228 @@
+<?php
+/**
+ * Raw page text accessor
+ *
+ * Copyright © 2004 Gabriel Wicke <wicke@wikidev.net>
+ * http://wikidev.net/
+ *
+ * Based on HistoryPage and SpecialExport
+ *
+ * License: GPL (http://www.gnu.org/copyleft/gpl.html)
+ *
+ * @author Gabriel Wicke <wicke@wikidev.net>
+ * @file
+ */
+
+/**
+ * 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, $mSection;
+       var $mSmaxage, $mMaxage;
+       var $mContentType, $mExpandTemplates;
+
+       function __construct( Article $article, $request = false ) {
+               global $wgRequest, $wgSquidMaxage, $wgJsMimeType, $wgGroupPermissions;
+
+               $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 = $this->mRequest->getVal( 'ctype' );
+               $smaxage = $this->mRequest->getIntOrNull( 'smaxage' );
+               $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
+                               if( $oldid ) {
+                                       $oldid = $this->mTitle->getNextRevisionId( $oldid );
+                               }
+                               $oldid = $oldid ? $oldid : -1;
+                               break;
+                       case 'prev':
+                               # output previous revision, or nothing if there isn't one
+                               if( !$oldid ) {
+                                       # get the current revision so we can get the penultimate one
+                                       $this->mArticle->getTouched();
+                                       $oldid = $this->mArticle->mLatest;
+                               }
+                               $prev = $this->mTitle->getPreviousRevisionId( $oldid );
+                               $oldid = $prev ? $prev : -1 ;
+                               break;
+                       case 'cur':
+                               $oldid = 0;
+                               break;
+               }
+               $this->mOldId = $oldid;
+
+               # special case for 'generated' raw things: user css/js
+               $gen = $this->mRequest->getVal( 'gen' );
+
+               if( $gen == 'css' ) {
+                       $this->mGen = $gen;
+                       if( is_null( $smaxage ) ) {
+                               $smaxage = $wgSquidMaxage;
+                       }
+                       if( $ctype == '' ) {
+                               $ctype = 'text/css';
+                       }
+               } elseif( $gen == 'js' ) {
+                       $this->mGen = $gen;
+                       if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
+                       if($ctype == '') $ctype = $wgJsMimeType;
+               } else {
+                       $this->mGen = false;
+               }
+               $this->mCharset = 'UTF-8';
+
+               # Force caching for CSS and JS raw content, default: 5 minutes
+               if( is_null( $smaxage ) && ( $ctype == 'text/css' || $ctype == $wgJsMimeType ) ) {
+                       global $wgForcedRawSMaxage;
+                       $this->mSmaxage = intval( $wgForcedRawSMaxage );
+               } else {
+                       $this->mSmaxage = intval( $smaxage );
+               }
+               $this->mMaxage = $maxage;
+
+               # Output may contain user-specific data;
+               # vary generated content for open sessions and private wikis
+               if( $this->mGen || !$wgGroupPermissions['*']['read'] ) {
+                       $this->mPrivateCache = $this->mSmaxage == 0 || session_id() != '';
+               } else {
+                       $this->mPrivateCache = false;
+               }
+
+               if( $ctype == '' || !in_array( $ctype, $allowedCTypes ) ) {
+                       $this->mContentType = 'text/x-wiki';
+               } else {
+                       $this->mContentType = $ctype;
+               }
+       }
+
+       function view() {
+               global $wgOut, $wgRequest;
+
+               if( !$wgRequest->checkUrlExtension() ) {
+                       $wgOut->disable();
+                       return;
+               }
+
+               header( 'Content-type: ' . $this->mContentType . '; charset=' . $this->mCharset );
+               # allow the client to cache this for 24 hours
+               $mode = $this->mPrivateCache ? 'private' : 'public';
+               header( 'Cache-Control: ' . $mode . ', s-maxage=' . $this->mSmaxage . ', max-age=' . $this->mMaxage );
+
+               global $wgUseFileCache;
+               if( $wgUseFileCache && HTMLFileCache::useFileCache() ) {
+                       $cache = new HTMLFileCache( $this->mTitle, 'raw' );
+                       if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
+                               $cache->loadFromFileCache();
+                               $wgOut->disable();
+                               return;
+                       } else {
+                               ob_start( array( &$cache, 'saveToFileCache' ) );
+                       }
+               }
+
+               $text = $this->getRawText();
+
+               if( !wfRunHooks( 'RawPageViewBeforeOutput', array( &$this, &$text ) ) ) {
+                       wfDebug( __METHOD__ . ": RawPageViewBeforeOutput hook broke raw page output.\n" );
+               }
+
+               echo $text;
+               $wgOut->disable();
+       }
+
+       function getRawText() {
+               global $wgUser, $wgOut;
+               if( $this->mGen ) {
+                       $sk = $wgUser->getSkin();
+                       if( !StubObject::isRealObject( $wgOut ) ) {
+                               $wgOut->_unstub( 2 );
+                       }
+                       $sk->initPage( $wgOut );
+                       if( $this->mGen == 'css' ) {
+                               return $sk->generateUserStylesheet();
+                       } else if( $this->mGen == 'js' ) {
+                               return $sk->generateUserJs();
+                       }
+               } else {
+                       return $this->getArticleText();
+               }
+       }
+
+       function getArticleText() {
+               $found = false;
+               $text = '';
+               if( $this->mTitle ) {
+                       // If it's a MediaWiki message we can just hit the message cache
+                       if( $this->mUseMessageCache && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
+                               $key = $this->mTitle->getDBkey();
+                               $msg = wfMessage( $key )->inContentLanguage();
+                               # If the message doesn't exist, return a blank
+                               $text = !$msg->exists() ? '' : $msg->plain();
+                               $found = true;
+                       } 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" );
+
+                                       if( !is_null( $this->mSection ) ) {
+                                               global $wgParser;
+                                               $text = $wgParser->getSection( $rev->getText(), $this->mSection );
+                                       } else {
+                                               $text = $rev->getText();
+                                       }
+                                       $found = true;
+                               }
+                       }
+               }
+
+               # Bad title or page does not exist
+               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 $this->parseArticleText( $text );
+       }
+
+       /**
+        * @param $text
+        * @return string
+        */
+       function parseArticleText( $text ) {
+               if( $text === '' ) {
+                       return '';
+               } else {
+                       if( $this->mExpandTemplates ) {
+                               global $wgParser;
+                               return $wgParser->preprocess( $text, $this->mTitle, new ParserOptions() );
+                       } else {
+                               return $text;
+                       }
+               }
+       }
+}
index 2e54796..1f9c939 100644 (file)
@@ -418,6 +418,12 @@ class MediaWiki {
                                $this->context->output->setSquidMaxage( $wgSquidMaxage );
                                $article->view();
                                break;
+                       case 'raw': // includes JS/CSS
+                               wfProfileIn( __METHOD__ . '-raw' );
+                               $raw = new RawPage( $article );
+                               $raw->view();
+                               wfProfileOut( __METHOD__ . '-raw' );
+                               break;
                        case 'delete':
                        case 'revert':
                        case 'rollback':