SimpleMachines / SMF2.1

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>

Sources/Subs-Password.php

Braces +93 added lines, -45 removed lines

@@ -18,7 +18,8 @@ 
 
 namespace {
 
-	if (!defined('PASSWORD_DEFAULT')) {
+	if (!defined('PASSWORD_DEFAULT'))
+	{
 
 		define('PASSWORD_BCRYPT', 1);
 		define('PASSWORD_DEFAULT', PASSWORD_BCRYPT);
@@ -34,29 +35,37 @@ 
 		 *
 		 * @return string|false The hashed password, or false on error.
 		 */
-		function password_hash($password, $algo, array $options = array()) {
-			if (!function_exists('crypt')) {
+		function password_hash($password, $algo, array $options = array())
+		{
+			if (!function_exists('crypt'))
+			{
 				trigger_error("Crypt must be loaded for password_hash to function", E_USER_WARNING);
 				return null;
 			}
-			if (!is_string($password)) {
+			if (!is_string($password))
+			{
 				trigger_error("password_hash(): Password must be a string", E_USER_WARNING);
 				return null;
 			}
-			if (!is_int($algo)) {
+			if (!is_int($algo))
+			{
 				trigger_error("password_hash() expects parameter 2 to be long, " . gettype($algo) . " given", E_USER_WARNING);
 				return null;
 			}
-			if (PasswordCompat\binary\_strlen($password) > 72) {
+			if (PasswordCompat\binary\_strlen($password) > 72)
+			{
 				$password = PasswordCompat\binary\_substr($password, 0, 72);
 			}
-			switch ($algo) {
+			switch ($algo)
+			{
 				case PASSWORD_BCRYPT:
 					// Note that this is a C constant, but not exposed to PHP, so we don't define it here.
 					$cost = 10;
-					if (isset($options['cost'])) {
+					if (isset($options['cost']))
+					{
 						$cost = $options['cost'];
-						if ($cost < 4 || $cost > 31) {
+						if ($cost < 4 || $cost > 31)
+						{
 							trigger_error(sprintf("password_hash(): Invalid bcrypt cost parameter specified: %d", $cost), E_USER_WARNING);
 							return null;
 						}
@@ -74,8 +83,10 @@ 
 					return null;
 			}
 			$salt_requires_encoding = false;
-			if (isset($options['salt'])) {
-				switch (gettype($options['salt'])) {
+			if (isset($options['salt']))
+			{
+				switch (gettype($options['salt']))
+				{
 					case 'NULL':
 					case 'boolean':
 					case 'integer':
@@ -84,7 +95,8 @@ 
 						$salt = (string) $options['salt'];
 						break;
 					case 'object':
-						if (method_exists($options['salt'], '__tostring')) {
+						if (method_exists($options['salt'], '__tostring'))
+						{
 							$salt = (string) $options['salt'];
 							break;
 						}
@@ -94,51 +106,70 @@ 
 						trigger_error('password_hash(): Non-string salt parameter supplied', E_USER_WARNING);
 						return null;
 				}
-				if (PasswordCompat\binary\_strlen($salt) < $required_salt_len) {
+				if (PasswordCompat\binary\_strlen($salt) < $required_salt_len)
+				{
 					trigger_error(sprintf("password_hash(): Provided salt is too short: %d expecting %d", PasswordCompat\binary\_strlen($salt), $required_salt_len), E_USER_WARNING);
 					return null;
-				} elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt)) {
+				}
+				elseif (0 == preg_match('#^[a-zA-Z0-9./]+$#D', $salt))
+				{
 					$salt_requires_encoding = true;
 				}
-			} else {
+			}
+			else
+			{
 				$buffer = '';
 				$buffer_valid = false;
-				if (function_exists('random_bytes')) {
+				if (function_exists('random_bytes'))
+				{
 					$buffer = random_bytes($raw_salt_len);
-					if ($buffer) {
+					if ($buffer)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER')) {
+				if (!$buffer_valid && function_exists('mcrypt_create_iv') && !defined('PHALANGER'))
+				{
 					$buffer = mcrypt_create_iv($raw_salt_len, MCRYPT_DEV_URANDOM);
-					if ($buffer) {
+					if ($buffer)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes')) {
+				if (!$buffer_valid && function_exists('openssl_random_pseudo_bytes'))
+				{
 					$buffer = openssl_random_pseudo_bytes($raw_salt_len);
-					if ($buffer) {
+					if ($buffer)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid && @is_readable('/dev/urandom')) {
+				if (!$buffer_valid && @is_readable('/dev/urandom'))
+				{
 					$f = fopen('/dev/urandom', 'r');
 					$read = PasswordCompat\binary\_strlen($buffer);
-					while ($read < $raw_salt_len) {
+					while ($read < $raw_salt_len)
+					{
 						$buffer .= fread($f, $raw_salt_len - $read);
 						$read = PasswordCompat\binary\_strlen($buffer);
 					}
 					fclose($f);
-					if ($read >= $raw_salt_len) {
+					if ($read >= $raw_salt_len)
+					{
 						$buffer_valid = true;
 					}
 				}
-				if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len) {
+				if (!$buffer_valid || PasswordCompat\binary\_strlen($buffer) < $raw_salt_len)
+				{
 					$bl = PasswordCompat\binary\_strlen($buffer);
-					for ($i = 0; $i < $raw_salt_len; $i++) {
-						if ($i < $bl) {
+					for ($i = 0; $i < $raw_salt_len; $i++)
+					{
+						if ($i < $bl)
+						{
 							$buffer[$i] = $buffer[$i] ^ chr(mt_rand(0, 255));
-						} else {
+						}
+						else
+						{
 							$buffer .= chr(mt_rand(0, 255));
 						}
 					}
@@ -146,7 +177,8 @@ 
 				$salt = $buffer;
 				$salt_requires_encoding = true;
 			}
-			if ($salt_requires_encoding) {
+			if ($salt_requires_encoding)
+			{
 				// encode string with the Base64 variant used by crypt
 				$base64_digits =
 					'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
@@ -162,7 +194,8 @@ 
 
 			$ret = crypt($password, $hash);
 
-			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength) {
+			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != $resultLength)
+			{
 				return false;
 			}
 
@@ -185,13 +218,15 @@ 
 		 *
 		 * @return array The array of information about the hash.
 		 */
-		function password_get_info($hash) {
+		function password_get_info($hash)
+		{
 			$return = array(
 				'algo' => 0,
 				'algoName' => 'unknown',
 				'options' => array(),
 			);
-			if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60) {
+			if (PasswordCompat\binary\_substr($hash, 0, 4) == '$2y$' && PasswordCompat\binary\_strlen($hash) == 60)
+			{
 				$return['algo'] = PASSWORD_BCRYPT;
 				$return['algoName'] = 'bcrypt';
 				list($cost) = sscanf($hash, "$2y$%d$");
@@ -211,15 +246,19 @@ 
 		 *
 		 * @return boolean True if the password needs to be rehashed.
 		 */
-		function password_needs_rehash($hash, $algo, array $options = array()) {
+		function password_needs_rehash($hash, $algo, array $options = array())
+		{
 			$info = password_get_info($hash);
-			if ($info['algo'] != $algo) {
+			if ($info['algo'] != $algo)
+			{
 				return true;
 			}
-			switch ($algo) {
+			switch ($algo)
+			{
 				case PASSWORD_BCRYPT:
 					$cost = isset($options['cost']) ? $options['cost'] : 10;
-					if ($cost != $info['options']['cost']) {
+					if ($cost != $info['options']['cost'])
+					{
 						return true;
 					}
 					break;
@@ -235,21 +274,26 @@ 
 		 *
 		 * @return boolean If the password matches the hash
 		 */
-		function password_verify($password, $hash) {
-			if (!function_exists('crypt')) {
+		function password_verify($password, $hash)
+		{
+			if (!function_exists('crypt'))
+			{
 				trigger_error("Crypt must be loaded for password_verify to function", E_USER_WARNING);
 				return false;
 			}
-			if (PasswordCompat\binary\_strlen($password) > 72) {
+			if (PasswordCompat\binary\_strlen($password) > 72)
+			{
 				$password = PasswordCompat\binary\_substr($password, 0, 72);
 			}
 			$ret = crypt($password, $hash);
-			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13) {
+			if (!is_string($ret) || PasswordCompat\binary\_strlen($ret) != PasswordCompat\binary\_strlen($hash) || PasswordCompat\binary\_strlen($ret) <= 13)
+			{
 				return false;
 			}
 
 			$status = 0;
-			for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++) {
+			for ($i = 0; $i < PasswordCompat\binary\_strlen($ret); $i++)
+			{
 				$status |= (ord($ret[$i]) ^ ord($hash[$i]));
 			}
 
@@ -271,8 +315,10 @@ 
 	 * @internal
 	 * @return int The number of bytes
 	 */
-	function _strlen($binary_string) {
-		if (function_exists('mb_strlen')) {
+	function _strlen($binary_string)
+	{
+		if (function_exists('mb_strlen'))
+		{
 			return mb_strlen($binary_string, '8bit');
 		}
 		return strlen($binary_string);
@@ -290,8 +336,10 @@ 
 	 * @internal
 	 * @return string The substring
 	 */
-	function _substr($binary_string, $start, $length) {
-		if (function_exists('mb_substr')) {
+	function _substr($binary_string, $start, $length)
+	{
+		if (function_exists('mb_substr'))
+		{
 			return mb_substr($binary_string, $start, $length, '8bit');
 		}
 		return substr($binary_string, $start, $length);

Sources/Themes.php

Braces -1 removed lines

@@ -1364,7 +1364,6 @@
 		// return all the info.
 		return $context['to_install'];
 	}
-
 	else
 		fatal_lang_error('theme_install_error_title', false);
 }

Sources/Subs-BoardIndex.php

Braces +1 added lines, -1 removed lines

@@ -419,7 +419,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 (!empty($moderators[$board['id']]))

Sources/tasks/Birthday-Notify.php

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      * @return bool Always returns true
      */
 	public function execute()
- 	{
+	{
 		global $txt, $smcFunc, $txtBirthdayEmails, $modSettings, $sourcedir;
 
 		$greeting = isset($modSettings['birthday_email']) ? $modSettings['birthday_email'] : 'happy_birthday';

Sources/tasks/GroupReq-Notify.php

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * @return bool Always returns true.
 	 */
 	public function execute()
- 	{
+	{
  		global $sourcedir, $smcFunc, $language, $modSettings, $scripturl;
 
 		// Do we have any group moderators?

Sources/tasks/UpdateTldRegex.php

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
      * @return bool Always returns true
      */
 	public function execute()
- 	{
+	{
 		global $sourcedir;
 
 		require_once($sourcedir . '/Subs.php');

Sources/tasks/EventNew-Notify.php

Braces +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * @return bool Always returns true
 	 */
 	public function execute()
- 	{
+	{
  		global $sourcedir, $smcFunc, $user_profile;
 
 		// Get everyone who could be notified - those are the people who can see the calendar.

Sources/tasks/Buddy-Notify.php

Braces +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 * @return bool Always returns true
 	 */
 	public function execute()
- 	{
+	{
  		global $smcFunc, $sourcedir;
 
 		// Figure out if the user wants to be notified.