]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/SkinTemplate.php
MediaWiki 1.15.0
[autoinstallsdev/mediawiki.git] / includes / SkinTemplate.php
index 8b649605d51f7a8391deb28d84c7905e277983ee..4317a93e276b7a715a6ee599a046d6214addd20d 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
 #
 # 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
 
-/**
- * Template-filler skin base class
- * Formerly generic PHPTal (http://phptal.sourceforge.net/) skin
- * Based on Brion's smarty skin
- * Copyright (C) Gabriel Wicke -- http://www.aulinx.de/
- *
- * 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
- * @package MediaWiki
+ * @private
+ * @ingroup Skins
  */
 class MediaWiki_I18N {
        var $_context = array();
@@ -55,14 +32,14 @@ class MediaWiki_I18N {
        }
 
        function translate($value) {
-               $fname = 'SkinTemplate-translate';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                // 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
+               $m = array();
                while (preg_match('/\$([0-9]*?)/sm', $value, $m)) {
                        list($src, $var) = $m;
                        wfSuppressWarnings();
@@ -70,18 +47,26 @@ class MediaWiki_I18N {
                        wfRestoreWarnings();
                        $value = str_replace($src, $varValue, $value);
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $value;
        }
 }
 
 /**
+ * Template-filler skin base class
+ * Formerly generic PHPTal (http://phptal.sourceforge.net/) skin
+ * Based on Brion's smarty skin
+ * @copyright Copyright © Gabriel Wicke -- http://www.aulinx.de/
+ *
+ * @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.
  *
- * @package MediaWiki
+ * @ingroup Skins
  */
 class SkinTemplate extends Skin {
        /**#@+
-        * @access private
+        * @private
         */
 
        /**
@@ -99,9 +84,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;
 
@@ -112,25 +94,35 @@ class SkinTemplate extends Skin {
         * Child classes should override this to set the name,
         * style subdirectory, and template filler callback.
         *
-        * @param OutputPage $out
+        * @param $out OutputPage
         */
-       function initPage( &$out ) {
+       function initPage( OutputPage $out ) {
                parent::initPage( $out );
                $this->skinname  = 'monobook';
                $this->stylename = 'monobook';
                $this->template  = 'QuickTemplate';
        }
 
+       /**
+        * Add specific styles for this skin
+        *
+        * @param $out OutputPage
+        */
+       function setupSkinUserCss( OutputPage $out ){
+               $out->addStyle( 'common/shared.css', 'screen' );
+               $out->addStyle( 'common/commonPrint.css', 'print' );    
+       }
+
        /**
         * Create the template engine object; we feed it a bunch of data
         * and eventually it spits out some HTML. Should have interface
         * roughly equivalent to PHPTAL 0.7.
         *
-        * @param string $callback (or file)
-        * @param string $repository subdirectory where we keep template files
-        * @param string $cache_dir
+        * @param $callback string (or file)
+        * @param $repository string: subdirectory where we keep template files
+        * @param $cache_dir string
         * @return object
-        * @access private
+        * @private
         */
        function setupTemplate( $classname, $repository=false, $cache_dir=false ) {
                return new $classname();
@@ -139,57 +131,77 @@ class SkinTemplate extends Skin {
        /**
         * initialize various variables and generate the template
         *
-        * @param OutputPage $out
-        * @access public
+        * @param $out OutputPage
         */
-       function outputPage( &$out ) {
-               global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
-               global $wgScript, $wgStylePath, $wgLanguageCode, $wgContLanguageCode, $wgUseNewInterlanguage;
-               global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
-               global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgHideInterlanguageLinks;
+       function outputPage( OutputPage $out ) {
+               global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang;
+               global $wgScript, $wgStylePath, $wgContLanguageCode;
+               global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
+               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
+               global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
-               global $wgUseTrackbacks;
-               global $wgDBname;
+               global $wgUseTrackbacks, $wgUseSiteJs;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgLang, $wgCanonicalNamespaceNames;
 
-               $fname = 'SkinTemplate::outputPage';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
-               extract( $wgRequest->getValues( 'oldid', 'diff' ) );
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
+               $action = $wgRequest->getVal( 'action', 'view' );
 
-               wfProfileIn( "$fname-init" );
+               wfProfileIn( __METHOD__."-init" );
                $this->initPage( $out );
 
-               $this->mTitle =& $wgTitle;
-               $this->mUser =& $wgUser;
-
+               $this->setMembers();
                $tpl = $this->setupTemplate( $this->template, 'skins' );
 
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
                #}
-               wfProfileOut( "$fname-init" );
+               wfProfileOut( __METHOD__."-init" );
 
-               wfProfileIn( "$fname-stuff" );
+               wfProfileIn( __METHOD__."-stuff" );
                $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();
-               $userPage = $wgUser->getUserPage();
-               $this->userpage = $userPage->getPrefixedText();
-               $this->userpageUrlDetails = $this->makeUrlDetails($this->userpage);
 
-               $this->usercss =  $this->userjs = $this->userjsprev = false;
-               $this->setupUserCss();
-               $this->setupUserJs();
+               if ( $wgUser->isLoggedIn() || $this->showIPinHeader() ) {
+                       $this->userpageUrlDetails = self::makeUrlDetails( $this->userpage );
+               } else {
+                       # This won't be used in the standard skins, but we define it to preserve the interface
+                       # To save time, we check for existence
+                       $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
+               }
+
+               $this->userjs = $this->userjsprev = false;
+               $this->setupUserCss( $out );
+               $this->setupUserJs( $out->isUserJsAllowed() );
                $this->titletxt = $this->mTitle->getPrefixedText();
-               wfProfileOut( "$fname-stuff" );
+               wfProfileOut( __METHOD__."-stuff" );
 
-               wfProfileIn( "$fname-stuff2" );
-               $tpl->set( 'title', $wgOut->getPageTitle() );
-               $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
+               wfProfileIn( __METHOD__."-stuff2" );
+               $tpl->set( 'title', $out->getPageTitle() );
+               $tpl->set( 'pagetitle', $out->getHTMLTitle() );
+               $tpl->set( 'displaytitle', $out->mPageLinkTitle );
+               $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) );
+               $tpl->set( 'skinnameclass', ( "skin-" . Sanitizer::escapeClass( $this->getSkinName ( ) ) ) );
+
+               $nsname = isset( $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] ) ?
+                         $wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ] :
+                         $this->mTitle->getNsText();
+
+               $tpl->set( 'nscanonical', $nsname );
+               $tpl->set( 'nsnumber', $this->mTitle->getNamespace() );
+               $tpl->set( 'titleprefixeddbkey', $this->mTitle->getPrefixedDBKey() );
+               $tpl->set( 'titletext', $this->mTitle->getText() );
+               $tpl->set( 'articleid', $this->mTitle->getArticleId() );
+               $tpl->set( 'currevisionid', isset( $wgArticle ) ? $wgArticle->getLatest() : 0 );
+
+               $tpl->set( 'isarticle', $out->isArticle() );
 
                $tpl->setRef( "thispage", $this->thispage );
                $subpagestr = $this->subPageSubtitle();
@@ -206,33 +218,38 @@ class SkinTemplate extends Skin {
                );
 
                $tpl->set( 'catlinks', $this->getCategories());
-               if( $wgOut->isSyndicated() ) {
+               if( $out->isSyndicated() ) {
                        $feeds = array();
-                       foreach( $wgFeedClasses as $format => $class ) {
+                       foreach( $out->getSyndicationLinks() as $format => $link ) {
                                $feeds[$format] = array(
-                                       'text' => $format,
-                                       'href' => $wgRequest->appendQuery( "feed=$format" ),
-                                       'ttip' => wfMsg('tooltip-'.$format)
-                               );
+                                       'text' => wfMsg( "feed-$format" ),
+                                       'href' => $link );
                        }
                        $tpl->setRef( 'feeds', $feeds );
                } else {
                        $tpl->set( 'feeds', false );
                }
-               if ($wgUseTrackbacks && $out->isArticleRelated())
-                       $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF());
+               if ($wgUseTrackbacks && $out->isArticleRelated()) {
+                       $tpl->set( 'trackbackhtml', $wgTitle->trackbackRDF() );
+               } else {
+                       $tpl->set( 'trackbackhtml', null );
+               }
 
+               $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
+               $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
                $tpl->setRef( 'mimetype', $wgMimeType );
                $tpl->setRef( 'jsmimetype', $wgJsMimeType );
                $tpl->setRef( 'charset', $wgOutputEncoding );
                $tpl->set( 'headlinks', $out->getHeadLinks() );
-               $tpl->set('headscripts', $out->getScript() );
+               $tpl->set( 'headscripts', $out->getScript() );
+               $tpl->set( 'csslinks', $out->buildCssLinks() );
                $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->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
                $tpl->setRef( 'loggedin', $this->loggedin );
-               $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", ($this->mTitle->getNamespace() != NS_SPECIAL ) );
@@ -242,68 +259,82 @@ class SkinTemplate extends Skin {
                $tpl->set( "helppage", wfMsg('helppage'));
                */
                $tpl->set( 'searchaction', $this->escapeSearchLink() );
+               $tpl->set( 'searchtitle', SpecialPage::getTitleFor('search')->getPrefixedDBKey() );
                $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);
-               global $wgUseSiteJs;
-               if ($wgUseSiteJs) {
-                       if($this->loggedin) {
-                               $tpl->set( 'jsvarurl', $this->makeUrl('-','action=raw&smaxage=0&gen=js') );
-                       } else {
-                               $tpl->set( 'jsvarurl', $this->makeUrl('-','action=raw&gen=js') );
-                       }
+               if( $wgUseSiteJs ) {
+                       $jsCache = $this->loggedin ? '&smaxage=0' : '';
+                       $tpl->set( 'jsvarurl',
+                               self::makeUrl('-',
+                                       "action=raw$jsCache&gen=js&useskin=" .
+                                               urlencode( $this->getSkinName() ) ) );
                } else {
                        $tpl->set('jsvarurl', false);
                }
                $newtalks = $wgUser->getNewMessageLinks();
 
-               if (count($newtalks) == 1 && $newtalks[0]["wiki"] === $wgDBname) {
+               if (count($newtalks) == 1 && $newtalks[0]["wiki"] === wfWikiID() ) {
                        $usertitle = $this->mUser->getUserPage();
                        $usertalktitle = $usertitle->getTalkPage();
                        if( !$usertalktitle->equals( $this->mTitle ) ) {
-                               $ntl = wfMsg( 'newmessages',
+                               $ntl = wfMsg( 'youhavenewmessages',
                                        $this->makeKnownLinkObj(
                                                $usertalktitle,
-                                               wfMsg('newmessageslink')
+                                               wfMsgHtml( 'newmessageslink' ),
+                                               'redirect=no'
+                                       ),
+                                       $this->makeKnownLinkObj(
+                                               $usertalktitle,
+                                               wfMsgHtml( 'newmessagesdifflink' ),
+                                               'diff=cur'
                                        )
                                );
                                # Disable Cache
-                               $wgOut->setSquidMaxage(0);
+                               $out->setSquidMaxage(0);
                        }
                } else if (count($newtalks)) {
-                       $sep = str_replace("_", " ", wfMsgHtml("newtalkseperator"));
+                       $sep = str_replace("_", " ", wfMsgHtml("newtalkseparator"));
                        $msgs = array();
                        foreach ($newtalks as $newtalk) {
-                               $msgs[] = wfElement("a", 
+                               $msgs[] = Xml::element("a",
                                        array('href' => $newtalk["link"]), $newtalk["wiki"]);
                        }
                        $parts = implode($sep, $msgs);
                        $ntl = wfMsgHtml('youhavenewmessagesmulti', $parts);
-                       $wgOut->setSquidMaxage(0);
+                       $out->setSquidMaxage(0);
                } else {
                        $ntl = '';
                }
-               wfProfileOut( "$fname-stuff2" );
+               wfProfileOut( __METHOD__."-stuff2" );
 
-               wfProfileIn( "$fname-stuff3" );
+               wfProfileIn( __METHOD__."-stuff3" );
                $tpl->setRef( 'newtalk', $ntl );
-               $tpl->setRef( 'skin', $this);
+               $tpl->setRef( 'skin', $this );
                $tpl->set( 'logo', $this->logoText() );
-               if ( $wgOut->isArticle() and (!isset( $oldid ) or isset( $diff )) and 0 != $wgArticle->getID() ) {
+               if ( $out->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);
                                }
@@ -312,16 +343,19 @@ class SkinTemplate extends Skin {
                        }
 
                        if ($wgPageShowWatchingUsers) {
-                               $dbr =& wfGetDB( DB_SLAVE );
-                               extract( $dbr->tableNames( 'watchlist' ) );
+                               $dbr = wfGetDB( DB_SLAVE );
+                               $watchlist = $dbr->tableName( 'watchlist' );
                                $sql = "SELECT COUNT(*) AS n FROM $watchlist
-                                       WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBKey()) .
+                                       WHERE wl_title='" . $dbr->strencode($this->mTitle->getDBkey()) .
                                        "' AND  wl_namespace=" . $this->mTitle->getNamespace() ;
-                               $res = $dbr->query( $sql, 'SkinPHPTal::outputPage');
+                               $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));
+                                       $tpl->set('numberofwatchingusers',
+                                               wfMsgExt('number_of_watching_users_pageview', array('parseinline'),
+                                               $wgLang->formatNum($numberofwatchingusers))
+                                       );
                                } else {
                                        $tpl->set('numberofwatchingusers', false);
                                }
@@ -333,11 +367,10 @@ class SkinTemplate extends Skin {
 
                        $this->credits = false;
 
-                       if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
-                               require_once("Credits.php");
-                               $this->credits = getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
+                       if( $wgMaxCredits != 0 ){
+                               $this->credits = Credits::getCredits( $wgArticle, $wgMaxCredits, $wgShowCreditsIfMax );
                        } else {
-                               $tpl->set('lastmod', $this->lastModified());
+                               $tpl->set( 'lastmod', $this->lastModified() );
                        }
 
                        $tpl->setRef( 'credits', $this->credits );
@@ -355,36 +388,40 @@ class SkinTemplate extends Skin {
                        $tpl->set('credits', false);
                        $tpl->set('numberofwatchingusers', false);
                }
-               wfProfileOut( "$fname-stuff3" );
+               wfProfileOut( __METHOD__."-stuff3" );
 
-               wfProfileIn( "$fname-stuff4" );
+               wfProfileIn( __METHOD__."-stuff4" );
                $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( 'reporttime', wfReportTime() );
                $tpl->set( 'sitenotice', wfGetSiteNotice() );
+               $tpl->set( 'bottomscripts', $this->bottomScripts() );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
-               $out->mBodytext .= $printfooter ;
+               $out->mBodytext .= $printfooter . $this->generateDebugHTML();
                $tpl->setRef( 'bodytext', $out->mBodytext );
 
                # Language links
                $language_urls = array();
 
                if ( !$wgHideInterlanguageLinks ) {
-                       foreach( $wgOut->getLanguageLinks() as $l ) {
+                       foreach( $out->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 ( $nt ) {
+                                       $language_urls[] = array(
+                                               'href' => $nt->getFullURL(),
+                                               'text' => ($wgContLang->getLanguageName( $nt->getInterwiki()) != ''?$wgContLang->getLanguageName( $nt->getInterwiki()) : $l),
+                                               'class' => $class
+                                       );
+                               }
                        }
                }
                if(count($language_urls)) {
@@ -392,8 +429,9 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('language_urls', false);
                }
-               wfProfileOut( "$fname-stuff4" );
+               wfProfileOut( __METHOD__."-stuff4" );
 
+               wfProfileIn( __METHOD__."-stuff5" );
                # Personal toolbar
                $tpl->set('personal_urls', $this->buildPersonalUrls());
                $content_actions = $this->buildContentActionUrls();
@@ -402,26 +440,33 @@ class SkinTemplate extends Skin {
                // XXX: attach this from javascript, same with section editing
                if($this->iseditable && $wgUser->getOption("editondblclick") )
                {
-                       $tpl->set('body_ondblclick', 'document.location = "' .$content_actions['edit']['href'] .'";');
+                       $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
+                       $tpl->set('body_ondblclick', 'document.location = "' . $encEditUrl . '";');
                } else {
                        $tpl->set('body_ondblclick', false);
                }
-               if( $this->iseditable && $wgUser->getOption( 'editsectiononrightclick' ) ) {
-                       $tpl->set( 'body_onload', 'setupRightClickEdit()' );
-               } else {
-                       $tpl->set( 'body_onload', false );
-               }
+               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
+               // original version by hansm
+               if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
+                       wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
+               }
+
+               // allow extensions adding stuff after the page content.
+               // See Skin::afterContentHook() for further documentation.
+               $tpl->set ('dataAfterContent', $this->afterContentHook());
+               wfProfileOut( __METHOD__."-stuff5" );
+
                // execute template
-               wfProfileIn( "$fname-execute" );
+               wfProfileIn( __METHOD__."-execute" );
                $res = $tpl->execute();
-               wfProfileOut( "$fname-execute" );
+               wfProfileOut( __METHOD__."-execute" );
 
                // result may be an error
                $this->printOrError( $res );
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -430,189 +475,267 @@ class SkinTemplate extends Skin {
         * For the base class, assume strings all around.
         *
         * @param mixed $str
-        * @access private
+        * @private
         */
-       function printOrError( &$str ) {
+       function printOrError( $str ) {
                echo $str;
        }
 
        /**
         * build array of urls for personal toolbar
         * @return array
-        * @access private
+        * @private
         */
        function buildPersonalUrls() {
-               $fname = 'SkinTemplate::buildPersonalUrls';
-               wfProfileIn( $fname );
+               global $wgTitle, $wgRequest;
+
+               $pageurl = $wgTitle->getLocalURL();
+               wfProfileIn( __METHOD__ );
 
                /* 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 = self::makeSpecialUrl( 'Preferences' );
                        $personal_urls['preferences'] = array(
-                               'text' => wfMsg('preferences'),
-                               'href' => $this->makeSpecialUrl('Preferences')
+                               'text' => wfMsg( 'mypreferences' ),
+                               'href' => $href,
+                               'active' => ( $href == $pageurl )
                        );
+                       $href = self::makeSpecialUrl( 'Watchlist' );
                        $personal_urls['watchlist'] = array(
-                               'text' => wfMsg('watchlist'),
-                               'href' => $this->makeSpecialUrl('Watchlist')
+                               'text' => wfMsg( 'mywatchlist' ),
+                               'href' => $href,
+                               'active' => ( $href == $pageurl )
                        );
+
+                       # We need to do an explicit check for Special:Contributions, as we
+                       # have to match both the title, and the target (which could come
+                       # from request values or be specified in "sub page" form. The plot
+                       # thickens, because $wgTitle is altered for special pages, so doesn't
+                       # contain the original alias-with-subpage.
+                       $title = Title::newFromText( $wgRequest->getText( 'title' ) );
+                       if( $title instanceof Title && $title->getNamespace() == NS_SPECIAL ) {
+                               list( $spName, $spPar ) =
+                                       SpecialPage::resolveAliasWithSubpage( $title->getText() );
+                               $active = $spName == 'Contributions'
+                                       && ( ( $spPar && $spPar == $this->username )
+                                               || $wgRequest->getText( 'target' ) == $this->username );
+                       } else {
+                               $active = false;
+                       }
+
+                       $href = self::makeSpecialUrlSubpage( 'Contributions', $this->username );
                        $personal_urls['mycontris'] = array(
-                               'text' => wfMsg('mycontris'),
-                               'href' => $this->makeSpecialUrl("Contributions/$this->username")
+                               'text' => wfMsg( 'mycontris' ),
+                               'href' => $href,
+                               'active' => $active
                        );
                        $personal_urls['logout'] = array(
-                               'text' => wfMsg('userlogout'),
-                               'href' => $this->makeSpecialUrl('Userlogout','returnto=' . $this->thisurl )
+                               'text' => wfMsg( 'userlogout' ),
+                               'href' => self::makeSpecialUrl( 'Userlogout',
+                                       $wgTitle->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
+                               ),
+                               'active' => false
                        );
                } else {
-                       if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] ) ) {
+                       global $wgUser;
+                       $loginlink = $wgUser->isAllowed( 'createaccount' )
+                               ? 'nav-login-createaccount'
+                               : 'login';
+                       if( $this->showIPinHeader() ) {
+                               $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 )
+                                       'text' => wfMsg( $loginlink ),
+                                       'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
+                                       'active' => $wgTitle->isSpecial( 'Userlogin' )
                                );
                        } else {
 
                                $personal_urls['login'] = array(
-                                       'text' => wfMsg('userlogin'),
-                                       'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
+                                       'text' => wfMsg( $loginlink ),
+                                       'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
+                                       'active' => $wgTitle->isSpecial( 'Userlogin' )
                                );
                        }
                }
-               wfProfileOut( $fname );
+
+               wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$wgTitle ) );
+               wfProfileOut( __METHOD__ );
                return $personal_urls;
        }
 
-
        function tabAction( $title, $message, $selected, $query='', $checkEdit=false ) {
                $classes = array();
                if( $selected ) {
                        $classes[] = 'selected';
                }
-               if( $checkEdit && $title->getArticleId() == 0 ) {
+               if( $checkEdit && !$title->isKnown() ) {
                        $classes[] = 'new';
-                       $query = 'action=edit';
+                       $query = 'action=edit&redlink=1';
                }
+
+               $text = wfMsg( $message );
+               if ( wfEmptyMsg( $message, $text ) ) {
+                       global $wgContLang;
+                       $text = $wgContLang->getFormattedNsText( MWNamespace::getSubject( $title->getNamespace() ) );
+               }
+
+               $result = array();
+               if( !wfRunHooks('SkinTemplateTabAction', array(&$this,
+                               $title, $message, $selected, $checkEdit,
+                               &$classes, &$query, &$text, &$result)) ) {
+                       return $result;
+               }
+
                return array(
                        'class' => implode( ' ', $classes ),
-                       'text' => wfMsg( $message ),
+                       'text' => $text,
                        'href' => $title->getLocalUrl( $query ) );
        }
 
-       function makeTalkUrlDetails( $name, $urlaction='' ) {
+       function makeTalkUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
+               if( !is_object($title) ) {
+                       throw new MWException( __METHOD__." given invalid pagename $name" );
+               }
                $title = $title->getTalkPage();
-               $this->checkTitle($title, $name);
+               self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0?true:false
+                       'exists' => $title->getArticleID() != 0 ? true : false
                );
        }
 
-       function makeArticleUrlDetails( $name, $urlaction='' ) {
+       function makeArticleUrlDetails( $name, $urlaction = '' ) {
                $title = Title::newFromText( $name );
                $title= $title->getSubjectPage();
-               $this->checkTitle($title, $name);
+               self::checkTitle( $title, $name );
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0?true:false
+                       'exists' => $title->getArticleID() != 0 ? true : false
                );
        }
 
        /**
         * an array of edit links by default used for the tabs
         * @return array
-        * @access private
+        * @private
         */
-       function buildContentActionUrls () {
-               global $wgContLang, $wgUseValidation, $wgDBprefix, $wgValidationForAnons;
-               $fname = 'SkinTemplate::buildContentActionUrls';
-               wfProfileIn( $fname );
-
-               global $wgUser, $wgRequest;
-               $action = $wgRequest->getText( 'action' );
-               $section = $wgRequest->getText( 'section' );
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
+       function buildContentActionUrls() {
+               global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest;
+
+               wfProfileIn( __METHOD__ );
+
+               $action = $wgRequest->getVal( 'action', 'view' );
+               $section = $wgRequest->getVal( 'section' );
                $content_actions = array();
 
+               $prevent_active_tabs = false ;
+               wfRunHooks( 'SkinTemplatePreventOtherActiveTabs', array( &$this , &$prevent_active_tabs ) )     ;
+
                if( $this->iscontent ) {
+                       $subjpage = $this->mTitle->getSubjectPage();
+                       $talkpage = $this->mTitle->getTalkPage();
 
-                       $nskey = $this->getNameSpaceKey();
+                       $nskey = $this->mTitle->getNamespaceKey();
                        $content_actions[$nskey] = $this->tabAction(
-                               $this->mTitle->getSubjectPage(),
+                               $subjpage,
                                $nskey,
-                               !$this->mTitle->isTalkPage(),
+                               !$this->mTitle->isTalkPage() && !$prevent_active_tabs,
                                '', true);
 
                        $content_actions['talk'] = $this->tabAction(
-                               $this->mTitle->getTalkPage(),
+                               $talkpage,
                                'talk',
-                               $this->mTitle->isTalkPage(),
+                               $this->mTitle->isTalkPage() && !$prevent_active_tabs,
                                '',
                                true);
 
-                       wfProfileIn( "$fname-edit" );
-                       if ( $this->mTitle->userCanEdit() ) {
-                               $oid = ( $oldid && ! isset( $diff ) ) ? '&oldid='.IntVal( $oldid ) : false;
+                       wfProfileIn( __METHOD__."-edit" );
+                       if ( $this->mTitle->quickUserCan( 'edit' ) && ( $this->mTitle->exists() || $this->mTitle->quickUserCan( 'create' ) ) ) {
                                $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' => $this->mTitle->getLocalUrl( 'action=edit'.$oid )
+                                       'text' => $this->mTitle->exists()
+                                               ? wfMsg( 'edit' )
+                                               : wfMsg( 'create' ),
+                                       'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
 
-                               if ( $istalk ) {
-                                       $content_actions['addsection'] = array(
-                                               'class' => $section == 'new'?'selected':false,
-                                               'text' => wfMsg('addsection'),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
-                                       );
+                               if ( $istalk || $wgOut->showNewSectionLink() ) {
+                                       if ( !$wgOut->forceHideNewSectionLink() ) {
+                                               $content_actions['addsection'] = array(
+                                                       'class' => $section == 'new' ? 'selected' : false,
+                                                       'text' => wfMsg('addsection'),
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=edit&section=new' )
+                                               );
+                                       }
                                }
-                       } else {
-                               $oid = ( $oldid && ! isset( $diff ) ) ? '&oldid='.IntVal( $oldid ) : '';
+                       } elseif ( $this->mTitle->isKnown() ) {
                                $content_actions['viewsource'] = array(
                                        'class' => ($action == 'edit') ? 'selected' : false,
                                        'text' => wfMsg('viewsource'),
-                                       'href' => $this->mTitle->getLocalUrl( 'action=edit'.$oid )
+                                       'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
                        }
-                       wfProfileOut( "$fname-edit" );
+                       wfProfileOut( __METHOD__."-edit" );
 
-                       wfProfileIn( "$fname-live" );
-                       if ( $this->mTitle->getArticleId() ) {
+                       wfProfileIn( __METHOD__."-live" );
+                       if ( $this->mTitle->exists() ) {
 
                                $content_actions['history'] = array(
                                        'class' => ($action == 'history') ? 'selected' : false,
                                        'text' => wfMsg('history_short'),
-                                       'href' => $this->mTitle->getLocalUrl( 'action=history')
+                                       'href' => $this->mTitle->getLocalUrl( 'action=history' ),
+                                       'rel' => 'archives',
                                );
 
-                               if($wgUser->isAllowed('protect')){
-                                       if(!$this->mTitle->isProtected()){
+                               if( $wgUser->isAllowed('delete') ) {
+                                       $content_actions['delete'] = array(
+                                               'class' => ($action == 'delete') ? 'selected' : false,
+                                               'text' => wfMsg('delete'),
+                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
+                                       );
+                               }
+                               if ( $this->mTitle->quickUserCan( 'move' ) ) {
+                                       $moveTitle = SpecialPage::getTitleFor( 'Movepage', $this->thispage );
+                                       $content_actions['move'] = array(
+                                               'class' => $this->mTitle->isSpecial( 'Movepage' ) ? 'selected' : false,
+                                               'text' => wfMsg('move'),
+                                               'href' => $moveTitle->getLocalUrl()
+                                       );
+                               }
+
+                               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'),
@@ -627,33 +750,39 @@ class SkinTemplate extends Skin {
                                                );
                                        }
                                }
-                               if($wgUser->isAllowed('delete')){
-                                       $content_actions['delete'] = array(
-                                               'class' => ($action == 'delete') ? 'selected' : false,
-                                               'text' => wfMsg('delete'),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
-                                       );
-                               }
-                               if ( $this->mTitle->userCanMove()) {
-                                       $content_actions['move'] = array(
-                                               'class' => ($this->mTitle->getDbKey() == 'Movepage' and $this->mTitle->getNamespace == NS_SPECIAL) ? 'selected' : false,
-                                               'text' => wfMsg('move'),
-                                               'href' => $this->makeSpecialUrl("Movepage/$this->thispage" )
-                                       );
-                               }
                        } else {
                                //article doesn't exist or is deleted
-                               if($wgUser->isAllowed('delete')){
+                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) {
                                        if( $n = $this->mTitle->isDeleted() ) {
+                                               $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
                                                $content_actions['undelete'] = array(
                                                        'class' => false,
-                                                       'text' => ($n == 1) ? wfMsg( 'undelete_short1' ) : wfMsg('undelete_short', $n ),
-                                                       'href' => $this->makeSpecialUrl("Undelete/$this->thispage")
+                                                       'text' => wfMsgExt( 'undelete_short', array( 'parsemag' ), $wgLang->formatNum($n) ),
+                                                       'href' => $undelTitle->getLocalUrl( 'target=' . urlencode( $this->thispage ) )
+                                                       #'href' => self::makeSpecialUrl( "Undelete/$this->thispage" )
+                                               );
+                                       }
+                               }
+
+                               if ( $this->mTitle->getNamespace() !== NS_MEDIAWIKI && $wgUser->isAllowed( 'protect' ) ) {
+                                       if( !$this->mTitle->getRestrictions( 'create' ) ) {
+                                               $content_actions['protect'] = array(
+                                                       'class' => ($action == 'protect') ? 'selected' : false,
+                                                       'text' => wfMsg('protect'),
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=protect' )
+                                               );
+
+                                       } else {
+                                               $content_actions['unprotect'] = array(
+                                                       'class' => ($action == 'unprotect') ? 'selected' : false,
+                                                       'text' => wfMsg('unprotect'),
+                                                       'href' => $this->mTitle->getLocalUrl( 'action=unprotect' )
                                                );
                                        }
                                }
                        }
-                       wfProfileOut( "$fname-live" );
+
+                       wfProfileOut( __METHOD__."-live" );
 
                        if( $this->loggedin ) {
                                if( !$this->mTitle->userIsWatching()) {
@@ -671,38 +800,18 @@ 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}" )
-                                                       );
-                                       }
-                               }
-                       }
+
+                       wfRunHooks( 'SkinTemplateTabs', array( &$this , &$content_actions ) )   ;
                } else {
                        /* show special page tab */
 
-                       $content_actions['article'] = array(
+                       $content_actions[$this->mTitle->getNamespaceKey()] = array(
                                'class' => 'selected',
-                               'text' => wfMsg('specialpage'),
+                               'text' => wfMsg('nstab-special'),
                                'href' => $wgRequest->getRequestURL(), // @bug 2457, 2510
                        );
+
+                       wfRunHooks( 'SkinTemplateBuildContentActionUrlsAfterSpecialPage', array( &$this, &$content_actions ) );
                }
 
                /* show links to different language variants */
@@ -710,9 +819,6 @@ class SkinTemplate extends Skin {
                $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 );
@@ -722,15 +828,15 @@ class SkinTemplate extends Skin {
                                $content_actions['varlang-' . $vcount] = array(
                                                'class' => $selected,
                                                'text' => $varname,
-                                               'href' => $this->mTitle->getLocalUrl( $actstr . 'variant=' . $code )
+                                               'href' => $this->mTitle->getLocalURL('',$code)
                                        );
                                $vcount ++;
                        }
                }
 
-               wfRunHooks( 'SkinTemplateContentActions', array(&$content_actions) );
-               
-               wfProfileOut( $fname );
+               wfRunHooks( 'SkinTemplateContentActions', array( &$content_actions ) );
+
+               wfProfileOut( __METHOD__ );
                return $content_actions;
        }
 
@@ -739,58 +845,69 @@ class SkinTemplate extends Skin {
        /**
         * build array of common navigation links
         * @return array
-        * @access private
+        * @private
         */
-       function buildNavUrls () {
-               global $wgUseTrackbacks, $wgTitle;
-
-               $fname = 'SkinTemplate::buildNavUrls';
-               wfProfileIn( $fname );
+       function buildNavUrls() {
+               global $wgUseTrackbacks, $wgTitle, $wgUser, $wgRequest;
+               global $wgEnableUploads, $wgUploadNavigationUrl;
 
-               global $wgUser, $wgRequest;
-               global $wgSiteSupportPage, $wgEnableUploads, $wgUploadNavigationUrl;
+               wfProfileIn( __METHOD__ );
 
-               $action = $wgRequest->getText( 'action' );
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
+               $action = $wgRequest->getVal( 'action', 'view' );
 
                $nav_urls = array();
-               $nav_urls['mainpage'] = array('href' => $this->makeI18nUrl('mainpage'));
-               $nav_urls['randompage'] = array('href' => $this->makeSpecialUrl('Random'));
-               $nav_urls['recentchanges'] = array('href' => $this->makeSpecialUrl('Recentchanges'));
-               $nav_urls['currentevents'] = (wfMsgForContent('currentevents') != '-') ? array('href' => $this->makeI18nUrl('currentevents')) : false;
-               $nav_urls['portal'] =  (wfMsgForContent('portal') != '-') ? array('href' => $this->makeI18nUrl('portal-url')) : false;
-               $nav_urls['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( $wgEnableUploads ) {
+               $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
+               if( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
                        if ($wgUploadNavigationUrl) {
-                               $nav_urls['upload'] = array('href' => $wgUploadNavigationUrl );
+                               $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
                        } else {
-                               $nav_urls['upload'] = array('href' => $this->makeSpecialUrl('Upload'));
+                               $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
                        }
                } else {
-                       $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'));
+               $nav_urls['specialpages'] = array( 'href' => self::makeSpecialUrl( 'Specialpages' ) );
 
+               // default permalink to being off, will override it as required below.
+               $nav_urls['permalink'] = false;
 
                // 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' ) ) {
+               if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
                        $nav_urls['print'] = array(
                                'text' => wfMsg( 'printableversion' ),
-                               'href' => $wgRequest->appendQuery( 'printable=yes' ) );
+                               'href' => $wgRequest->appendQuery( 'printable=yes' )
+                       );
+
+                       // Also add a "permalink" while we're at it
+                       if ( $this->mRevisionId ) {
+                               $nav_urls['permalink'] = array(
+                                       'text' => wfMsg( 'permalink' ),
+                                       'href' => $wgTitle->getLocalURL( "oldid=$this->mRevisionId" )
+                               );
+                       }
+
+                       // Copy in case this undocumented, shady hook tries to mess with internals
+                       $revid = $this->mRevisionId;
+                       wfRunHooks( 'SkinTemplateBuildNavUrlsNav_urlsAfterPermalink', array( &$this, &$nav_urls, &$revid, &$revid ) );
                }
 
-               if( $this->mTitle->getNamespace() != NS_SPECIAL) {
+               if( $this->mTitle->getNamespace() != NS_SPECIAL ) {
+                       $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere', $this->thispage );
                        $nav_urls['whatlinkshere'] = array(
-                               'href' => $this->makeSpecialUrl("Whatlinkshere/$this->thispage")
-                       );
-                       $nav_urls['recentchangeslinked'] = array(
-                               'href' => $this->makeSpecialUrl("Recentchangeslinked/$this->thispage")
+                               'href' => $wlhTitle->getLocalUrl()
                        );
+                       if( $this->mTitle->getArticleId() ) {
+                               $rclTitle = SpecialPage::getTitleFor( 'Recentchangeslinked', $this->thispage );
+                               $nav_urls['recentchangeslinked'] = array(
+                                       'href' => $rclTitle->getLocalUrl()
+                               );
+                       } else {
+                               $nav_urls['recentchangeslinked'] = false;
+                       }
                        if ($wgUseTrackbacks)
                                $nav_urls['trackbacklink'] = array(
                                        'href' => $wgTitle->trackbackURL()
@@ -805,20 +922,38 @@ class SkinTemplate extends Skin {
                        $ip = false;
                }
 
-               if($id || $ip) { # both anons and non-anons have contri list
+               if($id || $ip) { # both anons and non-anons have contribs list
                        $nav_urls['contributions'] = array(
-                               'href' => $this->makeSpecialUrl('Contributions/' . $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
                        );
+
+                       if( $id ) {
+                               $logPage = SpecialPage::getTitleFor( 'Log' );
+                               $nav_urls['log'] = array( 'href' => $logPage->getLocalUrl( 'user='
+                                       . $this->mTitle->getPartialUrl() ) );
+                       } else {
+                               $nav_urls['log'] = false;
+                       }
+
+                       if ( $wgUser->isAllowed( 'block' ) ) {
+                               $nav_urls['blockip'] = array(
+                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
+                               );
+                       } else {
+                               $nav_urls['blockip'] = false;
+                       }
                } else {
                        $nav_urls['contributions'] = false;
+                       $nav_urls['log'] = false;
+                       $nav_urls['blockip'] = false;
                }
                $nav_urls['emailuser'] = false;
                if( $this->showEmailUser( $id ) ) {
                        $nav_urls['emailuser'] = array(
-                               'href' => $this->makeSpecialUrl('Emailuser/' . $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
                        );
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
                return $nav_urls;
        }
 
@@ -827,159 +962,54 @@ class SkinTemplate extends Skin {
         * @return string
         * @private
         */
-       function getNameSpaceKey () {
-               switch ($this->mTitle->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';
-               }
+       function getNameSpaceKey() {
+               return $this->mTitle->getNamespaceKey();
        }
 
        /**
-        * @access private
+        * @private
         */
-       function setupUserCss() {
-               $fname = 'SkinTemplate::setupUserCss';
-               wfProfileIn( $fname );
-
-               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( $this->mTitle->isCssSubpage() and $this->userCanPreview( $action ) ) {
-                               $siteargs = "&smaxage=0&maxage=0";
-                               $usercss = $wgRequest->getText('wpTextbox1');
-                       } else {
-                               $usercss = '@import "' .
-                                 $this->makeUrl($this->userpage . '/'.$this->skinname.'.css',
-                                                                'action=raw&ctype=text/css') . '";' ."\n";
-                       }
+       function setupUserJs( $allowUserJs ) {
+               global $wgRequest, $wgJsMimeType;
 
-                       $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->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 . '/*]]>*/';
-               }
-               wfProfileOut( $fname );
-       }
-
-       /**
-        * @access private
-        */
-       function setupUserJs() {
-               $fname = 'SkinTemplate::setupUserJs';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
-               global $wgRequest, $wgAllowUserJs, $wgJsMimeType;
-               $action = $wgRequest->getText('action');
+               $action = $wgRequest->getVal( 'action', 'view' );
 
-               if( $wgAllowUserJs && $this->loggedin ) {
+               if( $allowUserJs && $this->loggedin ) {
                        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='.$wgJsMimeType.'&dontcountme=s');
+                               $this->userjs = self::makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype='.$wgJsMimeType);
                        }
                }
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
-        * returns css with user-specific options
-        * @access public
-        */
-
-       function getUserStylesheet() {
-               $fname = 'SkinTemplate::getUserStylesheet';
-               wfProfileIn( $fname );
-
-               global $wgUser;
-               $s = "/* generated user stylesheet */\n";
-               $s .= $this->reallyDoGetUserStyles();
-               wfProfileOut( $fname );
-               return $s;
-       }
-
-       /**
-        * @access public
+        * Code for extensions to hook into to provide per-page CSS, see
+        * extensions/PageCSS/PageCSS.php for an implementation of this.
+        *
+        * @private
         */
-       function getUserJs() {
-               $fname = 'SkinTemplate::getUserJs';
-               wfProfileIn( $fname );
-
-               global $wgStylePath;
-               $s = '/* generated javascript */';
-               $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';";
-               $s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n";
-
-               // 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;
+       function setupPageCss() {
+               wfProfileIn( __METHOD__ );
+               $out = false;
+               wfRunHooks( 'SkinTemplateSetupPageCss', array( &$out ) );
+               wfProfileOut( __METHOD__ );
+               return $out;
        }
 }
 
 /**
  * Generic wrapper for template functions, with interface
  * compatible with what we use of PHPTAL 0.7.
- * @package MediaWiki
- * @subpackage Skins
+ * @ingroup Skins
  */
 class QuickTemplate {
        /**
-        * @access public
+        * @public
         */
        function QuickTemplate() {
                $this->data = array();
@@ -987,28 +1017,28 @@ class QuickTemplate {
        }
 
        /**
-        * @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.";
@@ -1016,28 +1046,35 @@ 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 );
@@ -1045,32 +1082,29 @@ class QuickTemplate {
 
        /**
         * An ugly, ugly hack.
-        * @access private
+        * @private
         */
        function msgWiki( $str ) {
-               global $wgParser, $wgTitle, $wgOut, $wgUseTidy;
+               global $wgParser, $wgTitle, $wgOut;
 
                $text = $this->translator->translate( $str );
                $parserOutput = $wgParser->parse( $text, $wgTitle,
-                       $wgOut->mParserOptions, true );
+                       $wgOut->parserOptions(), true );
                echo $parserOutput->getText();
        }
 
        /**
-        * @access private
+        * @private
         */
        function haveData( $str ) {
-               return $this->data[$str];
+               return isset( $this->data[$str] );
        }
 
        /**
-        * @access private
+        * @private
         */
        function haveMsg( $str ) {
                $msg = $this->translator->translate( $str );
                return ($msg != '-') && ($msg != ''); # ????
        }
 }
-
-} // end of if( defined( 'MEDIAWIKI' ) )
-?>