elkarte / Elkarte

sources/subs/Exception/ElkException.class.php

Braces +3 added lines, -1 removed lines

@@ -166,7 +166,9 @@
 		// Don't need to reload the language file if both the user and
 		// the forum share the same language.
 		if (!isset($language) || $language !== $user_info['language'])
-			loadLanguage($lang, $language);
+		{
+					loadLanguage($lang, $language);
+		}
 
 		if ($this->log !== false)
 		{

sources/subs/Smileys.subs.php

Braces +24 added lines, -9 removed lines

@@ -35,7 +35,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$found[] = $row['filename'];
+	{
+			$found[] = $row['filename'];
+	}
 	$db->free_result($request);
 
 	return $found;
@@ -64,7 +66,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) > 0)
-		return true;
+	{
+			return true;
+	}
 	$db->free_result($request);
 
 	return false;
@@ -201,7 +205,9 @@ 
 		)
 	);
 	if ($db->num_rows($request) != 1)
-		throw new Elk_Exception('smiley_not_found');
+	{
+			throw new Elk_Exception('smiley_not_found');
+	}
 	$current_smiley = $db->fetch_assoc($request);
 	$db->free_result($request);
 
@@ -492,20 +498,27 @@ 
 	$sort_flag = strpos($sort, 'DESC') === false ? SORT_ASC : SORT_DESC;
 
 	if (substr($sort, 0, 4) === 'name')
-		array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
+	{
+			array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
+	}
 	elseif (substr($sort, 0, 4) === 'path')
-		array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
-	else
-		array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	{
+			array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
+	}
+	else {
+			array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	}
 
 	$smiley_sets = array();
 	foreach ($cols['id'] as $i => $id)
-		$smiley_sets[] = array(
+	{
+			$smiley_sets[] = array(
 			'id' => $id,
 			'path' => $cols['path'][$i],
 			'name' => $cols['name'][$i],
 			'selected' => $cols['path'][$i] == $modSettings['smiley_sets_default']
 		);
+	}
 
 	return $smiley_sets;
 }
@@ -541,7 +554,9 @@ 
 	);
 	$smileys = array();
 	while ($row = $db->fetch_assoc($request))
-		$smileys[] = $row;
+	{
+			$smileys[] = $row;
+	}
 	$db->free_result($request);
 
 	return $smileys;

sources/subs/NotificationsTask.class.php

Braces +9 added lines, -4 removed lines

@@ -58,12 +58,17 @@
 		);
 
 		if (!isset($this->data['source_data']['status']))
-			$this->data['source_data']['status'] = 'new';
+		{
+					$this->data['source_data']['status'] = 'new';
+		}
 
 		if (isset($this->data['source_data']['id_members']))
