SimpleMachines / SMF2.1

Sources/Subs-Db-postgresql.php

Braces +6 added lines, -3 removed lines

@@ -78,7 +78,8 @@ 
 	$db_passwd = str_replace(array('\\','\''), array('\\\\','\\\''), $db_passwd);
 
 	// Since pg_connect doesn't feed error info to pg_last_error, we have to catch issues with a try/catch.
-	set_error_handler(function($errno, $errstr) {
+	set_error_handler(function($errno, $errstr)
+	{
 		throw new ErrorException($errstr, $errno);});
 	try
 	{
@@ -939,7 +940,8 @@ 
 		$error_array[2] = null;
 
 	if(empty($db_persist))
-	{ // without pooling
+	{
+// without pooling
 		if (empty($pg_error_data_prep))
 			$pg_error_data_prep = pg_prepare($db_connection, 'smf_log_errors',
 				'INSERT INTO ' . $db_prefix . 'log_errors
@@ -950,7 +952,8 @@ 
 		pg_execute($db_connection, 'smf_log_errors', $error_array);
 	}
 	else
-	{ //with pooling
+	{
+//with pooling
 		$pg_error_data_prep = pg_prepare($db_connection, '',
 			'INSERT INTO ' . $db_prefix . 'log_errors
 				(id_member, log_time, ip, url, message, session, error_type, file, line, backtrace)

Sources/random_compat/random_bytes_dev_urandom.php

Braces +35 added lines, -17 removed lines

@@ -26,11 +26,13 @@ 
  * SOFTWARE.
  */
 
-if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
+if (!defined('RANDOM_COMPAT_READ_BUFFER'))
+{
     define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
-if (!is_callable('random_bytes')) {
+if (!is_callable('random_bytes'))
+{
     /**
      * Unless open_basedir is enabled, use /dev/urandom for
      * random numbers in accordance with best practices
@@ -53,7 +55,8 @@ 
         /**
          * This block should only be run once
          */
-        if (empty($fp)) {
+        if (empty($fp))
+        {
             /**
              * We don't want to ever read C:\dev\random, only /dev/urandom on
              * Unix-like operating systems. While we guard against this
@@ -64,8 +67,10 @@ 
              * like operating system (which means the directory separator is set
              * to "/" not "\".
              */
-            if (DIRECTORY_SEPARATOR === '/') {
-                if (!is_readable('/dev/urandom')) {
+            if (DIRECTORY_SEPARATOR === '/')
+            {
+                if (!is_readable('/dev/urandom'))
+                {
                     throw new Exception(
                         'Environment misconfiguration: ' .
                         '/dev/urandom cannot be read.'
@@ -77,17 +82,20 @@ 
                  */
                 /** @var resource|bool $fp */
                 $fp = fopen('/dev/urandom', 'rb');
-                if (is_resource($fp)) {
+                if (is_resource($fp))
+                {
                     /** @var array<string, int> $st */
                     $st = fstat($fp);
-                    if (($st['mode'] & 0170000) !== 020000) {
+                    if (($st['mode'] & 0170000) !== 020000)
+                    {
                         fclose($fp);
                         $fp = false;
                     }
                 }
             }
 
-            if (is_resource($fp)) {
+            if (is_resource($fp))
+            {
                 /**
                  * stream_set_read_buffer() does not exist in HHVM
                  *
@@ -96,25 +104,31 @@ 
                  *
                  * stream_set_read_buffer returns 0 on success
                  */
-                if (is_callable('stream_set_read_buffer')) {
+                if (is_callable('stream_set_read_buffer'))
+                {
                     stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
                 }
-                if (is_callable('stream_set_chunk_size')) {
+                if (is_callable('stream_set_chunk_size'))
+                {
                     stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
                 }
             }
         }
 
-        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'
             );
@@ -127,7 +141,8 @@ 
          * if (empty($fp)) line is logic that should only be run once per
          * page load.
          */
-        if (is_resource($fp)) {
+        if (is_resource($fp))
+        {
             /**
              * @var int
              */
@@ -146,7 +161,8 @@ 
                  * @var string|bool
                  */
                 $read = fread($fp, $remaining);
-                if (!is_string($read)) {
+                if (!is_string($read))
+                {
                     /**
                      * We cannot safely read from the file. Exit the
                      * do-while loop and trigger the exception condition
@@ -170,8 +186,10 @@ 
              * Is our result valid?
              * @var string|bool $buf
              */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
+            if (is_string($buf))
+            {
+                if (RandomCompat_strlen($buf) === $bytes)
+                {
                     /**
                      * Return our random entropy buffer here:
                      */

Sources/Subs-Admin.php

Braces +10 added lines, -4 removed lines

@@ -1219,7 +1219,8 @@ 
 	}
 
 	// It's important to do the numbered ones before the named ones, or messes happen.
-	uksort($substitutions, function($a, $b) {
+	uksort($substitutions, function($a, $b)
+	{
 		if (is_int($a) && is_int($b))
 			return $a > $b ? 1 : ($a < $b ? -1 : 0);
 		elseif (is_int($a))
@@ -1758,8 +1759,12 @@ 
 		unset($mtime, $settingsFile, $settingsText);
 		$defined_vars = get_defined_vars();
 	}
-	catch (Throwable $e) {}
-	catch (ErrorException $e) {}
+	catch (Throwable $e)
+	{
+}
+	catch (ErrorException $e)
+	{
+}
 	if (isset($e))
 		return false;
 
@@ -1915,7 +1920,8 @@ 
 	// For the same reason, replace literal returns and newlines with "\r" and "\n"
 	elseif (is_string($var) && (strpos($var, "\n") !== false || strpos($var, "\r") !== false))
 	{
-		return strtr(preg_replace_callback('/[\r\n]+/', function($m) {
+		return strtr(preg_replace_callback('/[\r\n]+/', function($m)
+		{
 			return '\' . "' . strtr($m[0], array("\r" => '\r', "\n" => '\n')) . '" . \'';
 		}, $var), array("'' . " => '', " . ''" => ''));
 	}

Sources/Subs-BoardIndex.php

Braces +1 added lines, -4 removed lines

@@ -280,7 +280,6 @@ 
 					$this_category[$row_board['id_board']]['board_class'] = 'on';
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['new_posts'];
 				}
-
 				else
 				{
 					$this_category[$row_board['id_board']]['board_tooltip'] = $txt['old_posts'];
@@ -415,7 +414,6 @@ 
 			$this_last_post['href'] = $scripturl . '?topic=' . $row_board['id_topic'] . '.msg' . ($user_info['is_guest'] ? $row_board['id_msg'] : $row_board['new_from']) . (empty($row_board['is_read']) ? ';boardseen' : '') . '#new';
 			$this_last_post['link'] = '<a href="' . $this_last_post['href'] . '" title="' . $row_board['subject'] . '">' . $row_board['short_subject'] . '</a>';
 		}
-
 		else
 		{
 			$this_last_post['href'] = '';
@@ -510,8 +508,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 (isset($boards_parsed_data_by_cat_id[$board['id_cat']][$board['id']]))

Sources/Subs.php

Braces +7 added lines, -10 removed lines

@@ -279,7 +279,6 @@ 
 		$condition = 'id_member IN ({array_int:members})';
 		$parameters['members'] = $members;
 	}
-
 	elseif ($members === null)
 		$condition = '1=1';
 
@@ -382,11 +381,9 @@ 
 				$val = $val . ' END';
 				$type = 'raw';
 			}
-
 			else
 				$val = alert_count($members, true);
 		}
-
 		elseif ($type == 'int' && ($val === '+' || $val === '-'))
 		{
 			$val = $var . ' ' . $val . ' 1';
@@ -2202,12 +2199,12 @@ 
 			'tag' => 'cowsay',
 			'parameters' => array(
 				'e' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => 'oo', 'validate' => function ($eyes) use ($smcFunc)
-					{
+				{
 						return $smcFunc['substr']($eyes . 'oo', 0, 2);
 					},
 				),
 				't' => array('optional' => true, 'quoted' => true, 'match' => '(.*?)', 'default' => '  ', 'validate' => function ($tongue) use ($smcFunc)
-					{
+				{
 						return $smcFunc['substr']($tongue . '  ', 0, 2);
 					},
 				),
@@ -3314,7 +3311,7 @@ 
 
 	// Replace away!
 	$message = preg_replace_callback($smileyPregSearch, function($matches) use ($smileyPregReplacements)
-		{
+	{
 			return $smileyPregReplacements[$matches[1]];
 		}, $message);
 }
@@ -4112,7 +4109,6 @@ 
 				if (!isset($minSeed) && isset($js_file['options']['seed']))
 					$minSeed = $js_file['options']['seed'];
 			}
-
 			else
 			{
 				echo '
@@ -6029,7 +6025,8 @@ 
 			$zones[$tzkey]['tzid'] = $tzid;
 			$zones[$tzkey]['dst_type'] = count($tzinfo) > 1 ? 1 : ($tzinfo[0]['isdst'] ? 2 : 0);
 
-			foreach ($tzinfo as $transition) {
+			foreach ($tzinfo as $transition)
+			{
 				$zones[$tzkey]['abbrs'][] = $transition['abbr'];
 			}
 
@@ -6114,7 +6111,8 @@ 
 			$desc = implode(', ', array_slice(array_unique($tzvalue['locations']), 0, 5)) . (count($tzvalue['locations']) > 5 ? ', ' . $txt['etc'] : '');
 
 		// We don't want abbreviations like '+03' or '-11'.
-		$abbrs = array_filter($tzvalue['abbrs'], function ($abbr) {
+		$abbrs = array_filter($tzvalue['abbrs'], function ($abbr)
+		{
 			return !strspn($abbr, '+-');
 		});
 		$abbrs = count($abbrs) == count($tzvalue['abbrs']) ? array_unique($abbrs) : array();
@@ -6462,7 +6460,6 @@ 
 			$isWritable = true;
 			break;
 		}
-
 		else
 			@chmod($file, $val);
 	}

Sources/Profile-View.php

Braces +2 added lines, -1 removed lines

@@ -359,7 +359,8 @@
 	call_integration_hook('integrate_fetch_alerts', array(&$alerts, &$formats));
 
 	// Substitute $scripturl into the link formats. (Done here to make life easier for hooked mods.)
-	$formats = array_map(function ($format) use ($scripturl) {
+	$formats = array_map(function ($format) use ($scripturl)
+	{
 		$format['link'] = str_replace('{scripturl}', $scripturl, $format['link']);
 		$format['text'] = str_replace('{scripturl}', $scripturl, $format['text']);