coding style tweaks
[lhc/web/wiklou.git] / includes / SkinTemplate.php
index edfdf0f..50dfefe 100644 (file)
@@ -1,22 +1,28 @@
 <?php
+/**
+ * Base class for template-based skins
+ *
+ * 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
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * 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.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
+
 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
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# 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.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# http://www.gnu.org/copyleft/gpl.html
-
 /**
  * Wrapper object for MediaWiki's localization functions,
  * to be passed to the template engine.
@@ -70,38 +76,30 @@ class SkinTemplate extends Skin {
         */
 
        /**
-        * Name of our skin, set in initPage()
-        * It probably need to be all lower case.
+        * Name of our skin, it probably needs to be all lower case.  Child classes
+        * should override the default.
         */
-       var $skinname;
+       var $skinname = 'monobook';
 
        /**
-        * Stylesheets set to use
-        * Sub directory in ./skins/ where various stylesheets are located
+        * Stylesheets set to use.  Subdirectory in skins/ where various stylesheets
+        * are located.  Child classes should override the default.
         */
-       var $stylename;
+       var $stylename = 'monobook';
 
        /**
-        * For QuickTemplate, the name of the subclass which
-        * will actually fill the template.
+        * For QuickTemplate, the name of the subclass which will actually fill the
+        * template.  Child classes should override the default.
         */
-       var $template;
-
-       /**#@-*/
+       var $template = 'QuickTemplate';
 
        /**
-        * Setup the base parameters...
-        * Child classes should override this to set the name,
-        * style subdirectory, and template filler callback.
-        *
-        * @param $out OutputPage
+        * Whether this skin use OutputPage::headElement() to generate the <head>
+        * tag
         */
