X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FRawPage.php;h=b422d49ee3c9c961f6e38826504aa6eace1a5bb3;hb=b66845404076b2d08924501aff33ed51a62081e9;hp=7dc0e80f77b0dd3b508151f1099299b6521a2954;hpb=2832d79f21bfc2d288d591977d6e180ec8bd4f25;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/RawPage.php b/includes/RawPage.php index 7dc0e80f77..b422d49ee3 100644 --- a/includes/RawPage.php +++ b/includes/RawPage.php @@ -1,70 +1,113 @@ - * http://www.aulinx.de/ + * Copyright (C) 2004 Gabriel Wicke + * http://wikidev.net/ * Based on PageHistory and SpecialExport - * + * * License: GPL (http://www.gnu.org/copyleft/gpl.html) * - * @author Gabriel Wicke - * @package MediaWiki + * @author Gabriel Wicke + * @file */ -/** */ -require_once( 'Revision.php' ); - /** - * @todo document - * @package MediaWiki + * 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 RawPage( &$article, $request = false ) { - global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType; + function __construct( &$article, $request = false ) { + global $wgRequest, $wgInputEncoding, $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 ) { + if( $request === false ) { $this->mRequest =& $wgRequest; } else { $this->mRequest = $request; } - - $ctype = $this->mRequest->getText( 'ctype' ); - $smaxage = $this->mRequest->getInt( 'smaxage', $wgSquidMaxage ); + + $ctype = $this->mRequest->getVal( 'ctype' ); + $smaxage = $this->mRequest->getIntOrNull( 'smaxage' ); $maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage ); - $this->mExpandTemplates = $this->mRequest->getText( 'templates' ) === 'expand'; - $this->mOldId = $this->mRequest->getInt( 'oldid' ); + + $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->getText( 'gen' ); - - if($gen == 'css') { + $gen = $this->mRequest->getVal( 'gen' ); + + if( $gen == 'css' ) { $this->mGen = $gen; - if($smaxage == '') $smaxage = $wgSquidMaxage; + if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage; if($ctype == '') $ctype = 'text/css'; - } else if ($gen == 'js') { + } elseif( $gen == 'js' ) { $this->mGen = $gen; - if($smaxage == '') $smaxage = $wgSquidMaxage; + if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage; if($ctype == '') $ctype = $wgJsMimeType; } else { $this->mGen = false; } $this->mCharset = $wgInputEncoding; - $this->mSmaxage = $smaxage; + + # Force caching for CSS and JS raw content, default: 5 minutes + if( is_null($smaxage) and ($ctype=='text/css' or $ctype==$wgJsMimeType) ) { + global $wgForcedRawSMaxage; + $this->mSmaxage = intval($wgForcedRawSMaxage); + } else { + $this->mSmaxage = intval( $smaxage ); + } $this->mMaxage = $maxage; - if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) { + + # 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 { $this->mContentType = $ctype; } } - + function view() { global $wgOut, $wgScript; @@ -83,6 +126,16 @@ class RawPage { } else { $url = $_SERVER['PHP_SELF']; } + + if( $url == '' ) { + # This will make the next check fail with a confusing error + # message, so we should mention it separately. + wfHttpError( 500, 'Internal Server Error', + "\$_SERVER['PHP_SELF'] is not set. Perhaps you're using CGI" . + " and haven't set cgi.fix_pathinfo = 1 in php.ini?" ); + return; + } + 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 @@ -100,78 +153,113 @@ class RawPage { '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(); + $mode = $this->mPrivateCache ? 'private' : 'public'; + header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage ); + + if( 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) { + global $wgUser, $wgOut, $wgRequest; + if( $this->mGen ) { $sk = $wgUser->getSkin(); - $sk->initPage($wgOut); - if($this->mGen == 'css') { - return $sk->getUserStylesheet(); - } else if($this->mGen == 'js') { - return $sk->getUserJs(); + 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() { - global $wgParser; - + $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() ); - else { + 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 ); - if ( $rev ) { + if( $rev ) { $lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() ); header( "Last-modified: $lastmod" ); - $text = $rev->isDeleted() ? '' : $rev->getText(); - } else - $text = ''; - } - return $this->parseArticleText( $text ); + 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( $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 ''; + + // Special-case for empty CSS/JS + // + // Internet Explorer for Mac handles empty files badly; + // particularly so when keep-alive is active. It can lead + // to long timeouts as it seems to sit there waiting for + // more data that never comes. + // + // Give it a comment... + if( strlen( $text ) == 0 && + ($this->mContentType == 'text/css' || + $this->mContentType == 'text/javascript' ) ) { + return "/* Empty */"; + } + + return $this->parseArticleText( $text ); } function parseArticleText( $text ) { - if ( $text === '' ) + if( $text === '' ) 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 ); + if( $this->mExpandTemplates ) { + global $wgParser; + return $wgParser->preprocess( $text, $this->mTitle, new ParserOptions() ); } else return $text; } } -?>