* Add more profiling granularity to replaceLinkHolders
[lhc/web/wiklou.git] / includes / OutputPage.php
index 4c11403..36c522c 100644 (file)
@@ -1,31 +1,38 @@
 <?php
+
+# This is not a valid entry point, perform no further processing unless MEDIAWIKI is defined
+if( defined( "MEDIAWIKI" ) ) {
+
 # See design.doc
 
-if($wgUseTeX) include_once( "Math.php" );
+if($wgUseTeX) require_once( "Math.php" );
+
+define( 'RLH_FOR_UPDATE', 1 );
 
 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, $mLinkColours;
+       
        var $mSuppressQuickbar;
        var $mOnloadHandler;
        var $mDoNothing;
-       var $mContainsOldMagic, $mContainsNewMagic; 
+       var $mContainsOldMagic, $mContainsNewMagic;
        var $mIsArticleRelated;
        var $mParserOptions;
        var $mShowFeedLinks = false;
        var $mEnableClientCache = true;
-       
+
        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->mSubtitle = $this->mDebugtext = $this->mRobotpolicy =
                $this->mOnloadHandler = "";
                $this->mIsArticleRelated = $this->mIsarticle = $this->mPrintable = true;
                $this->mSuppressQuickbar = $this->mPrintable = false;
@@ -35,6 +42,7 @@ class OutputPage {
                $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" ) ; }
@@ -44,18 +52,26 @@ class OutputPage {
        # 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( $type, $target ) {
+       function addMetadataLink( $linkarr ) {
+               # note: buggy CC software only reads first "meta" link
                static $haveMeta = false;
-               $this->addLink( ($haveMeta) ? "alternate meta" : "meta", "", $target, $type );
+               $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
        # any future call to OutputPage->output() have no effect. The method
-       # returns true iff cache-ok headers was sent. 
+       # returns true iff cache-ok headers was sent.
        function checkLastModified ( $timestamp )
        {
                global $wgLang, $wgCachePages, $wgUser;
@@ -73,18 +89,17 @@ class OutputPage {
                        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().
                        $modsince = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] );
                        $ismodsince = wfUnix2Timestamp( strtotime( $modsince ) );
                        wfDebug( "-- client send If-Modified-Since: " . $modsince . "\n", false );
-                       wfDebug( "--  we might send Last-Modified : $lastmod\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" );
@@ -103,9 +118,45 @@ class OutputPage {
                }
        }
 
+       function getPageTitleActionText () {
+               global $action;
+               switch($action) {
+                       case 'edit':
+                               return wfMsg('edit');
+                       case 'history':
+                               return wfMsg('history_short');
+                       case 'protect':
+                               return wfMsg('protect');
+                       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');
+                       case 'info':
+                               return wfMsg('info_short');
+                       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; }
@@ -125,8 +176,8 @@ class OutputPage {
                        $this->mIsarticle = false;
                }
        }
-       function setArticleFlag( $v ) { 
-               $this->mIsarticle = $v; 
+       function setArticleFlag( $v ) {
+               $this->mIsarticle = $v;
                if ( $v ) {
                        $this->mIsArticleRelated = $v;
                }
@@ -136,17 +187,30 @@ class OutputPage {
        {
                return $this->mIsArticleRelated;
        }
-       
+
        function getLanguageLinks() {
-               global $wgTitle, $wgLanguageCode;
-               global $wgDBconnection, $wgDBname;
                return $this->mLanguageLinks;
        }
+       function addLanguageLinks($newLinkArray) {
+               $this->mLanguageLinks += $newLinkArray;
+       }
+       function setLanguageLinks($newLinkArray) {
+               $this->mLanguageLinks = $newLinkArray;
+       }
+       function getCategoryLinks() {
+               return $this->mCategoryLinks;
+       }
+       function addCategoryLinks($newLinkArray) {
+               $this->mCategoryLinks += $newLinkArray;
+       }
+       function setCategoryLinks($newLinkArray) {
+               $this->mCategoryLinks += $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 )
@@ -163,42 +227,46 @@ class OutputPage {
        {
                global $wgParser, $wgParserCache, $wgUser, $wgTitle;
 
-               $parserOutput = false;
+               $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
                if ( $cacheArticle ) {
-                       $parserOutput = $wgParserCache->get( $cacheArticle, $wgUser );
+                       $wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
                }
 
-               if ( $parserOutput === false ) {
-                       $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
-                       if ( $cacheArticle ) {
-                               $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;
        }
-       
+
        # Use enableClientCache(false) to force it to send nocache headers
        function enableClientCache( $state ) {
                return wfSetVar( $this->mEnableClientCache, $state );
        }
-       
+
        function sendCacheControl() {
                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( $wgUseSquid && ! isset( $_COOKIE[ini_get( "session.name") ] ) && 
-                         ! $this->isPrintable() 
+               if( $this->mEnableClientCache ) {
+                       if( $wgUseSquid && ! isset( $_COOKIE[ini_get( "session.name") ] ) &&
+                         ! $this->isPrintable() && $this->mSquidMaxage != 0 )
                        {
                                if ( $wgUseESI ) {
                                        # We'll purge the proxy cache explicitly, but require end user agents
@@ -212,7 +280,7 @@ class OutputPage {
                                } else {
                                        # We'll purge the proxy cache for anons explicitly, but require end user agents
                                        # to revalidate against the proxy on each visit.
-                                       # IMPORTANT! The Squid needs to replace the Cache-Control header with 
+                                       # 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 );
                                        # start with a shorter timeout for initial testing
@@ -226,7 +294,7 @@ class OutputPage {
                                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 );
 
@@ -237,7 +305,7 @@ class OutputPage {
                        header( "Pragma: no-cache" );
                }
        }
-       
+
        # Finally, all the text has been munged and accumulated into
        # the object, let's actually output it:
        #
@@ -245,13 +313,13 @@ class OutputPage {
        {
                global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
                global $wgInputEncoding, $wgOutputEncoding, $wgLanguageCode;
-               global $wgDebugRedirects, $wgMimeType;
+               global $wgDebugRedirects, $wgMimeType, $wgProfiler;
                if( $this->mDoNothing ){
                        return;
                }
                $fname = "OutputPage::output";
                wfProfileIn( $fname );
-               
+
                $sk = $wgUser->getSkin();
 
                if ( "" != $this->mRedirect ) {
@@ -266,9 +334,9 @@ class OutputPage {
                                }
                                $this->mLastModified = gmdate( "D, j M Y H:i:s" ) . " GMT";
                        }
-                        
+
                        $this->sendCacheControl();
-                       
+
                        if( $wgDebugRedirects ) {
                                $url = htmlspecialchars( $this->mRedirect );
                                print "<html>\n<head>\n<title>Redirect</title>\n</head>\n<body>\n";
@@ -277,12 +345,18 @@ class OutputPage {
                        } else {
                                header( "Location: {$this->mRedirect}" );
                        }
+                       if ( isset( $wgProfiler ) ) { wfDebug( $wgProfiler->getOutput() ); }
                        return;
                }
-               
-               
+
+
                $this->sendCacheControl();
+               # Perform link colouring
+               $this->replaceLinkHolders();
                
+               # Disable temporary placeholders, so that the skin produces HTML
+               $sk->postParseLinkColour( false );
+
                header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
                header( "Content-language: {$wgLanguageCode}" );
 
@@ -290,7 +364,7 @@ class OutputPage {
                foreach( $this->mCookies as $name => $val ) {
                        setcookie( $name, $val, $exp, "/" );
                }
-               
+
                $sk->outputPage( $this );
                # flush();
        }
@@ -313,7 +387,7 @@ class OutputPage {
                global $wgUser, $wgLang;
 
                $wgInputEncoding = strtolower( $wgInputEncoding );
-               
+
                if( $wgUser->getOption( 'altencoding' ) ) {
                        $wgLang->setAltEncoding();
                        return;
@@ -323,11 +397,11 @@ class OutputPage {
                        $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 = "*";
@@ -355,7 +429,7 @@ class OutputPage {
                $wgOutputEncoding = $wgInputEncoding;
        }
 
-       # Returns a HTML comment with the elapsed time since request. 
+       # Returns a HTML comment with the elapsed time since request.
        # This method has no side effects.
        function reportTime()
        {
@@ -365,8 +439,22 @@ class OutputPage {
                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;
        }
 
@@ -378,32 +466,33 @@ class OutputPage {
 
                $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->mRedirect = "";
 
                $this->mBodytext = "";
-               $this->addHTML( "<p>" . wfMsg( $msg ) . "\n" );
+               $this->addHTML( "<p>" . wfMsg( $msg ) . "</p>\n" );
                $this->returnToMain( false );
 
                $this->output();
-               wfAbruptExit();
+               wfErrorExit();
        }
 
        function sysopRequired()
        {
                global $wgUser;
 
-               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
                $this->setPageTitle( wfMsg( "sysoptitle" ) );
+               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
                $this->setRobotpolicy( "noindex,nofollow" );
                $this->setArticleRelated( false );
                $this->mBodytext = "";
 
                $sk = $wgUser->getSkin();
-               $ap = $sk->makeKnownLink( wfMsg( "administrators" ), "" );      
+               $ap = $sk->makeKnownLink( wfMsg( "administrators" ), "" );
                $this->addHTML( wfMsg( "sysoptext", $ap ) );
                $this->returnToMain();
        }
@@ -412,14 +501,14 @@ class OutputPage {
        {
                global $wgUser;
 
-               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
                $this->setPageTitle( wfMsg( "developertitle" ) );
+               $this->setHTMLTitle( wfMsg( "errorpagetitle" ) );
                $this->setRobotpolicy( "noindex,nofollow" );
                $this->setArticleRelated( false );
                $this->mBodytext = "";
 
                $sk = $wgUser->getSkin();
-               $ap = $sk->makeKnownLink( wfMsg( "administrators" ), "" );      
+               $ap = $sk->makeKnownLink( wfMsg( "administrators" ), "" );
                $this->addHTML( wfMsg( "developertext", $ap ) );
                $this->returnToMain();
        }
@@ -428,8 +517,8 @@ class OutputPage {
        {
                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 = "";
@@ -437,14 +526,14 @@ class OutputPage {
 
                # 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() ) . 
-                                               ":" . 
+               $this->addHTML( "\n<!--" .
+                                               $wgLang->getNsText( $wgTitle->getNamespace() ) .
+                                               ":" .
                                                $wgTitle->getDBkey() . "-->" );
                $this->returnToMain();          # Flip back to the main page after 10 seconds.
        }
 
-       function databaseError( $fname, &$conn )
+       function databaseError( $fname, $sql, $error, $errno )
        {
                global $wgUser, $wgCommandLineMode;
 
@@ -452,32 +541,26 @@ class OutputPage {
                $this->setRobotpolicy( "noindex,nofollow" );
                $this->setArticleRelated( false );
                $this->enableClientCache( false );
+               $this->mRedirect = "";
 
                if ( $wgCommandLineMode ) {
-                       $msg = wfMsgNoDB( "dberrortextcl" );
+                       $msg = wfMsgNoDB( "dberrortextcl", htmlspecialchars( $sql ),
+                                               htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
                } else {
-                       $msg = wfMsgNoDB( "dberrortext" );
+                       $msg = wfMsgNoDB( "dberrortext", htmlspecialchars( $sql ),
+                                               htmlspecialchars( $fname ), $errno, htmlspecialchars( $error ) );
                }
 
-               $msg = str_replace( "$1", htmlspecialchars( $conn->lastQuery() ), $msg );
-               $msg = str_replace( "$2", htmlspecialchars( $fname ), $msg );
-               $msg = str_replace( "$3", $conn->lastErrno(), $msg );
-               $msg = str_replace( "$4", htmlspecialchars( $conn->lastError() ), $msg );
-               
                if ( $wgCommandLineMode || !is_object( $wgUser )) {
                        print "$msg\n";
-                       wfAbruptExit();
+                       wfErrorExit();
                }
-               $sk = $wgUser->getSkin();
-               $shlink = $sk->makeKnownLink( wfMsgNoDB( "searchhelppage" ),
-                 wfMsgNoDB( "searchingwikipedia" ) );
-               $msg = str_replace( "$5", $shlink, $msg );
                $this->mBodytext = $msg;
                $this->output();
-               wfAbruptExit();
+               wfErrorExit();
        }
 
-       function readOnlyPage( $source = "", $protected = false )
+       function readOnlyPage( $source = null, $protected = false )
        {
                global $wgUser, $wgReadOnlyFile;
 
@@ -490,17 +573,20 @@ class OutputPage {
                } 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->returnToMain( false );
        }
 
@@ -510,10 +596,11 @@ class OutputPage {
                $this->setRobotpolicy( "noindex,nofollow" );
                $this->setArticleRelated( false );
                $this->enableClientCache( false );
+               $this->mRedirect = "";
 
                $this->mBodytext = $message;
                $this->output();
-               wfAbruptExit();
+               wfErrorExit();
        }
 
        function unexpectedValueError( $name, $val )
@@ -541,10 +628,13 @@ class OutputPage {
                $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;
-               
+
                if ( $returnto == NULL ) {
                        $returnto = $wgRequest->getText( 'returnto' );
                }
@@ -573,6 +663,12 @@ class OutputPage {
                $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 ) ;
        }
 
@@ -587,11 +683,11 @@ class OutputPage {
                } else {
                        $ret = "";
                }
-               
-               $ret .= "<!DOCTYPE HTML PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
+
+               $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\"";
@@ -600,8 +696,31 @@ class OutputPage {
                }
                $rtl = $wgLang->isRTL() ? " dir='RTL'" : "";
                $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
-               $ret .= "<head>\n<title>{$this->mHTMLtitle}</title>\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";
@@ -616,36 +735,171 @@ class OutputPage {
                $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'";
+               # 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;
+       }
+       
+       # 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( $options = 0 )
+       {
+               global $wgUser, $wgLinkCache, $wgUseOldExistenceCheck;
+               
+               if ( $wgUseOldExistenceCheck ) {
+                       return array();
                }
-               $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();
+               $fname = 'OutputPage::replaceLinkHolders';
+               wfProfileIn( $fname );
 
-               $ret .= "</head>\n";
-               return $ret;
+               $titles = array();
+               $pdbks = array();
+               $colours = array();
+               
+               # Get placeholders from body
+               wfProfileIn( "$fname-match" );
+               preg_match_all( "/<!--LINK (.*?) (.*?) (.*?) (.*?)-->/", $this->mBodytext, $tmpLinks );
+               wfProfileOut( "$fname-match" );
+               
+               if ( !empty( $tmpLinks[0] ) ) {
+                       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 );
+       
+                       # Generate query
+                       $query = false;
+                       foreach ( $namespaces as $key => $val ) {
+                               # Make title object
+                               $dbk = $dbkeys[$key];
+                               $title = $titles[$key] = Title::makeTitle( $val, $dbk );
+
+                               # 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( $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" );
+                       $search = $replace = array();
+                       foreach ( $namespaces as $key => $ns ) {
+                               $pdbk = $pdbks[$key];
+                               $search[] = $tmpLinks[0][$key];
+                               $title = $titles[$key];
+                               if ( empty( $colours[$pdbk] ) ) {
+                                       $wgLinkCache->addBadLink( $pdbk );
+                                       $colours[$pdbk] = 0;
+                                       $replace[] = $sk->makeBrokenLinkObj( $title, $texts[$key], $queries[$key] );
+                               } elseif ( $colours[$pdbk] == 1 ) {
+                                       $replace[] = $sk->makeKnownLinkObj( $title, $texts[$key], $queries[$key] );
+                               } elseif ( $colours[$pdbk] == 2 ) {
+                                       $replace[] = $sk->makeStubLinkObj( $title, $texts[$key], $queries[$key] );
+                               }
+                       }
+                       wfProfileOut( "$fname-construct" );
+                       # Do the thing
+                       wfProfileIn( "$fname-replace" );
+                       $this->mBodytext = str_replace( $search, $replace, $this->mBodytext );
+                       wfProfileOut( "$fname-replace" );
+               }
+               wfProfileOut( $fname );
+               return $colours;
        }
 }
+
+}
 ?>