-       function initPage( OutputPage $out ) {
-               parent::initPage( $out );
-               $this->skinname  = 'monobook';
-               $this->stylename = 'monobook';
-               $this->template  = 'QuickTemplate';
-       }
+       var $useHeadElement = false;
+
+       /**#@-*/
 
        /**
         * Add specific styles for this skin
@@ -110,15 +108,15 @@ class SkinTemplate extends Skin {
         */
        function setupSkinUserCss( OutputPage $out ){
                $out->addStyle( 'common/shared.css', 'screen' );
-               $out->addStyle( 'common/commonPrint.css', 'print' );    
+               $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 $callback string (or file)
+        * @param $classname string (or file)
         * @param $repository string: subdirectory where we keep template files
         * @param $cache_dir string
         * @return object
@@ -137,14 +135,17 @@ class SkinTemplate extends Skin {
                global $wgArticle, $wgUser, $wgLang, $wgContLang;
                global $wgScript, $wgStylePath, $wgContLanguageCode;
                global $wgMimeType, $wgJsMimeType, $wgOutputEncoding, $wgRequest;
-               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces;
+               global $wgXhtmlDefaultNamespace, $wgXhtmlNamespaces, $wgHtml5Version;
                global $wgDisableCounters, $wgLogo, $wgHideInterlanguageLinks;
                global $wgMaxCredits, $wgShowCreditsIfMax;
                global $wgPageShowWatchingUsers;
-               global $wgUseTrackbacks, $wgUseSiteJs;
-               global $wgArticlePath, $wgScriptPath, $wgServer, $wgCanonicalNamespaceNames;
+               global $wgUseTrackbacks, $wgUseSiteJs, $wgDebugComments;
+               global $wgArticlePath, $wgScriptPath, $wgServer, $wgProfiler;
 
                wfProfileIn( __METHOD__ );
+               if ( is_object( $wgProfiler ) ) {
+                       $wgProfiler->setTemplated( true );
+               }
 
                $oldid = $wgRequest->getVal( 'oldid' );
                $diff = $wgRequest->getVal( 'diff' );
@@ -164,6 +165,14 @@ class SkinTemplate extends Skin {
                wfProfileIn( __METHOD__ . '-stuff' );
                $this->thispage = $this->mTitle->getPrefixedDBkey();
                $this->thisurl = $this->mTitle->getPrefixedURL();
+               $query = array();
+               if ( !$wgRequest->wasPosted() ) {
+                       $query = $wgRequest->getValues();
+                       unset( $query['title'] );
+                       unset( $query['returnto'] );
+                       unset( $query['returntoquery'] );
+               }
+               $this->thisquery = wfUrlencode( wfArrayToCGI( $query ) );
                $this->loggedin = $wgUser->isLoggedIn();
                $this->iscontent = ( $this->mTitle->getNamespace() != NS_SPECIAL );
                $this->iseditable = ( $this->iscontent and !( $action == 'edit' or $action == 'submit' ) );
@@ -177,12 +186,49 @@ class SkinTemplate extends Skin {
                        $this->userpageUrlDetails = self::makeKnownUrlDetails( $this->userpage );
                }
 
-               $this->userjs = $this->userjsprev = false;
-               $this->setupUserCss( $out );
-               $this->setupUserJs( $out->isUserJsAllowed() );
                $this->titletxt = $this->mTitle->getPrefixedText();
                wfProfileOut( __METHOD__ . '-stuff' );
 
+               wfProfileIn( __METHOD__ . '-stuff-head' );
+               if ( $this->useHeadElement ) {
+                       $pagecss = $this->setupPageCss();
+                       if( $pagecss )
+                               $out->addInlineStyle( $pagecss );
+               } else {
+                       $this->setupUserCss( $out );
+
+                       $tpl->set( 'pagecss', $this->setupPageCss() );
+                       $tpl->setRef( 'usercss', $this->usercss );
+
+                       $this->userjs = $this->userjsprev = false;
+                       $this->setupUserJs( $out->isUserJsAllowed() );
+                       $tpl->setRef( 'userjs', $this->userjs );
+                       $tpl->setRef( 'userjsprev', $this->userjsprev );
+
+                       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 );
+                       }
+
+                       $tpl->setRef( 'xhtmldefaultnamespace', $wgXhtmlDefaultNamespace );
+                       $tpl->set( 'xhtmlnamespaces', $wgXhtmlNamespaces );
+                       $tpl->set( 'html5version', $wgHtml5Version );
+                       $tpl->set( 'headlinks', $out->getHeadLinks() );
+                       $tpl->set( 'csslinks', $out->buildCssLinks() );
+
+                       if( $wgUseTrackbacks && $out->isArticleRelated() ) {
+                               $tpl->set( 'trackbackhtml', $out->getTitle()->trackbackRDF() );
+                       } else {
+                               $tpl->set( 'trackbackhtml', null );
+                       }
+               }
+               wfProfileOut( __METHOD__ . '-stuff-head' );
+
                wfProfileIn( __METHOD__ . '-stuff2' );
                $tpl->set( 'title', $out->getPageTitle() );
                $tpl->set( 'pagetitle', $out->getHTMLTitle() );
@@ -190,8 +236,8 @@ class SkinTemplate extends Skin {
                $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() ] :
+               $nsname = MWNamespace::exists( $this->mTitle->getNamespace() ) ?
+                                       MWNamespace::getCanonicalName( $this->mTitle->getNamespace() ) :
                                        $this->mTitle->getNsText();
 
                $tpl->set( 'nscanonical', $nsname );
@@ -230,25 +276,15 @@ class SkinTemplate extends Skin {
                } else {
                        $tpl->set( 'feeds', false );
                }
-               if( $wgUseTrackbacks && $out->isArticleRelated() ) {
-                       $tpl->set( 'trackbackhtml', $out->getTitle()->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( '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( 'printable', $out->isPrintable() );
                $tpl->set( 'handheld', $wgRequest->getBool( 'handheld' ) );
                $tpl->setRef( 'loggedin', $this->loggedin );
                $tpl->set( 'notspecialpage', $this->mTitle->getNamespace() != NS_SPECIAL );
@@ -267,80 +303,45 @@ class SkinTemplate extends Skin {
                $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() );
+
+               $lang = wfUILang();
+               $tpl->set( 'lang', $lang->getCode() );
+               $tpl->set( 'dir', $lang->getDir() );
+               $tpl->set( 'rtl', $lang->isRTL() );
+
                $tpl->set( 'capitalizeallnouns', $wgLang->capitalizeAllNouns() ? ' capitalize-all-nouns' : '' );
-               $tpl->set( 'langname', $wgContLang->getLanguageName( $wgContLanguageCode ) );
                $tpl->set( 'showjumplinks', $wgUser->getOption( 'showjumplinks' ) );
-               $tpl->set( 'username', $wgUser->isAnon() ? NULL : $this->username );
+               $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( 'userlangattributes', 'lang="' . $wgLang->getCode() . '" xml:lang="' . $wgLang->getCode() . '"' );
-               $tpl->set( 'pagecss', $this->setupPageCss() );
-               $tpl->setRef( 'usercss', $this->usercss );
-               $tpl->setRef( 'userjs', $this->userjs );
-               $tpl->setRef( 'userjsprev', $this->userjsprev );
-               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();
+               // Users can have their language set differently than the
+               // content of the wiki. For these users, tell the web browser
+               // that interface elements are in a different language.
+               $tpl->set( 'userlangattributes', '' );
+               $tpl->set( 'specialpageattributes', '' );
 
-               if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) {
-                       $usertitle = $this->mUser->getUserPage();
-                       $usertalktitle = $usertitle->getTalkPage();
+               $lang = $wgLang->getCode();
+               $dir  = $wgLang->getDir();
+               if ( $lang !== $wgContLang->getCode() || $dir !== $wgContLang->getDir() ) {
+                       $attrs = " lang='$lang' dir='$dir'";
 
-                       if( !$usertalktitle->equals( $this->mTitle ) ) {
-                               $newmessageslink = $this->link(
-                                       $usertalktitle,
-                                       wfMsgHtml( 'newmessageslink' ),
-                                       array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
-                               );
-
-                               $newmessagesdifflink = $this->link(
-                                       $usertalktitle,
-                                       wfMsgHtml( 'newmessagesdifflink' ),
-                                       array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
-                               );
+                       $tpl->set( 'userlangattributes', $attrs );
 
-                               $ntl = wfMsg(
-                                       'youhavenewmessages',
-                                       $newmessageslink,
-                                       $newmessagesdifflink
-                               );
-                               # Disable Cache
-                               $out->setSquidMaxage( 0 );
-                       }
-               } else if( count( $newtalks ) ) {
-                       // _>" " for BC <= 1.16
-                       $sep = str_replace( '_', ' ', wfMsgHtml( 'newtalkseparator' ) );
-                       $msgs = array();
-                       foreach( $newtalks as $newtalk ) {
-                               $msgs[] = Xml::element('a',
-                                       array( 'href' => $newtalk['link'] ), $newtalk['wiki'] );
+                       // The content of SpecialPages should be presented in the
+                       // user's language. Content of regular pages should not be touched.
+                       if( $this->mTitle->isSpecialPage() ) {
+                               $tpl->set( 'specialpageattributes', $attrs );
                        }
-                       $parts = implode( $sep, $msgs );
-                       $ntl = wfMsgHtml( 'youhavenewmessagesmulti', $parts );
-                       $out->setSquidMaxage( 0 );
-               } else {
-                       $ntl = '';
                }
+
+               $newtalks = $this->getNewtalks();
+
                wfProfileOut( __METHOD__ . '-stuff2' );
 
                wfProfileIn( __METHOD__ . '-stuff3' );
-               $tpl->setRef( 'newtalk', $ntl );
+               $tpl->setRef( 'newtalk', $newtalks );
                $tpl->setRef( 'skin', $this );
                $tpl->set( 'logo', $this->logoText() );
                if ( $out->isArticle() and ( !isset( $oldid ) or isset( $diff ) ) and
@@ -412,12 +413,22 @@ class SkinTemplate extends Skin {
                $tpl->set( 'privacy', $this->privacyLink() );
                $tpl->set( 'about', $this->aboutLink() );
 
-               $tpl->setRef( 'debug', $out->mDebugtext );
+               if ( $wgDebugComments ) {
+                       $tpl->setRef( 'debug', $out->mDebugtext );
+               } else {
+                       $tpl->set( 'debug', '' );
+               }
+
                $tpl->set( 'reporttime', wfReportTime() );
                $tpl->set( 'sitenotice', wfGetSiteNotice() );
                $tpl->set( 'bottomscripts', $this->bottomScripts() );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
+               global $wgBetterDirectionality;
+               if ( $wgBetterDirectionality ) {
+                       $realBodyAttribs = array( 'lang' => $wgContLanguageCode, 'dir' => $wgContLang->getDir() );
+                       $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, $out->mBodytext );
+               }
                $out->mBodytext .= $printfooter . $this->generateDebugHTML();
                $tpl->setRef( 'bodytext', $out->mBodytext );
 
@@ -435,6 +446,7 @@ class SkinTemplate extends Skin {
                                                'href' => $nt->getFullURL(),
                                                'text' => ( $wgContLang->getLanguageName( $nt->getInterwiki() ) != '' ?
                                                                        $wgContLang->getLanguageName( $nt->getInterwiki() ) : $l ),
+                                               'title' => $nt->getText(),
                                                'class' => $class
                                        );
                                }
@@ -453,17 +465,16 @@ class SkinTemplate extends Skin {
                $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' ) ){
-                       $encEditUrl = Xml::escapeJsString( $this->mTitle->getLocalUrl( $this->editUrlOptions() ) );
-                       $tpl->set( 'body_ondblclick', 'document.location = "' . $encEditUrl . '";' );
-               } else {
-                       $tpl->set( 'body_ondblclick', false );
-               }
-               $tpl->set( 'body_onload', false );
                $tpl->set( 'sidebar', $this->buildSidebar() );
                $tpl->set( 'nav_urls', $this->buildNavUrls() );
 
+               // Set the head scripts near the end, in case the above actions resulted in added scripts
+               if ( $this->useHeadElement ) {
+                       $tpl->set( 'headelement', $out->headElement( $this ) );
+               } else {
+                       $tpl->set( 'headscripts', $out->getScript() );
+               }
+
                // original version by hansm
                if( !wfRunHooks( 'SkinTemplateOutputPageBeforeExec', array( &$this, &$tpl ) ) ) {
                        wfDebug( __METHOD__ . ": Hook SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
@@ -489,7 +500,7 @@ class SkinTemplate extends Skin {
         * an error object of the appropriate type.
         * For the base class, assume strings all around.
         *
-        * @param mixed $str
+        * @param $str Mixed
         * @private
         */
        function printOrError( $str ) {
@@ -510,6 +521,11 @@ class SkinTemplate extends Skin {
 
                /* set up the default links for the personal toolbar */
                $personal_urls = array();
+               $page = $wgRequest->getVal( 'returnto', $this->thisurl );
+               $query = $wgRequest->getVal( 'returntoquery', $this->thisquery );
+               $returnto = "returnto=$page";
+               if( $this->thisquery != '' )
+                       $returnto .= "&returntoquery=$query";
                if( $this->loggedin ) {
                        $personal_urls['userpage'] = array(
                                'text' => $this->username,
@@ -562,7 +578,7 @@ class SkinTemplate extends Skin {
                        $personal_urls['logout'] = array(
                                'text' => wfMsg( 'userlogout' ),
                                'href' => self::makeSpecialUrl( 'Userlogout',
-                                       $title->isSpecial( 'Preferences' ) ? '' : "returnto={$this->thisurl}"
+                                       $title->isSpecial( 'Preferences' ) ? '' : $returnto
                                ),
                                'active' => false
                        );
@@ -589,18 +605,18 @@ class SkinTemplate extends Skin {
                                );
                                $personal_urls['anonlogin'] = array(
                                        'text' => wfMsg( $loginlink ),
-                                       'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
+                                       'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
                                        'active' => $title->isSpecial( 'Userlogin' )
                                );
                        } else {
                                $personal_urls['login'] = array(
                                        'text' => wfMsg( $loginlink ),
-                                       'href' => self::makeSpecialUrl( 'Userlogin', 'returnto=' . $this->thisurl ),
+                                       'href' => self::makeSpecialUrl( 'Userlogin', $returnto ),
                                        'active' => $title->isSpecial( 'Userlogin' )
                                );
                        }
                }
-               
+
                wfRunHooks( 'PersonalUrls', array( &$personal_urls, &$title ) );
                wfProfileOut( __METHOD__ );
                return $personal_urls;
@@ -701,23 +717,23 @@ class SkinTemplate extends Skin {
                                $istalkclass = $istalk?' istalk':'';
                                $content_actions['edit'] = array(
                                        'class' => ( ( ( $action == 'edit' or $action == 'submit' ) and $section != 'new' ) ? 'selected' : '' ) . $istalkclass,
-                                       'text' => $this->mTitle->exists()
+                                       'text' => ( $this->mTitle->exists() || ( $this->mTitle->getNamespace() == NS_MEDIAWIKI && !wfEmptyMsg( $this->mTitle->getText() ) ) )
                                                ? wfMsg( 'edit' )
                                                : wfMsg( 'create' ),
                                        'href' => $this->mTitle->getLocalUrl( $this->editUrlOptions() )
                                );
 
-                               // adds new section link if page is a current revision of a talk page or 
+                               // adds new section link if page is a current revision of a talk page or
                                if ( ( $wgArticle && $wgArticle->isCurrent() && $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' )
-                                               );                                      
+                                               );
                                        }
-                               }  
-                       } elseif ( $this->mTitle->isKnown() ) {
+                               }
+                       } elseif ( $this->mTitle->hasSourceText() ) {
                                $content_actions['viewsource'] = array(
                                        'class' => ($action == 'edit') ? 'selected' : false,
                                        'text' => wfMsg( 'viewsource' ),
@@ -770,7 +786,7 @@ class SkinTemplate extends Skin {
                                }
                        } else {
                                //article doesn't exist or is deleted
-                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'undelete' ) ) {
+                               if( $wgUser->isAllowed( 'deletedhistory' ) && $wgUser->isAllowed( 'deletedtext' ) ) {
                                        if( $n = $this->mTitle->isDeleted() ) {
                                                $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
                                                $content_actions['undelete'] = array(
@@ -819,7 +835,7 @@ class SkinTemplate extends Skin {
                        }
 
 
-                       wfRunHooks( 'SkinTemplateTabs', array( &$this, &$content_actions ) );
+                       wfRunHooks( 'SkinTemplateTabs', array( $this, &$content_actions ) );
                } else {
                        /* show special page tab */
 
@@ -865,7 +881,7 @@ class SkinTemplate extends Skin {
         */
        function buildNavUrls() {
                global $wgUseTrackbacks, $wgOut, $wgUser, $wgRequest;
-               global $wgEnableUploads, $wgUploadNavigationUrl;
+               global $wgUploadNavigationUrl;
 
                wfProfileIn( __METHOD__ );
 
@@ -875,7 +891,7 @@ class SkinTemplate extends Skin {
                $nav_urls['mainpage'] = array( 'href' => self::makeMainPageUrl() );
                if( $wgUploadNavigationUrl ) {
                        $nav_urls['upload'] = array( 'href' => $wgUploadNavigationUrl );
-               } elseif( $wgEnableUploads && $wgUser->isAllowed( 'upload' ) ) {
+               } elseif( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
                        $nav_urls['upload'] = array( 'href' => self::makeSpecialUrl( 'Upload' ) );
                } else {
                        $nav_urls['upload'] = false;
@@ -888,7 +904,7 @@ class SkinTemplate extends Skin {
                // A print stylesheet is attached to all pages, but nobody ever
                // figures that out. :)  Add a link...
                if( $this->iscontent && ( $action == 'view' || $action == 'purge' ) ) {
-                       if ( !$wgRequest->getBool( 'printable' ) ) {
+                       if ( !$wgOut->isPrintable() ) {
                                $nav_urls['print'] = array(
                                        'text' => wfMsg( 'printableversion' ),
                                        'href' => $wgRequest->appendQuery( 'printable=yes' )
@@ -928,8 +944,10 @@ class SkinTemplate extends Skin {
                }
 
                if( $this->mTitle->getNamespace() == NS_USER || $this->mTitle->getNamespace() == NS_USER_TALK ) {
-                       $id = User::idFromName( $this->mTitle->getText() );
-                       $ip = User::isIP( $this->mTitle->getText() );
+                       $parts = explode( '/', $this->mTitle->getText() );
+                       $rootUser = $parts[0];
+                       $id = User::idFromName( $rootUser );
+                       $ip = User::isIP( $rootUser );
                } else {
                        $id = 0;
                        $ip = false;
@@ -937,7 +955,7 @@ class SkinTemplate extends Skin {
 
                if( $id || $ip ) { # both anons and non-anons have contribs list
                        $nav_urls['contributions'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Contributions', $rootUser )
                        );
 
                        if( $id ) {
@@ -945,7 +963,7 @@ class SkinTemplate extends Skin {
                                $nav_urls['log'] = array(
                                        'href' => $logPage->getLocalUrl(
                                                array(
-                                                       'user' => $this->mTitle->getText()
+                                                       'user' => $rootUser
                                                )
                                        )
                                );
@@ -955,7 +973,7 @@ class SkinTemplate extends Skin {
 
                        if ( $wgUser->isAllowed( 'block' ) ) {
                                $nav_urls['blockip'] = array(
-                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $this->mTitle->getText() )
+                                       'href' => self::makeSpecialUrlSubpage( 'Blockip', $rootUser )
                                );
                        } else {
                                $nav_urls['blockip'] = false;
@@ -968,305 +986,13 @@ class SkinTemplate extends Skin {
                $nav_urls['emailuser'] = false;
                if( $this->showEmailUser( $id ) ) {
                        $nav_urls['emailuser'] = array(
-                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $this->mTitle->getText() )
+                               'href' => self::makeSpecialUrlSubpage( 'Emailuser', $rootUser )
                        );
                }
                wfProfileOut( __METHOD__ );
                return $nav_urls;
        }
 
-       /**
-        * Builds a structured array of links used for tabs and menus
-        * @return array
-        * @private
-        */
-       function buildNavigationUrls() {
-               global $wgContLang, $wgLang, $wgOut, $wgUser, $wgRequest, $wgArticle;
-               global $wgDisableLangConversion;
-
-               wfProfileIn( __METHOD__ );
-
-               $links = array(
-                       'namespaces' => array(),
-                       'views' => array(),
-                       'actions' => array(),
-                       'variants' => array()
-               );
-               
-               // Detects parameters
-               $action = $wgRequest->getVal( 'action', 'view' );
-               $section = $wgRequest->getVal( 'section' );
-
-               // Checks if page is some kind of content
-               if( $this->iscontent ) {
-
-                       // Gets page objects for the related namespaces
-                       $subjectPage = $this->mTitle->getSubjectPage();
-                       $talkPage = $this->mTitle->getTalkPage();
-
-                       // Determines if this is a talk page
-                       $isTalk = $this->mTitle->isTalkPage();
-
-                       // Generates XML IDs from namespace names
-                       $subjectId = $this->mTitle->getNamespaceKey( '' );
-                       
-                       if ( $subjectId == 'main' ) {
-                               $talkId = 'talk';
-                       } else {
-                               $talkId = "{$subjectId}_talk";
-                       }
-                       $currentId = $isTalk ? $talkId : $subjectId;
-                       
-                       // Adds namespace links
-                       $links['namespaces'][$subjectId] = $this->tabAction(
-                               $subjectPage, 'vector-namespace-' . $subjectId, !$isTalk, '', true
-                       );
-                       $links['namespaces'][$subjectId]['context'] = 'subject';
-                       $links['namespaces'][$talkId] = $this->tabAction(
-                               $talkPage, 'vector-namespace-talk', $isTalk, '', true
-                       );
-                       $links['namespaces'][$talkId]['context'] = 'talk';
-                       
-                       // Adds view view link
-                       if ( $this->mTitle->exists() ) {
-                               $links['views']['view'] = $this->tabAction(
-                                       $isTalk ? $talkPage : $subjectPage,
-                                               'vector-view-view', ( $action == 'view' ), '', true
-                               );
-                       }
-                       
-                       wfProfileIn( __METHOD__ . '-edit' );
-                       
-                       // Checks if user can...
-                       if (
-                               // edit the current page
-                               $this->mTitle->quickUserCan( 'edit' ) &&
-                               (
-                                       // if it exists
-                                       $this->mTitle->exists() ||
-                                       // or they can create one here
-                                       $this->mTitle->quickUserCan( 'create' )
-                               )
-                       ) {
-                               // Builds CSS class for talk page links
-                               $isTalkClass = $isTalk ? ' istalk' : '';
-
-                               // Determines if we're in edit mode
-                               $selected = (
-                                       ( $action == 'edit' || $action == 'submit' ) &&
-                                       ( $section != 'new' )
-                               );
-                               $links['views']['edit'] = array(
-                                       'class' => ( $selected ? 'selected' : '' ) . $isTalkClass,
-                                       'text' => $this->mTitle->exists()
-                                               ? wfMsg( 'vector-view-edit' )
-                                               : wfMsg( 'vector-view-create' ),
-                                       'href' =>
-                                               $this->mTitle->getLocalUrl( $this->editUrlOptions() )
-                               );
-                               // Checks if this is a current rev of talk page and we should show a new
-                               // section link
-                               if ( ( $isTalk && $wgArticle->isCurrent() ) || ( $wgOut->showNewSectionLink() ) ) {
-                                       // Checks if we should ever show a new section link
-                                       if ( !$wgOut->forceHideNewSectionLink() ) {
-                                               // Adds new section link
-                                               $links['actions']['addsection'] = array(
-                                                       'class' => $section == 'new' ? 'selected' : false,
-                                                       'text' => wfMsg( 'vector-action-addsection' ),
-                                                       'href' => $this->mTitle->getLocalUrl(
-                                                               'action=edit&section=new'
-                                                       )
-                                               );
-                                       }
-                               }
-                       // Checks if the page is known (some kind of viewable content)
-                       } elseif ( $this->mTitle->isKnown() ) {
-                               // Adds view source view link
-                               $links['views']['viewsource'] = array(
-                                       'class' => ( $action == 'edit' ) ? 'selected' : false,
-                                       'text' => wfMsg( 'vector-view-viewsource' ),
-                                       'href' =>
-                                               $this->mTitle->getLocalUrl( $this->editUrlOptions() )
-                               );
-                       }
-                       wfProfileOut( __METHOD__ . '-edit' );
-
-                       wfProfileIn( __METHOD__ . '-live' );
-
-                       // Checks if the page exists
-                       if ( $this->mTitle->exists() ) {
-                               // Adds history view link
-                               $links['views']['history'] = array(
-                                       'class' => ($action == 'history') ? 'selected' : false,
-                                       'text' => wfMsg( 'vector-view-history' ),
-                                       'href' => $this->mTitle->getLocalUrl( 'action=history' ),
-                                       'rel' => 'archives',
-                               );
-
-                               if( $wgUser->isAllowed( 'delete' ) ) {
-                                       $links['actions']['delete'] = array(
-                                               'class' => ($action == 'delete') ? 'selected' : false,
-                                               'text' => wfMsg( 'vector-action-delete' ),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=delete' )
-                                       );
-                               }
-                               if ( $this->mTitle->quickUserCan( 'move' ) ) {
-                                       $moveTitle = SpecialPage::getTitleFor(
-                                               'Movepage', $this->thispage
-                                       );
-                                       $links['actions']['move'] = array(
-                                               'class' => $this->mTitle->isSpecial( 'Movepage' ) ?
-                                                                               'selected' : false,
-                                               'text' => wfMsg( 'vector-action-move' ),
-                                               'href' => $moveTitle->getLocalUrl()
-                                       );
-                               }
-
-                               if (
-                                       $this->mTitle->getNamespace() !== NS_MEDIAWIKI &&
-                                       $wgUser->isAllowed( 'protect' )
-                               ) {
-                                       if ( !$this->mTitle->isProtected() ){
-                                               $links['actions']['protect'] = array(
-                                                       'class' => ($action == 'protect') ?
-                                                                                       'selected' : false,
-                                                       'text' => wfMsg( 'vector-action-protect' ),
-                                                       'href' =>
-                                                               $this->mTitle->getLocalUrl( 'action=protect' )
-                                               );
-
-                                       } else {
-                                               $links['actions']['unprotect'] = array(
-                                                       'class' => ($action == 'unprotect') ?
-                                                                                       'selected' : false,
-                                                       'text' => wfMsg( 'vector-action-unprotect' ),
-                                                       'href' =>
-                                                               $this->mTitle->getLocalUrl( 'action=unprotect' )
-                                               );
-                                       }
-                               }
-                       } else {
-                               // article doesn't exist or is deleted
-                               if (
-                                       $wgUser->isAllowed( 'deletedhistory' ) &&
-                                       $wgUser->isAllowed( 'undelete' )
-                               ) {
-                                       if( $n = $this->mTitle->isDeleted() ) {
-                                               $undelTitle = SpecialPage::getTitleFor( 'Undelete' );
-                                               $links['actions']['undelete'] = array(
-                                                       'class' => false,
-                                                       'text' => wfMsgExt(
-                                                               'vector-action-undelete',
-                                                               array( 'parsemag' ),
-                                                               $wgLang->formatNum( $n )
-                                                       ),
-                                                       'href' => $undelTitle->getLocalUrl(
-                                                               'target=' . urlencode( $this->thispage )
-                                                       )
-                                               );
-                                       }
-                               }
-
-                               if (
-                                       $this->mTitle->getNamespace() !== NS_MEDIAWIKI &&
-                                       $wgUser->isAllowed( 'protect' )
-                               ) {
-                                       if ( !$this->mTitle->getRestrictions( 'create' ) ) {
-                                               $links['actions']['protect'] = array(
-                                                       'class' => ($action == 'protect') ?
-                                                                                       'selected' : false,
-                                                       'text' => wfMsg( 'vector-action-protect' ),
-                                                       'href' =>
-                                                               $this->mTitle->getLocalUrl( 'action=protect' )
-                                               );
-
-                                       } else {
-                                               $links['actions']['unprotect'] = array(
-                                                       'class' => ($action == 'unprotect') ?
-                                                                                       'selected' : false,
-                                                       'text' => wfMsg( 'vector-action-unprotect' ),
-                                                       'href' =>
-                                                               $this->mTitle->getLocalUrl( 'action=unprotect' )
-                                               );
-                                       }
-                               }
-                       }
-                       wfProfileOut( __METHOD__ . '-live' );
-                       
-                       /**
-                        * The following actions use messages which, if made particular to
-                        * the Vector skin, would break the Ajax code which makes this
-                        * action happen entirely inline. Skin::makeGlobalVariablesScript
-                        * defines a set of messages in a javascript object - and these
-                        * messages are assumed to be global for all skins. Without making
-                        * a change to that procedure these messages will have to remain as
-                        * the global versions.
-                        */
-                       // Checks if the user is logged in
-                       if( $this->loggedin ) {
-                               // Checks if the user is watching this page
-                               if( !$this->mTitle->userIsWatching() ) {
-                                       // Adds watch action link
-                                       $links['actions']['watch'] = array(
-                                               'class' =>
-                                                       ( $action == 'watch' or $action == 'unwatch' ) ?
-                                                               'selected' : false,
-                                               'text' => wfMsg( 'watch' ),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=watch' )
-                                       );
-                               } else {
-                                       // Adds unwatch action link
-                                       $links['actions']['unwatch'] = array(
-                                               'class' =>
-                                                       ($action == 'unwatch' or $action == 'watch') ?
-                                                               'selected' : false,
-                                               'text' => wfMsg( 'unwatch' ),
-                                               'href' => $this->mTitle->getLocalUrl( 'action=unwatch' )
-                                       );
-                               }
-                       }
-                       
-                       // This is instead of SkinTemplateTabs - which uses a flat array
-                       wfRunHooks( 'SkinTemplateNavigation', array( &$this, &$links ) );
-               
-               // If it's not content, it's got to be a special page
-               } else {
-                       $links['namespaces']['special'] = array(
-                               'class' => 'selected',
-                               'text' => wfMsg( 'vector-namespace-special' ),
-                               'href' => $wgRequest->getRequestURL()
-                       );
-               }
-
-               // Gets list of language variants
-               $variants = $wgContLang->getVariants();
-               // Checks that language conversion is enabled and variants exist
-               if( !$wgDisableLangConversion && count( $variants ) > 1 ) {
-                       // Gets preferred variant
-                       $preferred = $wgContLang->getPreferredVariant();
-                       // Loops over each variant
-                       foreach( $variants as $code ) {
-                               // Gets variant name from language code
-                               $varname = $wgContLang->getVariantname( $code );
-                               // Checks if the variant is marked as disabled
-                               if( $varname == 'disable' ) {
-                                       // Skips this variant
-                                       continue;
-                               }
-                               // Appends variant link
-                               $links['variants'][] = array(
-                                       'class' => ( $code == $preferred ) ? 'selected' : false,
-                                       'text' => $varname,
-                                       'href' => $this->mTitle->getLocalURL( '', $code )
-                               );
-                       }
-               }
-
-               wfProfileOut( __METHOD__ );
-
-               return $links;
-       }
-       
        /**
         * Generate strings used for xml 'id' names
         * @return string
@@ -1281,7 +1007,6 @@ class SkinTemplate extends Skin {
         */
        function setupUserJs( $allowUserJs ) {
                global $wgRequest, $wgJsMimeType;
-
                wfProfileIn( __METHOD__ );
 
                $action = $wgRequest->getVal( 'action', 'view' );
@@ -1321,7 +1046,7 @@ class SkinTemplate extends Skin {
  * compatible with what we use of PHPTAL 0.7.
  * @ingroup Skins
  */
-class QuickTemplate {
+abstract class QuickTemplate {
        /**
         * Constructor
         */
@@ -1358,9 +1083,7 @@ class QuickTemplate {
         * Main function, used by classes that subclass QuickTemplate
         * to show the actual HTML output
         */
-       public function execute() {
-               echo 'Override this function.';
-       }
+       abstract public function execute();
 
        /**
         * @private