Rm some long-commented code, including quite possibly the lamest use of $wgTitle...

[lhc/web/wiklou.git] / skins / Standard.php

diff --git a/skins/Standard.php b/skins/Standard.php
index fb8beda..b91254b 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -6,24 +6,15 @@
  * @ingroup Skins
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if( !defined( 'MEDIAWIKI' ) ) {
        die( -1 );
+}
 
 /**
  * @todo document
  * @ingroup Skins
  */
 class SkinStandard extends Skin {
-       /*
-        * OutputPage
-        */
-       function outputPage( OutputPage $out ) {
-               global $wgStylePath;
-               if ( 3 == $this->qbSetting() ) { # Floating left
-                       $out->addScriptFile ( "{$wgStylePath}/common/sticky.js" );
-               }
-               parent::outputPage( $out );
-       }
 
        /**
         *
@@ -31,7 +22,7 @@ class SkinStandard extends Skin {
        function setupSkinUserCss( OutputPage $out ){
                if ( 3 == $this->qbSetting() ) { # Floating left
                        $out->addStyle( 'common/quickbar.css' );
-               } else if ( 4 == $this->qbSetting() ) { # Floating right
+               } elseif ( 4 == $this->qbSetting() ) { # Floating right
                        $out->addStyle( 'common/quickbar-right.css' );
                }
                parent::setupSkinUserCss( $out );
@@ -46,15 +37,15 @@ class SkinStandard extends Skin {
 
                if ( 2 == $qb ) { # Right
                        $s .= "#quickbar { position: absolute; top: 4px; right: 4px; " .
-                         "border-left: 2px solid #000000; }\n" .
-                         "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n";
-               } else if ( 1 == $qb || 3 == $qb ) {
+                               "border-left: 2px solid #000000; }\n" .
+                               "#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }\n";
+               } elseif ( 1 == $qb || 3 == $qb ) {
                        $s .= "#quickbar { position: absolute; top: 4px; left: 4px; " .
-                         "border-right: 1px solid gray; }\n" .
-                         "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n";
-               } else if ( 4 == $qb) {
+                               "border-right: 1px solid gray; }\n" .
+                               "#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }\n";
+               } elseif ( 4 == $qb ) {
                        $s .= "#quickbar { border-right: 1px solid gray; }\n" .
-                         "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n";
+                               "#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }\n";
                }
                return $s;
        }
@@ -74,10 +65,12 @@ class SkinStandard extends Skin {
                $qb = $this->qbSetting();
                $shove = ( $qb != 0 );
                $left = ( $qb == 1 || $qb == 3 );
-               if( $wgContLang->isRTL() ) $left = !$left;
+               if( $wgContLang->isRTL() ) {
+                       $left = !$left;
+               }
 
                if ( $shove && $left ) { # Left
-                               $s .= $this->getQuickbarCompensator();
+                       $s .= $this->getQuickbarCompensator();
                }
                wfProfileOut( __METHOD__ . '-2' );
                wfProfileIn( __METHOD__ . '-3' );
@@ -88,9 +81,9 @@ class SkinStandard extends Skin {
                $s .= "\n<br />" . $wgLang->pipeList( array(
                        $this->mainPageLink(),
                        $this->aboutLink(),
-                       $this->specialLink( 'recentchanges' ),
+                       $this->specialLink( 'Recentchanges' ),
                        $this->searchForm() ) )
-                 . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
+                       . '<br /><span id="pagestats">' . $this->pageStats() . '</span>';
 
                $s .= '</td>';
                if ( $shove && !$left ) { # Right
@@ -110,7 +103,6 @@ class SkinStandard extends Skin {
 
        function quickBar() {
                global $wgOut, $wgUser, $wgRequest, $wgContLang;
-               global $wgEnableUploads, $wgRemoteUploads;
 
                wfProfileIn( __METHOD__ );
 
@@ -138,7 +130,7 @@ class SkinStandard extends Skin {
                }
 
                if( $wgUser->isLoggedIn() ) {
-                       $s.= $this->specialLink( 'watchlist' ) ;
+                       $s.= $this->specialLink( 'Watchlist' ) ;
                        $s .= $sep . $this->linkKnown(
                                SpecialPage::getTitleFor( 'Contributions' ),
                                wfMsg( 'mycontris' ),
@@ -194,7 +186,8 @@ class SkinStandard extends Skin {
                                        }
 
                                        $link = $this->mTitle->getText();
-                                       if( $nstext = $wgContLang->getNsText( $tns ) ) { # add namespace if necessary
+                                       $nstext = $wgContLang->getNsText( $tns );
+                                       if( $nstext ) { # add namespace if necessary
                                                $link = $nstext . ':' . $link;
                                        }
 
@@ -222,24 +215,20 @@ class SkinStandard extends Skin {
                                        array( 'known', 'noclasses' )
                                );
 
-                       #if( $tns%2 && $action!='edit' && !$wpPreview) {
-                               #$s.= '<br />'.$this->linkKnown( Title::newFromText( $wgTitle->getPrefixedText() ),wfMsg('postcomment'),array(),array('action'=>'edit','section'=>'new'));
-                       #}
-
                        /*
                        watching could cause problems in edit mode:
                        if user edits article, then loads "watch this article" in background and then saves
                        article with "Watch this article" checkbox disabled, the article is transparently
                        unwatched. Therefore we do not show the "Watch this page" link in edit mode
                        */
-                       if ( $wgUser->isLoggedIn() && $articleExists) {
-                               if( $action != 'edit' && $action != 'submit' ){
+                       if ( $wgUser->isLoggedIn() && $articleExists ) {
+                               if( $action != 'edit' && $action != 'submit' ) {
                                        $s .= $sep . $this->watchThisPage();
                                }
                                if ( $this->mTitle->userCan( 'edit' ) )
                                        $s .= $sep . $this->moveThisPage();
                        }
-                       if ( $wgUser->isAllowed( 'delete' ) and $articleExists ) {
+                       if ( $wgUser->isAllowed( 'delete' ) && $articleExists ) {
                                $s .= $sep . $this->deleteThisPage() .
                                $sep . $this->protectThisPage();
                        }
@@ -247,14 +236,16 @@ class SkinStandard extends Skin {
                        if( $articleExists && $action != 'history' ) {
                                $s .= $sep . $this->historyLink();
                        }
-                       $s.= $sep . $this->whatLinksHere();
+                       $s .= $sep . $this->whatLinksHere();
 
                        if( $wgOut->isArticleRelated() ) {
                                $s .= $sep . $this->watchPageLinksLink();
                        }
 
-                       if ( NS_USER == $this->mTitle->getNamespace()
-                               || $this->mTitle->getNamespace() == NS_USER_TALK ) {
+                       if (
+                               NS_USER == $this->mTitle->getNamespace() ||
+                               $this->mTitle->getNamespace() == NS_USER_TALK
+                       ) {
 
                                $id = User::idFromName( $this->mTitle->getText() );
                                $ip = User::isIP( $this->mTitle->getText() );
@@ -269,10 +260,11 @@ class SkinStandard extends Skin {
                        $s .= "\n<br /><hr class='sep' />";
                }
 
-               if ( $wgUser->isLoggedIn() && ( $wgEnableUploads || $wgRemoteUploads ) ) {
-                       $s .= $this->specialLink( 'upload' ) . $sep;
+               if( UploadBase::isEnabled() && UploadBase::isAllowed( $wgUser ) === true ) {
+                       $s .= $this->getUploadLink() . $sep;
                }
-               $s .= $this->specialLink( 'specialpages' );
+
+               $s .= $this->specialLink( 'Specialpages' );
 
                global $wgSiteSupportPage;
                if( $wgSiteSupportPage ) {