function outputPage( &$out ) {
global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
global $wgScript, $wgStylePath, $wgLanguageCode, $wgContLanguageCode, $wgUseNewInterlanguage;
- global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
- global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses;
+ global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
+ global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
global $wgMaxCredits, $wgShowCreditsIfMax;
global $wgPageShowWatchingUsers;
wfProfileIn( "$fname-init" );
$this->initPage( $out );
- $this->mTitle = $wgTitle;
+ $this->mTitle =& $wgTitle;
$this->mUser =& $wgUser;
$tpl =& $this->setupTemplate( $this->template, 'skins' );
$tpl->set( 'feeds', false );
}
$tpl->setRef( 'mimetype', $wgMimeType );
+ $tpl->setRef( 'jsmimetype', $wgJsMimeType );
$tpl->setRef( 'charset', $wgOutputEncoding );
$tpl->set( 'headlinks', $out->getHeadLinks() );
$tpl->setRef( 'wgScript', $wgScript );
$tpl->setRef( 'skinname', $this->skinname );
$tpl->setRef( 'stylename', $this->stylename );
+ $tpl->set( 'printable', $wgRequest->getBool( 'printable' ) );
$tpl->setRef( 'loggedin', $this->loggedin );
$tpl->set('nsclass', 'ns-'.$this->mTitle->getNamespace());
$tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
$tpl->set('numberofwatchingusers', false);
}
- $tpl->set('lastmod', $this->lastModified());
$tpl->set('copyright',$this->getCopyright());
$this->credits = false;
if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
require_once("Credits.php");
$this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+ } else {
+ $tpl->set('lastmod', $this->lastModified());
}
$tpl->setRef( 'credits', $this->credits );
# Language links
$language_urls = array();
- foreach( $wgOut->getLanguageLinks() as $l ) {
- $nt = Title::newFromText( $l );
- $language_urls[] = array('href' => $nt->getFullURL(),
- 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
- 'class' => $wgContLang->isRTL() ? 'rtl' : 'ltr');
+
+ if ( !$wgHideInterlanguageLinks ) {
+ foreach( $wgOut->getLanguageLinks() as $l ) {
+ $nt = Title::newFromText( $l );
+ $language_urls[] = array('href' => $nt->getFullURL(),
+ 'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+ 'class' => $wgContLang->isRTL() ? 'rtl' : 'ltr');
+ }
}
if(count($language_urls)) {
$tpl->setRef( 'language_urls', $language_urls);
} else {
$tpl->set( 'body_onload', false );
}
- $tpl->set( 'navigation_urls', $this->buildNavigationUrls() );
+ $tpl->set( 'sidebar', $this->buildSidebar() );
$tpl->set( 'nav_urls', $this->buildNavUrls() );
// execute template
);
$personal_urls['mycontris'] = array(
'text' => wfMsg('mycontris'),
- 'href' => $this->makeSpecialUrl('Contributions','target=' . urlencode( $this->username ) )
+ 'href' => $this->makeSpecialUrl("Contributions/$this->username")
);
$personal_urls['logout'] = array(
'text' => wfMsg('userlogout'),
}
if( $checkEdit && $title->getArticleId() == 0 ) {
$classes[] = 'new';
+ $query = 'action=edit';
}
return array(
'class' => implode( ' ', $classes ),
* @access private
*/
function buildContentActionUrls () {
- global $wgContLang, $wgUseValidation;
+ global $wgContLang, $wgUseValidation, $wgDBprefix, $wgValidationForAnons;
$fname = 'SkinTemplate::buildContentActionUrls';
wfProfileIn( $fname );
$content_actions[$nskey] = $this->tabAction(
$this->mTitle->getSubjectPage(),
$nskey,
- !$this->mTitle->isTalkPage() );
+ !$this->mTitle->isTalkPage(),
+ '', true);
$content_actions['talk'] = $this->tabAction(
$this->mTitle->getTalkPage(),
$content_actions['move'] = array(
'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false,
'text' => wfMsg('move'),
- 'href' => $this->makeSpecialUrl('Movepage', 'target='. urlencode( $this->thispage ) )
+ 'href' => $this->makeSpecialUrl("Movepage/$this->thispage" )
);
}
}
$content_actions['undelete'] = array(
'class' => false,
'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ),
- 'href' => $this->makeSpecialUrl('Undelete/'.$this->thispage)
+ 'href' => $this->makeSpecialUrl("Undelete/$this->thispage")
);
}
}
'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
);
}
+ }
+ if( $wgUser->isLoggedIn() || $wgValidationForAnons ) { # and $action != 'submit' ) {
# Validate tab. TODO: add validation to logged-in user rights
if($wgUseValidation && ( $action == "" || $action=='view' ) ){ # && $wgUser->isAllowed('validate')){
if ( $oldid ) $oid = IntVal( $oldid ) ; # Use the oldid
{# Trying to get the current article revision through this weird stunt
$tid = $this->mTitle->getArticleID();
$tns = $this->mTitle->getNamespace();
- $sql = "SELECT page_latest FROM page WHERE page_id={$tid} AND page_namespace={$tns}" ;
+ $sql = "SELECT page_latest FROM {$wgDBprefix}page WHERE page_id={$tid} AND page_namespace={$tns}" ;
$res = wfQuery( $sql, DB_READ );
if( $s = wfFetchObject( $res ) )
$oid = $s->page_latest ;
$content_actions['article'] = array(
'class' => 'selected',
'text' => wfMsg('specialpage'),
- 'href' => false
+ 'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
);
}
);
$vcount ++;
}
- }
+ }
wfProfileOut( $fname );
return $content_actions;
}
- function getNavigationLinks() {
- global $wgNavigationLinks;
- return $wgNavigationLinks;
- }
- /**
- * build array of global navigation links
- * @return array
- * @access private
- */
- function buildNavigationUrls () {
- $fname = 'SkinTemplate::buildNavigationUrls';
- wfProfileIn( $fname );
-
- $links = $this->getNavigationLinks();
-
- $result = array();
- foreach ( $links as $link ) {
- $text = wfMsg( $link['text'] );
- wfProfileIn( "$fname-{$link['text']}" );
- if ($text != '-') {
- $dest = wfMsgForContent( $link['href'] );
- wfProfileIn( "$fname-{$link['text']}2" );
- $result[] = array(
- 'text' => $text,
- 'href' => $this->makeInternalOrExternalUrl( $dest ),
- 'id' => 'n-'.$link['text']
- );
- wfProfileOut( "$fname-{$link['text']}2" );
- }
- wfProfileOut( "$fname-{$link['text']}" );
- }
- wfProfileOut( $fname );
- return $result;
- }
/**
* build array of common navigation links
$nav_urls = array();
$nav_urls['mainpage'] = array('href' => $this->makeI18nUrl('mainpage'));
- $nav_urls['randompage'] = array('href' => $this->makeSpecialUrl('Randompage'));
+ $nav_urls['randompage'] = array('href' => $this->makeSpecialUrl('Random'));
$nav_urls['recentchanges'] = array('href' => $this->makeSpecialUrl('Recentchanges'));
$nav_urls['currentevents'] = (wfMsgForContent('currentevents') != '-') ? array('href' => $this->makeI18nUrl('currentevents')) : false;
$nav_urls['portal'] = (wfMsgForContent('portal') != '-') ? array('href' => $this->makeI18nUrl('portal-url')) : false;
}
$nav_urls['specialpages'] = array('href' => $this->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' ) ) {
+ $nav_urls['print'] = array(
+ 'text' => wfMsg( 'printableversion' ),
+ 'href' => $wgRequest->appendQuery( 'printable=yes' ) );
+ }
+
if( $this->mTitle->getNamespace() != NS_SPECIAL) {
- $nav_urls['whatlinkshere'] = array('href' => $this->makeSpecialUrl('Whatlinkshere', 'target='.urlencode( $this->thispage)));
- $nav_urls['recentchangeslinked'] = array('href' => $this->makeSpecialUrl('Recentchangeslinked', 'target='.urlencode( $this->thispage)));
+ $nav_urls['whatlinkshere'] = array(
+ 'href' => $this->makeSpecialUrl("Whatlinkshere/$this->thispage")
+ );
+ $nav_urls['recentchangeslinked'] = array(
+ 'href' => $this->makeSpecialUrl("Recentchangeslinked/$this->thispage")
+ );
}
if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
if($id || $ip) { # both anons and non-anons have contri list
$nav_urls['contributions'] = array(
- 'href' => $this->makeSpecialUrl('Contributions', "target=" . $this->mTitle->getPartialURL() )
+ 'href' => $this->makeSpecialUrl('Contributions/' . $this->mTitle->getText() )
);
} else {
$nav_urls['contributions'] = false;
$nav_urls['emailuser'] = false;
if( $this->showEmailUser( $id ) ) {
$nav_urls['emailuser'] = array(
- 'href' => $this->makeSpecialUrl('Emailuser', "target=" . $this->mTitle->getPartialURL() )
+ 'href' => $this->makeSpecialUrl('Emailuser/' . $this->mTitle->getText() )
);
}
wfProfileOut( $fname );
$fname = 'SkinTemplate::setupUserJs';
wfProfileIn( $fname );
- global $wgRequest, $wgAllowUserJs;
+ global $wgRequest, $wgAllowUserJs, $wgJsMimeType;
$action = $wgRequest->getText('action');
if( $wgAllowUserJs && $this->loggedin ) {
# XXX: additional security check/prompt?
$this->userjsprev = '/*<![CDATA[*/ ' . $wgRequest->getText('wpTextbox1') . ' /*]]>*/';
} else {
- $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript&dontcountme=s');
+ $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType.'&dontcountme=s');
}
}
wfProfileOut( $fname );
$s = '/* generated javascript */';
$s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';";
$s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n";
- $s .= wfMsg(ucfirst($this->skinname).'.js');
+
+ // 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) {
+ $s .= $userJS;
+ }
wfProfileOut( $fname );
return $s;
dépôts / lhc / web / wiklou.git / blobdiff