<?php
# See design.doc
-if($wgUseTeX) include_once( "Math.php" );
+if($wgUseTeX) require_once( "Math.php" );
class OutputPage {
var $mHeaders, $mCookies, $mMetatags, $mKeywords;
var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable;
- var $mSubtitle, $mRedirect, $mHeadtext;
+ var $mSubtitle, $mRedirect;
var $mLastModified, $mCategoryLinks;
+ var $mScripts;
var $mSuppressQuickbar;
var $mOnloadHandler;
$this->mContainsOldMagic = $this->mContainsNewMagic = 0;
$this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
$this->mSquidMaxage = 0;
+ $this->mScripts = "";
}
function addHeader( $name, $val ) { array_push( $this->mHeaders, "$name: $val" ) ; }
# 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 addLink( $rel, $rev, $target, $type="", $media="" ) { array_push( $this->mLinktags, array( $rel, $rev, $target, $type, $media ) ); }
+ function addScript( $script ) { $this->mScripts .= $script; }
+ function getScript() { return $this->mScripts; }
+
+ function addLink( $linkarr ) {
+ # $linkarr should be an associative array of attributes. We'll escape on output.
+ array_push( $this->mLinktags, $linkarr );
+ }
+
+ function addMetadataLink( $linkarr ) {
+ # note: buggy CC software only reads first "meta" link
+ static $haveMeta = false;
+ $linkarr["rel"] = ($haveMeta) ? "alternate meta" : "meta";
+ $this->addLink( $linkarr );
+ $haveMeta = true;
+ }
# checkLastModified tells the client to use the client-cached page if
# possible. If sucessful, the OutputPage is disabled so that
return;
}
- $lastmod = gmdate( "D, j M Y H:i:s", wfTimestamp2Unix(
- max( $timestamp, $wgUser->mTouched ) ) ) . " GMT";
+ $lastmod = gmdate( "D, j M Y H:i:s", wfTimestamp2Unix( max( $timestamp, $wgUser->mTouched ) ) ) . " GMT";
- if( !empty( $_SERVER["HTTP_IF_MODIFIED_SINCE"] ) ) {
+ if( !empty( $_SERVER["HTTP_IF_MODIFIED_SINCE"] ) ) {
# IE sends sizes after the date like this:
# Wed, 20 Aug 2003 06:51:19 GMT; length=5202
# this breaks strtotime().
$ismodsince = wfUnix2Timestamp( 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 ) ) {
# Make sure you're in a place you can leave when you call us!
header( "HTTP/1.0 304 Not Modified" );
}
}
+ function getPageTitleActionText () {
+ global $action;
+ switch($action) {
+ case 'edit':
+ return wfMsg('edit');
+ case 'history':
+ return wfMsg('history_short');
+ case 'protect':
+ return wfMsg('unprotect');
+ case 'unprotect':
+ return wfMsg('unprotect');
+ case 'delete':
+ return wfMsg('delete');
+ case 'watch':
+ return wfMsg('watch');
+ case 'unwatch':
+ return wfMsg('unwatch');
+ case 'submit':
+ return wfMsg('preview');
+ default:
+ return '';
+ }
+ }
function setRobotpolicy( $str ) { $this->mRobotpolicy = $str; }
- function setHTMLtitle( $name ) { $this->mHTMLtitle = $name; }
- function setPageTitle( $name ) { $this->mPagetitle = $name; }
+ function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; }
+ function setPageTitle( $name ) {
+ global $action;
+ $this->mPagetitle = $name;
+ if(!empty($action)) {
+ $taction = $this->getPageTitleActionText();
+ if( !empty( $taction ) ) {
+ $name .= " - $taction";
+ }
+ }
+ $this->setHTMLTitle( $name . " - " . wfMsg( "wikititlesuffix" ) );
+ }
+ function getHTMLTitle() { return $this->mHTMLtitle; }
function getPageTitle() { return $this->mPagetitle; }
function setSubtitle( $str ) { $this->mSubtitle = $str; }
function getSubtitle() { return $this->mSubtitle; }
}
function getLanguageLinks() {
- global $wgTitle, $wgLanguageCode;
- global $wgDBconnection, $wgDBname;
return $this->mLanguageLinks;
}
+ function addLanguageLinks($newLinkArray) {
+ $this->mLanguageLinks += $newLinkArray;
+ }
+ function setLanguageLinks($newLinkArray) {
+ $this->mLanguageLinks = $newLinkArray;
+ }
function suppressQuickbar() { $this->mSuppressQuickbar = true; }
function isQuickbarSuppressed() { return $this->mSuppressQuickbar; }
function addHTML( $text ) { $this->mBodytext .= $text; }
- function addHeadtext( $text ) { $this->mHeadtext .= $text; }
function debug( $text ) { $this->mDebugtext .= $text; }
function setParserOptions( $options )
function addWikiText( $text, $linestart = true, $cacheArticle = NULL )
{
global $wgParser, $wgParserCache, $wgUser, $wgTitle;
-
- $parserOutput = false;
+
+ $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
if ( $cacheArticle ) {
- $parserOutput = $wgParserCache->get( $cacheArticle, $wgUser );
- }
-
- if ( $parserOutput === false ) {
- $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
- if ( $cacheArticle ) {
- $wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
- }
+ $wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
}
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->mCategoryLinks += $parserOutput->getCategoryLinks();
-
$this->addHTML( $parserOutput->getText() );
-
}
+ function tryParserCache( $article, $user ) {
+ global $wgParserCache;
+ $parserOutput = $wgParserCache->get( $article, $user );
+ if ( $parserOutput !== false ) {
+ $this->mLanguageLinks += $parserOutput->getLanguageLinks();
+ $this->mCategoryLinks += $parserOutput->getCategoryLinks();
+ $this->addHTML( $parserOutput->getText() );
+ return true;
+ } else {
+ return false;
+ }
+ }
+
# Set the maximum cache time on the Squid in seconds
function setSquidMaxage( $maxage ) {
$this->mSquidMaxage = $maxage;
global $wgUseSquid, $wgUseESI;
# FIXME: This header may cause trouble with some versions of Internet Explorer
header( "Vary: Accept-Encoding, Cookie" );
- if( $this->mEnableClientCache && $this->mLastModified != "" ) {
+ if( $this->mEnableClientCache ) {
if( $wgUseSquid && ! isset( $_COOKIE[ini_get( "session.name") ] ) &&
- ! $this->isPrintable() )
+ ! $this->isPrintable() && $this->mSquidMaxage != 0 )
{
if ( $wgUseESI ) {
# We'll purge the proxy cache explicitly, but require end user agents
header( "Expires: -1" );
header( "Cache-Control: private, must-revalidate, max-age=0" );
}
- header( "Last-modified: {$this->mLastModified}" );
+ if($this->mLastModified) header( "Last-modified: {$this->mLastModified}" );
} else {
wfDebug( "** no caching **\n", false );
{
global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
global $wgInputEncoding, $wgOutputEncoding, $wgLanguageCode;
- global $wgDebugRedirects;
+ global $wgDebugRedirects, $wgMimeType;
if( $this->mDoNothing ){
return;
}
$this->sendCacheControl();
- header( "Content-type: text/html; charset={$wgOutputEncoding}" );
+ header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
header( "Content-language: {$wgLanguageCode}" );
$exp = time() + $wgCookieExpiration;
list( $usec, $sec ) = explode( " ", $wgRequestTime );
$start = (float)$sec + (float)$usec;
$elapsed = $now - $start;
- $com = sprintf( "<!-- Time since request: %01.2f secs. -->",
- $elapsed );
+
+ # 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;
}
$this->mDebugtext .= "Original title: " .
$wgTitle->getPrefixedText() . "\n";
- $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setPageTitle( wfMsg( $title ) );
+ $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setRobotpolicy( "noindex,nofollow" );
$this->setArticleRelated( false );
$this->enableClientCache( false );
$this->mBodytext = "";
- $this->addHTML( "<p>" . wfMsg( $msg ) . "\n" );
+ $this->addHTML( "<p>" . wfMsg( $msg ) . "</p>\n" );
$this->returnToMain( false );
$this->output();
{
global $wgUser;
- $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setPageTitle( wfMsg( "sysoptitle" ) );
+ $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setRobotpolicy( "noindex,nofollow" );
$this->setArticleRelated( false );
$this->mBodytext = "";
{
global $wgUser;
- $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setPageTitle( wfMsg( "developertitle" ) );
+ $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setRobotpolicy( "noindex,nofollow" );
$this->setArticleRelated( false );
$this->mBodytext = "";
{
global $wgUser, $wgTitle, $wgLang;
- $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setPageTitle( wfMsg( "loginreqtitle" ) );
+ $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
$this->setRobotpolicy( "noindex,nofollow" );
$this->setArticleFlag( false );
$this->mBodytext = "";
$this->returnToMain(); # Flip back to the main page after 10 seconds.
}
- function databaseError( $fname, &$conn )
+ function databaseError( $fname, $sql, $error, $errno )
{
global $wgUser, $wgCommandLineMode;
$msg = wfMsgNoDB( "dberrortext" );
}
- $msg = str_replace( "$1", htmlspecialchars( $conn->lastQuery() ), $msg );
+ $msg = str_replace( "$1", htmlspecialchars( $sql ), $msg );
$msg = str_replace( "$2", htmlspecialchars( $fname ), $msg );
- $msg = str_replace( "$3", $conn->lastErrno(), $msg );
- $msg = str_replace( "$4", htmlspecialchars( $conn->lastError() ), $msg );
+ $msg = str_replace( "$3", $errno, $msg );
+ $msg = str_replace( "$4", htmlspecialchars( $error ), $msg );
if ( $wgCommandLineMode || !is_object( $wgUser )) {
print "$msg\n";
wfAbruptExit();
}
- function readOnlyPage( $source = "", $protected = false )
+ function readOnlyPage( $source = null, $protected = false )
{
global $wgUser, $wgReadOnlyFile;
} else {
$this->setPageTitle( wfMsg( "readonly" ) );
$reason = file_get_contents( $wgReadOnlyFile );
- $this->addHTML( wfMsg( "readonlytext", $reason ) );
+ $this->addWikiText( wfMsg( "readonlytext", $reason ) );
}
- if($source) {
+ if( is_string( $source ) ) {
+ if( strcmp( $source, "" ) == 0 ) {
+ $source = wfMsg( "noarticletext" );
+ }
$rows = $wgUser->getOption( "rows" );
$cols = $wgUser->getOption( "cols" );
- $text .= "</p>\n<textarea cols='$cols' rows='$rows' readonly>" .
+ $text = "\n<textarea cols='$cols' rows='$rows' readonly='readonly'>" .
htmlspecialchars( $source ) . "\n</textarea>";
$this->addHTML( $text );
}
$this->fatalError( wfMsg( "filenotfound", $name ) );
}
+ // return from error messages or notes
+ // auto: automatically redirect the user after 10 seconds
+ // returnto: page title to return to. Default is Main Page.
function returnToMain( $auto = true, $returnto = NULL )
{
global $wgUser, $wgOut, $wgRequest;
$titleObj = Title::newFromText( $returnto );
$wgOut->addMeta( "http:Refresh", "10;url=" . $titleObj->escapeFullURL() );
}
- $wgOut->addHTML( "\n<p>$r\n" );
+ $wgOut->addHTML( "\n<p>$r</p>\n" );
}
# This function takes the existing and broken links for the page
$a = array_merge ( $good , $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 ));
+
$wgOut->addMeta ( "KEYWORDS" , $a ) ;
}
/* private */ function headElement()
{
- global $wgDocType, $wgDTD, $wgUser, $wgLanguageCode, $wgOutputEncoding, $wgLang, $wgRequest;
+ global $wgDocType, $wgDTD, $wgLanguageCode, $wgOutputEncoding, $wgMimeType;
+ global $wgUser, $wgLang, $wgRequest;
- $ret = "<!DOCTYPE HTML PUBLIC \"$wgDocType\"\n \"$wgDTD\">\n";
+ $xml = ($wgMimeType == 'text/xml');
+ if( $xml ) {
+ $ret = "<" . "?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
+ } else {
+ $ret = "";
+ }
+
+ $ret .= "<!DOCTYPE html PUBLIC \"$wgDocType\"\n \"$wgDTD\">\n";
if ( "" == $this->mHTMLtitle ) {
- $this->mHTMLtitle = $this->mPagetitle;
+ $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 lang=\"$wgLanguageCode\"$rtl><head><title>{$this->mHTMLtitle}</title>\n";
- array_push( $this->mMetatags, array( "http:Content-type", "text/html; charset={$wgOutputEncoding}" ) );
+ $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
+ $ret .= "<head>\n<title>" . htmlspecialchars( $this->mHTMLtitle ) . "</title>\n";
+ array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
+
+ $ret .= $this->getHeadLinks();
+ global $wgStylePath;
+ if( $this->isPrintable() ) {
+ $media = "";
+ } else {
+ $media = "media='print'";
+ }
+ $printsheet = htmlspecialchars( "$wgStylePath/wikiprintable.css" );
+ $ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet' />\n";
+
+ $sk = $wgUser->getSkin();
+ $ret .= $sk->getHeadScripts();
+ $ret .= $this->mScripts;
+ $ret .= $sk->getUserStyles();
+
+ $ret .= "</head>\n";
+ return $ret;
+ }
+
+ function getHeadLinks() {
+ global $wgRequest, $wgStylePath;
+ $ret = "";
foreach ( $this->mMetatags as $tag ) {
if ( 0 == strcasecmp( "http:", substr( $tag[0], 0, 5 ) ) ) {
$a = "http-equiv";
} else {
$a = "name";
}
- $ret .= "<meta $a=\"{$tag[0]}\" content=\"{$tag[1]}\">\n";
+ $ret .= "<meta $a=\"{$tag[0]}\" content=\"{$tag[1]}\" />\n";
}
$p = $this->mRobotpolicy;
if ( "" == $p ) { $p = "index,follow"; }
- $ret .= "<meta name=\"robots\" content=\"$p\">\n";
+ $ret .= "<meta name=\"robots\" content=\"$p\" />\n";
if ( count( $this->mKeywords ) > 0 ) {
+ $strip = array(
+ "/<.*?>/" => '',
+ "/[_]/" => ' '
+ );
$ret .= "<meta name=\"keywords\" content=\"" .
- implode( ",", $this->mKeywords ) . "\">\n";
+ htmlspecialchars(preg_replace(array_keys($strip), array_values($strip),implode( ",", $this->mKeywords ))) . "\" />\n";
}
foreach ( $this->mLinktags as $tag ) {
- $ret .= "<link ";
- if ( "" != $tag[0] ) { $ret .= "rel=\"{$tag[0]}\" "; }
- if ( "" != $tag[1] ) { $ret .= "rev=\"{$tag[1]}\" "; }
- if ( !empty( $tag[3] ) ) { $ret .= "type=\"{$tag[3]}\" "; }
- if ( !empty( $tag[4] ) ) { $ret .= "media=\"{$tag[4]}\" "; }
- $ret .= "href=\"{$tag[2]}\">\n";
+ $ret .= "<link";
+ foreach( $tag as $attr => $val ) {
+ $ret .= " $attr=\"" . htmlspecialchars( $val ) . "\"";
+ }
+ $ret .= " />\n";
}
if( $this->isSyndicated() ) {
+ # FIXME: centralize the mime-type and name information in Feed.php
$link = $wgRequest->escapeAppendQuery( "feed=rss" );
- $ret .= "<link rel='alternate' type='application/rss+xml' title='RSS' href='$link'>\n";
+ $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";
}
- global $wgStyleSheetPath;
- if( $this->isPrintable() ) {
- $media = "";
- } else {
- $media = "media='print'";
- }
- $printsheet = htmlspecialchars( "$wgStyleSheetPath/wikiprintable.css" );
- $ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet'>\n";
-
- $sk = $wgUser->getSkin();
- $ret .= $sk->getHeadScripts();
- $ret .= $sk->getUserStyles();
-
- $ret .= "</head>\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;
}
}
dépôts / lhc / web / wiklou.git / blobdiff