albertlast / SMF2.1

Sources/Subs-Compat.php

Indentation +9 added lines, -9 removed lines

@@ -776,15 +776,15 @@
 if (!is_callable('random_int'))
 {
 	 /**
-	 * Fetch a random integer between $min and $max inclusive
-	 *
-	 * @param int $min
-	 * @param int $max
-	 *
-	 * @throws Exception
-	 *
-	 * @return int
-	 */
+	  * Fetch a random integer between $min and $max inclusive
+	  *
+	  * @param int $min
+	  * @param int $max
+	  *
+	  * @throws Exception
+	  *
+	  * @return int
+	  */
 	function random_int($min, $max)
 	{
 		/**

Spacing +1 added lines, -1 removed lines

@@ -371,7 +371,7 @@
 					}
 
 					return (string) substr(
-						(string )$binary_string,
+						(string) $binary_string,
 						(int) $start,
 						(int) $length
 					);

Sources/Subs-Members.php

Spacing +5 added lines, -5 removed lines

@@ -586,7 +586,7 @@ 
 		'member_name' => $regOptions['username'],
 		'email_address' => $regOptions['email'],
 		'passwd' => hash_password($regOptions['username'], $regOptions['password']),
-		'password_salt' => substr(md5($smcFunc['random_int']()), 0, 4) ,
+		'password_salt' => substr(md5($smcFunc['random_int']()), 0, 4),
 		'posts' => 0,
 		'date_registered' => time(),
 		'member_ip' => $regOptions['interface'] == 'admin' ? '127.0.0.1' : $user_info['ip'],
@@ -676,7 +676,7 @@ 
 		'time_offset',
 	);
 	$knownInets = array(
-		'member_ip','member_ip2',
+		'member_ip', 'member_ip2',
 	);
 
 	// Call an optional function to validate the users' input.
@@ -904,7 +904,7 @@ 
 	$checkName = strtr($name, array('_' => '\\_', '%' => '\\%'));
 
 	//when we got no wildcard we can use equal -> fast
-	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=' );
+	$operator = (strpos($checkName, '%') || strpos($checkName, '_') ? 'LIKE' : '=');
 
 	// Make sure they don't want someone else's name.
 	$request = $smcFunc['db_query']('', '
@@ -1273,7 +1273,7 @@ 
 		$user_info['buddies'][] = $userReceiver;
 
 		// And add a nice alert. Don't abuse though!
-		if ((cache_get_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, 86400)) == null)
+		if ((cache_get_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, 86400)) == null)
 		{
 			$smcFunc['db_insert']('insert',
 				'{db_prefix}background_tasks',
@@ -1288,7 +1288,7 @@ 
 			);
 
 			// Store this in a cache entry to avoid creating multiple alerts. Give it a long life cycle.
-			cache_put_data('Buddy-sent-'. $user_info['id'] .'-'. $userReceiver, '1', 86400);
+			cache_put_data('Buddy-sent-' . $user_info['id'] . '-' . $userReceiver, '1', 86400);
 		}
 	}
 

Sources/Class-TOTP.php

Braces +24 added lines, -12 removed lines

@@ -64,7 +64,8 @@ 
 	{
 		$this->buildLookup();
 
-		if ($initKey !== null) {
+		if ($initKey !== null)
+		{
 			$this->setInitKey($initKey);
 		}
 	}
@@ -98,7 +99,8 @@ 
 	 */
 	public function setRange($range)
 	{
-		if (!is_numeric($range)) {
+		if (!is_numeric($range))
+		{
 			throw new \InvalidArgumentException('Invalid window range');
 		}
 		$this->range = $range;
@@ -114,7 +116,8 @@ 
 	 */
 	public function setInitKey($key)
 	{
-		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false) {
+		if (preg_match('/^[' . implode('', array_keys($this->getLookup())) . ']+$/', $key) == false)
+		{
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 		$this->initKey = $key;
@@ -140,7 +143,8 @@ 
 	 */
 	public function setLookup($lookup)
 	{
-		if (!is_array($lookup)) {
+		if (!is_array($lookup))
+		{
 			throw new \InvalidArgumentException('Lookup value must be an array');
 		}
 		$this->lookup = $lookup;
@@ -176,7 +180,8 @@ 
 	 */
 	public function setRefresh($seconds)
 	{
-		if (!is_numeric($seconds)) {
+		if (!is_numeric($seconds))
+		{
 			throw new \InvalidArgumentException('Seconds must be numeric');
 		}
 		$this->refreshSeconds = $seconds;
@@ -217,7 +222,8 @@ 
 	 */
 	public function validateCode($code, $initKey = null, $timestamp = null, $range = null)
 	{
-		if (strlen($code) !== $this->getCodeLength()) {
+		if (strlen($code) !== $this->getCodeLength())
+		{
 			throw new \InvalidArgumentException('Incorrect code length');
 		}
 
@@ -227,8 +233,10 @@ 
 
 		$binary = $this->base32_decode($initKey);
 
-		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++) {
-			if ($this->generateOneTime($binary, $time) == $code) {
+		for ($time = ($timestamp - $range); $time <= ($timestamp + $range); $time++)
+		{
+			if ($this->generateOneTime($binary, $time) == $code)
+			{
 				return true;
 			}
 		}
@@ -269,7 +277,8 @@ 
 		$lookup = implode('', array_keys($this->getLookup()));
 		$code = '';
 
-		for ($i = 0; $i < $length; $i++) {
+		for ($i = 0; $i < $length; $i++)
+		{
 			$code .= $lookup[$smcFunc['random_int'](0, strlen($lookup) - 1)];
 		}
 
@@ -315,7 +324,8 @@ 
 	{
 		$lookup = $this->getLookup();
 
-		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false) {
+		if (preg_match('/^[' . implode('', array_keys($lookup)) . ']+$/', $hash) == false)
+		{
 			throw new \InvalidArgumentException('Invalid base32 hash!');
 		}
 
@@ -324,12 +334,14 @@ 
 		$length = 0;
 		$binary = '';
 
-		for ($i = 0; $i < strlen($hash); $i++) {
+		for ($i = 0; $i < strlen($hash); $i++)
+		{
 			$buffer = $buffer << 5;
 			$buffer += $lookup[$hash[$i]];
 			$length += 5;
 
-			if ($length >= 8) {
+			if ($length >= 8)
+			{
 				$length -= 8;
 				$binary .= chr(($buffer & (0xFF << $length)) >> $length);
 			}

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,31 +35,39 @@ 
 		 *
 		 * @return string|false The hashed password, or false on error.
 		 */
-		function password_hash($password, $algo, array $options = array()) {
+		function password_hash($password, $algo, array $options = array())
+		{
 			global $smcFunc;
 
-			if (!function_exists('crypt')) {
+			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;
 						}
@@ -76,8 +85,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':
@@ -86,7 +97,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;
 						}
@@ -96,51 +108,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($smcFunc['random_int'](0, 255));
-						} else {
+						}
+						else
+						{
 							$buffer .= chr($smcFunc['random_int'](0, 255));
 						}
 					}
@@ -148,7 +179,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+/';
@@ -164,7 +196,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;
 			}
 
@@ -187,13 +220,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$");
@@ -213,15 +248,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;
@@ -237,21 +276,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]));
 			}
 
@@ -273,8 +317,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);
@@ -292,8 +338,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);