Rm some long-commented code, including quite possibly the lamest use of $wgTitle...
[lhc/web/wiklou.git] / skins / Standard.php
index 5c0cc5e..b91254b 100644 (file)
@@ -6,8 +6,9 @@
  * @ingroup Skins
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if( !defined( 'MEDIAWIKI' ) ) {
        die( -1 );
+}
 
 /**
  * @todo document
@@ -15,27 +16,13 @@ if( !defined( 'MEDIAWIKI' ) )
  */
 class SkinStandard extends Skin {
 
-       /**
-        *
-        */
-       function getHeadScripts( $allowUserJs ) {
-               global $wgStylePath, $wgJsMimeType, $wgStyleVersion;
-
-               $s = parent::getHeadScripts( $allowUserJs );
-               if ( 3 == $this->qbSetting() ) { # Floating left
-                       $s .= "<script language='javascript' type='$wgJsMimeType' " .
-                         "src='{$wgStylePath}/common/sticky.js?$wgStyleVersion'></script>\n";
-               }
-               return $s;
-       }
-
        /**
         *
         */
        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 );
@@ -50,36 +37,19 @@ 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;
        }
 
-       /**
-        *
-        */
-       function getBodyOptions() {
-               $a = parent::getBodyOptions();
-
-               if ( 3 == $this->qbSetting() ) { # Floating left
-                       $qb = "setup(\"quickbar\")";
-                       if( $a['onload'] ) {
-                               $a['onload'] .= ";$qb";
-                       } else {
-                               $a['onload'] = $qb;
-                       }
-               }
-               return $a;
-       }
-
        function doAfterContent() {
                global $wgContLang, $wgLang;
                wfProfileIn( __METHOD__ );
@@ -95,23 +65,25 @@ 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' );
-               $l = $wgContLang->isRTL() ? 'right' : 'left';
+               $l = $wgContLang->alignStart();
                $s .= "<td class='bottom' align='$l' valign='top'>";
 
                $s .= $this->bottomLinks();
                $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
@@ -131,13 +103,12 @@ class SkinStandard extends Skin {
 
        function quickBar() {
                global $wgOut, $wgUser, $wgRequest, $wgContLang;
-               global $wgEnableUploads, $wgRemoteUploads;
 
                wfProfileIn( __METHOD__ );
 
                $action = $wgRequest->getText( 'action' );
                $wpPreview = $wgRequest->getBool( 'wpPreview' );
-               $tns = $wgOut->getTitle()->getNamespace();
+               $tns = $this->mTitle->getNamespace();
 
                $s = "\n<div id='quickbar'>";
                $s .= "\n" . $this->logoText() . "\n<hr class='sep' />";
@@ -159,13 +130,17 @@ class SkinStandard extends Skin {
                }
 
                if( $wgUser->isLoggedIn() ) {
-                       $s.= $this->specialLink( 'watchlist' ) ;
-                       $s .= $sep . $this->makeKnownLink( $wgContLang->specialPage( 'Contributions' ),
-                               wfMsg( 'mycontris' ), 'target=' . wfUrlencode( $wgUser->getName() ) );
+                       $s.= $this->specialLink( 'Watchlist' ) ;
+                       $s .= $sep . $this->linkKnown(
+                               SpecialPage::getTitleFor( 'Contributions' ),
+                               wfMsg( 'mycontris' ),
+                               array(),
+                               array( 'target' => $wgUser->getName() )
+                       );
                }
                // only show watchlist link if logged in
                $s .= "\n<hr class='sep' />";
-               $articleExists = $wgOut->getTitle()->getArticleId();
+               $articleExists = $this->mTitle->getArticleId();
                if ( $wgOut->isArticle() || $action == 'edit' || $action == 'history' || $wpPreview ) {
                        if( $wgOut->isArticle() ) {
                                $s .= '<strong>' . $this->editThisPage() . '</strong>';
@@ -210,27 +185,35 @@ class SkinStandard extends Skin {
                                                        $text = wfMsg( 'articlepage' );
                                        }
 
-                                       $link = $wgOut->getTitle()->getText();
-                                       if( $nstext = $wgContLang->getNsText( $tns ) ) { # add namespace if necessary
+                                       $link = $this->mTitle->getText();
+                                       $nstext = $wgContLang->getNsText( $tns );
+                                       if( $nstext ) { # add namespace if necessary
                                                $link = $nstext . ':' . $link;
                                        }
 
-                                       $s .= $this->makeLink( $link, $text );
-                               } elseif( $wgOut->getTitle()->getNamespace() != NS_SPECIAL ) {
+                                       $s .= $this->link(
+                                               Title::newFromText( $link ),
+                                               $text
+                                       );
+                               } elseif( $this->mTitle->getNamespace() != NS_SPECIAL ) {
                                        # we just throw in a "New page" text to tell the user that he's in edit mode,
                                        # and to avoid messing with the separator that is prepended to the next item
                                        $s .= '<strong>' . wfMsg( 'newpage' ) . '</strong>';
                                }
-
                        }
 
                        # "Post a comment" link
-                       if( ( $wgOut->getTitle()->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
-                               $s .= '<br />' . $this->makeKnownLinkObj( $wgOut->getTitle(), wfMsg( 'postcomment' ), 'action=edit&section=new' );
-                       
-                       #if( $tns%2 && $action!='edit' && !$wpPreview) {
-                               #$s.= '<br />'.$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg('postcomment'),'action=edit&section=new');
-                       #}
+                       if( ( $this->mTitle->isTalkPage() || $wgOut->showNewSectionLink() ) && $action != 'edit' && !$wpPreview )
+                               $s .= '<br />' . $this->link(
+                                       $this->mTitle,
+                                       wfMsg( 'postcomment' ),
+                                       array(),
+                                       array(
+                                               'action' => 'edit',
+                                               'section' => 'new'
+                                       ),
+                                       array( 'known', 'noclasses' )
+                               );
 
                        /*
                        watching could cause problems in edit mode:
@@ -238,14 +221,14 @@ class SkinStandard extends Skin {
                        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 ( $wgOut->getTitle()->userCan( 'edit' ) )
+                               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();
                        }
@@ -253,17 +236,19 @@ 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 == $wgOut->getTitle()->getNamespace()
-                               || $wgOut->getTitle()->getNamespace() == NS_USER_TALK ) {
+                       if (
+                               NS_USER == $this->mTitle->getNamespace() ||
+                               $this->mTitle->getNamespace() == NS_USER_TALK
+                       ) {
 
-                               $id = User::idFromName( $wgOut->getTitle()->getText() );
-                               $ip = User::isIP( $wgOut->getTitle()->getText() );
+                               $id = User::idFromName( $this->mTitle->getText() );
+                               $ip = User::isIP( $this->mTitle->getText() );
 
                                if( $id || $ip ){
                                        $s .= $sep . $this->userContribsLink();
@@ -275,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 ) {