Yoshi2889 / SMF2.1

Themes/default/MessageIndex.template.php

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
 			</div>';
 
 			// Show the last post if there is one.
-			if(!empty($board['last_post']['id']))
+			if (!empty($board['last_post']['id']))
 				echo '
 			<div class="lastpost lpr_border">
 				', function_exists('template_bi_' . $board['type'] . '_lastpost') ? call_user_func('template_bi_' . $board['type'] . '_lastpost', $board) : template_bi_board_lastpost($board), '

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/ManageMembergroups.template.php

Spacing +2 added lines, -2 removed lines

@@ -388,7 +388,7 @@ 
 	<script>
 		function swapPostGroup(isChecked)
 		{
-			var is_moderator_group = ', (int)$context['is_moderator_group'], ';
+			var is_moderator_group = ', (int) $context['is_moderator_group'], ';
 			var group_type = ', $context['group']['type'], ';
 			var min_posts_text = document.getElementById(\'min_posts_text\');
 			var group_desc_text = document.getElementById(\'group_desc_text\');
@@ -453,7 +453,7 @@ 
 		if (empty($modSettings['deny_boards_access']))
 			echo '
 									<li class="category">
-										<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \''.$form_id.'\'); return false;"><strong>', $category['name'], '</strong></a>
+										<a href="javascript:void(0);" onclick="selectBoards([', implode(', ', $category['child_ids']), '], \'' . $form_id . '\'); return false;"><strong>', $category['name'], '</strong></a>
 										<ul>';
 		else
 			echo '

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

Spacing +1 added lines, -1 removed lines

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

Themes/default/ModerationCenter.template.php

Spacing +4 added lines, -4 removed lines

@@ -393,17 +393,17 @@ 
 		$quickbuttons = array(
 			'approve' => array(
 				'label' => $txt['approve'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';approve='.$item['id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';approve=' . $item['id'],
 				'icon' => 'approve',
 			),
 			'delete' => array(
 				'label' => $txt['remove'],
-				'href' => $scripturl.'?action=moderate;area=postmod;sa='.$context['current_view'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'].';delete='.$item['id'],
+				'href' => $scripturl . '?action=moderate;area=postmod;sa=' . $context['current_view'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';delete=' . $item['id'],
 				'icon' => 'remove_button',
 				'show' => $item['can_delete']
 			),
 			'quickmod' => array(
-				'content' => '<input type="checkbox" name="item[]" value="'.$item['id'].'" checked>',
+				'content' => '<input type="checkbox" name="item[]" value="' . $item['id'] . '" checked>',
 				'show' => !empty($options['display_quick_mod']) && $options['display_quick_mod'] == 1
 			),
 		);
@@ -468,7 +468,7 @@ 
 	$quickbuttons = array(
 		'delete' => array(
 			'label' => $txt['remove_message'],
-			'href' => $scripturl.'?action=moderate;area=userwatch;sa=post;delete='.$post['id'].';start='.$context['start'].';'.$context['session_var'].'='.$context['session_id'],
+			'href' => $scripturl . '?action=moderate;area=userwatch;sa=post;delete=' . $post['id'] . ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'javascript' => 'data-confirm="' . $txt['mc_watched_users_delete_post'] . '" class="you_sure"',
 			'icon' => 'remove_button',
 			'show' => $post['can_delete']

Themes/default/BoardIndex.template.php

Spacing +1 added lines, -1 removed lines

@@ -107,7 +107,7 @@
 					</div>';
 
 			// Show the last post if there is one.
-			if(!empty($board['last_post']['id']))
+			if (!empty($board['last_post']['id']))
 				echo'
 					<div class="lastpost lpr_border">
 						', function_exists('template_bi_' . $board['type'] . '_lastpost') ? call_user_func('template_bi_' . $board['type'] . '_lastpost', $board) : template_bi_board_lastpost($board), '

Sources/random_compat/random_bytes_libsodium.php

Indentation +57 added lines, -57 removed lines

@@ -27,65 +27,65 @@
  */
 
 if (!is_callable('random_bytes')) {
-    /**
-     * If the libsodium PHP extension is loaded, we'll use it above any other
-     * solution.
-     *
-     * libsodium-php project:
-     * @ref https://github.com/jedisct1/libsodium-php
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
+	/**
+	 * If the libsodium PHP extension is loaded, we'll use it above any other
+	 * solution.
+	 *
+	 * libsodium-php project:
+	 * @ref https://github.com/jedisct1/libsodium-php
+	 *
+	 * @param int $bytes
+	 *
+	 * @throws Exception
+	 *
+	 * @return string
+	 */
+	function random_bytes($bytes)
+	{
+		try {
+			/** @var int $bytes */
+			$bytes = RandomCompat_intval($bytes);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_bytes(): $bytes must be an integer'
+			);
+		}
 
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
+		if ($bytes < 1) {
+			throw new Error(
+				'Length must be greater than 0'
+			);
+		}
 
-        /**
-         * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
-         * generated in one invocation.
-         */
-        /** @var string|bool $buf */
-        if ($bytes > 2147483647) {
-            $buf = '';
-            for ($i = 0; $i < $bytes; $i += 1073741824) {
-                $n = ($bytes - $i) > 1073741824
-                    ? 1073741824
-                    : $bytes - $i;
-                $buf .= \Sodium\randombytes_buf($n);
-            }
-        } else {
-            /** @var string|bool $buf */
-            $buf = \Sodium\randombytes_buf($bytes);
-        }
+		/**
+		 * \Sodium\randombytes_buf() doesn't allow more than 2147483647 bytes to be
+		 * generated in one invocation.
+		 */
+		/** @var string|bool $buf */
+		if ($bytes > 2147483647) {
+			$buf = '';
+			for ($i = 0; $i < $bytes; $i += 1073741824) {
+				$n = ($bytes - $i) > 1073741824
+					? 1073741824
+					: $bytes - $i;
+				$buf .= \Sodium\randombytes_buf($n);
+			}
+		} else {
+			/** @var string|bool $buf */
+			$buf = \Sodium\randombytes_buf($bytes);
+		}
 
-        if (is_string($buf)) {
-            if (RandomCompat_strlen($buf) === $bytes) {
-                return $buf;
-            }
-        }
+		if (is_string($buf)) {
+			if (RandomCompat_strlen($buf) === $bytes) {
+				return $buf;
+			}
+		}
 
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Could not gather sufficient random data'
-        );
-    }
+		/**
+		 * If we reach here, PHP has failed us.
+		 */
+		throw new Exception(
+			'Could not gather sufficient random data'
+		);
+	}
 }

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

Indentation +130 added lines, -130 removed lines

@@ -27,146 +27,146 @@
  */
 
 if (!defined('RANDOM_COMPAT_READ_BUFFER')) {
-    define('RANDOM_COMPAT_READ_BUFFER', 8);
+	define('RANDOM_COMPAT_READ_BUFFER', 8);
 }
 
 if (!is_callable('random_bytes')) {
-    /**
-     * Unless open_basedir is enabled, use /dev/urandom for
-     * random numbers in accordance with best practices
-     *
-     * Why we use /dev/urandom and not /dev/random
-     * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
-     *
-     * @param int $bytes
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    function random_bytes($bytes)
-    {
-        /** @var resource $fp */
-        static $fp = null;
+	/**
+	 * Unless open_basedir is enabled, use /dev/urandom for
+	 * random numbers in accordance with best practices
+	 *
+	 * Why we use /dev/urandom and not /dev/random
+	 * @ref http://sockpuppet.org/blog/2014/02/25/safely-generate-random-numbers
+	 *
+	 * @param int $bytes
+	 *
+	 * @throws Exception
+	 *
+	 * @return string
+	 */
+	function random_bytes($bytes)
+	{
+		/** @var resource $fp */
+		static $fp = null;
 
-        /**
-         * This block should only be run once
-         */
-        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)) {
-                /** @var array<string, int> $st */
-                $st = fstat($fp);
-                if (($st['mode'] & 0170000) !== 020000) {
-                    fclose($fp);
-                    $fp = false;
-                }
-            }
+		/**
+		 * This block should only be run once
+		 */
+		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)) {
+				/** @var array<string, int> $st */
+				$st = fstat($fp);
+				if (($st['mode'] & 0170000) !== 020000) {
+					fclose($fp);
+					$fp = false;
+				}
+			}
 
-            if (is_resource($fp)) {
-                /**
-                 * stream_set_read_buffer() does not exist in HHVM
-                 *
-                 * If we don't set the stream's read buffer to 0, PHP will
-                 * internally buffer 8192 bytes, which can waste entropy
-                 *
-                 * stream_set_read_buffer returns 0 on success
-                 */
-                if (is_callable('stream_set_read_buffer')) {
-                    stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-                if (is_callable('stream_set_chunk_size')) {
-                    stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
-                }
-            }
-        }
+			if (is_resource($fp)) {
+				/**
+				 * stream_set_read_buffer() does not exist in HHVM
+				 *
+				 * If we don't set the stream's read buffer to 0, PHP will
+				 * internally buffer 8192 bytes, which can waste entropy
+				 *
+				 * stream_set_read_buffer returns 0 on success
+				 */
+				if (is_callable('stream_set_read_buffer')) {
+					stream_set_read_buffer($fp, RANDOM_COMPAT_READ_BUFFER);
+				}
+				if (is_callable('stream_set_chunk_size')) {
+					stream_set_chunk_size($fp, RANDOM_COMPAT_READ_BUFFER);
+				}
+			}
+		}
 
-        try {
-            /** @var int $bytes */
-            $bytes = RandomCompat_intval($bytes);
-        } catch (TypeError $ex) {
-            throw new TypeError(
-                'random_bytes(): $bytes must be an integer'
-            );
-        }
+		try {
+			/** @var int $bytes */
+			$bytes = RandomCompat_intval($bytes);
+		} catch (TypeError $ex) {
+			throw new TypeError(
+				'random_bytes(): $bytes must be an integer'
+			);
+		}
 
-        if ($bytes < 1) {
-            throw new Error(
-                'Length must be greater than 0'
-            );
-        }
+		if ($bytes < 1) {
+			throw new Error(
+				'Length must be greater than 0'
+			);
+		}
 
-        /**
-         * This if() block only runs if we managed to open a file handle
-         *
-         * It does not belong in an else {} block, because the above
-         * if (empty($fp)) line is logic that should only be run once per
-         * page load.
-         */
-        if (is_resource($fp)) {
-            /**
-             * @var int
-             */
-            $remaining = $bytes;
+		/**
+		 * This if() block only runs if we managed to open a file handle
+		 *
+		 * It does not belong in an else {} block, because the above
+		 * if (empty($fp)) line is logic that should only be run once per
+		 * page load.
+		 */
+		if (is_resource($fp)) {
+			/**
+			 * @var int
+			 */
+			$remaining = $bytes;
 
-            /**
-             * @var string|bool
-             */
-            $buf = '';
+			/**
+			 * @var string|bool
+			 */
+			$buf = '';
 
-            /**
-             * We use fread() in a loop to protect against partial reads
-             */
-            do {
-                /**
-                 * @var string|bool
-                 */
-                $read = fread($fp, $remaining);
-                if (!is_string($read)) {
-                    if ($read === false) {
-                        /**
-                         * We cannot safely read from the file. Exit the
-                         * do-while loop and trigger the exception condition
-                         *
-                         * @var string|bool
-                         */
-                        $buf = false;
-                        break;
-                    }
-                }
-                /**
-                 * Decrease the number of bytes returned from remaining
-                 */
-                $remaining -= RandomCompat_strlen($read);
-                /**
-                 * @var string|bool
-                 */
-                $buf = $buf . $read;
-            } while ($remaining > 0);
+			/**
+			 * We use fread() in a loop to protect against partial reads
+			 */
+			do {
+				/**
+				 * @var string|bool
+				 */
+				$read = fread($fp, $remaining);
+				if (!is_string($read)) {
+					if ($read === false) {
+						/**
+						 * We cannot safely read from the file. Exit the
+						 * do-while loop and trigger the exception condition
+						 *
+						 * @var string|bool
+						 */
+						$buf = false;
+						break;
+					}
+				}
+				/**
+				 * Decrease the number of bytes returned from remaining
+				 */
+				$remaining -= RandomCompat_strlen($read);
+				/**
+				 * @var string|bool
+				 */
+				$buf = $buf . $read;
+			} while ($remaining > 0);
 
-            /**
-             * Is our result valid?
-             */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
-                    /**
-                     * Return our random entropy buffer here:
-                     */
-                    return $buf;
-                }
-            }
-        }
+			/**
+			 * Is our result valid?
+			 */
+			if (is_string($buf)) {
+				if (RandomCompat_strlen($buf) === $bytes) {
+					/**
+					 * Return our random entropy buffer here:
+					 */
+					return $buf;
+				}
+			}
+		}
 
-        /**
-         * If we reach here, PHP has failed us.
-         */
-        throw new Exception(
-            'Error reading from source device'
-        );
-    }
+		/**
+		 * If we reach here, PHP has failed us.
+		 */
+		throw new Exception(
+			'Error reading from source device'
+		);
+	}
 }

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:
                      */

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