albertlast / SMF2.1

Sources/random_compat/byte_safe_strings.php

Indentation +149 added lines, -149 removed lines

@@ -27,169 +27,169 @@
  */
 
 if (!is_callable('RandomCompat_strlen')) {
-    if (
-        defined('MB_OVERLOAD_STRING')
-            &&
-        ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_strlen() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
+	if (
+		defined('MB_OVERLOAD_STRING')
+			&&
+		((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING
+	) {
+		/**
+		 * strlen() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version uses mb_strlen() in '8bit' mode to treat strings as raw
+		 * binary rather than UTF-8, ISO-8859-1, etc
+		 *
+		 * @param string $binary_string
+		 *
+		 * @throws TypeError
+		 *
+		 * @return int
+		 */
+		function RandomCompat_strlen($binary_string)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_strlen() expects a string'
+				);
+			}
 
-            return (int) mb_strlen($binary_string, '8bit');
-        }
+			return (int) mb_strlen($binary_string, '8bit');
+		}
 
-    } else {
-        /**
-         * strlen() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just used the default strlen()
-         *
-         * @param string $binary_string
-         *
-         * @throws TypeError
-         *
-         * @return int
-         */
-        function RandomCompat_strlen($binary_string)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_strlen() expects a string'
-                );
-            }
-            return (int) strlen($binary_string);
-        }
-    }
+	} else {
+		/**
+		 * strlen() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version just used the default strlen()
+		 *
+		 * @param string $binary_string
+		 *
+		 * @throws TypeError
+		 *
+		 * @return int
+		 */
+		function RandomCompat_strlen($binary_string)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_strlen() expects a string'
+				);
+			}
+			return (int) strlen($binary_string);
+		}
+	}
 }
 
 if (!is_callable('RandomCompat_substr')) {
 
-    if (
-        defined('MB_OVERLOAD_STRING')
-            &&
-        ((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING
-    ) {
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version uses mb_substr() in '8bit' mode to treat strings as raw
-         * binary rather than UTF-8, ISO-8859-1, etc
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int|null $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+	if (
+		defined('MB_OVERLOAD_STRING')
+			&&
+		((int) ini_get('mbstring.func_overload')) & MB_OVERLOAD_STRING
+	) {
+		/**
+		 * substr() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version uses mb_substr() in '8bit' mode to treat strings as raw
+		 * binary rather than UTF-8, ISO-8859-1, etc
+		 *
+		 * @param string $binary_string
+		 * @param int $start
+		 * @param int|null $length (optional)
+		 *
+		 * @throws TypeError
+		 *
+		 * @return string
+		 */
+		function RandomCompat_substr($binary_string, $start, $length = null)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_substr(): First argument should be a string'
+				);
+			}
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+			if (!is_int($start)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Second argument should be an integer'
+				);
+			}
 
-            if ($length === null) {
-                /**
-                 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
-                 * PHP 5.3, so we have to find the length ourselves.
-                 */
-                /** @var int $length */
-                $length = RandomCompat_strlen($binary_string) - $start;
-            } elseif (!is_int($length)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                );
-            }
+			if ($length === null) {
+				/**
+				 * mb_substr($str, 0, NULL, '8bit') returns an empty string on
+				 * PHP 5.3, so we have to find the length ourselves.
+				 */
+				/** @var int $length */
+				$length = RandomCompat_strlen($binary_string) - $start;
+			} elseif (!is_int($length)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Third argument should be an integer, or omitted'
+				);
+			}
 
-            // Consistency with PHP's behavior
-            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
-                return '';
-            }
-            if ($start > RandomCompat_strlen($binary_string)) {
-                return '';
-            }
+			// Consistency with PHP's behavior
+			if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+				return '';
+			}
+			if ($start > RandomCompat_strlen($binary_string)) {
+				return '';
+			}
 
-            return (string) mb_substr(
-                (string) $binary_string,
-                (int) $start,
-                (int) $length,
-                '8bit'
-            );
-        }
+			return (string) mb_substr(
+				(string) $binary_string,
+				(int) $start,
+				(int) $length,
+				'8bit'
+			);
+		}
 
