X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2FIEUrlExtension.php;h=0d969fb270734f0e39a3d9c25835dd2ef2ff15b1;hb=3bd96b883843816ab2e3eca75a0b65163ff594b0;hp=216d9b78604c6c8802f63cf52ddc53c57162e7e2;hpb=568284cf57d38fa9d515aabd28731bd0509df9a8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/libs/IEUrlExtension.php b/includes/libs/IEUrlExtension.php
index 216d9b7860..0d969fb270 100644
--- a/includes/libs/IEUrlExtension.php
+++ b/includes/libs/IEUrlExtension.php
@@ -59,12 +59,12 @@ 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'] )
-			&& self::haveUndecodedRequestUri( $vars['SERVER_SOFTWARE'] ) )
-		{
+			&& self::haveUndecodedRequestUri( $vars['SERVER_SOFTWARE'] )
+		) {
 			$urlPart = $vars['REQUEST_URI'];
 		} elseif ( isset( $vars['QUERY_STRING'] ) ) {
 			$urlPart = $vars['QUERY_STRING'];
@@ -79,8 +79,8 @@ class IEUrlExtension {
 		// Some servers have PATH_INFO but not REQUEST_URI, so we check both
 		// to be on the safe side.
 		if ( isset( $vars['PATH_INFO'] )
-			&& self::isUrlExtensionBad( $vars['PATH_INFO'], $extWhitelist ) )
-		{
+			&& self::isUrlExtensionBad( $vars['PATH_INFO'], $extWhitelist )
+		) {
 			return true;
 		}
 
@@ -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;
 		}
@@ -133,11 +133,11 @@ class IEUrlExtension {
 	/**
 	 * Returns a variant of $url which will pass isUrlExtensionBad() but has the
 	 * same GET parameters, or false if it can't figure one out.
-	 * @param $url
-	 * @param $extWhitelist array
+	 * @param string $url
+	 * @param array $extWhitelist
 	 * @return bool|string
 	 */
-	public static function fixUrlForIE6( $url, $extWhitelist = array() ) {
+	public static function fixUrlForIE6( $url, $extWhitelist = [] ) {
 		$questionPos = strpos( $url, '?' );
 		if ( $questionPos === false ) {
 			$beforeQuery = $url . '?';
@@ -186,7 +186,7 @@ class IEUrlExtension {
 	 * - if we find a possible extension followed by a dot or another illegal
 	 *   character, we ignore it and continue searching
 	 *
-	 * @param string $url URL
+	 * @param string $url
 	 * @return mixed Detected extension (string), or false if none found
 	 */
 	public static function findIE6Extension( $url ) {
@@ -223,8 +223,8 @@ class IEUrlExtension {
 				// If the extension is NOT exe, dll or cgi, return it
 				$extension = substr( $url, $pos, $nextPos - $pos );
 				if ( strcasecmp( $extension, 'exe' ) && strcasecmp( $extension, 'dll' ) &&
-					strcasecmp( $extension, 'cgi' ) )
-				{
+					strcasecmp( $extension, 'cgi' )
+				) {
 					return $extension;
 				}
 				// Else continue looking
@@ -251,15 +251,14 @@ class IEUrlExtension {
 	 * or a specification in the style of a User-Agent header, such as
 	 * "Apache/1.3.34 (Unix) mod_ssl/2.8.25 OpenSSL/0.9.8a PHP/4.4.2"
 	 *
-	 * @param $serverSoftware
+	 * @param string $serverSoftware
 	 * @return bool
-	 *
 	 */
 	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 {