<?php
/**
- * @version $Id$
* @package MediaWiki
*/
if($wgUseTeX) require_once( 'Math.php' );
-define( 'RLH_FOR_UPDATE', 1 );
-
/**
* @todo document
* @package MediaWiki
*/
function checkLastModified ( $timestamp ) {
global $wgLang, $wgCachePages, $wgUser;
- $timestamp=wfTimestamp(TS_MW,$timestamp);
- if( !$wgCachePages ) {
- wfDebug( "CACHE DISABLED\n", false );
+ if ( !$timestamp || $timestamp == '19700101000000' ) {
+ wfDebug( "CACHE DISABLED, NO TIMESTAMP\n" );
return;
}
- if( preg_match( '/MSIE ([1-4]|5\.0)/', $_SERVER["HTTP_USER_AGENT"] ) ) {
- # IE 5.0 has probs with our caching
- wfDebug( "-- bad client, not caching\n", false );
+ if( !$wgCachePages ) {
+ wfDebug( "CACHE DISABLED\n", false );
return;
}
if( $wgUser->getOption( 'nocache' ) ) {
return;
}
- $lastmod = gmdate( 'D, j M Y H:i:s', wfTimestamp(TS_UNIX, max( $timestamp, $wgUser->mTouched ) ) ) . ' GMT';
+ $timestamp=wfTimestamp(TS_MW,$timestamp);
+ $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched ) );
if( !empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
# IE sends sizes after the date like this:
$ismodsince = wfTimestamp( TS_MW, strtotime( $modsince ) );
wfDebug( "-- client send If-Modified-Since: " . $modsince . "\n", false );
wfDebug( "-- we might send Last-Modified : $lastmod\n", false );
- if( ($ismodsince >= $timestamp ) and $wgUser->validateCache( $ismodsince ) ) {
+ if( ($ismodsince >= $timestamp ) && $wgUser->validateCache( $ismodsince ) ) {
# 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->mLastModified = $lastmod;
}
} else {
- wfDebug( "We're confused.\n", false );
+ wfDebug( "client did not send If-Modified-Since header\n", false );
$this->mLastModified = $lastmod;
}
}
function setRobotpolicy( $str ) { $this->mRobotpolicy = $str; }
function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; }
function setPageTitle( $name ) {
- global $action;
+ global $action, $wgContLang;
+ $name = $wgContLang->convert($name, true);
$this->mPagetitle = $name;
if(!empty($action)) {
$taction = $this->getPageTitleActionText();
* Convert wikitext to HTML and add it to the buffer
*/
function addWikiText( $text, $linestart = true ) {
- global $wgParser, $wgTitle;
+ global $wgParser, $wgTitle, $wgUseTidy;
$parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
* 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 );
- $parserOutput->setText( $text );
if ( $cacheArticle ) {
$wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
$this->addHTML( $text );
}
+ /**
+ * Add the output of a QuickTemplate to the output buffer
+ * @param QuickTemplate $template
+ */
+ function addTemplate( &$template ) {
+ ob_start();
+ $template->execute();
+ $this->addHtml( ob_get_contents() );
+ ob_end_clean();
+ }
+
+ /**
+ * Parse wikitext and return the HTML. This is for special pages that add the text later
+ */
+ function parse( $text, $linestart = true ) {
+ global $wgParser, $wgTitle;
+ $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
+ return $parserOutput->getText();
+ }
+
/**
* @param $article
* @param $user
function sendCacheControl() {
global $wgUseSquid, $wgUseESI;
- # FIXME: This header may cause trouble with some versions of Internet Explorer
+ # 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( $wgUseSquid && ! isset( $_COOKIE[ini_get( 'session.name') ] ) &&
global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
global $wgInputEncoding, $wgOutputEncoding, $wgContLanguageCode;
global $wgDebugRedirects, $wgMimeType, $wgProfiler;
+
if( $this->mDoNothing ){
return;
}
$fname = 'OutputPage::output';
wfProfileIn( $fname );
-
$sk = $wgUser->getSkin();
if ( '' != $this->mRedirect ) {
if( !$wgDebugRedirects ) {
header("HTTP/1.1 {$this->mRedirectCode} Moved Permanently");
}
- $this->mLastModified = gmdate( 'D, j M Y H:i:s' ) . ' GMT';
+ $this->mLastModified = wfTimestamp( TS_RFC2822 );
}
$this->sendCacheControl();
}
- $this->sendCacheControl();
- # Perform link colouring
+ # Buffer output; final headers may depend on later processing
+ ob_start();
+
$this->transformBuffer();
- $this->replaceLinkHolders( $this->mSubtitle );
# Disable temporary placeholders, so that the skin produces HTML
$sk->postParseLinkColour( false );
setcookie( $name, $val, $exp, '/' );
}
+ wfProfileIn( 'Output-skin' );
$sk->outputPage( $this );
- # flush();
+ wfProfileOut( 'Output-skin' );
+
+ $this->sendCacheControl();
+ ob_end_flush();
}
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.
}
function databaseError( $fname, $sql, $error, $errno ) {
- global $wgUser, $wgCommandLineMode;
+ global $wgUser, $wgCommandLineMode, $wgShowSQLErrors;
$this->setPageTitle( wfMsgNoDB( 'databaseerror' ) );
$this->setRobotpolicy( 'noindex,nofollow' );
$this->enableClientCache( false );
$this->mRedirect = '';
- if ( $wgCommandLineMode ) {
- $msg = wfMsgNoDB( 'dberrortextcl', htmlspecialchars( $sql ),
- htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
+ 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 ) );
+ }
} else {
- $msg = wfMsgNoDB( 'dberrortext', htmlspecialchars( $sql ),
- htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
+ if( $wgCommandLineMode ) {
+ $msg = wfMsg( 'internalerror' );
+ } else {
+ $msg = htmlspecialchars( wfMsg( 'internalerror' ) );
+ }
}
if ( $wgCommandLineMode || !is_object( $wgUser )) {
if ( $returnto == NULL ) {
$returnto = $wgRequest->getText( 'returnto' );
}
+ $returnto = htmlspecialchars( $returnto );
$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 ) {
+ if( $wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml' ) {
$ret = "<" . "?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
} else {
$ret = '';
if ( "" == $this->mHTMLtitle ) {
$this->mHTMLtitle = wfMsg( "pagetitle", $this->mPagetitle );
}
- if( $xml ) {
- $xmlbits = "xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"";
- } else {
- $xmlbits = '';
- }
- $rtl = $wgLang->isRTL() ? " dir='RTL'" : '';
- $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
+
+ $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";
array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
$link = $wgRequest->escapeAppendQuery( 'feed=atom' );
$ret .= "<link rel='alternate' type='application/rss+atom' title='Atom 0.3' href='$link' />\n";
}
- # FIXME: get these working
- # $fix = htmlspecialchars( $wgStylePath . "/ie-png-fix.js" );
- # $ret .= "<!--[if gte IE 5.5000]><script type='text/javascript' src='$fix'>< /script><![endif]-->";
+
return $ret;
}
* Run any necessary pre-output transformations on the buffer text
*/
function transformBuffer( $options = 0 ) {
- $this->replaceLinkHolders( $this->mBodytext, $options );
}
- /**
- * Replace <!--LINK--> link placeholders with actual links, in the buffer
- * Placeholders created in Skin::makeLinkObj()
- * Returns an array of links found, indexed by PDBK:
- * 0 - broken
- * 1 - normal link
- * 2 - stub
- * $options is a bit field, RLH_FOR_UPDATE to select for update
- */
- function replaceLinkHolders( &$text, $options = 0 ) {
- global $wgUser, $wgLinkCache, $wgUseOldExistenceCheck, $wgLinkHolders;
-
- if ( $wgUseOldExistenceCheck ) {
- return array();
- }
-
- $fname = 'OutputPage::replaceLinkHolders';
- wfProfileIn( $fname );
-
- $pdbks = array();
- $colours = array();
-
- #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');
-
- # Sort by namespace
- asort( $wgLinkHolders['namespaces'] );
-
- # Generate query
- $query = false;
- foreach ( $wgLinkHolders['namespaces'] as $key => $val ) {
- # Make title object
- $title = $wgLinkHolders['titles'][$key];
-
- # Skip invalid entries.
- # Result will be ugly, but prevents crash.
- if ( is_null( $title ) ) {
- continue;
- }
- $pdbk = $pdbks[$key] = $title->getPrefixedDBkey();
-
- # Check if it's in the link cache already
- if ( $wgLinkCache->getGoodLinkID( $pdbk ) ) {
- $colours[$pdbk] = 1;
- } elseif ( $wgLinkCache->isBadLink( $pdbk ) ) {
- $colours[$pdbk] = 0;
- } else {
- # Not in the link cache, add it to the query
- if ( !isset( $current ) ) {
- $current = $val;
- $query = "SELECT cur_id, cur_namespace, cur_title";
- if ( $threshold > 0 ) {
- $query .= ", LENGTH(cur_text) AS cur_len, cur_is_redirect";
- }
- $query .= " FROM $cur WHERE (cur_namespace=$val AND cur_title IN(";
- } elseif ( $current != $val ) {
- $current = $val;
- $query .= ")) OR (cur_namespace=$val AND cur_title IN(";
- } else {
- $query .= ', ';
- }
-
- $query .= $dbr->addQuotes( $wgLinkHolders['dbkeys'][$key] );
- }
- }
- if ( $query ) {
- $query .= '))';
- if ( $options & RLH_FOR_UPDATE ) {
- $query .= ' FOR UPDATE';
- }
-
- $res = $dbr->query( $query, $fname );
-
- # Fetch data and form into an associative array
- # non-existent = broken
- # 1 = known
- # 2 = stub
- while ( $s = $dbr->fetchObject($res) ) {
- $title = Title::makeTitle( $s->cur_namespace, $s->cur_title );
- $pdbk = $title->getPrefixedDBkey();
- $wgLinkCache->addGoodLink( $s->cur_id, $pdbk );
-
- if ( $threshold > 0 ) {
- $size = $s->cur_len;
- if ( $s->cur_is_redirect || $s->cur_namespace != 0 || $length < $threshold ) {
- $colours[$pdbk] = 1;
- } else {
- $colours[$pdbk] = 2;
- }
- } else {
- $colours[$pdbk] = 1;
- }
- }
- }
- wfProfileOut( $fname.'-check' );
-
- # Construct search and replace arrays
- wfProfileIn( $fname.'-construct' );
- global $outputReplace;
- $outputReplace = array();
- foreach ( $wgLinkHolders['namespaces'] as $key => $ns ) {
- $pdbk = $pdbks[$key];
- $searchkey = '<!--LINK '.$key.'-->';
- $title = $wgLinkHolders['titles'][$key];
- if ( empty( $colours[$pdbk] ) ) {
- $wgLinkCache->addBadLink( $pdbk );
- $colours[$pdbk] = 0;
- $outputReplace[$searchkey] = $sk->makeBrokenLinkObj( $title,
- $wgLinkHolders['texts'][$key],
- $wgLinkHolders['queries'][$key] );
- } elseif ( $colours[$pdbk] == 1 ) {
- $outputReplace[$searchkey] = $sk->makeKnownLinkObj( $title,
- $wgLinkHolders['texts'][$key],
- $wgLinkHolders['queries'][$key] );
- } elseif ( $colours[$pdbk] == 2 ) {
- $outputReplace[$searchkey] = $sk->makeStubLinkObj( $title,
- $wgLinkHolders['texts'][$key],
- $wgLinkHolders['queries'][$key] );
- }
- }
- wfProfileOut( $fname.'-construct' );
- # Do the thing
- wfProfileIn( $fname.'-replace' );
-
- $text = preg_replace_callback(
- '/(<!--LINK .*?-->)/',
- "outputReplaceMatches",
- $text);
- wfProfileOut( $fname.'-replace' );
- }
- wfProfileOut( $fname );
- return $colours;
- }
}
-function &outputReplaceMatches($matches) {
- global $outputReplace;
- return $outputReplace[$matches[1]];
}
-}
?>
dépôts / lhc / web / wiklou.git / blobdiff