-    } else {
+	} else {
 
-        /**
-         * substr() implementation that isn't brittle to mbstring.func_overload
-         *
-         * This version just uses the default substr()
-         *
-         * @param string $binary_string
-         * @param int $start
-         * @param int|null $length (optional)
-         *
-         * @throws TypeError
-         *
-         * @return string
-         */
-        function RandomCompat_substr($binary_string, $start, $length = null)
-        {
-            if (!is_string($binary_string)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): First argument should be a string'
-                );
-            }
+		/**
+		 * substr() implementation that isn't brittle to mbstring.func_overload
+		 *
+		 * This version just uses the default substr()
+		 *
+		 * @param string $binary_string
+		 * @param int $start
+		 * @param int|null $length (optional)
+		 *
+		 * @throws TypeError
+		 *
+		 * @return string
+		 */
+		function RandomCompat_substr($binary_string, $start, $length = null)
+		{
+			if (!is_string($binary_string)) {
+				throw new TypeError(
+					'RandomCompat_substr(): First argument should be a string'
+				);
+			}
 
-            if (!is_int($start)) {
-                throw new TypeError(
-                    'RandomCompat_substr(): Second argument should be an integer'
-                );
-            }
+			if (!is_int($start)) {
+				throw new TypeError(
+					'RandomCompat_substr(): Second argument should be an integer'
+				);
+			}
 
-            if ($length !== null) {
-                if (!is_int($length)) {
-                    throw new TypeError(
-                        'RandomCompat_substr(): Third argument should be an integer, or omitted'
-                    );
-                }
+			if ($length !== null) {
+				if (!is_int($length)) {
+					throw new TypeError(
+						'RandomCompat_substr(): Third argument should be an integer, or omitted'
+					);
+				}
 
-                return (string) substr(
-                    (string )$binary_string,
-                    (int) $start,
-                    (int) $length
-                );
-            }
+				return (string) substr(
+					(string )$binary_string,
+					(int) $start,
+					(int) $length
+				);
+			}
 
-            return (string) substr(
-                (string) $binary_string,
-                (int) $start
-            );
-        }
-    }
+			return (string) substr(
+				(string) $binary_string,
+				(int) $start
+			);
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -180,7 +180,7 @@
                 }
 
                 return (string) substr(
-                    (string )$binary_string,
+                    (string) $binary_string,
                     (int) $start,
                     (int) $length
                 );

Braces +35 added lines, -16 removed lines

@@ -26,7 +26,8 @@ 
  * SOFTWARE.
  */
 
