*/
if( defined( 'MEDIAWIKI' ) ) {
-# See design.doc
+# See design.txt
if($wgUseTeX) require_once( 'Math.php' );
var $mHeaders, $mCookies, $mMetatags, $mKeywords;
var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable;
- var $mSubtitle, $mRedirect;
- var $mLastModified, $mCategoryLinks;
+ var $mSubtitle, $mRedirect, $mStatusCode;
+ var $mLastModified, $mETag, $mCategoryLinks;
var $mScripts, $mLinkColours;
-
+
var $mSuppressQuickbar;
var $mOnloadHandler;
var $mDoNothing;
var $mParserOptions;
var $mShowFeedLinks = false;
var $mEnableClientCache = true;
+ var $mArticleBodyOnly = false;
/**
* Constructor
$this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
$this->mSquidMaxage = 0;
$this->mScripts = '';
+ $this->mETag = false;
+ $this->mRevisionId = null;
}
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; }
-
+ function setStatusCode( $statusCode ) { $this->mStatusCode = $statusCode; }
+
# To add an http-equiv meta tag, precede the name with "http:"
function addMeta( $name, $val ) { array_push( $this->mMetatags, array( $name, $val ) ); }
function addKeyword( $text ) { array_push( $this->mKeywords, $text ); }
function addScript( $script ) { $this->mScripts .= $script; }
function getScript() { return $this->mScripts; }
+ function setETag($tag) { $this->mETag = $tag; }
+ function setArticleBodyOnly($only) { $this->mArticleBodyOnly = $only; }
+ function getArticleBodyOnly($only) { return $this->mArticleBodyOnly; }
+
function addLink( $linkarr ) {
# $linkarr should be an associative array of attributes. We'll escape on output.
array_push( $this->mLinktags, $linkarr );
*/
function checkLastModified ( $timestamp ) {
global $wgLang, $wgCachePages, $wgUser;
- $timestamp=wfTimestamp(TS_MW,$timestamp);
+ if ( !$timestamp || $timestamp == '19700101000000' ) {
+ wfDebug( "CACHE DISABLED, NO TIMESTAMP\n" );
+ return;
+ }
if( !$wgCachePages ) {
wfDebug( "CACHE DISABLED\n", false );
return;
return;
}
+ $timestamp=wfTimestamp(TS_MW,$timestamp);
$lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched ) );
if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
# Wed, 20 Aug 2003 06:51:19 GMT; length=5202
# this breaks strtotime().
$modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
- $ismodsince = wfTimestamp( TS_MW, strtotime( $modsince ) );
+ $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 );
if( ($ismodsince >= $timestamp ) && $wgUser->validateCache( $ismodsince ) ) {
$this->sendCacheControl();
wfDebug( "CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp\n", false );
$this->disable();
+ @ob_end_clean(); // Don't output compressed blob
return true;
} else {
wfDebug( "READY client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp\n", false );
$name .= ' - '.$taction;
}
}
- $this->setHTMLTitle( $name . ' - ' . wfMsg( 'wikititlesuffix' ) );
+
+ $this->setHTMLTitle( wfMsg( 'pagetitle', $name ) );
}
function getHTMLTitle() { return $this->mHTMLtitle; }
function getPageTitle() { return $this->mPagetitle; }
- function setSubtitle( $str ) { $this->mSubtitle = $str; }
+ function setSubtitle( $str ) { $this->mSubtitle = /*$this->parse(*/$str/*)*/; } // @bug 2514
function getSubtitle() { return $this->mSubtitle; }
function isArticle() { return $this->mIsarticle; }
function setPrintable() { $this->mPrintable = true; }
function addHTML( $text ) { $this->mBodytext .= $text; }
function clearHTML() { $this->mBodytext = ''; }
+ function getHTML() { return $this->mBodytext; }
function debug( $text ) { $this->mDebugtext .= $text; }
function setParserOptions( $options ) {
return wfSetVar( $this->mParserOptions, $options );
}
+
+ /**
+ * Set the revision ID which will be seen by the wiki text parser
+ * for things such as embedded {{REVISIONID}} variable use.
+ * @param mixed $revid an integer, or NULL
+ * @return mixed previous value
+ */
+ function setRevisionId( $revid ) {
+ $val = is_null( $revid ) ? null : intval( $revid );
+ return wfSetVar( $this->mRevisionId, $val );
+ }
/**
* Convert wikitext to HTML and add it to the buffer
+ * Default assumes that the current page title will
+ * be used.
*/
function addWikiText( $text, $linestart = true ) {
- global $wgParser, $wgTitle, $wgUseTidy;
+ global $wgTitle;
+ $this->addWikiTextTitle($text, $wgTitle, $linestart);
+ }
+
+ function addWikiTextWithTitle($text, &$title, $linestart = true) {
+ $this->addWikiTextTitle($text, $title, $linestart);
+ }
- $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
+ function addWikiTextTitle($text, &$title, $linestart) {
+ global $wgParser, $wgUseTidy;
+ $parserOutput = $wgParser->parse( $text, $title, $this->mParserOptions,
+ $linestart, true, $this->mRevisionId );
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->mCategoryLinks += $parserOutput->getCategoryLinks();
+ if ( $parserOutput->getCacheTime() == -1 ) {
+ $this->enableClientCache( false );
+ }
$this->addHTML( $parserOutput->getText() );
}
* Saves the text into the parser cache if possible
*/
function addPrimaryWikiText( $text, $cacheArticle ) {
- global $wgParser, $wgParserCache, $wgUser, $wgTitle, $wgUseTidy;
+ global $wgParser, $wgParserCache, $wgUser, $wgUseTidy;
- $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, true );
+ $parserOutput = $wgParser->parse( $text, $cacheArticle->mTitle,
+ $this->mParserOptions, true, true, $this->mRevisionId );
$text = $parserOutput->getText();
-
- if ( $cacheArticle ) {
+
+ if ( $cacheArticle && $parserOutput->getCacheTime() != -1 ) {
$wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
}
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->mCategoryLinks += $parserOutput->getCategoryLinks();
+ if ( $parserOutput->getCacheTime() == -1 ) {
+ $this->enableClientCache( false );
+ }
$this->addHTML( $text );
}
*/
function parse( $text, $linestart = true ) {
global $wgParser, $wgTitle;
- $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
+ $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions,
+ $linestart, true, $this->mRevision );
return $parserOutput->getText();
}
-
+
/**
* @param $article
* @param $user
+ *
+ * @return bool
*/
function tryParserCache( $article, $user ) {
global $wgParserCache;
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->mCategoryLinks += $parserOutput->getCategoryLinks();
$this->addHTML( $parserOutput->getText() );
+ $t = $parserOutput->getTitleText();
+ if( !empty( $t ) ) {
+ $this->setPageTitle( $t );
+ }
return true;
} else {
return false;
return wfSetVar( $this->mEnableClientCache, $state );
}
+ function uncacheableBecauseRequestvars() {
+ global $wgRequest;
+ return $wgRequest->getText('useskin', false) === false
+ && $wgRequest->getText('uselang', false) === false;
+ }
+
function sendCacheControl() {
global $wgUseSquid, $wgUseESI;
+
+ if ($this->mETag)
+ header("ETag: $this->mETag");
+
# don't serve compressed data to clients who can't handle it
# maintain different caches for logged-in users and non-logged in ones
header( 'Vary: Accept-Encoding, Cookie' );
- if( $this->mEnableClientCache ) {
+ if( !$this->uncacheableBecauseRequestvars() && $this->mEnableClientCache ) {
if( $wgUseSquid && ! isset( $_COOKIE[ini_get( 'session.name') ] ) &&
! $this->isPrintable() && $this->mSquidMaxage != 0 )
{
header( 'Location: '.$this->mRedirect );
}
if ( isset( $wgProfiler ) ) { wfDebug( $wgProfiler->getOutput() ); }
+ wfProfileOut( $fname );
return;
}
+ elseif ( $this->mStatusCode )
+ {
+ $statusMessage = array(
+ 100 => 'Continue',
+ 101 => 'Switching Protocols',
+ 102 => 'Processing',
+ 200 => 'OK',
+ 201 => 'Created',
+ 202 => 'Accepted',
+ 203 => 'Non-Authoritative Information',
+ 204 => 'No Content',
+ 205 => 'Reset Content',
+ 206 => 'Partial Content',
+ 207 => 'Multi-Status',
+ 300 => 'Multiple Choices',
+ 301 => 'Moved Permanently',
+ 302 => 'Found',
+ 303 => 'See Other',
+ 304 => 'Not Modified',
+ 305 => 'Use Proxy',
+ 307 => 'Temporary Redirect',
+ 400 => 'Bad Request',
+ 401 => 'Unauthorized',
+ 402 => 'Payment Required',
+ 403 => 'Forbidden',
+ 404 => 'Not Found',
+ 405 => 'Method Not Allowed',
+ 406 => 'Not Acceptable',
+ 407 => 'Proxy Authentication Required',
+ 408 => 'Request Timeout',
+ 409 => 'Conflict',
+ 410 => 'Gone',
+ 411 => 'Length Required',
+ 412 => 'Precondition Failed',
+ 413 => 'Request Entity Too Large',
+ 414 => 'Request-URI Too Large',
+ 415 => 'Unsupported Media Type',
+ 416 => 'Request Range Not Satisfiable',
+ 417 => 'Expectation Failed',
+ 422 => 'Unprocessable Entity',
+ 423 => 'Locked',
+ 424 => 'Failed Dependency',
+ 500 => 'Internal Server Error',
+ 501 => 'Not Implemented',
+ 502 => 'Bad Gateway',
+ 503 => 'Service Unavailable',
+ 504 => 'Gateway Timeout',
+ 505 => 'HTTP Version Not Supported',
+ 507 => 'Insufficient Storage'
+ );
+ if ( $statusMessage[$this->mStatusCode] )
+ header( 'HTTP/1.1 ' . $this->mStatusCode . ' ' . $statusMessage[$this->mStatusCode] );
+ }
# Buffer output; final headers may depend on later processing
ob_start();
$this->transformBuffer();
-
+
# Disable temporary placeholders, so that the skin produces HTML
$sk->postParseLinkColour( false );
setcookie( $name, $val, $exp, '/' );
}
- wfProfileIn( 'Output-skin' );
- $sk->outputPage( $this );
- wfProfileOut( 'Output-skin' );
-
+ if ($this->mArticleBodyOnly) {
+ $this->out($this->mBodytext);
+ } else {
+ wfProfileIn( 'Output-skin' );
+ $sk->outputPage( $this );
+ wfProfileOut( 'Output-skin' );
+ }
+
$this->sendCacheControl();
ob_end_flush();
+ wfProfileOut( $fname );
}
function out( $ins ) {
$wgOutputEncoding = strtolower( $wgOutputEncoding );
return;
}
-
- /*
- # This code is unused anyway!
- # Commenting out. --bv 2003-11-15
-
- $a = explode( ",", $_SERVER['HTTP_ACCEPT_CHARSET'] );
- $best = 0.0;
- $bestset = "*";
-
- foreach ( $a as $s ) {
- if ( preg_match( "/(.*);q=(.*)/", $s, $m ) ) {
- $set = $m[1];
- $q = (float)($m[2]);
- } else {
- $set = $s;
- $q = 1.0;
- }
- if ( $q > $best ) {
- $bestset = $set;
- $best = $q;
- }
- }
- #if ( "*" == $bestset ) { $bestset = "iso-8859-1"; }
- if ( "*" == $bestset ) { $bestset = $wgOutputEncoding; }
- $wgOutputEncoding = strtolower( $bestset );
-
-# Disable for now
-#
- */
$wgOutputEncoding = $wgInputEncoding;
}
/**
* Returns a HTML comment with the elapsed time since request.
* This method has no side effects.
+ * Use wfReportTime() instead.
+ * @return string
+ * @deprecated
*/
function reportTime() {
- global $wgRequestTime;
-
- $now = wfTime();
- list( $usec, $sec ) = explode( ' ', $wgRequestTime );
- $start = (float)$sec + (float)$usec;
- $elapsed = $now - $start;
-
- # Use real server name if available, so we know which machine
- # in a server farm generated the current page.
- if ( function_exists( 'posix_uname' ) ) {
- $uname = @posix_uname();
- } else {
- $uname = false;
- }
- if( is_array( $uname ) && isset( $uname['nodename'] ) ) {
- $hostname = $uname['nodename'];
- } else {
- # This may be a virtual server.
- $hostname = $_SERVER['SERVER_NAME'];
- }
- $com = sprintf( "<!-- Served by %s in %01.2f secs. -->",
- $hostname, $elapsed );
- return $com;
+ $time = wfReportTime();
+ return $time;
}
/**
$this->mRedirect = '';
$this->mBodytext = '';
- $this->addHTML( '<p>' . wfMsg( $msg ) . "</p>\n" );
+ $this->addWikiText( wfMsg( $msg ) );
$this->returnToMain( false );
$this->output();
wfErrorExit();
}
+ /**
+ * Display an error page indicating that a given version of MediaWiki is
+ * required to use it
+ *
+ * @param mixed $version The version of MediaWiki needed to use the page
+ */
+ function versionRequired( $version ) {
+ global $wgUser;
+
+ $this->setPageTitle( wfMsg( 'versionrequired', $version ) );
+ $this->setHTMLTitle( wfMsg( 'versionrequired', $version ) );
+ $this->setRobotpolicy( 'noindex,nofollow' );
+ $this->setArticleRelated( false );
+ $this->mBodytext = '';
+
+ $sk = $wgUser->getSkin();
+ $this->addWikiText( wfMsg( 'versionrequiredtext', $version ) );
+ $this->returnToMain();
+ }
+
+ /**
+ * Display an error page noting that a given permission bit is required.
+ * This should generally replace the sysopRequired, developerRequired etc.
+ * @param string $permission key required
+ */
+ function permissionRequired( $permission ) {
+ global $wgUser;
+
+ $this->setPageTitle( wfMsg( 'badaccess' ) );
+ $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) );
+ $this->setRobotpolicy( 'noindex,nofollow' );
+ $this->setArticleRelated( false );
+ $this->mBodytext = '';
+
+ $sk = $wgUser->getSkin();
+ $ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ) );
+ $this->addHTML( wfMsgHtml( 'badaccesstext', $ap, $permission ) );
+ $this->returnToMain();
+ }
+
+ /**
+ * @deprecated
+ */
function sysopRequired() {
global $wgUser;
$sk = $wgUser->getSkin();
$ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' );
- $this->addHTML( wfMsg( 'sysoptext', $ap ) );
+ $this->addHTML( wfMsgHtml( 'sysoptext', $ap ) );
$this->returnToMain();
}
+ /**
+ * @deprecated
+ */
function developerRequired() {
global $wgUser;
$sk = $wgUser->getSkin();
$ap = $sk->makeKnownLink( wfMsgForContent( 'administrators' ), '' );
- $this->addHTML( wfMsg( 'developertext', $ap ) );
+ $this->addHTML( wfMsgHtml( 'developertext', $ap ) );
$this->returnToMain();
}
$this->setRobotpolicy( 'noindex,nofollow' );
$this->setArticleFlag( false );
$this->mBodytext = '';
- $this->addWikiText( wfMsg( 'loginreqtext' ) );
+ $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->enableClientCache( false );
$this->mRedirect = '';
- if( $wgShowSQLErrors ) {
- if ( $wgCommandLineMode ) {
- $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
- htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
- } else {
- $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
- htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
- }
+ if( !$wgShowSQLErrors ) {
+ $sql = wfMsg( 'sqlhidden' );
+ }
+
+ if ( $wgCommandLineMode ) {
+ $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
+ htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
} else {
- if( $wgCommandLineMode ) {
- $msg = wfMsg( 'internalerror' );
- } else {
- $msg = htmlspecialchars( wfMsg( 'internalerror' ) );
- }
+ $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
+ htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
}
if ( $wgCommandLineMode || !is_object( $wgUser )) {
}
function readOnlyPage( $source = null, $protected = false ) {
- global $wgUser, $wgReadOnlyFile;
+ global $wgUser, $wgReadOnlyFile, $wgReadOnly;
$this->setRobotpolicy( 'noindex,nofollow' );
$this->setArticleRelated( false );
$this->addWikiText( wfMsg( 'protectedtext' ) );
} else {
$this->setPageTitle( wfMsg( 'readonly' ) );
- $reason = file_get_contents( $wgReadOnlyFile );
+ if ( $wgReadOnly ) {
+ $reason = $wgReadOnly;
+ } else {
+ $reason = file_get_contents( $wgReadOnlyFile );
+ }
$this->addWikiText( wfMsg( 'readonlytext', $reason ) );
}
if( is_string( $source ) ) {
if( strcmp( $source, '' ) == 0 ) {
- $source = wfMsg( 'noarticletext' );
+ $source = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
}
$rows = $wgUser->getOption( 'rows' );
$cols = $wgUser->getOption( 'cols' );
}
/**
- * This function takes the existing and broken links for the page
+ * This function takes the title (first item of mGoodLinks), categories, existing and broken links for the page
* and uses the first 10 of them for META keywords
*/
function addMetaTags () {
global $wgLinkCache , $wgOut ;
+ $categories = array_keys ( $wgLinkCache->mCategoryLinks ) ;
$good = array_keys ( $wgLinkCache->mGoodLinks ) ;
$bad = array_keys ( $wgLinkCache->mBadLinks ) ;
- $a = array_merge ( $good , $bad ) ;
+ $a = array_merge ( array_slice ( $good , 0 , 1 ), $categories, array_slice ( $good , 1 , 9 ) , $bad ) ;
$a = array_slice ( $a , 0 , 10 ) ; # 10 keywords max
$a = implode ( ',' , $a ) ;
$strip = array(
- "/<.*?" . ">/" => '',
- "/[_]/" => ' '
+ "/<.*?>/" => '',
+ "/_/" => ' '
);
$a = htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),$a ));
/**
* @private
+ * @return string
*/
function headElement() {
global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType;
- global $wgUser, $wgContLang, $wgRequest;
+ global $wgUser, $wgContLang, $wgRequest, $wgUseTrackbacks, $wgTitle;
if( $wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml' ) {
- $ret = "<" . "?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
+ $ret = "<?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?>\n";
} else {
$ret = '';
}
$ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n \"$wgDTD\">\n";
- if ( "" == $this->mHTMLtitle ) {
- $this->mHTMLtitle = wfMsg( "pagetitle", $this->mPagetitle );
+ if ( '' == $this->getHTMLTitle() ) {
+ $this->setHTMLTitle( wfMsg( 'pagetitle', $this->getPageTitle() ));
}
$rtl = $wgContLang->isRTL() ? " dir='RTL'" : '';
$ret .= "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n";
- $ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
+ $ret .= "<head>\n<title>" . htmlspecialchars( $this->getHTMLTitle() ) . "</title>\n";
array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
$ret .= $this->getHeadLinks();
$ret .= $this->mScripts;
$ret .= $sk->getUserStyles();
+ if ($wgUseTrackbacks && $this->isArticleRelated())
+ $ret .= $wgTitle->trackbackRDF();
+
$ret .= "</head>\n";
return $ret;
}
if ( count( $this->mKeywords ) > 0 ) {
$strip = array(
- "/<.*?" . ">/" => '',
- "/[_]/" => ' '
+ "/<.*?>/" => '',
+ "/_/" => ' '
);
$ret .= "<meta name=\"keywords\" content=\"" .
htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),implode( ",", $this->mKeywords ))) . "\" />\n";
$link = $wgRequest->escapeAppendQuery( 'feed=rss' );
$ret .= "<link rel='alternate' type='application/rss+xml' title='RSS 2.0' href='$link' />\n";
$link = $wgRequest->escapeAppendQuery( 'feed=atom' );
- $ret .= "<link rel='alternate' type='application/rss+atom' title='Atom 0.3' href='$link' />\n";
+ $ret .= "<link rel='alternate' type='application/atom+xml' title='Atom 0.3' href='$link' />\n";
}
return $ret;
}
-
+
/**
* Run any necessary pre-output transformations on the buffer text
*/
}
-}
+ /**
+ * Turn off regular page output and return an error reponse
+ * for when rate limiting has triggered.
+ * @todo i18n
+ * @access public
+ */
+ function rateLimited() {
+ global $wgOut;
+ $wgOut->disable();
+ wfHttpError( 500, 'Internal Server Error',
+ 'Sorry, the server has encountered an internal error. ' .
+ 'Please wait a moment and hit "refresh" to submit the request again.' );
+ }
}
+} // MediaWiki
+
?>
dépôts / lhc / web / wiklou.git / blobdiff