* @subpackage Skins
*/
-require_once 'GlobalFunctions.php';
-
/**
* Wrapper object for MediaWiki's localization functions,
* to be passed to the template engine.
global $wgMaxCredits, $wgShowCreditsIfMax;
global $wgPageShowWatchingUsers;
global $wgUseTrackbacks;
- global $wgDBname;
+ global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
$fname = 'SkinTemplate::outputPage';
wfProfileIn( $fname );
$this->userpage = $userPage->getPrefixedText();
if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
- $this->userpageUrlDetails = $this->makeUrlDetails($this->userpage);
+ $this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
} else {
# This won't be used in the standard skins, but we define it to preserve the interface
# To save time, we check for existence
- $this->userpageUrlDetails = $this->makeKnownUrlDetails($this->userpage);
+ $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
}
$this->usercss = $this->userjs = $this->userjsprev = false;
$tpl->set( 'title', $wgOut->getPageTitle() );
$tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
$tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
-
+ $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() ) );
+
+ $nsname = @$wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ];
+ if ( $nsname === NULL ) $nsname = $this->mTitle->getNsText();
+
+ $tpl->set( 'nscanonical', $nsname );
+ $tpl->set( 'nsnumber', $this->mTitle->getNamespace() );
+ $tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() );
+ $tpl->set( 'titletext', $this->mTitle->getText() );
+ $tpl->set( 'articleid', $this->mTitle->getArticleId() );
+ $tpl->set( 'isarticle', $wgOut->isArticle() );
+
$tpl->setRef( "thispage", $this->thispage );
$subpagestr = $this->subPageSubtitle();
$tpl->set(
if( $wgOut->isSyndicated() ) {
$feeds = array();
foreach( $wgFeedClasses as $format => $class ) {
+ $linktext = $format;
+ if ( $format == "atom" ) {
+ $linktext = wfMsg( 'feed-atom' );
+ } else if ( $format == "rss" ) {
+ $linktext = wfMsg( 'feed-rss' );
+ }
$feeds[$format] = array(
- 'text' => $format,
+ 'text' => $linktext,
'href' => $wgRequest->appendQuery( "feed=$format" )
);
}
$tpl->set('headscripts', $out->getScript() );
$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->setRef( 'loggedin', $this->loggedin );
$tpl->set( 'searchaction', $this->escapeSearchLink() );
$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->set( 'rtl', $wgContLang->isRTL() );
$tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
$tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
- $tpl->setRef( 'username', $this->username );
+ $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
$tpl->setRef( 'userpage', $this->userpage);
$tpl->setRef( 'userpageurl', $this->userpageUrlDetails['href']);
+ $tpl->set( 'userlang', $wgLang->getCode() );
$tpl->set( 'pagecss', $this->setupPageCss() );
$tpl->setRef( 'usercss', $this->usercss);
$tpl->setRef( 'userjs', $this->userjs);
global $wgUseSiteJs;
if ($wgUseSiteJs) {
if($this->loggedin) {
- $tpl->set( 'jsvarurl', $this->makeUrl('-','action=raw&smaxage=0&gen=js') );
+ $tpl->set( 'jsvarurl', self::makeUrl('-','action=raw&smaxage=0&gen=js') );
} else {
- $tpl->set( 'jsvarurl', $this->makeUrl('-','action=raw&gen=js') );
+ $tpl->set( 'jsvarurl', self::makeUrl('-','action=raw&gen=js') );
}
} else {
$tpl->set('jsvarurl', false);
}
$newtalks = $wgUser->getNewMessageLinks();
- if (count($newtalks) == 1 && $newtalks[0]["wiki"] === $wgDBname) {
+ if (count($newtalks) == 1 && $newtalks[0]["wiki"] === wfWikiID() ) {
$usertitle = $this->mUser->getUserPage();
$usertalktitle = $usertitle->getTalkPage();
if( !$usertalktitle->equals( $this->mTitle ) ) {
$tpl->setRef( 'newtalk', $ntl );
$tpl->setRef( 'skin', $this);
$tpl->set( 'logo', $this->logoText() );
- if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and 0 != $wgArticle->getID() ) {
+ if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and
+ $wgArticle and 0 != $wgArticle->getID() )
+ {
if ( !$wgDisableCounters ) {
$viewcount = $wgLang->formatNum( $wgArticle->getCount() );
if ( $viewcount ) {
$tpl->setRef( 'debug', $out->mDebugtext );
$tpl->set( 'reporttime', $out->reportTime() );
$tpl->set( 'sitenotice', wfGetSiteNotice() );
+ $tpl->set( 'bottomscripts', $this->bottomScripts() );
$printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
$out->mBodytext .= $printfooter ;
'class' => $usertalkUrlDetails['exists']?false:'new',
'active' => ( $usertalkUrlDetails['href'] == $pageurl )
);
- $href = $this->makeSpecialUrl('Preferences');
+ $href = self::makeSpecialUrl( 'Preferences' );
$personal_urls['preferences'] = array(
- 'text' => wfMsg('preferences'),
- 'href' => $this->makeSpecialUrl('Preferences'),
+ 'text' => wfMsg( 'mypreferences' ),
+ 'href' => self::makeSpecialUrl( 'Preferences' ),
'active' => ( $href == $pageurl )
);
- $href = $this->makeSpecialUrl('Watchlist');
+ $href = self::makeSpecialUrl( 'Watchlist' );
$personal_urls['watchlist'] = array(
- 'text' => wfMsg('watchlist'),
+ 'text' => wfMsg( 'watchlist' ),
'href' => $href,
'active' => ( $href == $pageurl )
);
- $href = $this->makeSpecialUrl("Contributions/$this->username");
+ $href = self::makeSpecialUrl( "Contributions/$this->username" );
$personal_urls['mycontris'] = array(
- 'text' => wfMsg('mycontris'),
+ 'text' => wfMsg( 'mycontris' ),
'href' => $href
# FIXME # 'active' => ( $href == $pageurl . '/' . $this->username )
);
$personal_urls['logout'] = array(
- 'text' => wfMsg('userlogout'),
- 'href' => $this->makeSpecialUrl( 'Userlogout',
- $wgTitle->getNamespace() === NS_SPECIAL && $wgTitle->getText() === 'Preferences' ? '' : "returnto={$this->thisurl}"
+ 'text' => wfMsg( 'userlogout' ),
+ 'href' => self::makeSpecialUrl( 'Userlogout',
+ $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
)
);
} else {
);
$personal_urls['anonlogin'] = array(
'text' => wfMsg('userlogin'),
- 'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => ( NS_SPECIAL == $wgTitle->getNamespace() && 'Userlogin' == $wgTitle->getDBkey() )
+ 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
+ 'active' => $wgTitle->isSpecial( 'Userlogin' )
);
} else {
$personal_urls['login'] = array(
'text' => wfMsg('userlogin'),
- 'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl ),
- 'active' => ( NS_SPECIAL == $wgTitle->getNamespace() && 'Userlogin' == $wgTitle->getDBkey() )
+ 'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
+ 'active' => $wgTitle->isSpecial( 'Userlogin' )
);
}
}
}
$text = wfMsg( $message );
- if ( $text == "<$message>" ) {
+ if ( wfEmptyMsg( $message, $text ) ) {
global $wgContLang;
- $text = $wgContLang->getNsText( Namespace::getSubject( $title->getNamespace() ) );
+ $text = $wgContLang->getFormattedNsText( Namespace::getSubject( $title->getNamespace() ) );
}
return array(
'href' => $title->getLocalUrl( $query ) );
}
- function makeTalkUrlDetails( $name, $urlaction='' ) {
+ function makeTalkUrlDetails( $name, $urlaction = '' ) {
$title = Title::newFromText( $name );
$title = $title->getTalkPage();
- $this->checkTitle($title, $name);
+ self::checkTitle( $title, $name );
return array(
'href' => $title->getLocalURL( $urlaction ),
- 'exists' => $title->getArticleID() != 0?true:false
+ 'exists' => $title->getArticleID() != 0 ? true : false
);
}
- function makeArticleUrlDetails( $name, $urlaction='' ) {
+ function makeArticleUrlDetails( $name, $urlaction = '' ) {
$title = Title::newFromText( $name );
$title= $title->getSubjectPage();
- $this->checkTitle($title, $name);
+ self::checkTitle( $title, $name );
return array(
'href' => $title->getLocalURL( $urlaction ),
- 'exists' => $title->getArticleID() != 0?true:false
+ 'exists' => $title->getArticleID() != 0 ? true : false
);
}
true);
wfProfileIn( "$fname-edit" );
- if ( $this->mTitle->userCanEdit() ) {
+ if ( $this->mTitle->userCanEdit() && ( $this->mTitle->exists() || $this->mTitle->userCanCreate() ) ) {
$istalk = $this->mTitle->isTalkPage();
$istalkclass = $istalk?' istalk':'';
$content_actions['edit'] = array(
);
}
if ( $this->mTitle->userCanMove()) {
- $moveTitle = Title::makeTitle( NS_SPECIAL, 'Movepage' );
+ $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
$content_actions['move'] = array(
- 'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false,
+ 'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
'text' => wfMsg('move'),
- 'href' => $moveTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+ 'href' => $moveTitle->getLocalUrl()
);
}
} else {
//article doesn't exist or is deleted
if( $wgUser->isAllowed( 'delete' ) ) {
if( $n = $this->mTitle->isDeleted() ) {
- $undelTitle = Title::makeTitle( NS_SPECIAL, 'Undelete' );
+ $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
$content_actions['undelete'] = array(
'class' => false,
- 'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ),
+ 'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $n ),
'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
- #'href' => $this->makeSpecialUrl("Undelete/$this->thispage")
+ #'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
);
}
}
} else {
/* show special page tab */
- $content_actions['article'] = array(
+ $content_actions[$this->mTitle->getNamespaceKey()] = array(
'class' => 'selected',
'text' => wfMsg('specialpage'),
'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
$content_actions['varlang-' . $vcount] = array(
'class' => $selected,
'text' => $varname,
- 'href' => $this->mTitle->getLocalUrl( $actstr . 'variant=' . urlencode( $code ) )
+ 'href' => $this->mTitle->getLocalURL('',$code)
);
$vcount ++;
}
$diff = $wgRequest->getVal( 'diff' );
$nav_urls = array();
- $nav_urls['mainpage'] = array('href' => $this->makeI18nUrl('mainpage'));
+ $nav_urls['mainpage'] = array( 'href' => self::makeI18nUrl( 'mainpage') );
if( $wgEnableUploads ) {
if ($wgUploadNavigationUrl) {
- $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl );
+ $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
} else {
- $nav_urls['upload'] = array('href' => $this->makeSpecialUrl('Upload'));
+ $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
}
} else {
if ($wgUploadNavigationUrl)
- $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl );
+ $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
else
$nav_urls['upload'] = false;
}
- $nav_urls['specialpages'] = array('href' => $this->makeSpecialUrl('Specialpages'));
+ $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
// 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' ) ) {
- $revid = $wgArticle->getLatest();
+ $revid = $wgArticle ? $wgArticle->getLatest() : 0;
if ( !( $revid == 0 ) )
$nav_urls['print'] = array(
'text' => wfMsg( 'printableversion' ),
}
if( $this->mTitle->getNamespace() != NS_SPECIAL ) {
- $wlhTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' );
+ $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage );
$nav_urls['whatlinkshere'] = array(
- 'href' => $wlhTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+ 'href' => $wlhTitle->getLocalUrl()
);
if( $this->mTitle->getArticleId() ) {
- $rclTitle = Title::makeTitle( NS_SPECIAL, 'Recentchangeslinked' );
+ $rclTitle = SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage );
$nav_urls['recentchangeslinked'] = array(
- 'href' => $rclTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+ 'href' => $rclTitle->getLocalUrl()
);
}
if ($wgUseTrackbacks)
if($id || $ip) { # both anons and non-anons have contri list
$nav_urls['contributions'] = array(
- 'href' => $this->makeSpecialUrl('Contributions/' . $this->mTitle->getText() )
+ 'href' => self::makeSpecialUrl( 'Contributions/' . $this->mTitle->getText() )
);
if ( $wgUser->isAllowed( 'block' ) )
$nav_urls['blockip'] = array(
- 'href' => $this->makeSpecialUrl( 'Blockip/' . $this->mTitle->getText() )
+ 'href' => self::makeSpecialUrl( 'Blockip/' . $this->mTitle->getText() )
);
} else {
$nav_urls['contributions'] = false;
$nav_urls['emailuser'] = false;
if( $this->showEmailUser( $id ) ) {
$nav_urls['emailuser'] = array(
- 'href' => $this->makeSpecialUrl('Emailuser/' . $this->mTitle->getText() )
+ 'href' => self::makeSpecialUrl( 'Emailuser/' . $this->mTitle->getText() )
);
}
wfProfileOut( $fname );
$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
$usercss = $wgRequest->getText('wpTextbox1');
} else {
$usercss = '@import "' .
- $this->makeUrl($this->userpage . '/'.$this->skinname.'.css',
+ self::makeUrl($this->userpage . '/'.$this->skinname.'.css',
'action=raw&ctype=text/css') . '";' ."\n";
}
$siteargs .= '&ts=' . $wgUser->mTouched;
}
- if ($wgContLang->isRTL()) $sitecss .= '@import "' . $wgStylePath . '/' . $this->stylename . '/rtl.css";' . "\n";
+ 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 = "action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
- $sitecss .= '@import "' . $this->makeNSUrl('Common.css', $query, NS_MEDIAWIKI) . '";' . "\n";
- $sitecss .= '@import "' . $this->makeNSUrl(ucfirst($this->skinname) . '.css', $query, NS_MEDIAWIKI) . '";' . "\n";
- $sitecss .= '@import "' . $this->makeUrl('-','action=raw&gen=css' . $siteargs) . '";' . "\n";
+ $query = "usemsgcache=yes&action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
+ $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 ) . '";' . "\n";
}
# If we use any dynamic CSS, make a little CDATA block out of it.
# XXX: additional security check/prompt?
$this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
} else {
- $this->userjs = $this->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.'&dontcountme=s');
}
}
wfProfileOut( $fname );
// avoid inclusion of non defined user JavaScript (with custom skins only)
// by checking for default message content
$msgKey = ucfirst($this->skinname).'.js';
- $userJS = wfMsg($msgKey);
- if ('<'.$msgKey.'>' != $userJS) {
+ $userJS = wfMsgForContent($msgKey);
+ if ( !wfEmptyMsg( $msgKey, $userJS ) ) {
$s .= $userJS;
}
echo htmlspecialchars( $this->data[$str] );
}
+ /**
+ * @private
+ */
+ function jstext( $str ) {
+ echo Xml::escapeJsString( $this->data[$str] );
+ }
+
/**
* @private
*/
$text = $this->translator->translate( $str );
$parserOutput = $wgParser->parse( $text, $wgTitle,
- $wgOut->mParserOptions, true );
+ $wgOut->parserOptions(), true );
echo $parserOutput->getText();
}
dépôts / lhc / web / wiklou.git / blobdiff