SimpleMachines / SMF2.1

Sources/random_compat/error_polyfill.php

Braces +9 added lines, -4 removed lines

@@ -26,7 +26,8 @@ 
  * SOFTWARE.
  */
 
-if (!class_exists('Error', false)) {
+if (!class_exists('Error', false))
+{
     // We can't really avoid making this extend Exception in PHP 5.
     class Error extends Exception
     {
@@ -34,13 +35,17 @@ 
     }
 }
 
-if (!class_exists('TypeError', false)) {
-    if (is_subclass_of('Error', 'Exception')) {
+if (!class_exists('TypeError', false))
+{
+    if (is_subclass_of('Error', 'Exception'))
+    {
         class TypeError extends Error
         {
             
         }
-    } else {
+    }
+    else
+    {
         class TypeError extends Exception
         {
             

Sources/random_compat/random.php

Braces +35 added lines, -16 removed lines

@@ -29,7 +29,8 @@ 
  * SOFTWARE.
  */
 
-if (!defined('PHP_VERSION_ID')) {
+if (!defined('PHP_VERSION_ID'))
+{
     // This constant was introduced in PHP 5.2.7
     $RandomCompatversion = array_map('intval', explode('.', PHP_VERSION));
     define(
@@ -44,11 +45,13 @@ 
 /**
  * PHP 7.0.0 and newer have these functions natively.
  */
-if (PHP_VERSION_ID >= 70000) {
+if (PHP_VERSION_ID >= 70000)
+{
     return;
 }
 
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+if (!defined('RANDOM_COMPAT_READ_BUFFER'))
+{
     define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
@@ -58,7 +61,8 @@ 
 require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'cast_to_int.php';
 require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'error_polyfill.php';
 
-if (!is_callable('random_bytes')) {
+if (!is_callable('random_bytes'))
+{
     /**
      * PHP 5.2.0 - 5.6.x way to implement random_bytes()
      *
@@ -73,11 +77,15 @@ 
      *
      * See RATIONALE.md for our reasoning behind this particular order
      */
-    if (extension_loaded('libsodium')) {
+    if (extension_loaded('libsodium'))
+    {
         // See random_bytes_libsodium.php
-        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf')) {
+        if (PHP_VERSION_ID >= 50300 && is_callable('\\Sodium\\randombytes_buf'))
+        {
             require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium.php';
-        } elseif (method_exists('Sodium', 'randombytes_buf')) {
+        }
+        elseif (method_exists('Sodium', 'randombytes_buf'))
+        {
             require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_libsodium_legacy.php';
         }
     }
@@ -85,13 +93,15 @@ 
     /**
      * Reading directly from /dev/urandom:
      */
-    if (DIRECTORY_SEPARATOR === '/') {
+    if (DIRECTORY_SEPARATOR === '/')
+    {
         // DIRECTORY_SEPARATOR === '/' on Unix-like OSes -- this is a fast
         // way to exclude Windows.
         $RandomCompatUrandom = true;
         $RandomCompat_basedir = ini_get('open_basedir');
 
-        if (!empty($RandomCompat_basedir)) {
+        if (!empty($RandomCompat_basedir))
+        {
             $RandomCompat_open_basedir = explode(
                 PATH_SEPARATOR,
                 strtolower($RandomCompat_basedir)
@@ -121,7 +131,9 @@ 
         }
         // Unset variables after use
         $RandomCompat_basedir = null;
-    } else {
+    }
+    else
+    {
         $RandomCompatUrandom = false;
     }
 
@@ -179,14 +191,19 @@ 
             strtolower(ini_get('disable_classes'))
         );
 
-        if (!in_array('com', $RandomCompat_disabled_classes)) {
-            try {
+        if (!in_array('com', $RandomCompat_disabled_classes))
+        {
+            try
+            {
                 $RandomCompatCOMtest = new COM('CAPICOM.Utilities.1');
-                if (method_exists($RandomCompatCOMtest, 'GetRandom')) {
+                if (method_exists($RandomCompatCOMtest, 'GetRandom'))
+                {
                     // See random_bytes_com_dotnet.php
                     require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_bytes_com_dotnet.php';
                 }
-            } catch (com_exception $e) {
+            }
+            catch (com_exception $e)
+            {
                 // Don't try to use it.
             }
         }
@@ -197,7 +214,8 @@ 
     /**
      * throw new Exception
      */
-    if (!is_callable('random_bytes')) {
+    if (!is_callable('random_bytes'))
+    {
         /**
          * We don't have any more options, so let's throw an exception right now
          * and hope the developer won't let it fail silently.
@@ -218,7 +236,8 @@ 
     }
 }
 
-if (!is_callable('random_int')) {
+if (!is_callable('random_int'))
+{
     require_once $RandomCompatDIR . DIRECTORY_SEPARATOR . 'random_int.php';
 }
 

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_legacy.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'
             );
@@ -66,19 +71,25 @@ 
          * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
          * generated in one invocation.
          */
-        if ($bytes > 2147483647) {
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
+        if ($bytes > 2147483647)
+        {
+            for ($i = 0; $i < $bytes; $i += 1073741824)
+            {
                 $n = ($bytes - $i) > 1073741824
                     ? 1073741824
                     : $bytes - $i;
                 $buf .= Sodium::randombytes_buf((int) $n);
             }
-        } else {
+        }
+        else
+        {
             $buf .= Sodium::randombytes_buf((int) $bytes);
         }
 
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
+        if (is_string($buf))
+        {
+            if (RandomCompat_strlen($buf) === $bytes)
+            {
                 return $buf;
             }
         }

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;
             }
         }

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;

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

Sources/ManageSmileys.php

Braces +3 added lines, -1 removed lines

@@ -1965,7 +1965,9 @@
 	// Remove anything that isn't actually new from our list of files
 	foreach ($to_unset as $key => $ids)
 	{
-		if (array_reduce($ids, function ($carry, $item) { return $carry * $item; }, true) == true)
+		if (array_reduce($ids, function ($carry, $item)
+		{
+return $carry * $item; }, true) == true)
 			unset($smiley_files[$key]);
 	}
 

Sources/Subs-Post.php

Braces -1 removed lines

@@ -1254,7 +1254,6 @@
 
 		return array($charset, $string, 'base64');
 	}
-
 	else
 		return array($charset, $string, '7bit');
 }