From b9b85843572bf283f48285001e276ba7e61b63f6 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sun, 22 Feb 2009 13:37:51 +0100 Subject: updated to MediaWiki 1.14.0 --- includes/OutputPage.php | 575 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 403 insertions(+), 172 deletions(-) (limited to 'includes/OutputPage.php') diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 8226cb2f..f8dba714 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -6,20 +6,23 @@ if ( ! defined( 'MEDIAWIKI' ) ) * @todo document */ class OutputPage { - var $mMetatags, $mKeywords; - var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext; - var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable; - var $mSubtitle, $mRedirect, $mStatusCode; - var $mLastModified, $mETag, $mCategoryLinks; - var $mScripts, $mLinkColours, $mPageLinkTitle; + var $mMetatags = array(), $mKeywords = array(), $mLinktags = array(); + var $mExtStyles = array(); + var $mPagetitle = '', $mBodytext = '', $mDebugtext = ''; + var $mHTMLtitle = '', $mIsarticle = true, $mPrintable = false; + var $mSubtitle = '', $mRedirect = '', $mStatusCode; + var $mLastModified = '', $mETag = false; + var $mCategoryLinks = array(), $mLanguageLinks = array(); + var $mScripts = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems = array(); + var $mTemplateIds = array(); var $mAllowUserJs; - var $mSuppressQuickbar; - var $mOnloadHandler; - var $mDoNothing; - var $mContainsOldMagic, $mContainsNewMagic; - var $mIsArticleRelated; - protected $mParserOptions; // lazy initialised, use parserOptions() + var $mSuppressQuickbar = false; + var $mOnloadHandler = ''; + var $mDoNothing = false; + var $mContainsOldMagic = 0, $mContainsNewMagic = 0; + var $mIsArticleRelated = true; + protected $mParserOptions = null; // lazy initialised, use parserOptions() var $mShowFeedLinks = false; var $mFeedLinksAppendQuery = false; var $mEnableClientCache = true; @@ -29,6 +32,18 @@ class OutputPage { var $mNoGallery = false; var $mPageTitleActionText = ''; var $mParseWarnings = array(); + var $mSquidMaxage = 0; + var $mRevisionId = null; + + /** + * An array of stylesheet filenames (relative from skins path), with options + * for CSS media, IE conditions, and RTL/LTR direction. + * For internal use; add settings in the skin via $this->addStyle() + */ + var $styles = array(); + + private $mIndexPolicy = 'index'; + private $mFollowPolicy = 'follow'; /** * Constructor @@ -37,25 +52,6 @@ class OutputPage { function __construct() { global $wgAllowUserJs; $this->mAllowUserJs = $wgAllowUserJs; - $this->mMetatags = $this->mKeywords = $this->mLinktags = array(); - $this->mHTMLtitle = $this->mPagetitle = $this->mBodytext = - $this->mRedirect = $this->mLastModified = - $this->mSubtitle = $this->mDebugtext = $this->mRobotpolicy = - $this->mOnloadHandler = $this->mPageLinkTitle = ''; - $this->mIsArticleRelated = $this->mIsarticle = $this->mPrintable = true; - $this->mSuppressQuickbar = $this->mPrintable = false; - $this->mLanguageLinks = array(); - $this->mCategoryLinks = array(); - $this->mDoNothing = false; - $this->mContainsOldMagic = $this->mContainsNewMagic = 0; - $this->mParserOptions = null; - $this->mSquidMaxage = 0; - $this->mScripts = ''; - $this->mHeadItems = array(); - $this->mETag = false; - $this->mRevisionId = null; - $this->mNewSectionLink = false; - $this->mTemplateIds = array(); } public function redirect( $url, $responsecode = '302' ) { @@ -76,17 +72,23 @@ class OutputPage { */ 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 ) ); } + /** + * Add a new tag + * To add an http-equiv meta tag, precede the name with "http:" + * + * @param $name tag name + * @param $val tag value + */ + function addMeta( $name, $val ) { + array_push( $this->mMetatags, array( $name, $val ) ); + } + function addKeyword( $text ) { array_push( $this->mKeywords, $text ); } function addScript( $script ) { $this->mScripts .= "\t\t".$script; } - function addStyle( $style ) { - global $wgStylePath, $wgStyleVersion; - $this->addLink( - array( - 'rel' => 'stylesheet', - 'href' => $wgStylePath . '/' . $style . '?' . $wgStyleVersion, - 'type' => 'text/css' ) ); + + function addExtensionStyle( $url ) { + $linkarr = array( 'rel' => 'stylesheet', 'href' => $url, 'type' => 'text/css' ); + array_push( $this->mExtStyles, $linkarr ); } /** @@ -100,7 +102,6 @@ class OutputPage { } else { $path = "{$wgStylePath}/common/{$file}"; } - $encPath = htmlspecialchars( $path ); $this->addScript( "\n" ); } @@ -141,6 +142,11 @@ class OutputPage { # $linkarr should be an associative array of attributes. We'll escape on output. array_push( $this->mLinktags, $linkarr ); } + + # Get all links added by extensions + function getExtStyle() { + return $this->mExtStyles; + } function addMetadataLink( $linkarr ) { # note: buggy CC software only reads first "meta" link @@ -155,62 +161,87 @@ class OutputPage { * possible. If sucessful, the OutputPage is disabled so that * any future call to OutputPage->output() have no effect. * + * Side effect: sets mLastModified for Last-Modified header + * * @return bool True iff cache-ok headers was sent. */ function checkLastModified ( $timestamp ) { global $wgCachePages, $wgCacheEpoch, $wgUser, $wgRequest; - + if ( !$timestamp || $timestamp == '19700101000000' ) { wfDebug( __METHOD__ . ": CACHE DISABLED, NO TIMESTAMP\n" ); - return; + return false; } if( !$wgCachePages ) { wfDebug( __METHOD__ . ": CACHE DISABLED\n", false ); - return; + return false; } if( $wgUser->getOption( 'nocache' ) ) { wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false ); - return; + return false; } - $timestamp=wfTimestamp(TS_MW,$timestamp); - $lastmod = wfTimestamp( TS_RFC2822, max( $timestamp, $wgUser->mTouched, $wgCacheEpoch ) ); + $timestamp = wfTimestamp( TS_MW, $timestamp ); + $modifiedTimes = array( + 'page' => $timestamp, + 'user' => $wgUser->getTouched(), + 'epoch' => $wgCacheEpoch + ); + wfRunHooks( 'OutputPageCheckLastModified', array( &$modifiedTimes ) ); - 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"] ); + $maxModified = max( $modifiedTimes ); + $this->mLastModified = wfTimestamp( TS_RFC2822, $maxModified ); - wfSuppressWarnings(); // E_STRICT system time bitching - $modsinceTime = strtotime( $modsince ); - wfRestoreWarnings(); + if( empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) { + wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false ); + return false; + } - $ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 ); - wfDebug( __METHOD__ . ": -- client send If-Modified-Since: " . $modsince . "\n", false ); - wfDebug( __METHOD__ . ": -- we might send Last-Modified : $lastmod\n", false ); - if( ($ismodsince >= $timestamp ) && $wgUser->validateCache( $ismodsince ) && $ismodsince >= $wgCacheEpoch ) { - # Make sure you're in a place you can leave when you call us! - $wgRequest->response()->header( "HTTP/1.0 304 Not Modified" ); - $this->mLastModified = $lastmod; - $this->sendCacheControl(); - wfDebug( __METHOD__ . ": CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false ); - $this->disable(); + # Make debug info + $info = ''; + foreach ( $modifiedTimes as $name => $value ) { + if ( $info !== '' ) { + $info .= ', '; + } + $info .= "$name=" . wfTimestamp( TS_ISO_8601, $value ); + } - // Don't output a compressed blob when using ob_gzhandler; - // it's technically against HTTP spec and seems to confuse - // Firefox when the response gets split over two packets. - wfClearOutputBuffers(); + # IE sends sizes after the date like this: + # Wed, 20 Aug 2003 06:51:19 GMT; length=5202 + # this breaks strtotime(). + $clientHeader = preg_replace( '/;.*$/', '', $_SERVER["HTTP_IF_MODIFIED_SINCE"] ); - return true; - } else { - wfDebug( __METHOD__ . ": READY client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false ); - $this->mLastModified = $lastmod; - } - } else { - wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false ); - $this->mLastModified = $lastmod; + wfSuppressWarnings(); // E_STRICT system time bitching + $clientHeaderTime = strtotime( $clientHeader ); + wfRestoreWarnings(); + if ( !$clientHeaderTime ) { + wfDebug( __METHOD__ . ": unable to parse the client's If-Modified-Since header: $clientHeader\n" ); + return false; } + $clientHeaderTime = wfTimestamp( TS_MW, $clientHeaderTime ); + + wfDebug( __METHOD__ . ": client sent If-Modified-Since: " . + wfTimestamp( TS_ISO_8601, $clientHeaderTime ) . "\n", false ); + wfDebug( __METHOD__ . ": effective Last-Modified: " . + wfTimestamp( TS_ISO_8601, $maxModified ) . "\n", false ); + if( $clientHeaderTime < $maxModified ) { + wfDebug( __METHOD__ . ": STALE, $info\n", false ); + return false; + } + + # Not modified + # Give a 304 response code and disable body output + wfDebug( __METHOD__ . ": NOT MODIFIED, $info\n", false ); + $wgRequest->response()->header( "HTTP/1.1 304 Not Modified" ); + $this->sendCacheControl(); + $this->disable(); + + // Don't output a compressed blob when using ob_gzhandler; + // it's technically against HTTP spec and seems to confuse + // Firefox when the response gets split over two packets. + wfClearOutputBuffers(); + + return true; } function setPageTitleActionText( $text ) { @@ -223,7 +254,61 @@ class OutputPage { } } - public function setRobotpolicy( $str ) { $this->mRobotpolicy = $str; } + /** + * Set the robot policy for the page: + * + * @param $policy string The literal string to output as the contents of + * the meta tag. Will be parsed according to the spec and output in + * standardized form. + * @return null + */ + public function setRobotPolicy( $policy ) { + $policy = explode( ',', $policy ); + $policy = array_map( 'trim', $policy ); + + # The default policy is follow, so if nothing is said explicitly, we + # do that. + if( in_array( 'nofollow', $policy ) ) { + $this->mFollowPolicy = 'nofollow'; + } else { + $this->mFollowPolicy = 'follow'; + } + + if( in_array( 'noindex', $policy ) ) { + $this->mIndexPolicy = 'noindex'; + } else { + $this->mIndexPolicy = 'index'; + } + } + + /** + * Set the index policy for the page, but leave the follow policy un- + * touched. + * + * @param $policy string Either 'index' or 'noindex'. + * @return null + */ + public function setIndexPolicy( $policy ) { + $policy = trim( $policy ); + if( in_array( $policy, array( 'index', 'noindex' ) ) ) { + $this->mIndexPolicy = $policy; + } + } + + /** + * Set the follow policy for the page, but leave the index policy un- + * touched. + * + * @param $policy string Either 'follow' or 'nofollow'. + * @return null + */ + public function setFollowPolicy( $policy ) { + $policy = trim( $policy ); + if( in_array( $policy, array( 'follow', 'nofollow' ) ) ) { + $this->mFollowPolicy = $policy; + } + } + public function setHTMLTitle( $name ) {$this->mHTMLtitle = $name; } public function setPageTitle( $name ) { global $action, $wgContLang; @@ -341,6 +426,7 @@ class OutputPage { public function disallowUserJs() { $this->mAllowUserJs = false; } public function isUserJsAllowed() { return $this->mAllowUserJs; } + public function prependHTML( $text ) { $this->mBodytext = $text . $this->mBodytext; } public function addHTML( $text ) { $this->mBodytext .= $text; } public function clearHTML() { $this->mBodytext = ''; } public function getHTML() { return $this->mBodytext; } @@ -369,6 +455,10 @@ class OutputPage { $val = is_null( $revid ) ? null : intval( $revid ); return wfSetVar( $this->mRevisionId, $val ); } + + public function getRevisionId() { + return $this->mRevisionId; + } /** * Convert wikitext to HTML and add it to the buffer @@ -416,9 +506,23 @@ class OutputPage { * @param ParserOutput object &$parserOutput */ public function addParserOutputNoText( &$parserOutput ) { + global $wgTitle, $wgExemptFromUserRobotsControl, $wgContentNamespaces; + $this->mLanguageLinks += $parserOutput->getLanguageLinks(); $this->addCategoryLinks( $parserOutput->getCategories() ); $this->mNewSectionLink = $parserOutput->getNewSection(); + + if( is_null( $wgExemptFromUserRobotsControl ) ) { + $bannedNamespaces = $wgContentNamespaces; + } else { + $bannedNamespaces = $wgExemptFromUserRobotsControl; + } + if( !in_array( $wgTitle->getNamespace(), $bannedNamespaces ) ) { + # FIXME (bug 14900): This overrides $wgArticleRobotPolicies, and it + # shouldn't + $this->setIndexPolicy( $parserOutput->getIndexPolicy() ); + } + $this->addKeywords( $parserOutput ); $this->mParseWarnings = $parserOutput->getWarnings(); if ( $parserOutput->getCacheTime() == -1 ) { @@ -427,8 +531,13 @@ class OutputPage { $this->mNoGallery = $parserOutput->getNoGallery(); $this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems ); // Versioning... - $this->mTemplateIds = wfArrayMerge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds ); - + foreach ( (array)$parserOutput->mTemplateIds as $ns => $dbks ) { + if ( isset( $this->mTemplateIds[$ns] ) ) { + $this->mTemplateIds[$ns] = $dbks + $this->mTemplateIds[$ns]; + } else { + $this->mTemplateIds[$ns] = $dbks; + } + } // Display title if( ( $dt = $parserOutput->getDisplayTitle() ) !== false ) $this->setPageTitle( $dt ); @@ -522,6 +631,9 @@ class OutputPage { */ public function parse( $text, $linestart = true, $interface = false ) { global $wgParser, $wgTitle; + if( is_null( $wgTitle ) ) { + throw new MWException( 'Empty $wgTitle in ' . __METHOD__ ); + } $popts = $this->parserOptions(); if ( $interface) { $popts->setInterfaceMessage(true); } $parserOutput = $wgParser->parse( $text, $wgTitle, $popts, @@ -590,7 +702,7 @@ class OutputPage { * If it does, it's very important that we don't allow public caching */ function haveCacheVaryCookies() { - global $wgRequest, $wgCookiePrefix; + global $wgRequest; $cookieHeader = $wgRequest->getHeader( 'cookie' ); if ( $cookieHeader === false ) { return false; @@ -609,7 +721,6 @@ class OutputPage { /** Get a complete X-Vary-Options header */ public function getXVO() { - global $wgCookiePrefix; $cvCookies = $this->getCacheVaryCookies(); $xvo = 'X-Vary-Options: Accept-Encoding;list-contains=gzip,Cookie;'; $first = true; @@ -668,7 +779,9 @@ class OutputPage { $response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); $response->header( "Cache-Control: private, must-revalidate, max-age=0" ); } - if($this->mLastModified) $response->header( "Last-modified: {$this->mLastModified}" ); + if($this->mLastModified) { + $response->header( "Last-Modified: {$this->mLastModified}" ); + } } else { wfDebug( __METHOD__ . ": no caching **\n", false ); @@ -687,8 +800,9 @@ class OutputPage { public function output() { global $wgUser, $wgOutputEncoding, $wgRequest; global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType; - global $wgJsMimeType, $wgUseAjax, $wgAjaxSearch, $wgAjaxWatch; - global $wgServer, $wgEnableMWSuggest; + global $wgJsMimeType, $wgUseAjax, $wgAjaxWatch; + global $wgEnableMWSuggest, $wgUniversalEditButton; + global $wgArticle, $wgTitle; if( $this->mDoNothing ){ return; @@ -782,11 +896,6 @@ class OutputPage { wfRunHooks( 'AjaxAddScript', array( &$this ) ); - if( $wgAjaxSearch && $wgUser->getBoolOption( 'ajaxsearch' ) ) { - $this->addScriptFile( 'ajaxsearch.js' ); - $this->addScript( "\n" ); - } - if( $wgAjaxWatch && $wgUser->isLoggedIn() ) { $this->addScriptFile( 'ajaxwatch.js' ); } @@ -800,13 +909,28 @@ class OutputPage { $this->addScriptFile( 'rightclickedit.js' ); } - + if( $wgUniversalEditButton ) { + if( isset( $wgArticle ) && isset( $wgTitle ) && $wgTitle->quickUserCan( 'edit' ) + && ( $wgTitle->exists() || $wgTitle->quickUserCan( 'create' ) ) ) { + // Original UniversalEditButton + $this->addLink( array( + 'rel' => 'alternate', + 'type' => 'application/x-wiki', + 'title' => wfMsg( 'edit' ), + 'href' => $wgTitle->getFullURL( 'action=edit' ) + ) ); + // Alternate edit link + $this->addLink( array( + 'rel' => 'edit', + 'title' => wfMsg( 'edit' ), + 'href' => $wgTitle->getFullURL( 'action=edit' ) + ) ); + } + } + # Buffer output; final headers may depend on later processing ob_start(); - # Disable temporary placeholders, so that the skin produces HTML - $sk->postParseLinkColour( false ); - $wgRequest->response()->header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" ); $wgRequest->response()->header( 'Content-language: '.$wgContLanguageCode ); @@ -879,7 +1003,7 @@ class OutputPage { global $wgUser, $wgContLang, $wgTitle, $wgLang; $this->setPageTitle( wfMsg( 'blockedtitle' ) ); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); $name = User::whoIs( $wgUser->blockedBy() ); @@ -945,7 +1069,7 @@ class OutputPage { } $this->setPageTitle( wfMsg( $title ) ); $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) ); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); $this->enableClientCache( false ); $this->mRedirect = ''; @@ -953,7 +1077,7 @@ class OutputPage { array_unshift( $params, 'parse' ); array_unshift( $params, $msg ); - $this->addHtml( call_user_func_array( 'wfMsgExt', $params ) ); + $this->addHTML( call_user_func_array( 'wfMsgExt', $params ) ); $this->returnToMain(); } @@ -971,7 +1095,7 @@ class OutputPage { $wgTitle->getPrefixedText() . "\n"; $this->setPageTitle( wfMsg( 'permissionserrors' ) ); $this->setHTMLTitle( wfMsg( 'permissionserrors' ) ); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); $this->enableClientCache( false ); $this->mRedirect = ''; @@ -994,7 +1118,7 @@ class OutputPage { public function versionRequired( $version ) { $this->setPageTitle( wfMsg( 'versionrequired', $version ) ); $this->setHTMLTitle( wfMsg( 'versionrequired', $version ) ); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); $this->mBodytext = ''; @@ -1008,39 +1132,23 @@ class OutputPage { * @param string $permission key required */ public function permissionRequired( $permission ) { - global $wgGroupPermissions, $wgUser; + global $wgUser; $this->setPageTitle( wfMsg( 'badaccess' ) ); $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) ); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); $this->mBodytext = ''; - $groups = array(); - foreach( $wgGroupPermissions as $key => $value ) { - if( isset( $value[$permission] ) && $value[$permission] == true ) { - $groupName = User::getGroupName( $key ); - $groupPage = User::getGroupPage( $key ); - if( $groupPage ) { - $skin = $wgUser->getSkin(); - $groups[] = $skin->makeLinkObj( $groupPage, $groupName ); - } else { - $groups[] = $groupName; - } - } + $groups = array_map( array( 'User', 'makeGroupLinkWiki' ), + User::getGroupsWithPermission( $permission ) ); + if( $groups ) { + $this->addWikiMsg( 'badaccess-groups', + implode( ', ', $groups ), + count( $groups) ); + } else { + $this->addWikiMsg( 'badaccess-group0' ); } - $n = count( $groups ); - $groups = implode( ', ', $groups ); - switch( $n ) { - case 0: - case 1: - case 2: - $message = wfMsgHtml( "badaccess-group$n", $groups ); - break; - default: - $message = wfMsgHtml( 'badaccess-groups', $groups ); - } - $this->addHtml( $message ); $this->returnToMain(); } @@ -1080,8 +1188,8 @@ class OutputPage { $loginTitle = SpecialPage::getTitleFor( 'Userlogin' ); $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() ); - $this->addHtml( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) ); - $this->addHtml( "\n" ); + $this->addHTML( wfMsgWikiHtml( 'loginreqpagetext', $loginLink ) ); + $this->addHTML( "\n" ); # Don't return to the main page if the user can't read it # otherwise we'll end up in a pointless loop @@ -1103,8 +1211,8 @@ class OutputPage { if ($action == null) { $text = wfMsgNoTrans( 'permissionserrorstext', count($errors)). "\n\n"; } else { - $action_desc = wfMsg( "right-$action" ); - $action_desc[0] = strtolower($action_desc[0]); + global $wgLang; + $action_desc = wfMsg( "action-$action" ); $text = wfMsgNoTrans( 'permissionserrorstext-withaction', count($errors), $action_desc ) . "\n\n"; } @@ -1148,7 +1256,7 @@ class OutputPage { global $wgUser, $wgTitle; $skin = $wgUser->getSkin(); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); // If no reason is given, just supply a default "I can't let you do @@ -1170,7 +1278,7 @@ class OutputPage { // Wiki is read only $this->setPageTitle( wfMsg( 'readonly' ) ); $reason = wfReadOnlyReason(); - $this->addWikiMsg( 'readonlytext', $reason ); + $this->wrapWikiMsg( '
$1
', array( 'readonlytext', $reason ) ); } // Show source, if supplied @@ -1189,7 +1297,10 @@ class OutputPage { // Show templates used by this article $skin = $wgUser->getSkin(); $article = new Article( $wgTitle ); - $this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) ); + $this->addHTML( "
+{$skin->formatTemplates( $article->getUsedTemplates() )} +
+" ); } # If the title doesn't exist, it's fairly pointless to print a return @@ -1238,7 +1349,7 @@ class OutputPage { public function showFatalError( $message ) { $this->setPageTitle( wfMsg( "internalerror" ) ); - $this->setRobotpolicy( "noindex,nofollow" ); + $this->setRobotPolicy( "noindex,nofollow" ); $this->setArticleRelated( false ); $this->enableClientCache( false ); $this->mRedirect = ''; @@ -1272,8 +1383,9 @@ class OutputPage { */ public function addReturnTo( $title ) { global $wgUser; + $this->addLink( array( 'rel' => 'next', 'href' => $title->getFullUrl() ) ); $link = wfMsg( 'returnto', $wgUser->getSkin()->makeLinkObj( $title ) ); - $this->addHtml( "

{$link}

\n" ); + $this->addHTML( "

{$link}

\n" ); } /** @@ -1333,15 +1445,19 @@ class OutputPage { /** * @return string The doctype, opening , and head element. */ - public function headElement() { + public function headElement( Skin $sk ) { global $wgDocType, $wgDTD, $wgContLanguageCode, $wgOutputEncoding, $wgMimeType; global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces; global $wgUser, $wgContLang, $wgUseTrackbacks, $wgTitle, $wgStyleVersion; + $this->addMeta( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ); + $this->addStyle( 'common/wikiprintable.css', 'print' ); + $sk->setupUserCss( $this ); + + $ret = ''; + if( $wgMimeType == 'text/xml' || $wgMimeType == 'application/xhtml+xml' || $wgMimeType == 'application/xml' ) { - $ret = "\n"; - } else { - $ret = ''; + $ret .= "\n"; } $ret .= "\n"; @@ -1356,24 +1472,17 @@ class OutputPage { $ret .= "xmlns:{$tag}=\"{$ns}\" "; } $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n"; - $ret .= "\n" . htmlspecialchars( $this->getHTMLTitle() ) . "\n"; - $this->addMeta( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ); - - $ret .= $this->getHeadLinks(); - global $wgStylePath; - if( $this->isPrintable() ) { - $media = ''; - } else { - $media = "media='print'"; + $ret .= "\n" . htmlspecialchars( $this->getHTMLTitle() ) . "\n\t\t"; + $ret .= implode( "\t\t", array( + $this->getHeadLinks(), + $this->buildCssLinks(), + $sk->getHeadScripts( $this->mAllowUserJs ), + $this->mScripts, + $this->getHeadItems(), + )); + if( $sk->usercss ){ + $ret .= ""; } - $printsheet = htmlspecialchars( "$wgStylePath/common/wikiprintable.css?$wgStyleVersion" ); - $ret .= "\n"; - - $sk = $wgUser->getSkin(); - $ret .= $sk->getHeadScripts( $this->mAllowUserJs ); - $ret .= $this->mScripts; - $ret .= $sk->getUserStyles(); - $ret .= $this->getHeadItems(); if ($wgUseTrackbacks && $this->isArticleRelated()) $ret .= $wgTitle->trackbackRDF(); @@ -1384,10 +1493,11 @@ class OutputPage { protected function addDefaultMeta() { global $wgVersion; - $this->addMeta( "generator", "MediaWiki $wgVersion" ); + $this->addMeta( 'http:Content-Style-Type', 'text/css' ); //bug 15835 + $this->addMeta( 'generator', "MediaWiki $wgVersion" ); - $p = $this->mRobotpolicy; - if( $p !== '' && $p != 'index,follow' ) { + $p = "{$this->mIndexPolicy},{$this->mFollowPolicy}"; + if( $p !== 'index,follow' ) { // http://www.robotstxt.org/wc/meta-user.html // Only show if it's different from the default robots policy $this->addMeta( 'robots', $p ); @@ -1446,20 +1556,29 @@ class OutputPage { # Recent changes feed should appear on every page (except recentchanges, # that would be redundant). Put it after the per-page feed to avoid # changing existing behavior. It's still available, probably via a - # menu in your browser. - + # menu in your browser. Some sites might have a different feed they'd + # like to promote instead of the RC feed (maybe like a "Recent New Articles" + # or "Breaking news" one). For this, we see if $wgOverrideSiteFeed is defined. + # If so, use it instead. + + global $wgOverrideSiteFeed, $wgSitename, $wgFeedClasses; $rctitle = SpecialPage::getTitleFor( 'Recentchanges' ); - if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) { - global $wgSitename; - - $tags[] = $this->feedLink( - 'rss', - $rctitle->getFullURL( 'feed=rss' ), - wfMsg( 'site-rss-feed', $wgSitename ) ); - $tags[] = $this->feedLink( - 'atom', - $rctitle->getFullURL( 'feed=atom' ), - wfMsg( 'site-atom-feed', $wgSitename ) ); + + if ( $wgOverrideSiteFeed ) { + foreach ( $wgOverrideSiteFeed as $type => $feedUrl ) { + $tags[] = $this->feedLink ( + $type, + htmlspecialchars( $feedUrl ), + wfMsg( "site-{$type}-feed", $wgSitename ) ); + } + } + else if ( $wgTitle->getPrefixedText() != $rctitle->getPrefixedText() ) { + foreach( $wgFeedClasses as $format => $class ) { + $tags[] = $this->feedLink( + $format, + $rctitle->getFullURL( "feed={$format}" ), + wfMsg( "site-{$format}-feed", $wgSitename ) ); # For grep: 'site-rss-feed', 'site-atom-feed'. + } } } @@ -1499,6 +1618,118 @@ class OutputPage { 'href' => $url ) ); } + /** + * Add a local or specified stylesheet, with the given media options. + * Meant primarily for internal use... + * + * @param $media -- to specify a media type, 'screen', 'printable', 'handheld' or any. + * @param $conditional -- for IE conditional comments, specifying an IE version + * @param $dir -- set to 'rtl' or 'ltr' for direction-specific sheets + */ + public function addStyle( $style, $media='', $condition='', $dir='' ) { + $options = array(); + if( $media ) + $options['media'] = $media; + if( $condition ) + $options['condition'] = $condition; + if( $dir ) + $options['dir'] = $dir; + $this->styles[$style] = $options; + } + + /** + * Build a set of s for the stylesheets specified in the $this->styles array. + * These will be applied to various media & IE conditionals. + */ + public function buildCssLinks() { + $links = array(); + foreach( $this->styles as $file => $options ) { + $link = $this->styleLink( $file, $options ); + if( $link ) + $links[] = $link; + } + + return implode( "\n\t\t", $links ); + } + + protected function styleLink( $style, $options ) { + global $wgRequest; + + if( isset( $options['dir'] ) ) { + global $wgContLang; + $siteDir = $wgContLang->isRTL() ? 'rtl' : 'ltr'; + if( $siteDir != $options['dir'] ) + return ''; + } + + if( isset( $options['media'] ) ) { + $media = $this->transformCssMedia( $options['media'] ); + if( is_null( $media ) ) { + return ''; + } + } else { + $media = ''; + } + + if( substr( $style, 0, 1 ) == '/' || + substr( $style, 0, 5 ) == 'http:' || + substr( $style, 0, 6 ) == 'https:' ) { + $url = $style; + } else { + global $wgStylePath, $wgStyleVersion; + $url = $wgStylePath . '/' . $style . '?' . $wgStyleVersion; + } + + $attribs = array( + 'rel' => 'stylesheet', + 'href' => $url, + 'type' => 'text/css' ); + if( $media ) { + $attribs['media'] = $media; + } + + $link = Xml::element( 'link', $attribs ); + + if( isset( $options['condition'] ) ) { + $condition = htmlspecialchars( $options['condition'] ); + $link = ""; + } + return $link; + } + + function transformCssMedia( $media ) { + global $wgRequest, $wgHandheldForIPhone; + + // Switch in on-screen display for media testing + $switches = array( + 'printable' => 'print', + 'handheld' => 'handheld', + ); + foreach( $switches as $switch => $targetMedia ) { + if( $wgRequest->getBool( $switch ) ) { + if( $media == $targetMedia ) { + $media = ''; + } elseif( $media == 'screen' ) { + return null; + } + } + } + + // Expand longer media queries as iPhone doesn't grok 'handheld' + if( $wgHandheldForIPhone ) { + $mediaAliases = array( + 'screen' => 'screen and (min-device-width: 481px)', + 'handheld' => 'handheld, only screen and (max-device-width: 480px)', + ); + + if( isset( $mediaAliases[$media] ) ) { + $media = $mediaAliases[$media]; + } + } + + return $media; + } + /** * Turn off regular page output and return an error reponse * for when rate limiting has triggered. @@ -1543,7 +1774,7 @@ class OutputPage { ? 'lag-warn-normal' : 'lag-warn-high'; $warning = wfMsgExt( $message, 'parse', $lag ); - $this->addHtml( "
\n{$warning}\n
\n" ); + $this->addHTML( "
\n{$warning}\n
\n" ); } } -- cgit v1.2.3-54-g00ecf