Don't set $this->pattern unless it is allowed
[lhc/web/wiklou.git] / includes / Skin.php
index d6821a9..4aaf861 100644 (file)
@@ -16,10 +16,6 @@ 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.
@@ -97,8 +93,7 @@ class Skin extends Linker {
                if( isset( $skinNames[$key] ) ) {
                        return $key;
                } else {
-                       // The old built-in skin
-                       return 'standard';
+                       return 'monobook';
                }
        }
 
@@ -115,23 +110,25 @@ class Skin extends Linker {
 
                $skinNames = Skin::getSkinNames();
                $skinName = $skinNames[$key];
+               $className = 'Skin'.ucfirst($key);
 
                # Grab the skin class and initialise it.
-               // 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
-               $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;
@@ -156,24 +153,24 @@ class Skin extends Linker {
        }
 
        function initPage( &$out ) {
-               global $wgFavicon, $wgScriptPath, $wgSitename, $wgContLang;
+               global $wgFavicon, $wgAppleTouchIcon, $wgScriptPath, $wgScriptExtension;
 
                wfProfileIn( __METHOD__ );
 
                if( false !== $wgFavicon ) {
                        $out->addLink( array( 'rel' => 'shortcut icon', 'href' => $wgFavicon ) );
                }
-
-               $code = $wgContLang->getCode();
-               $name = $wgContLang->getLanguageName( $code );
-               $langName = $name ? $name : $code;
+               
+               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 ($langName)",
+                       'href' => "$wgScriptPath/opensearch_desc{$wgScriptExtension}",
+                       'title' => wfMsgForContent( 'opensearch-desc' ),
                ));
 
                $this->addMetadataLinks($out);
@@ -299,8 +296,10 @@ class Skin extends Linker {
                global $wgScript, $wgStylePath, $wgUser;
                global $wgArticlePath, $wgScriptPath, $wgServer, $wgContLang, $wgLang;
                global $wgTitle, $wgCanonicalNamespaceNames, $wgOut, $wgArticle;
-               global $wgBreakFrames, $wgRequest;
+               global $wgBreakFrames, $wgRequest, $wgVariantArticlePath, $wgActionPaths;
                global $wgUseAjax, $wgAjaxWatch;
+               global $wgVersion, $wgEnableAPI, $wgEnableWriteAPI;
+               global $wgRestrictionTypes, $wgLivePreview;
 
                $ns = $wgTitle->getNamespace();
                $nsname = isset( $wgCanonicalNamespaceNames[ $ns ] ) ? $wgCanonicalNamespaceNames[ $ns ] : $wgTitle->getNsText();
@@ -311,15 +310,15 @@ class Skin extends Linker {
                        'wgArticlePath' => $wgArticlePath,
                        'wgScriptPath' => $wgScriptPath,
                        'wgScript' => $wgScript,
+                       'wgVariantArticlePath' => $wgVariantArticlePath,
+                       'wgActionPaths' => $wgActionPaths,
                        'wgServer' => $wgServer,
                        'wgCanonicalNamespace' => $nsname,
-                       'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBKey() ),
+                       'wgCanonicalSpecialPageName' => SpecialPage::resolveAlias( $wgTitle->getDBkey() ),
                        'wgNamespaceNumber' => $wgTitle->getNamespace(),
                        'wgPageName' => $wgTitle->getPrefixedDBKey(),
                        'wgTitle' => $wgTitle->getText(),
                        'wgAction' => $wgRequest->getText( 'action', 'view' ),
-                       'wgRestrictionEdit' => $wgTitle->getRestrictions( 'edit' ),
-                       'wgRestrictionMove' => $wgTitle->getRestrictions( 'move' ),
                        'wgArticleId' => $wgTitle->getArticleId(),
                        'wgIsArticle' => $wgOut->isArticle(),
                        'wgUserName' => $wgUser->isAnon() ? NULL : $wgUser->getName(),
@@ -328,9 +327,14 @@ class Skin extends Linker {
                        'wgContentLanguage' => $wgContLang->getCode(),
                        'wgBreakFrames' => $wgBreakFrames,
                        'wgCurRevisionId' => isset( $wgArticle ) ? $wgArticle->getLatest() : 0,
+                       'wgVersion' => $wgVersion,
+                       'wgEnableAPI' => $wgEnableAPI,
+                       'wgEnableWriteAPI' => $wgEnableWriteAPI,
                );
 
-               global $wgLivePreview;
+               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' );
@@ -479,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";
                }
@@ -490,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;
                }
