protected $searchboxes = '';
/**#@-*/
protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
- protected $skinname = 'standard' ;
+ protected $skinname = 'standard';
+ // @fixme Should be protected :-\
+ var $mTitle = null;
/** Constructor, call parent constructor */
function Skin() { parent::__construct(); }
$skinDir = dir( $wgStyleDirectory );
# while code from www.php.net
- while (false !== ($file = $skinDir->read())) {
+ while( false !== ( $file = $skinDir->read() ) ) {
// Skip non-PHP files, hidden files, and '.dep' includes
$matches = array();
- if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
+ if( preg_match( '/^([^.]*)\.php$/', $file, $matches ) ) {
$aSkin = $matches[1];
$wgValidSkinNames[strtolower($aSkin)] = $aSkin;
}
}
return $wgValidSkinNames;
}
+
+ /**
+ * Fetch the list of usable skins in regards to $wgSkipSkins.
+ * Useful for Special:Preferences and other places where you
+ * only want to show skins users _can_ use.
+ * @return array of strings
+ */
+ public static function getUsableSkins() {
+ global $wgSkipSkins;
+ $usableSkins = self::getSkinNames();
+ foreach ( $wgSkipSkins as $skip ) {
+ unset( $usableSkins[$skip] );
+ }
+ return $usableSkins;
+ }
/**
* Normalize a skin preference value to a form that can be loaded.
return $q;
}
- function initPage( &$out ) {
- global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgScriptExtension;
+ function initPage( OutputPage $out ) {
+ global $wgFavicon, $wgAppleTouchIcon;
wfProfileIn( __METHOD__ );
- if( false !== $wgFavicon ) {
- $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
- }
-
+ # Generally the order of the favicon and apple-touch-icon links
+ # should not matter, but Konqueror (3.5.9 at least) incorrectly
+ # uses whichever one appears later in the HTML source. Make sure
+ # apple-touch-icon is specified first to avoid this.
if( false !== $wgAppleTouchIcon ) {
$out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
}
+ if( false !== $wgFavicon ) {
+ $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
+ }
+
# OpenSearch description link
$out->addLink( array(
'rel' => 'search',
'type' => 'application/opensearchdescription+xml',
- 'href' => "$wgScriptPath/opensearch_desc{$wgScriptExtension}",
+ 'href' => wfScript( 'opensearch_desc' ),
'title' => wfMsgForContent( 'opensearch-desc' ),
));
- $this->addMetadataLinks($out);
+ $this->addMetadataLinks( $out );
$this->mRevisionId = $out->mRevisionId;
* Preload the existence of three commonly-requested pages in a single query
*/
function preloadExistence() {
- global $wgUser, $wgTitle;
+ global $wgUser;
// User/talk link
$titles = array( $wgUser->getUserPage(), $wgUser->getTalkPage() );
// Other tab link
- if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+ if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
// nothing
- } elseif ( $wgTitle->isTalkPage() ) {
- $titles[] = $wgTitle->getSubjectPage();
+ } elseif ( $this->mTitle->isTalkPage() ) {
+ $titles[] = $this->mTitle->getSubjectPage();
} else {
- $titles[] = $wgTitle->getTalkPage();
+ $titles[] = $this->mTitle->getTalkPage();
}
$lb = new LinkBatch( $titles );
$lb->execute();
}
- function addMetadataLinks( &$out ) {
- global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
+ function addMetadataLinks( OutputPage $out ) {
+ global $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
global $wgRightsPage, $wgRightsUrl;
if( $out->isArticleRelated() ) {
$out->addMetadataLink( array(
'title' => 'Creative Commons',
'type' => 'application/rdf+xml',
- 'href' => $wgTitle->getLocalURL( 'action=creativecommons') ) );
+ 'href' => $this->mTitle->getLocalURL( 'action=creativecommons' ) )
+ );
}
if( $wgEnableDublinCoreRdf ) {
$out->addMetadataLink( array(
'title' => 'Dublin Core',
'type' => 'application/rdf+xml',
- 'href' => $wgTitle->getLocalURL( 'action=dublincore' ) ) );
+ 'href' => $this->mTitle->getLocalURL( 'action=dublincore' ) )
+ );
}
}
$copyright = '';
if( $copyright ) {
$out->addLink( array(
'rel' => 'copyright',
- 'href' => $copyright ) );
+ 'href' => $copyright )
+ );
}
}
- function outputPage( &$out ) {
- global $wgDebugComments;
+ /**
+ * Set some local variables
+ */
+ protected function setMembers(){
+ global $wgUser;
+ $this->mUser = $wgUser;
+ $this->userpage = $wgUser->getUserPage()->getPrefixedText();
+ $this->usercss = false;
+ }
+
+ /**
+ * Set the title
+ * @param Title $t The title to use
+ */
+ public function setTitle( $t ) {
+ $this->mTitle = $t;
+ }
+
+ /** Get the title */
+ public function getTitle() {
+ return $this->mTitle;
+ }
+ function outputPage( OutputPage $out ) {
+ global $wgDebugComments;
wfProfileIn( __METHOD__ );
+
+ $this->setMembers();
$this->initPage( $out );
- $out->out( $out->headElement() );
+ // See self::afterContentHook() for documentation
+ $afterContent = $this->afterContentHook();
+
+ $out->out( $out->headElement( $this ) );
$out->out( "\n<body" );
$ops = $this->getBodyOptions();
$out->out( $out->mBodytext . "\n" );
$out->out( $this->afterContent() );
+
+ $out->out( $afterContent );
$out->out( $this->bottomScripts() );
static function makeVariablesScript( $data ) {
global $wgJsMimeType;
- $r = array( "<script type= \"$wgJsMimeType\">/*<![CDATA[*/" );
+ $r = array( "<script type=\"$wgJsMimeType\">/*<![CDATA[*/" );
foreach ( $data as $name => $value ) {
$encValue = Xml::encodeJsVar( $value );
$r[] = "var $name = $encValue;";
* @param array $data Associative array containing one element:
* skinname => the skin name
* The odd calling convention is for backwards compatibility
+ * @TODO @FIXME Make this not depend on $wgTitle!
*/
static function makeGlobalVariablesScript( $data ) {
- global $wgScript, $wgStylePath, $wgUser;
+ global $wgScript, $wgTitle, $wgStylePath, $wgUser;
global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
- global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
+ global $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
global $wgUseAjax, $wgAjaxWatch;
global $wgVersion, $wgEnableAPI, $wgEnableWriteAPI;
$ns = $wgTitle->getNamespace();
$nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
+ $separatorTransTable = $wgContLang->separatorTransformTable();
+ $separatorTransTable = $separatorTransTable ? $separatorTransTable : array();
+ $compactSeparatorTransTable = array(
+ implode( "\t", array_keys( $separatorTransTable ) ),
+ implode( "\t", $separatorTransTable ),
+ );
+ $digitTransTable = $wgContLang->digitTransformTable();
+ $digitTransTable = $digitTransTable ? $digitTransTable : array();
+ $compactDigitTransTable = array(
+ implode( "\t", array_keys( $digitTransTable ) ),
+ implode( "\t", $digitTransTable ),
+ );
$vars = array(
'skin' => $data['skinname'],
'wgScriptPath' => $wgScriptPath,
'wgScript' => $wgScript,
'wgVariantArticlePath' => $wgVariantArticlePath,
- 'wgActionPaths' => $wgActionPaths,
+ 'wgActionPaths' => (object)$wgActionPaths,
'wgServer' => $wgServer,
'wgCanonicalNamespace' => $nsname,
'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBkey() ),
'wgVersion' => $wgVersion,
'wgEnableAPI' => $wgEnableAPI,
'wgEnableWriteAPI' => $wgEnableWriteAPI,
+ 'wgSeparatorTransformTable' => $compactSeparatorTransTable,
+ 'wgDigitTransformTable' => $compactDigitTransTable,
);
- if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false )){
+ if( $wgUseAjax && $wgEnableMWSuggest && !$wgUser->getOption( 'disablesuggest', false ) ){
$vars['wgMWSuggestTemplate'] = SearchEngine::getMWSuggestTemplate();
$vars['wgDBname'] = $wgDBname;
$vars['wgSearchNamespaces'] = SearchEngine::userNamespaces( $wgUser );
- $vars['wgMWSuggestMessages'] = array( wfMsg('search-mwsuggest-enabled'), wfMsg('search-mwsuggest-disabled'));
+ $vars['wgMWSuggestMessages'] = array( wfMsg( 'search-mwsuggest-enabled' ), wfMsg( 'search-mwsuggest-disabled' ) );
}
foreach( $wgRestrictionTypes as $type )
$vars['wgLivepreviewMessageError'] = wfMsg( 'livepreview-error' );
}
- if($wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
+ if ( $wgOut->isArticleRelated() && $wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
$msgs = (object)array();
foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching' ) as $msgName ) {
$msgs->{$msgName . 'Msg'} = wfMsg( $msgName );
$vars['wgAjaxWatch'] = $msgs;
}
+ // Allow extensions to add their custom variables to the global JS variables
+ wfRunHooks( 'MakeGlobalVariablesScript', array( &$vars ) );
+
return self::makeVariablesScript( $vars );
}
function getHeadScripts( $allowUserJs ) {
global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
- $r = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
+ $vars = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
- $r .= "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>\n";
+ $r = array( "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>" );
global $wgUseSiteJs;
- if ($wgUseSiteJs) {
+ if( $wgUseSiteJs ) {
$jsCache = $wgUser->isLoggedIn() ? '&smaxage=0' : '';
- $r .= "<script type=\"$wgJsMimeType\" src=\"".
- htmlspecialchars(self::makeUrl('-',
+ $r[] = "<script type=\"$wgJsMimeType\" src=\"".
+ htmlspecialchars( self::makeUrl( '-',
"action=raw$jsCache&gen=js&useskin=" .
urlencode( $this->getSkinName() ) ) ) .
- "\"><!-- site js --></script>\n";
+ "\"><!-- site js --></script>";
}
if( $allowUserJs && $wgUser->isLoggedIn() ) {
$userpage = $wgUser->getUserPage();
$userjs = htmlspecialchars( self::makeUrl(
$userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
- 'action=raw&ctype='.$wgJsMimeType));
- $r .= '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>\n";
+ 'action=raw&ctype='.$wgJsMimeType ) );
+ $r[] = '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>";
}
- return $r;
+ return $vars . "\t\t" . implode ( "\n\t\t", $r );
}
/**
* @private
*/
function userCanPreview( $action ) {
- global $wgTitle, $wgRequest, $wgUser;
+ global $wgRequest, $wgUser;
if( $action != 'submit' )
return false;
if( !$wgRequest->wasPosted() )
return false;
- if( !$wgTitle->userCanEditCssJsSubpage() )
+ if( !$this->mTitle->userCanEditCssJsSubpage() )
return false;
return $wgUser->matchEditToken(
$wgRequest->getVal( 'wpEditToken' ) );
}
- # get the user/site-specific stylesheet, SkinTemplate loads via RawPage.php (settings are cached that way)
- function getUserStylesheet() {
- global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
- $sheet = $this->getStylesheet();
- $s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
- $s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
- $s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
- if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";
-
- $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
- $s .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
- '@import "' . self::makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
-
- $s .= $this->doGetUserStyles();
- return $s."\n";
- }
-
/**
- * This returns MediaWiki:Common.js, and derived classes may add other JS.
- * Despite its name, it does *not* return any custom user JS from user
- * subpages. The returned script is sitewide and publicly cacheable and
- * therefore must not include anything that varies according to user,
- * interface language, etc. (although it may vary by skin). See
- * makeGlobalVariablesScript for things that can vary per page view and are
- * not cacheable.
+ * generated JavaScript action=raw&gen=js
+ * This returns MediaWiki:Common.js and MediaWiki:[Skinname].js concate-
+ * nated together. For some bizarre reason, it does *not* return any
+ * custom user JS from subpages. Huh?
*
- * @return string Raw JavaScript to be returned
+ * There's absolutely no reason to have separate Monobook/Common JSes.
+ * Any JS that cares can just check the skin variable generated at the
+ * top. For now Monobook.js will be maintained, but it should be consi-
+ * dered deprecated.
+ *
+ * @return string
*/
- public function getUserJs() {
+ public function generateUserJs() {
+ global $wgStylePath;
+
wfProfileIn( __METHOD__ );
- global $wgStylePath;
$s = "/* generated javascript */\n";
$s .= "var skin = '" . Xml::escapeJsString( $this->getSkinName() ) . "';\n";
$s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
$s .= "\n\n/* MediaWiki:Common.js */\n";
- $commonJs = wfMsgForContent('common.js');
- if ( !wfEmptyMsg ( 'common.js', $commonJs ) ) {
+ $commonJs = wfMsgForContent( 'common.js' );
+ if ( !wfEmptyMsg( 'common.js', $commonJs ) ) {
$s .= $commonJs;
}
+
+ $s .= "\n\n/* MediaWiki:".ucfirst( $this->getSkinName() ).".js */\n";
+ // avoid inclusion of non defined user JavaScript (with custom skins only)
+ // by checking for default message content
+ $msgKey = ucfirst( $this->getSkinName() ).'.js';
+ $userJS = wfMsgForContent( $msgKey );
+ if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
+ $s .= $userJS;
+ }
+
wfProfileOut( __METHOD__ );
return $s;
}
/**
- * Return html code that include User stylesheets
+ * Generate user stylesheet for action=raw&gen=css
*/
- function getUserStyles() {
- $s = "<style type='text/css'>\n";
- $s .= "/*/*/ /*<![CDATA[*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
- $s .= $this->getUserStylesheet();
- $s .= "/*]]>*/ /* */\n";
- $s .= "</style>\n";
+ public function generateUserStylesheet() {
+ wfProfileIn( __METHOD__ );
+ $s = "/* generated user stylesheet */\n" .
+ $this->reallyGenerateUserStylesheet();
+ wfProfileOut( __METHOD__ );
return $s;
}
-
+
/**
- * Some styles that are set by user through the user settings interface.
+ * Split for easier subclassing in SkinSimple, SkinStandard and SkinCologneBlue
*/
- function doGetUserStyles() {
- global $wgUser, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
-
- $s = '';
-
- if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
- if($wgTitle->isCssSubpage() && $this->userCanPreview( $wgRequest->getText( 'action' ) ) ) {
- $s .= $wgRequest->getText('wpTextbox1');
- } else {
- $userpage = $wgUser->getUserPage();
- $s.= '@import "'.self::makeUrl(
- $userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
- 'action=raw&ctype=text/css').'";'."\n";
- }
- }
-
- return $s . $this->reallyDoGetUserStyles();
- }
-
- function reallyDoGetUserStyles() {
+ protected function reallyGenerateUserStylesheet(){
global $wgUser;
$s = '';
- if (($undopt = $wgUser->getOption("underline")) < 2) {
+ if( ( $undopt = $wgUser->getOption( 'underline' ) ) < 2 ) {
$underline = $undopt ? 'underline' : 'none';
$s .= "a { text-decoration: $underline; }\n";
}
return $s;
}
+ /**
+ * @private
+ */
+ function setupUserCss( OutputPage $out ) {
+ global $wgRequest, $wgContLang, $wgUser;
+ global $wgAllowUserCss, $wgUseSiteCss, $wgSquidMaxage, $wgStylePath;
+
+ wfProfileIn( __METHOD__ );
+
+ $this->setupSkinUserCss( $out );
+
+ $siteargs = array(
+ 'action' => 'raw',
+ 'maxage' => $wgSquidMaxage,
+ );
+
+ // Add any extension CSS
+ foreach( $out->getExtStyle() as $tag ) {
+ $out->addStyle( $tag['href'] );
+ }
+
+ // If we use the site's dynamic CSS, throw that in, too
+ // Per-site custom styles
+ if( $wgUseSiteCss ) {
+ global $wgHandheldStyle;
+ $query = wfArrayToCGI( array(
+ 'usemsgcache' => 'yes',
+ 'ctype' => 'text/css',
+ 'smaxage' => $wgSquidMaxage
+ ) + $siteargs );
+ # Site settings must override extension css! (bug 15025)
+ $out->addStyle( self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) );
+ $out->addStyle( self::makeNSUrl( 'Print.css', $query, NS_MEDIAWIKI ), 'print' );
+ if( $wgHandheldStyle ) {
+ $out->addStyle( self::makeNSUrl( 'Handheld.css', $query, NS_MEDIAWIKI ), 'handheld' );
+ }
+ $out->addStyle( self::makeNSUrl( $this->getSkinName() . '.css', $query, NS_MEDIAWIKI ) );
+ }
+
+ if( $wgUser->isLoggedIn() ) {
+ // Ensure that logged-in users' generated CSS isn't clobbered
+ // by anons' publicly cacheable generated CSS.
+ $siteargs['smaxage'] = '0';
+ $siteargs['ts'] = $wgUser->mTouched;
+ }
+ // Per-user styles based on preferences
+ $siteargs['gen'] = 'css';
+ if( ( $us = $wgRequest->getVal( 'useskin', '' ) ) !== '' ) {
+ $siteargs['useskin'] = $us;
+ }
+ $out->addStyle( self::makeUrl( '-', wfArrayToCGI( $siteargs ) ) );
+
+ // Per-user custom style pages
+ if( $wgAllowUserCss && $wgUser->isLoggedIn() ) {
+ $action = $wgRequest->getVal( 'action' );
+ # If we're previewing the CSS page, use it
+ if( $this->mTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
+ $previewCss = $wgRequest->getText( 'wpTextbox1' );
+ // @FIXME: properly escape the cdata!
+ $this->usercss = "/*<![CDATA[*/\n" . $previewCss . "/*]]>*/";
+ } else {
+ $out->addStyle( self::makeUrl( $this->userpage . '/' . $this->getSkinName() .'.css',
+ 'action=raw&ctype=text/css' ) );
+ }
+ }
+
+ wfProfileOut( __METHOD__ );
+ }
+
+ /**
+ * Add skin specific stylesheets
+ * @param $out OutputPage
+ */
+ function setupSkinUserCss( OutputPage $out ) {
+ $out->addStyle( 'common/shared.css' );
+ $out->addStyle( 'common/oldshared.css' );
+ $out->addStyle( $this->getStylesheet() );
+ $out->addStyle( 'common/common_rtl.css', '', '', 'rtl' );
+ }
+
function getBodyOptions() {
- global $wgUser, $wgTitle, $wgOut, $wgRequest, $wgContLang;
+ global $wgUser, $wgOut, $wgRequest, $wgContLang;
extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
- if ( 0 != $wgTitle->getNamespace() ) {
+ if ( 0 != $this->mTitle->getNamespace() ) {
$a = array( 'bgcolor' => '#ffffec' );
}
else $a = array( 'bgcolor' => '#FFFFFF' );
- if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
- $wgTitle->userCan( 'edit' ) ) {
- $s = $wgTitle->getFullURL( $this->editUrlOptions() );
- $s = 'document.location = "' .wfEscapeJSString( $s ) .'";';
- $a += array ('ondblclick' => $s);
-
+ if( $wgOut->isArticle() && $wgUser->getOption( 'editondblclick' ) &&
+ $this->mTitle->quickUserCan( 'edit' ) ) {
+ $s = $this->mTitle->getFullURL( $this->editUrlOptions() );
+ $s = 'document.location = "' .Xml::escapeJsString( $s ) .'";';
+ $a += array( 'ondblclick' => $s );
}
$a['onload'] = $wgOut->getOnloadHandler();
$a['class'] =
- 'mediawiki ns-'.$wgTitle->getNamespace().
- ' '.($wgContLang->isRTL() ? "rtl" : "ltr").
- ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() );
+ 'mediawiki' .
+ ' '.( $wgContLang->isRTL() ? 'rtl' : 'ltr' ).
+ ' '.$this->getPageClasses( $this->mTitle ) .
+ ' skin-'. Sanitizer::escapeClass( $this->getSkinName() );
return $a;
}
+
+ function getPageClasses( $title ) {
+ $numeric = 'ns-'.$title->getNamespace();
+ if( $title->getNamespace() == NS_SPECIAL ) {
+ $type = 'ns-special';
+ } elseif( $title->isTalkPage() ) {
+ $type = 'ns-talk';
+ } else {
+ $type = 'ns-subject';
+ }
+ $name = Sanitizer::escapeClass( 'page-'.$title->getPrefixedText() );
+ return "$numeric $type $name";
+ }
/**
* URL to the logo
function doBeforeContent() {
global $wgContLang;
- $fname = 'Skin::doBeforeContent';
- wfProfileIn( $fname );
+ wfProfileIn( __METHOD__ );
$s = '';
$qb = $this->qbSetting();
$s .= "\n<div id='content'>\n<div id='topbar'>\n" .
"<table border='0' cellspacing='0' width='98%'>\n<tr>\n";
- $shove = ($qb != 0);
- $left = ($qb == 1 || $qb == 3);
- if($wgContLang->isRTL()) $left = !$left;
+ $shove = ( $qb != 0 );
+ $left = ( $qb == 1 || $qb == 3 );
+ if( $wgContLang->isRTL() ) $left = !$left;
- if ( !$shove ) {
+ if( !$shove ) {
$s .= "<td class='top' align='left' valign='top' rowspan='{$rows}'>\n" .
$this->logoText() . '</td>';
} elseif( $left ) {
$l = $wgContLang->isRTL() ? 'right' : 'left';
$s .= "<td {$borderhack} align='$l' valign='top'>\n";
- $s .= $this->topLinks() ;
+ $s .= $this->topLinks();
$s .= "<p class='subtitle'>" . $this->pageTitleLinks() . "</p>\n";
- $r = $wgContLang->isRTL() ? "left" : "right";
+ $r = $wgContLang->isRTL() ? 'left' : 'right';
$s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
$s .= $this->nameAndLogin();
$s .= "\n<br />" . $this->searchForm() . "</td>";
$s .= "\n<div id='siteNotice'>$notice</div>\n";
}
$s .= $this->pageTitle();
- $s .= $this->pageSubtitle() ;
+ $s .= $this->pageSubtitle();
$s .= $this->getCategories();
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $s;
}
function getCategoryLinks() {
- global $wgOut, $wgTitle, $wgUseCategoryBrowser;
+ global $wgOut, $wgUseCategoryBrowser;
global $wgContLang, $wgUser;
if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
# Separator
- $sep = wfMsgHtml( 'catseparator' );
+ $sep = wfMsgExt( 'catseparator', array( 'parsemag', 'escapenoentities' ) );
// Use Unicode bidi embedding override characters,
// to make sure links don't smash each other up in ugly ways.
$s = '';
$colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
if ( !empty( $allCats['normal'] ) ) {
- $t = $embed . implode ( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
+ $t = $embed . implode( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
$msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
$s .= '<div id="mw-normal-catlinks">' .
- $this->makeLinkObj( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
+ $this->link( Title::newFromText( wfMsgForContent( 'pagecategorieslink' ) ), $msg )
. $colon . $t . '</div>';
}
if ( isset( $allCats['hidden'] ) ) {
if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
$class ='mw-hidden-cats-user-shown';
- } elseif ( $wgTitle->getNamespace() == NS_CATEGORY ) {
+ } elseif ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
$class = 'mw-hidden-cats-ns-shown';
} else {
$class = 'mw-hidden-cats-hidden';
# optional 'dmoz-like' category browser. Will be shown under the list
# of categories an article belong to
- if($wgUseCategoryBrowser) {
+ if( $wgUseCategoryBrowser ){
$s .= '<br /><hr />';
# get a big array of the parents tree
- $parenttree = $wgTitle->getParentCategoryTree();
+ $parenttree = $this->mTitle->getParentCategoryTree();
# Skin object passed by reference cause it can not be
# accessed under the method subfunction drawCategoryBrowser
- $tempout = explode("\n", Skin::drawCategoryBrowser($parenttree, $this) );
+ $tempout = explode( "\n", Skin::drawCategoryBrowser( $parenttree, $this ) );
# Clean out bogus first entry and sort them
- unset($tempout[0]);
- asort($tempout);
+ unset( $tempout[0] );
+ asort( $tempout );
# Output one per line
- $s .= implode("<br />\n", $tempout);
+ $s .= implode( "<br />\n", $tempout );
}
return $s;
}
- /** Render the array as a serie of links.
+ /**
+ * Render the array as a serie of links.
* @param $tree Array: categories tree returned by Title::getParentCategoryTree
* @param &skin Object: skin passed by reference
* @return String separated by >, terminate with "\n"
*/
- function drawCategoryBrowser($tree, &$skin) {
+ function drawCategoryBrowser( $tree, &$skin ){
$return = '';
- foreach ($tree as $element => $parent) {
- if (empty($parent)) {
+ foreach( $tree as $element => $parent ) {
+ if( empty( $parent ) ) {
# element start a new list
$return .= "\n";
} else {
# grab the others elements
- $return .= Skin::drawCategoryBrowser($parent, $skin) . ' > ';
+ $return .= Skin::drawCategoryBrowser( $parent, $skin ) . ' > ';
}
# add our current element to the list
- $eltitle = Title::NewFromText($element);
- $return .= $skin->makeLinkObj( $eltitle, $eltitle->getText() ) ;
+ $eltitle = Title::newFromText( $element );
+ $return .= $skin->link( $eltitle, $eltitle->getText() );
}
return $return;
}
}
/**
- * This gets called shortly before the \</body\> tag.
- * @return String HTML to be put before \</body\>
+ * This runs a hook to allow extensions placing their stuff after content
+ * and article metadata (e.g. categories).
+ * Note: This function has nothing to do with afterContent().
+ *
+ * This hook is placed here in order to allow using the same hook for all
+ * skins, both the SkinTemplate based ones and the older ones, which directly
+ * use this class to get their data.
+ *
+ * The output of this function gets processed in SkinTemplate::outputPage() for
+ * the SkinTemplate based skins, all other skins should directly echo it.
+ *
+ * Returns an empty string by default, if not changed by any hook function.
+ */
+ protected function afterContentHook() {
+ $data = '';
+
+ if( wfRunHooks( 'SkinAfterContent', array( &$data ) ) ){
+ // adding just some spaces shouldn't toggle the output
+ // of the whole <div/>, so we use trim() here
+ if( trim( $data ) != '' ){
+ // Doing this here instead of in the skins to
+ // ensure that the div has the same ID in all
+ // skins
+ $data = "<div id='mw-data-after-content'>\n" .
+ "\t$data\n" .
+ "</div>\n";
+ }
+ } else {
+ wfDebug( "Hook SkinAfterContent changed output processing.\n" );
+ }
+
+ return $data;
+ }
+
+ /**
+ * Generate debug data HTML for displaying at the bottom of the main content
+ * area.
+ * @return String HTML containing debug data, if enabled (otherwise empty).
+ */
+ protected function generateDebugHTML() {
+ global $wgShowDebug, $wgOut;
+ if ( $wgShowDebug ) {
+ $listInternals = str_replace( "\n", "</li>\n<li>", htmlspecialchars( $wgOut->mDebugtext ) );
+ return "\n<hr>\n<strong>Debug data:</strong><ul style=\"font-family:monospace;\"><li>" .
+ $listInternals . "</li></ul>\n";
+ }
+ return '';
+ }
+
+ /**
+ * This gets called shortly before the </body> tag.
+ * @return String HTML to be put before </body>
*/
function afterContent() {
$printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
- return $printfooter . $this->doAfterContent();
+ return $printfooter . $this->generateDebugHTML() . $this->doAfterContent();
}
/**
- * This gets called shortly before the \</body\> tag.
- * @return String HTML-wrapped JS code to be put before \</body\>
+ * This gets called shortly before the </body> tag.
+ * @return String HTML-wrapped JS code to be put before </body>
*/
function bottomScripts() {
global $wgJsMimeType;
/** @return string Retrievied from HTML text */
function printSource() {
- global $wgTitle;
- $url = htmlspecialchars( $wgTitle->getFullURL() );
+ $url = htmlspecialchars( $this->mTitle->getFullURL() );
return wfMsg( 'retrievedfrom', '<a href="'.$url.'">'.$url.'</a>' );
}
}
/** overloaded by derived classes */
- function doAfterContent() { }
+ function doAfterContent() { return '</div></div>'; }
function pageTitleLinks() {
- global $wgOut, $wgTitle, $wgUser, $wgRequest;
+ global $wgOut, $wgUser, $wgRequest, $wgLang;
$oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
$action = $wgRequest->getText( 'action' );
- $s = $this->printableLink();
+ $s[] = $this->printableLink();
$disclaimer = $this->disclaimerLink(); # may be empty
if( $disclaimer ) {
- $s .= ' | ' . $disclaimer;
+ $s[] = $disclaimer;
}
$privacy = $this->privacyLink(); # may be empty too
if( $privacy ) {
- $s .= ' | ' . $privacy;
+ $s[] = $privacy;
}
if ( $wgOut->isArticleRelated() ) {
- if ( $wgTitle->getNamespace() == NS_IMAGE ) {
- $name = $wgTitle->getDBkey();
- $image = wfFindFile( $wgTitle );
+ if ( $this->mTitle->getNamespace() == NS_FILE ) {
+ $name = $this->mTitle->getDBkey();
+ $image = wfFindFile( $this->mTitle );
if( $image ) {
$link = htmlspecialchars( $image->getURL() );
$style = $this->getInternalLinkAttributes( $link, $name );
- $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
+ $s[] = "<a href=\"{$link}\"{$style}>{$name}</a>";
}
}
}
if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
- $s .= ' | ' . $this->makeKnownLinkObj( $wgTitle,
+ $s[] .= $this->makeKnownLinkObj( $this->mTitle,
wfMsg( 'currentrev' ) );
}
if ( $wgUser->getNewtalk() ) {
# do not show "You have new messages" text when we are viewing our
# own talk page
- if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
+ if( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) {
$tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessageslink' ), 'redirect=no' );
$dl = $this->makeKnownLinkObj( $wgUser->getTalkPage(), wfMsgHtml( 'newmessagesdifflink' ), 'diff=cur' );
- $s.= ' | <strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
+ $s[] = '<strong>'. wfMsg( 'youhavenewmessages', $tl, $dl ) . '</strong>';
# disable caching
- $wgOut->setSquidMaxage(0);
- $wgOut->enableClientCache(false);
+ $wgOut->setSquidMaxage( 0 );
+ $wgOut->enableClientCache( false );
}
}
$undelete = $this->getUndeleteLink();
if( !empty( $undelete ) ) {
- $s .= ' | '.$undelete;
+ $s[] = $undelete;
}
- return $s;
+ return $wgLang->pipeList( $s );
}
function getUndeleteLink() {
- global $wgUser, $wgTitle, $wgContLang, $wgLang, $action;
- if( $wgUser->isAllowed( 'deletedhistory' ) &&
- (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
- ($n = $wgTitle->isDeleted() ) )
- {
+ global $wgUser, $wgContLang, $wgLang, $wgRequest;
+
+ $action = $wgRequest->getVal( 'action', 'view' );
+
+ if ( $wgUser->isAllowed( 'deletedhistory' ) &&
+ ( $this->mTitle->getArticleId() == 0 || $action == 'history' ) &&
+ $n = $this->mTitle->isDeleted() ) {
if ( $wgUser->isAllowed( 'undelete' ) ) {
$msg = 'thisisdeleted';
} else {
}
return wfMsg( $msg,
$this->makeKnownLinkObj(
- SpecialPage::getTitleFor( 'Undelete', $wgTitle->getPrefixedDBkey() ),
+ SpecialPage::getTitleFor( 'Undelete', $this->mTitle->getPrefixedDBkey() ),
wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ) ) );
}
return '';
}
function printableLink() {
- global $wgOut, $wgFeedClasses, $wgRequest;
+ global $wgOut, $wgFeedClasses, $wgRequest, $wgLang;
$printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
- $s = "<a href=\"$printurl\">" . wfMsg( 'printableversion' ) . '</a>';
+ $s[] = "<a href=\"$printurl\" rel=\"alternate\">" . wfMsg( 'printableversion' ) . '</a>';
if( $wgOut->isSyndicated() ) {
foreach( $wgFeedClasses as $format => $class ) {
$feedurl = $wgRequest->escapeAppendQuery( "feed=$format" );
- $s .= " | <a href=\"$feedurl\">{$format}</a>";
+ $s[] = "<a href=\"$feedurl\" rel=\"alternate\" type=\"application/{$format}+xml\""
+ . " class=\"feedlink\">" . wfMsgHtml( "feed-$format" ) . "</a>";
}
}
- return $s;
+ return $wgLang->pipeList( $s );
}
function pageTitle() {
global $wgOut;
- $s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
+ $s = '<h1 class="pagetitle">' . $wgOut->getPageTitle() . '</h1>';
return $s;
}
$sub = $wgOut->getSubtitle();
if ( '' == $sub ) {
global $wgExtraSubtitle;
- $sub = wfMsg( 'tagline' ) . $wgExtraSubtitle;
+ $sub = wfMsgExt( 'tagline', 'parsemag' ) . $wgExtraSubtitle;
}
$subpages = $this->subPageSubtitle();
- $sub .= !empty($subpages)?"</p><p class='subpages'>$subpages":'';
+ $sub .= !empty( $subpages ) ? "</p><p class='subpages'>$subpages" : '';
$s = "<p class='subtitle'>{$sub}</p>\n";
return $s;
}
function subPageSubtitle() {
$subpages = '';
- if(!wfRunHooks('SkinSubPageSubtitle', array(&$subpages)))
+ if( !wfRunHooks( 'SkinSubPageSubtitle', array( &$subpages ) ) )
return $subpages;
- global $wgOut, $wgTitle;
- if($wgOut->isArticle() && MWNamespace::hasSubpages( $wgTitle->getNamespace() )) {
- $ptext=$wgTitle->getPrefixedText();
- if(preg_match('/\//',$ptext)) {
- $links = explode('/',$ptext);
+ global $wgOut;
+ if( $wgOut->isArticle() && MWNamespace::hasSubpages( $this->mTitle->getNamespace() ) ) {
+ $ptext = $this->mTitle->getPrefixedText();
+ if( preg_match( '/\//', $ptext ) ) {
+ $links = explode( '/', $ptext );
array_pop( $links );
$c = 0;
$growinglink = '';
$display = '';
- foreach($links as $link) {
+ foreach( $links as $link ) {
$growinglink .= $link;
$display .= $link;
$linkObj = Title::newFromText( $growinglink );
if( is_object( $linkObj ) && $linkObj->exists() ){
$getlink = $this->makeKnownLinkObj( $linkObj, htmlspecialchars( $display ) );
$c++;
- if ($c>1) {
- $subpages .= ' | ';
+ if( $c > 1 ) {
+ $subpages .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
} else {
$subpages .= '< ';
}
}
function nameAndLogin() {
- global $wgUser, $wgTitle, $wgLang, $wgContLang;
+ global $wgUser, $wgLang, $wgContLang;
- $lo = $wgContLang->specialPage( 'Userlogout' );
+ $logoutPage = $wgContLang->specialPage( 'Userlogout' );
- $s = '';
+ $ret = '';
if ( $wgUser->isAnon() ) {
if( $this->showIPinHeader() ) {
- $n = wfGetIP();
+ $name = wfGetIP();
- $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
- $wgLang->getNsText( NS_TALK ) );
+ $talkLink = $this->link( $wgUser->getTalkPage(),
+ $wgLang->getNsText( NS_TALK ) );
- $s .= $n . ' ('.$tl.')';
+ $ret .= "$name ($talkLink)";
} else {
- $s .= wfMsg('notloggedin');
+ $ret .= wfMsg( 'notloggedin' );
}
- $rt = $wgTitle->getPrefixedURL();
- if ( 0 == strcasecmp( urlencode( $lo ), $rt ) ) {
- $q = '';
- } else { $q = "returnto={$rt}"; }
+ $returnTo = $this->mTitle->getPrefixedDBkey();
+ $query = array();
+ if ( $logoutPage != $returnTo ) {
+ $query['returnto'] = $returnTo;
+ }
$loginlink = $wgUser->isAllowed( 'createaccount' )
? 'nav-login-createaccount'
: 'login';
- $s .= "\n<br />" . $this->makeKnownLinkObj(
+ $ret .= "\n<br />" . $this->link(
SpecialPage::getTitleFor( 'Userlogin' ),
- wfMsg( $loginlink ), $q );
+ wfMsg( $loginlink ), array(), $query
+ );
} else {
- $n = $wgUser->getName();
- $rt = $wgTitle->getPrefixedURL();
- $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
- $wgLang->getNsText( NS_TALK ) );
-
- $tl = " ({$tl})";
-
- $s .= $this->makeKnownLinkObj( $wgUser->getUserPage(),
- $n ) . "{$tl}<br />" .
- $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
- "returnto={$rt}" ) . ' | ' .
- $this->specialLink( 'preferences' );
- }
- $s .= ' | ' . $this->makeKnownLink( wfMsgForContent( 'helppage' ),
- wfMsg( 'help' ) );
-
- return $s;
+ $returnTo = $this->mTitle->getPrefixedDBkey();
+ $talkLink = $this->link( $wgUser->getTalkPage(),
+ $wgLang->getNsText( NS_TALK ) );
+
+ $ret .= $this->link( $wgUser->getUserPage(),
+ htmlspecialchars( $wgUser->getName() ) );
+ $ret .= " ($talkLink)<br />";
+ $ret .= $wgLang->pipeList( array(
+ $this->link(
+ SpecialPage::getTitleFor( 'Userlogout' ), wfMsg( 'logout' ),
+ array(), array( 'returnto' => $returnTo )
+ ),
+ $this->specialLink( 'preferences' ),
+ ) );
+ }
+ $ret = $wgLang->pipeList( array(
+ $ret,
+ $this->link(
+ Title::newFromText( wfMsgForContent( 'helppage' ) ),
+ wfMsg( 'help' )
+ ),
+ ) );
+
+ return $ret;
}
function getSearchLink() {
}
function searchForm() {
- global $wgRequest;
+ global $wgRequest, $wgUseTwoButtonsSearchForm;
$search = $wgRequest->getText( 'search' );
$s = '<form id="searchform'.$this->searchboxes.'" name="search" class="inline" method="post" action="'
. $this->escapeSearchLink() . "\">\n"
. '<input type="text" id="searchInput'.$this->searchboxes.'" name="search" size="19" value="'
- . htmlspecialchars(substr($search,0,256)) . "\" />\n"
- . '<input type="submit" name="go" value="' . wfMsg ('searcharticle') . '" /> '
- . '<input type="submit" name="fulltext" value="' . wfMsg ('searchbutton') . "\" />\n</form>";
+ . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" />\n"
+ . '<input type="submit" name="go" value="' . wfMsg( 'searcharticle' ) . '" />';
+
+ if( $wgUseTwoButtonsSearchForm )
+ $s .= ' <input type="submit" name="fulltext" value="' . wfMsg( 'searchbutton' ) . "\" />\n";
+ else
+ $s .= ' <a href="' . $this->escapeSearchLink() . '" rel="search">' . wfMsg( 'powersearch-legend' ) . "</a>\n";
+
+ $s .= '</form>';
// Ensure unique id's for search boxes made after the first
$this->searchboxes = $this->searchboxes == '' ? 2 : $this->searchboxes + 1;
-
+
return $s;
}
function topLinks() {
global $wgOut;
- $sep = " |\n";
- $s = $this->mainPageLink() . $sep
- . $this->specialLink( 'recentchanges' );
+ $s = array(
+ $this->mainPageLink(),
+ $this->specialLink( 'recentchanges' )
+ );
if ( $wgOut->isArticleRelated() ) {
- $s .= $sep . $this->editThisPage()
- . $sep . $this->historyLink();
+ $s[] = $this->editThisPage();
+ $s[] = $this->historyLink();
}
# Many people don't like this dropdown box
- #$s .= $sep . $this->specialPagesList();
+ #$s[] = $this->specialPagesList();
- $s .= $this->variantLinks();
+ if( $this->variantLinks() ) {
+ $s[] = $this->variantLinks();
+ }
- $s .= $this->extensionTabLinks();
+ if( $this->extensionTabLinks() ) {
+ $s[] = $this->extensionTabLinks();
+ }
- return $s;
+ // FIXME: Is using Language::pipeList impossible here? Do not quite understand the use of the newline
+ return implode( $s, wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n" );
}
/**
*/
function extensionTabLinks() {
$tabs = array();
- $s = '';
+ $out = '';
+ $s = array();
wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
foreach( $tabs as $tab ) {
- $s .= ' | ' . Xml::element( 'a',
+ $s[] = Xml::element( 'a',
array( 'href' => $tab['href'] ),
$tab['text'] );
}
- return $s;
+
+ if( count( $s ) ) {
+ global $wgLang;
+
+ $out = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
+ $out .= $wgLang->pipeList( $s );
+ }
+
+ return $out;
}
/**
function variantLinks() {
$s = '';
/* show links to different language variants */
- global $wgDisableLangConversion, $wgContLang, $wgTitle;
+ global $wgDisableLangConversion, $wgLang, $wgContLang;
$variants = $wgContLang->getVariants();
if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
foreach( $variants as $code ) {
$varname = $wgContLang->getVariantname( $code );
if( $varname == 'disable' )
continue;
- $s .= ' | <a href="' . $wgTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>';
+ $s = $wgLang->pipeList( array(
+ $s,
+ '<a href="' . $this->mTitle->escapeLocalUrl( 'variant=' . $code ) . '">' . htmlspecialchars( $varname ) . '</a>'
+ ) );
}
}
return $s;
}
function bottomLinks() {
- global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks;
- $sep = " |\n";
+ global $wgOut, $wgUser, $wgUseTrackbacks;
+ $sep = wfMsgExt( 'pipe-separator', 'escapenoentities' ) . "\n";
$s = '';
if ( $wgOut->isArticleRelated() ) {
- $s .= '<strong>' . $this->editThisPage() . '</strong>';
+ $element[] = '<strong>' . $this->editThisPage() . '</strong>';
if ( $wgUser->isLoggedIn() ) {
- $s .= $sep . $this->watchThisPage();
+ $element[] = $this->watchThisPage();
}
- $s .= $sep . $this->talkLink()
- . $sep . $this->historyLink()
- . $sep . $this->whatLinksHere()
- . $sep . $this->watchPageLinksLink();
-
- if ($wgUseTrackbacks)
- $s .= $sep . $this->trackbackLink();
+ $element[] = $this->talkLink();
+ $element[] = $this->historyLink();
+ $element[] = $this->whatLinksHere();
+ $element[] = $this->watchPageLinksLink();
- if ( $wgTitle->getNamespace() == NS_USER
- || $wgTitle->getNamespace() == NS_USER_TALK )
+ if( $wgUseTrackbacks )
+ $element[] = $this->trackbackLink();
- {
- $id=User::idFromName($wgTitle->getText());
- $ip=User::isIP($wgTitle->getText());
+ if ( $this->mTitle->getNamespace() == NS_USER
+ || $this->mTitle->getNamespace() == NS_USER_TALK ){
+ $id = User::idFromName( $this->mTitle->getText() );
+ $ip = User::isIP( $this->mTitle->getText() );
- if($id || $ip) { # both anons and non-anons have contri list
- $s .= $sep . $this->userContribsLink();
+ if( $id || $ip ) { # both anons and non-anons have contri list
+ $element[] = $this->userContribsLink();
}
if( $this->showEmailUser( $id ) ) {
- $s .= $sep . $this->emailUserLink();
+ $element[] = $this->emailUserLink();
}
}
- if ( $wgTitle->getArticleId() ) {
+
+ $s = implode( $element, $sep );
+
+ if ( $this->mTitle->getArticleId() ) {
$s .= "\n<br />";
- if($wgUser->isAllowed('delete')) { $s .= $this->deleteThisPage(); }
- if($wgUser->isAllowed('protect')) { $s .= $sep . $this->protectThisPage(); }
- if($wgUser->isAllowed('move')) { $s .= $sep . $this->moveThisPage(); }
+ if( $wgUser->isAllowed( 'delete' ) ) { $s .= $this->deleteThisPage(); }
+ if( $wgUser->isAllowed( 'protect' ) ) { $s .= $sep . $this->protectThisPage(); }
+ if( $wgUser->isAllowed( 'move' ) ) { $s .= $sep . $this->moveThisPage(); }
}
$s .= "<br />\n" . $this->otherLanguages();
}
+
return $s;
}
function pageStats() {
global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
- global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgTitle, $wgPageShowWatchingUsers;
+ global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgPageShowWatchingUsers;
$oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
if ( ! $wgOut->isArticle() ) { return ''; }
+ if( !$wgArticle instanceOf Article ) { return ''; }
if ( isset( $oldid ) || isset( $diff ) ) { return ''; }
if ( 0 == $wgArticle->getID() ) { return ''; }
}
}
- if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
- require_once('Credits.php');
- $s .= ' ' . getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+ if( $wgMaxCredits != 0 ){
+ $s .= ' ' . Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
} else {
- $s .= $this->lastModified();
+ $s .= $this->lastModified();
}
- if ($wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
+ if( $wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' ) ) {
$dbr = wfGetDB( DB_SLAVE );
- $watchlist = $dbr->tableName( 'watchlist' );
- $sql = "SELECT COUNT(*) AS n FROM $watchlist
- WHERE wl_title='" . $dbr->strencode($wgTitle->getDBkey()) .
- "' AND wl_namespace=" . $wgTitle->getNamespace() ;
- $res = $dbr->query( $sql, 'Skin::pageStats');
+ $res = $dbr->select( 'watchlist',
+ array( 'COUNT(*) AS n' ),
+ array( 'wl_title' => $dbr->strencode( $this->mTitle->getDBkey() ), 'wl_namespace' => $this->mTitle->getNamespace() ),
+ __METHOD__
+ );
$x = $dbr->fetchObject( $res );
$s .= ' ' . wfMsgExt( 'number_of_watching_users_pageview',
- array( 'parseinline' ), $wgLang->formatNum($x->n)
+ array( 'parseinline' ), $wgLang->formatNum( $x->n )
);
}
}
function getCopyright( $type = 'detect' ) {
- global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest;
+ global $wgRightsPage, $wgRightsUrl, $wgRightsText, $wgRequest, $wgArticle;
if ( $type == 'detect' ) {
- $oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
-
- if ( !is_null( $oldid ) && is_null( $diff ) && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+ $isCur = $wgArticle && $wgArticle->isCurrent();
+ if ( is_null( $diff ) && !$isCur && wfMsgForContent( 'history_copyright' ) !== '-' ) {
$type = 'history';
} else {
$type = 'normal';
$link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
} elseif( $wgRightsUrl ) {
$link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
+ } elseif( $wgRightsText ) {
+ $link = $wgRightsText;
} else {
# Give up now
return $out;
function lastModified() {
global $wgLang, $wgArticle;
if( $this->mRevisionId ) {
- $timestamp = Revision::getTimestampFromId( $this->mRevisionId, $wgArticle->getId() );
+ $timestamp = Revision::getTimestampFromId( $wgArticle->getTitle(), $this->mRevisionId );
} else {
$timestamp = $wgArticle->getTimestamp();
}
}
function logoText( $align = '' ) {
- if ( '' != $align ) { $a = " align='{$align}'"; }
- else { $a = ''; }
+ if ( '' != $align ) {
+ $a = " align='{$align}'";
+ } else {
+ $a = '';
+ }
$mp = wfMsg( 'mainpage' );
$mptitle = Title::newMainPage();
- $url = ( is_object($mptitle) ? $mptitle->escapeLocalURL() : '' );
+ $url = ( is_object( $mptitle ) ? $mptitle->escapeLocalURL() : '' );
$logourl = $this->getLogo();
$s = "<a href='{$url}'><img{$a} src='{$logourl}' alt='[{$mp}]' /></a>";
$sp = wfMsg( 'specialpages' );
$spp = $wgContLang->specialPage( 'Specialpages' );
- $s = '<form id="specialpages" method="get" class="inline" ' .
+ $s = '<form id="specialpages" method="get" ' .
'action="' . htmlspecialchars( "{$wgServer}{$wgRedirectScript}" ) . "\">\n";
$s .= "<select name=\"wpDropdown\">\n";
$s .= "<option value=\"{$spp}\">{$sp}</option>\n";
}
function editThisPage() {
- global $wgOut, $wgTitle;
+ global $wgOut;
if ( !$wgOut->isArticleRelated() ) {
$s = wfMsg( 'protectedpage' );
} else {
- if( $wgTitle->userCan( 'edit' ) && $wgTitle->exists() ) {
+ if( $this->mTitle->quickUserCan( 'edit' ) && $this->mTitle->exists() ) {
$t = wfMsg( 'editthispage' );
- } elseif( $wgTitle->userCan( 'create' ) && !$wgTitle->exists() ) {
+ } elseif( $this->mTitle->quickUserCan( 'create' ) && !$this->mTitle->exists() ) {
$t = wfMsg( 'create-this-page' );
} else {
$t = wfMsg( 'viewsource' );
}
- $s = $this->makeKnownLinkObj( $wgTitle, $t, $this->editUrlOptions() );
+ $s = $this->makeKnownLinkObj( $this->mTitle, $t, $this->editUrlOptions() );
}
return $s;
}
global $wgArticle;
if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
- return "action=edit&oldid=" . intval( $this->mRevisionId );
+ return 'action=edit&oldid=' . intval( $this->mRevisionId );
} else {
- return "action=edit";
+ return 'action=edit';
}
}
function deleteThisPage() {
- global $wgUser, $wgTitle, $wgRequest;
+ global $wgUser, $wgRequest;
$diff = $wgRequest->getVal( 'diff' );
- if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
+ if ( $this->mTitle->getArticleId() && ( !$diff ) && $wgUser->isAllowed( 'delete' ) ) {
$t = wfMsg( 'deletethispage' );
- $s = $this->makeKnownLinkObj( $wgTitle, $t, 'action=delete' );
+ $s = $this->makeKnownLinkObj( $this->mTitle, $t, 'action=delete' );
} else {
$s = '';
}
}
function protectThisPage() {
- global $wgUser, $wgTitle, $wgRequest;
+ global $wgUser, $wgRequest;
$diff = $wgRequest->getVal( 'diff' );
- if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
- if ( $wgTitle->isProtected() ) {
+ if ( $this->mTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
+ if ( $this->mTitle->isProtected() ) {
$t = wfMsg( 'unprotectthispage' );
$q = 'action=unprotect';
} else {
$t = wfMsg( 'protectthispage' );
$q = 'action=protect';
}
- $s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
+ $s = $this->makeKnownLinkObj( $this->mTitle, $t, $q );
} else {
$s = '';
}
}
function watchThisPage() {
- global $wgOut, $wgTitle;
+ global $wgOut;
++$this->mWatchLinkNum;
if ( $wgOut->isArticleRelated() ) {
- if ( $wgTitle->userIsWatching() ) {
+ if ( $this->mTitle->userIsWatching() ) {
$t = wfMsg( 'unwatchthispage' );
$q = 'action=unwatch';
- $id = "mw-unwatch-link".$this->mWatchLinkNum;
+ $id = 'mw-unwatch-link' . $this->mWatchLinkNum;
} else {
$t = wfMsg( 'watchthispage' );
$q = 'action=watch';
- $id = 'mw-watch-link'.$this->mWatchLinkNum;
+ $id = 'mw-watch-link' . $this->mWatchLinkNum;
}
- $s = $this->makeKnownLinkObj( $wgTitle, $t, $q, '', '', " id=\"$id\"" );
+ $s = $this->makeKnownLinkObj( $this->mTitle, $t, $q, '', '', " id=\"$id\"" );
} else {
$s = wfMsg( 'notanarticle' );
}
}
function moveThisPage() {
- global $wgTitle;
-
- if ( $wgTitle->userCan( 'move' ) ) {
+ if ( $this->mTitle->quickUserCan( 'move' ) ) {
return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
- wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
+ wfMsg( 'movethispage' ), 'target=' . $this->mTitle->getPrefixedURL() );
} else {
// no message if page is protected - would be redundant
return '';
}
function historyLink() {
- global $wgTitle;
-
- return $this->makeKnownLinkObj( $wgTitle,
- wfMsg( 'history' ), 'action=history' );
+ return $this->link( $this->mTitle, wfMsg( 'history' ),
+ array( 'rel' => 'archives' ), array( 'action' => 'history' ) );
}
function whatLinksHere() {
- global $wgTitle;
-
return $this->makeKnownLinkObj(
- SpecialPage::getTitleFor( 'Whatlinkshere', $wgTitle->getPrefixedDBkey() ),
+ SpecialPage::getTitleFor( 'Whatlinkshere', $this->mTitle->getPrefixedDBkey() ),
wfMsg( 'whatlinkshere' ) );
}
function userContribsLink() {
- global $wgTitle;
-
return $this->makeKnownLinkObj(
- SpecialPage::getTitleFor( 'Contributions', $wgTitle->getDBkey() ),
+ SpecialPage::getTitleFor( 'Contributions', $this->mTitle->getDBkey() ),
wfMsg( 'contributions' ) );
}
function showEmailUser( $id ) {
- global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
- return $wgEnableEmail &&
- $wgEnableUserEmail &&
- $wgUser->isLoggedIn() && # show only to signed in users
- 0 != $id; # we can only email to non-anons ..
-# '' != $id->getEmail() && # who must have an email address stored ..
-# 0 != $id->getEmailauthenticationtimestamp() && # .. which is authenticated
-# 1 != $wgUser->getOption('disablemail'); # and not disabled
+ global $wgUser;
+ $targetUser = User::newFromId( $id );
+ return $wgUser->canSendEmail() && # the sending user must have a confirmed email address
+ $targetUser->canReceiveEmail(); # the target user must have a confirmed email address and allow emails from users
}
function emailUserLink() {
- global $wgTitle;
-
return $this->makeKnownLinkObj(
- SpecialPage::getTitleFor( 'Emailuser', $wgTitle->getDBkey() ),
+ SpecialPage::getTitleFor( 'Emailuser', $this->mTitle->getDBkey() ),
wfMsg( 'emailuser' ) );
}
function watchPageLinksLink() {
- global $wgOut, $wgTitle;
-
+ global $wgOut;
if ( ! $wgOut->isArticleRelated() ) {
return '(' . wfMsg( 'notanarticle' ) . ')';
} else {
return $this->makeKnownLinkObj(
- SpecialPage::getTitleFor( 'Recentchangeslinked', $wgTitle->getPrefixedDBkey() ),
+ SpecialPage::getTitleFor( 'Recentchangeslinked', $this->mTitle->getPrefixedDBkey() ),
wfMsg( 'recentchangeslinked' ) );
}
}
function trackbackLink() {
- global $wgTitle;
-
- return "<a href=\"" . $wgTitle->trackbackURL() . "\">"
- . wfMsg('trackbacklink') . "</a>";
+ return '<a href="' . $this->mTitle->trackbackURL() . '">'
+ . wfMsg( 'trackbacklink' ) . '</a>';
}
function otherLanguages() {
return '';
}
- $s = wfMsg( 'otherlanguages' ) . ': ';
+ $s = wfMsg( 'otherlanguages' ) . wfMsg( 'colon-separator' );
$first = true;
- if($wgContLang->isRTL()) $s .= '<span dir="LTR">';
+ if( $wgContLang->isRTL() ) $s .= '<span dir="LTR">';
foreach( $a as $l ) {
- if ( ! $first ) { $s .= ' | '; }
+ if ( !$first ) {
+ $s .= wfMsgExt( 'pipe-separator', 'escapenoentities' );
+ }
$first = false;
$nt = Title::newFromText( $l );
$style = $this->getExternalLinkAttributes( $l, $text );
$s .= "<a href=\"{$url}\"{$style}>{$text}</a>";
}
- if($wgContLang->isRTL()) $s .= '</span>';
- return $s;
- }
-
- function bugReportsLink() {
- $s = $this->makeKnownLink( wfMsgForContent( 'bugreportspage' ),
- wfMsg( 'bugreports' ) );
+ if( $wgContLang->isRTL() ) $s .= '</span>';
return $s;
}
function talkLink() {
- global $wgTitle;
-
- if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
+ if ( NS_SPECIAL == $this->mTitle->getNamespace() ) {
# No discussion links for special pages
return '';
}
- if( $wgTitle->isTalkPage() ) {
- $link = $wgTitle->getSubjectPage();
+ $linkOptions = array();
+
+ if( $this->mTitle->isTalkPage() ) {
+ $link = $this->mTitle->getSubjectPage();
switch( $link->getNamespace() ) {
case NS_MAIN:
$text = wfMsg( 'articlepage' );
case NS_PROJECT:
$text = wfMsg( 'projectpage' );
break;
- case NS_IMAGE:
+ case NS_FILE:
$text = wfMsg( 'imagepage' );
+ # Make link known if image exists, even if the desc. page doesn't.
+ if( wfFindFile( $link ) )
+ $linkOptions[] = 'known';
break;
case NS_MEDIAWIKI:
$text = wfMsg( 'mediawikipage' );
$text = wfMsg( 'articlepage' );
}
} else {
- $link = $wgTitle->getTalkPage();
+ $link = $this->mTitle->getTalkPage();
$text = wfMsg( 'talkpage' );
}
- $s = $this->makeLinkObj( $link, $text );
+ $s = $this->link( $link, $text, array(), array(), $linkOptions );
return $s;
}
function commentLink() {
- global $wgTitle, $wgOut;
+ global $wgOut;
- if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+ if ( $this->mTitle->getNamespace() == NS_SPECIAL ) {
return '';
}
# __NEWSECTIONLINK___ changes behaviour here
# If it's present, the link points to this page, otherwise
# it points to the talk page
- if( $wgTitle->isTalkPage() ) {
- $title = $wgTitle;
+ if( $this->mTitle->isTalkPage() ) {
+ $title = $this->mTitle;
} elseif( $wgOut->showNewSectionLink() ) {
- $title = $wgTitle;
+ $title = $this->mTitle;
} else {
- $title = $wgTitle->getTalkPage();
+ $title = $this->mTitle->getTalkPage();
}
return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit§ion=new' );
$bar = array();
$lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
$heading = '';
- foreach ($lines as $line) {
- if (strpos($line, '*') !== 0)
+ foreach( $lines as $line ) {
+ if( strpos( $line, '*' ) !== 0 )
continue;
- if (strpos($line, '**') !== 0) {
- $line = trim($line, '* ');
- if ( $line == 'SEARCH' || $line == 'TOOLBOX' || $line == 'LANGUAGES' ) {
- # Special box type
- $bar[$line] = array();
- } else {
- $heading = $line;
- }
+ if( strpos( $line, '**') !== 0 ) {
+ $heading = trim( $line, '* ' );
+ if( !array_key_exists( $heading, $bar ) ) $bar[$heading] = array();
} else {
- if (strpos($line, '|') !== false) { // sanity check
- $line = array_map('trim', explode( '|' , trim($line, '* '), 2 ) );
+ if( strpos( $line, '|' ) !== false ) { // sanity check
+ $line = array_map( 'trim', explode( '|', trim( $line, '* ' ), 2 ) );
$link = wfMsgForContent( $line[0] );
- if ($link == '-')
+ if( $link == '-' )
continue;
- if (wfEmptyMsg($line[1], $text = wfMsg($line[1])))
+
+ $text = wfMsgExt( $line[1], 'parsemag' );
+ if( wfEmptyMsg( $line[1], $text ) )
$text = $line[1];
- if (wfEmptyMsg($line[0], $link))
+ if( wfEmptyMsg( $line[0], $link ) )
$link = $line[0];
if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
$bar[$heading][] = array(
'text' => $text,
'href' => $href,
- 'id' => 'n-' . strtr($line[1], ' ', '-'),
+ 'id' => 'n-' . strtr( $line[1], ' ', '-' ),
'active' => false
);
} else { continue; }
}
}
+ wfRunHooks( 'SkinBuildSidebar', array( $this, &$bar ) );
if ( $wgEnableSidebarCache ) $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
wfProfileOut( __METHOD__ );
return $bar;