* Fixed unclosed <p> tag
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index d6fa713..20f017d 100644 (file)
@@ -23,7 +23,7 @@
  * Todo: Needs some serious refactoring into functions that correspond
  * to the computations individual esi snippets need. Most importantly no body
  * parsing for most of those of course.
- * 
+ *
  * PHPTAL support has been moved to a subclass in SkinPHPTal.php,
  * and is optional. You'll need to install PHPTAL manually to use
  * skins that depend on it.
@@ -57,10 +57,10 @@ class MediaWiki_I18N {
        function translate($value) {
                $fname = 'SkinTemplate-translate';
                wfProfileIn( $fname );
-               
+
                // Hack for i18n:attributes in PHPTAL 1.0.0 dev version as of 2004-10-23
                $value = preg_replace( '/^string:/', '', $value );
-               
+
                $value = wfMsg( $value );
                // interpolate variables
                while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
@@ -135,7 +135,7 @@ class SkinTemplate extends Skin {
        function &setupTemplate( $classname, $repository=false, $cache_dir=false ) {
                return new $classname();
        }
-       
+
        /**
         * initialize various variables and generate the template
         *
@@ -145,20 +145,20 @@ class SkinTemplate extends Skin {
        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;
 
                $fname = 'SkinTemplate::outputPage';
                wfProfileIn( $fname );
-               
+
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
                wfProfileIn( "$fname-init" );
                $this->initPage( $out );
 
-               $this->mTitle = $wgTitle;
+               $this->mTitle =& $wgTitle;
                $this->mUser =& $wgUser;
 
                $tpl =& $this->setupTemplate( $this->template, 'skins' );
@@ -171,11 +171,12 @@ class SkinTemplate extends Skin {
                wfProfileIn( "$fname-stuff" );
                $this->thispage = $this->mTitle->getPrefixedDbKey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
-               $this->loggedin = $wgUser->getID() != 0;
-               $this->iscontent = ($this->mTitle->getNamespace() != Namespace::getSpecial() );
+               $this->loggedin = $wgUser->isLoggedIn();
+               $this->iscontent = ($this->mTitle->getNamespace() != NS_SPECIAL );
                $this->iseditable = ($this->iscontent and !($action == 'edit' or $action == 'submit'));
                $this->username = $wgUser->getName();
-               $this->userpage = $wgContLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
+               $userPage = $wgUser->getUserPage();
+               $this->userpage = $userPage->getPrefixedText();
                $this->userpageUrlDetails = $this->makeUrlDetails($this->userpage);
 
                $this->usercss =  $this->userjs = $this->userjsprev = false;
@@ -217,11 +218,13 @@ class SkinTemplate extends Skin {
                        $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);
@@ -286,6 +289,8 @@ class SkinTemplate extends Skin {
                                } else {
                                        $tpl->set('viewcount', false);
                                }
+                       } else {
+                               $tpl->set('viewcount', false);
                        }
 
                        if ($wgPageShowWatchingUsers) {
@@ -306,7 +311,6 @@ class SkinTemplate extends Skin {
                                $tpl->set('numberofwatchingusers', false);
                        }
 
-                       $tpl->set('lastmod', $this->lastModified());
                        $tpl->set('copyright',$this->getCopyright());
 
                        $this->credits = false;
@@ -314,6 +318,8 @@ class SkinTemplate extends Skin {
                        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 );
@@ -341,8 +347,7 @@ class SkinTemplate extends Skin {
 
                $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 ;
@@ -350,11 +355,14 @@ class SkinTemplate extends Skin {
 
                # 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);
@@ -375,19 +383,24 @@ class SkinTemplate extends Skin {
                } 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
                wfProfileIn( "$fname-execute" );
                $res = $tpl->execute();
                wfProfileOut( "$fname-execute" );
-               
+
                // result may be an error
                $this->printOrError( $res );
                wfProfileOut( $fname );
        }
-       
+
        /**
         * Output the string, or print error message if it's
         * an error object of the appropriate type.
@@ -408,19 +421,21 @@ class SkinTemplate extends Skin {
        function buildPersonalUrls() {
                $fname = 'SkinTemplate::buildPersonalUrls';
                wfProfileIn( $fname );
-               
+
                /* set up the default links for the personal toolbar */
                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'),
@@ -432,7 +447,7 @@ class SkinTemplate extends Skin {
                        );
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg('mycontris'),
-                               'href' => $this->makeSpecialUrl('Mycontributions')
+                               'href' => $this->makeSpecialUrl("Contributions/$this->username")
                        );
                        $personal_urls['logout'] = array(
                                'text' => wfMsg('userlogout'),
@@ -440,22 +455,23 @@ class SkinTemplate extends Skin {
                        );
                } 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 )
@@ -474,23 +490,44 @@ class SkinTemplate extends Skin {
                }
                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
         * @return array
         * @access private
         */
        function buildContentActionUrls () {
-               global $wgContLang;
+               global $wgContLang, $wgUseValidation, $wgDBprefix, $wgValidationForAnons;
                $fname = 'SkinTemplate::buildContentActionUrls';
                wfProfileIn( $fname );
-               
+
                global $wgUser, $wgRequest;
                $action = $wgRequest->getText( 'action' );
                $section = $wgRequest->getText( 'section' );
@@ -504,15 +541,16 @@ class SkinTemplate extends Skin {
                        $content_actions[$nskey] = $this->tabAction(
                                $this->mTitle->getSubjectPage(),
                                $nskey,
-                               !$this->mTitle->isTalkPage() );
-                       
+                               !$this->mTitle->isTalkPage(),
+                               '', true);
+
                        $content_actions['talk'] = $this->tabAction(
                                $this->mTitle->getTalkPage(),
                                'talk',
                                $this->mTitle->isTalkPage(),
                                '',
                                true);
-                       
+
                        wfProfileIn( "$fname-edit" );
                        if ( $this->mTitle->userCanEdit() ) {
                                $oid = ( $oldid && ! isset( $diff ) ) ? '&oldid='.IntVal( $oldid ) : false;
@@ -573,12 +611,12 @@ class SkinTemplate extends Skin {
                                                'href' => $this->mTitle->getLocalUrl( 'action=delete' )
                                        );
                                }
-                               if ( $wgUser->getID() != 0 ) {
+                               if ( $wgUser->isLoggedIn() ) {
                                        if ( $this->mTitle->userCanMove()) {
                                                $content_actions['move'] = array(
-                                                       'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == Namespace::getSpecial()) ? 'selected' : false,
+                                                       '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" )
                                                );
                                        }
                                }
@@ -588,15 +626,15 @@ class SkinTemplate extends Skin {
                                        if( $n = $this->mTitle->isDeleted() ) {
                                                $content_actions['undelete'] = array(
                                                        'class' => false,
-                                                       'text' => wfMsg( "undelete_short", $n ),
-                                                       'href' => $this->makeSpecialUrl('Undelete/'.$this->thispage)
+                                                       'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ),
+                                                       'href' => $this->makeSpecialUrl("Undelete/$this->thispage")
                                                );
                                        }
                                }
                        }
                        wfProfileOut( "$fname-live" );
 
-                       if ( $wgUser->getID() != 0 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,
@@ -612,13 +650,37 @@ class SkinTemplate extends Skin {
                                }
                        }
 
+                       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
                        );
                }
 
