fix for broken categories on preview
[lhc/web/wiklou.git] / includes / OutputPage.php
index df6ff66..9978a31 100644 (file)
@@ -17,10 +17,10 @@ if($wgUseTeX) require_once( 'Math.php' );
  * @package MediaWiki
  */
 class OutputPage {
-       var $mHeaders, $mCookies, $mMetatags, $mKeywords;
+       var $mHeaders, $mMetatags, $mKeywords;
        var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
        var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable;
-       var $mSubtitle, $mRedirect;
+       var $mSubtitle, $mRedirect, $mStatusCode;
        var $mLastModified, $mETag, $mCategoryLinks;
        var $mScripts, $mLinkColours;
 
@@ -39,7 +39,7 @@ class OutputPage {
         * Initialise private variables
         */
        function OutputPage() {
-               $this->mHeaders = $this->mCookies = $this->mMetatags =
+               $this->mHeaders = $this->mMetatags =
                $this->mKeywords = $this->mLinktags = array();
                $this->mHTMLtitle = $this->mPagetitle = $this->mBodytext =
                $this->mRedirect = $this->mLastModified =
@@ -55,12 +55,13 @@ class OutputPage {
                $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 ); }
@@ -91,7 +92,7 @@ class OutputPage {
         * returns true iff cache-ok headers was sent.
         */
        function checkLastModified ( $timestamp ) {
-               global $wgLang, $wgCachePages, $wgUser;
+               global $wgCachePages, $wgUser;
                if ( !$timestamp || $timestamp == '19700101000000' ) {
                        wfDebug( "CACHE DISABLED, NO TIMESTAMP\n" );
                        return;
@@ -140,20 +141,17 @@ class OutputPage {
                global $action;
                switch($action) {
                        case 'edit':
-                               return wfMsg('edit');
-                       case 'history':
-                               return wfMsg('history_short');
+                       case 'delete':
                        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');
+                               // Display title is already customized
+                               return '';
+                       case 'history':
+                               return wfMsg('history_short');
                        case 'submit':
+                               // FIXME: bug 2735; not correct for special pages etc
                                return wfMsg('preview');
                        case 'info':
                                return wfMsg('info_short');
@@ -174,7 +172,8 @@ class OutputPage {
                                $name .= ' - '.$taction;
                        }
                }
-               $this->setHTMLTitle( $name . ' - ' . wfMsg( 'wikititlesuffix' ) );
+               
+               $this->setHTMLTitle( wfMsg( 'pagetitle', $name ) );
        }
        function getHTMLTitle() { return $this->mHTMLtitle; }
        function getPageTitle() { return $this->mPagetitle; }
@@ -215,11 +214,30 @@ class OutputPage {
        function getCategoryLinks() {
                return $this->mCategoryLinks;
        }
-       function addCategoryLinks($newLinkArray) {
-               $this->mCategoryLinks += $newLinkArray;
+
+       /**
+        * Add an array of categories, with names in the keys
+        */
+       function addCategoryLinks($categories) {
+               global $wgUser, $wgLinkCache, $wgContLang;
+
+               # Add the links to the link cache in a batch
+               $arr = array( NS_CATEGORY => $categories );
+               $lb = new LinkBatch;
+               $lb->setArray( $arr );
+               $lb->execute( $wgLinkCache );
+
+               $sk =& $wgUser->getSkin();
+               foreach ( $categories as $category => $arbitrary ) {
+                       $title = Title::makeTitleSafe( NS_CATEGORY, $category );
+                       $text = $wgContLang->convertHtml( $title->getText() );
+                       $this->mCategoryLinks[] = $sk->makeLinkObj( $title, $text );
+               }
        }
-       function setCategoryLinks($newLinkArray) {
-               $this->mCategoryLinks += $newLinkArray;
+
+       function setCategoryLinks($categories) {
+               $this->mCategoryLinks = array();
+               $this->addCategoryLinks($categories);
        }
 
        function suppressQuickbar() { $this->mSuppressQuickbar = true; }
@@ -230,9 +248,25 @@ class OutputPage {
        function getHTML() { return $this->mBodytext; }
        function debug( $text ) { $this->mDebugtext .= $text; }
 
+       /* @deprecated */
        function setParserOptions( $options ) {
+               return $this->ParserOptions( $options );
+       }
+
+       function ParserOptions( $options = null ) {
                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
@@ -249,13 +283,23 @@ class OutputPage {
        }
 
        function addWikiTextTitle($text, &$title, $linestart) {
-               global $wgParser, $wgUseTidy;
-               $parserOutput = $wgParser->parse( $text, $title, $this->mParserOptions, $linestart );
+               global $wgParser;
+               $parserOutput = $wgParser->parse( $text, $title, $this->mParserOptions,
+                       $linestart, true, $this->mRevisionId );
+               $this->addParserOutput( $parserOutput );
+       }
+
+       function addParserOutputNoText( &$parserOutput ) {
                $this->mLanguageLinks += $parserOutput->getLanguageLinks();
-               $this->mCategoryLinks += $parserOutput->getCategoryLinks();
+               $this->addCategoryLinks( $parserOutput->getCategories() );
+               $this->addKeywords( $parserOutput );
                if ( $parserOutput->getCacheTime() == -1 ) {
                        $this->enableClientCache( false );
                }
+       }
+       
+       function addParserOutput( &$parserOutput ) {
+               $this->addParserOutputNoText( $parserOutput );
                $this->addHTML( $parserOutput->getText() );
        }
 
@@ -263,23 +307,17 @@ class OutputPage {
         * Add wikitext to the buffer, assuming that this is the primary text for a page view
         * Saves the text into the parser cache if possible
         */
-       function addPrimaryWikiText( $text, $cacheArticle ) {
-               global $wgParser, $wgParserCache, $wgUser, $wgTitle, $wgUseTidy;
-
-               $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, true );
+       function addPrimaryWikiText( $text, $article, $cache = true ) {
+               global $wgParser, $wgParserCache, $wgUser;
 
-               $text = $parserOutput->getText();
+               $parserOutput = $wgParser->parse( $text, $article->mTitle,
+                       $this->mParserOptions, true, true, $this->mRevisionId );
 
-               if ( $cacheArticle && $parserOutput->getCacheTime() != -1 ) {
-                       $wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
+               if ( $article && $parserOutput->getCacheTime() != -1 ) {
+                       $wgParserCache->save( $parserOutput, $article, $wgUser );
                }
 
-               $this->mLanguageLinks += $parserOutput->getLanguageLinks();
-               $this->mCategoryLinks += $parserOutput->getCategoryLinks();
-               if ( $parserOutput->getCacheTime() == -1 ) {
-                       $this->enableClientCache( false );
-               }
-               $this->addHTML( $text );
+               $this->addParserOutput( $parserOutput );
        }
 
        /**
@@ -289,7 +327,7 @@ class OutputPage {
        function addTemplate( &$template ) {
                ob_start();
                $template->execute();
-               $this->addHtml( ob_get_contents() );
+               $this->addHTML( ob_get_contents() );
                ob_end_clean();
        }
 
@@ -298,7 +336,8 @@ class OutputPage {
         */
        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->mRevisionId );
                return $parserOutput->getText();
        }
 
@@ -313,7 +352,8 @@ class OutputPage {
                $parserOutput = $wgParserCache->get( $article, $user );
                if ( $parserOutput !== false ) {
                        $this->mLanguageLinks += $parserOutput->getLanguageLinks();
-                       $this->mCategoryLinks += $parserOutput->getCategoryLinks();
+                       $this->addCategoryLinks( $parserOutput->getCategories() );
+                       $this->addKeywords( $parserOutput );
                        $this->addHTML( $parserOutput->getText() );
                        $t = $parserOutput->getTitleText();
                        if( !empty( $t ) ) {
@@ -403,9 +443,8 @@ class OutputPage {
         * the object, let's actually output it:
         */
        function output() {
-               global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
-               global $wgInputEncoding, $wgOutputEncoding, $wgContLanguageCode;
-               global $wgDebugRedirects, $wgMimeType, $wgProfiler;
+               global $wgUser, $wgOutputEncoding;
+               global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType, $wgProfiler;
 
                if( $this->mDoNothing ){
                        return;
@@ -441,24 +480,70 @@ class OutputPage {
                        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 );
 
                header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
                header( 'Content-language: '.$wgContLanguageCode );
 
-               $exp = time() + $wgCookieExpiration;
-               foreach( $this->mCookies as $name => $val ) {
-                       setcookie( $name, $val, $exp, '/' );
-               }
-
                if ($this->mArticleBodyOnly) {
                        $this->out($this->mBodytext);
                } else {
@@ -504,32 +589,13 @@ class OutputPage {
        /**
         * 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;
        }
 
        /**
@@ -570,7 +636,6 @@ class OutputPage {
                $this->setArticleRelated( false );
                $this->mBodytext = '';
 
-               $sk = $wgUser->getSkin();
                $this->addWikiText( wfMsg( 'versionrequiredtext', $version ) );
                $this->returnToMain();
        }
@@ -705,7 +770,12 @@ class OutputPage {
 
                if( is_string( $source ) ) {
                        if( strcmp( $source, '' ) == 0 ) {
-                               $source = wfMsg( 'noarticletext' );
+                               global $wgTitle ;
+                               if ( $wgTitle->getNamespace() == NS_MEDIAWIKI ) {
+                                       $source = wfMsgWeirdKey ( $wgTitle->getText() ) ;
+                               } else {
+                                       $source = wfMsg( $wgUser->isLoggedIn() ? 'noarticletext' : 'noarticletextanon' );
+                               }
                        }
                        $rows = $wgUser->getOption( 'rows' );
                        $cols = $wgUser->getOption( 'cols' );
@@ -780,21 +850,19 @@ class OutputPage {
         * 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 ( 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 ));
-
-               $wgOut->addMeta ( 'KEYWORDS' , $a ) ;
+       function addKeywords( &$parserOutput ) {
+               global $wgTitle;
+               $this->addKeyword( $wgTitle->getPrefixedText() );
+               $count = 1;
+               $links2d =& $parserOutput->getLinks();
+               foreach ( $links2d as $ns => $dbkeys ) {
+                       foreach( $dbkeys as $dbkey => $id ) {
+                               $this->addKeyword( $dbkey );
+                               if ( ++$count > 10 ) {
+                                       break 2;
+                               }
+                       }
+               }
        }
 
        /**
@@ -813,13 +881,13 @@ class OutputPage {
 
                $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();
@@ -856,9 +924,13 @@ class OutputPage {
                        }
                        $ret .= "<meta $a=\"{$tag[0]}\" content=\"{$tag[1]}\" />\n";
                }
+               
                $p = $this->mRobotpolicy;
-               if ( '' == $p ) { $p = 'index,follow'; }
-               $ret .= "<meta name=\"robots\" content=\"$p\" />\n";
+               if( $p !== '' && $p != 'index,follow' ) {
+                       // http://www.robotstxt.org/wc/meta-user.html
+                       // Only show if it's different from the default robots policy
+                       $ret .= "<meta name=\"robots\" content=\"$p\" />\n";
+               }
 
                if ( count( $this->mKeywords ) > 0 ) {
                        $strip = array(
@@ -880,19 +952,12 @@ class OutputPage {
                        $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
-        */
-       function transformBuffer( $options = 0 ) {
-       }
-
-
        /**
         * Turn off regular page output and return an error reponse
         * for when rate limiting has triggered.