cleanup to CologneBlue.php, Nostalgia.php and Standard.php

diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php
index e67cbc7..a7aac8a 100644 (file)
--- a/skins/CologneBlue.php
+++ b/skins/CologneBlue.php
@@ -7,8 +7,9 @@
  * @ingroup Skins
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if( !defined( 'MEDIAWIKI' ) ) {
        die( -1 );
+}
 
 /**
  * @todo document
@@ -46,7 +47,9 @@ class SkinCologneBlue extends Skin {
                $s .= '<font size="-1"><span id="langlinks">';
                $s .= str_replace( '<br />', '', $this->otherLanguages() );
                $cat = $this->getCategoryLinks();
-               if( $cat ) $s .= "<br />$cat\n";
+               if( $cat ) {
+                       $s .= "<br />$cat\n";
+               }
                $s .= '<br />' . $this->pageTitleLinks();
                $s .= '</span></font>';
 
@@ -110,20 +113,20 @@ class SkinCologneBlue extends Skin {
 
                if ( 2 == $qb ) { # Right
                        $s .= "#quickbar { position: absolute; right: 4px; }\n" .
-                         "#article { margin-left: 4px; margin-right: 148px; }\n";
-               } else if ( 1 == $qb ) {
+                               "#article { margin-left: 4px; margin-right: 148px; }\n";
+               } elseif ( 1 == $qb ) {
                        $s .= "#quickbar { position: absolute; left: 4px; }\n" .
-                         "#article { margin-left: 148px; margin-right: 4px; }\n";
-               } else if ( 3 == $qb ) { # Floating left
+                               "#article { margin-left: 148px; margin-right: 4px; }\n";
+               } elseif ( 3 == $qb ) { # Floating left
                        $s .= "#quickbar { position:absolute; left:4px } \n" .
-                         "#topbar { margin-left: 148px }\n" .
-                         "#article { margin-left:148px; margin-right: 4px; } \n" .
-                         "body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto ;bottom:4px;} \n"; # Hides from IE
-               } else if ( 4 == $qb ) { # Floating right
+                               "#topbar { margin-left: 148px }\n" .
+                               "#article { margin-left:148px; margin-right: 4px; } \n" .
+                               "body>#quickbar { position:fixed; left:4px; top:4px; overflow:auto ;bottom:4px;} \n"; # Hides from IE
+               } elseif ( 4 == $qb ) { # Floating right
                        $s .= "#quickbar { position: fixed; right: 4px; } \n" .
-                         "#topbar { margin-right: 148px }\n" .
-                         "#article { margin-right: 148px; margin-left: 4px; } \n" .
-                         "body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto ;bottom:4px;} \n"; # Hides from IE
+                               "#topbar { margin-right: 148px }\n" .
+                               "#article { margin-right: 148px; margin-left: 4px; } \n" .
+                               "body>#quickbar { position: fixed; right: 4px; top: 4px; overflow: auto ;bottom:4px;} \n"; # Hides from IE
                }
                return $s;
        }
@@ -242,8 +245,8 @@ class SkinCologneBlue extends Skin {
 
                        $s .= $this->menuHead( 'qbpageoptions' );
                        $s .= $this->talkLink()
-                         . $sep . $this->commentLink()
-                         . $sep . $this->printableLink();
+                                       . $sep . $this->commentLink()
+                                       . $sep . $this->printableLink();
                        if ( $wgUser->isLoggedIn() ) {
                                $s .= $sep . $this->watchThisPage();
                        }
@@ -251,9 +254,9 @@ class SkinCologneBlue extends Skin {
                        $s .= $sep;
 
                        $s .= $this->menuHead( 'qbpageinfo' )
-                         . $this->historyLink()
-                         . $sep . $this->whatLinksHere()
-                         . $sep . $this->watchPageLinksLink();
+                                       . $this->historyLink()
+                                       . $sep . $this->whatLinksHere()
+                                       . $sep . $this->watchPageLinksLink();
 
                        if( $tns == NS_USER || $tns == NS_USER_TALK ) {
                                $id = User::idFromName( $this->mTitle->getText() );
@@ -278,35 +281,33 @@ class SkinCologneBlue extends Skin {
                                array( 'known', 'noclasses' )
                        );
                        if ( $wgUser->getNewtalk() ) {
-                               $tl .= " *";
+                               $tl .= ' *';
                        }
 
                        $s .= $this->link(
-                               $wgUser->getUserPage(),
-                               wfMsg( 'mypage' ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                         )
-                         . $sep . $tl
-                         . $sep . $this->specialLink( 'watchlist' )
-                         . $sep . $this->link(
-                               SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
-                               wfMsg( 'mycontris' ),
-                               array(),
-                               array(),
-                               array( 'known', 'noclasses' )
-                         )
-                         . $sep . $this->specialLink( 'preferences' )
-                         . $sep . $this->specialLink( 'userlogout' );
+                                       $wgUser->getUserPage(),
+                                       wfMsg( 'mypage' ),
+                                       array(),
+                                       array(),
+                                       array( 'known', 'noclasses' )
+                               ) . $sep . $tl . $sep . $this->specialLink( 'watchlist' )
+                                       . $sep .
+                               $this->link(
+                                       SpecialPage::getSafeTitleFor( 'Contributions', $wgUser->getName() ),
+                                       wfMsg( 'mycontris' ),
+                                       array(),
+                                       array(),
+                                       array( 'known', 'noclasses' )
+                               ) . $sep . $this->specialLink( 'preferences' )
+                               . $sep . $this->specialLink( 'userlogout' );
                } else {
                        $s .= $this->specialLink( 'userlogin' );
                }
 
                $s .= $this->menuHead( 'qbspecialpages' )
-                 . $this->specialLink( 'newpages' )
-                 . $sep . $this->specialLink( 'listfiles' )
-                 . $sep . $this->specialLink( 'statistics' );
+                       . $this->specialLink( 'newpages' )
+                       . $sep . $this->specialLink( 'listfiles' )
+                       . $sep . $this->specialLink( 'statistics' );
                if ( $wgUser->isLoggedIn() && $wgEnableUploads ) {
                        $s .= $sep . $this->specialLink( 'upload' );
                }
@@ -315,7 +316,7 @@ class SkinCologneBlue extends Skin {
 
                if( $wgSiteSupportPage ) {
                        $s .= $sep . '<a href="' . htmlspecialchars( $wgSiteSupportPage ) . '" class="internal">'
-                             . wfMsg( 'sitesupport' ) . '</a>';
+                                       . wfMsg( 'sitesupport' ) . '</a>';
                }
 
                $s .= $sep . $this->link(
@@ -330,12 +331,12 @@ class SkinCologneBlue extends Skin {
                return $s;
        }
 
-       function menuHead( $key ){
+       function menuHead( $key ) {
                $s = "\n<h6>" . wfMsg( $key ) . "</h6>";
                return $s;
        }
 
-       function searchForm( $label = '' ){
+       function searchForm( $label = '' ) {
                global $wgRequest, $wgUseTwoButtonsSearchForm;
 
                $search = $wgRequest->getText( 'search' );
@@ -346,13 +347,14 @@ class SkinCologneBlue extends Skin {
                }
 
                $s .= "<input type='text' id=\"searchInput{$this->searchboxes}\" class=\"mw-searchInput\" name=\"search\" size=\"14\" value=\""
-                 . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" /><br />"
-                 . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( 'searcharticle' ) ) . "\" />";
+                       . htmlspecialchars( substr( $search, 0, 256 ) ) . "\" /><br />"
+                       . "<input type='submit' id=\"searchGoButton{$this->searchboxes}\" class=\"searchButton\" name=\"go\" value=\"" . htmlspecialchars( wfMsg( 'searcharticle' ) ) . "\" />";
 
-               if( $wgUseTwoButtonsSearchForm )
+               if( $wgUseTwoButtonsSearchForm ) {
                        $s .= "<input type='submit' id=\"mw-searchButton{$this->searchboxes}\" class=\"searchButton\" name=\"fulltext\" value=\"" . htmlspecialchars( wfMsg( 'search' ) ) . "\" />\n";
-               else
+               } else {
                        $s .= '<div><a href="' . $action . '" rel="search">' . wfMsg( 'powersearch-legend' ) . "</a></div>\n";
+               }
 
                $s .= '</form>';
 

diff --git a/skins/Nostalgia.php b/skins/Nostalgia.php
index 334f1c5..d4f3f06 100644 (file)
--- a/skins/Nostalgia.php
+++ b/skins/Nostalgia.php
@@ -6,8 +6,9 @@
  * @ingroup Skins
  */
 