@@ -643,41 +705,13 @@ class SkinTemplate extends Skin {
                                        );
                                $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
@@ -687,17 +721,17 @@ class SkinTemplate extends Skin {
        function buildNavUrls () {
                $fname = 'SkinTemplate::buildNavUrls';
                wfProfileIn( $fname );
-               
+
                global $wgUser, $wgRequest;
-               global $wgSiteSupportPage, $wgDisableUploads;
+               global $wgSiteSupportPage, $wgEnableUploads, $wgUploadNavigationUrl;
 
                $action = $wgRequest->getText( 'action' );
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
-               
+
                $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;
@@ -705,16 +739,33 @@ class SkinTemplate extends Skin {
                // $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 ) {
@@ -727,7 +778,7 @@ class SkinTemplate extends Skin {
 
                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;
@@ -735,7 +786,7 @@ class SkinTemplate extends Skin {
                $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 );
@@ -781,14 +832,14 @@ class SkinTemplate extends Skin {
                                return 'nstab-main';
                }
        }
-       
+
        /**
         * @access private
         */
        function setupUserCss() {
                $fname = 'SkinTemplate::setupUserCss';
                wfProfileIn( $fname );
-               
+
                global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
                $sitecss = '';
@@ -796,10 +847,10 @@ class SkinTemplate extends Skin {
                $siteargs = '&maxage=' . $wgSquidMaxage;
 
                # 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";
@@ -814,15 +865,15 @@ class SkinTemplate extends Skin {
                }
 
                if ($wgContLang->isRTL()) $sitecss .= '@import "' . $wgStylePath . '/' . $this->stylename . '/rtl.css";' . "\n";
-               
+
                # If we use the site's dynamic CSS, throw that in, too
                if ( $wgUseSiteCss ) {
                        $sitecss .= '@import "' . $this->makeNSUrl(ucfirst($this->skinname) . '.css', 'action=raw&ctype=text/css&smaxage=' . $wgSquidMaxage, NS_MEDIAWIKI) . '";' . "\n";
                        $sitecss .= '@import "' . $this->makeUrl('-','action=raw&gen=css' . $siteargs) . '";' . "\n";
                }
-               
+
                # If we use any dynamic CSS, make a little CDATA block out of it.
-               
+
                if ( !empty($sitecss) || !empty($usercss) ) {
                        $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
@@ -835,8 +886,8 @@ class SkinTemplate extends Skin {
        function setupUserJs() {
                $fname = 'SkinTemplate::setupUserJs';
                wfProfileIn( $fname );
-               
-               global $wgRequest, $wgAllowUserJs;
+
+               global $wgRequest, $wgAllowUserJs, $wgJsMimeType;
                $action = $wgRequest->getText('action');
 
                if( $wgAllowUserJs && $this->loggedin ) {
@@ -844,53 +895,48 @@ class SkinTemplate extends Skin {
                                # 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->getID() != 0) {
-                       if ( 1 == $wgUser->getOption( "underline" ) ) {
-                               $s .= "a { text-decoration: underline; }\n";
-                       } else {
-                               $s .= "a { text-decoration: none; }\n";
-                       }
-               }
-               if ( 1 != $wgUser->getOption( "highlightbroken" ) ) {
-                       $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
-               }
-               if ( 1 == $wgUser->getOption( "justify" ) ) {
-                       $s .= "#bodyContent { text-align: justify; }\n";
-               }
+               $s .= $this->reallyDoGetUserStyles();
                wfProfileOut( $fname );
                return $s;
        }
-       
+
        /**
         * @access public
         */
        function getUserJs() {
                $fname = 'SkinTemplate::getUserJs';
                wfProfileIn( $fname );
-               
-               global $wgUser, $wgStylePath;
+
+               global $wgStylePath;
                $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 ('&lt;'.$msgKey.'&gt;' != $userJS) {
+                       $s .= $userJS;
+               }
+
                wfProfileOut( $fname );
                return $s;
        }
@@ -910,28 +956,28 @@ class QuickTemplate {
                $this->data = array();
                $this->translator = new MediaWiki_I18N();
        }
-       
+
        /**
         * @access public
         */
        function set( $name, $value ) {
                $this->data[$name] = $value;
        }
-       
+
        /**
         * @access public
         */
        function setRef($name, &$value) {
                $this->data[$name] =& $value;
        }
-       
+
        /**
         * @access public
         */
        function setTranslator( &$t ) {
                $this->translator = &$t;
        }
-       
+
        /**
         * @access public
         */
@@ -946,28 +992,28 @@ class QuickTemplate {
        function text( $str ) {
                echo htmlspecialchars( $this->data[$str] );
        }
-       
+
        /**
         * @access private
         */
        function html( $str ) {
                echo $this->data[$str];
        }
-       
+
        /**
         * @access private
         */
        function msg( $str ) {
                echo htmlspecialchars( $this->translator->translate( $str ) );
        }
-       
+
        /**
         * @access private
         */
        function msgHtml( $str ) {
                echo $this->translator->translate( $str );
        }
-       
+
        /**
         * An ugly, ugly hack.
         * @access private
@@ -980,14 +1026,14 @@ class QuickTemplate {
                        $wgOut->mParserOptions, true );
                echo $parserOutput->getText();
        }
-       
+
        /**
         * @access private
         */
        function haveData( $str ) {
                return $this->data[$str];
        }
-       
+
        /**
         * @access private
         */
@@ -997,5 +1043,5 @@ class QuickTemplate {
        }
 }
 
-} // end of if( defined( 'MEDIAWIKI' ) ) 
-?>
\ No newline at end of file
+} // end of if( defined( 'MEDIAWIKI' ) )
+?>