@@ -539,8 +540,10 @@ END;
                        }
                        $a['onload'] .= 'setupRightClickEdit()';
                }
-               $a['class'] = 'ns-'.$wgTitle->getNamespace().' '.($wgContLang->isRTL() ? "rtl" : "ltr").
-               ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() );
+               $a['class'] =
+                       'mediawiki ns-'.$wgTitle->getNamespace().
+                       ' '.($wgContLang->isRTL() ? "rtl" : "ltr").
+                       ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() );
                return $a;
        }
 
@@ -623,9 +626,9 @@ END;
        }
 
 
-       function getCategoryLinks () {
+       function getCategoryLinks() {
                global $wgOut, $wgTitle, $wgUseCategoryBrowser;
-               global $wgContLang;
+               global $wgContLang, $wgUser;
 
                if( count( $wgOut->mCategoryLinks ) == 0 ) return '';
 
@@ -637,11 +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->makeLinkObj( Title::newFromText( wfMsgForContent('pagecategorieslink') ), $msg )
-                       . ': ' . $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
@@ -687,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>";
                }
        }
 
@@ -790,7 +822,7 @@ END;
                        (($wgTitle->getArticleId() == 0) || ($action == "history")) &&
                        ($n = $wgTitle->isDeleted() ) )
                {
-                       if ( $wgUser->isAllowed( 'delete' ) ) {
+                       if ( $wgUser->isAllowed( 'undelete' ) ) {
                                $msg = 'thisisdeleted';
                        } else {
                                $msg = 'viewdeleted';
@@ -839,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)) {
@@ -1075,7 +1110,7 @@ END;
                        $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 );
@@ -1149,7 +1184,7 @@ END;
        }
 
        function lastModified() {
-               global $wgLang, $wgArticle, $wgLoadBalancer;
+               global $wgLang, $wgArticle;
 
                $timestamp = $wgArticle->getTimestamp();
                if ( $timestamp ) {
@@ -1159,7 +1194,7 @@ END;
                } else {
                        $s = '';
                }
-               if ( $wgLoadBalancer->getLaggedSlaveMode() ) {
+               if ( wfGetLB()->getLaggedSlaveMode() ) {
                        $s .= ' <strong>' . wfMsg( 'laggedslavemode' ) . '</strong>';
                }
                return $s;
@@ -1229,7 +1264,7 @@ END;
                        // 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', 'escape' ) ) );
+                               wfMsgExt( $desc, array( 'parsemag', 'escapenoentities' ) ) );
                }
        }
 
@@ -1248,11 +1283,13 @@ END;
        function editThisPage() {
                global $wgOut, $wgTitle;
 
-               if ( ! $wgOut->isArticleRelated() ) {
+               if ( !$wgOut->isArticleRelated() ) {
                        $s = wfMsg( 'protectedpage' );
                } else {
-                       if ( $wgTitle->userCan( 'edit' ) ) {
+                       if( $wgTitle->userCan( 'edit' ) && $wgTitle->exists() ) {
                                $t = wfMsg( 'editthispage' );
+                       } elseif( $wgTitle->userCan( 'create' ) && !$wgTitle->exists() ) {
+                               $t = wfMsg( 'create-this-page' );
                        } else {
                                $t = wfMsg( 'viewsource' );
                        }
@@ -1502,11 +1539,11 @@ 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' );
@@ -1597,7 +1634,7 @@ END;
         * @private
         */
        function buildSidebar() {
-               global $parserMemc, $wgEnableSidebarCache;
+               global $parserMemc, $wgEnableSidebarCache, $wgSidebarCacheExpiry;
                global $wgLang, $wgContLang;
 
                $fname = 'SkinTemplate::buildSidebar';
@@ -1618,6 +1655,7 @@ END;
 
                $bar = array();
                $lines = explode( "\n", wfMsgForContent( 'sidebar' ) );
+               $heading = '';
                foreach ($lines as $line) {
                        if (strpos($line, '*') !== 0)
                                continue;
@@ -1657,9 +1695,9 @@ END;
                        }
                }
                if ($cacheSidebar)
-                       $parserMemc->set( $key, $bar, 86400 );
+                       $parserMemc->set( $key, $bar, $wgSidebarCacheExpiry );
                wfProfileOut( $fname );
                return $bar;
        }
        
-}
\ No newline at end of file
+}