-if( !defined( 'MEDIAWIKI' ) )
+if( !defined( 'MEDIAWIKI' ) ) {
        die( -1 );
+}
 
 /**
  * @todo document
@@ -40,10 +41,14 @@ class SkinNostalgia extends Skin {
                $s .= $this->pageTitleLinks();
 
                $ol = $this->otherLanguages();
-               if( $ol ) $s .= '<br />' . $ol;
+               if( $ol ) {
+                       $s .= '<br />' . $ol;
+               }
 
                $cat = $this->getCategoryLinks();
-               if( $cat ) $s .= '<br />' . $cat;
+               if( $cat ) {
+                       $s .= '<br />' . $cat;
+               }
 
                $s .= "<br clear='all' /></div><hr />\n</div>\n";
                $s .= "\n<div id='article'>";
@@ -104,8 +109,8 @@ class SkinNostalgia extends Skin {
                $s .= $this->bottomLinks();
                $s .= "\n<br />" . $this->pageStats();
                $s .= "\n<br />" . $this->mainPageLink()
-                 . " | " . $this->aboutLink()
-                 . " | " . $this->searchForm();
+                               . ' | ' . $this->aboutLink()
+                               . ' | ' . $this->searchForm();
 
                $s .= "\n</div>\n</div>\n";
 

diff --git a/skins/Standard.php b/skins/Standard.php
index f7a2435..e57cfaf 100644 (file)
--- a/skins/Standard.php
+++ b/skins/Standard.php
@@ -6,21 +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;
-               parent::outputPage( $out );
-       }
 
        /**
         *
@@ -28,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 );
@@ -43,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;
        }
@@ -71,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' );
@@ -87,7 +83,7 @@ class SkinStandard extends Skin {
                        $this->aboutLink(),
                        $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
@@ -229,14 +225,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 ( $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();
                        }
@@ -244,14 +240,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() );