* (bug 829) Fix URL-escaping on block success
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index ae5c304..3289c5f 100644 (file)
@@ -15,7 +15,8 @@
 # http://www.gnu.org/copyleft/gpl.html
 
 /**
- * Generic PHPTal (http://phptal.sourceforge.net/) skin
+ * 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/
  *
@@ -23,9 +24,9 @@
  * to the computations individual esi snippets need. Most importantly no body
  * parsing for most of those of course.
  * 
- * Set this in LocalSettings to enable phptal:
- * set_include_path(get_include_path() . ":" . $IP.'/PHPTAL-NP-0.7.0/libs');
- * $wgUsePHPTal = true;
+ * 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
@@ -40,11 +41,12 @@ if( defined( 'MEDIAWIKI' ) ) {
 require_once 'GlobalFunctions.php';
 
 /**
- * @todo document
+ * Wrapper object for MediaWiki's localization functions,
+ * to be passed to the template engine.
+ *
+ * @access private
  * @package MediaWiki
  */
-// PHPTAL 1.0 no longer has the PHPTAL_I18N stub class.
-//class MediaWiki_I18N extends PHPTAL_I18N {
 class MediaWiki_I18N {
        var $_context = array();
 
@@ -53,6 +55,9 @@ 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 );
                
@@ -65,9 +70,11 @@ class MediaWiki_I18N {
                        wfRestoreWarnings();
                        $value = str_replace($src, $varValue, $value);
                }
+               wfProfileOut( $fname );
                return $value;
        }
 }
+
 /**
  *
  * @package MediaWiki
@@ -90,33 +97,50 @@ class SkinTemplate extends Skin {
        var $stylename;
 
        /**
-        * PHPTal template to be used.
+        * 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;
 
        /**#@-*/
 
-       /** */
+       /**
+        * Setup the base parameters...
+        * Child classes should override this to set the name,
+        * style subdirectory, and template filler callback.
+        *
+        * @param OutputPage $out
+        */
        function initPage( &$out ) {
                parent::initPage( $out );
                $this->skinname  = 'monobook';
                $this->stylename = 'monobook';
-               $this->template  = 'MonoBookTemplate';
+               $this->template  = 'QuickTemplate';
        }
 
        /**
-        * If using PHPTAL 0.7 on PHP 4.x, return a PHPTAL template object.
-        * If using PHPTAL 1.0 on PHP 5.x, return a bridge object.
+        * 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
         * @return object
         * @access private
         */
