begin cleanup on magnus' url upload thingy
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index 4082c67..a3580d9 100644 (file)
@@ -1,4 +1,7 @@
 <?php
+if ( ! defined( 'MEDIAWIKI' ) )
+       die( 1 );
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -11,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License along
 # with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
 /**
  * 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.
  *
  * @package MediaWiki
  * @subpackage Skins
  */
 
-/**
- * This is not a valid entry point, perform no further processing unless
- * MEDIAWIKI is defined
- */
-if( defined( 'MEDIAWIKI' ) ) {
-
-require_once 'GlobalFunctions.php';
-
 /**
  * Wrapper object for MediaWiki's localization functions,
  * to be passed to the template engine.
  *
- * @access private
+ * @private
  * @package MediaWiki
  */
 class MediaWiki_I18N {
@@ -57,10 +48,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)) {
@@ -81,7 +72,7 @@ class MediaWiki_I18N {
  */
 class SkinTemplate extends Skin {
        /**#@+
-        * @access private
+        * @private
         */
 
        /**
@@ -99,9 +90,6 @@ class SkinTemplate extends Skin {
        /**
         * For QuickTemplate, the name of the subclass which
         * will actually fill the template.
-        *
-        * In PHPTal mode, name of PHPTal template to be used.
-        * '.pt' will be automaticly added to it on PHPTAL object creation
         */
        var $template;
 
@@ -130,33 +118,45 @@ class SkinTemplate extends Skin {
         * @param string $repository subdirectory where we keep template files
         * @param string $cache_dir
         * @return object
-        * @access private
+        * @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
-        * @access public
+        * @public
         */
        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 $wgScript, $wgStylePath, $wgContLanguageCode;
+               global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
+               global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
+               global $wgPageShowWatchingUsers;
+               global $wgUseTrackbacks;
+               global $wgDBname;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
 
                $fname = 'SkinTemplate::outputPage';
                wfProfileIn( $fname );
-               
+
+               // Hook that allows last minute changes to the output page, e.g.
+               // adding of CSS or Javascript by extensions.
+               wfRunHooks( 'BeforePageDisplay', array( &$out ) );
+
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
                wfProfileIn( "$fname-init" );
                $this->initPage( $out );
-               $tpl =& $this->setupTemplate( $this->template, 'skins' );
+
+               $this->mTitle =& $wgTitle;
+               $this->mUser =& $wgUser;
+
+               $tpl = $this->setupTemplate( $this->template, 'skins' );
 
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
@@ -164,25 +164,42 @@ class SkinTemplate extends Skin {
                wfProfileOut( "$fname-init" );
 
                wfProfileIn( "$fname-stuff" );
-               $this->thispage = $wgTitle->getPrefixedDbKey();
-               $this->thisurl = $wgTitle->getPrefixedURL();
-               $this->loggedin = $wgUser->getID() != 0;
-               $this->iscontent = ($wgTitle->getNamespace() != Namespace::getSpecial() );
+               $this->thispage = $this->mTitle->getPrefixedDbKey();
+               $this->thisurl = $this->mTitle->getPrefixedURL();
+               $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();
-               $this->userpageUrlDetails = $this->makeUrlDetails($this->userpage);
+               $userPage = $wgUser->getUserPage();
+               $this->userpage = $userPage->getPrefixedText();
+
+               if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
+                       $this->userpageUrlDetails = $this->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->usercss =  $this->userjs = $this->userjsprev = false;
                $this->setupUserCss();
                $this->setupUserJs();
-               $this->titletxt = $wgTitle->getPrefixedText();
+               $this->titletxt = $this->mTitle->getPrefixedText();
                wfProfileOut( "$fname-stuff" );
 
                wfProfileIn( "$fname-stuff2" );
                $tpl->set( 'title', $wgOut->getPageTitle() );
                $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
+               $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
 
+               $nsname = @$wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ];
+               if ( $nsname === NULL ) $nsname = $this->mTitle->getNsText();
+               
+               $tpl->set( 'nscanonical', $nsname );
+               $tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() );
+               $tpl->set( 'titletext', $this->mTitle->getText() );
+               $tpl->set( 'articleid', $this->mTitle->getArticleId() );
+                               
                $tpl->setRef( "thispage", $this->thispage );
                $subpagestr = $this->subPageSubtitle();
                $tpl->set(
@@ -203,40 +220,53 @@ class SkinTemplate extends Skin {
                        foreach( $wgFeedClasses as $format => $class ) {
                                $feeds[$format] = array(
                                        'text' => $format,
-                                       'href' => $wgRequest->appendQuery( "feed=$format" ),
-                                       'ttip' => wfMsg('tooltip-'.$format)
+                                       'href' => $wgRequest->appendQuery( "feed=$format" )
                                );
                        }
                        $tpl->setRef( 'feeds', $feeds );
                } else {
                        $tpl->set( 'feeds', false );
                }
+               if ($wgUseTrackbacks && $out->isArticleRelated())
+                       $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF());
+
                $tpl->setRef( 'mimetype', $wgMimeType );
+               $tpl->setRef( 'jsmimetype', $wgJsMimeType );
                $tpl->setRef( 'charset', $wgOutputEncoding );
                $tpl->set( 'headlinks', $out->getHeadLinks() );
+               $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('nsclass', 'ns-'.$wgTitle->getNamespace());
-               $tpl->set('notspecialpage', $wgTitle->getNamespace() != NS_SPECIAL);
+               $tpl->set('nsclass', 'ns-'.$this->mTitle->getNamespace());
+               $tpl->set('notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL);
                /* XXX currently unused, might get useful later
-               $tpl->set( "editable", ($wgTitle->getNamespace() != NS_SPECIAL ) );
-               $tpl->set( "exists", $wgTitle->getArticleID() != 0 );
-               $tpl->set( "watch", $wgTitle->userIsWatching() ? "unwatch" : "watch" );
-               $tpl->set( "protect", count($wgTitle->isProtected()) ? "unprotect" : "protect" );
+               $tpl->set( "editable", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
+               $tpl->set( "exists", $this->mTitle->getArticleID() != 0 );
+               $tpl->set( "watch", $this->mTitle->userIsWatching() ? "unwatch" : "watch" );
+               $tpl->set( "protect", count($this->mTitle->isProtected()) ? "unprotect" : "protect" );
                $tpl->set( "helppage", wfMsg('helppage'));
                */
                $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->setRef( 'username', $this->username );
+               $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->set( 'userlang', $wgLang->getCode() );
+               $tpl->set( 'pagecss', $this->setupPageCss() );
                $tpl->setRef( 'usercss', $this->usercss);
                $tpl->setRef( 'userjs', $this->userjs);
                $tpl->setRef( 'userjsprev', $this->userjsprev);
@@ -250,20 +280,37 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('jsvarurl', false);
                }
-               if( $wgUser->getNewtalk() ) {
-                       $usertitle = Title::newFromText( $this->userpage );
-                       $usertalktitle = $usertitle->getTalkPage();
-                       if($usertalktitle->getPrefixedDbKey() != $this->thispage){
+               $newtalks = $wgUser->getNewMessageLinks();
 
-                               $ntl = wfMsg( 'newmessages',
-                               $this->makeKnownLink(
-                                       $wgContLang->getNsText( Namespace::getTalk( Namespace::getUser() ) )
-                                       . ':' . $this->username,
-                                       wfMsg('newmessageslink') )
+               if (count($newtalks) == 1 && $newtalks[0]["wiki"] === $wgDBname) {
+                       $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'
+                                       )
                                );
                                # Disable Cache
                                $wgOut->setSquidMaxage(0);
                        }
+               } else if (count($newtalks)) {
+                       $sep = str_replace("_", " ", wfMsgHtml("newtalkseperator"));
+                       $msgs = array();
+                       foreach ($newtalks as $newtalk) {
+                               $msgs[] = wfElement("a",
+                                       array('href' => $newtalk["link"]), $newtalk["wiki"]);
+                       }
+                       $parts = implode($sep, $msgs);
+                       $ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
+                       $wgOut->setSquidMaxage(0);
                } else {
                        $ntl = '';
                }
@@ -273,16 +320,38 @@ class SkinTemplate extends Skin {
                $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->set('viewcount', wfMsg( "viewcount", $viewcount ));
+                                       $tpl->set('viewcount', wfMsgExt( 'viewcount', array( 'parseinline' ), $viewcount ) );
                                } else {
                                        $tpl->set('viewcount', false);
                                }
+                       } else {
+                               $tpl->set('viewcount', false);
+                       }
+
+                       if ($wgPageShowWatchingUsers) {
+                               $dbr =& wfGetDB( DB_SLAVE );
+                               extract( $dbr->tableNames( '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');
+                               $x = $dbr->fetchObject( $res );
+                               $numberofwatchingusers = $x->n;
+                               if ($numberofwatchingusers > 0) {
+                                       $tpl->set('numberofwatchingusers', wfMsg('number_of_watching_users_pageview', $numberofwatchingusers));
+                               } else {
+                                       $tpl->set('numberofwatchingusers', false);
+                               }
+                       } else {
+                               $tpl->set('numberofwatchingusers', false);
                        }
-                       $tpl->set('lastmod', $this->lastModified());
+
                        $tpl->set('copyright',$this->getCopyright());
 
                        $this->credits = false;
@@ -290,6 +359,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 );
@@ -299,11 +370,13 @@ class SkinTemplate extends Skin {
                        $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);
                }
                wfProfileOut( "$fname-stuff3" );
 
@@ -311,11 +384,13 @@ class SkinTemplate extends Skin {
                $tpl->set( 'copyrightico', $this->getCopyrightIcon() );
                $tpl->set( 'poweredbyico', $this->getPoweredBy() );
                $tpl->set( 'disclaimer', $this->disclaimerLink() );
+               $tpl->set( 'privacy', $this->privacyLink() );
                $tpl->set( 'about', $this->aboutLink() );
 
                $tpl->setRef( 'debug', $out->mDebugtext );
                $tpl->set( 'reporttime', $out->reportTime() );
-               $tpl->set( 'sitenotice', $wgSiteNotice );
+               $tpl->set( 'sitenotice', wfGetSiteNotice() );
+               $tpl->set( 'bottomscripts', $this->bottomScripts() );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
                $out->mBodytext .= $printfooter ;
@@ -323,11 +398,19 @@ 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 ) {
+                               $tmp = explode( ':', $l, 2 );
+                               $class = 'interwiki-' . $tmp[0];
+                               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(count($language_urls)) {
                        $tpl->setRef( 'language_urls', $language_urls);
@@ -348,26 +431,31 @@ 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.
         * For the base class, assume strings all around.
         *
         * @param mixed $str
-        * @access private
+        * @private
         */
        function printOrError( &$str ) {
                echo $str;
@@ -376,176 +464,226 @@ class SkinTemplate extends Skin {
        /**
         * build array of urls for personal toolbar
         * @return array
-        * @access private
+        * @private
         */
        function buildPersonalUrls() {
+               global $wgTitle, $wgShowIPinHeader;
+
                $fname = 'SkinTemplate::buildPersonalUrls';
+               $pageurl = $wgTitle->getLocalURL();
                wfProfileIn( $fname );
-               
+
                /* set up the default links for the personal toolbar */
-               global $wgShowIPinHeader;
                $personal_urls = array();
                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);
                        $personal_urls['mytalk'] = array(
                                'text' => wfMsg('mytalk'),
                                'href' => &$usertalkUrlDetails['href'],
-                               'class' => $usertalkUrlDetails['exists']?false:'new'
+                               'class' => $usertalkUrlDetails['exists']?false:'new',
+                               'active' => ( $usertalkUrlDetails['href'] == $pageurl )
                        );
+                       $href = $this->makeSpecialUrl('Preferences');
                        $personal_urls['preferences'] = array(
                                'text' => wfMsg('preferences'),
-                               'href' => $this->makeSpecialUrl('Preferences')
+                               'href' => $this->makeSpecialUrl('Preferences'),
+                               'active' => ( $href == $pageurl )
                        );
+                       $href = $this->makeSpecialUrl('Watchlist');
                        $personal_urls['watchlist'] = array(
                                'text' => wfMsg('watchlist'),
-                               'href' => $this->makeSpecialUrl('Watchlist')
+                               'href' => $href,
+                               'active' => ( $href == $pageurl )
                        );
+                       $href = $this->makeSpecialUrl("Contributions/$this->username");
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg('mycontris'),
-                               'href' => $this->makeSpecialUrl('Contributions','target=' . urlencode( $this->username ) )
+                               'href' => $href
+                               # FIXME #  'active' => ( $href == $pageurl . '/' . $this->username )
                        );
                        $personal_urls['logout'] = array(
                                'text' => wfMsg('userlogout'),
-                               'href' => $this->makeSpecialUrl('Userlogout','returnto=' . $this->thisurl )
+                               'href' => $this->makeSpecialUrl( 'Userlogout',
+                                       $wgTitle->getNamespace() === NS_SPECIAL && $wgTitle->getText() === 'Preferences' ? '' : "returnto={$this->thisurl}"
+                               )
                        );
                } else {
                        if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] ) ) {
+                               $href = &$this->userpageUrlDetails['href'];
                                $personal_urls['anonuserpage'] = array(
                                        'text' => $this->username,
-                                       'href' => &$this->userpageUrlDetails['href'],
-                                       'class' => $this->userpageUrlDetails['exists']?false:'new'
+                                       'href' => $href,
+                                       'class' => $this->userpageUrlDetails['exists']?false:'new',
+                                       'active' => ( $pageurl == $href )
                                );
                                $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
+                               $href = &$usertalkUrlDetails['href'];
                                $personal_urls['anontalk'] = array(
                                        'text' => wfMsg('anontalk'),
-                                       'href' => &$usertalkUrlDetails['href'],
-                                       'class' => $usertalkUrlDetails['exists']?false:'new'
+                                       'href' => $href,
+                                       'class' => $usertalkUrlDetails['exists']?false:'new',
+                                       'active' => ( $pageurl == $href )
                                );
                                $personal_urls['anonlogin'] = array(
                                        'text' => wfMsg('userlogin'),
-                                       'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
+                                       'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl ),
+                                       'active' => ( NS_SPECIAL == $wgTitle->getNamespace() && 'Userlogin' == $wgTitle->getDBkey() )
                                );
                        } else {
 
                                $personal_urls['login'] = array(
                                        'text' => wfMsg('userlogin'),
-                                       'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
+                                       'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl ),
+                                       'active' => ( NS_SPECIAL == $wgTitle->getNamespace() && 'Userlogin' == $wgTitle->getDBkey() )
                                );
                        }
                }
