Yoshi2889 / SMF2.1

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/upgrade.php

Braces +3 added lines, -1 removed lines

@@ -3204,7 +3204,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.
 

ssi_examples.php

Braces +3 added lines, -1 removed lines

@@ -89,7 +89,9 @@
 						<li><a href="#" onclick="showSSIBlock('ssi_quickSearch'); return false;">Quick Search Box</a></li>
 						<li><a href="#" onclick="showSSIBlock('ssi_recentAttachments'); return false;">Recent Attachments</a></li>
 					</ul>
-					<?php if ($user_info['is_admin']) { ?>
+					<?php if ($user_info['is_admin'])
+{
+?>
 					<h3>Advanced Functions <img class="help" title="Functions that require additional tweaking, not just copy and paste." src="<?php echo $settings['images_url']; ?>/helptopics.png" alt=""></h3>
 					<ul>
 						<li><a href="#" onclick="showSSIBlock('ssi_showPoll'); return false;">Show Single Poll</a></li>

Themes/default/Calendar.template.php

Braces +4 added lines, -2 removed lines

@@ -407,7 +407,8 @@ 
 					if (!empty($day['events']))
 					{
 						// Sort events by start time (all day events will be listed first)
-						uasort($day['events'], function($a, $b) {
+						uasort($day['events'], function($a, $b)
+						{
 							if ($a['start_timestamp'] == $b['start_timestamp'])
 								return 0;
 
@@ -600,7 +601,8 @@ 
 			if (!empty($day['events']))
 			{
 				// Sort events by start time (all day events will be listed first)
-				uasort($day['events'], function($a, $b) {
+				uasort($day['events'], function($a, $b)
+				{
 					if ($a['start_timestamp'] == $b['start_timestamp'])
 						return 0;
 					return ($a['start_timestamp'] < $b['start_timestamp']) ? -1 : 1;

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"' : '', '>';
 		}

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/Profile-Modify.php

Braces +1 added lines, -1 removed lines

@@ -498,7 +498,7 @@
 						log_error(sprintf($txt['smiley_set_dir_not_found'], $set_names[array_search($set, $context['smiley_sets'])]));
 
 						$context['smiley_sets'] = array_filter($context['smiley_sets'], function($v) use ($set)
-							{
+						{
 								return $v != $set;
 							});
 					}

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/random_bytes_dev_urandom.php

Braces +33 added lines, -16 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
@@ -52,23 +54,27 @@ 
         /**
          * This block should only be run once
          */
-        if (empty($fp)) {
+        if (empty($fp))
+        {
             /**
              * We use /dev/urandom if it is a char device.
              * We never fall back to /dev/random
              */
             /** @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
                  *
@@ -77,25 +83,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'
             );
@@ -108,7 +120,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
              */
@@ -127,8 +140,10 @@ 
                  * @var string|bool
                  */
                 $read = fread($fp, $remaining);
-                if (!is_string($read)) {
-                    if ($read === false) {
+                if (!is_string($read))
+                {
+                    if ($read === false)
+                    {
                         /**
                          * We cannot safely read from the file. Exit the
                          * do-while loop and trigger the exception condition
@@ -152,8 +167,10 @@ 
             /**
              * Is our result valid?
              */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
+            if (is_string($buf))
+            {
+                if (RandomCompat_strlen($buf) === $bytes)
+                {
                     /**
                      * Return our random entropy buffer here:
                      */