Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / libs / IEUrlExtension.php

diff --git a/includes/libs/IEUrlExtension.php b/includes/libs/IEUrlExtension.php
index 79387e6..16163fb 100644 (file)
--- a/includes/libs/IEUrlExtension.php
+++ b/includes/libs/IEUrlExtension.php
@@ -59,7 +59,7 @@ class IEUrlExtension {
         * @param array $extWhitelist Extensions which are allowed, assumed harmless.
         * @return bool
         */
-       public static function areServerVarsBad( $vars, $extWhitelist = array() ) {
+       public static function areServerVarsBad( $vars, $extWhitelist = [] ) {
                // Check QUERY_STRING or REQUEST_URI
                if ( isset( $vars['SERVER_SOFTWARE'] )
                        && isset( $vars['REQUEST_URI'] )
@@ -97,7 +97,7 @@ class IEUrlExtension {
         *    URL, and which should be allowed.
         * @return bool
         */
-       public static function isUrlExtensionBad( $urlPart, $extWhitelist = array() ) {
+       public static function isUrlExtensionBad( $urlPart, $extWhitelist = [] ) {
                if ( strval( $urlPart ) === '' ) {
                        return false;
                }
@@ -108,7 +108,7 @@ class IEUrlExtension {
                        return false;
                }
 
-               if ( in_array( $extension, array( 'php', 'php5' ) ) ) {
+               if ( in_array( $extension, [ 'php', 'php5' ] ) ) {
                        // Script extension, OK
                        return false;
                }
@@ -119,7 +119,6 @@ class IEUrlExtension {
 
                if ( !preg_match( '/^[a-zA-Z0-9_-]+$/', $extension ) ) {
                        // Non-alphanumeric extension, unlikely to be registered.
-                       //
                        // The regex above is known to match all registered file extensions
                        // in a default Windows XP installation. It's important to allow
                        // extensions with ampersands and percent signs, since that reduces
@@ -138,7 +137,7 @@ class IEUrlExtension {
         * @param $extWhitelist array
         * @return bool|string
         */
-       public static function fixUrlForIE6( $url, $extWhitelist = array() ) {
+       public static function fixUrlForIE6( $url, $extWhitelist = [] ) {
                $questionPos = strpos( $url, '?' );
                if ( $questionPos === false ) {
                        $beforeQuery = $url . '?';
@@ -232,7 +231,7 @@ class IEUrlExtension {
                        }
                        // We found an illegal character or another dot
                        // Skip to that character and continue the loop
-                       $pos = $nextPos + 1;
+                       $pos = $nextPos;
                        $remainingLength = $urlLength - $pos;
                }
                return false;
@@ -257,10 +256,10 @@ class IEUrlExtension {
         *
         */
        public static function haveUndecodedRequestUri( $serverSoftware ) {
-               static $whitelist = array(
+               static $whitelist = [
                        'Apache',
                        'Zeus',
-                       'LiteSpeed' );
+                       'LiteSpeed' ];
                if ( preg_match( '/^(.*?)($|\/| )/', $serverSoftware, $m ) ) {
                        return in_array( $m[1], $whitelist );
                } else {