albertlast / SMF2.1

Sources/Cache/APIs/FileBased.php

Spacing +2 added lines, -2 removed lines

@@ -184,7 +184,7 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array('cachedir', $txt['cachedir'], 'file', 'text', 36, 'cache_cachedir');
 
 		if (!isset($context['settings_post_javascript']))
@@ -193,7 +193,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir").prop("disabled", cache_type != "'. $class_name . '");
 			});';
 	}
 

Sources/Cache/APIs/MemcachedImplementation.php

Spacing +5 added lines, -5 removed lines

@@ -169,15 +169,15 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array(
 			self::CLASS_KEY,
-			$txt['cache_'. $class_name_txt_key .'_servers'],
+			$txt['cache_' . $class_name_txt_key . '_servers'],
 			'file',
 			'text',
 			0,
-			'cache_'. $class_name_txt_key,
-			'subtext' => $txt['cache_'. $class_name_txt_key .'_servers_subtext']);
+			'cache_' . $class_name_txt_key,
+			'subtext' => $txt['cache_' . $class_name_txt_key . '_servers_subtext']);
 
 		if (!isset($context['settings_post_javascript']))
 			$context['settings_post_javascript'] = '';
@@ -185,7 +185,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "'. $class_name .'");
+				$("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "' . $class_name . '");
 			});';
 	}
 

Sources/Cache/APIs/Sqlite.php

Spacing +5 added lines, -5 removed lines

@@ -131,14 +131,14 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array(
-			'cachedir_'. $class_name_txt_key,
-			$txt['cachedir_'. $class_name_txt_key],
+			'cachedir_' . $class_name_txt_key,
+			$txt['cachedir_' . $class_name_txt_key],
 			'file',
 			'text',
 			36,
-			'cache_'. $class_name_txt_key .'_cachedir');
+			'cache_' . $class_name_txt_key . '_cachedir');
 
 		if (!isset($context['settings_post_javascript']))
 			$context['settings_post_javascript'] = '';
@@ -146,7 +146,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#cachedir_'. $class_name_txt_key .'").prop("disabled", cache_type != "'. $class_name .'");
+				$("#cachedir_'. $class_name_txt_key . '").prop("disabled", cache_type != "' . $class_name . '");
 			});';
 	}
 

Sources/ScheduledTasks.php

Spacing +2 added lines, -2 removed lines

@@ -169,7 +169,7 @@ 
 	clean_cache();
 
 	// If warning decrement is enabled and we have people who have not had a new warning in 24 hours, lower their warning level.
