<?php
/**
- *
+ * @version $Id$
* @package MediaWiki
*/
var $mShowFeedLinks = false;
var $mEnableClientCache = true;
- function OutputPage()
- {
+ /**
+ * Constructor
+ * Initialise private variables
+ */
+ function OutputPage() {
$this->mHeaders = $this->mCookies = $this->mMetatags =
$this->mKeywords = $this->mLinktags = array();
$this->mHTMLtitle = $this->mPagetitle = $this->mBodytext =
$this->mRedirect = $this->mLastModified =
$this->mSubtitle = $this->mDebugtext = $this->mRobotpolicy =
- $this->mOnloadHandler = "";
+ $this->mOnloadHandler = '';
$this->mIsArticleRelated = $this->mIsarticle = $this->mPrintable = true;
$this->mSuppressQuickbar = $this->mPrintable = false;
$this->mLanguageLinks = array();
$this->mContainsOldMagic = $this->mContainsNewMagic = 0;
$this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
$this->mSquidMaxage = 0;
- $this->mScripts = "";
+ $this->mScripts = '';
}
- function addHeader( $name, $val ) { array_push( $this->mHeaders, "$name: $val" ) ; }
+ function addHeader( $name, $val ) { array_push( $this->mHeaders, $name.': '.$val ) ; }
function addCookie( $name, $val ) { array_push( $this->mCookies, array( $name, $val ) ); }
function redirect( $url, $responsecode = '302' ) { $this->mRedirect = $url; $this->mRedirectCode = $responsecode; }
* any future call to OutputPage->output() have no effect. The method
* returns true iff cache-ok headers was sent.
*/
- function checkLastModified ( $timestamp )
- {
+ function checkLastModified ( $timestamp ) {
global $wgLang, $wgCachePages, $wgUser;
$timestamp=wfTimestamp(TS_MW,$timestamp);
if( !$wgCachePages ) {
return;
}
- $lastmod = gmdate( "D, j M Y H:i:s", wfTimestamp(TS_UNIX, max( $timestamp, $wgUser->mTouched ) ) ) . " GMT";
+ $lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp(TS_UNIX, max( $timestamp, $wgUser->mTouched ) ) ) . ' GMT';
if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
# IE sends sizes after the date like this:
return '';
}
}
+
function setRobotpolicy( $str ) { $this->mRobotpolicy = $str; }
function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; }
function setPageTitle( $name ) {
- global $action;
+ global $action, $wgContLang;
+ $name = $wgContLang->autoConvert($name);
$this->mPagetitle = $name;
if(!empty($action)) {
$taction = $this->getPageTitleActionText();
function getOnloadHandler() { return $this->mOnloadHandler; }
function disable() { $this->mDoNothing = true; }
- function setArticleRelated( $v )
- {
+ function setArticleRelated( $v ) {
$this->mIsArticleRelated = $v;
if ( !$v ) {
$this->mIsarticle = false;
}
}
- function isArticleRelated()
- {
- return $this->mIsArticleRelated;
- }
+ function isArticleRelated() { return $this->mIsArticleRelated; }
- function getLanguageLinks() {
- return $this->mLanguageLinks;
- }
+ function getLanguageLinks() { return $this->mLanguageLinks; }
function addLanguageLinks($newLinkArray) {
$this->mLanguageLinks += $newLinkArray;
}
function setLanguageLinks($newLinkArray) {
$this->mLanguageLinks = $newLinkArray;
}
+
function getCategoryLinks() {
return $this->mCategoryLinks;
}
function isQuickbarSuppressed() { return $this->mSuppressQuickbar; }
function addHTML( $text ) { $this->mBodytext .= $text; }
+ function clearHTML() { $this->mBodytext = ''; }
function debug( $text ) { $this->mDebugtext .= $text; }
- function setParserOptions( $options )
- {
+ function setParserOptions( $options ) {
return wfSetVar( $this->mParserOptions, $options );
}
/**
* Convert wikitext to HTML and add it to the buffer
*/
- function addWikiText( $text, $linestart = true )
- {
- global $wgParser, $wgTitle;
+ function addWikiText( $text, $linestart = true ) {
+ global $wgParser, $wgTitle, $wgUseTidy;
$parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
+ if ($wgUseTidy) {
+ $text = Parser::tidy($text);
+ }
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->mCategoryLinks += $parserOutput->getCategoryLinks();
$this->addHTML( $parserOutput->getText() );
* Saves the text into the parser cache if possible
*/
function addPrimaryWikiText( $text, $cacheArticle ) {
- global $wgParser, $wgParserCache, $wgUser, $wgTitle;
+ global $wgParser, $wgParserCache, $wgUser, $wgTitle, $wgUseTidy;
$parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, true );
# Replace link holders
$text = $parserOutput->getText();
$this->replaceLinkHolders( $text );
+ if ($wgUseTidy) {
+ $text = Parser::tidy($text);
+ }
$parserOutput->setText( $text );
if ( $cacheArticle ) {
$this->mCategoryLinks += $parserOutput->getCategoryLinks();
$this->addHTML( $text );
}
-
+
+ /**
+ * @param $article
+ * @param $user
+ */
function tryParserCache( $article, $user ) {
global $wgParserCache;
$parserOutput = $wgParserCache->get( $article, $user );
/**
* Set the maximum cache time on the Squid in seconds
+ * @param $maxage
*/
function setSquidMaxage( $maxage ) {
$this->mSquidMaxage = $maxage;
/**
* Use enableClientCache(false) to force it to send nocache headers
+ * @param $state
*/
function enableClientCache( $state ) {
return wfSetVar( $this->mEnableClientCache, $state );
* Finally, all the text has been munged and accumulated into
* the object, let's actually output it:
*/
- function output()
- {
+ function output() {
global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
- global $wgInputEncoding, $wgOutputEncoding, $wgLanguageCode;
+ global $wgInputEncoding, $wgOutputEncoding, $wgContLanguageCode;
global $wgDebugRedirects, $wgMimeType, $wgProfiler;
+
if( $this->mDoNothing ){
return;
}
$fname = 'OutputPage::output';
wfProfileIn( $fname );
-
$sk = $wgUser->getSkin();
if ( '' != $this->mRedirect ) {
$this->sendCacheControl();
# Perform link colouring
$this->transformBuffer();
+ $this->replaceLinkHolders( $this->mSubtitle );
# Disable temporary placeholders, so that the skin produces HTML
$sk->postParseLinkColour( false );
header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
- header( 'Content-language: '.$wgLanguageCode );
+ header( 'Content-language: '.$wgContLanguageCode );
$exp = time() + $wgCookieExpiration;
foreach( $this->mCookies as $name => $val ) {
}
function out( $ins ) {
- global $wgInputEncoding, $wgOutputEncoding, $wgLang;
+ global $wgInputEncoding, $wgOutputEncoding, $wgContLang;
if ( 0 == strcmp( $wgInputEncoding, $wgOutputEncoding ) ) {
$outs = $ins;
} else {
- $outs = $wgLang->iconv( $wgInputEncoding, $wgOutputEncoding, $ins );
+ $outs = $wgContLang->iconv( $wgInputEncoding, $wgOutputEncoding, $ins );
if ( false === $outs ) { $outs = $ins; }
}
print $outs;
function setEncodings() {
global $wgInputEncoding, $wgOutputEncoding;
- global $wgUser, $wgLang;
+ global $wgUser, $wgContLang;
$wgInputEncoding = strtolower( $wgInputEncoding );
if( $wgUser->getOption( 'altencoding' ) ) {
- $wgLang->setAltEncoding();
+ $wgContLang->setAltEncoding();
return;
}
$this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
$this->setRobotpolicy( 'noindex,nofollow' );
$this->setArticleRelated( false );
+ $this->suppressQuickbar();
+
$this->enableClientCache( false );
$this->mRedirect = '';
$this->mBodytext = '';
$sk = $wgUser->getSkin();
- $ap = $sk->makeKnownLink( wfMsg( 'administrators' ), '' );
+ $ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' );
$this->addHTML( wfMsg( 'sysoptext', $ap ) );
$this->returnToMain();
}
$this->mBodytext = '';
$sk = $wgUser->getSkin();
- $ap = $sk->makeKnownLink( wfMsg( 'administrators' ), '' );
+ $ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' );
$this->addHTML( wfMsg( 'developertext', $ap ) );
$this->returnToMain();
}
function loginToUse() {
- global $wgUser, $wgTitle, $wgLang;
+ global $wgUser, $wgTitle, $wgContLang;
$this->setPageTitle( wfMsg( 'loginreqtitle' ) );
$this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
# We put a comment in the .html file so a Sysop can diagnose the page the
# user can't see.
$this->addHTML( "\n<!--" .
- $wgLang->getNsText( $wgTitle->getNamespace() ) .
+ $wgContLang->getNsText( $wgTitle->getNamespace() ) .
':' .
$wgTitle->getDBkey() . '-->' );
$this->returnToMain(); # Flip back to the main page after 10 seconds.
$sk = $wgUser->getSkin();
if ( '' == $returnto ) {
- $returnto = wfMsg( 'mainpage' );
+ $returnto = wfMsgForContent( 'mainpage' );
}
$link = $sk->makeKnownLink( $returnto, '' );
* @private
*/
function headElement() {
- global $wgDocType, $wgDTD, $wgLanguageCode, $wgOutputEncoding, $wgMimeType;
- global $wgUser, $wgLang, $wgRequest;
+ global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType;
+ global $wgUser, $wgContLang, $wgRequest;
$xml = ($wgMimeType == 'text/xml');
if( $xml ) {
} else {
$xmlbits = '';
}
- $rtl = $wgLang->isRTL() ? " dir='RTL'" : '';
- $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
+ $rtl = $wgContLang->isRTL() ? " dir='RTL'" : '';
+ $ret .= "<html $xmlbits lang=\"$wgContLanguageCode\" $rtl>\n";
$ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
* $options is a bit field, RLH_FOR_UPDATE to select for update
*/
function replaceLinkHolders( &$text, $options = 0 ) {
- global $wgUser, $wgLinkCache, $wgUseOldExistenceCheck;
+ global $wgUser, $wgLinkCache, $wgUseOldExistenceCheck, $wgLinkHolders;
if ( $wgUseOldExistenceCheck ) {
return array();
$fname = 'OutputPage::replaceLinkHolders';
wfProfileIn( $fname );
- $titles = array();
$pdbks = array();
$colours = array();
- # Get placeholders from body
- wfProfileIn( $fname.'-match' );
- preg_match_all( "/<!--LINK (.*?) (.*?) (.*?) (.*?)-->/", $text, $tmpLinks );
- wfProfileOut( $fname.'-match' );
-
- if ( !empty( $tmpLinks[0] ) ) {
+ #if ( !empty( $tmpLinks[0] ) ) { #TODO
+ if ( !empty( $wgLinkHolders['namespaces'] ) ) {
wfProfileIn( $fname.'-check' );
$dbr =& wfGetDB( DB_SLAVE );
$cur = $dbr->tableName( 'cur' );
$sk = $wgUser->getSkin();
$threshold = $wgUser->getOption('stubthreshold');
- $namespaces =& $tmpLinks[1];
- $dbkeys =& $tmpLinks[2];
- $queries =& $tmpLinks[3];
- $texts =& $tmpLinks[4];
-
# Sort by namespace
- asort( $namespaces );
+ asort( $wgLinkHolders['namespaces'] );
# Generate query
$query = false;
- foreach ( $namespaces as $key => $val ) {
+ foreach ( $wgLinkHolders['namespaces'] as $key => $val ) {
# Make title object
- $dbk = $dbkeys[$key];
- $title = $titles[$key] = Title::makeTitleSafe( $val, $dbk );
+ $title = $wgLinkHolders['titles'][$key];
# Skip invalid entries.
# Result will be ugly, but prevents crash.
$query .= ', ';
}
- $query .= $dbr->addQuotes( $dbkeys[$key] );
+ $query .= $dbr->addQuotes( $wgLinkHolders['dbkeys'][$key] );
}
}
if ( $query ) {
wfProfileIn( $fname.'-construct' );
global $outputReplace;
$outputReplace = array();
- foreach ( $namespaces as $key => $ns ) {
+ foreach ( $wgLinkHolders['namespaces'] as $key => $ns ) {
$pdbk = $pdbks[$key];
- $searchkey = $tmpLinks[0][$key];
- $title = $titles[$key];
+ $searchkey = '<!--LINK '.$key.'-->';
+ $title = $wgLinkHolders['titles'][$key];
if ( empty( $colours[$pdbk] ) ) {
$wgLinkCache->addBadLink( $pdbk );
$colours[$pdbk] = 0;
- $outputReplace[$searchkey] = $sk->makeBrokenLinkObj( $title, $texts[$key], $queries[$key] );
+ $outputReplace[$searchkey] = $sk->makeBrokenLinkObj( $title,
+ $wgLinkHolders['texts'][$key],
+ $wgLinkHolders['queries'][$key] );
} elseif ( $colours[$pdbk] == 1 ) {
- $outputReplace[$searchkey] = $sk->makeKnownLinkObj( $title, $texts[$key], $queries[$key] );
+ $outputReplace[$searchkey] = $sk->makeKnownLinkObj( $title,
+ $wgLinkHolders['texts'][$key],
+ $wgLinkHolders['queries'][$key] );
} elseif ( $colours[$pdbk] == 2 ) {
- $outputReplace[$searchkey] = $sk->makeStubLinkObj( $title, $texts[$key], $queries[$key] );
+ $outputReplace[$searchkey] = $sk->makeStubLinkObj( $title,
+ $wgLinkHolders['texts'][$key],
+ $wgLinkHolders['queries'][$key] );
}
}
wfProfileOut( $fname.'-construct' );
wfProfileIn( $fname.'-replace' );
$text = preg_replace_callback(
- '/(<!--LINK .*? .*? .*? .*?-->)/',
+ '/(<!--LINK .*?-->)/',
"outputReplaceMatches",
$text);
wfProfileOut( $fname.'-replace' );
+
+ wfProfileIn( $fname.'-interwiki' );
+ global $wgInterwikiLinkHolders;
+ $outputReplace = $wgInterwikiLinkHolders;
+ $text = preg_replace_callback(
+ '/<!--IWLINK (.*?)-->/',
+ "outputReplaceMatches",
+ $text);
+ wfProfileOut( $fname.'-interwiki' );
}
+
wfProfileOut( $fname );
return $colours;
}
dépôts / lhc / web / wiklou.git / blobdiff