-if (!is_callable('RandomCompat_strlen')) {
+if (!is_callable('RandomCompat_strlen'))
+{
     if (
         defined('MB_OVERLOAD_STRING')
             &&
@@ -46,7 +47,8 @@ 
          */
         function RandomCompat_strlen($binary_string)
         {
-            if (!is_string($binary_string)) {
+            if (!is_string($binary_string))
+            {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
                 );
@@ -55,7 +57,9 @@ 
             return (int) mb_strlen($binary_string, '8bit');
         }
 
-    } else {
+    }
+    else
+    {
         /**
          * strlen() implementation that isn't brittle to mbstring.func_overload
          *
@@ -69,7 +73,8 @@ 
          */
         function RandomCompat_strlen($binary_string)
         {
-            if (!is_string($binary_string)) {
+            if (!is_string($binary_string))
+            {
                 throw new TypeError(
                     'RandomCompat_strlen() expects a string'
                 );
@@ -79,7 +84,8 @@ 
     }
 }
 
-if (!is_callable('RandomCompat_substr')) {
+if (!is_callable('RandomCompat_substr'))
+{
 
     if (
         defined('MB_OVERLOAD_STRING')
@@ -102,36 +108,43 @@ 
          */
         function RandomCompat_substr($binary_string, $start, $length = null)
         {
-            if (!is_string($binary_string)) {
+            if (!is_string($binary_string))
+            {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
 
-            if (!is_int($start)) {
+            if (!is_int($start))
+            {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
 
-            if ($length === null) {
+            if ($length === null)
+            {
                 /**
                  * mb_substr($str, 0, NULL, '8bit') returns an empty string on
                  * PHP 5.3, so we have to find the length ourselves.
                  */
                 /** @var int $length */
                 $length = RandomCompat_strlen($binary_string) - $start;
-            } elseif (!is_int($length)) {
+            }
+            elseif (!is_int($length))
+            {
                 throw new TypeError(
                     'RandomCompat_substr(): Third argument should be an integer, or omitted'
                 );
             }
 
             // Consistency with PHP's behavior
-            if ($start === RandomCompat_strlen($binary_string) && $length === 0) {
+            if ($start === RandomCompat_strlen($binary_string) && $length === 0)
+            {
                 return '';
             }
-            if ($start > RandomCompat_strlen($binary_string)) {
+            if ($start > RandomCompat_strlen($binary_string))
+            {
                 return '';
             }
 
@@ -143,7 +156,9 @@ 
             );
         }
 
-    } else {
+    }
+    else
+    {
 
         /**
          * substr() implementation that isn't brittle to mbstring.func_overload
@@ -160,20 +175,24 @@ 
          */
         function RandomCompat_substr($binary_string, $start, $length = null)
         {
-            if (!is_string($binary_string)) {
+            if (!is_string($binary_string))
+            {
                 throw new TypeError(
                     'RandomCompat_substr(): First argument should be a string'
                 );
             }
 
-            if (!is_int($start)) {
+            if (!is_int($start))
+            {
                 throw new TypeError(
                     'RandomCompat_substr(): Second argument should be an integer'
                 );
             }
 
-            if ($length !== null) {
-                if (!is_int($length)) {
+            if ($length !== null)
+            {
+                if (!is_int($length))
+                {
                     throw new TypeError(
                         'RandomCompat_substr(): Third argument should be an integer, or omitted'
                     );

Sources/Subs-BoardIndex.php

Braces +1 added lines, -1 removed lines

@@ -420,7 +420,7 @@
 					$board['last_post']['last_post_message'] = sprintf($txt['last_post_message'], $board['last_post']['member']['link'], $board['last_post']['link'], $board['last_post']['time'] > 0 ? timeformat($board['last_post']['time']) : $txt['not_applicable']);
 			}
 		}
-	else
+		else
 		foreach ($this_category as &$board)
 		{
 			if (!empty($moderators[$board['id']]))

cron.php

Indentation +1 added lines, -1 removed lines

@@ -285,7 +285,7 @@
 {
 	/**
 	 * Constants for notfication types.
-	*/
+	 */
 	const RECEIVE_NOTIFY_EMAIL = 0x02;
 	const RECEIVE_NOTIFY_ALERT = 0x01;
 

other/upgrade-helper.php

Braces +14 added lines, -7 removed lines

@@ -428,21 +428,28 @@
  * @param $index to use as index if specified
  * @return array of values of specified $col from $array
  */
-if (!function_exists('array_column')) {
-	function array_column($input, $column_key, $index_key = null) {
-		$arr = array_map(function($d) use ($column_key, $index_key) {
-			if (!isset($d[$column_key])) {
+if (!function_exists('array_column'))
+{
+	function array_column($input, $column_key, $index_key = null)
+	{
+		$arr = array_map(function($d) use ($column_key, $index_key)
+		{
+			if (!isset($d[$column_key]))
+			{
 				return null;
 			}
-			if ($index_key !== null) {
+			if ($index_key !== null)
+			{
 				return array($d[$index_key] => $d[$column_key]);
 			}
 			return $d[$column_key];
 		}, $input);
 
-		if ($index_key !== null) {
+		if ($index_key !== null)
+		{
 			$tmp = array();
-			foreach ($arr as $ar) {
+			foreach ($arr as $ar)
+			{
 				$tmp[key($ar)] = current($ar);
 			}
 			$arr = $tmp;

other/install.php

Spacing +1 added lines, -2 removed lines

@@ -1756,8 +1756,7 @@
 	updateStats('topic');
 
 	// This function is needed to do the updateStats('subject') call.
-	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
-		function($string)
+	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string)
 		{
 			global $sourcedir;
 			if (function_exists('mb_strtolower'))