Avoid undefined variable error on null edits
[lhc/web/wiklou.git] / includes / Skin.php
index 1b60a94..a9aeccd 100644 (file)
@@ -11,7 +11,7 @@
  */
 if( defined( "MEDIAWIKI" ) ) {
 
-# See skin.doc
+# See skin.txt
 require_once( 'Linker.php' );
 require_once( 'Image.php' );
 
@@ -34,17 +34,6 @@ unset($matches);
 
 require_once( 'RecentChange.php' );
 
-global $wgLinkHolders;
-$wgLinkHolders = array(
-       'namespaces' => array(),
-       'dbkeys' => array(),
-       'queries' => array(),
-       'texts' => array(),
-       'titles' => array()
-);
-global $wgInterwikiLinkHolders;
-$wgInterwikiLinkHolders = array();
-
 /**
  * @todo document
  * @package MediaWiki
@@ -81,19 +70,18 @@ class Skin extends Linker {
        var $rcMoveIndex;
        /**#@-*/
 
-       function Skin() {
-               parent::Linker();
-       }
+       /** Constructor, call parent constructor */
+       function Skin() { parent::Linker(); }
 
        function getSkinNames() {
                global $wgValidSkinNames;
                return $wgValidSkinNames;
        }
 
-       function getStylesheet() {
-               return 'common/wikistandard.css';
-       }
+       /** @return string path to the skin stylesheet */
+       function getStylesheet() { return 'common/wikistandard.css?1'; }
 
+       /** @return string skin name */
        function getSkinName() {
                return 'standard';
        }
@@ -114,12 +102,14 @@ class Skin extends Linker {
                $out->addLink( array( 'rel' => 'shortcut icon', 'href' => '/favicon.ico' ) );
 
                $this->addMetadataLinks($out);
+               
+               $this->mRevisionId = $out->mRevisionId;
 
                wfProfileOut( $fname );
        }
 
        function addMetadataLinks( &$out ) {
-               global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf, $wgRdfMimeType, $action;
+               global $wgTitle, $wgEnableDublinCoreRdf, $wgEnableCreativeCommonsRdf;
                global $wgRightsPage, $wgRightsUrl;
 
                if( $out->isArticleRelated() ) {
@@ -159,6 +149,7 @@ class Skin extends Linker {
 
                wfProfileIn( 'Skin::outputPage' );
                $this->initPage( $out );
+
                $out->out( $out->headElement() );
 
                $out->out( "\n<body" );
@@ -171,6 +162,7 @@ class Skin extends Linker {
                        $out->out( "<!-- Wiki debugging output:\n" .
                          $out->mDebugtext . "-->\n" );
                }
+
                $out->out( $this->beforeContent() );
 
                $out->out( $out->mBodytext . "\n" );
@@ -184,31 +176,54 @@ class Skin extends Linker {
        }
 
        function getHeadScripts() {
-               global $wgStylePath, $wgUser, $wgContLang, $wgAllowUserJs;
-               $r = "<script type=\"text/javascript\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
-               if( $wgAllowUserJs && $wgUser->getID() != 0 ) { # logged in
-                       $userpage = $wgContLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
-                       $userjs = htmlspecialchars($this->makeUrl($userpage.'/'.$this->getSkinName().'.js', 'action=raw&ctype=text/javascript'));
-                       $r .= '<script type="text/javascript" src="'.$userjs."\"></script>\n";
+               global $wgStylePath, $wgUser, $wgAllowUserJs, $wgJsMimeType;
+               $r = "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js\"></script>\n";
+               if( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
+                       $userpage = $wgUser->getUserPage();
+                       $userjs = htmlspecialchars( $this->makeUrl(
+                               $userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
+                               'action=raw&ctype='.$wgJsMimeType));
+                       $r .= '<script type="'.$wgJsMimeType.'" src="'.$userjs."\"></script>\n";
                }
                return $r;
        }
 
+       /**
+        * To make it harder for someone to slip a user a fake
+        * user-JavaScript or user-CSS preview, a random token
+        * is associated with the login session. If it's not
+        * passed back with the preview request, we won't render
+        * the code.
+        *
+        * @param string $action
+        * @return bool
+        * @access private
+        */
+       function userCanPreview( $action ) {
+               global $wgTitle, $wgRequest, $wgUser;
+
+               if( $action != 'submit' )
+                       return false;
+               if( !$wgRequest->wasPosted() )
+                       return false;
+               if( !$wgTitle->userCanEditCssJsSubpage() )
+                       return false;
+               return $wgUser->matchEditToken(
+                       $wgRequest->getVal( 'wpEditToken' ) );
+       }
+
        # get the user/site-specific stylesheet, SkinPHPTal called from RawPage.php (settings are cached that way)
        function getUserStylesheet() {
-               global $wgOut, $wgStylePath, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
+               global $wgOut, $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage;
                $sheet = $this->getStylesheet();
                $action = $wgRequest->getText('action');
                $s = "@import \"$wgStylePath/$sheet\";\n";
                if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css\";\n";
-               if( $wgAllowUserCss && $wgUser->getID() != 0 ) { # logged in
-                       if($wgTitle->isCssSubpage() and $action == 'submit' and  $wgTitle->userCanEditCssJsSubpage()) {
-                               $s .= $wgRequest->getText('wpTextbox1');
-                       } else {
-                               $userpage = $wgContLang->getNsText( Namespace::getUser() ) . ":" . $wgUser->getName();
-                               $s.= '@import "'.$this->makeUrl($userpage.'/'.$this->getSkinName().'.css', 'action=raw&ctype=text/css').'";'."\n";
-                       }
-               }
+
+               $query = "action=raw&ctype=text/css&smaxage=$wgSquidMaxage";
+               $s .= '@import "' . $this->makeNSUrl( 'Common.css', $query, NS_MEDIAWIKI ) . "\";\n" .
+                       '@import "'.$this->makeNSUrl( ucfirst( $this->getSkinName() . '.css' ), $query, NS_MEDIAWIKI ) . "\";\n";
+
                $s .= $this->doGetUserStyles();
                return $s."\n";
        }
@@ -222,7 +237,7 @@ class Skin extends Linker {
         * Return html code that include User stylesheets
         */
        function getUserStyles() {
-               global $wgOut, $wgStylePath, $wgLang;
+               global $wgOut, $wgStylePath;
                $s = "<style type='text/css'>\n";
                $s .= "/*/*/ /*<![CDATA[*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
                $s .= $this->getUserStylesheet();
@@ -235,29 +250,66 @@ class Skin extends Linker {
         * Some styles that are set by user through the user settings interface.
         */
        function doGetUserStyles() {
-               global $wgUser, $wgContLang;
+               global $wgUser, $wgContLang, $wgUser, $wgRequest, $wgTitle, $wgAllowUserCss;
+
+               $s = '';
+               
+               if( $wgAllowUserCss && $wgUser->isLoggedIn() ) { # logged in
+                       if($wgTitle->isCssSubpage() && $this->userCanPreview( $action ) ) {
+                               $s .= $wgRequest->getText('wpTextbox1');
+                       } else {
+                               $userpage = $wgUser->getUserPage();
+                               $s.= '@import "'.$this->makeUrl(
+                                       $userpage->getPrefixedText().'/'.$this->getSkinName().'.css',
+                                       'action=raw&ctype=text/css').'";'."\n";
+                       }
+               }
 
-               $csspage = $wgContLang->getNsText( NS_MEDIAWIKI ) . ':' . $this->getSkinName() . '.css';
-               $s = '@import "'.$this->makeUrl($csspage, 'action=raw&ctype=text/css')."\";\n";
+               return $s . $this->reallyDoGetUserStyles();
+       }
 
-               if ( 1 == $wgUser->getOption( 'underline' ) ) {
-                       # Don't override browser settings
-               } else {
-                       # CHECK MERGE @@@
-                       # Force no underline
-                       $s .= "a { text-decoration: none; }\n";
+       function reallyDoGetUserStyles() {
+               global $wgUser;
+               $s = '';
+               if (($undopt = $wgUser->getOption("underline")) != 2) {
+                       $underline = $undopt ? 'underline' : 'none';
+                       $s .= "a { text-decoration: $underline; }\n";
                }
-               if ( 1 == $this->mOptions['highlightbroken'] ) {
+               if( $wgUser->getOption( 'highlightbroken' ) ) {
                        $s .= "a.new, #quickbar a.new { color: #CC2200; }\n";
+               } else {
+                       $s .= <<<END
+a.new, #quickbar a.new,
+a.stub, #quickbar a.stub {
+       color: inherit;
+       text-decoration: inherit;
+}
+a.new:after, #quickbar a.new:after {
+       content: "?";
+       color: #CC2200;
+       text-decoration: $underline;
+}
+a.stub:after, #quickbar a.stub:after {
+       content: "!";
+       color: #772233;
+       text-decoration: $underline;
+}
+END;
+               }
+               if( $wgUser->getOption( 'justify' ) ) {
+                       $s .= "#article, #bodyContent { text-align: justify; }\n";
                }
-               if ( 1 == $wgUser->getOption( 'justify' ) ) {
-                       $s .= "#article { text-align: justify; }\n";
+               if( !$wgUser->getOption( 'showtoc' ) ) {
+                       $s .= "#toc { display: none; }\n";
+               }
+               if( !$wgUser->getOption( 'editsection' ) ) {
+                       $s .= ".editsection { display: none; }\n";
                }
                return $s;
        }
 
        function getBodyOptions() {
-               global $wgUser, $wgTitle, $wgNamespaceBackgrounds, $wgOut, $wgRequest;
+               global $wgUser, $wgTitle, $wgOut, $wgRequest;
 
                extract( $wgRequest->getValues( 'oldid', 'redirect', 'diff' ) );
 
@@ -266,21 +318,20 @@ class Skin extends Linker {
                }
                else $a = array( 'bgcolor' => '#FFFFFF' );
                if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
-                 (!$wgTitle->isProtected() || $wgUser->isAllowed('protect')) ) {
+                 $wgTitle->userCanEdit() ) {
                        $t = wfMsg( 'editthispage' );
-                       $oid = $red = '';
-                       if ( !empty($redirect) && $redirect == 'no' ) {
-                               $red = "&redirect={$redirect}";
-                       }
-                       if ( !empty($oldid) && ! isset( $diff ) ) {
-                               $oid = "&oldid=" . IntVal( $oldid );
-                       }
-                       $s = $wgTitle->getFullURL( "action=edit{$oid}{$red}" );
-                       $s = 'document.location = "' .$s .'";';
+                       $s = $wgTitle->getFullURL( $this->editUrlOptions() );
+                       $s = 'document.location = "' .wfEscapeJSString( $s ) .'";';
                        $a += array ('ondblclick' => $s);
 
                }
                $a['onload'] = $wgOut->getOnloadHandler();
+               if( $wgUser->getOption( 'editsectiononrightclick' ) ) {
+                       if( $a['onload'] != '' ) {
+                               $a['onload'] .= ';';
+                       }
+                       $a['onload'] .= 'setupRightClickEdit()';
+               }
                return $a;
        }
 
@@ -297,13 +348,11 @@ class Skin extends Linker {
         * two functions to make it easier to subclass.
         */
        function beforeContent() {
-               global $wgUser, $wgOut;
-
                return $this->doBeforeContent();
        }
 
        function doBeforeContent() {
-               global $wgUser, $wgOut, $wgTitle, $wgContLang, $wgSiteNotice;
+               global $wgOut, $wgTitle, $wgContLang;
                $fname = 'Skin::doBeforeContent';
                wfProfileIn( $fname );
 
@@ -353,8 +402,9 @@ class Skin extends Linker {
                $s .= "</tr>\n</table>\n</div>\n";
                $s .= "\n<div id='article'>\n";
 
-               if( $wgSiteNotice ) {
-                       $s .= "\n<div id='siteNotice'>$wgSiteNotice</div>\n";
+               $notice = wfGetSiteNotice();
+               if( $notice ) {
+                       $s .= "\n<div id='siteNotice'>$notice</div>\n";
                }
                $s .= $this->pageTitle();
                $s .= $this->pageSubtitle() ;
@@ -363,57 +413,68 @@ class Skin extends Linker {
                return $s;
        }
 
-       
+
        function getCategoryLinks () {
-               global $wgOut, $wgTitle, $wgUser, $wgParser;
-               global $wgUseCategoryMagic, $wgUseCategoryBrowser, $wgLang;
+               global $wgOut, $wgTitle, $wgUseCategoryMagic, $wgUseCategoryBrowser;
+               global $wgContLang;
 
                if( !$wgUseCategoryMagic ) return '' ;
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
 
-               # Taken out so that they will be displayed in previews -- TS
-               #if( !$wgOut->isArticle() ) return '';
-
-               $t = implode ( ' | ' , $wgOut->mCategoryLinks ) ;
-               $s = $this->makeKnownLink( 'Special:Categories',
-                       wfMsg( 'categories' ), 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
+               // Use Unicode bidi embedding override characters,
+               // to make sure links don't smash each other up in ugly ways.
+               $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
+               $embed = "<span dir='$dir'>";
+               $pop = '</span>';
+               $t = $embed . implode ( "$pop | $embed" , $wgOut->mCategoryLinks ) . $pop;
+               
+               $msg = count( $wgOut->mCategoryLinks ) === 1 ? 'categories1' : 'categories';
+               $s = $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Categories' ),
+                       wfMsg( $msg ), 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
                        . ': ' . $t;
 
                # optional 'dmoz-like' category browser. Will be shown under the list
                # of categories an article belong to
                if($wgUseCategoryBrowser) {
-                       $s .= '<br/><hr/>';
+                       $s .= '<br /><hr />';
 
                        # get a big array of the parents tree
                        $parenttree = $wgTitle->getParentCategoryTree();
-
-                       # Render the array as a serie of links
-                       function walkThrough ($tree) {
-                               global $wgUser;
-                               $sk = $wgUser->getSkin();
-                               $return = '';
-                               foreach($tree as $element => $parent) {
-                                       if(empty($parent)) {
-                                               # element start a new list
-                                               $return .= '<br />';
-                                       } else {
-                                               # grab the others elements
-                                               $return .= walkThrough($parent);
-                                       }
-                                       # add our current element to the list
-                                       $eltitle = Title::NewFromText($element);
-                                       # FIXME : should be makeLink() [AV]
-                                       $return .= $sk->makeLink($element, $eltitle->getText()).' &gt; ';
-                               }
-                               return $return;
-                       }
-
-                       $s .= walkThrough($parenttree);
+                       # Skin object passed by reference cause it can not be
+                       # accessed under the method subfunction drawCategoryBrowser
+                       $tempout = explode("\n", Skin::drawCategoryBrowser($parenttree, $this) );
+                       # Clean out bogus first entry and sort them
+                       unset($tempout[0]);
+                       asort($tempout);
+                       # Output one per line
+                       $s .= implode("<br />\n", $tempout);
                }
 
                return $s;
        }
 
+       /** Render the array as a serie of links.
+        * @param array $tree Categories tree returned by Title::getParentCategoryTree
+        * @param object &skin Skin passed by reference
+        * @return string separated by &gt;, terminate with "\n"
+        */
+       function drawCategoryBrowser($tree, &$skin) {
+               $return = '';
+               foreach ($tree as $element => $parent) {
+                       if (empty($parent)) {
+                               # element start a new list
+                               $return .= "\n";
+                       } else {
+                               # grab the others elements
+                               $return .= Skin::drawCategoryBrowser($parent, $skin) . ' &gt; ';
+                       }
+                       # add our current element to the list
+                       $eltitle = Title::NewFromText($element);
+                       $return .=  $skin->makeLinkObj( $eltitle, $eltitle->getText() ) ;
+               }
+               return $return;
+       }
+
        function getCategories() {
                $catlinks=$this->getCategoryLinks();
                if(!empty($catlinks)) {
@@ -425,20 +486,20 @@ class Skin extends Linker {
                return "<td width='152' rowspan='{$rows}'>&nbsp;</td>";
        }
 
-       # This gets called immediately before the </body> tag.
-       #
+       /**
+        * This gets called immediately before the </body> tag.
+        * @return string HTML to be put after </body> ???
+        */
        function afterContent() {
-               global $wgUser, $wgOut, $wgServer;
-               global $wgTitle, $wgLang;
-
                $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
                return $printfooter . $this->doAfterContent();
        }
 
+       /** @return string Retrievied from HTML text */
        function printSource() {
                global $wgTitle;
                $url = htmlspecialchars( $wgTitle->getFullURL() );
-               return wfMsg( "retrievedfrom", "<a href=\"$url\">$url</a>" );
+               return wfMsg( 'retrievedfrom', '<a href="'.$url.'">'.$url.'</a>' );
        }
 
        function printFooter() {
@@ -446,12 +507,11 @@ class Skin extends Linker {
                        "</p>\n\n<p>" . $this->pageStats() . "</p>\n";
        }
 
-       function doAfterContent() {
-       # overloaded by derived classes
-       }
+       /** overloaded by derived classes */
+       function doAfterContent() { }
 
        function pageTitleLinks() {
-               global $wgOut, $wgTitle, $wgUser, $wgContLang, $wgUseApproval, $wgRequest;
+               global $wgOut, $wgTitle, $wgUser, $wgContLang, $wgRequest;
 
                extract( $wgRequest->getValues( 'oldid', 'diff' ) );
                $action = $wgRequest->getText( 'action' );
@@ -461,30 +521,24 @@ class Skin extends Linker {
                if( $disclaimer ) {
                        $s .= ' | ' . $disclaimer;
                }
+               $privacy = $this->privacyLink(); # may be empty too
+               if( $privacy ) {
+                       $s .= ' | ' . $privacy;
+               }
 
                if ( $wgOut->isArticleRelated() ) {
-                       if ( $wgTitle->getNamespace() == Namespace::getImage() ) {
+                       if ( $wgTitle->getNamespace() == NS_IMAGE ) {
                                $name = $wgTitle->getDBkey();
-                               $image = new Image( $wgTitle->getDBkey() );
+                               $image = new Image( $wgTitle );
                                if( $image->exists() ) {
                                        $link = htmlspecialchars( $image->getURL() );
                                        $style = $this->getInternalLinkAttributes( $link, $name );
                                        $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
                                }
                        }
-                       # This will show the "Approve" link if $wgUseApproval=true;
-                       if ( isset ( $wgUseApproval ) && $wgUseApproval )
-                       {
-                               $t = $wgTitle->getDBkey();
-                               $name = 'Approve this article' ;
-                               $link = "http://test.wikipedia.org/w/magnus/wiki.phtml?title={$t}&action=submit&doit=1" ;
-                               #htmlspecialchars( wfImageUrl( $name ) );
-                               $style = $this->getExternalLinkAttributes( $link, $name );
-                               $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>" ;
-                       }
                }
                if ( 'history' == $action || isset( $diff ) || isset( $oldid ) ) {
-                       $s .= ' | ' . $this->makeKnownLink( $wgTitle->getPrefixedText(),
+                       $s .= ' | ' . $this->makeKnownLinkObj( $wgTitle,
                                        wfMsg( 'currentrev' ) );
                }
 
@@ -492,11 +546,8 @@ class Skin extends Linker {
                # do not show "You have new messages" text when we are viewing our
                # own talk page
 
-                       if(!(strcmp($wgTitle->getText(),$wgUser->getName()) == 0 &&
-                                               $wgTitle->getNamespace()==Namespace::getTalk(Namespace::getUser()))) {
-                               $n =$wgUser->getName();
-                               $tl = $this->makeKnownLink( $wgContLang->getNsText(
-                                                       Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
+                       if( !$wgTitle->equals( $wgUser->getTalkPage() ) ) {
+                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
                                                wfMsg('newmessageslink') );
                                $s.= ' | <strong>'. wfMsg( 'newmessages', $tl ) . '</strong>';
                                # disable caching
@@ -514,13 +565,18 @@ class Skin extends Linker {
 
        function getUndeleteLink() {
                global $wgUser, $wgTitle, $wgContLang, $action;
-               if( $wgUser->isAllowed('rollback') &&
-                       (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
-                       ($n = $wgTitle->isDeleted() ) ) {
-                       return wfMsg( 'thisisdeleted',
+               if(     (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
+                       ($n = $wgTitle->isDeleted() ) ) 
+               {
+                       if ( $wgUser->isAllowed( 'delete' ) ) {
+                               $msg = 'thisisdeleted';
+                       } else {
+                               $msg = 'viewdeleted';
+                       }
+                       return wfMsg( $msg,
                                $this->makeKnownLink(
                                        $wgContLang->SpecialPage( 'Undelete/' . $wgTitle->getPrefixedDBkey() ),
-                                       wfMsg( 'restorelink', $n ) ) );
+                                       wfMsg( 'restorelink' . ($n == 1 ? '1' : ''), $n ) ) );
                }
                return '';
        }
@@ -551,7 +607,6 @@ class Skin extends Linker {
                global $wgOut, $wgTitle, $wgUser;
 
                $s = '<h1 class="pagetitle">' . htmlspecialchars( $wgOut->getPageTitle() ) . '</h1>';
-               if($wgUser->getOption( 'editsectiononrightclick' ) && $wgTitle->userCanEdit()) { $s=$this->editSectionScript($wgTitle, 0,$s);}
                return $s;
        }
 
@@ -599,19 +654,18 @@ class Skin extends Linker {
        }
 
        function nameAndLogin() {
-               global $wgUser, $wgTitle, $wgLang, $wgContLang, $wgShowIPinHeader, $wgIP;
+               global $wgUser, $wgTitle, $wgLang, $wgContLang, $wgShowIPinHeader;
 
                $li = $wgContLang->specialPage( 'Userlogin' );
                $lo = $wgContLang->specialPage( 'Userlogout' );
 
                $s = '';
-               if ( 0 == $wgUser->getID() ) {
-                       if( $wgShowIPinHeader && isset(  $_COOKIE[ini_get('session.name')] ) ) {
-                               $n = $wgIP;
+               if ( $wgUser->isAnon() ) {
+                       if( $wgShowIPinHeader && isset( $_COOKIE[ini_get('session.name')] ) ) {
+                               $n = wfGetIP();
 
-                               $tl = $this->makeKnownLink( $wgContLang->getNsText(
-                                 Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
-                                 $wgContLang->getNsText( Namespace::getTalk( 0 ) ) );
+                               $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
+                                 $wgLang->getNsText( NS_TALK ) );
 
                                $s .= $n . ' ('.$tl.')';
                        } else {
@@ -623,20 +677,20 @@ class Skin extends Linker {
                                $q = '';
                        } else { $q = "returnto={$rt}"; }
 
-                       $s .= "\n<br />" . $this->makeKnownLink( $li,
-                         wfMsg( 'login' ), $q );
+                       $s .= "\n<br />" . $this->makeKnownLinkObj(
+                               Title::makeTitle( NS_SPECIAL, 'Userlogin' ),
+                               wfMsg( 'login' ), $q );
                } else {
                        $n = $wgUser->getName();
                        $rt = $wgTitle->getPrefixedURL();
-                       $tl = $this->makeKnownLink( $wgContLang->getNsText(
-                         Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}",
-                         $wgContLang->getNsText( Namespace::getTalk( 0 ) ) );
+                       $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
+                         $wgLang->getNsText( NS_TALK ) );
 
                        $tl = " ({$tl})";
 
-                       $s .= $this->makeKnownLink( $wgContLang->getNsText(
-                         Namespace::getUser() ) . ":{$n}", $n ) . "{$tl}<br />" .
-                         $this->makeKnownLink( $lo, wfMsg( 'logout' ),
+                       $s .= $this->makeKnownLinkObj( $wgUser->getUserPage(),
+                         $n ) . "{$tl}<br />" .
+                         $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Userlogout' ), wfMsg( 'logout' ),
                          "returnto={$rt}" ) . ' | ' .
                          $this->specialLink( 'preferences' );
                }
@@ -695,19 +749,17 @@ class Skin extends Linker {
                        }
                }
 
-
-
                return $s;
        }
 
        function bottomLinks() {
-               global $wgOut, $wgUser, $wgTitle;
+               global $wgOut, $wgUser, $wgTitle, $wgUseTrackbacks;
                $sep = " |\n";
 
                $s = '';
                if ( $wgOut->isArticleRelated() ) {
                        $s .= '<strong>' . $this->editThisPage() . '</strong>';
-                       if ( 0 != $wgUser->getID() ) {
+                       if ( $wgUser->isLoggedIn() ) {
                                $s .= $sep . $this->watchThisPage();
                        }
                        $s .= $sep . $this->talkLink()
@@ -715,8 +767,11 @@ class Skin extends Linker {
                          . $sep . $this->whatLinksHere()
                          . $sep . $this->watchPageLinksLink();
 
-                       if ( $wgTitle->getNamespace() == Namespace::getUser()
-                           || $wgTitle->getNamespace() == Namespace::getTalk(Namespace::getUser()) )
+                       if ($wgUseTrackbacks)
+                               $s .= $sep . $this->trackbackLink();
+
+                       if ( $wgTitle->getNamespace() == NS_USER
+                           || $wgTitle->getNamespace() == NS_USER_TALK )
 
                        {
                                $id=User::idFromName($wgTitle->getText());
@@ -758,7 +813,7 @@ class Skin extends Linker {
                }
 
                if (isset($wgMaxCredits) && $wgMaxCredits != 0) {
-                   require_once("Credits.php");
+                   require_once('Credits.php');
                    $s .= ' ' . getCredits($wgArticle, $wgMaxCredits, $wgShowCreditsIfMax);
                } else {
                    $s .= $this->lastModified();
@@ -836,7 +891,7 @@ class Skin extends Linker {
 
                $timestamp = $wgArticle->getTimestamp();
                if ( $timestamp ) {
-                       $d = $wgLang->timeanddate( $wgArticle->getTimestamp(), true );
+                       $d = $wgLang->timeanddate( $timestamp, true );
                        $s = ' ' . wfMsg( 'lastmodified', $d );
                } else {
                        $s = '';
@@ -869,26 +924,29 @@ class Skin extends Linker {
         * @TODO crash bug913. Need to be rewrote completly.
         */
        function specialPagesList() {
-               global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript;
+               global $wgUser, $wgOut, $wgContLang, $wgServer, $wgRedirectScript, $wgAvailableRights;
                require_once('SpecialPage.php');
                $a = array();
                $pages = SpecialPage::getPages();
 
+               // special pages without access restriction
                foreach ( $pages[''] as $name => $page ) {
                        $a[$name] = $page->getDescription();
                }
-               if ( $wgUser->isSysop() )
-               {
-                       foreach ( $pages['sysop'] as $name => $page ) {
-                               $a[$name] = $page->getDescription();
-                       }
-               }
-               if ( $wgUser->isDeveloper() )
-               {
-                       foreach ( $pages['developer'] as $name => $page ) {
-                               $a[$name] = $page->getDescription() ;
+
+               // Other special pages that are restricted.
+               // Copied from SpecialSpecialpages.php
+               foreach($wgAvailableRights as $right) {
+                       if( $wgUser->isAllowed($right) ) {
+                               /** Add all pages for this right */
+                               if(isset($pages[$right])) {
+                                       foreach($pages[$right] as $name => $page) {
+                                       $a[$name] = $page->getDescription();
+                                       }
+                               }
                        }
                }
+
                $go = wfMsg( 'go' );
                $sp = wfMsg( 'specialpages' );
                $spp = $wgContLang->specialPage( 'Specialpages' );
@@ -898,6 +956,7 @@ class Skin extends Linker {
                $s .= "<select name=\"wpDropdown\">\n";
                $s .= "<option value=\"{$spp}\">{$sp}</option>\n";
 
+
                foreach ( $a as $name => $desc ) {
                        $p = $wgContLang->specialPage( $name );
                        $s .= "<option value=\"{$p}\">{$desc}</option>\n";
@@ -921,17 +980,25 @@ class Skin extends Linker {
                return $s;
        }
 
+       function privacyLink() {
+               $privacy = wfMsg( 'privacy' );
+               if ($privacy == '-') {
+                       return '';
+               } else {
+                       return $this->makeKnownLink( wfMsgForContent( 'privacypage' ), $privacy);
+               }
+       }
+
        function aboutLink() {
                $s = $this->makeKnownLink( wfMsgForContent( 'aboutpage' ),
                  wfMsg( 'aboutsite' ) );
                return $s;
        }
 
-
        function disclaimerLink() {
                $disclaimers = wfMsg( 'disclaimers' );
                if ($disclaimers == '-') {
-                       return "";
+                       return '';
                } else {
                        return $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
                                                     $disclaimers );
@@ -941,40 +1008,45 @@ class Skin extends Linker {
        function editThisPage() {
                global $wgOut, $wgTitle, $wgRequest;
 
-               $oldid = $wgRequest->getVal( 'oldid' );
-               $diff = $wgRequest->getVal( 'diff' );
-               $redirect = $wgRequest->getVal( 'redirect' );
-
                if ( ! $wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
                } else {
-                       $n = $wgTitle->getPrefixedText();
                        if ( $wgTitle->userCanEdit() ) {
                                $t = wfMsg( 'editthispage' );
                        } else {
-                               #$t = wfMsg( "protectedpage" );
                                $t = wfMsg( 'viewsource' );
                        }
-                       $oid = $red = '';
 
-                       if ( !is_null( $redirect ) ) { $red = "&redirect={$redirect}"; }
-                       if ( $oldid && ! isset( $diff ) ) {
-                               $oid = '&oldid='.$oldid;
-                       }
-                       $s = $this->makeKnownLink( $n, $t, "action=edit{$oid}{$red}" );
+                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $this->editUrlOptions() );
                }
                return $s;
        }
+       
+       /**
+        * Return URL options for the 'edit page' link.
+        * This may include an 'oldid' specifier, if the current page view is such.
+        *
+        * @return string
+        * @access private
+        */
+       function editUrlOptions() {
+               global $wgArticle;
+               
+               if( $this->mRevisionId && ! $wgArticle->isCurrent() ) {
+                       return "action=edit&oldid=" . intval( $this->mRevisionId );
+               } else {
+                       return "action=edit";
+               }
+       }
 
        function deleteThisPage() {
                global $wgUser, $wgOut, $wgTitle, $wgRequest;
 
                $diff = $wgRequest->getVal( 'diff' );
                if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('delete') ) {
-                       $n = $wgTitle->getPrefixedText();
                        $t = wfMsg( 'deletethispage' );
 
-                       $s = $this->makeKnownLink( $n, $t, 'action=delete' );
+                       $s = $this->makeKnownLinkObj( $wgTitle, $t, 'action=delete' );
                } else {
                        $s = '';
                }
@@ -986,8 +1058,6 @@ class Skin extends Linker {
 
                $diff = $wgRequest->getVal( 'diff' );
                if ( $wgTitle->getArticleId() && ( ! $diff ) && $wgUser->isAllowed('protect') ) {
-                       $n = $wgTitle->getPrefixedText();
-
                        if ( $wgTitle->isProtected() ) {
                                $t = wfMsg( 'unprotectthispage' );
                                $q = 'action=unprotect';
@@ -995,7 +1065,7 @@ class Skin extends Linker {
                                $t = wfMsg( 'protectthispage' );
                                $q = 'action=protect';
                        }
-                       $s = $this->makeKnownLink( $n, $t, $q );
+                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
                } else {
                        $s = '';
                }
@@ -1006,8 +1076,6 @@ class Skin extends Linker {
                global $wgUser, $wgOut, $wgTitle;
 
                if ( $wgOut->isArticleRelated() ) {
-                       $n = $wgTitle->getPrefixedText();
-
                        if ( $wgTitle->userIsWatching() ) {
                                $t = wfMsg( 'unwatchthispage' );
                                $q = 'action=unwatch';
@@ -1015,7 +1083,7 @@ class Skin extends Linker {
                                $t = wfMsg( 'watchthispage' );
                                $q = 'action=watch';
                        }
-                       $s = $this->makeKnownLink( $n, $t, $q );
+                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
                } else {
                        $s = wfMsg( 'notanarticle' );
                }
@@ -1023,10 +1091,10 @@ class Skin extends Linker {
        }
 
        function moveThisPage() {
-               global $wgTitle, $wgContLang;
+               global $wgTitle;
 
                if ( $wgTitle->userCanMove() ) {
-                       return $this->makeKnownLink( $wgContLang->specialPage( 'Movepage' ),
+                       return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Movepage' ),
                          wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
                } else {
                        // no message if page is protected - would be redundant
@@ -1037,82 +1105,72 @@ class Skin extends Linker {
        function historyLink() {
                global $wgTitle;
 
-               $s = $this->makeKnownLink( $wgTitle->getPrefixedText(),
+               return $this->makeKnownLinkObj( $wgTitle,
                  wfMsg( 'history' ), 'action=history' );
-               return $s;
        }
 
        function whatLinksHere() {
-               global $wgTitle, $wgContLang;
+               global $wgTitle;
 
-               $s = $this->makeKnownLink( $wgContLang->specialPage( 'Whatlinkshere' ),
+               return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' ),
                  wfMsg( 'whatlinkshere' ), 'target=' . $wgTitle->getPrefixedURL() );
-               return $s;
        }
 
        function userContribsLink() {
-               global $wgTitle, $wgContLang;
+               global $wgTitle;
 
-               $s = $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
+               return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Contributions' ),
                  wfMsg( 'contributions' ), 'target=' . $wgTitle->getPartialURL() );
-               return $s;
        }
 
        function showEmailUser( $id ) {
                global $wgEnableEmail, $wgEnableUserEmail, $wgUser;
                return $wgEnableEmail &&
                       $wgEnableUserEmail &&
-                      0 != $wgUser->getID() && # show only to signed in users
+                      $wgUser->isLoggedIn() && # show only to signed in users
                       0 != $id; # we can only email to non-anons ..
 #                     '' != $id->getEmail() && # who must have an email address stored ..
 #                     0 != $id->getEmailauthenticationtimestamp() && # .. which is authenticated
 #                     1 != $wgUser->getOption('disablemail'); # and not disabled
        }
-       
+
        function emailUserLink() {
-               global $wgTitle, $wgContLang;
+               global $wgTitle;
 
-               $s = $this->makeKnownLink( $wgContLang->specialPage( 'Emailuser' ),
+               return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL, 'Emailuser' ),
                  wfMsg( 'emailuser' ), 'target=' . $wgTitle->getPartialURL() );
-               return $s;
        }
 
        function watchPageLinksLink() {
-               global $wgOut, $wgTitle, $wgContLang;
+               global $wgOut, $wgTitle;
 
                if ( ! $wgOut->isArticleRelated() ) {
-                       $s = '(' . wfMsg( 'notanarticle' ) . ')';
+                       return '(' . wfMsg( 'notanarticle' ) . ')';
                } else {
-                       $s = $this->makeKnownLink( $wgContLang->specialPage(
+                       return $this->makeKnownLinkObj( Title::makeTitle( NS_SPECIAL,
                          'Recentchangeslinked' ), wfMsg( 'recentchangeslinked' ),
                          'target=' . $wgTitle->getPrefixedURL() );
                }
-               return $s;
+       }
+
+       function trackbackLink() {
+               global $wgTitle;
+
+               return "<a href=\"" . $wgTitle->trackbackURL() . "\">"
+                       . wfMsg('trackbacklink') . "</a>";
        }
 
        function otherLanguages() {
-               global $wgOut, $wgContLang, $wgTitle, $wgUseNewInterlanguage;
+               global $wgOut, $wgContLang, $wgTitle, $wgHideInterlanguageLinks;
+
+               if ( $wgHideInterlanguageLinks ) {
+                       return '';
+               }
 
                $a = $wgOut->getLanguageLinks();
                if ( 0 == count( $a ) ) {
-                       if ( !$wgUseNewInterlanguage ) return '';
-                       $ns = $wgContLang->getNsIndex ( $wgTitle->getNamespace () ) ;
-                       if ( $ns != NS_MAIN AND $ns != NS_TALK ) return '' ;
-                       $pn = 'Intl' ;
-                       $x = 'mode=addlink&xt='.$wgTitle->getDBkey() ;
-                       return $this->makeKnownLink( $wgContLang->specialPage( $pn ),
-                                 wfMsg( 'intl' ) , $x );
-                       }
-
-               if ( !$wgUseNewInterlanguage ) {
-                       $s = wfMsg( 'otherlanguages' ) . ': ';
-               } else {
-                       global $wgContLanguageCode ;
-                       $x = 'mode=zoom&xt='.$wgTitle->getDBkey() ;
-                       $x .= '&xl='.$wgContLanguageCode ;
-                       $s =  $this->makeKnownLink( $wgContLang->specialPage( 'Intl' ),
-                                 wfMsg( 'otherlanguages' ) , $x ) . ': ' ;
-                       }
+                       return '';
+               }
 
                $s = wfMsg( 'otherlanguages' ) . ': ';
                $first = true;
@@ -1122,7 +1180,7 @@ class Skin extends Linker {
                        $first = false;
 
                        $nt = Title::newFromText( $l );
-                       $url = $nt->getFullURL();
+                       $url = $nt->escapeFullURL();
                        $text = $wgContLang->getLanguageName( $nt->getInterwiki() );
 
                        if ( '' == $text ) { $text = $l; }
@@ -1168,42 +1226,38 @@ class Skin extends Linker {
        }
 
        function talkLink() {
-               global $wgContLang, $wgTitle, $wgLinkCache;
+               global $wgTitle, $wgLinkCache;
 
-               $tns = $wgTitle->getNamespace();
-               if ( -1 == $tns ) { return ''; }
+               if ( NS_SPECIAL == $wgTitle->getNamespace() ) {
+                       # No discussion links for special pages
+                       return '';
+               }
 
-               $pn = $wgTitle->getText();
-               $tp = wfMsg( 'talkpage' );
-               if ( Namespace::isTalk( $tns ) ) {
-                       $lns = Namespace::getSubject( $tns );
-                       switch($tns) {
-                               case 1:
+               if( $wgTitle->isTalkPage() ) {
+                       $link = $wgTitle->getSubjectPage();
+                       switch( $link->getNamespace() ) {
+                       case NS_MAIN:
                                $text = wfMsg('articlepage');
                                break;
-                               case 3:
+                       case NS_USER:
                                $text = wfMsg('userpage');
                                break;
-                               case 5:
+                       case NS_PROJECT:
                                $text = wfMsg('wikipediapage');
                                break;
-                               case 7:
+                       case NS_IMAGE:
                                $text = wfMsg('imagepage');
                                break;
-                               default:
+                       default:
                                $text= wfMsg('articlepage');
                        }
                } else {
-
-                       $lns = Namespace::getTalk( $tns );
-                       $text=$tp;
+                       $link = $wgTitle->getTalkPage();
+                       $text = wfMsg( 'talkpage' );
                }
-               $n = $wgContLang->getNsText( $lns );
-               if ( '' == $n ) { $link = $pn; }
-               else { $link = $n.':'.$pn; }
 
                $wgLinkCache->suspend();
-               $s = $this->makeLink( $link, $text );
+               $s = $this->makeLinkObj( $link, $text );
                $wgLinkCache->resume();
 
                return $s;
@@ -1212,48 +1266,25 @@ class Skin extends Linker {
        function commentLink() {
                global $wgContLang, $wgTitle, $wgLinkCache;
 
-               $tns = $wgTitle->getNamespace();
-               if ( -1 == $tns ) { return ''; }
-
-               $lns = ( Namespace::isTalk( $tns ) ) ? $tns : Namespace::getTalk( $tns );
-
-               # assert Namespace::isTalk( $lns )
-
-               $n = $wgContLang->getNsText( $lns );
-               $pn = $wgTitle->getText();
-
-               $link = $n.':'.$pn;
-
-               $wgLinkCache->suspend();
-               $s = $this->makeKnownLink($link, wfMsg('postcomment'), 'action=edit&section=new');
-               $wgLinkCache->resume();
-
-               return $s;
+               if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+                       return '';
+               }
+               return $this->makeKnownLinkObj( $wgTitle->getTalkPage(),
+                       wfMsg( 'postcomment' ), 'action=edit&section=new' );
        }
 
        /* these are used extensively in SkinPHPTal, but also some other places */
        /*static*/ function makeSpecialUrl( $name, $urlaction='' ) {
                $title = Title::makeTitle( NS_SPECIAL, $name );
-               $this->checkTitle($title, $name);
-               return $title->getLocalURL( $urlaction );
-       }
-       /*static*/ function makeTalkUrl ( $name, $urlaction='' ) {
-               $title = Title::newFromText( $name );
-               $title = $title->getTalkPage();
-               $this->checkTitle($title, $name);
-               return $title->getLocalURL( $urlaction );
-       }
-       /*static*/ function makeArticleUrl ( $name, $urlaction='' ) {
-               $title = Title::newFromText( $name );
-               $title= $title->getSubjectPage();
-               $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
+
        /*static*/ function makeI18nUrl ( $name, $urlaction='' ) {
                $title = Title::newFromText( wfMsgForContent($name) );
                $this->checkTitle($title, $name);
                return $title->getLocalURL( $urlaction );
        }
+
        /*static*/ function makeUrl ( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
                $this->checkTitle($title, $name);
@@ -1263,7 +1294,7 @@ class Skin extends Linker {
        # If url string starts with http, consider as external URL, else
        # internal
        /*static*/ function makeInternalOrExternalUrl( $name ) {
-               if ( strncmp( $name, 'http', 4 ) == 0 ) {
+               if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $name ) ) {
                        return $name;
                } else {
                        return $this->makeUrl( $name );
@@ -1286,30 +1317,16 @@ class Skin extends Linker {
                        'exists' => $title->getArticleID() != 0?true:false
                );
        }
-       /*static*/ function makeTalkUrlDetails ( $name, $urlaction='' ) {
-               $title = Title::newFromText( $name );
-               $title = $title->getTalkPage();
-               $this->checkTitle($title, $name);
-               return array(
-                       'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0?true:false
-               );
-       }
-       /*static*/ function makeArticleUrlDetails ( $name, $urlaction='' ) {
+
+       /**
+        * Make URL details where the article exists (or at least it's convenient to think so)
+        */
+       function makeKnownUrlDetails( $name, $urlaction='' ) {
                $title = Title::newFromText( $name );
-               $title= $title->getSubjectPage();
                $this->checkTitle($title, $name);
                return array(
                        'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0?true:false
-               );
-       }
-       /*static*/ function makeI18nUrlDetails ( $name, $urlaction='' ) {
-               $title = Title::newFromText( wfMsgForContent($name) );
-               $this->checkTitle($title, $name);
-               return array(
-                       'href' => $title->getLocalURL( $urlaction ),
-                       'exists' => $title->getArticleID() != 0?true:false
+                       'exists' => true
                );
        }
 
@@ -1323,6 +1340,51 @@ class Skin extends Linker {
                }
        }
 
+       /**
+        * Build an array that represents the sidebar(s), the navigation bar among them
+        *
+        * @return array
+        * @access private
+        */
+       function buildSidebar() {
+               global $wgTitle, $action;
+
+               $fname = 'SkinTemplate::buildSidebar';
+               $pageurl = $wgTitle->getLocalURL();
+               wfProfileIn( $fname );
+
+               $bar = array();
+               $lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
+               foreach ($lines as $line) {
+                       if (strpos($line, '*') !== 0)
+                               continue;
+                       if (strpos($line, '**') !== 0) {
+                               $line = trim($line, '* ');
+                               $heading = $line;
+                       } else {
+                               if (strpos($line, '|') !== false) { // sanity check
+                                       $line = explode( '|' , trim($line, '* '), 2 );
+                                       $link = wfMsgForContent( $line[0] );
+                                       if ($link == '-')
+                                               continue;
+                                       if (wfEmptyMsg($line[1], $text = wfMsg($line[1])))
+                                               $text = $line[1];
+                                       if (wfEmptyMsg($line[0], $link))
+                                               $link = $line[0];
+                                       $href = $this->makeInternalOrExternalUrl( $link );
+                                       $bar[$heading][] = array(
+                                               'text' => $text,
+                                               'href' => $href,
+                                               'id' => 'n-' . strtr($line[1], ' ', '-'),
+                                               'active' => $pageurl == $href
+                                       );
+                               } else { continue; }
+                       }
+               }
+
+               wfProfileOut( $fname );
+               return $bar;
+       }
 }
 
 }