-	list (, , $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
+	list (,, $modSettings['warning_decrement']) = explode(',', $modSettings['warning_settings']);
 	if ($modSettings['warning_decrement'])
 	{
 		// Find every member who has a warning level...
@@ -1665,7 +1665,7 @@ 
 	// Determine action based on last_login...
 	$purgeMembers = array();
 	$markReadMembers = array();
-	foreach($members as $member)
+	foreach ($members as $member)
 	{
 		if ($member['last_login'] <= $cleanupBeyond)
 			$purgeMembers[] = $member['id_member'];

Sources/random_compat/random_bytes_dev_urandom.php

Indentation +148 added lines, -148 removed lines

@@ -27,164 +27,164 @@
  */
 
 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 https://www.2uo.de/myths-about-urandom
-     * @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 https://www.2uo.de/myths-about-urandom
+	 * @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 don't want to ever read C:\dev\random, only /dev/urandom on
-             * Unix-like operating systems. While we guard against this
-             * condition in random.php, it doesn't hurt to be defensive in depth
-             * here.
-             *
-             * To that end, we only try to open /dev/urandom if we're on a Unix-
-             * like operating system (which means the directory separator is set
-             * to "/" not "\".
-             */
-            if (DIRECTORY_SEPARATOR === '/') {
-                if (!is_readable('/dev/urandom')) {
-                    throw new Exception(
-                        'Environment misconfiguration: ' .
-                        '/dev/urandom cannot be read.'
-                    );
-                }
-                /**
-                 * 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 don't want to ever read C:\dev\random, only /dev/urandom on
+			 * Unix-like operating systems. While we guard against this
+			 * condition in random.php, it doesn't hurt to be defensive in depth
+			 * here.
+			 *
+			 * To that end, we only try to open /dev/urandom if we're on a Unix-
+			 * like operating system (which means the directory separator is set
+			 * to "/" not "\".
+			 */
+			if (DIRECTORY_SEPARATOR === '/') {
+				if (!is_readable('/dev/urandom')) {
+					throw new Exception(
+						'Environment misconfiguration: ' .
+						'/dev/urandom cannot be read.'
+					);
+				}
+				/**
+				 * 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)) {
-                    /**
-                     * 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 $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)) {
+					/**
+					 * 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 $buf
+				 */
+				$buf .= $read;
+			} while ($remaining > 0);
 
-            /**
-             * Is our result valid?
-             * @var string|bool $buf
-             */
-            if (is_string($buf)) {
-                if (RandomCompat_strlen($buf) === $bytes) {
-                    /**
-                     * Return our random entropy buffer here:
-                     */
-                    return $buf;
-                }
-            }
-        }
+			/**
+			 * Is our result valid?
+			 * @var string|bool $buf
+			 */
+			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 +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-Boards.php

Spacing +2 added lines, -2 removed lines

@@ -851,7 +851,7 @@ 
 
 	clean_cache('data');
 
-	cache_put_data('parsed_boards_descriptions_'. $parsed_boards_cat_id, $already_parsed_boards, 864000);
+	cache_put_data('parsed_boards_descriptions_' . $parsed_boards_cat_id, $already_parsed_boards, 864000);
 
 	if (empty($boardOptions['dont_log']))
 		logAction('edit_board', array('board' => $board_id), 'admin');
@@ -1579,7 +1579,7 @@ 
 			$context['description_allowed_tags']
 		);
 
-	cache_put_data('parsed_boards_descriptions_'. $category_id, $already_parsed_boards, 864000);
+	cache_put_data('parsed_boards_descriptions_' . $category_id, $already_parsed_boards, 864000);
 
 	return $already_parsed_boards;
 }

Sources/Cache/APIs/MemcacheImplementation.php

Spacing +5 added lines, -5 removed lines

@@ -169,15 +169,15 @@ 
 		$class_name = $this->getImplementationClassKeyName();
 		$class_name_txt_key = strtolower($class_name);
 
-		$config_vars[] = $txt['cache_'. $class_name_txt_key .'_settings'];
+		$config_vars[] = $txt['cache_' . $class_name_txt_key . '_settings'];
 		$config_vars[] = array(
 			self::CLASS_KEY,
-			$txt['cache_'. $class_name_txt_key .'_servers'],
+			$txt['cache_' . $class_name_txt_key . '_servers'],
 			'file',
 			'text',
 			0,
-			'cache_'. $class_name_txt_key,
-			'subtext' => $txt['cache_'. $class_name_txt_key .'_servers_subtext']);
+			'cache_' . $class_name_txt_key,
+			'subtext' => $txt['cache_' . $class_name_txt_key . '_servers_subtext']);
 
 		if (!isset($context['settings_post_javascript']))
 			$context['settings_post_javascript'] = '';
@@ -185,7 +185,7 @@ 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {
 				var cache_type = e.currentTarget.value;
-				$("#'. self::CLASS_KEY .'").prop("disabled", cache_type != "'. $class_name .'");
+				$("#'. self::CLASS_KEY . '").prop("disabled", cache_type != "' . $class_name . '");
 			});';
 	}
 

Sources/Subs-BoardIndex.php

Spacing +1 added lines, -2 removed lines

@@ -195,8 +195,7 @@
 				);
 
 				$categories[$row_board['id_cat']]['link'] = '<a id="c' . $row_board['id_cat'] . '"></a>' . (!$context['user']['is_guest'] ?
-						'<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' :
-						$row_board['cat_name']);
+						'<a href="' . $scripturl . '?action=unread;c=' . $row_board['id_cat'] . '" title="' . sprintf($txt['new_posts_in_category'], $row_board['cat_name']) . '">' . $row_board['cat_name'] . '</a>' : $row_board['cat_name']);
 
 			}
 

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

Themes/default/Packages.template.php

Spacing +1 added lines, -1 removed lines

@@ -455,7 +455,7 @@
 
 	elseif ($context['uninstalling'])
 		echo '
-			', $txt['package_uninstall_done'] .' <br>
+			', $txt['package_uninstall_done'] . ' <br>
 			', '<a href="', $context['keep_url'], '" class="button">', $txt['package_keep'], '</a>', '<a href="', $context['remove_url'], '" class="button">', $txt['package_delete2'], '</a>';
 
 	elseif ($context['install_finished'])