Stylise Setup.php

diff --git a/includes/Setup.php b/includes/Setup.php
index 547e549..e51efee 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -9,7 +9,7 @@
  * This file is not a valid entry point, perform no further processing unless
  * MEDIAWIKI is defined
  */
-if( !defined( 'MEDIAWIKI' ) ) {
+if ( !defined( 'MEDIAWIKI' ) ) {
        exit( 1 );
 }
 
@@ -29,60 +29,62 @@ if ( !isset( $wgVersion ) ) {
 }
 
 // Set various default paths sensibly...
-if( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
-if( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
-if( $wgLoadScript === false ) $wgLoadScript = "$wgScriptPath/load$wgScriptExtension";
+if ( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
+if ( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
+if ( $wgLoadScript === false ) $wgLoadScript = "$wgScriptPath/load$wgScriptExtension";
 
-if( $wgArticlePath === false ) {
-       if( $wgUsePathInfo ) {
+if ( $wgArticlePath === false ) {
+       if ( $wgUsePathInfo ) {
                $wgArticlePath      = "$wgScript/$1";
        } else {
                $wgArticlePath      = "$wgScript?title=$1";
        }
 }
 
-if( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins";
-if( $wgLocalStylePath === false ) $wgLocalStylePath = "$wgScriptPath/skins";
-if( $wgStyleDirectory === false) $wgStyleDirectory   = "$IP/skins";
-if( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions";
+if ( $wgStylePath === false ) $wgStylePath = "$wgScriptPath/skins";
+if ( $wgLocalStylePath === false ) $wgLocalStylePath = "$wgScriptPath/skins";
+if ( $wgStyleDirectory === false ) $wgStyleDirectory   = "$IP/skins";
+if ( $wgExtensionAssetsPath === false ) $wgExtensionAssetsPath = "$wgScriptPath/extensions";
 
-if( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/wiki.png";
+if ( $wgLogo === false ) $wgLogo = "$wgStylePath/common/images/wiki.png";
 
-if( $wgUploadPath === false ) $wgUploadPath = "$wgScriptPath/images";
-if( $wgUploadDirectory === false ) $wgUploadDirectory = "$IP/images";
+if ( $wgUploadPath === false ) $wgUploadPath = "$wgScriptPath/images";
+if ( $wgUploadDirectory === false ) $wgUploadDirectory = "$IP/images";
 
-if( $wgMathPath === false ) $wgMathPath = "{$wgUploadPath}/math";
-if( $wgMathDirectory === false ) $wgMathDirectory = "{$wgUploadDirectory}/math";
-if( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
+if ( $wgMathPath === false ) $wgMathPath = "{$wgUploadPath}/math";
+if ( $wgMathDirectory === false ) $wgMathDirectory = "{$wgUploadDirectory}/math";
+if ( $wgTmpDirectory === false ) $wgTmpDirectory = "{$wgUploadDirectory}/tmp";
 
-if( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
-if( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
-if( $wgDeletedDirectory === false ) $wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
+if ( $wgReadOnlyFile === false ) $wgReadOnlyFile = "{$wgUploadDirectory}/lock_yBgMBwiR";
+if ( $wgFileCacheDirectory === false ) $wgFileCacheDirectory = "{$wgUploadDirectory}/cache";
+if ( $wgDeletedDirectory === false ) $wgDeletedDirectory = "{$wgUploadDirectory}/deleted";
 
-if( isset( $wgFileStore['deleted']['directory'] ) ) {
+if ( isset( $wgFileStore['deleted']['directory'] ) ) {
        $wgDeletedDirectory = $wgFileStore['deleted']['directory'];
 }
 
-if( isset($wgFooterIcons["copyright"]) &&
-  isset($wgFooterIcons["copyright"]["copyright"]) &&
-  $wgFooterIcons["copyright"]["copyright"] === array() ) {
+if ( isset( $wgFooterIcons['copyright'] ) &&
+       isset( $wgFooterIcons['copyright']['copyright'] ) &&
+       $wgFooterIcons['copyright']['copyright'] === array() )
+{
        if ( isset( $wgCopyrightIcon ) && $wgCopyrightIcon ) {
-               $wgFooterIcons["copyright"]["copyright"] = $wgCopyrightIcon;
+               $wgFooterIcons['copyright']['copyright'] = $wgCopyrightIcon;
        } elseif ( $wgRightsIcon || $wgRightsText ) {
-               $wgFooterIcons["copyright"]["copyright"] = array(
-                       "url" => $wgRightsUrl,
-                       "src" => $wgRightsIcon,
-                       "alt" => $wgRightsText,
+               $wgFooterIcons['copyright']['copyright'] = array(
+                       'url' => $wgRightsUrl,
+                       'src' => $wgRightsIcon,
+                       'alt' => $wgRightsText,
                );
        } else {
-               unset($wgFooterIcons["copyright"]["copyright"]);
+               unset( $wgFooterIcons['copyright']['copyright'] );
        }
 }
 
-if( isset($wgFooterIcons["poweredby"]) &&
-  isset($wgFooterIcons["poweredby"]["mediawiki"]) &&
-  $wgFooterIcons["poweredby"]["mediawiki"]["src"] === null ) {
-       $wgFooterIcons["poweredby"]["mediawiki"]["src"] = "$wgStylePath/common/images/poweredby_mediawiki_88x31.png";
+if ( isset( $wgFooterIcons['poweredby'] ) &&
+       isset( $wgFooterIcons['poweredby']['mediawiki'] ) &&
+       $wgFooterIcons['poweredby']['mediawiki']['src'] === null )
+{
+       $wgFooterIcons['poweredby']['mediawiki']['src'] = "$wgStylePath/common/images/poweredby_mediawiki_88x31.png";
 }
 
 /**
@@ -106,7 +108,7 @@ $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
  * Initialise $wgLocalFileRepo from backwards-compatible settings
  */
 if ( !$wgLocalFileRepo ) {
-       if( isset( $wgFileStore['deleted']['hash'] ) ) {
+       if ( isset( $wgFileStore['deleted']['hash'] ) ) {
                $deletedHashLevel = $wgFileStore['deleted']['hash'];
        } else {
                $deletedHashLevel = $wgHashedUploadDirectory ? 3 : 0;
@@ -143,7 +145,7 @@ if ( $wgUseSharedUploads ) {
                        'dbUser' => $wgDBuser,
                        'dbPassword' => $wgDBpassword,
                        'dbName' => $wgSharedUploadDBname,
-                       'dbFlags' => ($wgDebugDumpSql ? DBO_DEBUG : 0) | DBO_DEFAULT,
+                       'dbFlags' => ( $wgDebugDumpSql ? DBO_DEBUG : 0 ) | DBO_DEFAULT,
                        'tablePrefix' => $wgSharedUploadDBprefix,
                        'hasSharedCache' => $wgCacheSharedUploads,
                        'descBaseUrl' => $wgRepositoryBaseUrl,
@@ -163,7 +165,7 @@ if ( $wgUseSharedUploads ) {
                );
        }
 }
-if( $wgUseInstantCommons ) {
+if ( $wgUseInstantCommons ) {
        $wgForeignFileRepos[] = array(
                'class'                   => 'ForeignAPIRepo',
                'name'                    => 'wikimediacommons',
@@ -176,12 +178,12 @@ if( $wgUseInstantCommons ) {
 }
 
 if ( $wgRCFilterByAge ) {
-       ## Trim down $wgRCLinkDays so that it only lists links which are valid
-       ## as determined by $wgRCMaxAge.
-       ## Note that we allow 1 link higher than the max for things like 56 days but a 60 day link.
+       # # Trim down $wgRCLinkDays so that it only lists links which are valid
+       # # as determined by $wgRCMaxAge.
+       # # Note that we allow 1 link higher than the max for things like 56 days but a 60 day link.
        sort( $wgRCLinkDays );
-       for( $i = 0; $i < count( $wgRCLinkDays ); $i++ ) {
-               if( $wgRCLinkDays[$i] >= $wgRCMaxAge / ( 3600 * 24 ) ) {
+       for ( $i = 0; $i < count( $wgRCLinkDays ); $i++ ) {
+               if ( $wgRCLinkDays[$i] >= $wgRCMaxAge / ( 3600 * 24 ) ) {
                        $wgRCLinkDays = array_slice( $wgRCLinkDays, 0, $i + 1, false );
                        break;
                }
@@ -208,7 +210,7 @@ if ( !$wgCookiePrefix ) {
                $wgCookiePrefix = $wgDBname;
        }
 }
-$wgCookiePrefix = strtr( $wgCookiePrefix, "=,; +.\"'\\[", "__________" );
+$wgCookiePrefix = strtr( $wgCookiePrefix, '=,; +."\'\\[', '__________' );
 
 $wgUseEnotif = $wgEnotifUserTalk || $wgEnotifWatchlist;
 
@@ -271,20 +273,20 @@ if ( !class_exists( 'AutoLoader' ) ) {
        require_once( "$IP/includes/AutoLoader.php" );
 }
 
-wfProfileIn( $fname.'-exception' );
+wfProfileIn( $fname . '-exception' );
 require_once( "$IP/includes/Exception.php" );
 wfInstallExceptionHandler();
-wfProfileOut( $fname.'-exception' );
+wfProfileOut( $fname . '-exception' );
 
-wfProfileIn( $fname.'-includes' );
+wfProfileIn( $fname . '-includes' );
 require_once( "$IP/includes/GlobalFunctions.php" );
 require_once( "$IP/includes/Hooks.php" );
 require_once( "$IP/includes/Namespace.php" );
 require_once( "$IP/includes/ProxyTools.php" );
 require_once( "$IP/includes/ObjectCache.php" );
 require_once( "$IP/includes/ImageFunctions.php" );
-wfProfileOut( $fname.'-includes' );
-wfProfileIn( $fname.'-misc1' );
+wfProfileOut( $fname . '-includes' );
+wfProfileIn( $fname . '-misc1' );
 
 # Raise the memory limit if it's too low
 wfMemoryLimit();
@@ -339,8 +341,8 @@ if ( $wgCommandLineMode ) {
        }
 }
 
-wfProfileOut( $fname.'-misc1' );
-wfProfileIn( $fname.'-memcached' );
+wfProfileOut( $fname . '-misc1' );
+wfProfileIn( $fname . '-memcached' );
 
 $wgMemc =& wfGetMainCache();
 $messageMemc =& wfGetMessageCacheStorage();
@@ -350,20 +352,20 @@ wfDebug( 'CACHES: ' . get_class( $wgMemc ) . '[main] ' .
        get_class( $messageMemc ) . '[message] ' .
        get_class( $parserMemc ) . "[parser]\n" );
 
-wfProfileOut( $fname.'-memcached' );
+wfProfileOut( $fname . '-memcached' );
 
-## Most of the config is out, some might want to run hooks here.
+# # Most of the config is out, some might want to run hooks here.
 wfRunHooks( 'SetupAfterCache' );
 
-wfProfileIn( $fname.'-session' );
+wfProfileIn( $fname . '-session' );
 
 # If session.auto_start is there, we can't touch session name
 if ( !wfIniGetBool( 'session.auto_start' ) ) {
        session_name( $wgSessionName ? $wgSessionName : $wgCookiePrefix . '_session' );
 }
 
-if( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
-       if( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix.'Token'] ) ) {
+if ( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
+       if ( $wgRequest->checkSessionCookie() || isset( $_COOKIE[$wgCookiePrefix . 'Token'] ) ) {
                wfIncrStats( 'request_with_session' );
                wfSetupSession();
                $wgSessionStarted = true;
@@ -373,8 +375,8 @@ if( !defined( 'MW_NO_SESSION' ) && !$wgCommandLineMode ) {
        }
 }
 
-wfProfileOut( $fname.'-session' );
-wfProfileIn( $fname.'-globals' );
+wfProfileOut( $fname . '-session' );
+wfProfileIn( $fname . '-globals' );
 
 $wgContLang = new StubContLang;
 
@@ -388,7 +390,7 @@ $wgParser = new StubObject( 'wgParser', $wgParserConf['class'], array( $wgParser
 $wgMessageCache = new StubObject( 'wgMessageCache', 'MessageCache',
        array( $messageMemc, $wgUseDatabaseMessages, $wgMsgCacheExpiry ) );
 
-if( !is_object( $wgAuth ) ) {
+if ( !is_object( $wgAuth ) ) {
        $wgAuth = new StubObject( 'wgAuth', 'AuthPlugin' );
        wfRunHooks( 'AuthPluginSetup', array( &$wgAuth ) );
 }
@@ -399,8 +401,8 @@ $wgArticle = null;
 
 $wgDeferredUpdateList = array();
 
-wfProfileOut( $fname.'-globals' );
-wfProfileIn( $fname.'-extensions' );
+wfProfileOut( $fname . '-globals' );
+wfProfileIn( $fname . '-extensions' );
 
 # Skin setup functions
 # Entries can be added to this variable during the inclusion
@@ -416,14 +418,14 @@ foreach ( $wgSkinExtensionFunctions as $func ) {
 foreach ( $wgExtensionFunctions as $func ) {
        # Allow closures in PHP 5.3+
        if ( is_object( $func ) && $func instanceof Closure ) {
-               $profName = $fname.'-extensions-closure';
-       } elseif( is_array( $func ) ) {
+               $profName = $fname . '-extensions-closure';
+       } elseif ( is_array( $func ) ) {
                if ( is_object( $func[0] ) )
-                       $profName = $fname.'-extensions-'.get_class( $func[0] ).'::'.$func[1];
+                       $profName = $fname . '-extensions-' . get_class( $func[0] ) . '::' . $func[1];
                else
-                       $profName = $fname.'-extensions-'.implode( '::', $func );
+                       $profName = $fname . '-extensions-' . implode( '::', $func );
        } else {
-               $profName = $fname.'-extensions-'.strval( $func );
+               $profName = $fname . '-extensions-' . strval( $func );
        }
 
        wfProfileIn( $profName );
@@ -439,5 +441,5 @@ wfRunHooks( 'LogPageActionText', array( &$wgLogActions ) );
 
 wfDebug( "Fully initialised\n" );
 $wgFullyInitialised = true;
-wfProfileOut( $fname.'-extensions' );
+wfProfileOut( $fname . '-extensions' );
 wfProfileOut( $fname );