Use getLinkURL instead of getLocalURL for titles from MediaWiki:Sidebar so that ...
[lhc/web/wiklou.git] / includes / Skin.php
index ae98951..36d56c6 100644 (file)
@@ -160,11 +160,6 @@ abstract class Skin extends ContextSource {
                return $skin;
        }
 
-       /** @return string path to the skin stylesheet */
-       function getStylesheet() {
-               return 'common/wikistandard.css';
-       }
-
        /** @return string skin name */
        public function getSkinName() {
                return $this->skinname;
@@ -174,7 +169,6 @@ abstract class Skin extends ContextSource {
                wfProfileIn( __METHOD__ );
 
                $this->preloadExistence();
-               $this->setMembers();
 
                wfProfileOut( __METHOD__ );
        }
@@ -202,13 +196,6 @@ abstract class Skin extends ContextSource {
                $lb->execute();
        }
 
-       /**
-        * Set some local variables
-        */
-       protected function setMembers() {
-               $this->userpage = $this->getUser()->getUserPage()->getPrefixedText();
-       }
-
        /**
         * Get the current revision ID
         *
@@ -365,7 +352,6 @@ abstract class Skin extends ContextSource {
         * @return String
         */
        function getPageClasses( $title ) {
-               global $wgRequest;
                $numeric = 'ns-' . $title->getNamespace();
 
                if ( $title->getNamespace() == NS_SPECIAL ) {
@@ -384,13 +370,8 @@ abstract class Skin extends ContextSource {
                }
 
                $name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() );
-               
-               if ( $wgRequest->getVal('action') ) {
-                       $action = 'action-' . $wgRequest->getVal('action');
-               } else {
-                       $action = 'action-view';
-               }
-               return "$numeric $type $name $action";
+
+               return "$numeric $type $name";
        }
 
        /**
@@ -417,15 +398,15 @@ abstract class Skin extends ContextSource {
                global $wgUseCategoryBrowser;
 
                $out = $this->getOutput();
+               $allCats = $out->getCategoryLinks();
 
-               if ( count( $out->mCategoryLinks ) == 0 ) {
+               if ( !count( $allCats ) ) {
                        return '';
                }
 
                $embed = "<li>";
                $pop = "</li>";
 
-               $allCats = $out->getCategoryLinks();
                $s = '';
                $colon = wfMsgExt( 'colon-separator', 'escapenoentities' );
 
@@ -493,7 +474,7 @@ abstract class Skin extends ContextSource {
 
                        # add our current element to the list
                        $eltitle = Title::newFromText( $element );
-                       $return .=  Linker::link( $eltitle, $eltitle->getText() );
+                       $return .=  Linker::link( $eltitle, htmlspecialchars( $eltitle->getText() ) );
                }
 
                return $return;
@@ -622,14 +603,14 @@ abstract class Skin extends ContextSource {
 
        /**
         * This gets called shortly before the </body> tag.
-        * @param $out OutputPage object
+        *
         * @return String HTML-wrapped JS code to be put before </body>
         */
-       function bottomScripts( $out ) {
+       function bottomScripts() {
                // TODO and the suckage continues. This function is really just a wrapper around
                // OutputPage::getBottomScripts() which takes a Skin param. This should be cleaned
                // up at some point
-               $bottomScriptText = $out->getBottomScripts();
+               $bottomScriptText = $this->getOutput()->getBottomScripts();
                wfRunHooks( 'SkinAfterBottomScripts', array( $this, &$bottomScriptText ) );
 
                return $bottomScriptText;
@@ -644,7 +625,7 @@ abstract class Skin extends ContextSource {
        function getUndeleteLink() {
                $action = $this->getRequest()->getVal( 'action', 'view' );
 
-               if ( $this->getUser()->isAllowed( 'deletedhistory' ) &&
+               if ( $this->getUser()->isAllowed( 'deletedhistory' ) && !$this->getUser()->isBlocked() &&
                        ( $this->getTitle()->getArticleId() == 0 || $action == 'history' ) ) {
 
                        $includeSuppressed = $this->getUser()->isAllowed( 'suppressrevision' );
@@ -659,12 +640,9 @@ abstract class Skin extends ContextSource {
 
                                return wfMsg(
                                        $msg,
-                                       Linker::link(
+                                       Linker::linkKnown(
                                                SpecialPage::getTitleFor( 'Undelete', $this->getTitle()->getPrefixedDBkey() ),
-                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $this->getLang()->formatNum( $n ) ),
-                                               array(),
-                                               array(),
-                                               array( 'known', 'noclasses' )
+                                               wfMsgExt( 'restorelink', array( 'parsemag', 'escape' ), $this->getLang()->formatNum( $n ) )
                                        )
                                );
                        }
@@ -696,12 +674,9 @@ abstract class Skin extends ContextSource {
                                        $linkObj = Title::newFromText( $growinglink );
 
                                        if ( is_object( $linkObj ) && $linkObj->exists() ) {
-                                               $getlink = $this->link(
+                                               $getlink = Linker::linkKnown(
                                                        $linkObj,
-                                                       htmlspecialchars( $display ),
-                                                       array(),
-                                                       array(),
-                                                       array( 'known', 'noclasses' )
+                                                       htmlspecialchars( $display )
                                                );
 
                                                $c++;
@@ -747,9 +722,7 @@ abstract class Skin extends ContextSource {
                global $wgRightsPage, $wgRightsUrl, $wgRightsText;
 
                if ( $type == 'detect' ) {
-                       $diff = $this->getRequest()->getVal( 'diff' );
-
-                       if ( is_null( $diff ) && !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
+                       if ( !$this->isRevisionCurrent() && wfMsgForContent( 'history_copyright' ) !== '-' ) {
                                $type = 'history';
                        } else {
                                $type = 'normal';
@@ -762,8 +735,6 @@ abstract class Skin extends ContextSource {
                        $msg = 'copyright';
                }
 
-               $out = '';
-
                if ( $wgRightsPage ) {
                        $title = Title::newFromText( $wgRightsPage );
                        $link = Linker::linkKnown( $title, $wgRightsText );
@@ -773,7 +744,7 @@ abstract class Skin extends ContextSource {
                        $link = $wgRightsText;
                } else {
                        # Give up now
-                       return $out;
+                       return '';
                }
 
                // Allow for site and per-namespace customization of copyright notice.
@@ -782,12 +753,10 @@ abstract class Skin extends ContextSource {
                wfRunHooks( 'SkinCopyrightFooter', array( $this->getTitle(), $type, &$msg, &$link, &$forContent ) );
 
                if ( $forContent ) {
-                       $out .= wfMsgForContent( $msg, $link );
+                       return wfMsgForContent( $msg, $link );
                } else {
-                       $out .= wfMsg( $msg, $link );
+                       return wfMsg( $msg, $link );
                }
-
-               return $out;
        }
 
        function getCopyrightIcon() {
@@ -864,7 +833,7 @@ abstract class Skin extends ContextSource {
                        $a = '';
                }
 
-               $mp = wfMsg( 'mainpage' );
+               $mp = wfMsgHtml( 'mainpage' );
                $mptitle = Title::newMainPage();
                $url = ( is_object( $mptitle ) ? $mptitle->escapeLocalURL() : '' );
 
@@ -903,12 +872,9 @@ abstract class Skin extends ContextSource {
         * @return string
         */
        function mainPageLink() {
-               $s = Linker::link(
+               $s = Linker::linkKnown(
                        Title::newMainPage(),
-                       wfMsg( 'mainpage' ),
-                       array(),
-                       array(),
-                       array( 'known', 'noclasses' )
+                       wfMsgHtml( 'mainpage' )
                );
 
                return $s;
@@ -1145,7 +1111,6 @@ abstract class Skin extends ContextSource {
         */
        function addToSidebarPlain( &$bar, $text ) {
                $lines = explode( "\n", $text );
-               $wikiBar = array(); # We need to handle the wikitext on a different variable, to avoid trying to do an array operation on text, which would be a fatal error.
 
                $heading = '';
 
@@ -1153,6 +1118,7 @@ abstract class Skin extends ContextSource {
                        if ( strpos( $line, '*' ) !== 0 ) {
                                continue;
                        }
+                       $line = rtrim( $line, "\r" ); // for Windows compat
 
                        if ( strpos( $line, '**' ) !== 0 ) {
                                $heading = trim( $line, '* ' );
@@ -1186,24 +1152,13 @@ abstract class Skin extends ContextSource {
 
                                        if ( preg_match( '/^(?:' . wfUrlProtocols() . ')/', $link ) ) {
                                                $href = $link;
-                                               //Parser::getExternalLinkAttribs won't work here because of the Namespace things
-                                               global $wgNoFollowLinks;
-                                               if ( $wgNoFollowLinks ) {
+                                               
+                                               // Parser::getExternalLinkAttribs won't work here because of the Namespace things
+                                               global $wgNoFollowLinks, $wgNoFollowDomainExceptions;
+                                               if ( $wgNoFollowLinks && !wfMatchesDomainList( $href, $wgNoFollowDomainExceptions ) ) {
                                                        $extraAttribs['rel'] = 'nofollow';
-
-                                                       global $wgNoFollowDomainExceptions;
-                                                       if ( $wgNoFollowDomainExceptions ) {
-                                                               $bits = wfParseUrl( $url );
-                                                               if ( is_array( $bits ) && isset( $bits['host'] ) ) {
-                                                                       foreach ( $wgNoFollowDomainExceptions as $domain ) {
-                                                                               if ( substr( $bits['host'], -strlen( $domain ) ) == $domain ) {
-                                                                                       unset( $extraAttribs['rel'] );
-                                                                                       break;
-                                                                               }
-                                                                       }
-                                                               }
-                                                       }
                                                }
+                                               
                                                global $wgExternalLinkTarget;
                                                if ( $wgExternalLinkTarget) {
                                                        $extraAttribs['target'] = $wgExternalLinkTarget;
@@ -1213,7 +1168,7 @@ abstract class Skin extends ContextSource {
 
                                                if ( $title ) {
                                                        $title = $title->fixSpecialName();
-                                                       $href = $title->getLocalURL();
+                                                       $href = $title->getLinkURL();
                                                } else {
                                                        $href = 'INVALID-TITLE';
                                                }
@@ -1225,25 +1180,12 @@ abstract class Skin extends ContextSource {
                                                'id' => 'n-' . Sanitizer::escapeId( strtr( $line[1], ' ', '-' ), 'noninitial' ),
                                                'active' => false
                                        ), $extraAttribs );
-                               } elseif ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
-                                       global $wgParser;
-
-                                       $line = substr( $line, 2, strlen( $line ) - 4 );
-
-                                       $options = new ParserOptions();
-                                       $options->setEditSection( false );
-                                       $options->setInterfaceMessage( true );
-                                       $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $this->getTitle(), $options )->getText();
                                } else {
                                        continue;
                                }
                        }
                }
 
-               if ( count( $wikiBar ) > 0 ) {
-                       $bar = array_merge( $bar, $wikiBar );
-               }
-
                return $bar;
        }
 
@@ -1274,20 +1216,18 @@ abstract class Skin extends ContextSource {
                        $userTalkTitle = $userTitle->getTalkPage();
 
                        if ( !$userTalkTitle->equals( $out->getTitle() ) ) {
-                               $newMessagesLink = $this->link(
+                               $newMessagesLink = Linker::linkKnown(
                                        $userTalkTitle,
                                        wfMsgHtml( 'newmessageslink' ),
                                        array(),
-                                       array( 'redirect' => 'no' ),
-                                       array( 'known', 'noclasses' )
+                                       array( 'redirect' => 'no' )
                                );
 
-                               $newMessagesDiffLink = $this->link(
+                               $newMessagesDiffLink = Linker::linkKnown(
                                        $userTalkTitle,
                                        wfMsgHtml( 'newmessagesdifflink' ),
                                        array(),
-                                       array( 'diff' => 'cur' ),
-                                       array( 'known', 'noclasses' )
+                                       array( 'diff' => 'cur' )
                                );
 
                                $ntl = wfMsg(