X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FOutputPage.php;h=74feac9a95fda637492742c4cf5ea8af0bdb81e2;hb=59254f1bc827cec0872a27d222a3d1f4f9beadda;hp=adbdc314cf1f57e5bb87c527f518cefea838402f;hpb=424ddebb7de4e88f3eb29fe70dd1014cbc25f86b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/OutputPage.php b/includes/OutputPage.php index adbdc314cf..74feac9a95 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1,34 +1,49 @@ addStyle() + */ + var $styles = array(); + + private $mIndexPolicy = 'index'; + private $mFollowPolicy = 'follow'; /** * Constructor @@ -37,32 +52,14 @@ 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' ) { # Strip newlines as a paranoia check for header injection in PHP<5.1.2 $this->mRedirect = str_replace( "\n", '', $url ); $this->mRedirectCode = $responsecode; } + public function getRedirect() { return $this->mRedirect; } @@ -75,18 +72,39 @@ 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 ) ); + + function addExtensionStyle( $url ) { + $linkarr = array( 'rel' => 'stylesheet', 'href' => $url, 'type' => 'text/css' ); + array_push( $this->mExtStyles, $linkarr ); } + /** + * Add a JavaScript file out of skins/common, or a given relative path. + * @param string $file filename in skins/common or complete on-server path (/foo/bar.js) + */ + function addScriptFile( $file ) { + global $wgStylePath, $wgStyleVersion, $wgJsMimeType; + if( substr( $file, 0, 1 ) == '/' ) { + $path = $file; + } else { + $path = "{$wgStylePath}/common/{$file}"; + } + $this->addScript( "\n" ); + } + /** * Add a self-contained script tag with the given contents * @param string $script JavaScript text, no "; } - function getScript() { - return $this->mScripts . $this->getHeadItems(); + function getScript() { + return $this->mScripts . $this->getHeadItems(); } function getHeadItems() { @@ -124,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 @@ -138,63 +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; - $fname = 'OutputPage::checkLastModified'; - + if ( !$timestamp || $timestamp == '19700101000000' ) { - wfDebug( "$fname: CACHE DISABLED, NO TIMESTAMP\n" ); - return; + wfDebug( __METHOD__ . ": CACHE DISABLED, NO TIMESTAMP\n" ); + return false; } if( !$wgCachePages ) { - wfDebug( "$fname: CACHE DISABLED\n", false ); - return; + wfDebug( __METHOD__ . ": CACHE DISABLED\n", false ); + return false; } if( $wgUser->getOption( 'nocache' ) ) { - wfDebug( "$fname: USER DISABLED CACHE\n", false ); - return; + wfDebug( __METHOD__ . ": USER DISABLED CACHE\n", false ); + 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"] ); - - wfSuppressWarnings(); // E_STRICT system time bitching - $modsinceTime = strtotime( $modsince ); - wfRestoreWarnings(); - - $ismodsince = wfTimestamp( TS_MW, $modsinceTime ? $modsinceTime : 1 ); - wfDebug( "$fname: -- client send If-Modified-Since: " . $modsince . "\n", false ); - wfDebug( "$fname: -- 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( "$fname: CACHED client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false ); - $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; - } else { - wfDebug( "$fname: READY client: $ismodsince ; user: $wgUser->mTouched ; page: $timestamp ; site $wgCacheEpoch\n", false ); - $this->mLastModified = $lastmod; + $maxModified = max( $modifiedTimes ); + $this->mLastModified = wfTimestamp( TS_RFC2822, $maxModified ); + + if( empty( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) { + wfDebug( __METHOD__ . ": client did not send If-Modified-Since header\n", false ); + return false; + } + + # Make debug info + $info = ''; + foreach ( $modifiedTimes as $name => $value ) { + if ( $info !== '' ) { + $info .= ', '; } - } else { - wfDebug( "$fname: client did not send If-Modified-Since header\n", false ); - $this->mLastModified = $lastmod; + $info .= "$name=" . wfTimestamp( TS_ISO_8601, $value ); } + + # 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"] ); + + 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 ) { @@ -207,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; @@ -225,12 +326,15 @@ class OutputPage { public function getHTMLTitle() { return $this->mHTMLtitle; } public function getPageTitle() { return $this->mPagetitle; } public function setSubtitle( $str ) { $this->mSubtitle = /*$this->parse(*/$str/*)*/; } // @bug 2514 + public function appendSubtitle( $str ) { $this->mSubtitle .= /*$this->parse(*/$str/*)*/; } // @bug 2514 public function getSubtitle() { return $this->mSubtitle; } public function isArticle() { return $this->mIsarticle; } public function setPrintable() { $this->mPrintable = true; } public function isPrintable() { return $this->mPrintable; } public function setSyndicated( $show = true ) { $this->mShowFeedLinks = $show; } public function isSyndicated() { return $this->mShowFeedLinks; } + public function setFeedAppendQuery( $val ) { $this->mFeedLinksAppendQuery = $val; } + public function getFeedAppendQuery() { return $this->mFeedLinksAppendQuery; } public function setOnloadHandler( $js ) { $this->mOnloadHandler = $js; } public function getOnloadHandler() { return $this->mOnloadHandler; } public function disable() { $this->mDoNothing = true; } @@ -265,23 +369,49 @@ class OutputPage { /** * Add an array of categories, with names in the keys */ - public function addCategoryLinks($categories) { + public function addCategoryLinks( $categories ) { global $wgUser, $wgContLang; - if ( !is_array( $categories ) ) { + if ( !is_array( $categories ) || count( $categories ) == 0 ) { return; } - # Add the links to the link cache in a batch + + # Add the links to a LinkBatch $arr = array( NS_CATEGORY => $categories ); $lb = new LinkBatch; $lb->setArray( $arr ); - $lb->execute(); - $sk = $wgUser->getSkin(); - foreach ( $categories as $category => $unused ) { - $title = Title::makeTitleSafe( NS_CATEGORY, $category ); - $text = $wgContLang->convertHtml( $title->getText() ); - $this->mCategoryLinks[] = $sk->makeLinkObj( $title, $text ); + # Fetch existence plus the hiddencat property + $dbr = wfGetDB( DB_SLAVE ); + $pageTable = $dbr->tableName( 'page' ); + $where = $lb->constructSet( 'page', $dbr ); + $propsTable = $dbr->tableName( 'page_props' ); + $sql = "SELECT page_id, page_namespace, page_title, page_len, page_is_redirect, pp_value + FROM $pageTable LEFT JOIN $propsTable ON pp_propname='hiddencat' AND pp_page=page_id WHERE $where"; + $res = $dbr->query( $sql, __METHOD__ ); + + # Add the results to the link cache + $lb->addResultToCache( LinkCache::singleton(), $res ); + + # Set all the values to 'normal'. This can be done with array_fill_keys in PHP 5.2.0+ + $categories = array_combine( array_keys( $categories ), + array_fill( 0, count( $categories ), 'normal' ) ); + + # Mark hidden categories + foreach ( $res as $row ) { + if ( isset( $row->pp_value ) ) { + $categories[$row->page_title] = 'hidden'; + } + } + + # Add the remaining categories to the skin + if ( wfRunHooks( 'OutputPageMakeCategoryLinks', array( &$this, $categories, &$this->mCategoryLinks ) ) ) { + $sk = $wgUser->getSkin(); + foreach ( $categories as $category => $type ) { + $title = Title::makeTitleSafe( NS_CATEGORY, $category ); + $text = $wgContLang->convertHtml( $title->getText() ); + $this->mCategoryLinks[$type][] = $sk->makeLinkObj( $title, $text ); + } } } @@ -296,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; } @@ -303,6 +434,7 @@ class OutputPage { /* @deprecated */ public function setParserOptions( $options ) { + wfDeprecated( __METHOD__ ); return $this->parserOptions( $options ); } @@ -323,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 @@ -348,22 +484,21 @@ class OutputPage { public function addWikiTextTitle($text, &$title, $linestart, $tidy = false) { global $wgParser; - $fname = 'OutputPage:addWikiTextTitle'; - wfProfileIn($fname); + wfProfileIn( __METHOD__ ); - wfIncrStats('pcache_not_possible'); + wfIncrStats( 'pcache_not_possible' ); $popts = $this->parserOptions(); - $oldTidy = $popts->setTidy($tidy); + $oldTidy = $popts->setTidy( $tidy ); $parserOutput = $wgParser->parse( $text, $title, $popts, $linestart, true, $this->mRevisionId ); - + $popts->setTidy( $oldTidy ); $this->addParserOutput( $parserOutput ); - wfProfileOut($fname); + wfProfileOut( __METHOD__ ); } /** @@ -371,23 +506,38 @@ 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 ) { $this->enableClientCache( false ); } $this->mNoGallery = $parserOutput->getNoGallery(); $this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems ); // Versioning... - $this->mTemplateIds += (array)$parserOutput->mTemplateIds; - - # Display title + $this->mTemplateIds = wfArrayMerge( $this->mTemplateIds, (array)$parserOutput->mTemplateIds ); + + // Display title if( ( $dt = $parserOutput->getDisplayTitle() ) !== false ) $this->setPageTitle( $dt ); - # Hooks registered in the object + // Hooks registered in the object global $wgParserOutputHooks; foreach ( $parserOutput->getOutputHooks() as $hookInfo ) { list( $hookName, $data ) = $hookInfo; @@ -422,13 +572,15 @@ class OutputPage { public function addPrimaryWikiText( $text, $article, $cache = true ) { global $wgParser, $wgUser; + wfDeprecated( __METHOD__ ); + $popts = $this->parserOptions(); $popts->setTidy(true); $parserOutput = $wgParser->parse( $text, $article->mTitle, $popts, true, true, $this->mRevisionId ); $popts->setTidy(false); if ( $cache && $article && $parserOutput->getCacheTime() != -1 ) { - $parserCache =& ParserCache::singleton(); + $parserCache = ParserCache::singleton(); $parserCache->save( $parserOutput, $article, $wgUser ); } @@ -440,6 +592,7 @@ class OutputPage { */ public function addSecondaryWikiText( $text, $linestart = true ) { global $wgTitle; + wfDeprecated( __METHOD__ ); $this->addWikiTextTitleTidy($text, $wgTitle, $linestart); } @@ -488,7 +641,7 @@ class OutputPage { * @return bool True if successful, else false. */ public function tryParserCache( &$article, $user ) { - $parserCache =& ParserCache::singleton(); + $parserCache = ParserCache::singleton(); $parserOutput = $parserCache->get( $article, $user ); if ( $parserOutput !== false ) { $this->addParserOutput( $parserOutput ); @@ -513,61 +666,123 @@ class OutputPage { return wfSetVar( $this->mEnableClientCache, $state ); } - function uncacheableBecauseRequestvars() { + function getCacheVaryCookies() { + global $wgCookiePrefix, $wgCacheVaryCookies; + static $cookies; + if ( $cookies === null ) { + $cookies = array_merge( + array( + "{$wgCookiePrefix}Token", + "{$wgCookiePrefix}LoggedOut", + session_name() + ), + $wgCacheVaryCookies + ); + wfRunHooks('GetCacheVaryCookies', array( $this, &$cookies ) ); + } + return $cookies; + } + + function uncacheableBecauseRequestVars() { global $wgRequest; return $wgRequest->getText('useskin', false) === false && $wgRequest->getText('uselang', false) === false; } + /** + * Check if the request has a cache-varying cookie header + * If it does, it's very important that we don't allow public caching + */ + function haveCacheVaryCookies() { + global $wgRequest, $wgCookiePrefix; + $cookieHeader = $wgRequest->getHeader( 'cookie' ); + if ( $cookieHeader === false ) { + return false; + } + $cvCookies = $this->getCacheVaryCookies(); + foreach ( $cvCookies as $cookieName ) { + # Check for a simple string match, like the way squid does it + if ( strpos( $cookieHeader, $cookieName ) ) { + wfDebug( __METHOD__.": found $cookieName\n" ); + return true; + } + } + wfDebug( __METHOD__.": no cache-varying cookies found\n" ); + return false; + } + + /** 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; + foreach ( $cvCookies as $cookieName ) { + if ( $first ) { + $first = false; + } else { + $xvo .= ';'; + } + $xvo .= 'string-contains=' . $cookieName; + } + return $xvo; + } + public function sendCacheControl() { global $wgUseSquid, $wgUseESI, $wgUseETag, $wgSquidMaxage, $wgRequest; - $fname = 'OutputPage::sendCacheControl'; + $response = $wgRequest->response(); if ($wgUseETag && $this->mETag) - $wgRequest->response()->header("ETag: $this->mETag"); + $response->header("ETag: $this->mETag"); # don't serve compressed data to clients who can't handle it # maintain different caches for logged-in users and non-logged in ones - $wgRequest->response()->header( 'Vary: Accept-Encoding, Cookie' ); - if( !$this->uncacheableBecauseRequestvars() && $this->mEnableClientCache ) { + $response->header( 'Vary: Accept-Encoding, Cookie' ); + + # Add an X-Vary-Options header for Squid with Wikimedia patches + $response->header( $this->getXVO() ); + + if( !$this->uncacheableBecauseRequestVars() && $this->mEnableClientCache ) { if( $wgUseSquid && session_id() == '' && - ! $this->isPrintable() && $this->mSquidMaxage != 0 ) + ! $this->isPrintable() && $this->mSquidMaxage != 0 && !$this->haveCacheVaryCookies() ) { if ( $wgUseESI ) { # We'll purge the proxy cache explicitly, but require end user agents # to revalidate against the proxy on each visit. # Surrogate-Control controls our Squid, Cache-Control downstream caches - wfDebug( "$fname: proxy caching with ESI; {$this->mLastModified} **\n", false ); + wfDebug( __METHOD__ . ": proxy caching with ESI; {$this->mLastModified} **\n", false ); # start with a shorter timeout for initial testing # header( 'Surrogate-Control: max-age=2678400+2678400, content="ESI/1.0"'); - $wgRequest->response()->header( 'Surrogate-Control: max-age='.$wgSquidMaxage.'+'.$this->mSquidMaxage.', content="ESI/1.0"'); - $wgRequest->response()->header( 'Cache-Control: s-maxage=0, must-revalidate, max-age=0' ); + $response->header( 'Surrogate-Control: max-age='.$wgSquidMaxage.'+'.$this->mSquidMaxage.', content="ESI/1.0"'); + $response->header( 'Cache-Control: s-maxage=0, must-revalidate, max-age=0' ); } 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 # Cache-Control: s-maxage=0, must-revalidate, max-age=0 - wfDebug( "$fname: local proxy caching; {$this->mLastModified} **\n", false ); + wfDebug( __METHOD__ . ": local proxy caching; {$this->mLastModified} **\n", false ); # start with a shorter timeout for initial testing # header( "Cache-Control: s-maxage=2678400, must-revalidate, max-age=0" ); - $wgRequest->response()->header( 'Cache-Control: s-maxage='.$this->mSquidMaxage.', must-revalidate, max-age=0' ); + $response->header( 'Cache-Control: s-maxage='.$this->mSquidMaxage.', must-revalidate, max-age=0' ); } } else { # We do want clients to cache if they can, but they *must* check for updates # on revisiting the page. - wfDebug( "$fname: private caching; {$this->mLastModified} **\n", false ); - $wgRequest->response()->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); - $wgRequest->response()->header( "Cache-Control: private, must-revalidate, max-age=0" ); + wfDebug( __METHOD__ . ": private caching; {$this->mLastModified} **\n", false ); + $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) $wgRequest->response()->header( "Last-modified: {$this->mLastModified}" ); } else { - wfDebug( "$fname: no caching **\n", false ); + wfDebug( __METHOD__ . ": no caching **\n", false ); # In general, the absence of a last modified header should be enough to prevent # the client from using its cache. We send a few other things just to make sure. - $wgRequest->response()->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); - $wgRequest->response()->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' ); - $wgRequest->response()->header( 'Pragma: no-cache' ); + $response->header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', 0 ) . ' GMT' ); + $response->header( 'Cache-Control: no-cache, no-store, max-age=0, must-revalidate' ); + $response->header( 'Pragma: no-cache' ); } } @@ -578,37 +793,19 @@ class OutputPage { public function output() { global $wgUser, $wgOutputEncoding, $wgRequest; global $wgContLanguageCode, $wgDebugRedirects, $wgMimeType; - global $wgJsMimeType, $wgStylePath, $wgUseAjax, $wgAjaxSearch, $wgAjaxWatch; - global $wgServer, $wgStyleVersion; + global $wgJsMimeType, $wgUseAjax, $wgAjaxWatch; + global $wgEnableMWSuggest, $wgUniversalEditButton; + global $wgArticle, $wgTitle; if( $this->mDoNothing ){ return; } - $fname = 'OutputPage::output'; - wfProfileIn( $fname ); - $sk = $wgUser->getSkin(); - - if ( $wgUseAjax ) { - $this->addScript( "\n" ); - - wfRunHooks( 'AjaxAddScript', array( &$this ) ); - if( $wgAjaxSearch ) { - $this->addScript( "\n" ); - $this->addScript( "\n" ); - } - - if( $wgAjaxWatch && $wgUser->isLoggedIn() ) { - $this->addScript( "\n" ); - } - } + wfProfileIn( __METHOD__ ); if ( '' != $this->mRedirect ) { - if( substr( $this->mRedirect, 0, 4 ) != 'http' ) { - # Standards require redirect URLs to be absolute - global $wgServer; - $this->mRedirect = $wgServer . $this->mRedirect; - } + # Standards require redirect URLs to be absolute + $this->mRedirect = wfExpandUrl( $this->mRedirect ); if( $this->mRedirectCode == '301') { if( !$wgDebugRedirects ) { $wgRequest->response()->header("HTTP/1.1 {$this->mRedirectCode} Moved Permanently"); @@ -627,7 +824,7 @@ class OutputPage { } else { $wgRequest->response()->header( 'Location: '.$this->mRedirect ); } - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); return; } elseif ( $this->mStatusCode ) @@ -685,18 +882,58 @@ class OutputPage { $wgRequest->response()->header( 'HTTP/1.1 ' . $this->mStatusCode . ' ' . $statusMessage[$this->mStatusCode] ); } + $sk = $wgUser->getSkin(); + + if ( $wgUseAjax ) { + $this->addScriptFile( 'ajax.js' ); + + wfRunHooks( 'AjaxAddScript', array( &$this ) ); + + if( $wgAjaxWatch && $wgUser->isLoggedIn() ) { + $this->addScriptFile( 'ajaxwatch.js' ); + } + + if ( $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){ + $this->addScriptFile( 'mwsuggest.js' ); + } + } + + if( $wgUser->getBoolOption( 'editsectiononrightclick' ) ) { + $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 ); if ($this->mArticleBodyOnly) { $this->out($this->mBodytext); } else { + // Hook that allows last minute changes to the output page, e.g. + // adding of CSS or Javascript by extensions. + wfRunHooks( 'BeforePageDisplay', array( &$this, &$sk ) ); + wfProfileIn( 'Output-skin' ); $sk->outputPage( $this ); wfProfileOut( 'Output-skin' ); @@ -704,7 +941,7 @@ class OutputPage { $this->sendCacheControl(); ob_end_flush(); - wfProfileOut( $fname ); + wfProfileOut( __METHOD__ ); } /** @@ -744,6 +981,7 @@ class OutputPage { * @deprecated */ public function reportTime() { + wfDeprecated( __METHOD__ ); $time = wfReportTime(); return $time; } @@ -758,11 +996,14 @@ 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() ); $reason = $wgUser->blockedFor(); + if( $reason == '' ) { + $reason = wfMsg( 'blockednoreason' ); + } $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $wgUser->mBlock->mTimestamp ), true ); $ip = wfGetIP(); @@ -798,12 +1039,12 @@ class OutputPage { * This could be a username, an ip range, or a single ip. */ $intended = $wgUser->mBlock->mAddress; - $this->addWikiText( wfMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ) ); + $this->addWikiMsg( $msg, $link, $reason, $ip, $name, $blockid, $blockExpiry, $intended, $blockTimestamp ); # Don't auto-return to special pages if( $return ) { - $return = $wgTitle->getNamespace() > -1 ? $wgTitle->getPrefixedText() : NULL; - $this->returnToMain( false, $return ); + $return = $wgTitle->getNamespace() > -1 ? $wgTitle : NULL; + $this->returnToMain( null, $return ); } } @@ -816,22 +1057,22 @@ class OutputPage { */ public function showErrorPage( $title, $msg, $params = array() ) { global $wgTitle; - - $this->mDebugtext .= 'Original title: ' . - $wgTitle->getPrefixedText() . "\n"; + if ( isset($wgTitle) ) { + $this->mDebugtext .= 'Original title: ' . $wgTitle->getPrefixedText() . "\n"; + } $this->setPageTitle( wfMsg( $title ) ); $this->setHTMLTitle( wfMsg( 'errorpagetitle' ) ); - $this->setRobotpolicy( 'noindex,nofollow' ); + $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleRelated( false ); $this->enableClientCache( false ); $this->mRedirect = ''; $this->mBodytext = ''; - + array_unshift( $params, 'parse' ); array_unshift( $params, $msg ); $this->addHtml( call_user_func_array( 'wfMsgExt', $params ) ); - - $this->returnToMain( false ); + + $this->returnToMain(); } /** @@ -839,27 +1080,28 @@ class OutputPage { * * @param array $errors Error message keys */ - public function showPermissionsErrorPage( $errors ) + public function showPermissionsErrorPage( $errors, $action = null ) { global $wgTitle; $this->mDebugtext .= 'Original title: ' . - $wgTitle->getPrefixedText() . "\n"; + $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 = ''; $this->mBodytext = ''; - $this->addWikiText( $this->formatPermissionsErrorMessage( $errors ) ); + $this->addWikiText( $this->formatPermissionsErrorMessage( $errors, $action ) ); } /** @deprecated */ public function errorpage( $title, $msg ) { + wfDeprecated( __METHOD__ ); throw new ErrorPageError( $title, $msg ); } - + /** * Display an error page indicating that a given version of MediaWiki is * required to use it @@ -869,11 +1111,11 @@ 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 = ''; - $this->addWikiText( wfMsg( 'versionrequiredtext', $version ) ); + $this->addWikiMsg( 'versionrequiredtext', $version ); $this->returnToMain(); } @@ -883,40 +1125,24 @@ 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; - } - } - } - $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 ); + $groups = array_map( array( 'User', 'makeGroupLinkWiki' ), + User::getGroupsWithPermission( $permission ) ); + if( $groups ) { + $this->addWikiMsg( 'badaccess-groups', + implode( ', ', $groups ), + count( $groups) ); + } else { + $this->addWikiMsg( 'badaccess-group0' ); } - $this->addHtml( $message ); - $this->returnToMain( false ); + $this->returnToMain(); } /** @@ -947,22 +1173,22 @@ class OutputPage { } $skin = $wgUser->getSkin(); - + $this->setPageTitle( wfMsg( 'loginreqtitle' ) ); $this->setHtmlTitle( wfMsg( 'errorpagetitle' ) ); $this->setRobotPolicy( 'noindex,nofollow' ); $this->setArticleFlag( false ); - + $loginTitle = SpecialPage::getTitleFor( 'Userlogin' ); $loginLink = $skin->makeKnownLinkObj( $loginTitle, wfMsgHtml( 'loginreqlink' ), 'returnto=' . $wgTitle->getPrefixedUrl() ); $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 $mainPage = Title::newMainPage(); if( $mainPage->userCanRead() ) - $this->returnToMain( true, $mainPage ); + $this->returnToMain( null, $mainPage ); } /** @deprecated */ @@ -972,133 +1198,151 @@ class OutputPage { /** * @param array $errors An array of arrays returned by Title::getUserPermissionsErrors - * @return string The error-messages, formatted into a list. + * @return string The wikitext error-messages, formatted into a list. */ - public function formatPermissionsErrorMessage( $errors ) { - $text = ''; - - if (sizeof( $errors ) > 1) { + public function formatPermissionsErrorMessage( $errors, $action = null ) { + if ($action == null) { + $text = wfMsgNoTrans( 'permissionserrorstext', count($errors)). "\n\n"; + } else { + global $wgLang; + $action_desc = wfMsg( "action-$action" ); + $text = wfMsgNoTrans( 'permissionserrorstext-withaction', count($errors), $action_desc ) . "\n\n"; + } - $text .= wfMsgExt( 'permissionserrorstext', array( 'parse' ), count( $errors ) ) . "\n"; + if (count( $errors ) > 1) { $text .= ''; } else { - $text .= call_user_func_array( 'wfMsg', $errors[0]); + $text .= '
' . call_user_func_array( 'wfMsgNoTrans', reset( $errors ) ) . '
'; } return $text; } /** - * @todo document - * @param bool $protected Is the reason the page can't be reached because it's protected? - * @param mixed $source - * @param bool $protected, page is protected? - * @param array $reason, array of arrays( msg, args ) + * Display a page stating that the Wiki is in read-only mode, + * and optionally show the source of the page that the user + * was trying to edit. Should only be called (for this + * purpose) after wfReadOnly() has returned true. + * + * For historical reasons, this function is _also_ used to + * show the error message when a user tries to edit a page + * they are not allowed to edit. (Unless it's because they're + * blocked, then we show blockedPage() instead.) In this + * case, the second parameter should be set to true and a list + * of reasons supplied as the third parameter. + * + * @todo Needs to be split into multiple functions. + * + * @param string $source Source code to show (or null). + * @param bool $protected Is this a permissions error? + * @param array $reasons List of reasons for this error, as returned by Title::getUserPermissionsErrors(). */ - public function readOnlyPage( $source = null, $protected = false, $reasons = array() ) { - global $wgUser, $wgReadOnlyFile, $wgReadOnly, $wgTitle; + public function readOnlyPage( $source = null, $protected = false, $reasons = array(), $action = null ) { + 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 + // that, Dave" message. Should only occur if called by legacy code. + if ( $protected && empty($reasons) ) { + $reasons[] = array( 'badaccess-group0' ); + } + if ( !empty($reasons) ) { - $this->setPageTitle( wfMsg( 'viewsource' ) ); - $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); - - $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons ) ); - } else if( $protected ) { - $this->setPageTitle( wfMsg( 'viewsource' ) ); - $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); - list( $cascadeSources, /* $restrictions */ ) = $wgTitle->getCascadeProtectionSources(); - - // Show an appropriate explanation depending upon the reason - // for the protection...all of these should be moved to the - // callers - if( $wgTitle->getNamespace() == NS_MEDIAWIKI ) { - // User isn't allowed to edit the interface - $this->addWikiText( wfMsg( 'protectedinterface' ) ); - } elseif( $cascadeSources && ( $count = count( $cascadeSources ) ) > 0 ) { - // Cascading protection - $titles = ''; - foreach( $cascadeSources as $title ) - $titles .= "* [[:" . $title->getPrefixedText() . "]]\n"; - $this->addWikiText( wfMsgExt( 'cascadeprotected', 'parsemag', $count, "\n{$titles}" ) ); - } elseif( !$wgTitle->isProtected( 'edit' ) && $wgTitle->isNamespaceProtected() ) { - // Namespace protection - $ns = $wgTitle->getNamespace() == NS_MAIN - ? wfMsg( 'nstab-main' ) - : $wgTitle->getNsText(); - $this->addWikiText( wfMsg( 'namespaceprotected', $ns ) ); + // Permissions error + if( $source ) { + $this->setPageTitle( wfMsg( 'viewsource' ) ); + $this->setSubtitle( wfMsg( 'viewsourcefor', $skin->makeKnownLinkObj( $wgTitle ) ) ); } else { - // Standard protection - $this->addWikiText( wfMsg( 'protectedpagetext' ) ); + $this->setPageTitle( wfMsg( 'badaccess' ) ); } + $this->addWikiText( $this->formatPermissionsErrorMessage( $reasons, $action ) ); } else { + // Wiki is read only $this->setPageTitle( wfMsg( 'readonly' ) ); - if ( $wgReadOnly ) { - $reason = $wgReadOnly; - } else { - $reason = file_get_contents( $wgReadOnlyFile ); - } - $this->addWikiText( wfMsg( 'readonlytext', $reason ) ); + $reason = wfReadOnlyReason(); + $this->wrapWikiMsg( '
$1
', array( 'readonlytext', $reason ) ); } + // Show source, if supplied if( is_string( $source ) ) { - $this->addWikiText( wfMsg( 'viewsourcetext' ) ); - $rows = $wgUser->getIntOption( 'rows' ); - $cols = $wgUser->getIntOption( 'cols' ); - $text = "\n"; + $this->addWikiMsg( 'viewsourcetext' ); + $text = Xml::openElement( 'textarea', + array( 'id' => 'wpTextbox1', + 'name' => 'wpTextbox1', + 'cols' => $wgUser->getOption( 'cols' ), + 'rows' => $wgUser->getOption( 'rows' ), + 'readonly' => 'readonly' ) ); + $text .= htmlspecialchars( $source ); + $text .= Xml::closeElement( 'textarea' ); $this->addHTML( $text ); + + // Show templates used by this article + $skin = $wgUser->getSkin(); + $article = new Article( $wgTitle ); + $this->addHTML( "
+{$skin->formatTemplates( $article->getUsedTemplates() )} +
+" ); } - $article = new Article( $wgTitle ); - $this->addHTML( $skin->formatTemplates( $article->getUsedTemplates() ) ); - $this->returnToMain( false, $wgTitle ); + # If the title doesn't exist, it's fairly pointless to print a return + # link to it. After all, you just tried editing it and couldn't, so + # what's there to do there? + if( $wgTitle->exists() ) { + $this->returnToMain( null, $wgTitle ); + } } /** @deprecated */ public function fatalError( $message ) { - throw new FatalError( $message ); + wfDeprecated( __METHOD__ ); + throw new FatalError( $message ); } - + /** @deprecated */ public function unexpectedValueError( $name, $val ) { + wfDeprecated( __METHOD__ ); throw new FatalError( wfMsg( 'unexpected', $name, $val ) ); } /** @deprecated */ public function fileCopyError( $old, $new ) { + wfDeprecated( __METHOD__ ); throw new FatalError( wfMsg( 'filecopyerror', $old, $new ) ); } /** @deprecated */ public function fileRenameError( $old, $new ) { + wfDeprecated( __METHOD__ ); throw new FatalError( wfMsg( 'filerenameerror', $old, $new ) ); } /** @deprecated */ public function fileDeleteError( $name ) { + wfDeprecated( __METHOD__ ); throw new FatalError( wfMsg( 'filedeleteerror', $name ) ); } /** @deprecated */ public function fileNotFoundError( $name ) { + wfDeprecated( __METHOD__ ); throw new FatalError( wfMsg( 'filenotfound', $name ) ); } public function showFatalError( $message ) { $this->setPageTitle( wfMsg( "internalerror" ) ); - $this->setRobotpolicy( "noindex,nofollow" ); + $this->setRobotPolicy( "noindex,nofollow" ); $this->setArticleRelated( false ); $this->enableClientCache( false ); $this->mRedirect = ''; @@ -1145,11 +1389,11 @@ class OutputPage { */ public function returnToMain( $unused = null, $returnto = NULL ) { global $wgRequest; - + if ( $returnto == NULL ) { $returnto = $wgRequest->getText( 'returnto' ); } - + if ( '' === $returnto ) { $returnto = Title::newMainPage(); } @@ -1193,15 +1437,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"; @@ -1216,24 +1464,17 @@ class OutputPage { $ret .= "xmlns:{$tag}=\"{$ns}\" "; } $ret .= "xml:lang=\"$wgContLanguageCode\" lang=\"$wgContLanguageCode\" $rtl>\n"; - $ret .= "\n" . htmlspecialchars( $this->getHTMLTitle() ) . "\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'"; + $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(); @@ -1241,13 +1482,38 @@ class OutputPage { $ret .= "\n"; return $ret; } + + protected function addDefaultMeta() { + global $wgVersion; + $this->addMeta( "generator", "MediaWiki $wgVersion" ); + + $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 ); + } + + if ( count( $this->mKeywords ) > 0 ) { + $strip = array( + "/<.*?>/" => '', + "/_/" => ' ' + ); + $this->addMeta( 'keywords', preg_replace(array_keys($strip), array_values($strip),implode( ",", $this->mKeywords ) ) ); + } + } /** * @return string HTML tag links to be put in the header. */ public function getHeadLinks() { - global $wgRequest; - $ret = ''; + global $wgRequest, $wgFeed; + + // Ideally this should happen earlier, somewhere. :P + $this->addDefaultMeta(); + + $tags = array(); + foreach ( $this->mMetatags as $tag ) { if ( 0 == strcasecmp( 'http:', substr( $tag[0], 0, 5 ) ) ) { $a = 'http-equiv'; @@ -1255,66 +1521,83 @@ class OutputPage { } else { $a = 'name'; } - $ret .= "\n"; + $tags[] = Xml::element( 'meta', + array( + $a => $tag[0], + 'content' => $tag[1] ) ); } - - $p = $this->mRobotpolicy; - 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 .= "\n"; + foreach ( $this->mLinktags as $tag ) { + $tags[] = Xml::element( 'link', $tag ); } - if ( count( $this->mKeywords ) > 0 ) { - $strip = array( - "/<.*?>/" => '', - "/_/" => ' ' - ); - $ret .= "\t\tmKeywords ))) . "\" />\n"; - } - foreach ( $this->mLinktags as $tag ) { - $ret .= "\t\t $val ) { - $ret .= " $attr=\"" . htmlspecialchars( $val ) . "\""; + if( $wgFeed ) { + global $wgTitle; + foreach( $this->getSyndicationLinks() as $format => $link ) { + # Use the page name for the title (accessed through $wgTitle since + # there's no other way). In principle, this could lead to issues + # with having the same name for different feeds corresponding to + # the same page, but we can't avoid that at this low a level. + + $tags[] = $this->feedLink( + $format, + $link, + wfMsg( "page-{$format}-feed", $wgTitle->getPrefixedText() ) ); # Used messages: 'page-rss-feed' and 'page-atom-feed' (for an easier grep) + } + + # 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. 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 ( $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'. + } } - $ret .= " />\n"; } - + + return implode( "\n\t\t", $tags ) . "\n"; + } + + /** + * Return URLs for each supported syndication format for this page. + * @return array associating format keys with URLs + */ + public function getSyndicationLinks() { + global $wgTitle, $wgFeedClasses; + $links = array(); + if( $this->isSyndicated() ) { - # FIXME: centralize the mime-type and name information in Feed.php - # Use the page name for the title (accessed through $wgTitle since - # there's no other way). In principle, this could lead to issues - # with having the same name for different feeds corresponding to - # the same page, but we can't avoid that at this low a level. - global $wgTitle; - $ret .= $this->feedLink( - 'rss', - $wgRequest->appendQuery( 'feed=rss' ), - wfMsg( 'page-rss-feed', $wgTitle->getPrefixedText() ) ); - $ret .= $this->feedLink( - 'atom', - $wgRequest->appendQuery( 'feed=atom' ), - wfMsg( 'page-atom-feed', $wgTitle->getPrefixedText() ) ); - } - - # Recent changes feed should appear on every page - # Put it after the per-page feed to avoid changing existing behavior. - # It's still available, probably via a menu in your browser. - global $wgSitename; - $rctitle = SpecialPage::getTitleFor( 'Recentchanges' ); - $ret .= $this->feedLink( - 'rss', - $rctitle->getFullURL( 'feed=rss' ), - wfMsg( 'site-rss-feed', $wgSitename ) ); - $ret .= $this->feedLink( - 'atom', - $rctitle->getFullURL( 'feed=atom' ), - wfMsg( 'site-atom-feed', $wgSitename ) ); + if( is_string( $this->getFeedAppendQuery() ) ) { + $appendQuery = "&" . $this->getFeedAppendQuery(); + } else { + $appendQuery = ""; + } - return $ret; + foreach( $wgFeedClasses as $format => $class ) { + $links[$format] = $wgTitle->getLocalUrl( "feed=$format{$appendQuery}" ); + } + } + return $links; } - + /** * Generate a for an RSS feed. */ @@ -1323,22 +1606,140 @@ class OutputPage { 'rel' => 'alternate', 'type' => "application/$type+xml", 'title' => $text, - 'href' => $url ) ) . "\n"; + '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. - * @todo i18n */ public function rateLimited() { - global $wgOut; - $wgOut->disable(); - wfHttpError( 500, 'Internal Server Error', - 'Sorry, the server has encountered an internal error. ' . - 'Please wait a moment and hit "refresh" to submit the request again.' ); + global $wgTitle; + + $this->setPageTitle(wfMsg('actionthrottled')); + $this->setRobotPolicy( 'noindex,follow' ); + $this->setArticleRelated( false ); + $this->enableClientCache( false ); + $this->mRedirect = ''; + $this->clearHTML(); + $this->setStatusCode(503); + $this->addWikiMsg( 'actionthrottledtext' ); + + $this->returnToMain( null, $wgTitle ); } - + /** * Show an "add new section" link? * @@ -1347,7 +1748,7 @@ class OutputPage { public function showNewSectionLink() { return $this->mNewSectionLink; } - + /** * Show a warning about slave lag * @@ -1367,5 +1768,74 @@ class OutputPage { $this->addHtml( "
\n{$warning}\n
\n" ); } } - + + /** + * Add a wikitext-formatted message to the output. + * This is equivalent to: + * + * $wgOut->addWikiText( wfMsgNoTrans( ... ) ) + */ + public function addWikiMsg( /*...*/ ) { + $args = func_get_args(); + $name = array_shift( $args ); + $this->addWikiMsgArray( $name, $args ); + } + + /** + * Add a wikitext-formatted message to the output. + * Like addWikiMsg() except the parameters are taken as an array + * instead of a variable argument list. + * + * $options is passed through to wfMsgExt(), see that function for details. + */ + public function addWikiMsgArray( $name, $args, $options = array() ) { + $options[] = 'parse'; + $text = wfMsgExt( $name, $options, $args ); + $this->addHTML( $text ); + } + + /** + * This function takes a number of message/argument specifications, wraps them in + * some overall structure, and then parses the result and adds it to the output. + * + * In the $wrap, $1 is replaced with the first message, $2 with the second, and so + * on. The subsequent arguments may either be strings, in which case they are the + * message names, or an arrays, in which case the first element is the message name, + * and subsequent elements are the parameters to that message. + * + * The special named parameter 'options' in a message specification array is passed + * through to the $options parameter of wfMsgExt(). + * + * Don't use this for messages that are not in users interface language. + * + * For example: + * + * $wgOut->wrapWikiMsg( '
$1
', 'some-error' ); + * + * Is equivalent to: + * + * $wgOut->addWikiText( '
' . wfMsgNoTrans( 'some-error' ) . '
' ); + */ + public function wrapWikiMsg( $wrap /*, ...*/ ) { + $msgSpecs = func_get_args(); + array_shift( $msgSpecs ); + $msgSpecs = array_values( $msgSpecs ); + $s = $wrap; + foreach ( $msgSpecs as $n => $spec ) { + $options = array(); + if ( is_array( $spec ) ) { + $args = $spec; + $name = array_shift( $args ); + if ( isset( $args['options'] ) ) { + $options = $args['options']; + unset( $args['options'] ); + } + } else { + $args = array(); + $name = $spec; + } + $s = str_replace( '$' . ($n+1), wfMsgExt( $name, $options, $args ), $s ); + } + $this->addHTML( $this->parse( $s, /*linestart*/true, /*uilang*/true ) ); + } }