-			$this->setMembers($this->data['source_data']['id_members']);
-		else
-			$this->setMembers(array());
+		{
+					$this->setMembers($this->data['source_data']['id_members']);
+		}
+		else {
+					$this->setMembers(array());
+		}
 	}
 
 	/**

sources/subs/Search/API/Custom.php

Braces +39 added lines, -13 removed lines

@@ -64,7 +64,9 @@ 
 		}
 
 		if (empty($modSettings['search_custom_index_config']))
-			return;
+		{
+					return;
+		}
 
 		$this->indexSettings = \Util::unserialize($modSettings['search_custom_index_config']);
 
@@ -115,11 +117,15 @@ 
 		$subwords = text2words($word, $this->min_word_length, true);
 
 		if (empty($modSettings['search_force_index']))
-			$wordsSearch['words'][] = $word;
+		{
+					$wordsSearch['words'][] = $word;
+		}
 
 		// Excluded phrases don't benefit from being split into subwords.
 		if (count($subwords) > 1 && $isExcluded)
-			return;
+		{
+					return;
+		}
 		else
 		{
 			foreach ($subwords as $subword)
@@ -128,7 +134,9 @@ 
 				{
 					$wordsSearch['indexed_words'][] = $subword;
 					if ($isExcluded)
-						$wordsExclude[] = $subword;
+					{
+											$wordsExclude[] = $subword;
+					}
 				}
 			}
 		}
@@ -158,7 +166,9 @@ 
 		$query_params = $search_data['params'];
 
 		if ($query_params['id_search'])
-			$query_select['id_search'] = '{int:id_search}';
+		{
+					$query_select['id_search'] = '{int:id_search}';
+		}
 
 		$count = 0;
 		foreach ($words['words'] as $regularWord)
@@ -168,15 +178,25 @@ 
 		}
 
 		if ($query_params['user_query'])
-			$query_where[] = '{raw:user_query}';
+		{
+					$query_where[] = '{raw:user_query}';
+		}
 		if ($query_params['board_query'])
-			$query_where[] = 'm.id_board {raw:board_query}';
+		{
+					$query_where[] = 'm.id_board {raw:board_query}';
+		}
 		if ($query_params['topic'])
-			$query_where[] = 'm.id_topic = {int:topic}';
+		{
+					$query_where[] = 'm.id_topic = {int:topic}';
+		}
 		if ($query_params['min_msg_id'])
-			$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		{
+					$query_where[] = 'm.id_msg >= {int:min_msg_id}';
+		}
 		if ($query_params['max_msg_id'])
-			$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		{
+					$query_where[] = 'm.id_msg <= {int:max_msg_id}';
+		}
 
 		$count = 0;
 		if (!empty($query_params['excluded_phrases']) && empty($modSettings['search_force_index']))
@@ -251,15 +271,19 @@ 
 
 		$inserts = array();
 		foreach (text2words($msgOptions['body'], $customIndexSettings['bytes_per_word'], true) as $word)
-			$inserts[] = array($word, $msgOptions['id']);
+		{
+					$inserts[] = array($word, $msgOptions['id']);
+		}
 
 		if (!empty($inserts))
-			$db->insert('ignore',
+		{
+					$db->insert('ignore',
 				'{db_prefix}log_search_words',
 				array('id_word' => 'int', 'id_msg' => 'int'),
 				$inserts,
 				array('id_word', 'id_msg')
 			);
+		}
 	}
 
 	/**
@@ -309,7 +333,9 @@ 
 			{
 				$inserts = array();
 				foreach ($inserted_words as $word)
-					$inserts[] = array($word, $msgOptions['id']);
+				{
+									$inserts[] = array($word, $msgOptions['id']);
+				}
 				$db->insert('insert',
 					'{db_prefix}log_search_words',
 					array('id_word' => 'string', 'id_msg' => 'int'),

sources/subs/Search/API/Fulltext.php

Braces +3 added lines, -1 removed lines

@@ -324,7 +324,9 @@
 			$words['indexed_words'] = array_diff($words['indexed_words'], $words['complex_words']);
 
 			foreach ($words['indexed_words'] as $fulltextWord)
-				$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '-' : '+') . $fulltextWord . ' ';
+			{
+							$query_params['boolean_match'] .= (in_array($fulltextWord, $query_params['excluded_index_words']) ? '-' : '+') . $fulltextWord . ' ';
+			}
 			$query_params['boolean_match'] = substr($query_params['boolean_match'], 0, -1);
 
 			// If we have bool terms to search, add them in

sources/subs/FtpConnection.class.php

Braces +93 added lines, -34 removed lines

@@ -62,7 +62,9 @@ 
 		$this->pasv = array();
 
 		if ($ftp_server !== null)
-			$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		{
+					$this->connect($ftp_server, $ftp_port, $ftp_user, $ftp_pass);
+		}
 	}
 
 	/**
@@ -76,11 +78,17 @@ 
 	public function connect($ftp_server, $ftp_port = 21, $ftp_user = 'anonymous', $ftp_pass = 'ftpclient@yourdomain.org')
 	{
 		if (strpos($ftp_server, 'ftp://') === 0)
-			$ftp_server = substr($ftp_server, 6);
+		{
+					$ftp_server = substr($ftp_server, 6);
+		}
 		elseif (strpos($ftp_server, 'ftps://') === 0)
-			$ftp_server = 'ssl://' . substr($ftp_server, 7);
+		{
+					$ftp_server = 'ssl://' . substr($ftp_server, 7);
+		}
 		if (strpos($ftp_server, 'http://') === 0)
-			$ftp_server = substr($ftp_server, 7);
+		{
+					$ftp_server = substr($ftp_server, 7);
+		}
 		$ftp_server = strtr($ftp_server, array('/' => '', ':' => '', '@' => ''));
 
 		// Connect to the FTP server.
@@ -124,11 +132,15 @@ 
 	public function chdir($ftp_path)
 	{
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		// No slash on the end, please...
 		if ($ftp_path !== '/' && substr($ftp_path, -1) === '/')
-			$ftp_path = substr($ftp_path, 0, -1);
+		{
+					$ftp_path = substr($ftp_path, 0, -1);
+		}
 
 		fwrite($this->connection, 'CWD ' . $ftp_path . "\r\n");
 		if (!$this->check_response(250))
@@ -150,10 +162,14 @@ 
 	public function chmod($ftp_file, $chmod)
 	{
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		if ($ftp_file == '')
-			$ftp_file = '.';
+		{
+					$ftp_file = '.';
+		}
 
 		// Convert the chmod value from octal (0777) to text ("777").
 		fwrite($this->connection, 'SITE CHMOD ' . decoct($chmod) . ' ' . $ftp_file . "\r\n");
@@ -176,7 +192,9 @@ 
 	{
 		// We are actually connected, right?
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		// Delete file X.
 		fwrite($this->connection, 'DELE ' . $ftp_file . "\r\n");
@@ -222,7 +240,9 @@ 
 	{
 		// We can't create a passive data connection without a primary one first being there.
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		// Request a passive connection - this means, we'll talk to you, you don't talk to us.
 		@fwrite($this->connection, 'PASV' . "\r\n");
@@ -262,11 +282,15 @@ 
 	{
 		// First, we have to be connected... very important.
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		// I'd like one passive mode, please!
 		if (!$this->passive())
-			return false;
+		{
+					return false;
+		}
 
 		// Seems logical enough, so far...
 		fwrite($this->connection, 'STOR ' . $ftp_file . "\r\n");
@@ -302,11 +326,15 @@ 
 	{
 		// Are we even connected...?
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		// Passive... non-aggressive...
 		if (!$this->passive())
-			return false;
+		{
+					return false;
+		}
 
 		// Get the listing!
 		fwrite($this->connection, 'LIST -1' . ($search ? 'R' : '') . ($ftp_path == '' ? '' : ' ' . $ftp_path) . "\r\n");
@@ -323,7 +351,9 @@ 
 		// Read in the file listing.
 		$data = '';
 		while (!feof($fp))
-			$data .= fread($fp, 4096);
+		{
+					$data .= fread($fp, 4096);
+		}
 		fclose($fp);
 
 		// Everything go okay?
@@ -346,7 +376,9 @@ 
 	public function locate($file, $listing = null)
 	{
 		if ($listing === null)
-			$listing = $this->list_dir('', true);
+		{
+					$listing = $this->list_dir('', true);
+		}
 		$listing = explode("\n", $listing);
 
 		@fwrite($this->connection, 'PWD' . "\r\n");
@@ -358,9 +390,12 @@ 
 
 		// Check for 257!
 		if (preg_match('~^257 "(.+?)" ~', $response, $match) != 0)
-			$current_dir = strtr($match[1], array('""' => '"'));
-		else
-			$current_dir = '';
+		{
+					$current_dir = strtr($match[1], array('""' => '"'));
+		}
+		else {
+					$current_dir = '';
+		}
 
 		for ($i = 0, $n = count($listing); $i < $n; $i++)
 		{
@@ -374,11 +409,17 @@ 
 			$listing[$i] = $current_dir . '/' . trim(strlen($listing[$i]) > 30 ? strrchr($listing[$i], ' ') : $listing[$i]);
 
 			if ($file[0] == '*' && substr($listing[$i], -(strlen($file) - 1)) == substr($file, 1))
-				return $listing[$i];
+			{
+							return $listing[$i];
+			}
 			if (substr($file, -1) == '*' && substr($listing[$i], 0, strlen($file) - 1) == substr($file, 0, -1))
-				return $listing[$i];
+			{
+							return $listing[$i];
+			}
 			if (basename($listing[$i]) == $file || $listing[$i] == $file)
-				return $listing[$i];
+			{
+							return $listing[$i];
+			}
 		}
 
 		return false;
@@ -394,7 +435,9 @@ 
 	{
 		// We must be connected to the server to do something.
 		if (!is_resource($this->connection))
-			return false;
+		{
+					return false;
+		}
 
 		// Make this new beautiful directory!
 		fwrite($this->connection, 'MKD ' . $ftp_dir . "\r\n");
@@ -427,34 +470,50 @@ 
 				$path = strtr($_SERVER['DOCUMENT_ROOT'], array('/home/' . $match[1] . '/' => '', '/home2/' . $match[1] . '/' => ''));
 
 				if (substr($path, -1) == '/')
-					$path = substr($path, 0, -1);
+				{
+									$path = substr($path, 0, -1);
+				}
 
 				if (strlen(dirname($_SERVER['PHP_SELF'])) > 1)
-					$path .= dirname($_SERVER['PHP_SELF']);
+				{
+									$path .= dirname($_SERVER['PHP_SELF']);
+				}
 			}
 			elseif (strpos($filesystem_path, '/var/www/') === 0)
-				$path = substr($filesystem_path, 8);
-			else
-				$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
+			{
+							$path = substr($filesystem_path, 8);
+			}
+			else {
+							$path = strtr(strtr($filesystem_path, array('\\' => '/')), array($_SERVER['DOCUMENT_ROOT'] => ''));
+			}
+		}
+		else {
+					$path = '';
 		}
-		else
-			$path = '';
 
 		if (is_resource($this->connection) && $this->list_dir($path) == '')
 		{
 			$data = $this->list_dir('', true);
 
 			if ($lookup_file === null)
-				$lookup_file = $_SERVER['PHP_SELF'];
+			{
+							$lookup_file = $_SERVER['PHP_SELF'];
+			}
 
 			$found_path = dirname($this->locate('*' . basename(dirname($lookup_file)) . '/' . basename($lookup_file), $data));
 			if ($found_path === false)
-				$found_path = dirname($this->locate(basename($lookup_file)));
+			{
+							$found_path = dirname($this->locate(basename($lookup_file)));
+			}
 			if ($found_path !== false)
-				$path = $found_path;
+			{
+							$path = $found_path;
+			}
 		}
 		elseif (is_resource($this->connection))
-			$found_path = true;
+		{
+					$found_path = true;
+		}
 
 		return array($username, $path, isset($found_path));
 	}

sources/subs/Auth.subs.php

Braces +132 added lines, -51 removed lines

@@ -70,7 +70,9 @@ 
 
 	// If subdomain-independent cookies are on, unset the subdomain-dependent cookie too.
 	if (empty($id) && !empty($modSettings['globalCookies']))
-		elk_setcookie($cookiename, $data, time() + $cookie_length, $cookie_url[1], '');
+	{
+			elk_setcookie($cookiename, $data, time() + $cookie_length, $cookie_url[1], '');
+	}
 
 	// Any alias URLs?  This is mainly for use with frames, etc.
 	if (!empty($modSettings['forum_alias_urls']))
@@ -87,7 +89,9 @@ 
 			$cookie_url = url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies']));
 
 			if ($cookie_url[0] == '')
-				$cookie_url[0] = strtok($alias, '/');
+			{
+							$cookie_url[0] = strtok($alias, '/');
+			}
 
 			elk_setcookie($cookiename, $data, time() + $cookie_length, $cookie_url[1], $cookie_url[0]);
 		}
@@ -142,22 +146,32 @@ 
 
 	// Is local cookies off?
 	if (empty($parsed_url['path']) || !$local)
-		$parsed_url['path'] = '';
+	{
+			$parsed_url['path'] = '';
+	}
 
 	if (!empty($modSettings['globalCookiesDomain']) && strpos($boardurl, $modSettings['globalCookiesDomain']) !== false)
-		$parsed_url['host'] = $modSettings['globalCookiesDomain'];
+	{
+			$parsed_url['host'] = $modSettings['globalCookiesDomain'];
+	}
 
 	// Globalize cookies across domains (filter out IP-addresses)?
 	elseif ($global && preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-		$parsed_url['host'] = '.' . $parts[1];
+	{
+			$parsed_url['host'] = '.' . $parts[1];
+	}
 
 	// We shouldn't use a host at all if both options are off.
 	elseif (!$local && !$global)
-		$parsed_url['host'] = '';
+	{
+			$parsed_url['host'] = '';
+	}
 
 	// The host also shouldn't be set if there aren't any dots in it.
 	elseif (!isset($parsed_url['host']) || strpos($parsed_url['host'], '.') === false)
-		$parsed_url['host'] = '';
+	{
+			$parsed_url['host'] = '';
+	}
 
 	return array($parsed_url['host'], $parsed_url['path'] . '/');
 }
@@ -197,9 +211,13 @@ 
 		Errors::instance()->log_error($txt['security_wrong'], 'critical');
 
 		if (isset($_POST[$type . '_hash_pass']))
-			unset($_POST[$type . '_hash_pass']);
+		{
+					unset($_POST[$type . '_hash_pass']);
+		}
 		if (isset($_POST[$type . '_pass']))
-			unset($_POST[$type . '_pass']);
+		{
+					unset($_POST[$type . '_pass']);
+		}
 
 		$context['incorrect_password'] = true;
 	}
@@ -213,14 +231,18 @@ 
 	// Now go through $_POST.  Make sure the session hash is sent.
 	$_POST[$context['session_var']] = $context['session_id'];
 	foreach ($_POST as $k => $v)
-		$context['post_data'] .= adminLogin_outputPostVars($k, $v);
+	{
+			$context['post_data'] .= adminLogin_outputPostVars($k, $v);
+	}
 
 	// Now we'll use the admin_login sub template of the Login template.
 	$context['sub_template'] = 'admin_login';
 
 	// And title the page something like "Login".
 	if (!isset($context['page_title']))
-		$context['page_title'] = $txt['admin_login'];
+	{
+			$context['page_title'] = $txt['admin_login'];
+	}
 
 	// The type of action.
 	$context['sessionCheckType'] = $type;
@@ -245,13 +267,17 @@ 
 function adminLogin_outputPostVars($k, $v)
 {
 	if (!is_array($v))
-		return '
+	{
+			return '
 <input type="hidden" name="' . htmlspecialchars($k, ENT_COMPAT, 'UTF-8') . '" value="' . strtr($v, array('"' => '&quot;', '<' => '&lt;', '>' => '&gt;')) . '" />';
+	}
 	else
 	{
 		$ret = '';
 		foreach ($v as $k2 => $v2)
-			$ret .= adminLogin_outputPostVars($k . '[' . $k2 . ']', $v2);
+		{
+					$ret .= adminLogin_outputPostVars($k . '[' . $k2 . ']', $v2);
+		}
 
 		return $ret;
 	}
@@ -280,17 +306,23 @@ 
 		{
 			// Only if it's not already in the $scripturl!
 			if (!isset($temp[$k]))
-				$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+			{
+							$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+			}
 			// If it changed, put it out there, but with an ampersand.
 			elseif ($temp[$k] != $get[$k])
-				$query_string .= urlencode($k) . '=' . urlencode($v) . '&amp;';
+			{
+							$query_string .= urlencode($k) . '=' . urlencode($v) . '&amp;';
+			}
 		}
 	}
 	else
 	{
 		// Add up all the data from $_GET into get_data.
 		foreach ($get as $k => $v)
-			$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+		{
+					$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+		}
 	}
 
 	$query_string = substr($query_string, 0, -1);
@@ -320,7 +352,9 @@ 
 
 	// If it's not already an array, make it one.
 	if (!is_array($names))
-		$names = explode(',', $names);
+	{
+			$names = explode(',', $names);
+	}
 
 	$maybe_email = false;
 	foreach ($names as $i => $name)
@@ -332,9 +366,12 @@ 
 
 		// Make it so standard wildcards will work. (* and ?)
 		if ($use_wildcards)
-			$names[$i] = strtr($names[$i], array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '\'' => '&#039;'));
-		else
-			$names[$i] = strtr($names[$i], array('\'' => '&#039;'));
+		{
+					$names[$i] = strtr($names[$i], array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '\'' => '&#039;'));
+		}
+		else {
+					$names[$i] = strtr($names[$i], array('\'' => '&#039;'));
+		}
 		$names[$i] = $db->quote('{string:name}', array('name' => $names[$i]));
 	}
 
@@ -348,10 +385,13 @@ 
 	$email_condition = allowedTo('moderate_forum') ? '' : 'hide_email = 0 AND ';
 
 	if ($use_wildcards || $maybe_email)
-		$email_condition = '
+	{
+			$email_condition = '
 			OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode( ') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')';
-	else
-		$email_condition = '';
+	}
+	else {
+			$email_condition = '';
+	}
 
 	// Get the case of the columns right - but only if we need to as things like MySQL will go slow needlessly otherwise.
 	$member_name = defined('DB_CASE_SENSITIVE') ? 'LOWER(member_name)' : 'member_name';
@@ -451,13 +491,16 @@ 
 		// Otherwise grab all of them and don't log anything
 		$error_severity = $errors->hasErrors(1) && !$user_info['is_admin'] ? 1 : null;
 		foreach ($errors->prepareErrors($error_severity) as $error)
-			throw new Elk_Exception($error, $error_severity === null ? false : 'general');
+		{
+					throw new Elk_Exception($error, $error_severity === null ? false : 'general');
+		}
 
 		// Update the database...
 		updateMemberData($memID, array('member_name' => $user, 'passwd' => $db_hash));
 	}
-	else
-		updateMemberData($memID, array('passwd' => $db_hash));
+	else {
+			updateMemberData($memID, array('passwd' => $db_hash));
+	}
 
 	call_integration_hook('integrate_reset_pass', array($old_user, $user, $newPassword));
 
@@ -494,24 +537,34 @@ 
 
 	// Don't use too long a name.
 	if (Util::strlen($username) > 25)
-		$errors->addError('error_long_name');
+	{
+			$errors->addError('error_long_name');
+	}
 
 	// No name?!  How can you register with no name?
 	if ($username == '')
-		$errors->addError('need_username');
+	{
+			$errors->addError('need_username');
+	}
 
 	// Only these characters are permitted.
 	if (in_array($username, array('_', '|')) || preg_match('~[<>&"\'=\\\\]~', preg_replace('~&#(?:\\d{1,7}|x[0-9a-fA-F]{1,6});~', '', $username)) != 0 || strpos($username, '[code') !== false || strpos($username, '[/code') !== false)
-		$errors->addError('error_invalid_characters_username');
+	{
+			$errors->addError('error_invalid_characters_username');
+	}
 
 	if (stristr($username, $txt['guest_title']) !== false)
-		$errors->addError(array('username_reserved', array($txt['guest_title'])), 1);
+	{
+			$errors->addError(array('username_reserved', array($txt['guest_title'])), 1);
+	}
 
 	if ($check_reserved_name)
 	{
 		require_once(SUBSDIR . '/Members.subs.php');
 		if (isReservedName($username, $memID, false, $fatal))
-			$errors->addError(array('name_in_use', array(htmlspecialchars($username, ENT_COMPAT, 'UTF-8'))));
+		{
+					$errors->addError(array('name_in_use', array(htmlspecialchars($username, ENT_COMPAT, 'UTF-8'))));
+		}
 	}
 }
 
@@ -545,17 +598,25 @@ 
 
 	// Is this enough?
 	if (empty($modSettings['password_strength']))
-		return null;
+	{
+			return null;
+	}
 
 	// Otherwise, perform the medium strength test - checking if password appears in the restricted string.
 	if (preg_match('~\b' . preg_quote($password, '~') . '\b~', implode(' ', $restrict_in)) != 0)
-		return 'restricted_words';
+	{
+			return 'restricted_words';
+	}
 	elseif (Util::strpos($password, $username) !== false)
-		return 'restricted_words';
+	{
+			return 'restricted_words';
+	}
 
 	// If just medium, we're done.
 	if ($modSettings['password_strength'] == 1)
-		return null;
+	{
+			return null;
+	}
 
 	// Otherwise, hard test next, check for numbers and letters, uppercase too.
 	$good = preg_match('~(\D\d|\d\D)~', $password) != 0;
@@ -596,7 +657,9 @@ 
 
 	// If the password is not 64 characters, lets make it a (SHA-256)
 	if (strlen($password) !== 64)
-		$password = hash('sha256', Util::strtolower($user) . un_htmlspecialchars($password));
+	{
+			$password = hash('sha256', Util::strtolower($user) . un_htmlspecialchars($password));
+	}
 
 	// They need a password hash, something to save in the db?
 	if ($returnhash)
@@ -605,11 +668,14 @@ 
 
 		// Something is not right, we can not generate a valid hash that's <20 characters
 		if (strlen($passhash) < 20)
-			$passhash = false;
+		{
+					$passhash = false;
+		}
 	}
 	// Or doing a password check?
-	else
-		$passhash = (bool) $hasher->CheckPassword($password, $hash);
+	else {
+			$passhash = (bool) $hasher->CheckPassword($password, $hash);
+	}
 
 	unset($hasher);
 
@@ -651,9 +717,12 @@ 
 		);
 
 		if (empty($groups))
-			$group_query = '0=1';
-		else
-			$group_query = 'id_group IN (' . implode(',', $groups) . ')';
+		{
+					$group_query = '0=1';
+		}
+		else {
+					$group_query = 'id_group IN (' . implode(',', $groups) . ')';
+		}
 	}
 
 	// Then, same again, just the boards this time!
@@ -664,9 +733,12 @@ 
 		$boards = boardsAllowedTo('moderate_board', true);
 
 		if (empty($boards))
-			$board_query = '0=1';
-		else
-			$board_query = 'id_board IN (' . implode(',', $boards) . ')';
+		{
+					$board_query = '0=1';
+		}
+		else {
+					$board_query = 'id_board IN (' . implode(',', $boards) . ')';
+		}
 	}
 
 	// What boards are they the moderator of?
@@ -717,9 +789,13 @@ 
 
 	// In case a customization wants to override the default settings
 	if ($httponly === null)
-		$httponly = !empty($modSettings['httponlyCookies']);
+	{
+			$httponly = !empty($modSettings['httponlyCookies']);
+	}
 	if ($secure === null)
-		$secure = !empty($modSettings['secureCookies']);
+	{
+			$secure = !empty($modSettings['secureCookies']);
+	}
 
 	// Default value in modern browsers is Lax
 	$samesite = (empty($samesite)) ? 'Lax' : $samesite;
@@ -801,9 +877,12 @@ 
 		if ($db->num_rows($request) == 0)
 		{
 			if ($fatal)
-				throw new Elk_Exception('no_user_with_email', false);
-			else
-				return false;
+			{
+							throw new Elk_Exception('no_user_with_email', false);
+			}
+			else {
+							return false;
+			}
 		}
 	}
 
@@ -914,7 +993,9 @@ 
 
 	// Nothing? Ah the horror...
 	if ($db->num_rows($request) == 0)
-		$user_settings = false;
+	{
+			$user_settings = false;
+	}
 	else
 	{
 		$user_settings = $db->fetch_assoc($request);

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
 
 	if (isset($_COOKIE[$cookiename]))
 	{
-		$array = serializeToJson($_COOKIE[$cookiename], function ($array_from) use ($cookiename) {
+		$array = serializeToJson($_COOKIE[$cookiename], function($array_from) use ($cookiename) {
 			global $modSettings;
 
 			require_once(SUBSDIR . '/Auth.subs.php');
@@ -349,7 +349,7 @@ 
 
 	if ($use_wildcards || $maybe_email)
 		$email_condition = '
-			OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode( ') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')';
+			OR (' . $email_condition . 'email_address ' . $comparison . ' ' . implode(') OR (' . $email_condition . ' email_address ' . $comparison . ' ', $names) . ')';
 	else
 		$email_condition = '';
 
@@ -368,8 +368,8 @@ 
 		LIMIT {int:limit}',
 		array(
 			'buddy_list' => $user_info['buddies'],
-			'member_name_search' => $member_name . ' ' . $comparison . ' ' . implode( ' OR ' . $member_name . ' ' . $comparison . ' ', $names) . '',
-			'real_name_search' => $real_name . ' ' . $comparison . ' ' . implode( ' OR ' . $real_name . ' ' . $comparison . ' ', $names) . '',
+			'member_name_search' => $member_name . ' ' . $comparison . ' ' . implode(' OR ' . $member_name . ' ' . $comparison . ' ', $names) . '',
+			'real_name_search' => $real_name . ' ' . $comparison . ' ' . implode(' OR ' . $real_name . ' ' . $comparison . ' ', $names) . '',
 			'email_condition' => $email_condition,
 			'limit' => $max,
 		)
@@ -644,7 +644,7 @@ 
 			array(
 				'current_member' => $user_info['id'],
 			),
-			function ($row)
+			function($row)
 			{
 				return $row['id_group'];
 			}

sources/subs/Compat.subs.php

Braces +27 added lines, -11 removed lines

@@ -26,14 +26,18 @@ 
 {
 	// If we have mhash loaded in, use it instead!
 	if (function_exists('mhash') && defined('MHASH_SHA1'))
-		return bin2hex(mhash(MHASH_SHA1, $str));
+	{
+			return bin2hex(mhash(MHASH_SHA1, $str));
+	}
 
 	$nblk = (strlen($str) + 8 >> 6) + 1;
 	$blks = array_pad(array(), $nblk * 16, 0);
 
 	$str_len = strlen($str);
 	for ($i = 0; $i < $str_len; $i++)
-		$blks[$i >> 2] |= ord($str[$i]) << (24 - ($i % 4) * 8);
+	{
+			$blks[$i >> 2] |= ord($str[$i]) << (24 - ($i % 4) * 8);
+	}
 
 	$blks[$i >> 2] |= 0x80 << (24 - ($i % 4) * 8);
 
@@ -69,9 +73,12 @@ 
 		for ($j = 0; $j < 80; $j++)
 		{
 			if ($j < 16)
-				$w[$j] = isset($x[$i + $j]) ? $x[$i + $j] : 0;
-			else
-				$w[$j] = sha1_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+			{
+							$w[$j] = isset($x[$i + $j]) ? $x[$i + $j] : 0;
+			}
+			else {
+							$w[$j] = sha1_rol($w[$j - 3] ^ $w[$j - 8] ^ $w[$j - 14] ^ $w[$j - 16], 1);
+			}
 
 			$t = sha1_rol($a, 5) + sha1_ft($j, $b, $c, $d) + $e + $w[$j] + sha1_kt($j);
 			$e = $d;
@@ -102,11 +109,17 @@ 
 function sha1_ft($t, $b, $c, $d)
 {
 	if ($t < 20)
-		return ($b & $c) | ((~$b) & $d);
+	{
+			return ($b & $c) | ((~$b) & $d);
+	}
 	if ($t < 40)
-		return $b ^ $c ^ $d;
+	{
+			return $b ^ $c ^ $d;
+	}
 	if ($t < 60)
-		return ($b & $c) | ($b & $d) | ($c & $d);
+	{
+			return ($b & $c) | ($b & $d) | ($c & $d);
+	}
 
 	return $b ^ $c ^ $d;
 }
@@ -131,9 +144,12 @@ 
 {
 	// Unfortunately, PHP uses unsigned 32-bit longs only.  So we have to kludge it a bit.
 	if ($num & 0x80000000)
-		$a = ($num >> 1 & 0x7fffffff) >> (31 - $cnt);
-	else
-		$a = $num >> (32 - $cnt);
+	{
+			$a = ($num >> 1 & 0x7fffffff) >> (31 - $cnt);
+	}
+	else {
+			$a = $num >> (32 - $cnt);
+	}
 
 	return ($num << $cnt) | $a;
 }

sources/subs/Notification.subs.php

Braces +173 added lines, -63 removed lines

@@ -40,16 +40,22 @@ 
 
 	// Can't do it if there's no topics.
 	if (empty($topics))
-		return;
+	{
+			return;
+	}
 
 	// It must be an array - it must!
 	if (!is_array($topics))
-		$topics = array($topics);
+	{
+			$topics = array($topics);
+	}
 
 	// I hope we are not sending one of those silly moderation notices
 	$maillist = !empty($modSettings['maillist_enabled']) && !empty($modSettings['pbe_post_enabled']);
 	if ($type !== 'reply' && !empty($maillist) && !empty($modSettings['pbe_no_mod_notices']))
-		return;
+	{
+			return;
+	}
 
 	// Load in our dependencies
 	require_once(SUBSDIR . '/Emailpost.subs.php');
@@ -98,23 +104,31 @@ 
 
 	// Work out any exclusions...
 	foreach ($topics as $key => $id)
-		if (isset($topicData[$id]) && !empty($exclude[$key]))
+	{
+			if (isset($topicData[$id]) && !empty($exclude[$key]))
 			$topicData[$id]['exclude'] = (int) $exclude[$key];
+	}
 
 	// Nada?
 	if (empty($topicData))
-		trigger_error('sendNotifications(): topics not found', E_USER_NOTICE);
+	{
+			trigger_error('sendNotifications(): topics not found', E_USER_NOTICE);
+	}
 
 	$topics = array_keys($topicData);
 
 	// Just in case they've gone walkies.
 	if (empty($topics))
-		return;
+	{
+			return;
+	}
 
 	// Insert all of these items into the digest log for those who want notifications later.
 	$digest_insert = array();
 	foreach ($topicData as $id => $data)
-		$digest_insert[] = array($data['topic'], $data['last_id'], $type, (int) $data['exclude']);
+	{
+			$digest_insert[] = array($data['topic'], $data['last_id'], $type, (int) $data['exclude']);
+	}
 
 	$db->insert('',
 		'{db_prefix}log_digest',
@@ -162,28 +176,39 @@ 
 			// If they are not the poster do they want to know?
 			// @todo maybe if they posted via email?
 			if ($type !== 'reply' && $row['notify_types'] == 2)
-				continue;
+			{
+							continue;
+			}
 
 			// for this member/board, loop through the topics and see if we should send it
 			foreach ($topicData as $id => $data)
 			{
 				// Don't send it if its not from the right board
 				if ($data['board'] !== $row['id_board'])
-					continue;
-				else
-					$data['board_name'] = $row['name'];
+				{
+									continue;
+				}
+				else {
+									$data['board_name'] = $row['name'];
+				}
 
 				// Don't do the excluded...
 				if ($data['exclude'] === $row['id_member'])
-					continue;
+				{
+									continue;
+				}
 
 				$email_perm = true;
 				if (validateNotificationAccess($row, $maillist, $email_perm) === false)
-					continue;
+				{
+									continue;
+				}
 
 				$needed_language = empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile'];
 				if (empty($current_language) || $current_language != $needed_language)
-					$current_language = loadLanguage('Post', $needed_language, false);
+				{
+									$current_language = loadLanguage('Post', $needed_language, false);
+				}
 
 				$message_type = 'notification_' . $type;
 				$replacements = array(
@@ -199,7 +224,9 @@ 
 				);
 
 				if ($type === 'remove')
-					unset($replacements['TOPICLINK'], $replacements['UNSUBSCRIBELINK']);
+				{
+									unset($replacements['TOPICLINK'], $replacements['UNSUBSCRIBELINK']);
+				}
 
 				// Do they want the body of the message sent too?
 				if (!empty($row['notify_send_body']) && $type === 'reply')
@@ -209,11 +236,15 @@ 
 
 					// Any attachments? if so lets make a big deal about them!
 					if ($data['attachments'] != 0)
-						$replacements['MESSAGE'] .= "\n\n" . sprintf($txt['message_attachments'], $data['attachments'], $replacements['TOPICLINK']);
+					{
+											$replacements['MESSAGE'] .= "\n\n" . sprintf($txt['message_attachments'], $data['attachments'], $replacements['TOPICLINK']);
+					}
 				}
 
 				if (!empty($row['notify_regularity']) && $type === 'reply')
-					$message_type .= '_once';
+				{
+									$message_type .= '_once';
+				}
 
 				// Give them a way to add in their own replacements
 				call_integration_hook('integrate_notification_replacements', array(&$replacements, $row, $type, $current_language));
@@ -234,8 +265,9 @@ 
 						$from_wrapper = !empty($modSettings['maillist_mail_from']) ? $modSettings['maillist_mail_from'] : (empty($modSettings['maillist_sitename_address']) ? $webmaster_email : $modSettings['maillist_sitename_address']);
 						sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], $emailfrom, 'm' . $data['last_id'], false, 3, null, false, $from_wrapper, $id);
 					}
-					else
-						sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $data['last_id']);
+					else {
+											sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $data['last_id']);
+					}
 
 					$sent++;
 
@@ -278,24 +310,34 @@ 
 	{
 		// Don't do the excluded...
 		if ($topicData[$row['id_topic']]['exclude'] == $row['id_member'])
-			continue;
+		{
+					continue;
+		}
 
 		// Don't do the ones that were sent via board notification, you only get one notice
 		if (isset($boards[$row['id_member']][$row['id_topic']]))
-			continue;
+		{
+					continue;
+		}
 
 		// Easier to check this here... if they aren't the topic poster do they really want to know?
 		// @todo perhaps just if they posted by email?
 		if ($type != 'reply' && $row['notify_types'] == 2 && $row['id_member'] != $row['id_member_started'])
-			continue;
+		{
+					continue;
+		}
 
 		$email_perm = true;
 		if (validateNotificationAccess($row, $maillist, $email_perm) === false)
-			continue;
+		{
+					continue;
+		}
 
 		$needed_language = empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile'];
 		if (empty($current_language) || $current_language != $needed_language)
-			$current_language = loadLanguage('Post', $needed_language, false);
+		{
+					$current_language = loadLanguage('Post', $needed_language, false);
+		}
 
 		$message_type = 'notification_' . $type;
 		$replacements = array(
@@ -311,7 +353,9 @@ 
 		);
 
 		if ($type == 'remove')
-			unset($replacements['TOPICLINK'], $replacements['UNSUBSCRIBELINK']);
+		{
+					unset($replacements['TOPICLINK'], $replacements['UNSUBSCRIBELINK']);
+		}
 
 		// Do they want the body of the message sent too?
 		if (!empty($row['notify_send_body']) && $type == 'reply')
@@ -320,7 +364,9 @@ 
 			$replacements['MESSAGE'] = $topicData[$row['id_topic']]['body'];
 		}
 		if (!empty($row['notify_regularity']) && $type == 'reply')
-			$message_type .= '_once';
+		{
+					$message_type .= '_once';
+		}
 
 		// Send only if once is off or it's on and it hasn't been sent.
 		if ($type != 'reply' || empty($row['notify_regularity']) || empty($row['sent']))
@@ -335,8 +381,9 @@ 
 				$from_wrapper = !empty($modSettings['maillist_mail_from']) ? $modSettings['maillist_mail_from'] : (empty($modSettings['maillist_sitename_address']) ? $webmaster_email : $modSettings['maillist_sitename_address']);
 				sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], $emailfrom, 'm' . $data['last_id'], false, 3, null, false, $from_wrapper, $row['id_topic']);
 			}
-			else
-				sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicData[$row['id_topic']]['last_id']);
+			else {
+							sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'm' . $topicData[$row['id_topic']]['last_id']);
+			}
 
 			$sent++;
 		}
@@ -344,11 +391,14 @@ 
 	$db->free_result($members);
 
 	if (isset($current_language) && $current_language != $user_language)
-		loadLanguage('Post');
+	{
+			loadLanguage('Post');
+	}
 
 	// Sent!
 	if ($type == 'reply' && !empty($sent))
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}log_notify
 			SET sent = {int:is_sent}
 			WHERE id_topic IN ({array_int:topic_list})
@@ -359,6 +409,7 @@ 
 				'is_sent' => 1,
 			)
 		);
+	}
 
 	// For approvals we need to unsend the exclusions (This *is* the quickest way!)
 	if (!empty($sent) && !empty($exclude))
@@ -404,7 +455,9 @@ 
 
 	// Do we have one or lots of topics?
 	if (isset($topicData['body']))
-		$topicData = array($topicData);
+	{
+			$topicData = array($topicData);
+	}
 
 	// Using the post to email functions?
 	$maillist = !empty($modSettings['maillist_enabled']) && !empty($modSettings['pbe_post_enabled']);
@@ -414,7 +467,9 @@ 
 	foreach ($topicData as $key => $topic)
 	{
 		if (!empty($topic['board']))
-			$boards[$topic['board']][] = $key;
+		{
+					$boards[$topic['board']][] = $key;
+		}
 		else
 		{
 			unset($topic[$key]);
@@ -428,7 +483,9 @@ 
 	// Just the board numbers.
 	$board_index = array_unique(array_keys($boards));
 	if (empty($board_index))
-		return;
+	{
+			return;
+	}
 
 	// Load the actual board names
 	require_once(SUBSDIR . '/Boards.subs.php');
@@ -437,7 +494,9 @@ 
 	// Yea, we need to add this to the digest queue.
 	$digest_insert = array();
 	foreach ($topicData as $id => $data)
-		$digest_insert[] = array($data['topic'], $data['msg'], 'topic', $user_info['id']);
+	{
+			$digest_insert[] = array($data['topic'], $data['msg'], 'topic', $user_info['id']);
+	}
 	$db->insert('',
 		'{db_prefix}log_digest',
 		array(
@@ -475,13 +534,17 @@ 
 	{
 		$email_perm = true;
 		if (validateNotificationAccess($rowmember, $maillist, $email_perm) === false)
-			continue;
+		{
+					continue;
+		}
 
 		$langloaded = loadLanguage('index', empty($rowmember['lngfile']) || empty($modSettings['userLanguage']) ? $language : $rowmember['lngfile'], false);
 
 		// Now loop through all the notifications to send for this board.
 		if (empty($boards[$rowmember['id_board']]))
-			continue;
+		{
+					continue;
+		}
 
 		$sentOnceAlready = 0;
 
@@ -491,7 +554,9 @@ 
 			// Don't notify the guy who started the topic!
 			// @todo In this case actually send them a "it's approved hooray" email :P
 			if ($topicData[$key]['poster'] == $rowmember['id_member'])
-				continue;
+			{
+							continue;
+			}
 
 			// Setup the string for adding the body to the message, if a user wants it.
 			$send_body = $maillist || (empty($modSettings['disallow_sendBody']) && !empty($rowmember['notify_send_body']));
@@ -513,9 +578,13 @@ 
 
 			// Send only if once is off or it's on and it hasn't been sent.
 			if (!empty($rowmember['notify_regularity']) && !$sentOnceAlready && empty($rowmember['sent']))
-				$emailtype = 'notify_boards_once';
+			{
+							$emailtype = 'notify_boards_once';
+			}
 			elseif (empty($rowmember['notify_regularity']))
-				$emailtype = 'notify_boards';
+			{
+							$emailtype = 'notify_boards';
+			}
 
 			if (!empty($emailtype))
 			{
@@ -530,8 +599,9 @@ 
 					$from_wrapper = !empty($modSettings['maillist_mail_from']) ? $modSettings['maillist_mail_from'] : (empty($modSettings['maillist_sitename_address']) ? $webmaster_email : $modSettings['maillist_sitename_address']);
 					sendmail($rowmember['email_address'], $emaildata['subject'], $emaildata['body'], $emailname, 't' . $topicData[$key]['topic'], false, 3, null, false, $from_wrapper, $topicData[$key]['topic']);
 				}
-				else
-					sendmail($rowmember['email_address'], $emaildata['subject'], $emaildata['body'], null, null, false, 3);
+				else {
+									sendmail($rowmember['email_address'], $emaildata['subject'], $emaildata['body'], null, null, false, 3);
+				}
 			}
 
 			$sentOnceAlready = 1;
@@ -569,7 +639,9 @@ 
 
 	// Clean up the data...
 	if (!is_array($topicData) || empty($topicData))
-		return;
+	{
+			return;
+	}
 
 	// Email ahoy
 	require_once(SUBSDIR . '/Mail.subs.php');
@@ -634,12 +706,16 @@ 
 			$row['additional_groups'][] = $row['id_post_group'];
 
 			if (count(array_intersect($allowed, $row['additional_groups'])) == 0)
-				continue;
+			{
+							continue;
+			}
 		}
 
 		$needed_language = empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile'];
 		if (empty($current_language) || $current_language != $needed_language)
-			$current_language = loadLanguage('Post', $needed_language, false);
+		{
+					$current_language = loadLanguage('Post', $needed_language, false);
+		}
 
 		$sent_this_time = false;
 		$replacements = array(
@@ -666,7 +742,9 @@ 
 			}
 
 			if (!empty($row['notify_regularity']))
-				$message_type .= '_once';
+			{
+							$message_type .= '_once';
+			}
 
 			// Send only if once is off or it's on and it hasn't been sent.
 			if (empty($row['notify_regularity']) || (empty($row['sent']) && !$sent_this_time))
@@ -682,11 +760,14 @@ 
 	$db->free_result($members);
 
 	if (isset($current_language) && $current_language != $user_info['language'])
-		loadLanguage('Post');
+	{
+			loadLanguage('Post');
+	}
 
 	// Sent!
 	if (!empty($sent))
-		$db->query('', '
+	{
+			$db->query('', '
 			UPDATE {db_prefix}log_notify
 			SET sent = {int:is_sent}
 			WHERE id_topic IN ({array_int:topic_list})
@@ -697,7 +778,8 @@ 
 				'is_sent' => 1,
 			)
 		);
-}
+	}
+	}
 
 /**
  * This simple function gets a list of all administrators and sends them an email
@@ -720,7 +802,9 @@ 
 
 	// If the setting isn't enabled then just exit.
 	if (empty($modSettings['notify_new_registration']))
-		return;
+	{
+			return;
+	}
 
 	// Needed to notify admins, or anyone
 	require_once(SUBSDIR . '/Mail.subs.php');
@@ -750,7 +834,9 @@ 
 		)
 	);
 	while ($row = $db->fetch_assoc($request))
-		$groups[] = $row['id_group'];
+	{
+			$groups[] = $row['id_group'];
+	}
 	$db->free_result($request);
 
 	// Add administrators too...
@@ -795,8 +881,10 @@ 
 	$db->free_result($request);
 
 	if (isset($current_language) && $current_language != $user_info['language'])
-		loadLanguage('Login');
-}
+	{
+			loadLanguage('Login');
+	}
+	}
 
 /**
  * Checks if a user has the correct access to get notifications
@@ -826,18 +914,24 @@ 
 
 	// No need to check for you ;)
 	if ($row['id_group'] == 1 || in_array('1', $row['additional_groups']))
-		return $email_perm;
+	{
+			return $email_perm;
+	}
 
 	// They do have access to this board?
 	if (count(array_intersect($allowed, $row['additional_groups'])) === 0)
-		return false;
+	{
+			return false;
+	}
 
 	// If using maillist, see if they should get a reply-able message
 	if ($maillist)
 	{
 		// Perhaps they don't require a security key in the message
 		if (!empty($modSettings['postmod_active']) && !empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $row['warning'])
-			$email_perm = false;
+		{
+					$email_perm = false;
+		}
 		else
 		{
 			if (!isset($board_profile[$row['id_board']]))
@@ -848,12 +942,16 @@ 
 
 			// In a group that has email posting permissions on this board
 			if (count(array_intersect($board_profile[$row['id_board']]['allowed'], $row['additional_groups'])) === 0)
-				$email_perm = false;
+			{
+							$email_perm = false;
+			}
 
 			// And not specifically denied?
 			if ($email_perm && !empty($modSettings['permission_enable_deny'])
 				&& count(array_intersect($row['additional_groups'], $board_profile[$row['id_board']]['denied'])) !== 0)
-				$email_perm = false;
+			{
+							$email_perm = false;
+			}
 		}
 	}
 
@@ -889,7 +987,9 @@ 
 	while ($row = $db->fetch_assoc($request))
 	{
 		if (!isset($results[$row['id_member']]))
-			$results[$row['id_member']] = array();
+		{
+					$results[$row['id_member']] = array();
+		}
 
 		$results[$row['id_member']][$row['mention_type']] = (int) $row['notification_level'];
 	}
@@ -911,7 +1011,9 @@ 
 	{
 		$preferences[$member] = $defaults;
 		if (isset($results[$member]))
-		$preferences[$member] = array_merge($preferences[$member], $results[$member]);
+		{
+				$preferences[$member] = array_merge($preferences[$member], $results[$member]);
+		}
 	}
 
 	return $preferences;
@@ -949,7 +1051,9 @@ 
 	}
 
 	if (empty($inserts))
-		return;
+	{
+			return;
+	}
 
 	$db->insert('',
 		'{db_prefix}notifications_pref',
@@ -975,13 +1079,17 @@ 
 	$unserialized = getConfiguredNotificationMethods($type);
 
 	if (empty($unserialized))
-		return array();
+	{
+			return array();
+	}
 
 	$allowed = array();
 	foreach ($possible_methods as $key => $val)
 	{
 		if (isset($unserialized[$val]))
-			$allowed[$key] = $val;
+		{
+					$allowed[$key] = $val;
+		}
 	}
 
 	return $allowed;
@@ -999,7 +1107,9 @@ 
 	static $unserialized = null;
 
 	if ($unserialized === null)
-		$unserialized = unserialize($modSettings['notification_methods']);
+	{
+			$unserialized = unserialize($modSettings['notification_methods']);
+	}
 
 	if (isset($unserialized[$type]))
 	{

Spacing +1 added lines, -1 removed lines

@@ -1074,7 +1074,7 @@
 		return false;
 	}
 
-	$blowfish_salt = '$2a$07$' . $memSalt . $modSettings['unsubscribe_site_salt']. '$';
+	$blowfish_salt = '$2a$07$' . $memSalt . $modSettings['unsubscribe_site_salt'] . '$';
 	$expected = substr($blowfish_salt, 0, 28) . $hash;
 	$check = crypt($area . $memEmail . $memSalt, $blowfish_salt);