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, $wgSiteNotice;
+ 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);
} else {
$tpl->set('viewcount', false);
}
+ } else {
+ $tpl->set('viewcount', false);
}
if ($wgPageShowWatchingUsers) {
$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 );
$tpl->setRef( 'debug', $out->mDebugtext );
$tpl->set( 'reporttime', $out->reportTime() );
- $tpl->set( 'sitenotice', $wgSiteNotice );
- $tpl->set( 'tagline', wfMsg('tagline') );
+ $tpl->set( 'sitenotice', wfGetSiteNotice() );
$printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
$out->mBodytext .= $printfooter ;
# 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_ondblclick', false);
}
- $tpl->set( 'navigation_urls', $this->buildNavigationUrls() );
+ if( $this->iseditable && $wgUser->getOption( 'editsectiononrightclick' ) ) {
+ $tpl->set( 'body_onload', 'setupRightClickEdit()' );
+ } else {
+ $tpl->set( 'body_onload', false );
+ }
+ $tpl->set( 'sidebar', $this->buildSidebar() );
$tpl->set( 'nav_urls', $this->buildNavUrls() );
// execute template
global $wgShowIPinHeader;
$personal_urls = array();
if ($this->loggedin) {
- /* Logged in users personal toolbar */
$personal_urls['userpage'] = array(
- 'text' => wfMsg('mypage'),
- 'href' => $this->makeSpecialUrl('Mypage')
+ 'text' => $this->username,
+ 'href' => &$this->userpageUrlDetails['href'],
+ 'class' => $this->userpageUrlDetails['exists']?false:'new'
);
+ $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
$personal_urls['mytalk'] = array(
'text' => wfMsg('mytalk'),
- 'href' => $this->makeSpecialUrl('Mytalk')
+ 'href' => &$usertalkUrlDetails['href'],
+ 'class' => $usertalkUrlDetails['exists']?false:'new'
);
$personal_urls['preferences'] = array(
'text' => wfMsg('preferences'),
);
$personal_urls['mycontris'] = array(
'text' => wfMsg('mycontris'),
- 'href' => $this->makeSpecialUrl('Mycontributions')
+ 'href' => $this->makeSpecialUrl("Contributions/$this->username")
);
$personal_urls['logout'] = array(
'text' => wfMsg('userlogout'),
);
} else {
if( $wgShowIPinHeader && isset( $_COOKIE[ini_get("session.name")] ) ) {
- /* Anonymous with session users personal toolbar */
$personal_urls['anonuserpage'] = array(
- 'text' => wfMsg('mypage'),
- 'href' => $this->makeSpecialUrl('Mypage')
+ 'text' => $this->username,
+ 'href' => &$this->userpageUrlDetails['href'],
+ 'class' => $this->userpageUrlDetails['exists']?false:'new'
);
- $personal_urls['mytalk'] = array(
- 'text' => wfMsg('mytalk'),
- 'href' => $this->makeSpecialUrl('Mytalk')
+ $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+ $personal_urls['anontalk'] = array(
+ 'text' => wfMsg('anontalk'),
+ 'href' => &$usertalkUrlDetails['href'],
+ 'class' => $usertalkUrlDetails['exists']?false:'new'
);
-
$personal_urls['anonlogin'] = array(
'text' => wfMsg('userlogin'),
'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
);
} else {
- /* Anonymous users personal toolbar */
+
$personal_urls['login'] = array(
'text' => wfMsg('userlogin'),
'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
}
if( $checkEdit && $title->getArticleId() == 0 ) {
$classes[] = 'new';
+ $query = 'action=edit';
}
return array(
'class' => implode( ' ', $classes ),
'text' => wfMsg( $message ),
'href' => $title->getLocalUrl( $query ) );
}
+
+ function makeTalkUrlDetails( $name, $urlaction='' ) {
+ $title = Title::newFromText( $name );
+ $title = $title->getTalkPage();
+ $this->checkTitle($title, $name);
+ return array(
+ 'href' => $title->getLocalURL( $urlaction ),
+ 'exists' => $title->getArticleID() != 0?true:false
+ );
+ }
+
+ function makeArticleUrlDetails( $name, $urlaction='' ) {
+ $title = Title::newFromText( $name );
+ $title= $title->getSubjectPage();
+ $this->checkTitle($title, $name);
+ return array(
+ 'href' => $title->getLocalURL( $urlaction ),
+ 'exists' => $title->getArticleID() != 0?true:false
+ );
+ }
/**
* an array of edit links by default used for the tabs
* @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" )
);
}
}
- }
} else {
//article doesn't exist or is deleted
if($wgUser->isAllowed('delete')){
$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")
);
}
}
}
wfProfileOut( "$fname-live" );
- if ( $wgUser->isLoggedIn() and $action != 'submit' ) {
+ if( $wgUser->isLoggedIn() and $action != 'submit' ) {
if( !$this->mTitle->userIsWatching()) {
$content_actions['watch'] = array(
'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
);
}
-
- # Validate tab. TODO: add validation to logged-in user rights
- if($wgUseValidation){ # && $wgUser->isAllowed('validate')){
- $content_actions['validate'] = array(
- 'class' => ($action == 'validate') ? 'selected' : false,
- 'text' => wfMsg('val_tab'),
- 'href' => $this->mTitle->getLocalUrl( 'action=validate' )
- );
}
+ 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
+ else
+ {# Trying to get the current article revision through this weird stunt
+ $tid = $this->mTitle->getArticleID();
+ $tns = $this->mTitle->getNamespace();
+ $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 ;
+ else $oid = "" ; # Something's wrong, like the article has been deleted in the last 10 ns
+ }
+ if ( $oid != "" ) {
+ $oid = "&revision={$oid}" ;
+ $content_actions['validate'] = array(
+ 'class' => ($action == 'validate') ? 'selected' : false,
+ 'text' => wfMsg('val_tab'),
+ 'href' => $this->mTitle->getLocalUrl( "action=validate{$oid}" )
+ );
+ }
+ }
+ }
} else {
/* show special page tab */
$content_actions['article'] = array(
'class' => 'selected',
'text' => wfMsg('specialpage'),
- 'href' => false
+ 'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
);
}
);
$vcount ++;
}
- }
+ }
wfProfileOut( $fname );
return $content_actions;
}
+
- /**
- * build array of global navigation links
- * @return array
- * @access private
- */
- function buildNavigationUrls () {
- $fname = 'SkinTemplate::buildNavigationUrls';
- wfProfileIn( $fname );
-
- global $wgNavigationLinks;
- $result = array();
- foreach ( $wgNavigationLinks 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
wfProfileIn( $fname );
global $wgUser, $wgRequest;
- global $wgSiteSupportPage, $wgDisableUploads;
+ global $wgSiteSupportPage, $wgEnableUploads, $wgUploadNavigationUrl;
$action = $wgRequest->getText( 'action' );
$oldid = $wgRequest->getVal( 'oldid' );
$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['sitesupport'] = array('href' => $this->makeI18nUrl('sitesupportpage'));
$nav_urls['sitesupport'] = array('href' => $wgSiteSupportPage);
$nav_urls['help'] = array('href' => $this->makeI18nUrl('helppage'));
- if( $this->loggedin && !$wgDisableUploads ) {
- $nav_urls['upload'] = array('href' => $this->makeSpecialUrl('Upload'));
+ if( $wgEnableUploads ) {
+ if ($wgUploadNavigationUrl) {
+ $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl );
+ } else {
+ $nav_urls['upload'] = array('href' => $this->makeSpecialUrl('Upload'));
+ }
} else {
$nav_urls['upload'] = 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 );
* returns css with user-specific options
* @access public
*/
+
function getUserStylesheet() {
$fname = 'SkinTemplate::getUserStylesheet';
wfProfileIn( $fname );
global $wgUser;
$s = "/* generated user stylesheet */\n";
-
- if( $wgUser->isLoggedIn() ) {
- if ( $wgUser->getOption( "underline" ) ) {
- $s .= "a { text-decoration: underline; }\n";
- } else {
- $s .= "a { text-decoration: none; }\n";
- }
- }
- if ( !$wgUser->getOption( "highlightbroken" ) ) {
- $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
- }
- if ( $wgUser->getOption( "justify" ) ) {
- $s .= "#bodyContent { text-align: justify; }\n";
- }
+ $s .= $this->reallyDoGetUserStyles();
wfProfileOut( $fname );
return $s;
}
$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