-       function &setupTemplate( $file, $repository=false, $cache_dir=false ) {
-               return new QuickTemplate( $file );
+       function &setupTemplate( $classname, $repository=false, $cache_dir=false ) {
+               return new $classname();
        }
        
        /**
         * initialize various variables and generate the template
+        *
+        * @param OutputPage $out
+        * @access public
         */
        function outputPage( &$out ) {
                global $wgTitle, $wgArticle, $wgUser, $wgLang, $wgContLang, $wgOut;
@@ -124,16 +148,23 @@ class SkinTemplate extends Skin {
                global $wgMimeType, $wgOutputEncoding, $wgUseDatabaseMessages, $wgRequest;
                global $wgDisableCounters, $wgLogo, $action, $wgFeedClasses, $wgSiteNotice;
                global $wgMaxCredits, $wgShowCreditsIfMax;
+               global $wgPageShowWatchingUsers;
 
+               $fname = 'SkinTemplate::outputPage';
+               wfProfileIn( $fname );
+               
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
 
+               wfProfileIn( "$fname-init" );
                $this->initPage( $out );
                $tpl =& $this->setupTemplate( $this->template, 'skins' );
 
                #if ( $wgUseDatabaseMessages ) { // uncomment this to fall back to GetText
                $tpl->setTranslator(new MediaWiki_I18N());
                #}
+               wfProfileOut( "$fname-init" );
 
+               wfProfileIn( "$fname-stuff" );
                $this->thispage = $wgTitle->getPrefixedDbKey();
                $this->thisurl = $wgTitle->getPrefixedURL();
                $this->loggedin = $wgUser->getID() != 0;
@@ -147,7 +178,9 @@ class SkinTemplate extends Skin {
                $this->setupUserCss();
                $this->setupUserJs();
                $this->titletxt = $wgTitle->getPrefixedText();
+               wfProfileOut( "$fname-stuff" );
 
+               wfProfileIn( "$fname-stuff2" );
                $tpl->set( 'title', $wgOut->getPageTitle() );
                $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
 
@@ -192,10 +225,11 @@ class SkinTemplate extends Skin {
                $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->getRestrictions()) ? "unprotect" : "protect" );
+               $tpl->set( "protect", count($wgTitle->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( 'logopath', $wgLogo );
                $tpl->setRef( "lang", $wgContLanguageCode );
@@ -235,7 +269,9 @@ class SkinTemplate extends Skin {
                } else {
                        $ntl = '';
                }
+               wfProfileOut( "$fname-stuff2" );
 
+               wfProfileIn( "$fname-stuff3" );
                $tpl->setRef( 'newtalk', $ntl );
                $tpl->setRef( 'skin', $this);
                $tpl->set( 'logo', $this->logoText() );
@@ -248,6 +284,25 @@ class SkinTemplate extends Skin {
                                        $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($wgTitle->getDBKey()) .
+                                       "' AND  wl_namespace=" . $wgTitle->getNamespace() ;
+                               $res = $dbr->query( $sql, 'SkinPHPTal::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());
 
@@ -265,13 +320,17 @@ 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" );
 
+               wfProfileIn( "$fname-stuff4" );
                $tpl->set( 'copyrightico', $this->getCopyrightIcon() );
                $tpl->set( 'poweredbyico', $this->getPoweredBy() );
                $tpl->set( 'disclaimer', $this->disclaimerLink() );
@@ -280,6 +339,7 @@ class SkinTemplate extends Skin {
                $tpl->setRef( 'debug', $out->mDebugtext );
                $tpl->set( 'reporttime', $out->reportTime() );
                $tpl->set( 'sitenotice', $wgSiteNotice );
+               $tpl->set( 'tagline', wfMsg('tagline') );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
                $out->mBodytext .= $printfooter ;
@@ -298,11 +358,13 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set('language_urls', false);
                }
+               wfProfileOut( "$fname-stuff4" );
 
                # Personal toolbar
                $tpl->set('personal_urls', $this->buildPersonalUrls());
                $content_actions = $this->buildContentActionUrls();
                $tpl->setRef('content_actions', $content_actions);
+
                // XXX: attach this from javascript, same with section editing
                if($this->iseditable && $wgUser->getOption("editondblclick") )
                {
@@ -314,35 +376,48 @@ class SkinTemplate extends Skin {
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
                // execute template
+               wfProfileIn( "$fname-execute" );
                $res = $tpl->execute();
+               wfProfileOut( "$fname-execute" );
                
                // result may be an error
-               #if (PEAR::isError($res)) {
-               #       echo $res->toString(), "\n";
-               #} else {
-                       echo $res;
-               #}
-
+               $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
+        */
+       function printOrError( &$str ) {
+               echo $str;
        }
 
        /**
         * build array of urls for personal toolbar
+        * @return array
+        * @access private
         */
        function buildPersonalUrls() {
+               $fname = 'SkinTemplate::buildPersonalUrls';
+               wfProfileIn( $fname );
+               
                /* set up the default links for the personal toolbar */
                global $wgShowIPinHeader;
                $personal_urls = array();
                if ($this->loggedin) {
+                       /* Logged in users personal toolbar */
                        $personal_urls['userpage'] = array(
-                               'text' => $this->username,
-                               'href' => &$this->userpageUrlDetails['href'],
-                               'class' => $this->userpageUrlDetails['exists']?false:'new'
+                               'text' => wfMsg('mypage'),
+                               'href' => $this->makeSpecialUrl('Mypage')
                        );
-                       $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
                        $personal_urls['mytalk'] = array(
                                'text' => wfMsg('mytalk'),
-                               'href' => &$usertalkUrlDetails['href'],
-                               'class' => $usertalkUrlDetails['exists']?false:'new'
+                               'href' => $this->makeSpecialUrl('Mytalk')
                        );
                        $personal_urls['preferences'] = array(
                                'text' => wfMsg('preferences'),
@@ -354,7 +429,7 @@ class SkinTemplate extends Skin {
                        );
                        $personal_urls['mycontris'] = array(
                                'text' => wfMsg('mycontris'),
-                               'href' => $this->makeSpecialUrl('Contributions','target=' . urlencode( $this->username ) )
+                               'href' => $this->makeSpecialUrl('Mycontributions')
                        );
                        $personal_urls['logout'] = array(
                                'text' => wfMsg('userlogout'),
@@ -362,72 +437,85 @@ class SkinTemplate extends Skin {
                        );
                } else {
                        if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get("session.name")] ) ) {
+                               /* Anonymous with session users personal toolbar */
                                $personal_urls['anonuserpage'] = array(
-                                       'text' => $this->username,
-                                       'href' => &$this->userpageUrlDetails['href'],
-                                       'class' => $this->userpageUrlDetails['exists']?false:'new'
+                                       'text' => wfMsg('mypage'),
+                                       'href' => $this->makeSpecialUrl('Mypage')
                                );
-                               $usertalkUrlDetails = $this->makeTalkUrlDetails($this->userpage);
-                               $personal_urls['anontalk'] = array(
-                                       'text' => wfMsg('anontalk'),
-                                       'href' => &$usertalkUrlDetails['href'],
-                                       'class' => $usertalkUrlDetails['exists']?false:'new'
+                               $personal_urls['mytalk'] = array(
+                                       'text' => wfMsg('mytalk'),
+                                       'href' => $this->makeSpecialUrl('Mytalk')
                                );
+
                                $personal_urls['anonlogin'] = array(
                                        'text' => wfMsg('userlogin'),
                                        'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
                                );
                        } else {
-
+                               /* Anonymous users personal toolbar */
                                $personal_urls['login'] = array(
                                        'text' => wfMsg('userlogin'),
                                        'href' => $this->makeSpecialUrl('Userlogin', 'returnto=' . $this->thisurl )
                                );
                        }
                }
-
+               wfProfileOut( $fname );
                return $personal_urls;
        }
 
        /**
         * an array of edit links by default used for the tabs
+        * @return array
+        * @access private
         */
        function buildContentActionUrls () {
-               global $wgTitle, $wgUser, $wgOut, $wgRequest, $wgUseValidation;
+               global $wgContLang;
+               $fname = 'SkinTemplate::buildContentActionUrls';
+               wfProfileIn( $fname );
+               
+               global $wgTitle, $wgUser, $wgRequest, $wgUseValidation;
                $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() ) {
+               if( $this->iscontent ) {
 
                        $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));
+
+                       $subjectTitle = $wgTitle->getSubjectPage();
+                       if( $subjectTitle->getArticleId() != 0 ) {
+                               $class = ($is_active) ? 'selected' : false;
+                       } else {
+                               $class = ($is_active) ? 'selected new' : 'new';
+                       }
+                       $content_actions[$nskey] = array('class' => $class,
+                                                        '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 = Title::newFromText( $this->titletxt );
-                       $talktitle = $talktitle->getTalkPage();
-                       $this->checkTitle($talktitle, $this->titletxt);
-                       if($talktitle->getArticleId() != 0) {
+                       $talktitle = $wgTitle->getTalkPage();
+                       if( $talktitle->getArticleId() != 0 ) {
                                $content_actions['talk'] = array(
                                        'class' => $talk_class,
                                        'text' => wfMsg('talk'),
-                                       'href' => $this->makeTalkUrl($this->titletxt)
+                                       'href' => $talktitle->getLocalUrl()
                                );
                        } else {
                                $content_actions['talk'] = array(
-                                       'class' => $talk_class?$talk_class.' new':'new',
+                                       'class' => $talk_class ? $talk_class.' new' : 'new',
                                        'text' => wfMsg('talk'),
-                                       'href' => $this->makeTalkUrl($this->titletxt,'action=edit')
+                                       'href' => $talktitle->getLocalUrl( 'action=edit' )
                                );
                        }
+                       wfProfileOut( "$fname-talk" );
 
+                       wfProfileIn( "$fname-edit" );
                        if ( $wgTitle->userCanEdit() ) {
                                $oid = ( $oldid && ! isset( $diff ) ) ? '&oldid='.IntVal( $oldid ) : false;
                                $istalk = ( Namespace::isTalk( $wgTitle->getNamespace()) );
@@ -435,27 +523,33 @@ class SkinTemplate extends Skin {
                                $content_actions['edit'] = array(
                                        'class' => ((($action == 'edit' or $action == 'submit') and $section != 'new') ? 'selected' : '').$istalkclass,
                                        'text' => wfMsg('edit'),
-                                       'href' => $this->makeUrl($this->thispage, 'action=edit'.$oid)
+                                       'href' => $wgTitle->getLocalUrl( 'action=edit'.$oid )
                                );
                                if ( $istalk ) {
                                        $content_actions['addsection'] = array(
                                                'class' => $section == 'new'?'selected':false,
                                                'text' => wfMsg('addsection'),
-                                               'href' => $this->makeUrl($this->thispage, 'action=edit&section=new')
+                                               'href' => $wgTitle->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' => $this->makeUrl($this->thispage, 'action=edit'.$oid));
+                               $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 )
+                               );
                        }
+                       wfProfileOut( "$fname-edit" );
 
+                       wfProfileIn( "$fname-live" );
                        if ( $wgTitle->getArticleId() ) {
 
-                               $content_actions['history'] = array('class' => ($action == 'history') ? 'selected' : false,
-                               'text' => wfMsg('history_short'),
-                               'href' => $this->makeUrl($this->thispage, 'action=history'));
+                               $content_actions['history'] = array(
+                                       'class' => ($action == 'history') ? 'selected' : false,
+                                       'text' => wfMsg('history_short'),
+                                       'href' => $wgTitle->getLocalUrl( 'action=history')
+                               );
 
                                # XXX: is there a rollback action anywhere or is it planned?
                                # Don't recall where i got this from...
@@ -473,14 +567,14 @@ class SkinTemplate extends Skin {
                                                $content_actions['protect'] = array(
                                                        'class' => ($action == 'protect') ? 'selected' : false,
                                                        'text' => wfMsg('protect'),
-                                                       'href' => $this->makeUrl($this->thispage, 'action=protect')
+                                                       'href' => $wgTitle->getLocalUrl( 'action=protect' )
                                                );
 
                                        } else {
                                                $content_actions['unprotect'] = array(
                                                        'class' => ($action == 'unprotect') ? 'selected' : false,
                                                        'text' => wfMsg('unprotect'),
-                                                       'href' => $this->makeUrl($this->thispage, 'action=unprotect')
+                                                       'href' => $wgTitle->getLocalUrl( 'action=unprotect' )
                                                );
                                        }
                                }
@@ -488,15 +582,16 @@ class SkinTemplate extends Skin {
                                        $content_actions['delete'] = array(
                                                'class' => ($action == 'delete') ? 'selected' : false,
                                                'text' => wfMsg('delete'),
-                                               'href' => $this->makeUrl($this->thispage, 'action=delete')
+                                               'href' => $wgTitle->getLocalUrl( 'action=delete' )
                                        );
                                }
                                if ( $wgUser->getID() != 0 ) {
-                                       if ( $wgTitle->userCanEdit()) {
-                                               $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 ( $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 ) )
+                                               );
                                        }
                                }
                        } else {
@@ -511,16 +606,21 @@ class SkinTemplate extends Skin {
                                        }
                                }
                        }
+                       wfProfileOut( "$fname-live" );
 
                        if ( $wgUser->getID() != 0 and $action != 'submit' ) {
                                if( !$wgTitle->userIsWatching()) {
-                                       $content_actions['watch'] = array('class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
-                                       'text' => wfMsg('watch'),
-                                       'href' => $this->makeUrl($this->thispage, 'action=watch'));
+                                       $content_actions['watch'] = array(
+                                               'class' => ($action == 'watch' or $action == 'unwatch') ? 'selected' : false,
+                                               'text' => wfMsg('watch'),
+                                               'href' => $wgTitle->getLocalUrl( 'action=watch' )
+                                       );
                                } else {
-                                       $content_actions['unwatch'] = array('class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
-                                       'text' => wfMsg('unwatch'),
-                                       'href' => $this->makeUrl($this->thispage, 'action=unwatch'));
+                                       $content_actions['unwatch'] = array(
+                                               'class' => ($action == 'unwatch' or $action == 'watch') ? 'selected' : false,
+                                               'text' => wfMsg('unwatch'),
+                                               'href' => $wgTitle->getLocalUrl( 'action=unwatch' )
+                                       );
                                }
                        }
 
@@ -528,57 +628,102 @@ class SkinTemplate extends Skin {
                        if ( $wgUseValidation && $wgTitle->getArticleId() && $wgTitle->getNamespace() == 0 ) {
                                global $wgArticle ;
                                $article_time = "&timestamp=" . $wgArticle->mTimestamp ;
-                               $content_actions['validate'] = array('class' => ($action == 'validate') ? 'selected' : false ,
+                               $content_actions['validate'] = array(
+                                       'class' => ($action == 'validate') ? 'selected' : false ,
                                        'text' => wfMsg('val_tab'),
-                                       'href' => $this->makeUrl($this->thispage, 'action=validate'.$article_time));
-                               }
+                                       'href' => $wgTitle->getLocalUrl( 'action=validate'.$article_time)
+                               );
+                       }
 
                } else {
                        /* show special page tab */
 
-                       $content_actions['article'] = array('class' => 'selected',
-                       'text' => wfMsg('specialpage'),
-                       'href' => false);
+                       $content_actions['article'] = array(
+                               'class' => 'selected',
+                               'text' => wfMsg('specialpage'),
+                               'href' => false
+                       );
                }
 
+               /* 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' => $wgTitle->getLocalUrl( $actstr . 'variant=' . $code )
+                                       );
+                               $vcount ++;
+                       }
+               }               
+
+               wfProfileOut( $fname );
                return $content_actions;
        }
 
        /**
         * build array of global navigation links
+        * @return array
+        * @access private
         */ 
        function buildNavigationUrls () {
+               $fname = 'SkinTemplate::buildNavigationUrls';
+               wfProfileIn( $fname );
+               
                global $wgNavigationLinks;
                $result = array();
                foreach ( $wgNavigationLinks as $link ) {
-                       if (wfMsg( $link['text'] ) != '-') {
+                       $text = wfMsg( $link['text'] );
+                       wfProfileIn( "$fname-{$link['text']}" );
+                       if ($text != '-') {
+                               $dest = wfMsgForContent( $link['href'] );
+                               wfProfileIn( "$fname-{$link['text']}2" );
                            $result[] = array(
-                                                                 'text' => wfMsg( $link['text'] ),
-                                                                 'href' => $this->makeInternalOrExternalUrl( wfMsgForContent( $link['href'] ) ),
+                                                                 'text' => $text,
+                                                                 'href' => $this->makeInternalOrExternalUrl( $dest ),
                                                                  'id' => 'n-'.$link['text']
                                                                  );
+                               wfProfileOut( "$fname-{$link['text']}2" );
                        }
+                       wfProfileOut( "$fname-{$link['text']}" );
                }
+               wfProfileOut( $fname );
                return $result;
        }
 
        /**
         * build array of common navigation links
+        * @return array
+        * @access private
         */
        function buildNavUrls () {
+               $fname = 'SkinTemplate::buildNavUrls';
+               wfProfileIn( $fname );
+               
                global $wgTitle, $wgUser, $wgRequest;
                global $wgSiteSupportPage, $wgDisableUploads;
 
                $action = $wgRequest->getText( 'action' );
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
-               // XXX: remove htmlspecialchars when tal:attributes works with i18n:attributes
+               
                $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'] = (wfMsg('currentevents') != '-') ? array('href' => $this->makeI18nUrl('currentevents')) : false;
-               $nav_urls['portal'] =  (wfMsg('portal') != '-') ? array('href' => $this->makeI18nUrl('portal-url')) : false;
+               $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);
@@ -591,8 +736,8 @@ class SkinTemplate extends Skin {
                $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)));
+                       $nav_urls['whatlinkshere'] = array('href' => $this->makeSpecialUrl('Whatlinkshere', 'target='.urlencode( $this->thispage)));
+                       $nav_urls['recentchangeslinked'] = array('href' => $this->makeSpecialUrl('Recentchangeslinked', 'target='.urlencode( $this->thispage)));
                }
 
                if( $wgTitle->getNamespace() == NS_USER || $wgTitle->getNamespace() == NS_USER_TALK ) {
@@ -611,19 +756,19 @@ class SkinTemplate extends Skin {
                        $nav_urls['contributions'] = false;
                }
                $nav_urls['emailuser'] = false;
-               if ( 0 != $wgUser->getID() ) { # show only to signed in users
-                       if($id) {       # can only email non-anons
-                               $nav_urls['emailuser'] = array(
-                                       'href' => $this->makeSpecialUrl('Emailuser', "target=" . $wgTitle->getPartialURL() )
-                               );
-                       }
+               if( $this->showEmailUser( $id ) ) {
+                       $nav_urls['emailuser'] = array(
+                               'href' => $this->makeSpecialUrl('Emailuser', "target=" . $wgTitle->getPartialURL() )
+                       );
                }
-
+               wfProfileOut( $fname );
                return $nav_urls;
        }
 
        /**
         * Generate strings used for xml 'id' names
+        * @return string
+        * @private
         */
        function getNameSpaceKey () {
                global $wgTitle;
@@ -664,14 +809,15 @@ class SkinTemplate extends Skin {
        /**
         * @access private
         */
-       
-       function setupUserCss () {
+       function setupUserCss() {
+               $fname = 'SkinTemplate::setupUserCss';
+               wfProfileIn( $fname );
                
-               global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss;
+               global $wgRequest, $wgTitle, $wgAllowUserCss, $wgUseSiteCss, $wgContLang, $wgSquidMaxage, $wgStylePath, $wgUser;
 
-               $sitecss = "";
-               $usercss = "";
-               $siteargs = "";
+               $sitecss = '';
+               $usercss = '';
+               $siteargs = '&maxage=' . $wgSquidMaxage;
 
                # Add user-specific code if this is a user and we allow that kind of thing
                
@@ -680,33 +826,40 @@ class SkinTemplate extends Skin {
                        
                        # if we're previewing the CSS page, use it
                        if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
-                               $siteargs .= "&smaxage=0&maxage=0";
+                               $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 we use the site's dynamic CSS, throw that in, too
+               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";
+                       $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[*/ ' . $sitecss . ' ' . $usercss . ' /*]]>*/';
+                       $this->usercss = "/*<![CDATA[*/\n" . $sitecss . $usercss . '/*]]>*/';
                }
+               wfProfileOut( $fname );
        }
 
        /**
         * @access private
         */
-       function setupUserJs () {
+       function setupUserJs() {
+               $fname = 'SkinTemplate::setupUserJs';
+               wfProfileIn( $fname );
+               
                global $wgRequest, $wgTitle, $wgAllowUserJs;
                $action = $wgRequest->getText('action');
 
@@ -718,19 +871,20 @@ class SkinTemplate extends Skin {
                                $this->userjs = $this->makeUrl($this->userpage.'/'.$this->skinname.'.js', 'action=raw&ctype=text/javascript&dontcountme=s');
                        }
                }
+               wfProfileOut( $fname );
        }
        
        /**
         * returns css with user-specific options
+        * @access public
         */
        function getUserStylesheet() {
-               global $wgUser, $wgRequest, $wgTitle, $wgContLang, $wgSquidMaxage, $wgStylePath;
-               $action = $wgRequest->getText('action');
-               $maxage = $wgRequest->getText('maxage');
+               $fname = 'SkinTemplate::getUserStylesheet';
+               wfProfileIn( $fname );
+               
+               global $wgUser;
                $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";
@@ -744,46 +898,128 @@ class SkinTemplate extends Skin {
                if ( 1 == $wgUser->getOption( "justify" ) ) {
                        $s .= "#bodyContent { text-align: justify; }\n";
                }
+               wfProfileOut( $fname );
                return $s;
        }
        
        /**
-        *
+        * @access public
         */
        function getUserJs() {
+               $fname = 'SkinTemplate::getUserJs';
+               wfProfileIn( $fname );
+               
                global $wgUser, $wgStylePath;
                $s = '/* generated javascript */';
                $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';";
                $s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n";
                $s .= wfMsg(ucfirst($this->skinname).'.js');
+               
+               wfProfileOut( $fname );
                return $s;
        }
 }
 
+/**
+ * Generic wrapper for template functions, with interface
+ * compatible with what we use of PHPTAL 0.7.
+ * @package MediaWiki
+ * @subpackage Skins
+ */
 class QuickTemplate {
-       function QuickTemplate( $file, $repository=false, $cache_dir=false ) {
-               $this->outputCallback = $file;
+       /**
+        * @access public
+        */
+       function QuickTemplate() {
                $this->data = array();
-               $this->translator = null;
+               $this->translator = new MediaWiki_I18N();
        }
        
+       /**
+        * @access public
+        */
        function set( $name, $value ) {
                $this->data[$name] = $value;
        }
        
+       /**
+        * @access public
+        */
        function setRef($name, &$value) {
                $this->data[$name] =& $value;
        }
        
+       /**
+        * @access public
+        */
        function setTranslator( &$t ) {
                $this->translator = &$t;
        }
        
+       /**
+        * @access public
+        */
        function execute() {
-               return call_user_func_array( $this->outputCallback,
-                       array( &$this->data, &$this->translator ) );
+               echo "Override this function.";
+       }
+
+
+       /**
+        * @access private
+        */
+       function text( $str ) {
+               echo htmlspecialchars( $this->data[$str] );
+       }
+       
+       /**
+        * @access private
+        */
+       function html( $str ) {
+               echo $this->data[$str];
+       }
+       
+       /**
+        * @access private
+        */
+       function msg( $str ) {
+               echo htmlspecialchars( $this->translator->translate( $str ) );
+       }
+       
+       /**
+        * @access private
+        */
+       function msgHtml( $str ) {
+               echo $this->translator->translate( $str );
+       }
+       
+       /**
+        * An ugly, ugly hack.
+        * @access private
+        */
+       function msgWiki( $str ) {
+               global $wgParser, $wgTitle, $wgOut, $wgUseTidy;
+
+               $text = $this->translator->translate( $str );
+               $parserOutput = $wgParser->parse( $text, $wgTitle,
+                       $wgOut->mParserOptions, true );
+               echo $parserOutput->getText();
+       }
+       
+       /**
+        * @access private
+        */
+       function haveData( $str ) {
+               return $this->data[$str];
+       }
+       
+       /**
+        * @access private
+        */
+       function haveMsg( $str ) {
+               $msg = $this->translator->translate( $str );
+               return ($msg != '-') && ($msg != ''); # ????
        }
 }
 
 } // end of if( defined( 'MEDIAWIKI' ) ) 
-?>
+?>
\ No newline at end of file