+
+               wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );              
                wfProfileOut( $fname );
                return $personal_urls;
        }
 
+       /**
+        * Returns true if the IP should be shown in the header
+        */
+       function showIPinHeader() {
+               global $wgShowIPinHeader;
+               return $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] );
+       }
+
+       function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) {
+               $classes = array();
+               if( $selected ) {
+                       $classes[] = 'selected';
+               }
+               if( $checkEdit && $title->getArticleId() == 0 ) {
+                       $classes[] = 'new';
+                       $query = 'action=edit';
+               }
+
+               $text = wfMsg( $message );
+               if ( $text == "&lt;$message&gt;" ) {
+                       global $wgContLang;
+                       $text = $wgContLang->getNsText( Namespace::getSubject( $title->getNamespace() ) );
+               }
+
+               return array(
+                       'class' => implode( ' ', $classes ),
+                       'text' => $text,
+                       '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
+        * @private
         */
        function buildContentActionUrls () {
+               global $wgContLang, $wgOut;
                $fname = 'SkinTemplate::buildContentActionUrls';
                wfProfileIn( $fname );
-               
-               global $wgTitle, $wgUser, $wgOut, $wgRequest, $wgUseValidation;
+
+               global $wgUser, $wgRequest;
                $action = $wgRequest->getText( 'action' );
                $section = $wgRequest->getText( 'section' );
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
                $content_actions = array();
 
-               if( $this->iscontent and !$wgOut->isQuickbarSuppressed() ) {
-
-                       $nskey = $this->getNameSpaceKey();
-                       $is_active = !Namespace::isTalk( $wgTitle->getNamespace()) ;
-                       if ( $action == 'validate' ) $is_active = false ; # Show article tab deselected when validating
-                       $content_actions[$nskey] = array('class' => ($is_active) ? 'selected' : false,
-                       'text' => wfMsg($nskey),
-                       'href' => $this->makeArticleUrl($this->thispage));
-
-                       /* set up the classes for the talk link */
-                       wfProfileIn( "$fname-talk" );
-                       $talk_class = (Namespace::isTalk( $wgTitle->getNamespace()) ? 'selected' : false);
-                       $talktitle = $wgTitle->getTalkPage();
-                       if( $talktitle->getArticleId() != 0 ) {
-                               $content_actions['talk'] = array(
-                                       'class' => $talk_class,
-                                       'text' => wfMsg('talk'),
-                                       'href' => $talktitle->getLocalUrl()
-                               );
-                       } else {
-                               $content_actions['talk'] = array(
-                                       'class' => $talk_class ? $talk_class.' new' : 'new',
-                                       'text' => wfMsg('talk'),
-                                       'href' => $talktitle->getLocalUrl( 'action=edit' )
-                               );
-                       }
-                       wfProfileOut( "$fname-talk" );
+               $prevent_active_tabs = false ;
+               wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this , &$prevent_active_tabs ) )     ;
+
+               if( $this->iscontent ) {
+                       $subjpage = $this->mTitle->getSubjectPage();
+                       $talkpage = $this->mTitle->getTalkPage();
+
+                       $nskey = $this->mTitle->getNamespaceKey();
+                       $content_actions[$nskey] = $this->tabAction(
+                               $subjpage,
+                               $nskey,
+                               !$this->mTitle->isTalkPage() && !$prevent_active_tabs,
+                               '', true);
+
+                       $content_actions['talk'] = $this->tabAction(
+                               $talkpage,
+                               'talk',
+                               $this->mTitle->isTalkPage() && !$prevent_active_tabs,
+                               '',
+                               true);
 
                        wfProfileIn( "$fname-edit" );
-                       if ( $wgTitle->userCanEdit() ) {
-                               $oid = ( $oldid && ! isset( $diff ) ) ? '&oldid='.IntVal( $oldid ) : false;
-                               $istalk = ( Namespace::isTalk( $wgTitle->getNamespace()) );
+                       if ( $this->mTitle->userCanEdit() && ( $this->mTitle->exists() || $this->mTitle->userCanCreate() ) ) {
+                               $istalk = $this->mTitle->isTalkPage();
                                $istalkclass = $istalk?' istalk':'';
                                $content_actions['edit'] = array(
                                        'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
                                        'text' => wfMsg('edit'),
-                                       'href' => $wgTitle->getLocalUrl( 'action=edit'.$oid )
+                                       'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
-                               if ( $istalk ) {
+
+                               if ( $istalk || $wgOut->showNewSectionLink() ) {
                                        $content_actions['addsection'] = array(
                                                'class' => $section == 'new'?'selected':false,
                                                'text' => wfMsg('addsection'),
-                                               'href' => $wgTitle->getLocalUrl( 'action=edit&section=new' )
+                                               'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
                                        );
                                }
                        } else {
-                               $oid = ( $oldid && ! isset( $diff ) ) ? '&oldid='.IntVal( $oldid ) : '';
                                $content_actions['viewsource'] = array(
                                        'class' => ($action == 'edit') ? 'selected' : false,
                                        'text' => wfMsg('viewsource'),
-                                       'href' => $wgTitle->getLocalUrl( 'action=edit'.$oid )
+                                       'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
                        }
                        wfProfileOut( "$fname-edit" );
 
                        wfProfileIn( "$fname-live" );
-                       if ( $wgTitle->getArticleId() ) {
+                       if ( $this->mTitle->getArticleId() ) {
 
                                $content_actions['history'] = array(
                                        'class' => ($action == 'history') ? 'selected' : false,
                                        'text' => wfMsg('history_short'),
-                                       'href' => $wgTitle->getLocalUrl( 'action=history')
+                                       'href' => $this->mTitle->getLocalUrl( 'action=history')
                                );
 
-                               # XXX: is there a rollback action anywhere or is it planned?
-                               # Don't recall where i got this from...
-                               /*if( $wgUser->getNewtalk() ) {
-                                       $content_actions['rollback'] = array('class' => ($action == 'rollback') ? 'selected' : false,
-                                       'text' => wfMsg('rollback_short'),
-                                       'href' => $this->makeUrl($this->thispage, 'action=rollback'),
-                                       'ttip' => wfMsg('tooltip-rollback'),
-                                       'akey' => wfMsg('accesskey-rollback'));
-                               }
-                               */
-
-                               if($wgUser->isAllowed('protect')){
-                                       if(!$wgTitle->isProtected()){
+                               if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
+                                       if(!$this->mTitle->isProtected()){
                                                $content_actions['protect'] = array(
                                                        'class' => ($action == 'protect') ? 'selected' : false,
                                                        'text' => wfMsg('protect'),
-                                                       'href' => $wgTitle->getLocalUrl( 'action=protect' )
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=protect' )
                                                );
 
                                        } else {
                                                $content_actions['unprotect'] = array(
                                                        'class' => ($action == 'unprotect') ? 'selected' : false,
                                                        'text' => wfMsg('unprotect'),
-                                                       'href' => $wgTitle->getLocalUrl( 'action=unprotect' )
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
                                                );
                                        }
                                }
@@ -553,143 +691,175 @@ class SkinTemplate extends Skin {
                                        $content_actions['delete'] = array(
                                                'class' => ($action == 'delete') ? 'selected' : false,
                                                'text' => wfMsg('delete'),
-                                               'href' => $wgTitle->getLocalUrl( 'action=delete' )
+                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
                                        );
                                }
-                               if ( $wgUser->getID() != 0 ) {
-                                       if ( $wgTitle->userCanMove()) {
-                                               $content_actions['move'] = array(
-                                                       'class' => ($wgTitle->getDbKey() == 'Movepage' and $wgTitle->getNamespace == Namespace::getSpecial()) ? 'selected' : false,
-                                                       'text' => wfMsg('move'),
-                                                       'href' => $this->makeSpecialUrl('Movepage', 'target='. urlencode( $this->thispage ) )
-                                               );
-                                       }
+                               if ( $this->mTitle->userCanMove()) {
+                                       $moveTitle = Title::makeTitle( NS_SPECIAL, 'Movepage' );
+                                       $content_actions['move'] = array(
+                                               'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false,
+                                               'text' => wfMsg('move'),
+                                               'href' => $moveTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+                                       );
                                }
                        } else {
                                //article doesn't exist or is deleted
-                               if($wgUser->isAllowed('delete')){
-                                       if( $n = $wgTitle->isDeleted() ) {
+                               if( $wgUser->isAllowed( 'delete' ) ) {
+                                       if( $n = $this->mTitle->isDeleted() ) {
+                                               $undelTitle = Title::makeTitle( NS_SPECIAL, 'Undelete' );
                                                $content_actions['undelete'] = array(
                                                        'class' => false,
-                                                       'text' => wfMsg( "undelete_short", $n ),
-                                                       'href' => $this->makeSpecialUrl('Undelete/'.$this->thispage)
+                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $n ),
+                                                       'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+                                                       #'href' => $this->makeSpecialUrl("Undelete/$this->thispage")
                                                );
                                        }
                                }
                        }
                        wfProfileOut( "$fname-live" );
-                       
-                       if ( $wgUser->getID() != 0 and $action != 'submit' ) {
-                               if( !$wgTitle->userIsWatching()) {
+
+                       if( $this->loggedin ) {
+                               if( !$this->mTitle->userIsWatching()) {
                                        $content_actions['watch'] = array(
                                                'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
                                                'text' => wfMsg('watch'),
-                                               'href' => $wgTitle->getLocalUrl( 'action=watch' )
+                                               'href' => $this->mTitle->getLocalUrl( 'action=watch' )
                                        );
                                } else {
                                        $content_actions['unwatch'] = array(
                                                'class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
                                                'text' => wfMsg('unwatch'),
-                                               'href' => $wgTitle->getLocalUrl( 'action=unwatch' )
+                                               'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
                                        );
                                }
                        }
 
-                       # Show validate tab
-                       if ( $wgUseValidation && $wgTitle->getArticleId() && $wgTitle->getNamespace() == 0 ) {
-                               global $wgArticle ;
-                               $article_time = "&timestamp=" . $wgArticle->mTimestamp ;
-                               $content_actions['validate'] = array(
-                                       'class' => ($action == 'validate') ? 'selected' : false ,
-                                       'text' => wfMsg('val_tab'),
-                                       'href' => $wgTitle->getLocalUrl( 'action=validate'.$article_time)
-                               );
-                       }
+                       wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) )   ;
                } else {
                        /* show special page tab */
 
                        $content_actions['article'] = array(
                                'class' => 'selected',
                                'text' => wfMsg('specialpage'),
-                               'href' => false
+                               'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
                        );
-               }
 
-               wfProfileOut( $fname );
-               return $content_actions;
-       }
+                       wfRunHooks( 'SkinTemplateBuildContentActionUrlsAfterSpecialPage', array( &$this, &$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" );
+               /* show links to different language variants */
+               global $wgDisableLangConversion;
+               $variants = $wgContLang->getVariants();
+               if( !$wgDisableLangConversion && sizeof( $variants ) > 1 ) {
+                       $preferred = $wgContLang->getPreferredVariant();
+                       $actstr = '';
+                       if( $action )
+                               $actstr = 'action=' . $action . '&';
+                       $vcount=0;
+                       foreach( $variants as $code ) {
+                               $varname = $wgContLang->getVariantname( $code );
+                               if( $varname == 'disable' )
+                                       continue;
+                               $selected = ( $code == $preferred )? 'selected' : false;
+                               $content_actions['varlang-' . $vcount] = array(
+                                               'class' => $selected,
+                                               'text' => $varname,
+                                               'href' => $this->mTitle->getLocalUrl( $actstr . 'variant=' . urlencode( $code ) )
+                                       );
+                               $vcount ++;
                        }
-                       wfProfileOut( "$fname-{$link['text']}" );
                }
+
+               wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
+
                wfProfileOut( $fname );
-               return $result;
+               return $content_actions;
        }
 
+
+
        /**
         * build array of common navigation links
         * @return array
-        * @access private
+        * @private
         */
        function buildNavUrls () {
+               global $wgUseTrackbacks, $wgTitle, $wgArticle;
+
                $fname = 'SkinTemplate::buildNavUrls';
                wfProfileIn( $fname );
-               
-               global $wgTitle, $wgUser, $wgRequest;
-               global $wgSiteSupportPage, $wgDisableUploads;
+
+               global $wgUser, $wgRequest;
+               global $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['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['bugreports'] = array('href' => $this->makeI18nUrl('bugreportspage'));
-               // $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;
+                       if ($wgUploadNavigationUrl)
+                               $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl );
+                       else
+                               $nav_urls['upload'] = false;
                }
                $nav_urls['specialpages'] = array('href' => $this->makeSpecialUrl('Specialpages'));
 
-               if( $wgTitle->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)));
+
+               // 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 ? $wgArticle->getLatest() : 0;
+                       if ( !( $revid == 0 )  )
+                               $nav_urls['print'] = array(
+                                       'text' => wfMsg( 'printableversion' ),
+                                       'href' => $wgRequest->appendQuery( 'printable=yes' )
+                               );
+
+                       // Also add a "permalink" while we're at it
+                       if ( (int)$oldid ) {
+                               $nav_urls['permalink'] = array(
+                                       'text' => wfMsg( 'permalink' ),
+                                       'href' => ''
+                               );
+                       } else {
+                               if ( !( $revid == 0 )  )
+                                       $nav_urls['permalink'] = array(
+                                               'text' => wfMsg( 'permalink' ),
+                                               'href' => $wgTitle->getLocalURL( "oldid=$revid" )
+                                       );
+                       }
+
+                       wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$oldid, &$revid ) );
+               }
+
+               if( $this->mTitle->getNamespace() != NS_SPECIAL ) {
+                       $wlhTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' );
+                       $nav_urls['whatlinkshere'] = array(
+                               'href' => $wlhTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+                       );
+                       if( $this->mTitle->getArticleId() ) {
+                               $rclTitle = Title::makeTitle( NS_SPECIAL, 'Recentchangeslinked' );
+                               $nav_urls['recentchangeslinked'] = array(
+                                       'href' => $rclTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+                               );
+                       }
+                       if ($wgUseTrackbacks)
+                               $nav_urls['trackbacklink'] = array(
+                                       'href' => $wgTitle->trackbackURL()
+                               );
                }
 
-               if( $wgTitle->getNamespace() == NS_USER || $wgTitle->getNamespace() == NS_USER_TALK ) {
-                       $id = User::idFromName($wgTitle->getText());
-                       $ip = User::isIP($wgTitle->getText());
+               if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
+                       $id = User::idFromName($this->mTitle->getText());
+                       $ip = User::isIP($this->mTitle->getText());
                } else {
                        $id = 0;
                        $ip = false;
@@ -697,15 +867,19 @@ class SkinTemplate extends Skin {
 
                if($id || $ip) { # both anons and non-anons have contri list
                        $nav_urls['contributions'] = array(
-                               'href' => $this->makeSpecialUrl('Contributions', "target=" . $wgTitle->getPartialURL() )
+                               'href' => $this->makeSpecialUrl('Contributions/' . $this->mTitle->getText() )
                        );
+                       if ( $wgUser->isAllowed( 'block' ) )
+                               $nav_urls['blockip'] = array(
+                                       'href' => $this->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', "target=" . $wgTitle->getPartialURL() )
+                               'href' => $this->makeSpecialUrl('Emailuser/' . $this->mTitle->getText() )
                        );
                }
                wfProfileOut( $fname );
@@ -718,151 +892,130 @@ class SkinTemplate extends Skin {
         * @private
         */
        function getNameSpaceKey () {
-               global $wgTitle;
-               switch ($wgTitle->getNamespace()) {
-                       case NS_MAIN:
-                       case NS_TALK:
-                               return 'nstab-main';
-                       case NS_USER:
-                       case NS_USER_TALK:
-                               return 'nstab-user';
-                       case NS_MEDIA:
-                               return 'nstab-media';
-                       case NS_SPECIAL:
-                               return 'nstab-special';
-                       case NS_PROJECT:
-                       case NS_PROJECT_TALK:
-                               return 'nstab-wp';
-                       case NS_IMAGE:
-                       case NS_IMAGE_TALK:
-                               return 'nstab-image';
-                       case NS_MEDIAWIKI:
-                       case NS_MEDIAWIKI_TALK:
-                               return 'nstab-mediawiki';
-                       case NS_TEMPLATE:
-                       case NS_TEMPLATE_TALK:
-                               return 'nstab-template';
-                       case NS_HELP:
-                       case NS_HELP_TALK:
-                               return 'nstab-help';
-                       case NS_CATEGORY:
-                       case NS_CATEGORY_TALK:
-                               return 'nstab-category';
-                       default:
-                               return 'nstab-main';
-               }
+               return $this->mTitle->getNamespaceKey();
        }
-       
+
        /**
-        * @access private
+        * @private
         */
        function setupUserCss() {
                $fname = 'SkinTemplate::setupUserCss';
                wfProfileIn( $fname );
-               
-               global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss;
 
-               $sitecss = "";
-               $usercss = "";
-               $siteargs = "";
+               global $wgRequest, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
+
+               $sitecss = '';
+               $usercss = '';
+               $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($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
-                               $siteargs .= "&smaxage=0&maxage=0";
+                       if( $this->mTitle->isCssSubpage() and $this->userCanPreview( $action ) ) {
+                               $siteargs = "&smaxage=0&maxage=0";
                                $usercss = $wgRequest->getText('wpTextbox1');
                        } else {
-                               $siteargs .= "&maxage=0";
                                $usercss = '@import "' .
                                  $this->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 we use the site's dynamic CSS, throw that in, too
-               
                if ( $wgUseSiteCss ) {
-                       $sitecss = '@import "'.$this->makeUrl('-','action=raw&gen=css' . $siteargs).'";'."\n";
+                       $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";
                }
-               
+
                # If we use any dynamic CSS, make a little CDATA block out of it.
-               
+
                if ( !empty($sitecss) || !empty($usercss) ) {
-                       $this->usercss = '/*<![CDATA[*/ ' . $sitecss . ' ' . $usercss . ' /*]]>*/';
+                       $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
                wfProfileOut( $fname );
        }
 
        /**
-        * @access private
+        * @private
         */
        function setupUserJs() {
                $fname = 'SkinTemplate::setupUserJs';
                wfProfileIn( $fname );
-               
-               global $wgRequest, $wgTitle, $wgAllowUserJs;
+
+               global $wgRequest, $wgAllowUserJs, $wgJsMimeType;
                $action = $wgRequest->getText('action');
 
                if( $wgAllowUserJs && $this->loggedin ) {
-                       if($wgTitle->isJsSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
+                       if( $this->mTitle->isJsSubpage() and $this->userCanPreview( $action ) ) {
                                # 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 );
        }
-       
+
+       /**
+        * Code for extensions to hook into to provide per-page CSS, see
+        * extensions/PageCSS/PageCSS.php for an implementation of this.
+        *
+        * @private
+        */
+       function setupPageCss() {
+               $fname = 'SkinTemplate::setupPageCss';
+               wfProfileIn( $fname );
+               $out = false;
+               wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
+               
+               wfProfileOut( $fname );
+               return $out;
+       }
+
        /**
         * returns css with user-specific options
-        * @access public
+        * @public
         */
+
        function getUserStylesheet() {
                $fname = 'SkinTemplate::getUserStylesheet';
                wfProfileIn( $fname );
-               
-               global $wgUser, $wgRequest, $wgTitle, $wgContLang, $wgSquidMaxage, $wgStylePath;
-               $action = $wgRequest->getText('action');
-               $maxage = $wgRequest->getText('maxage');
+
                $s = "/* generated user stylesheet */\n";
-               if($wgContLang->isRTL()) $s .= '@import "'.$wgStylePath.'/'.$this->stylename.'/rtl.css";'."\n";
-               $s .= '@import "'.
-               $this->makeNSUrl(ucfirst($this->skinname).'.css', 'action=raw&ctype=text/css&smaxage='.$wgSquidMaxage, NS_MEDIAWIKI)."\";\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
+        * @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;
        }
@@ -871,39 +1024,41 @@ class SkinTemplate extends Skin {
 /**
  * Generic wrapper for template functions, with interface
  * compatible with what we use of PHPTAL 0.7.
+ * @package MediaWiki
+ * @subpackage Skins
  */
 class QuickTemplate {
        /**
-        * @access public
+        * @public
         */
        function QuickTemplate() {
                $this->data = array();
                $this->translator = new MediaWiki_I18N();
        }
-       
+
        /**
-        * @access public
+        * @public
         */
        function set( $name, $value ) {
                $this->data[$name] = $value;
        }
-       
+
        /**
-        * @access public
+        * @public
         */
        function setRef($name, &$value) {
                $this->data[$name] =& $value;
        }
-       
+
        /**
-        * @access public
+        * @public
         */
        function setTranslator( &$t ) {
                $this->translator = &$t;
        }
-       
+
        /**
-        * @access public
+        * @public
         */
        function execute() {
                echo "Override this function.";
@@ -911,48 +1066,66 @@ class QuickTemplate {
 
 
        /**
-        * @access private
+        * @private
         */
        function text( $str ) {
                echo htmlspecialchars( $this->data[$str] );
        }
-       
+
        /**
-        * @access private
+        * @private
+        */
+       function jstext( $str ) {
+               echo Xml::escapeJsString( $this->data[$str] );
+       }
+
+       /**
+        * @private
         */
        function html( $str ) {
                echo $this->data[$str];
        }
-       
+
        /**
-        * @access private
+        * @private
         */
        function msg( $str ) {
                echo htmlspecialchars( $this->translator->translate( $str ) );
        }
-       
+
        /**
-        * @access private
+        * @private
         */
        function msgHtml( $str ) {
                echo $this->translator->translate( $str );
        }
-       
+
+       /**
+        * An ugly, ugly hack.
+        * @private
+        */
+       function msgWiki( $str ) {
+               global $wgParser, $wgTitle, $wgOut;
+
+               $text = $this->translator->translate( $str );
+               $parserOutput = $wgParser->parse( $text, $wgTitle,
+                       $wgOut->parserOptions(), true );
+               echo $parserOutput->getText();
+       }
+
        /**
-        * @access private
+        * @private
         */
        function haveData( $str ) {
                return $this->data[$str];
        }
-       
+
        /**
-        * @access private
+        * @private
         */
        function haveMsg( $str ) {
                $msg = $this->translator->translate( $str );
                return ($msg != '-') && ($msg != ''); # ????
        }
 }
-
-} // end of if( defined( 'MEDIAWIKI' ) ) 
 ?>