* Add form to RCLinked and add to sp:specialpages
[lhc/web/wiklou.git] / includes / Skin.php
index 1a74cfc..4aaf861 100644 (file)
@@ -2,38 +2,34 @@
 if ( ! defined( 'MEDIAWIKI' ) )
        die( 1 );
 
-/**
- *
- * @package MediaWiki
- * @subpackage Skins
- */
-
 # See skin.txt
 
 /**
  * The main skin class that provide methods and properties for all other skins.
  * This base class is also the "Standard" skin.
- * @package MediaWiki
+ *
+ * See docs/skin.txt for more information.
+ *
+ * @addtogroup Skins
  */
 class Skin extends Linker {
        /**#@+
         * @private
         */
-       var $lastdate, $lastline;
-       var $rc_cache ; # Cache for Enhanced Recent Changes
-       var $rcCacheIndex ; # Recent Changes Cache Counter for visibility toggle
-       var $rcMoveIndex;
+       var $mWatchLinkNum = 0; // Appended to end of watch link id's
        /**#@-*/
+       protected $mRevisionId; // The revision ID we're looking at, null if not applicable.
+       protected $skinname = 'standard' ;
 
        /** Constructor, call parent constructor */
-       function Skin() { parent::Linker(); }
+       function Skin() { parent::__construct(); }
 
        /**
         * Fetch the set of available skins.
         * @return array of strings
         * @static
         */
-       static function &getSkinNames() {
+       static function getSkinNames() {
                global $wgValidSkinNames;
                static $skinsInitialised = false;
                if ( !$skinsInitialised ) {
@@ -48,6 +44,7 @@ class Skin extends Linker {
                        # while code from www.php.net
                        while (false !== ($file = $skinDir->read())) {
                                // Skip non-PHP files, hidden files, and '.dep' includes
+                               $matches = array();
                                if(preg_match('/^([^.]*)\.php$/',$file, $matches)) {
                                        $aSkin = $matches[1];
                                        $wgValidSkinNames[strtolower($aSkin)] = $aSkin;
@@ -96,8 +93,7 @@ class Skin extends Linker {
                if( isset( $skinNames[$key] ) ) {
                        return $key;
                } else {
-                       // The old built-in skin
-                       return 'standard';
+                       return 'monobook';
                }
        }
 
@@ -114,24 +110,25 @@ class Skin extends Linker {
 
                $skinNames = Skin::getSkinNames();
                $skinName = $skinNames[$key];
+               $className = 'Skin'.ucfirst($key);
 
                # Grab the skin class and initialise it.
-               wfSuppressWarnings();
-               // Preload base classes to work around APC/PHP5 bug
-               include_once( "{$wgStyleDirectory}/{$skinName}.deps.php" );
-               wfRestoreWarnings();
-               require_once( "{$wgStyleDirectory}/{$skinName}.php" );
-
-               # Check if we got if not failback to default skin
-               $className = 'Skin'.$skinName;
-               if( !class_exists( $className ) ) {
-                       # DO NOT die if the class isn't found. This breaks maintenance
-                       # scripts and can cause a user account to be unrecoverable
-                       # except by SQL manipulation if a previously valid skin name
-                       # is no longer valid.
-                       wfDebug( "Skin class does not exist: $className\n" );
-                       $className = 'SkinStandard';
-                       require_once( "{$wgStyleDirectory}/Standard.php" );
+               if ( !class_exists( $className ) ) {
+                       // Preload base classes to work around APC/PHP5 bug
+                       $deps = "{$wgStyleDirectory}/{$skinName}.deps.php";
+                       if( file_exists( $deps ) ) include_once( $deps );
+                       require_once( "{$wgStyleDirectory}/{$skinName}.php" );
+
+                       # Check if we got if not failback to default skin
+                       if( !class_exists( $className ) ) {
+                               # DO NOT die if the class isn't found. This breaks maintenance
+                               # scripts and can cause a user account to be unrecoverable
+                               # except by SQL manipulation if a previously valid skin name
+                               # is no longer valid.
+                               wfDebug( "Skin class does not exist: $className\n" );
+                               $className = 'SkinMonobook';
+                               require_once( "{$wgStyleDirectory}/MonoBook.php" );
+                       }
                }
                $skin = new $className;
                return $skin;
@@ -143,35 +140,37 @@ class Skin extends Linker {
        }
 
        /** @return string skin name */
-       function getSkinName() {
-               return 'standard';
+       public function getSkinName() {
+               return $this->skinname;
        }
 
        function qbSetting() {
                global $wgOut, $wgUser;
 
                if ( $wgOut->isQuickbarSuppressed() ) { return 0; }
-               $q = $wgUser->getOption( 'quickbar' );
-               if ( '' == $q ) { $q = 0; }
+               $q = $wgUser->getOption( 'quickbar', 0 );
                return $q;
        }
 
        function initPage( &$out ) {
-               global $wgFavicon, $wgScriptPath, $wgSitename, $wgLanguageCode, $wgLanguageNames;
+               global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgScriptExtension;
 
-               $fname = 'Skin::initPage';
-               wfProfileIn( $fname );
+               wfProfileIn( __METHOD__ );
 
                if( false !== $wgFavicon ) {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }
+               
+               if( false !== $wgAppleTouchIcon ) {
+                       $out->addLink( array( 'rel' => 'apple-touch-icon', 'href' => $wgAppleTouchIcon ) );
+               }               
 
                # OpenSearch description link
                $out->addLink( array( 
                        'rel' => 'search', 
                        'type' => 'application/opensearchdescription+xml',
-                       'href' => "$wgScriptPath/opensearch_desc.php",
-                       'title' => "$wgSitename ({$wgLanguageNames[$wgLanguageCode]})",
+                       'href' => "$wgScriptPath/opensearch_desc{$wgScriptExtension}",
+                       'title' => wfMsgForContent( 'opensearch-desc' ),
                ));
 
                $this->addMetadataLinks($out);
@@ -180,7 +179,7 @@ class Skin extends Linker {
                
                $this->preloadExistence();
 
-               wfProfileOut( $fname );
+               wfProfileOut( __METHOD__ );
        }
 
        /**
@@ -189,16 +188,19 @@ class Skin extends Linker {
        function preloadExistence() {
                global $wgUser, $wgTitle;
 
-               if ( $wgTitle->isTalkPage() ) {
-                       $otherTab = $wgTitle->getSubjectPage();
+               // User/talk link
+               $titles = array( $wgUser->getUserPage(), $wgUser->getTalkPage() );
+
+               // Other tab link
+               if ( $wgTitle->getNamespace() == NS_SPECIAL ) {
+                       // nothing
+               } elseif ( $wgTitle->isTalkPage() ) {
+                       $titles[] = $wgTitle->getSubjectPage();
                } else {
-                       $otherTab = $wgTitle->getTalkPage();
+                       $titles[] = $wgTitle->getTalkPage();
                }
-               $lb = new LinkBatch( array( 
-                       $wgUser->getUserPage(),
-                       $wgUser->getTalkPage(),
-                       $otherTab
-               ));
+
+               $lb = new LinkBatch( $titles );
                $lb->execute();
        }
        
@@ -241,7 +243,7 @@ class Skin extends Linker {
        function outputPage( &$out ) {
                global $wgDebugComments;
 
-               wfProfileIn( 'Skin::outputPage' );
+               wfProfileIn( __METHOD__ );
                $this->initPage( $out );
 
                $out->out( $out->headElement() );
@@ -268,63 +270,105 @@ class Skin extends Linker {
                $out->out( $out->reportTime() );
 
                $out->out( "\n</body></html>" );
+               wfProfileOut( __METHOD__ );
        }
 
-       static function makeGlobalVariablesScript( $data ) {
-               $r = '<script type= "' . $data['jsmimetype'] . '">
-                       var skin = "' . Xml::escapeJsString( $data['skinname'] ) . '";
-                       var stylepath = "' . Xml::escapeJsString( $data['stylepath'] ) . '";
-
-                       var wgArticlePath = "' . Xml::escapeJsString( $data['articlepath'] ) . '";
-                       var wgScriptPath = "' . Xml::escapeJsString( $data['scriptpath'] ) . '";
-                       var wgServer = "' . Xml::escapeJsString( $data['serverurl'] ) . '";
-                        
-                       var wgCanonicalNamespace = "' . Xml::escapeJsString( $data['nscanonical'] ) . '";
-                       var wgNamespaceNumber = ' . (int)$data['nsnumber'] . ';
-                       var wgPageName = "' . Xml::escapeJsString( $data['titleprefixeddbkey'] ) . '";
-                       var wgTitle = "' . Xml::escapeJsString( $data['titletext'] ) . '";
-                       var wgArticleId = ' . (int)$data['articleid'] . ';
-                       var wgIsArticle = ' . ( $data['isarticle'] ? 'true' : 'false' ) . ';
-                        
-                       var wgUserName = ' . ( $data['username'] == NULL ? 'null' : ( '"' . Xml::escapeJsString( $data['username'] ) . '"' ) ) . ';
-                       var wgUserLanguage = "' . Xml::escapeJsString( $data['userlang'] ) . '";
-                       var wgContentLanguage = "' . Xml::escapeJsString( $data['lang'] ) . '";
-               </script>
-               ';
-               
+       static function makeVariablesScript( $data ) {
+               global $wgJsMimeType;
+
+               $r = "<script type= \"$wgJsMimeType\">/*<![CDATA[*/\n";
+               foreach ( $data as $name => $value ) {
+                       $encValue = Xml::encodeJsVar( $value );
+                       $r .= "var $name = $encValue;\n";
+               }
+               $r .= "/*]]>*/</script>\n";
+
                return $r;
        }
 
-       function getHeadScripts() {
-               global $wgStylePath, $wgUser, $wgAllowUserJs, $wgJsMimeType, $wgStyleVersion;
+       /**
+        * Make a <script> tag containing global variables
+        * @param array $data Associative array containing one element:
+        *     skinname => the skin name
+        * The odd calling convention is for backwards compatibility
+        */
+       static function makeGlobalVariablesScript( $data ) {
+               global $wgScript, $wgStylePath, $wgUser;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
-               global $wgTitle, $wgCanonicalNamespaceNames, $wgOut;
+               global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
+               global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
+               global $wgUseAjax, $wgAjaxWatch;
+               global $wgVersion, $wgEnableAPI, $wgEnableWriteAPI;
+               global $wgRestrictionTypes, $wgLivePreview;
 
-               $nsname = @$wgCanonicalNamespaceNames[ $wgTitle->getNamespace() ];
-               if ( $nsname === NULL ) $nsname = $wgTitle->getNsText();
+               $ns = $wgTitle->getNamespace();
+               $nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
 
                $vars = array( 
-                       'jsmimetype' => $wgJsMimeType,
-                       'skinname' => $this->getSkinName(),
+                       'skin' => $data['skinname'],
                        'stylepath' => $wgStylePath,
-                       'articlepath' => $wgArticlePath,
-                       'scriptpath' => $wgScriptPath,
-                       'serverurl' => $wgServer,
-                       'nscanonical' => $nsname,
-                       'nsnumber' => $wgTitle->getNamespace(),
-                       'titleprefixeddbkey' => $wgTitle->getPrefixedDBKey(),
-                       'titletext' => $wgTitle->getText(),
-                       'articleid' => $wgTitle->getArticleId(),
-                       'isarticle' => $wgOut->isArticle(),
-                       'username' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
-                       'userlang' => $wgLang->getCode(),
-                       'lang' => $wgContLang->getCode(),
+                       'wgArticlePath' => $wgArticlePath,
+                       'wgScriptPath' => $wgScriptPath,
+                       'wgScript' => $wgScript,
+                       'wgVariantArticlePath' => $wgVariantArticlePath,
+                       'wgActionPaths' => $wgActionPaths,
+                       'wgServer' => $wgServer,
+                       'wgCanonicalNamespace' => $nsname,
+                       'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBkey() ),
+                       'wgNamespaceNumber' => $wgTitle->getNamespace(),
+                       'wgPageName' => $wgTitle->getPrefixedDBKey(),
+                       'wgTitle' => $wgTitle->getText(),
+                       'wgAction' => $wgRequest->getText( 'action', 'view' ),
+                       'wgArticleId' => $wgTitle->getArticleId(),
+                       'wgIsArticle' => $wgOut->isArticle(),
+                       'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
+                       'wgUserGroups' => $wgUser->isAnon() ? NULL : $wgUser->getEffectiveGroups(),
+                       'wgUserLanguage' => $wgLang->getCode(),
+                       'wgContentLanguage' => $wgContLang->getCode(),
+                       'wgBreakFrames' => $wgBreakFrames,
+                       'wgCurRevisionId' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
+                       'wgVersion' => $wgVersion,
+                       'wgEnableAPI' => $wgEnableAPI,
+                       'wgEnableWriteAPI' => $wgEnableWriteAPI,
                );
 
-               $r = self::makeGlobalVariablesScript( $vars );
+               foreach( $wgRestrictionTypes as $type )
+                       $vars['wgRestriction' . ucfirst( $type )] = $wgTitle->getRestrictions( $type );
+
+               if ( $wgLivePreview && $wgUser->getOption( 'uselivepreview' ) ) {
+                       $vars['wgLivepreviewMessageLoading'] = wfMsg( 'livepreview-loading' );
+                       $vars['wgLivepreviewMessageReady']   = wfMsg( 'livepreview-ready' );
+                       $vars['wgLivepreviewMessageFailed']  = wfMsg( 'livepreview-failed' );
+                       $vars['wgLivepreviewMessageError']   = wfMsg( 'livepreview-error' );
+               }
+
+               if($wgUseAjax && $wgAjaxWatch && $wgUser->isLoggedIn() ) {
+                       $msgs = (object)array();
+                       foreach ( array( 'watch', 'unwatch', 'watching', 'unwatching' ) as $msgName ) {
+                               $msgs->{$msgName . 'Msg'} = wfMsg( $msgName );
+                       }
+                       $vars['wgAjaxWatch'] = $msgs;
+               }
+
+               return self::makeVariablesScript( $vars );
+       }
+
+       function getHeadScripts( $allowUserJs ) {
+               global $wgStylePath, $wgUser, $wgJsMimeType, $wgStyleVersion;
+
+               $r = self::makeGlobalVariablesScript( array( 'skinname' => $this->getSkinName() ) );
 
                $r .= "<script type=\"{$wgJsMimeType}\" src=\"{$wgStylePath}/common/wikibits.js?$wgStyleVersion\"></script>\n";
-               if( $wgAllowUserJs && $wgUser->isLoggedIn() ) {
+               global $wgUseSiteJs;
+               if ($wgUseSiteJs) {
+                       $jsCache = $wgUser->isLoggedIn() ? '&smaxage=0' : '';
+                       $r .= "<script type=\"$wgJsMimeType\" src=\"".
+                               htmlspecialchars(self::makeUrl('-',
+                                       "action=raw$jsCache&gen=js&useskin=" .
+                                       urlencode( $this->getSkinName() ) ) ) .
+                               "\"><!-- site js --></script>\n";
+               }
+               if( $allowUserJs && $wgUser->isLoggedIn() ) {
                        $userpage = $wgUser->getUserPage();
                        $userjs = htmlspecialchars( self::makeUrl(
                                $userpage->getPrefixedText().'/'.$this->getSkinName().'.js',
@@ -362,8 +406,8 @@ class Skin extends Linker {
        function getUserStylesheet() {
                global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
                $sheet = $this->getStylesheet();
-               $action = $wgRequest->getText('action');
-               $s = "@import \"$wgStylePath/common/common.css?$wgStyleVersion\";\n";
+               $s = "@import \"$wgStylePath/common/shared.css?$wgStyleVersion\";\n";
+               $s .= "@import \"$wgStylePath/common/oldshared.css?$wgStyleVersion\";\n";
                $s .= "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
                if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";
 
@@ -376,9 +420,31 @@ class Skin extends Linker {
        }
 
        /**
-        * placeholder, returns generated js in monobook
+        * This returns MediaWiki:Common.js, and derived classes may add other JS.
+        * Despite its name, it does *not* return any custom user JS from user
+        * subpages.  The returned script is sitewide and publicly cacheable and
+        * therefore must not include anything that varies according to user,
+        * interface language, etc. (although it may vary by skin).  See
+        * makeGlobalVariablesScript for things that can vary per page view and are
+        * not cacheable.
+        *
+        * @return string Raw JavaScript to be returned
         */
-       function getUserJs() { return; }
+       public function getUserJs() {
+               wfProfileIn( __METHOD__ );
+
+               global $wgStylePath;
+               $s = "/* generated javascript */\n";
+               $s .= "var skin = '" . Xml::escapeJsString( $this->getSkinName() ) . "';\n";
+               $s .= "var stylepath = '" . Xml::escapeJsString( $wgStylePath ) . "';";
+               $s .= "\n\n/* MediaWiki:Common.js */\n";
+               $commonJs = wfMsgForContent('common.js');
+               if ( !wfEmptyMsg ( 'common.js', $commonJs ) ) {
+                       $s .= $commonJs;
+               }
+               wfProfileOut( __METHOD__ );
+               return $s;
+       }
 
        /**
         * Return html code that include User stylesheets
@@ -417,7 +483,7 @@ class Skin extends Linker {
        function reallyDoGetUserStyles() {
                global $wgUser;
                $s = '';
-               if (($undopt = $wgUser->getOption("underline")) != 2) {
+               if (($undopt = $wgUser->getOption("underline")) < 2) {
                        $underline = $undopt ? 'underline' : 'none';
                        $s .= "a { text-decoration: $underline; }\n";
                }
@@ -428,17 +494,14 @@ class Skin extends Linker {
 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;
                }
@@ -464,8 +527,7 @@ END;
                }
                else $a = array( 'bgcolor' => '#FFFFFF' );
                if($wgOut->isArticle() && $wgUser->getOption('editondblclick') &&
-                 $wgTitle->userCanEdit() ) {
-                       $t = wfMsg( 'editthispage' );
+                 $wgTitle->userCan( 'edit' ) ) {
                        $s = $wgTitle->getFullURL( $this->editUrlOptions() );
                        $s = 'document.location = "' .wfEscapeJSString( $s ) .'";';
                        $a += array ('ondblclick' => $s);
@@ -478,8 +540,10 @@ END;
                        }
                        $a['onload'] .= 'setupRightClickEdit()';
                }
-               $a['class'] = 'ns-'.$wgTitle->getNamespace().' '.($wgContLang->isRTL() ? "rtl" : "ltr").
-               ' '.Sanitizer::escapeId( 'page-'.$wgTitle->getPrefixedText() );
+               $a['class'] =
+                       'mediawiki ns-'.$wgTitle->getNamespace().
+                       ' '.($wgContLang->isRTL() ? "rtl" : "ltr").
+                       ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() );
                return $a;
        }
 
@@ -562,9 +626,9 @@ END;
        }
 
 
-       function getCategoryLinks () {
+       function getCategoryLinks() {
                global $wgOut, $wgTitle, $wgUseCategoryBrowser;
-               global $wgContLang;
+               global $wgContLang, $wgUser;
 
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
 
@@ -576,12 +640,33 @@ END;
                $dir = $wgContLang->isRTL() ? 'rtl' : 'ltr';
                $embed = "<span dir='$dir'>";
                $pop = '</span>';
-               $t = $embed . implode ( "{$pop} {$sep} {$embed}" , $wgOut->mCategoryLinks ) . $pop;
 
-               $msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escape' ), count( $wgOut->mCategoryLinks ) );
-               $s = $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Categories' ),
-                       $msg, 'article=' . urlencode( $wgTitle->getPrefixedDBkey() ) )
-                       . ': ' . $t;
+               $allCats = $wgOut->getCategoryLinks();
+               $s = '';
+               $colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
+               if ( !empty( $allCats['normal'] ) ) {
+                       $t = $embed . implode ( "{$pop} {$sep} {$embed}" , $allCats['normal'] ) . $pop;
+       
+                       $msg = wfMsgExt( 'pagecategories', array( 'parsemag', 'escapenoentities' ), count( $allCats['normal'] ) );
+                       $s .= '<div id="mw-normal-catlinks">' .
+                               $this->makeLinkObj( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
+                               . $colon . $t . '</div>';
+               }
+
+               # Hidden categories
+               if ( isset( $allCats['hidden'] ) ) {
+                       if ( $wgUser->getBoolOption( 'showhiddencats' ) ) {
+                               $class ='mw-hidden-cats-user-shown';
+                       } elseif ( $wgTitle->getNamespace() == NS_CATEGORY ) {
+                               $class = 'mw-hidden-cats-ns-shown';
+                       } else {
+                               $class = 'mw-hidden-cats-hidden';
+                       }
+                       $s .= "<div id=\"mw-hidden-catlinks\" class=\"$class\">" . 
+                               wfMsgExt( 'hidden-categories', array( 'parsemag', 'escapenoentities' ), count( $allCats['hidden'] ) ) . 
+                               $colon . $embed . implode( "$pop $sep $embed", $allCats['hidden'] ) . $pop .
+                               "</div>";
+               }
 
                # optional 'dmoz-like' category browser. Will be shown under the list
                # of categories an article belong to
@@ -627,8 +712,15 @@ END;
 
        function getCategories() {
                $catlinks=$this->getCategoryLinks();
+               
+               $classes = 'catlinks';
+               
+               if(FALSE === strpos($catlinks,'<div id="mw-normal-catlinks">')) {
+                       $classes .= ' catlinks-allhidden';
+               }
+               
                if(!empty($catlinks)) {
-                       return "<p class='catlinks'>{$catlinks}</p>";
+                       return "<div id='catlinks' class='$classes'>{$catlinks}</div>";
                }
        }
 
@@ -651,7 +743,9 @@ END;
         */
        function bottomScripts() {
                global $wgJsMimeType;
-               return "\n\t\t<script type=\"$wgJsMimeType\">if (window.runOnloadHook) runOnloadHook();</script>\n";
+               $bottomScriptText = "\n\t\t<script type=\"$wgJsMimeType\">if (window.runOnloadHook) runOnloadHook();</script>\n";
+               wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
+               return $bottomScriptText;
        }
 
        /** @return string Retrievied from HTML text */
@@ -672,7 +766,8 @@ END;
        function pageTitleLinks() {
                global $wgOut, $wgTitle, $wgUser, $wgRequest;
 
-               extract( $wgRequest->getValues( 'oldid', 'diff' ) );
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
                $action = $wgRequest->getText( 'action' );
 
                $s = $this->printableLink();
@@ -688,8 +783,8 @@ END;
                if ( $wgOut->isArticleRelated() ) {
                        if ( $wgTitle->getNamespace() == NS_IMAGE ) {
                                $name = $wgTitle->getDBkey();
-                               $image = new Image( $wgTitle );
-                               if( $image->exists() ) {
+                               $image = wfFindFile( $wgTitle );
+                               if( $image ) {
                                        $link = htmlspecialchars( $image->getURL() );
                                        $style = $this->getInternalLinkAttributes( $link, $name );
                                        $s .= " | <a href=\"{$link}\"{$style}>{$name}</a>";
@@ -722,20 +817,20 @@ END;
        }
 
        function getUndeleteLink() {
-               global $wgUser, $wgTitle, $wgContLang, $action;
+               global $wgUser, $wgTitle, $wgContLang, $wgLang, $action;
                if(     $wgUser->isAllowed( 'deletedhistory' ) &&
                        (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
                        ($n = $wgTitle->isDeleted() ) )
                {
-                       if ( $wgUser->isAllowed( 'delete' ) ) {
+                       if ( $wgUser->isAllowed( 'undelete' ) ) {
                                $msg = 'thisisdeleted';
                        } else {
                                $msg = 'viewdeleted';
                        }
                        return wfMsg( $msg,
-                               $this->makeKnownLink(
-                                       $wgContLang->SpecialPage( 'Undelete/' . $wgTitle->getPrefixedDBkey() ),
-                                       wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $n ) ) );
+                               $this->makeKnownLinkObj(
+                                       SpecialPage::getTitleFor( 'Undelete', $wgTitle->getPrefixedDBkey() ),
+                                       wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $wgLang->formatNum( $n ) ) ) );
                }
                return '';
        }
@@ -743,13 +838,6 @@ END;
        function printableLink() {
                global $wgOut, $wgFeedClasses, $wgRequest;
 
-               $baseurl = $_SERVER['REQUEST_URI'];
-               if( strpos( '?', $baseurl ) == false ) {
-                       $baseurl .= '?';
-               } else {
-                       $baseurl .= '&';
-               }
-               $baseurl = htmlspecialchars( $baseurl );
                $printurl = $wgRequest->escapeAppendQuery( 'printable=yes' );
 
                $s = "<a href=\"$printurl\">" . wfMsg( 'printableversion' ) . '</a>';
@@ -783,8 +871,11 @@ END;
        }
 
        function subPageSubtitle() {
-               global $wgOut,$wgTitle,$wgNamespacesWithSubpages;
                $subpages = '';
+               if(!wfRunHooks('SkinSubPageSubtitle', array(&$subpages)))
+                       return $retval;
+
+               global $wgOut, $wgTitle, $wgNamespacesWithSubpages;
                if($wgOut->isArticle() && !empty($wgNamespacesWithSubpages[$wgTitle->getNamespace()])) {
                        $ptext=$wgTitle->getPrefixedText();
                        if(preg_match('/\//',$ptext)) {
@@ -811,15 +902,22 @@ END;
                return $subpages;
        }
 
+       /**
+        * Returns true if the IP should be shown in the header
+        */
+       function showIPinHeader() {
+               global $wgShowIPinHeader;
+               return $wgShowIPinHeader && session_id() != '';
+       }
+
        function nameAndLogin() {
-               global $wgUser, $wgTitle, $wgLang, $wgContLang, $wgShowIPinHeader;
+               global $wgUser, $wgTitle, $wgLang, $wgContLang;
 
-               $li = $wgContLang->specialPage( 'Userlogin' );
                $lo = $wgContLang->specialPage( 'Userlogout' );
 
                $s = '';
                if ( $wgUser->isAnon() ) {
-                       if( $wgShowIPinHeader && isset( $_COOKIE[ini_get('session.name')] ) ) {
+                       if( $this->showIPinHeader() ) {
                                $n = wfGetIP();
 
                                $tl = $this->makeKnownLinkObj( $wgUser->getTalkPage(),
@@ -859,7 +957,7 @@ END;
        }
 
        function getSearchLink() {
-               $searchPage =& SpecialPage::getTitleFor( 'Search' );
+               $searchPage = SpecialPage::getTitleFor( 'Search' );
                return $searchPage->getLocalURL();
        }
 
@@ -896,10 +994,30 @@ END;
                #$s .= $sep . $this->specialPagesList();
                
                $s .= $this->variantLinks();
+               
+               $s .= $this->extensionTabLinks();
 
                return $s;
        }
        
+       /**
+        * Compatibility for extensions adding functionality through tabs.
+        * Eventually these old skins should be replaced with SkinTemplate-based
+        * versions, sigh...
+        * @return string
+        */
+       function extensionTabLinks() {
+               $tabs = array();
+               $s = '';
+               wfRunHooks( 'SkinTemplateTabs', array( $this, &$tabs ) );
+               foreach( $tabs as $tab ) {
+                       $s .= ' | ' . Xml::element( 'a',
+                               array( 'href' => $tab['href'] ),
+                               $tab['text'] );
+               }
+               return $s;
+       }
+       
        /**
         * Language/charset variant links for classic-style skins
         * @return string
@@ -967,7 +1085,8 @@ END;
                global $wgOut, $wgLang, $wgArticle, $wgRequest, $wgUser;
                global $wgDisableCounters, $wgMaxCredits, $wgShowCreditsIfMax, $wgTitle, $wgPageShowWatchingUsers;
 
-               extract( $wgRequest->getValues( 'oldid', 'diff' ) );
+               $oldid = $wgRequest->getVal( 'oldid' );
+               $diff = $wgRequest->getVal( 'diff' );
                if ( ! $wgOut->isArticle() ) { return ''; }
                if ( isset( $oldid ) || isset( $diff ) ) { return ''; }
                if ( 0 == $wgArticle->getID() ) { return ''; }
@@ -988,14 +1107,17 @@ END;
                }
 
                if ($wgPageShowWatchingUsers && $wgUser->getOption( 'shownumberswatching' )) {
-                       $dbr =& wfGetDB( DB_SLAVE );
-                       extract( $dbr->tableNames( 'watchlist' ) );
+                       $dbr = wfGetDB( DB_SLAVE );
+                       $watchlist = $dbr->tableName( 'watchlist' );
                        $sql = "SELECT COUNT(*) AS n FROM $watchlist
-                               WHERE wl_title='" . $dbr->strencode($wgTitle->getDBKey()) .
+                               WHERE wl_title='" . $dbr->strencode($wgTitle->getDBkey()) .
                                "' AND  wl_namespace=" . $wgTitle->getNamespace() ;
                        $res = $dbr->query( $sql, 'Skin::pageStats');
                        $x = $dbr->fetchObject( $res );
-                       $s .= ' ' . wfMsg('number_of_watching_users_pageview', $x->n );
+
+                       $s .= ' ' . wfMsgExt( 'number_of_watching_users_pageview',
+                               array( 'parseinline' ), $wgLang->formatNum($x->n)
+                       );
                }
 
                return $s . ' ' .  $this->getCopyright();
@@ -1057,12 +1179,12 @@ END;
        function getPoweredBy() {
                global $wgStylePath;
                $url = htmlspecialchars( "$wgStylePath/common/images/poweredby_mediawiki_88x31.png" );
-               $img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="MediaWiki" /></a>';
+               $img = '<a href="http://www.mediawiki.org/"><img src="'.$url.'" alt="Powered by MediaWiki" /></a>';
                return $img;
        }
 
        function lastModified() {
-               global $wgLang, $wgArticle, $wgLoadBalancer;
+               global $wgLang, $wgArticle;
 
                $timestamp = $wgArticle->getTimestamp();
                if ( $timestamp ) {
@@ -1072,7 +1194,7 @@ END;
                } else {
                        $s = '';
                }
-               if ( $wgLoadBalancer->getLaggedSlaveMode() ) {
+               if ( wfGetLB()->getLaggedSlaveMode() ) {
                        $s .= ' <strong>' . wfMsg( 'laggedslavemode' ) . '</strong>';
                }
                return $s;
@@ -1083,12 +1205,8 @@ END;
                else { $a = ''; }
 
                $mp = wfMsg( 'mainpage' );
-               $titleObj = Title::newFromText( $mp );
-               if ( is_object( $titleObj ) ) {
-                       $url = $titleObj->escapeLocalURL();
-               } else {
-                       $url = '';
-               }
+               $mptitle = Title::newMainPage();
+               $url = ( is_object($mptitle) ? $mptitle->escapeLocalURL() : '' );
 
                $logourl = $this->getLogo();
                $s = "<a href='{$url}'><img{$a} src='{$logourl}' alt='[{$mp}]' /></a>";
@@ -1100,7 +1218,6 @@ END;
         */
        function specialPagesList() {
                global $wgUser, $wgContLang, $wgServer, $wgRedirectScript;
-               $a = array();
                $pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
                foreach ( $pages as $name => $page ) {
                        $pages[$name] = $page->getDescription();
@@ -1127,9 +1244,7 @@ END;
        }
 
        function mainPageLink() {
-               $mp = wfMsgForContent( 'mainpage' );
-               $mptxt = wfMsg( 'mainpage');
-               $s = $this->makeKnownLink( $mp, $mptxt );
+               $s = $this->makeKnownLinkObj( Title::newMainPage(), wfMsg( 'mainpage' ) );
                return $s;
        }
 
@@ -1139,39 +1254,42 @@ END;
                return $s;
        }
 
-       function privacyLink() {
-               $privacy = wfMsg( 'privacy' );
-               if ($privacy == '-') {
+       private function footerLink ( $desc, $page ) {
+               // if the link description has been set to "-" in the default language,
+               if ( wfMsgForContent( $desc )  == '-') {
+                       // then it is disabled, for all languages.
                        return '';
                } else {
-                       return $this->makeKnownLink( wfMsgForContent( 'privacypage' ), $privacy);
+                       // Otherwise, we display the link for the user, described in their
+                       // language (which may or may not be the same as the default language),
+                       // but we make the link target be the one site-wide page.
+                       return $this->makeKnownLink( wfMsgForContent( $page ),
+                               wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) );
                }
        }
 
+       function privacyLink() {
+               return $this->footerLink( 'privacy', 'privacypage' );
+       }
+
        function aboutLink() {
-               $s = $this->makeKnownLink( wfMsgForContent( 'aboutpage' ),
-                 wfMsg( 'aboutsite' ) );
-               return $s;
+               return $this->footerLink( 'aboutsite', 'aboutpage' );
        }
 
        function disclaimerLink() {
-               $disclaimers = wfMsg( 'disclaimers' );
-               if ($disclaimers == '-') {
-                       return '';
-               } else {
-                       return $this->makeKnownLink( wfMsgForContent( 'disclaimerpage' ),
-                                                    $disclaimers );
-               }
+               return $this->footerLink( 'disclaimers', 'disclaimerpage' );
        }
 
        function editThisPage() {
                global $wgOut, $wgTitle;
 
-               if ( ! $wgOut->isArticleRelated() ) {
+               if ( !$wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
                } else {
-                       if ( $wgTitle->userCanEdit() ) {
+                       if( $wgTitle->userCan( 'edit' ) && $wgTitle->exists() ) {
                                $t = wfMsg( 'editthispage' );
+                       } elseif( $wgTitle->userCan( 'create' ) && !$wgTitle->exists() ) {
+                               $t = wfMsg( 'create-this-page' );
                        } else {
                                $t = wfMsg( 'viewsource' );
                        }
@@ -1233,16 +1351,19 @@ END;
 
        function watchThisPage() {
                global $wgOut, $wgTitle;
+               ++$this->mWatchLinkNum;
 
                if ( $wgOut->isArticleRelated() ) {
                        if ( $wgTitle->userIsWatching() ) {
                                $t = wfMsg( 'unwatchthispage' );
                                $q = 'action=unwatch';
+                               $id = "mw-unwatch-link".$this->mWatchLinkNum;
                        } else {
                                $t = wfMsg( 'watchthispage' );
                                $q = 'action=watch';
+                               $id = 'mw-watch-link'.$this->mWatchLinkNum;
                        }
-                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $q );
+                       $s = $this->makeKnownLinkObj( $wgTitle, $t, $q, '', '', " id=\"$id\"" );
                } else {
                        $s = wfMsg( 'notanarticle' );
                }
@@ -1252,7 +1373,7 @@ END;
        function moveThisPage() {
                global $wgTitle;
 
-               if ( $wgTitle->userCanMove() ) {
+               if ( $wgTitle->userCan( 'move' ) ) {
                        return $this->makeKnownLinkObj( SpecialPage::getTitleFor( 'Movepage' ),
                          wfMsg( 'movethispage' ), 'target=' . $wgTitle->getPrefixedURL() );
                } else {
@@ -1359,29 +1480,6 @@ END;
                return $s;
        }
 
-       function dateLink() {
-               $t1 = Title::newFromText( gmdate( 'F j' ) );
-               $t2 = Title::newFromText( gmdate( 'Y' ) );
-
-               $id = $t1->getArticleID();
-
-               if ( 0 == $id ) {
-                       $s = $this->makeBrokenLink( $t1->getText() );
-               } else {
-                       $s = $this->makeKnownLink( $t1->getText() );
-               }
-               $s .= ', ';
-
-               $id = $t2->getArticleID();
-
-               if ( 0 == $id ) {
-                       $s .= $this->makeBrokenLink( $t2->getText() );
-               } else {
-                       $s .= $this->makeKnownLink( $t2->getText() );
-               }
-               return $s;
-       }
-
        function talkLink() {
                global $wgTitle;
 
@@ -1441,22 +1539,33 @@ END;
                # If it's present, the link points to this page, otherwise
                # it points to the talk page
                if( $wgTitle->isTalkPage() ) {
-                       $title =& $wgTitle;
+                       $title = $wgTitle;
                } elseif( $wgOut->showNewSectionLink() ) {
-                       $title =& $wgTitle;
+                       $title = $wgTitle;
                } else {
-                       $title =& $wgTitle->getTalkPage();
+                       $title = $wgTitle->getTalkPage();
                }
                
                return $this->makeKnownLinkObj( $title, wfMsg( 'postcomment' ), 'action=edit&section=new' );
        }
 
        /* these are used extensively in SkinTemplate, but also some other places */
+       static function makeMainPageUrl( $urlaction = '' ) {
+               $title = Title::newMainPage();
+               self::checkTitle( $title, '' );
+               return $title->getLocalURL( $urlaction );
+       }
+
        static function makeSpecialUrl( $name, $urlaction = '' ) {
                $title = SpecialPage::getTitleFor( $name );
                return $title->getLocalURL( $urlaction );
        }
 
+       static function makeSpecialUrlSubpage( $name, $subpage, $urlaction = '' ) {
+               $title = SpecialPage::getSafeTitleFor( $name, $subpage );
+               return $title->getLocalURL( $urlaction );
+       }
+
        static function makeI18nUrl( $name, $urlaction = '' ) {
                $title = Title::newFromText( wfMsgForContent( $name ) );
                self::checkTitle( $title, $name );
@@ -1509,7 +1618,7 @@ END;
        }
 
        # make sure we have some title to operate on
-       static function checkTitle( &$title, &$name ) {
+       static function checkTitle( &$title, $name ) {
                if( !is_object( $title ) ) {
                        $title = Title::newFromText( $name );
                        if( !is_object( $title ) ) {
@@ -1525,7 +1634,7 @@ END;
         * @private
         */
        function buildSidebar() {
-               global $parserMemc, $wgEnableSidebarCache;
+               global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
                global $wgLang, $wgContLang;
 
                $fname = 'SkinTemplate::buildSidebar';
@@ -1546,6 +1655,7 @@ END;
 
                $bar = array();
                $lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
+               $heading = '';
                foreach ($lines as $line) {
                        if (strpos($line, '*') !== 0)
                                continue;
@@ -1567,8 +1677,12 @@ END;
                                                $href = $link;
                                        } else {
                                                $title = Title::newFromText( $link );
-                                               $title = $title->fixSpecialName();
-                                               $href = $title->getLocalURL();
+                                               if ( $title ) {
+                                                       $title = $title->fixSpecialName();
+                                                       $href = $title->getLocalURL();
+                                               } else {
+                                                       $href = 'INVALID-TITLE';
+                                               }
                                        }
 
                                        $bar[$heading][] = array(
@@ -1581,9 +1695,9 @@ END;
                        }
                }
                if ($cacheSidebar)
-                       $cachednotice = $parserMemc->set( $key, $bar, 86400 );
+                       $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
                wfProfileOut( $fname );
                return $bar;
        }
+       
 }
-?>