albertlast / SMF2.1

Sources/random_compat/random_int.php

Braces +29 added lines, -13 removed lines

@@ -1,6 +1,7 @@ 
 <?php
 
-if (!is_callable('random_int')) {
+if (!is_callable('random_int'))
+{
     /**
      * Random_* Compatibility Library
      * for using the new PHP 7 random_* API in PHP 5 projects
@@ -50,19 +51,25 @@ 
          * through.
          */
 
-        try {
+        try
+        {
             /** @var int $min */
             $min = RandomCompat_intval($min);
-        } catch (TypeError $ex) {
+        }
+        catch (TypeError $ex)
+        {
             throw new TypeError(
                 'random_int(): $min must be an integer'
             );
         }
 
-        try {
+        try
+        {
             /** @var int $max */
             $max = RandomCompat_intval($max);
-        } catch (TypeError $ex) {
+        }
+        catch (TypeError $ex)
+        {
             throw new TypeError(
                 'random_int(): $max must be an integer'
             );
@@ -73,13 +80,15 @@ 
          * let's validate the logic then we can move forward with generating random
          * integers along a given range.
          */
-        if ($min > $max) {
+        if ($min > $max)
+        {
             throw new Error(
                 'Minimum value must be less than or equal to the maximum value'
             );
         }
 
-        if ($max === $min) {
+        if ($max === $min)
+        {
             return (int) $min;
         }
 
@@ -110,7 +119,8 @@ 
         /**
          * Test for integer overflow:
          */
-        if (!is_int($range)) {
+        if (!is_int($range))
+        {
 
             /**
              * Still safely calculate wider ranges.
@@ -127,14 +137,18 @@ 
             /** @var int $mask */
             $mask = ~0;
 
-        } else {
+        }
+        else
+        {
 
             /**
              * $bits is effectively ceil(log($range, 2)) without dealing with
              * type juggling
              */
-            while ($range > 0) {
-                if ($bits % 8 === 0) {
+            while ($range > 0)
+            {
+                if ($bits % 8 === 0)
+                {
                     ++$bytes;
                 }
                 ++$bits;
@@ -157,7 +171,8 @@ 
              * The rejection probability is at most 0.5, so this corresponds
              * to a failure probability of 2^-128 for a working RNG
              */
-            if ($attempts > 128) {
+            if ($attempts > 128)
+            {
                 throw new Exception(
                     'random_int: RNG is broken - too many rejections'
                 );
@@ -179,7 +194,8 @@ 
              *   204631455
              */
             $val &= 0;
-            for ($i = 0; $i < $bytes; ++$i) {
+            for ($i = 0; $i < $bytes; ++$i)
+            {
                 $val |= ord($randomByteString[$i]) << ($i * 8);
             }
             /** @var int $val */

Sources/random_compat/cast_to_int.php

Braces +12 added lines, -5 removed lines

@@ -26,7 +26,8 @@ 
  * SOFTWARE.
  */
 
-if (!is_callable('RandomCompat_intval')) {
+if (!is_callable('RandomCompat_intval'))
+{
 
     /**
      * Cast to an integer if we can, safely.
@@ -47,9 +48,12 @@ 
      */
     function RandomCompat_intval($number, $fail_open = false)
     {
-        if (is_int($number) || is_float($number)) {
+        if (is_int($number) || is_float($number))
+        {
             $number += 0;
-        } elseif (is_numeric($number)) {
+        }
+        elseif (is_numeric($number))
+        {
             /** @psalm-suppress InvalidOperand */
             $number += 0;
         }
@@ -65,9 +69,12 @@ 
             $number = (int) $number;
         }
 
-        if (is_int($number)) {
+        if (is_int($number))
+        {
             return (int) $number;
-        } elseif (!$fail_open) {
+        }
+        elseif (!$fail_open)
+        {
             throw new TypeError(
                 'Expected an integer.'
             );

Sources/random_compat/random_bytes_libsodium.php

Braces +20 added lines, -9 removed lines

@@ -26,7 +26,8 @@ 
  * SOFTWARE.
  */
 
-if (!is_callable('random_bytes')) {
+if (!is_callable('random_bytes'))
+{
     /**
      * If the libsodium PHP extension is loaded, we'll use it above any other
      * solution.
@@ -42,16 +43,20 @@ 
      */
     function random_bytes($bytes)
     {
-        try {
+        try
+        {
             /** @var int $bytes */
             $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
+        }
+        catch (TypeError $ex)
+        {
             throw new TypeError(
                 'random_bytes(): $bytes must be an integer'
             );
         }
 
-        if ($bytes < 1) {
+        if ($bytes < 1)
+        {
             throw new Error(
                 'Length must be greater than 0'
             );
@@ -62,21 +67,27 @@ 
          * generated in one invocation.
          */
         /** @var string|bool $buf */
-        if ($bytes > 2147483647) {
+        if ($bytes > 2147483647)
+        {
             $buf = '';
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
+            for ($i = 0; $i < $bytes; $i += 1073741824)
+            {
                 $n = ($bytes - $i) > 1073741824
                     ? 1073741824
                     : $bytes - $i;
                 $buf .= \Sodium\randombytes_buf($n);
             }
-        } else {
+        }
+        else
+        {
             /** @var string|bool $buf */
             $buf = \Sodium\randombytes_buf($bytes);
         }
 
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
+        if (is_string($buf))
+        {
+            if (RandomCompat_strlen($buf) === $bytes)
+            {
                 return $buf;
             }
         }

Sources/random_compat/byte_safe_strings.php

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'
                     );

Themes/default/Admin.template.php

Braces +1 added lines, -1 removed lines

@@ -742,7 +742,7 @@
 
 	// Filter out any redundant separators before we start the loop
 	$context['config_vars'] = array_filter($context['config_vars'], function ($v) use ($context)
-		{
+	{
 			static $config_vars, $prev;
 
 			$at_start = is_null($config_vars);

other/upgrade.php

Braces +3 added lines, -1 removed lines

@@ -3205,7 +3205,9 @@
 		return $string;
 
 	// This bit fixes incorrect string lengths, which can happen if the character encoding was changed (e.g. conversion to UTF-8)
-	$new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches) {return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string);
+	$new_string = preg_replace_callback('~\bs:(\d+):"(.*?)";(?=$|[bidsa]:|[{}]|N;)~s', function ($matches)
+	{
+return 's:' . strlen($matches[2]) . ':"' . $matches[2] . '";';}, $string);
 
 	// @todo Add more possible fixes here. For example, fix incorrect array lengths, try to handle truncated strings gracefully, etc.
 

Sources/ManagePermissions.php

Braces +1 added lines, -1 removed lines

@@ -1827,7 +1827,7 @@
 	{
 		// Make sure this is an array of integers
 		$excluded_groups = array_filter((array) $excluded_groups, function ($v)
-			{
+		{
 				return is_int($v) || is_string($v) && (string) intval($v) === $v;
 			});
 

Sources/Security.php

Braces -4 removed lines

@@ -1257,7 +1257,6 @@ 
 
 			continue;
 		}
-
 		else
 		{
 			$fh = @fopen($path . '/.htaccess', 'w');
@@ -1269,7 +1268,6 @@ 
 	Deny from all' . $close);
 				fclose($fh);
 			}
-
 			else
 				$errors[] = 'htaccess_cannot_create_file';
 		}
@@ -1280,7 +1278,6 @@ 
 
 			continue;
 		}
-
 		else
 		{
 			$fh = @fopen($path . '/index.php', 'w');
@@ -1307,7 +1304,6 @@ 
 ?' . '>');
 				fclose($fh);
 			}
-
 			else
 				$errors[] = 'index-php_cannot_create_file';
 		}

Themes/default/GenericControls.template.php

Braces +8 added lines, -4 removed lines

@@ -100,18 +100,22 @@
 	$tempTab++;
 	$context['tabindex'] = $tempTab;
 
-	foreach ($context['richedit_buttons'] as $name => $button) {
-		if ($name == 'spell_check') {
+	foreach ($context['richedit_buttons'] as $name => $button)
+	{
+		if ($name == 'spell_check')
+		{
 			$button['onclick'] = 'oEditorHandle_' . $editor_id . '.spellCheckStart();';
 		}
 
-		if ($name == 'preview') {
+		if ($name == 'preview')
+		{
 			$button['value'] = isset($editor_context['labels']['preview_button']) ? $editor_context['labels']['preview_button'] : $button['value'];
 			$button['onclick'] = $editor_context['preview_type'] == 2 ? '' : 'return submitThisOnce(this);';
 			$button['show'] = $editor_context['preview_type'];
 		}
 
-		if ($button['show']) {
+		if ($button['show'])
+		{
 			echo '
 		<input type="', $button['type'], '"', $button['type'] == 'hidden' ? ' id="' . $name . '"' : '', ' name="', $name, '" value="', $button['value'], '"', $button['type'] != 'hidden' ? ' tabindex="' . --$tempTab . '"' : '', !empty($button['onclick']) ? ' onclick="' . $button['onclick'] . '"' : '', !empty($button['accessKey']) ? ' accesskey="' . $button['accessKey'] . '"' : '', $button['type'] != 'hidden' ? ' class="button"' : '', '>';
 		}