X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FSkinTemplate.php;h=a4e5eff3cf5767d94a9bf99da6c06b12a7a11dd9;hb=aca7cbdebe313537aa10a218a978c13d40992bdb;hp=581772d3e32eecd57d0ee6b6f95dcb66a7b2a152;hpb=93f0afe54817d0e33c55eb1f9d7312f77a1789b4;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 581772d3e3..a4e5eff3cf 100644
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -22,18 +22,17 @@ if ( ! defined( 'MEDIAWIKI' ) )
* to be passed to the template engine.
*
* @private
- * @addtogroup Skins
+ * @ingroup Skins
*/
class MediaWiki_I18N {
var $_context = array();
- function set($varName, $value) {
+ function set( $varName, $value ) {
$this->_context[$varName] = $value;
}
- function translate($value) {
- $fname = 'SkinTemplate-translate';
- wfProfileIn( $fname );
+ function translate( $value ) {
+ wfProfileIn( __METHOD__ );
// Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
$value = preg_replace( '/^string:/', '', $value );
@@ -41,14 +40,14 @@ class MediaWiki_I18N {
$value = wfMsg( $value );
// interpolate variables
$m = array();
- while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
- list($src, $var) = $m;
+ while( preg_match( '/\$([0-9]*?)/sm', $value, $m ) ) {
+ list( $src, $var ) = $m;
wfSuppressWarnings();
$varValue = $this->_context[$var];
wfRestoreWarnings();
- $value = str_replace($src, $varValue, $value);
+ $value = str_replace( $src, $varValue, $value );
}
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $value;
}
}
@@ -63,7 +62,7 @@ class MediaWiki_I18N {
* to the computations individual esi snippets need. Most importantly no body
* parsing for most of those of course.
*
- * @addtogroup Skins
+ * @ingroup Skins
*/
class SkinTemplate extends Skin {
/**#@+
@@ -71,37 +70,45 @@ class SkinTemplate extends Skin {
*/
/**
- * Name of our skin, set in initPage()
- * It probably need to be all lower case.
+ * Name of our skin, it probably needs to be all lower case. Child classes
+ * should override the default.
*/
- var $skinname;
+ var $skinname = 'monobook';
/**
- * Stylesheets set to use
- * Sub directory in ./skins/ where various stylesheets are located
+ * Stylesheets set to use. Subdirectory in skins/ where various stylesheets
+ * are located. Child classes should override the default.
*/
- var $stylename;
+ var $stylename = 'monobook';
/**
- * For QuickTemplate, the name of the subclass which
- * will actually fill the template.
+ * For QuickTemplate, the name of the subclass which will actually fill the
+ * template. Child classes should override the default.
*/
- var $template;
+ var $template = 'QuickTemplate';
/**#@-*/
/**
- * Setup the base parameters...
- * Child classes should override this to set the name,
- * style subdirectory, and template filler callback.
+ * Add specific styles for this skin
*
- * @param OutputPage $out
+ * @param $out OutputPage
*/
- function initPage( &$out ) {
- parent::initPage( $out );
- $this->skinname = 'monobook';
- $this->stylename = 'monobook';
- $this->template = 'QuickTemplate';
+ function setupSkinUserCss( OutputPage $out ){
+ $out->addStyle( 'common/shared.css', 'screen' );
+ $out->addStyle( 'common/commonPrint.css', 'print' );
+ }
+ /* add specific javascript the base Skin class */
+ function setupSkinUserJs( OutputPage $out ){
+ global $wgUseSiteJs;
+ //use site js:
+ if( $wgUseSiteJs ) {
+ $jsCache = $this->loggedin ? '&smaxage=0' : '';
+ $siteGenScriptFile = self::makeUrl( '-',
+ "action=raw$jsCache&gen=js&useskin=" .
+ urlencode( $this->getSkinName() ) ) ;
+ $this->jsvarurl = $siteGenScriptFile;
+ }
}
/**
@@ -109,61 +116,61 @@ class SkinTemplate extends Skin {
* and eventually it spits out some HTML. Should have interface
* roughly equivalent to PHPTAL 0.7.
*
- * @param string $callback (or file)
- * @param string $repository subdirectory where we keep template files
- * @param string $cache_dir
+ * @param $callback string (or file)
+ * @param $repository string: subdirectory where we keep template files
+ * @param $cache_dir string
* @return object
* @private
*/
- function setupTemplate( $classname, $repository=false, $cache_dir=false ) {
+ function setupTemplate( $classname, $repository = false, $cache_dir = false ) {
return new $classname();
}
/**
* initialize various variables and generate the template
*
- * @param OutputPage $out
- * @public
+ * @param $out OutputPage
*/
- function outputPage( &$out ) {
- global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
+ function outputPage( OutputPage $out ) {
+ global $wgArticle, $wgUser, $wgLang, $wgContLang;
global $wgScript, $wgStylePath, $wgContLanguageCode;
global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
- global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
+ global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
global $wgMaxCredits, $wgShowCreditsIfMax;
global $wgPageShowWatchingUsers;
- global $wgUseTrackbacks;
- global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
+ global $wgUseTrackbacks, $wgUseSiteJs;
+ global $wgArticlePath, $wgScriptPath, $wgServer, $wgCanonicalNamespaceNames;
- $fname = 'SkinTemplate::outputPage';
- wfProfileIn( $fname );
+ wfProfileIn( __METHOD__ );
$oldid = $wgRequest->getVal( 'oldid' );
$diff = $wgRequest->getVal( 'diff' );
+ $action = $wgRequest->getVal( 'action', 'view' );
- wfProfileIn( "$fname-init" );
+ wfProfileIn( __METHOD__ . '-init' );
$this->initPage( $out );
- $this->mTitle =& $wgTitle;
- $this->mUser =& $wgUser;
-
+ $this->setMembers();
$tpl = $this->setupTemplate( $this->template, 'skins' );
#if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
- $tpl->setTranslator(new MediaWiki_I18N());
+ $tpl->setTranslator( new MediaWiki_I18N() );
#}
- wfProfileOut( "$fname-init" );
+ wfProfileOut( __METHOD__ . '-init' );
- wfProfileIn( "$fname-stuff" );
- $this->thispage = $this->mTitle->getPrefixedDbKey();
+ wfProfileIn( __METHOD__ . '-stuff' );
+ $this->thispage = $this->mTitle->getPrefixedDBkey();
$this->thisurl = $this->mTitle->getPrefixedURL();
+ $query = $wgRequest->getValues();
+ unset( $query['title'] );
+ unset( $query['returnto'] );
+ unset( $query['returntoquery'] );
+ $this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
$this->loggedin = $wgUser->isLoggedIn();
- $this->iscontent = ($this->mTitle->getNamespace() != NS_SPECIAL );
- $this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
+ $this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );
+ $this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) );
$this->username = $wgUser->getName();
- $userPage = $wgUser->getUserPage();
- $this->userpage = $userPage->getPrefixedText();
if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
$this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
@@ -173,21 +180,22 @@ class SkinTemplate extends Skin {
$this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
}
- $this->usercss = $this->userjs = $this->userjsprev = false;
- $this->setupUserCss();
+ $this->userjs = $this->userjsprev = false;
+ $this->setupUserCss( $out );
$this->setupUserJs( $out->isUserJsAllowed() );
$this->titletxt = $this->mTitle->getPrefixedText();
- wfProfileOut( "$fname-stuff" );
+ wfProfileOut( __METHOD__ . '-stuff' );
- wfProfileIn( "$fname-stuff2" );
- $tpl->set( 'title', $wgOut->getPageTitle() );
- $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
- $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
- $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$this->mTitle->getPrefixedText() ) );
+ wfProfileIn( __METHOD__ . '-stuff2' );
+ $tpl->set( 'title', $out->getPageTitle() );
+ $tpl->set( 'pagetitle', $out->getHTMLTitle() );
+ $tpl->set( 'displaytitle', $out->mPageLinkTitle );
+ $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
+ $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) );
$nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
- $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
- $this->mTitle->getNsText();
+ $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
+ $this->mTitle->getNsText();
$tpl->set( 'nscanonical', $nsname );
$tpl->set( 'nsnumber', $this->mTitle->getNamespace() );
@@ -196,36 +204,37 @@ class SkinTemplate extends Skin {
$tpl->set( 'articleid', $this->mTitle->getArticleId() );
$tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
- $tpl->set( 'isarticle', $wgOut->isArticle() );
+ $tpl->set( 'isarticle', $out->isArticle() );
- $tpl->setRef( "thispage", $this->thispage );
+ $tpl->setRef( 'thispage', $this->thispage );
$subpagestr = $this->subPageSubtitle();
$tpl->set(
- 'subtitle', !empty($subpagestr)?
- ''.$subpagestr.''.$out->getSubtitle():
+ 'subtitle', !empty( $subpagestr ) ?
+ ''.$subpagestr.''.$out->getSubtitle() :
$out->getSubtitle()
);
$undelete = $this->getUndeleteLink();
$tpl->set(
- "undelete", !empty($undelete)?
- ''.$undelete.'':
+ 'undelete', !empty( $undelete ) ?
+ ''.$undelete.'' :
''
);
- $tpl->set( 'catlinks', $this->getCategories());
- if( $wgOut->isSyndicated() ) {
+ $tpl->set( 'catlinks', $this->getCategories() );
+ if( $out->isSyndicated() ) {
$feeds = array();
- foreach( $wgOut->getSyndicationLinks() as $format => $link ) {
+ foreach( $out->getSyndicationLinks() as $format => $link ) {
$feeds[$format] = array(
'text' => wfMsg( "feed-$format" ),
- 'href' => $link );
+ 'href' => $link
+ );
}
$tpl->setRef( 'feeds', $feeds );
} else {
$tpl->set( 'feeds', false );
}
- if ($wgUseTrackbacks && $out->isArticleRelated()) {
- $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() );
+ if( $wgUseTrackbacks && $out->isArticleRelated() ) {
+ $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() );
} else {
$tpl->set( 'trackbackhtml', null );
}
@@ -236,15 +245,18 @@ class SkinTemplate extends Skin {
$tpl->setRef( 'jsmimetype', $wgJsMimeType );
$tpl->setRef( 'charset', $wgOutputEncoding );
$tpl->set( 'headlinks', $out->getHeadLinks() );
- $tpl->set('headscripts', $out->getScript() );
+
+ //moved headscripts to near end of template header output
+
+ $tpl->set( 'csslinks', $out->buildCssLinks() );
$tpl->setRef( 'wgScript', $wgScript );
$tpl->setRef( 'skinname', $this->skinname );
$tpl->set( 'skinclass', get_class( $this ) );
$tpl->setRef( 'stylename', $this->stylename );
$tpl->set( 'printable', $wgRequest->getBool( 'printable' ) );
+ $tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
$tpl->setRef( 'loggedin', $this->loggedin );
- $tpl->set('nsclass', 'ns-'.$this->mTitle->getNamespace());
- $tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
+ $tpl->set( 'notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL );
/* XXX currently unused, might get useful later
$tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
$tpl->set( "exists", $this->mTitle->getArticleID() != 0 );
@@ -253,140 +265,155 @@ class SkinTemplate extends Skin {
$tpl->set( "helppage", wfMsg('helppage'));
*/
$tpl->set( 'searchaction', $this->escapeSearchLink() );
+ $tpl->set( 'searchtitle', SpecialPage::getTitleFor( 'Search' )->getPrefixedDBKey() );
$tpl->set( 'search', trim( $wgRequest->getVal( 'search' ) ) );
$tpl->setRef( 'stylepath', $wgStylePath );
$tpl->setRef( 'articlepath', $wgArticlePath );
$tpl->setRef( 'scriptpath', $wgScriptPath );
$tpl->setRef( 'serverurl', $wgServer );
$tpl->setRef( 'logopath', $wgLogo );
- $tpl->setRef( "lang", $wgContLanguageCode );
- $tpl->set( 'dir', $wgContLang->isRTL() ? "rtl" : "ltr" );
+ $tpl->setRef( 'lang', $wgContLanguageCode );
+ $tpl->set( 'dir', $wgContLang->isRTL() ? 'rtl' : 'ltr' );
$tpl->set( 'rtl', $wgContLang->isRTL() );
+ $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
$tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
$tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
$tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
- $tpl->setRef( 'userpage', $this->userpage);
- $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
+ $tpl->setRef( 'userpage', $this->userpage );
+ $tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href'] );
$tpl->set( 'userlang', $wgLang->getCode() );
+ $tpl->set( 'userlangattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '"' );
$tpl->set( 'pagecss', $this->setupPageCss() );
- $tpl->set( 'printcss', $this->getPrintCss() );
- $tpl->setRef( 'usercss', $this->usercss);
- $tpl->setRef( 'userjs', $this->userjs);
- $tpl->setRef( 'userjsprev', $this->userjsprev);
- global $wgUseSiteJs;
- if ($wgUseSiteJs) {
+ $tpl->setRef( 'usercss', $this->usercss );
+ $tpl->setRef( 'userjs', $this->userjs );
+ $tpl->setRef( 'userjsprev', $this->userjsprev );
+ if( $wgUseSiteJs ) {
$jsCache = $this->loggedin ? '&smaxage=0' : '';
$tpl->set( 'jsvarurl',
- self::makeUrl('-',
+ self::makeUrl( '-',
"action=raw$jsCache&gen=js&useskin=" .
urlencode( $this->getSkinName() ) ) );
} else {
- $tpl->set('jsvarurl', false);
+ $tpl->set( 'jsvarurl', false );
}
+
$newtalks = $wgUser->getNewMessageLinks();
- if (count($newtalks) == 1 && $newtalks[0]["wiki"] === wfWikiID() ) {
+ if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
$usertitle = $this->mUser->getUserPage();
$usertalktitle = $usertitle->getTalkPage();
+
if( !$usertalktitle->equals( $this->mTitle ) ) {
- $ntl = wfMsg( 'youhavenewmessages',
- $this->makeKnownLinkObj(
- $usertalktitle,
- wfMsgHtml( 'newmessageslink' ),
- 'redirect=no'
- ),
- $this->makeKnownLinkObj(
- $usertalktitle,
- wfMsgHtml( 'newmessagesdifflink' ),
- 'diff=cur'
- )
+ $newmessageslink = $this->link(
+ $usertalktitle,
+ wfMsgHtml( 'newmessageslink' ),
+ array(),
+ array( 'redirect' => 'no' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $newmessagesdifflink = $this->link(
+ $usertalktitle,
+ wfMsgHtml( 'newmessagesdifflink' ),
+ array(),
+ array( 'diff' => 'cur' ),
+ array( 'known', 'noclasses' )
+ );
+
+ $newmessagesnumber = $wgUser->getNewtalkNumber();
+
+ $ntl = wfMsg(
+ 'youhavenewmessages',
+ $newmessageslink,
+ $newmessagesdifflink,
+ $newmessagesnumber
);
# Disable Cache
- $wgOut->setSquidMaxage(0);
+ $out->setSquidMaxage( 0 );
}
- } else if (count($newtalks)) {
- $sep = str_replace("_", " ", wfMsgHtml("newtalkseperator"));
+ } else if( count( $newtalks ) ) {
+ // _>" " for BC <= 1.16
+ $sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
$msgs = array();
- foreach ($newtalks as $newtalk) {
- $msgs[] = wfElement("a",
- array('href' => $newtalk["link"]), $newtalk["wiki"]);
+ foreach( $newtalks as $newtalk ) {
+ $msgs[] = Xml::element('a',
+ array( 'href' => $newtalk['link'] ), $newtalk['wiki'] );
}
- $parts = implode($sep, $msgs);
- $ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
- $wgOut->setSquidMaxage(0);
+ $parts = implode( $sep, $msgs );
+ $ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
+ $out->setSquidMaxage( 0 );
} else {
$ntl = '';
}
- wfProfileOut( "$fname-stuff2" );
+ wfProfileOut( __METHOD__ . '-stuff2' );
- wfProfileIn( "$fname-stuff3" );
+ wfProfileIn( __METHOD__ . '-stuff3' );
$tpl->setRef( 'newtalk', $ntl );
- $tpl->setRef( 'skin', $this);
+ $tpl->setRef( 'skin', $this );
$tpl->set( 'logo', $this->logoText() );
- if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and
- $wgArticle and 0 != $wgArticle->getID() )
- {
+ if ( $out->isArticle() and ( !isset( $oldid ) or isset( $diff ) ) and
+ $wgArticle and 0 != $wgArticle->getID() ){
if ( !$wgDisableCounters ) {
$viewcount = $wgLang->formatNum( $wgArticle->getCount() );
if ( $viewcount ) {
- $tpl->set('viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
+ $tpl->set( 'viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
} else {
- $tpl->set('viewcount', false);
+ $tpl->set( 'viewcount', false );
}
} else {
- $tpl->set('viewcount', false);
+ $tpl->set( 'viewcount', false );
}
- if ($wgPageShowWatchingUsers) {
+ if( $wgPageShowWatchingUsers ) {
$dbr = wfGetDB( DB_SLAVE );
$watchlist = $dbr->tableName( 'watchlist' );
- $sql = "SELECT COUNT(*) AS n FROM $watchlist
- WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) .
- "' AND wl_namespace=" . $this->mTitle->getNamespace() ;
- $res = $dbr->query( $sql, 'SkinTemplate::outputPage');
+ $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 );
$numberofwatchingusers = $x->n;
- if ($numberofwatchingusers > 0) {
- $tpl->set('numberofwatchingusers',
- wfMsgExt('number_of_watching_users_pageview', array('parseinline'),
- $wgLang->formatNum($numberofwatchingusers))
+ if( $numberofwatchingusers > 0 ) {
+ $tpl->set( 'numberofwatchingusers',
+ wfMsgExt( 'number_of_watching_users_pageview', array( 'parseinline' ),
+ $wgLang->formatNum( $numberofwatchingusers ) )
);
} else {
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'numberofwatchingusers', false );
}
} else {
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'numberofwatchingusers', false );
}
- $tpl->set('copyright',$this->getCopyright());
+ $tpl->set( 'copyright', $this->getCopyright() );
$this->credits = false;
- if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
- require_once("Credits.php");
- $this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+ if( $wgMaxCredits != 0 ){
+ $this->credits = Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
} else {
- $tpl->set('lastmod', $this->lastModified());
+ $tpl->set( 'lastmod', $this->lastModified() );
}
$tpl->setRef( 'credits', $this->credits );
} elseif ( isset( $oldid ) && !isset( $diff ) ) {
- $tpl->set('copyright', $this->getCopyright());
- $tpl->set('viewcount', false);
- $tpl->set('lastmod', false);
- $tpl->set('credits', false);
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'copyright', $this->getCopyright() );
+ $tpl->set( 'viewcount', false );
+ $tpl->set( 'lastmod', false );
+ $tpl->set( 'credits', false );
+ $tpl->set( 'numberofwatchingusers', false );
} else {
- $tpl->set('copyright', false);
- $tpl->set('viewcount', false);
- $tpl->set('lastmod', false);
- $tpl->set('credits', false);
- $tpl->set('numberofwatchingusers', false);
+ $tpl->set( 'copyright', false );
+ $tpl->set( 'viewcount', false );
+ $tpl->set( 'lastmod', false );
+ $tpl->set( 'credits', false );
+ $tpl->set( 'numberofwatchingusers', false );
}
- wfProfileOut( "$fname-stuff3" );
+ wfProfileOut( __METHOD__ . '-stuff3' );
- wfProfileIn( "$fname-stuff4" );
+ wfProfileIn( __METHOD__ . '-stuff4' );
$tpl->set( 'copyrightico', $this->getCopyrightIcon() );
$tpl->set( 'poweredbyico', $this->getPoweredBy() );
$tpl->set( 'disclaimer', $this->disclaimerLink() );
@@ -399,66 +426,73 @@ class SkinTemplate extends Skin {
$tpl->set( 'bottomscripts', $this->bottomScripts() );
$printfooter = "\n";
- $out->mBodytext .= $printfooter ;
+ $out->mBodytext .= $printfooter . $this->generateDebugHTML();
$tpl->setRef( 'bodytext', $out->mBodytext );
# Language links
$language_urls = array();
if ( !$wgHideInterlanguageLinks ) {
- foreach( $wgOut->getLanguageLinks() as $l ) {
+ foreach( $out->getLanguageLinks() as $l ) {
$tmp = explode( ':', $l, 2 );
$class = 'interwiki-' . $tmp[0];
- unset($tmp);
+ unset( $tmp );
$nt = Title::newFromText( $l );
- $language_urls[] = array(
- 'href' => $nt->getFullURL(),
- 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
- 'class' => $class
- );
+ if ( $nt ) {
+ $language_urls[] = array(
+ 'href' => $nt->getFullURL(),
+ 'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
+ $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+ 'class' => $class
+ );
+ }
}
}
- if(count($language_urls)) {
- $tpl->setRef( 'language_urls', $language_urls);
+ if( count( $language_urls ) ) {
+ $tpl->setRef( 'language_urls', $language_urls );
} else {
- $tpl->set('language_urls', false);
+ $tpl->set( 'language_urls', false );
}
- wfProfileOut( "$fname-stuff4" );
+ wfProfileOut( __METHOD__ . '-stuff4' );
+ wfProfileIn( __METHOD__ . '-stuff5' );
# Personal toolbar
- $tpl->set('personal_urls', $this->buildPersonalUrls());
+ $tpl->set( 'personal_urls', $this->buildPersonalUrls() );
$content_actions = $this->buildContentActionUrls();
- $tpl->setRef('content_actions', $content_actions);
+ $tpl->setRef( 'content_actions', $content_actions );
// XXX: attach this from javascript, same with section editing
- if($this->iseditable && $wgUser->getOption("editondblclick") )
- {
- $encEditUrl = wfEscapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
- $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
+ if( $this->iseditable && $wgUser->getOption( 'editondblclick' ) ){
+ $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
+ $tpl->set( 'body_ondblclick', 'document.location = "' . $encEditUrl . '";' );
} else {
- $tpl->set('body_ondblclick', false);
- }
- if( $this->iseditable && $wgUser->getOption( 'editsectiononrightclick' ) ) {
- $tpl->set( 'body_onload', 'setupRightClickEdit()' );
- } else {
- $tpl->set( 'body_onload', false );
+ $tpl->set( 'body_ondblclick', false );
}
+ $tpl->set( 'body_onload', false );
$tpl->set( 'sidebar', $this->buildSidebar() );
$tpl->set( 'nav_urls', $this->buildNavUrls() );
+ //set the head script near the end (in case above actions result in adding scripts)
+ $tpl->set( 'headscripts', $out->getScript() );
+
// original version by hansm
if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
- wfDebug( __METHOD__ . ': Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!' );
+ wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
}
+ // allow extensions adding stuff after the page content.
+ // See Skin::afterContentHook() for further documentation.
+ $tpl->set( 'dataAfterContent', $this->afterContentHook() );
+ wfProfileOut( __METHOD__ . '-stuff5' );
+
// execute template
- wfProfileIn( "$fname-execute" );
+ wfProfileIn( __METHOD__ . '-execute' );
$res = $tpl->execute();
- wfProfileOut( "$fname-execute" );
+ wfProfileOut( __METHOD__ . '-execute' );
// result may be an error
$this->printOrError( $res );
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
}
/**
@@ -479,26 +513,48 @@ class SkinTemplate extends Skin {
* @private
*/
function buildPersonalUrls() {
- global $wgTitle, $wgRequest;
+ global $wgOut, $wgRequest, $wgUser, $wgLang;
- $fname = 'SkinTemplate::buildPersonalUrls';
- $pageurl = $wgTitle->getLocalURL();
- wfProfileIn( $fname );
+ $title = $wgOut->getTitle();
+ $pageurl = $title->getLocalURL();
+ wfProfileIn( __METHOD__ );
/* set up the default links for the personal toolbar */
$personal_urls = array();
- if ($this->loggedin) {
+ $page = $wgRequest->getVal( 'returnto', $this->thisurl );
+ $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
+ $returnto = "returnto=$page";
+ if( $this->thisquery != '' )
+ $returnto .= "&returntoquery=$query";
+ if( $this->loggedin ) {
$personal_urls['userpage'] = array(
'text' => $this->username,
'href' => &$this->userpageUrlDetails['href'],
- 'class' => $this->userpageUrlDetails['exists']?false:'new',
+ 'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $this->userpageUrlDetails['href'] == $pageurl )
);
- $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
+ if ( $wgUser->getNewtalk() ) {
+ # do not show text when we are viewing our
+ # own talk page
+ if( !$title->equals( $wgUser->getTalkPage() ) ) {
+ $newtalk = $wgUser->getNewtalkNumber();
+
+ # disable caching
+ $wgOut->setSquidMaxage( 0 );
+ $wgOut->enableClientCache( false );
+ }
+ else {
+ $newtalk = 0;
+ }
+ }
+ else {
+ $newtalk = 0;
+ }
$personal_urls['mytalk'] = array(
- 'text' => wfMsg('mytalk'),
+ 'text' => wfMsg( 'mytalk', $newtalk ),
'href' => &$usertalkUrlDetails['href'],
- 'class' => $usertalkUrlDetails['exists']?false:'new',
+ 'class' => $usertalkUrlDetails['exists'] ? false : 'new',
'active' => ( $usertalkUrlDetails['href'] == $pageurl )
);
$href = self::makeSpecialUrl( 'Preferences' );
@@ -519,10 +575,10 @@ class SkinTemplate extends Skin {
# from request values or be specified in "sub page" form. The plot
# thickens, because $wgTitle is altered for special pages, so doesn't
# contain the original alias-with-subpage.
- $title = Title::newFromText( $wgRequest->getText( 'title' ) );
- if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
+ $origTitle = Title::newFromText( $wgRequest->getText( 'title' ) );
+ if( $origTitle instanceof Title && $origTitle->getNamespace() == NS_SPECIAL ) {
list( $spName, $spPar ) =
- SpecialPage::resolveAliasWithSubpage( $title->getText() );
+ SpecialPage::resolveAliasWithSubpage( $origTitle->getText() );
$active = $spName == 'Contributions'
&& ( ( $spPar && $spPar == $this->username )
|| $wgRequest->getText( 'target' ) == $this->username );
@@ -539,7 +595,7 @@ class SkinTemplate extends Skin {
$personal_urls['logout'] = array(
'text' => wfMsg( 'userlogout' ),
'href' => self::makeSpecialUrl( 'Userlogout',
- $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
+ $title->isSpecial( 'Preferences' ) ? '' : $returnto
),
'active' => false
);
@@ -553,45 +609,44 @@ class SkinTemplate extends Skin {
$personal_urls['anonuserpage'] = array(
'text' => $this->username,
'href' => $href,
- 'class' => $this->userpageUrlDetails['exists']?false:'new',
+ 'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'active' => ( $pageurl == $href )
);
- $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage );
$href = &$usertalkUrlDetails['href'];
$personal_urls['anontalk'] = array(
- 'text' => wfMsg('anontalk'),
+ 'text' => wfMsg( 'anontalk' ),
'href' => $href,
- 'class' => $usertalkUrlDetails['exists']?false:'new',
+ 'class' => $usertalkUrlDetails['exists'] ? false : 'new',
'active' => ( $pageurl == $href )
);
$personal_urls['anonlogin'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => $wgTitle->isSpecial( 'Userlogin' )
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+ 'active' => $title->isSpecial( 'Userlogin' )
);
} else {
-
$personal_urls['login'] = array(
'text' => wfMsg( $loginlink ),
- 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => $wgTitle->isSpecial( 'Userlogin' )
+ 'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
+ 'active' => $title->isSpecial( 'Userlogin' )
);
}
}
- wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
- wfProfileOut( $fname );
+ wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
+ wfProfileOut( __METHOD__ );
return $personal_urls;
}
- function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) {
+ function tabAction( $title, $message, $selected, $query = '', $checkEdit = false ) {
$classes = array();
if( $selected ) {
$classes[] = 'selected';
}
- if( $checkEdit && !$title->isAlwaysKnown() && $title->getArticleId() == 0 ) {
+ if( $checkEdit && !$title->isKnown() ) {
$classes[] = 'new';
- $query = 'action=edit';
+ $query = 'action=edit&redlink=1';
}
$text = wfMsg( $message );
@@ -601,9 +656,9 @@ class SkinTemplate extends Skin {
}
$result = array();
- if( !wfRunHooks('SkinTemplateTabAction', array(&$this,
+ if( !wfRunHooks( 'SkinTemplateTabAction', array( &$this,
$title, $message, $selected, $checkEdit,
- &$classes, &$query, &$text, &$result)) ) {
+ &$classes, &$query, &$text, &$result ) ) ) {
return $result;
}
@@ -615,8 +670,8 @@ class SkinTemplate extends Skin {
function makeTalkUrlDetails( $name, $urlaction = '' ) {
$title = Title::newFromText( $name );
- if( !is_object($title) ) {
- throw new MWException( __METHOD__." given invalid pagename $name" );
+ if( !is_object( $title ) ) {
+ throw new MWException( __METHOD__ . " given invalid pagename $name" );
}
$title = $title->getTalkPage();
self::checkTitle( $title, $name );
@@ -641,18 +696,17 @@ class SkinTemplate extends Skin {
* @return array
* @private
*/
- function buildContentActionUrls () {
- global $wgContLang, $wgLang, $wgOut;
- $fname = 'SkinTemplate::buildContentActionUrls';
- wfProfileIn( $fname );
-
- global $wgUser, $wgRequest;
- $action = $wgRequest->getText( 'action' );
- $section = $wgRequest->getText( 'section' );
+ function buildContentActionUrls() {
+ global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
+
+ wfProfileIn( __METHOD__ );
+
+ $action = $wgRequest->getVal( 'action', 'view' );
+ $section = $wgRequest->getVal( 'section' );
$content_actions = array();
- $prevent_active_tabs = false ;
- wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this , &$prevent_active_tabs ) ) ;
+ $prevent_active_tabs = false;
+ wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this, &$prevent_active_tabs ) );
if( $this->iscontent ) {
$subjpage = $this->mTitle->getSubjectPage();
@@ -663,56 +717,62 @@ class SkinTemplate extends Skin {
$subjpage,
$nskey,
!$this->mTitle->isTalkPage() && !$prevent_active_tabs,
- '', true);
+ '', true
+ );
$content_actions['talk'] = $this->tabAction(
$talkpage,
'talk',
$this->mTitle->isTalkPage() && !$prevent_active_tabs,
'',
- true);
+ true
+ );
- wfProfileIn( "$fname-edit" );
+ wfProfileIn( __METHOD__ . '-edit' );
if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
$istalk = $this->mTitle->isTalkPage();
$istalkclass = $istalk?' istalk':'';
$content_actions['edit'] = array(
- 'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
+ 'class' => ( ( ( $action == 'edit' or $action == 'submit' ) and $section != 'new' ) ? 'selected' : '' ) . $istalkclass,
'text' => $this->mTitle->exists()
? wfMsg( 'edit' )
: wfMsg( 'create' ),
'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
- if ( $istalk || $wgOut->showNewSectionLink() ) {
- $content_actions['addsection'] = array(
- 'class' => $section == 'new'?'selected':false,
- 'text' => wfMsg('addsection'),
- 'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' )
- );
+ // adds new section link if page is a current revision of a talk page or
+ if ( ( $wgArticle && $wgArticle->isCurrent() && $istalk ) || $wgOut->showNewSectionLink() ) {
+ if ( !$wgOut->forceHideNewSectionLink() ) {
+ $content_actions['addsection'] = array(
+ 'class' => $section == 'new' ? 'selected' : false,
+ 'text' => wfMsg( 'addsection' ),
+ 'href' => $this->mTitle->getLocalUrl( 'action=edit§ion=new' )
+ );
+ }
}
- } elseif ( $this->mTitle->exists() || $this->mTitle->isAlwaysKnown() ) {
+ } elseif ( $this->mTitle->isKnown() ) {
$content_actions['viewsource'] = array(
'class' => ($action == 'edit') ? 'selected' : false,
- 'text' => wfMsg('viewsource'),
+ 'text' => wfMsg( 'viewsource' ),
'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
);
}
- wfProfileOut( "$fname-edit" );
+ wfProfileOut( __METHOD__ . '-edit' );
- wfProfileIn( "$fname-live" );
- if ( $this->mTitle->getArticleId() ) {
+ wfProfileIn( __METHOD__ . '-live' );
+ if ( $this->mTitle->exists() ) {
$content_actions['history'] = array(
'class' => ($action == 'history') ? 'selected' : false,
- 'text' => wfMsg('history_short'),
- 'href' => $this->mTitle->getLocalUrl( 'action=history')
+ 'text' => wfMsg( 'history_short' ),
+ 'href' => $this->mTitle->getLocalUrl( 'action=history' ),
+ 'rel' => 'archives',
);
- if($wgUser->isAllowed('delete')){
+ if( $wgUser->isAllowed( 'delete' ) ) {
$content_actions['delete'] = array(
'class' => ($action == 'delete') ? 'selected' : false,
- 'text' => wfMsg('delete'),
+ 'text' => wfMsg( 'delete' ),
'href' => $this->mTitle->getLocalUrl( 'action=delete' )
);
}
@@ -720,23 +780,23 @@ class SkinTemplate extends Skin {
$moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
$content_actions['move'] = array(
'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
- 'text' => wfMsg('move'),
+ 'text' => wfMsg( 'move' ),
'href' => $moveTitle->getLocalUrl()
);
}
if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
- if(!$this->mTitle->isProtected()){
+ if( !$this->mTitle->isProtected() ){
$content_actions['protect'] = array(
'class' => ($action == 'protect') ? 'selected' : false,
- 'text' => wfMsg('protect'),
+ 'text' => wfMsg( 'protect' ),
'href' => $this->mTitle->getLocalUrl( 'action=protect' )
);
} else {
$content_actions['unprotect'] = array(
'class' => ($action == 'unprotect') ? 'selected' : false,
- 'text' => wfMsg('unprotect'),
+ 'text' => wfMsg( 'unprotect' ),
'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
);
}
@@ -748,7 +808,7 @@ class SkinTemplate extends Skin {
$undelTitle = SpecialPage::getTitleFor( 'Undelete' );
$content_actions['undelete'] = array(
'class' => false,
- 'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum($n) ),
+ 'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum( $n ) ),
'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
#'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
);
@@ -759,40 +819,40 @@ class SkinTemplate extends Skin {
if( !$this->mTitle->getRestrictions( 'create' ) ) {
$content_actions['protect'] = array(
'class' => ($action == 'protect') ? 'selected' : false,
- 'text' => wfMsg('protect'),
+ 'text' => wfMsg( 'protect' ),
'href' => $this->mTitle->getLocalUrl( 'action=protect' )
);
} else {
$content_actions['unprotect'] = array(
'class' => ($action == 'unprotect') ? 'selected' : false,
- 'text' => wfMsg('unprotect'),
+ 'text' => wfMsg( 'unprotect' ),
'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
);
}
}
}
- wfProfileOut( "$fname-live" );
+ wfProfileOut( __METHOD__ . '-live' );
if( $this->loggedin ) {
if( !$this->mTitle->userIsWatching()) {
$content_actions['watch'] = array(
'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
- 'text' => wfMsg('watch'),
+ 'text' => wfMsg( 'watch' ),
'href' => $this->mTitle->getLocalUrl( 'action=watch' )
);
} else {
$content_actions['unwatch'] = array(
'class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
- 'text' => wfMsg('unwatch'),
+ 'text' => wfMsg( 'unwatch' ),
'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
);
}
}
- wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) ) ;
+ wfRunHooks( 'SkinTemplateTabs', array( &$this, &$content_actions ) );
} else {
/* show special page tab */
@@ -817,49 +877,41 @@ class SkinTemplate extends Skin {
continue;
$selected = ( $code == $preferred )? 'selected' : false;
$content_actions['varlang-' . $vcount] = array(
- 'class' => $selected,
- 'text' => $varname,
- 'href' => $this->mTitle->getLocalURL('',$code)
- );
+ 'class' => $selected,
+ 'text' => $varname,
+ 'href' => $this->mTitle->getLocalURL( '', $code )
+ );
$vcount ++;
}
}
wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $content_actions;
}
-
-
/**
* build array of common navigation links
* @return array
* @private
*/
- function buildNavUrls () {
- global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
+ function buildNavUrls() {
+ global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
global $wgEnableUploads, $wgUploadNavigationUrl;
- $fname = 'SkinTemplate::buildNavUrls';
- wfProfileIn( $fname );
+ wfProfileIn( __METHOD__ );
- $action = $wgRequest->getText( 'action' );
+ $action = $wgRequest->getVal( 'action', 'view' );
$nav_urls = array();
$nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
- if( $wgEnableUploads ) {
- if ($wgUploadNavigationUrl) {
- $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
- } else {
- $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
- }
+ if( $wgUploadNavigationUrl ) {
+ $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
+ } elseif( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
+ $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
} else {
- if ($wgUploadNavigationUrl)
- $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
- else
- $nav_urls['upload'] = false;
+ $nav_urls['upload'] = false;
}
$nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
@@ -868,17 +920,19 @@ class SkinTemplate extends Skin {
// A print stylesheet is attached to all pages, but nobody ever
// figures that out. :) Add a link...
- if( $this->iscontent && ($action == '' || $action == 'view' || $action == 'purge' ) ) {
- $nav_urls['print'] = array(
- 'text' => wfMsg( 'printableversion' ),
- 'href' => $wgRequest->appendQuery( 'printable=yes' )
- );
+ if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
+ if ( !$wgRequest->getBool( 'printable' ) ) {
+ $nav_urls['print'] = array(
+ 'text' => wfMsg( 'printableversion' ),
+ 'href' => $wgRequest->appendQuery( 'printable=yes' )
+ );
+ }
// Also add a "permalink" while we're at it
if ( $this->mRevisionId ) {
$nav_urls['permalink'] = array(
'text' => wfMsg( 'permalink' ),
- 'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
+ 'href' => $wgOut->getTitle()->getLocalURL( "oldid=$this->mRevisionId" )
);
}
@@ -900,29 +954,34 @@ class SkinTemplate extends Skin {
} else {
$nav_urls['recentchangeslinked'] = false;
}
- if ($wgUseTrackbacks)
+ if( $wgUseTrackbacks )
$nav_urls['trackbacklink'] = array(
- 'href' => $wgTitle->trackbackURL()
+ 'href' => $wgOut->getTitle()->trackbackURL()
);
}
if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
- $id = User::idFromName($this->mTitle->getText());
- $ip = User::isIP($this->mTitle->getText());
+ $id = User::idFromName( $this->mTitle->getText() );
+ $ip = User::isIP( $this->mTitle->getText() );
} else {
$id = 0;
$ip = false;
}
- if($id || $ip) { # both anons and non-anons have contribs list
+ if( $id || $ip ) { # both anons and non-anons have contribs list
$nav_urls['contributions'] = array(
'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
);
if( $id ) {
$logPage = SpecialPage::getTitleFor( 'Log' );
- $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
- . $this->mTitle->getPartialUrl() ) );
+ $nav_urls['log'] = array(
+ 'href' => $logPage->getLocalUrl(
+ array(
+ 'user' => $this->mTitle->getText()
+ )
+ )
+ );
} else {
$nav_urls['log'] = false;
}
@@ -945,7 +1004,7 @@ class SkinTemplate extends Skin {
'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
);
}
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $nav_urls;
}
@@ -954,89 +1013,28 @@ class SkinTemplate extends Skin {
* @return string
* @private
*/
- function getNameSpaceKey () {
+ function getNameSpaceKey() {
return $this->mTitle->getNamespaceKey();
}
- /**
- * @private
- */
- function setupUserCss() {
- $fname = 'SkinTemplate::setupUserCss';
- wfProfileIn( $fname );
-
- global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
-
- $sitecss = '';
- $usercss = '';
- $siteargs = '&maxage=' . $wgSquidMaxage;
- if( $this->loggedin ) {
- // Ensure that logged-in users' generated CSS isn't clobbered
- // by anons' publicly cacheable generated CSS.
- $siteargs .= '&smaxage=0';
- }
-
- # Add user-specific code if this is a user and we allow that kind of thing
-
- if ( $wgAllowUserCss && $this->loggedin ) {
- $action = $wgRequest->getText('action');
-
- # if we're previewing the CSS page, use it
- if( $this->mTitle->isCssSubpage() and $this->userCanPreview( $action ) ) {
- $siteargs = "&smaxage=0&maxage=0";
- $usercss = $wgRequest->getText('wpTextbox1');
- } else {
- $usercss = '@import "' .
- self::makeUrl($this->userpage . '/'.$this->skinname.'.css',
- 'action=raw&ctype=text/css') . '";' ."\n";
- }
-
- $siteargs .= '&ts=' . $wgUser->mTouched;
- }
-
- if( $wgContLang->isRTL() ) {
- global $wgStyleVersion;
- $sitecss .= "@import \"$wgStylePath/$this->stylename/rtl.css?$wgStyleVersion\";\n";
- }
-
- # If we use the site's dynamic CSS, throw that in, too
- if ( $wgUseSiteCss ) {
- $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
- $skinquery = '';
- if (($us = $wgRequest->getVal('useskin', '')) !== '')
- $skinquery = "&useskin=$us";
- $sitecss .= '@import "' . self::makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI) . '";' . "\n";
- $sitecss .= '@import "' . self::makeNSUrl( ucfirst( $this->skinname ) . '.css', $query, NS_MEDIAWIKI ) . '";' . "\n";
- $sitecss .= '@import "' . self::makeUrl( '-', "action=raw&gen=css$siteargs$skinquery" ) . '";' . "\n";
- }
-
- # If we use any dynamic CSS, make a little CDATA block out of it.
-
- if ( !empty($sitecss) || !empty($usercss) ) {
- $this->usercss = "/**/';
- }
- wfProfileOut( $fname );
- }
-
/**
* @private
*/
function setupUserJs( $allowUserJs ) {
- $fname = 'SkinTemplate::setupUserJs';
- wfProfileIn( $fname );
-
global $wgRequest, $wgJsMimeType;
- $action = $wgRequest->getText('action');
+ wfProfileIn( __METHOD__ );
+
+ $action = $wgRequest->getVal( 'action', 'view' );
if( $allowUserJs && $this->loggedin ) {
if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
# XXX: additional security check/prompt?
- $this->userjsprev = '/*getText('wpTextbox1') . ' /*]]>*/';
+ $this->userjsprev = '/*getText( 'wpTextbox1' ) . ' /*]]>*/';
} else {
- $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s');
+ $this->userjs = self::makeUrl( $this->userpage . '/' . $this->skinname . '.js', 'action=raw&ctype=' . $wgJsMimeType );
}
}
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
}
/**
@@ -1046,114 +1044,64 @@ class SkinTemplate extends Skin {
* @private
*/
function setupPageCss() {
- $fname = 'SkinTemplate::setupPageCss';
- wfProfileIn( $fname );
+ wfProfileIn( __METHOD__ );
$out = false;
wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
-
- wfProfileOut( $fname );
+ wfProfileOut( __METHOD__ );
return $out;
}
- /**
- * returns css with user-specific options
- */
- public function getUserStylesheet() {
- $fname = 'SkinTemplate::getUserStylesheet';
- wfProfileIn( $fname );
-
- $s = "/* generated user stylesheet */\n";
- $s .= $this->reallyDoGetUserStyles();
- wfProfileOut( $fname );
- return $s;
- }
-
- /**
- * Returns the print stylesheet for this skin. In all default skins this
- * is just commonPrint.css, but third-party skins may want to modify it.
- *
- * @return string
- */
- private function getPrintCss() {
- global $wgStylePath;
- return $wgStylePath . "/common/commonPrint.css";
- }
-
- /**
- * 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?
- *
- * 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() {
- $fname = 'SkinTemplate::getUserJs';
- wfProfileIn( $fname );
-
- $s = parent::getUserJs();
- $s .= "\n\n/* MediaWiki:".ucfirst($this->skinname).".js (deprecated; migrate to Common.js!) */\n";
-
- // avoid inclusion of non defined user JavaScript (with custom skins only)
- // by checking for default message content
- $msgKey = ucfirst($this->skinname).'.js';
- $userJS = wfMsgForContent($msgKey);
- if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
- $s .= $userJS;
- }
-
- wfProfileOut( $fname );
- return $s;
+ public function commonPrintStylesheet() {
+ return false;
}
}
/**
* Generic wrapper for template functions, with interface
* compatible with what we use of PHPTAL 0.7.
- * @addtogroup Skins
+ * @ingroup Skins
*/
class QuickTemplate {
/**
- * @public
+ * Constructor
*/
- function QuickTemplate() {
+ public function QuickTemplate() {
$this->data = array();
$this->translator = new MediaWiki_I18N();
}
/**
- * @public
+ * Sets the value $value to $name
+ * @param $name
+ * @param $value
*/
- function set( $name, $value ) {
+ public function set( $name, $value ) {
$this->data[$name] = $value;
}
/**
- * @public
+ * @param $name
+ * @param $value
*/
- function setRef($name, &$value) {
+ public function setRef( $name, &$value ) {
$this->data[$name] =& $value;
}
/**
- * @public
+ * @param $t
*/
- function setTranslator( &$t ) {
+ public function setTranslator( &$t ) {
$this->translator = &$t;
}
/**
- * @public
+ * Main function, used by classes that subclass QuickTemplate
+ * to show the actual HTML output
*/
- function execute() {
- echo "Override this function.";
+ public function execute() {
+ echo 'Override this function.';
}
-
/**
* @private
*/
@@ -1194,10 +1142,10 @@ class QuickTemplate {
* @private
*/
function msgWiki( $str ) {
- global $wgParser, $wgTitle, $wgOut;
+ global $wgParser, $wgOut;
$text = $this->translator->translate( $str );
- $parserOutput = $wgParser->parse( $text, $wgTitle,
+ $parserOutput = $wgParser->parse( $text, $wgOut->getTitle(),
$wgOut->parserOptions(), true );
echo $parserOutput->getText();
}
@@ -1214,6 +1162,6 @@ class QuickTemplate {
*/
function haveMsg( $str ) {
$msg = $this->translator->translate( $str );
- return ($msg != '-') && ($msg != ''); # ????
+ return ( $msg != '-' ) && ( $msg != '' ); # ????
}
}