<?php
if ( ! defined( 'MEDIAWIKI' ) )
- die( -1 );
+ die( 1 );
/**
* @package MediaWiki
*/
-if ( $wgUseTeX )
- require_once 'Math.php';
-
/**
* @todo document
* @package MediaWiki
*/
class OutputPage {
- var $mHeaders, $mMetatags, $mKeywords;
+ var $mMetatags, $mKeywords;
var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable;
var $mSubtitle, $mRedirect, $mStatusCode;
var $mLastModified, $mETag, $mCategoryLinks;
- var $mScripts, $mLinkColours;
+ var $mScripts, $mLinkColours, $mPageLinkTitle;
var $mSuppressQuickbar;
var $mOnloadHandler;
var $mShowFeedLinks = false;
var $mEnableClientCache = true;
var $mArticleBodyOnly = false;
+
+ var $mNewSectionLink = false;
+ var $mNoGallery = false;
/**
* Constructor
* Initialise private variables
*/
function OutputPage() {
- $this->mHeaders = $this->mMetatags =
- $this->mKeywords = $this->mLinktags = array();
+ $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->mPageLinkTitle = '';
$this->mIsArticleRelated = $this->mIsarticle = $this->mPrintable = true;
$this->mSuppressQuickbar = $this->mPrintable = false;
$this->mLanguageLinks = array();
- $this->mCategoryLinks = array() ;
+ $this->mCategoryLinks = array();
$this->mDoNothing = false;
$this->mContainsOldMagic = $this->mContainsNewMagic = 0;
$this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
$this->mScripts = '';
$this->mETag = false;
$this->mRevisionId = null;
+ $this->mNewSectionLink = false;
+ }
+
+ function redirect( $url, $responsecode = '302' ) {
+ # Strip newlines as a paranoia check for header injection in PHP<5.1.2
+ $this->mRedirect = str_replace( "\n", '', $url );
+ $this->mRedirectCode = $responsecode;
}
- function addHeader( $name, $val ) { array_push( $this->mHeaders, $name.': '.$val ) ; }
- function redirect( $url, $responsecode = '302' ) { $this->mRedirect = $url; $this->mRedirectCode = $responsecode; }
function setStatusCode( $statusCode ) { $this->mStatusCode = $statusCode; }
# To add an http-equiv meta tag, precede the name with "http:"
*/
function checkLastModified ( $timestamp ) {
global $wgCachePages, $wgCacheEpoch, $wgUser;
+ $fname = 'OutputPage::checkLastModified';
+
if ( !$timestamp || $timestamp == '19700101000000' ) {
- wfDebug( "CACHE DISABLED, NO TIMESTAMP\n" );
+ wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP\n" );
return;
}
if( !$wgCachePages ) {
- wfDebug( "CACHE DISABLED\n", false );
+ wfDebug( "$fname: CACHE DISABLED\n", false );
return;
}
if( $wgUser->getOption( 'nocache' ) ) {
- wfDebug( "USER DISABLED CACHE\n", false );
+ wfDebug( "$fname: USER DISABLED CACHE\n", false );
return;
}
$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
$modsinceTime = strtotime( $modsince );
$ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 );
- wfDebug( "-- client send If-Modified-Since: " . $modsince . "\n", false );
- wfDebug( "-- we might send Last-Modified : $lastmod\n", false );
+ wfDebug( "$fname: -- client send If-Modified-Since: " . $modsince . "\n", false );
+ wfDebug( "$fname: -- we might send Last-Modified : $lastmod\n", false );
if( ($ismodsince >= $timestamp ) && $wgUser->validateCache( $ismodsince ) && $ismodsince >= $wgCacheEpoch ) {
# Make sure you're in a place you can leave when you call us!
header( "HTTP/1.0 304 Not Modified" );
$this->mLastModified = $lastmod;
$this->sendCacheControl();
- wfDebug( "CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
+ wfDebug( "$fname: CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
$this->disable();
@ob_end_clean(); // Don't output compressed blob
return true;
} else {
- wfDebug( "READY client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
+ wfDebug( "$fname: READY client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false );
$this->mLastModified = $lastmod;
}
} else {
- wfDebug( "client did not send If-Modified-Since header\n", false );
+ wfDebug( "$fname: client did not send If-Modified-Since header\n", false );
$this->mLastModified = $lastmod;
}
}
function addCategoryLinks($categories) {
global $wgUser, $wgContLang;
+ if ( !is_array( $categories ) ) {
+ return;
+ }
# Add the links to the link cache in a batch
$arr = array( NS_CATEGORY => $categories );
$lb = new LinkBatch;
function addParserOutputNoText( &$parserOutput ) {
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->addCategoryLinks( $parserOutput->getCategories() );
+ $this->mNewSectionLink = $parserOutput->getNewSection();
$this->addKeywords( $parserOutput );
if ( $parserOutput->getCacheTime() == -1 ) {
$this->enableClientCache( false );
}
+ if ( $parserOutput->mHTMLtitle != "" ) {
+ $this->mPagetitle = $parserOutput->mHTMLtitle ;
+ $this->mSubtitle .= $parserOutput->mSubtitle ;
+ }
}
function addParserOutput( &$parserOutput ) {
$this->addParserOutputNoText( $parserOutput );
$text = $parserOutput->getText();
+ $this->mNoGallery = $parserOutput->getNoGallery();
wfRunHooks( 'OutputPageBeforeHTML',array( &$this, &$text ) );
$parserOutput->setText( $text );
$this->addHTML( $parserOutput->getText() );
}
/**
- * Parse wikitext and return the HTML. This is for special pages that add the text later
+ * Parse wikitext and return the HTML.
*/
- function parse( $text, $linestart = true ) {
+ function parse( $text, $linestart = true, $interface = false ) {
global $wgParser, $wgTitle;
+ if ( $interface) { $this->mParserOptions->setInterfaceMessage(true); }
$parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions,
$linestart, true, $this->mRevisionId );
+ if ( $interface) { $this->mParserOptions->setInterfaceMessage(false); }
return $parserOutput->getText();
}
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->addCategoryLinks( $parserOutput->getCategories() );
$this->addKeywords( $parserOutput );
+ $this->mNewSectionLink = $parserOutput->getNewSection();
+ $this->mNoGallery = $parserOutput->getNoGallery();
$text = $parserOutput->getText();
wfRunHooks( 'OutputPageBeforeHTML', array( &$this, &$text ) );
$this->addHTML( $text );
function sendCacheControl() {
global $wgUseSquid, $wgUseESI, $wgSquidMaxage;
+ $fname = 'OutputPage::sendCacheControl';
if ($this->mETag)
header("ETag: $this->mETag");
# We'll purge the proxy cache explicitly, but require end user agents
# to revalidate against the proxy on each visit.
# Surrogate-Control controls our Squid, Cache-Control downstream caches
- wfDebug( "** proxy caching with ESI; {$this->mLastModified} **\n", false );
+ wfDebug( "$fname: proxy caching with ESI; {$this->mLastModified} **\n", false );
# start with a shorter timeout for initial testing
# header( 'Surrogate-Control: max-age=2678400+2678400, content="ESI/1.0"');
header( 'Surrogate-Control: max-age='.$wgSquidMaxage.'+'.$this->mSquidMaxage.', content="ESI/1.0"');
# to revalidate against the proxy on each visit.
# IMPORTANT! The Squid needs to replace the Cache-Control header with
# Cache-Control: s-maxage=0, must-revalidate, max-age=0
- wfDebug( "** local proxy caching; {$this->mLastModified} **\n", false );
+ wfDebug( "$fname: local proxy caching; {$this->mLastModified} **\n", false );
# start with a shorter timeout for initial testing
# header( "Cache-Control: s-maxage=2678400, must-revalidate, max-age=0" );
header( 'Cache-Control: s-maxage='.$this->mSquidMaxage.', must-revalidate, max-age=0' );
} else {
# We do want clients to cache if they can, but they *must* check for updates
# on revisiting the page.
- wfDebug( "** private caching; {$this->mLastModified} **\n", false );
- header( "Expires: -1" );
+ wfDebug( "$fname: private caching; {$this->mLastModified} **\n", false );
+ header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
header( "Cache-Control: private, must-revalidate, max-age=0" );
}
if($this->mLastModified) header( "Last-modified: {$this->mLastModified}" );
} else {
- wfDebug( "** no caching **\n", false );
+ wfDebug( "$fname: no caching **\n", false );
# In general, the absence of a last modified header should be enough to prevent
# the client from using its cache. We send a few other things just to make sure.
- header( 'Expires: -1' );
+ header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' );
header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' );
header( 'Pragma: no-cache' );
}
*/
function output() {
global $wgUser, $wgOutputEncoding;
- global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType, $wgProfiler;
+ global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType;
+ global $wgJsMimeType, $wgStylePath, $wgUseAjax, $wgScriptPath, $wgServer;
if( $this->mDoNothing ){
return;
wfProfileIn( $fname );
$sk = $wgUser->getSkin();
+ if ( $wgUseAjax ) {
+ $this->addScript( "<script type=\"{$wgJsMimeType}\">
+ var wgScriptPath=\"{$wgScriptPath}\";
+ var wgServer=\"{$wgServer}\";
+ </script>" );
+ $this->addScript( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/ajax.js\"></script>\n" );
+ }
+
if ( '' != $this->mRedirect ) {
if( substr( $this->mRedirect, 0, 4 ) != 'http' ) {
# Standards require redirect URLs to be absolute
} else {
header( 'Location: '.$this->mRedirect );
}
- if ( isset( $wgProfiler ) ) { wfDebug( $wgProfiler->getOutput() ); }
wfProfileOut( $fname );
return;
}
* Produce a "user is blocked" page
*/
function blockedPage() {
- global $wgUser, $wgContLang;
+ global $wgUser, $wgContLang, $wgTitle;
$this->setPageTitle( wfMsg( 'blockedtitle' ) );
$this->setRobotpolicy( 'noindex,nofollow' );
$link = '[[' . $wgContLang->getNsText( NS_USER ) . ":{$name}|{$name}]]";
$this->addWikiText( wfMsg( 'blockedtext', $link, $reason, $ip, $name ) );
- $this->returnToMain( false );
+
+ # Don't auto-return to special pages
+ $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL;
+ $this->returnToMain( false, $return );
}
/**
* Note: these arguments are keys into wfMsg(), not text!
*/
- function errorpage( $title, $msg ) {
+ function showErrorPage( $title, $msg ) {
global $wgTitle;
$this->mDebugtext .= 'Original title: ' .
$this->mBodytext = '';
$this->addWikiText( wfMsg( $msg ) );
$this->returnToMain( false );
-
- $this->output();
- wfErrorExit();
}
+ /** @obsolete */
+ function errorpage( $title, $msg ) {
+ throw new ErrorPageError( $title, $msg );
+ }
+
/**
* Display an error page indicating that a given version of MediaWiki is
* required to use it
$this->returnToMain();
}
+ /**
+ * Produce the stock "please login to use the wiki" page
+ */
function loginToUse() {
global $wgUser, $wgTitle, $wgContLang;
-
+ $skin = $wgUser->getSkin();
+
$this->setPageTitle( wfMsg( 'loginreqtitle' ) );
- $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
- $this->setRobotpolicy( 'noindex,nofollow' );
+ $this->setHtmlTitle( wfMsg( 'errorpagetitle' ) );
+ $this->setRobotPolicy( 'noindex,nofollow' );
$this->setArticleFlag( false );
- $this->mBodytext = '';
- $loginpage = Title::makeTitle(NS_SPECIAL, 'Userlogin');
- $sk = $wgUser->getSkin();
- $loginlink = $sk->makeKnownLinkObj($loginpage, wfMsg('loginreqlink'),
- 'returnto=' . htmlspecialchars($wgTitle->getPrefixedDBkey()));
- $this->addHTML( wfMsgHtml( 'loginreqpagetext', $loginlink ) );
-
- # We put a comment in the .html file so a Sysop can diagnose the page the
- # user can't see.
- $this->addHTML( "\n<!--" .
- $wgContLang->getNsText( $wgTitle->getNamespace() ) .
- ':' .
- $wgTitle->getDBkey() . '-->' );
- $this->returnToMain(); # Flip back to the main page after 10 seconds.
+
+ $loginTitle = Title::makeTitle( NS_SPECIAL, 'Userlogin' );
+ $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() );
+ $this->addHtml( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) );
+ $this->addHtml( "\n<!--" . $wgTitle->getPrefixedUrl() . "-->" );
+
+ $this->returnToMain();
}
+ /** @obsolete */
function databaseError( $fname, $sql, $error, $errno ) {
- global $wgUser, $wgCommandLineMode, $wgShowSQLErrors;
-
- $this->setPageTitle( wfMsgNoDB( 'databaseerror' ) );
- $this->setRobotpolicy( 'noindex,nofollow' );
- $this->setArticleRelated( false );
- $this->enableClientCache( false );
- $this->mRedirect = '';
-
- if( !$wgShowSQLErrors ) {
- $sql = wfMsg( 'sqlhidden' );
- }
-
- if ( $wgCommandLineMode ) {
- $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
- htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
- } else {
- $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
- htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
- }
-
- if ( $wgCommandLineMode || !is_object( $wgUser )) {
- print $msg."\n";
- wfErrorExit();
- }
- $this->mBodytext = $msg;
- $this->output();
- wfErrorExit();
+ throw new MWException( "OutputPage::databaseError is obsolete\n" );
}
function readOnlyPage( $source = null, $protected = false ) {
- global $wgUser, $wgReadOnlyFile, $wgReadOnly;
+ global $wgUser, $wgReadOnlyFile, $wgReadOnly, $wgTitle;
$this->setRobotpolicy( 'noindex,nofollow' );
$this->setArticleRelated( false );
if( $protected ) {
+ $skin = $wgUser->getSkin();
$this->setPageTitle( wfMsg( 'viewsource' ) );
- $this->addWikiText( wfMsg( 'protectedtext' ) );
+ $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) );
+
+ # Determine if protection is due to the page being a system message
+ # and show an appropriate explanation
+ if( $wgTitle->getNamespace() == NS_MEDIAWIKI && !$wgUser->isAllowed( 'editinterface' ) ) {
+ $this->addWikiText( wfMsg( 'protectedinterface' ) );
+ } else {
+ $this->addWikiText( wfMsg( 'protectedtext' ) );
+ }
} else {
$this->setPageTitle( wfMsg( 'readonly' ) );
if ( $wgReadOnly ) {
if( is_string( $source ) ) {
if( strcmp( $source, '' ) == 0 ) {
- global $wgTitle ;
+ global $wgTitle;
if ( $wgTitle->getNamespace() == NS_MEDIAWIKI ) {
- $source = wfMsgWeirdKey ( $wgTitle->getText() ) ;
+ $source = wfMsgWeirdKey ( $wgTitle->getText() );
} else {
$source = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
}
}
- $rows = $wgUser->getOption( 'rows' );
- $cols = $wgUser->getOption( 'cols' );
- $text = "\n<textarea cols='$cols' rows='$rows' readonly='readonly'>" .
+ $rows = $wgUser->getIntOption( 'rows' );
+ $cols = $wgUser->getIntOption( 'cols' );
+
+ $text = "\n<textarea name='wpTextbox1' id='wpTextbox1' cols='$cols' rows='$rows' readonly='readonly'>" .
htmlspecialchars( $source ) . "\n</textarea>";
$this->addHTML( $text );
}
$this->returnToMain( false );
}
- function fatalError( $message ) {
+ /** @obsolete */
+ function fatalError( $message ) {
+ throw new FatalError( $message );
+ }
+
+ /** @obsolete */
+ function unexpectedValueError( $name, $val ) {
+ throw new FatalError( wfMsg( 'unexpected', $name, $val ) );
+ }
+
+ /** @obsolete */
+ function fileCopyError( $old, $new ) {
+ throw new FatalError( wfMsg( 'filecopyerror', $old, $new ) );
+ }
+
+ /** @obsolete */
+ function fileRenameError( $old, $new ) {
+ throw new FatalError( wfMsg( 'filerenameerror', $old, $new ) );
+ }
+
+ /** @obsolete */
+ function fileDeleteError( $name ) {
+ throw new FatalError( wfMsg( 'filedeleteerror', $name ) );
+ }
+
+ /** @obsolete */
+ function fileNotFoundError( $name ) {
+ throw new FatalError( wfMsg( 'filenotfound', $name ) );
+ }
+
+ function showFatalError( $message ) {
$this->setPageTitle( wfMsg( "internalerror" ) );
$this->setRobotpolicy( "noindex,nofollow" );
$this->setArticleRelated( false );
$this->enableClientCache( false );
$this->mRedirect = '';
-
$this->mBodytext = $message;
- $this->output();
- wfErrorExit();
}
- function unexpectedValueError( $name, $val ) {
- $this->fatalError( wfMsg( 'unexpected', $name, $val ) );
+ function showUnexpectedValueError( $name, $val ) {
+ $this->showFatalError( wfMsg( 'unexpected', $name, $val ) );
}
- function fileCopyError( $old, $new ) {
- $this->fatalError( wfMsg( 'filecopyerror', $old, $new ) );
+ function showFileCopyError( $old, $new ) {
+ $this->showFatalError( wfMsg( 'filecopyerror', $old, $new ) );
}
- function fileRenameError( $old, $new ) {
- $this->fatalError( wfMsg( 'filerenameerror', $old, $new ) );
+ function showFileRenameError( $old, $new ) {
+ $this->showFatalError( wfMsg( 'filerenameerror', $old, $new ) );
}
- function fileDeleteError( $name ) {
- $this->fatalError( wfMsg( 'filedeleteerror', $name ) );
+ function showFileDeleteError( $name ) {
+ $this->showFatalError( wfMsg( 'filedeleteerror', $name ) );
}
- function fileNotFoundError( $name ) {
- $this->fatalError( wfMsg( 'filenotfound', $name ) );
+ function showFileNotFoundError( $name ) {
+ $this->showFatalError( wfMsg( 'filenotfound', $name ) );
}
/**
*/
function returnToMain( $auto = true, $returnto = NULL ) {
global $wgUser, $wgOut, $wgRequest;
-
+
if ( $returnto == NULL ) {
$returnto = $wgRequest->getText( 'returnto' );
}
- $returnto = htmlspecialchars( $returnto );
-
- $sk = $wgUser->getSkin();
- if ( '' == $returnto ) {
+
+ if ( '' === $returnto ) {
$returnto = wfMsgForContent( 'mainpage' );
}
- $link = $sk->makeLinkObj( Title::newFromText( $returnto ), '' );
+
+ if ( is_object( $returnto ) ) {
+ $titleObj = $returnto;
+ } else {
+ $titleObj = Title::newFromText( $returnto );
+ }
+
+ $sk = $wgUser->getSkin();
+ $link = $sk->makeLinkObj( $titleObj, '' );
$r = wfMsg( 'returnto', $link );
if ( $auto ) {
- $titleObj = Title::newFromText( $returnto );
$wgOut->addMeta( 'http:Refresh', '10;url=' . $titleObj->escapeFullURL() );
}
$wgOut->addHTML( "\n<p>$r</p>\n" );
$this->addKeyword( $wgTitle->getPrefixedText() );
$count = 1;
$links2d =& $parserOutput->getLinks();
+ if ( !is_array( $links2d ) ) {
+ return;
+ }
foreach ( $links2d as $ns => $dbkeys ) {
foreach( $dbkeys as $dbkey => $id ) {
$this->addKeyword( $dbkey );
'Sorry, the server has encountered an internal error. ' .
'Please wait a moment and hit "refresh" to submit the request again.' );
}
+
+ /**
+ * Show an "add new section" link?
+ *
+ * @return bool True if the parser output instructs us to add one
+ */
+ function showNewSectionLink() {
+ return $this->mNewSectionLink;
+ }
}
?>
dépôts / lhc / web / wiklou.git / blobdiff