albertlast / SMF2.1

Sources/ManageServer.php

Spacing +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 			$fts_language[$row['cfgname']] = $row['cfgname'];
 		
-		$config_vars = array_merge ($config_vars, array(
+		$config_vars = array_merge($config_vars, array(
 				'',
 				array('search_language', $txt['search_language'], 'db', 'select', $fts_language, 'pgFulltextSearch')
 			)

Braces +265 added lines, -204 removed lines

@@ -59,8 +59,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main dispatcher. Sets up all the available sub-actions, all the tabs and selects
@@ -111,10 +112,11 @@ 
 	$settings_not_writable = !is_writable($boarddir . '/Settings.php');
 	$settings_backup_fail = !@is_writable($boarddir . '/Settings_bak.php') || !@copy($boarddir . '/Settings.php', $boarddir . '/Settings_bak.php');
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	$context['settings_not_writable'] = $settings_not_writable;
 
@@ -168,8 +170,9 @@ 
 
 	call_integration_hook('integrate_general_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=general;save';
@@ -186,8 +189,9 @@ 
 			$registerSMStats = registerSMStats();
 
 			// Failed to register, disable it again.
-			if (empty($registerSMStats))
-				$_POST['enable_sm_stats'] = 0;
+			if (empty($registerSMStats)) {
+							$_POST['enable_sm_stats'] = 0;
+			}
 		}
 
 		saveSettings($config_vars);
@@ -248,8 +252,9 @@ 
 		$request = $smcFunc['db_query']('', 'SELECT cfgname FROM pg_ts_config', array());
 		$fts_language = array();
 		
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$fts_language[$row['cfgname']] = $row['cfgname'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$fts_language[$row['cfgname']] = $row['cfgname'];
+		}
 		
 		$config_vars = array_merge ($config_vars, array(
 				'',
@@ -261,8 +266,9 @@ 
 
 	call_integration_hook('integrate_database_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the template stuff.
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=database;save';
@@ -337,13 +343,15 @@ 
 		hideGlobalCookies();
 	});', true);
 
-	if (empty($user_settings['tfa_secret']))
-		addInlineJavaScript('');
+	if (empty($user_settings['tfa_secret'])) {
+			addInlineJavaScript('');
+	}
 
 	call_integration_hook('integrate_cookie_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=cookie;save';
 	$context['settings_title'] = $txt['cookies_sessions_settings'];
@@ -354,11 +362,13 @@ 
 		call_integration_hook('integrate_save_cookie_settings');
 
 		// Local and global do not play nicely together.
-		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies']))
-			unset ($_POST['globalCookies']);
+		if (!empty($_POST['localCookies']) && empty($_POST['globalCookies'])) {
+					unset ($_POST['globalCookies']);
+		}
 
-		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false)
-			fatal_lang_error('invalid_cookie_domain', false);
+		if (!empty($_POST['globalCookiesDomain']) && strpos($boardurl, $_POST['globalCookiesDomain']) === false) {
+					fatal_lang_error('invalid_cookie_domain', false);
+		}
 
 		saveSettings($config_vars);
 
@@ -441,8 +451,9 @@ 
 
 	call_integration_hook('integrate_general_security_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving?
 	if (isset($_GET['save']))
@@ -481,8 +492,7 @@ 
 		$txt['cache_settings_message'] = $txt['detected_no_caching'];
 		$cache_level = array($txt['cache_off']);
 		$detected['none'] = $txt['cache_off'];
-	}
-	else
+	} else
 	{
 		$txt['cache_settings_message'] = sprintf($txt['detected_accelerators'], implode(', ', $detected));
 		$cache_level = array($txt['cache_off'], $txt['cache_level1'], $txt['cache_level2'], $txt['cache_level3']);
@@ -519,8 +529,9 @@ 
 			}
 		}
 	}
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving again?
 	if (isset($_GET['save']))
@@ -548,8 +559,9 @@ 
 	$context['save_disabled'] = $context['settings_not_writable'];
 
 	// Decide what message to show.
-	if (!$context['save_disabled'])
-		$context['settings_message'] = $txt['caching_information'];
+	if (!$context['save_disabled']) {
+			$context['settings_message'] = $txt['caching_information'];
+	}
 
 	// Prepare the template.
 	prepareServerSettingsContext($config_vars);
@@ -572,24 +584,25 @@ 
 	if (stripos(PHP_OS, 'win') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_windows'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
-	}
-	elseif (stripos(PHP_OS, 'darwin') === 0)
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_windows'];
+		}
+	} elseif (stripos(PHP_OS, 'darwin') === 0)
 	{
 		$context['settings_message'] = $txt['loadavg_disabled_osx'];
-		if (isset($_GET['save']))
-			$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
-	}
-	else
+		if (isset($_GET['save'])) {
+					$_SESSION['adm-save'] = $txt['loadavg_disabled_osx'];
+		}
+	} else
 	{
 		$modSettings['load_average'] = @file_get_contents('/proc/loadavg');
-		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0)
-			$modSettings['load_average'] = (float) $matches[1];
-		else
-			unset($modSettings['load_average']);
+		if (!empty($modSettings['load_average']) && preg_match('~^([^ ]+?) ([^ ]+?) ([^ ]+)~', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} elseif (($modSettings['load_average'] = @`uptime`) !== null && preg_match('~load averages?: (\d+\.\d+), (\d+\.\d+), (\d+\.\d+)~i', $modSettings['load_average'], $matches) !== 0) {
+					$modSettings['load_average'] = (float) $matches[1];
+		} else {
+					unset($modSettings['load_average']);
+		}
 
 		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
 		{
@@ -625,8 +638,9 @@ 
 
 	call_integration_hook('integrate_loadavg_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['post_url'] = $scripturl . '?action=admin;area=serversettings;sa=loads;save';
 	$context['settings_title'] = $txt['load_balancing_settings'];
@@ -637,24 +651,27 @@ 
 		// Stupidity is not allowed.
 		foreach ($_POST as $key => $value)
 		{
-			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values)))
-				continue;
-			else
-				$_POST[$key] = (float) $value;
-
-			if ($key == 'loadavg_auto_opt' && $value <= 1)
-				$_POST['loadavg_auto_opt'] = 1.0;
-			elseif ($key == 'loadavg_forum' && $value < 10)
-				$_POST['loadavg_forum'] = 10.0;
-			elseif ($value < 2)
-				$_POST[$key] = 2.0;
+			if (strpos($key, 'loadavg') === 0 || $key === 'loadavg_enable' || !in_array($key, array_keys($default_values))) {
+							continue;
+			} else {
+							$_POST[$key] = (float) $value;
+			}
+
+			if ($key == 'loadavg_auto_opt' && $value <= 1) {
+							$_POST['loadavg_auto_opt'] = 1.0;
+			} elseif ($key == 'loadavg_forum' && $value < 10) {
+							$_POST['loadavg_forum'] = 10.0;
+			} elseif ($value < 2) {
+							$_POST[$key] = 2.0;
+			}
 		}
 
 		call_integration_hook('integrate_save_loadavg_settings');
 
 		saveDBSettings($config_vars);
-		if (!isset($_SESSION['adm-save']))
-			$_SESSION['adm-save'] = true;
+		if (!isset($_SESSION['adm-save'])) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=serversettings;sa=loads;' . $context['session_var'] . '=' . $context['session_id']);
 	}
 
@@ -690,10 +707,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -701,9 +719,9 @@ 
 	$context['config_vars'] = array();
 	foreach ($config_vars as $identifier => $config_var)
 	{
-		if (!is_array($config_var) || !isset($config_var[1]))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var) || !isset($config_var[1])) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			$varname = $config_var[0];
 			global $$varname;
@@ -738,16 +756,19 @@ 
 			if ($config_var[3] == 'int' || $config_var[3] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[0]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[0]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[0]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[0]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[0]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -755,12 +776,13 @@ 
 			{
 				// If it's associative
 				$config_values = array_values($config_var[4]);
-				if (isset($config_values[0]) && is_array($config_values[0]))
-					$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
-				else
+				if (isset($config_values[0]) && is_array($config_values[0])) {
+									$context['config_vars'][$config_var[0]]['data'] = $config_var[4];
+				} else
 				{
-					foreach ($config_var[4] as $key => $item)
-						$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					foreach ($config_var[4] as $key => $item) {
+											$context['config_vars'][$config_var[0]]['data'][] = array($key, $item);
+					}
 				}
 			}
 		}
@@ -785,10 +807,11 @@ 
 
 	if (isset($_SESSION['adm-save']))
 	{
-		if ($_SESSION['adm-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['adm-save'];
+		if ($_SESSION['adm-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['adm-save'];
+		}
 
 		unset($_SESSION['adm-save']);
 	}
@@ -800,26 +823,30 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// HR?
-		if (!is_array($config_var))
-			$context['config_vars'][] = $config_var;
-		else
+		if (!is_array($config_var)) {
+					$context['config_vars'][] = $config_var;
+		} else
 		{
 			// If it has no name it doesn't have any purpose!
-			if (empty($config_var[1]))
-				continue;
+			if (empty($config_var[1])) {
+							continue;
+			}
 
 			// Special case for inline permissions
-			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions'))
-				$inlinePermissions[] = $config_var[1];
-			elseif ($config_var[0] == 'permissions')
-				continue;
+			if ($config_var[0] == 'permissions' && allowedTo('manage_permissions')) {
+							$inlinePermissions[] = $config_var[1];
+			} elseif ($config_var[0] == 'permissions') {
+							continue;
+			}
 
-			if ($config_var[0] == 'boards')
-				$board_list = true;
+			if ($config_var[0] == 'boards') {
+							$board_list = true;
+			}
 
 			// Are we showing the BBC selection box?
-			if ($config_var[0] == 'bbc')
-				$bbcChoice[] = $config_var[1];
+			if ($config_var[0] == 'bbc') {
+							$bbcChoice[] = $config_var[1];
+			}
 
 			// We need to do some parsing of the value before we pass it in.
 			if (isset($modSettings[$config_var[1]]))
@@ -838,8 +865,7 @@ 
 					default:
 						$value = $smcFunc['htmlspecialchars']($modSettings[$config_var[1]]);
 				}
-			}
-			else
+			} else
 			{
 				// Darn, it's empty. What type is expected?
 				switch ($config_var[0])
@@ -879,16 +905,19 @@ 
 			if ($config_var[0] == 'int' || $config_var[0] == 'float')
 			{
 				// Default to a min of 0 if one isn't set
-				if (isset($config_var['min']))
-					$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
-				else
-					$context['config_vars'][$config_var[1]]['min'] = 0;
+				if (isset($config_var['min'])) {
+									$context['config_vars'][$config_var[1]]['min'] = $config_var['min'];
+				} else {
+									$context['config_vars'][$config_var[1]]['min'] = 0;
+				}
 
-				if (isset($config_var['max']))
-					$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				if (isset($config_var['max'])) {
+									$context['config_vars'][$config_var[1]]['max'] = $config_var['max'];
+				}
 
-				if (isset($config_var['step']))
-					$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				if (isset($config_var['step'])) {
+									$context['config_vars'][$config_var[1]]['step'] = $config_var['step'];
+				}
 			}
 
 			// If this is a select box handle any data.
@@ -902,12 +931,13 @@ 
 				}
 
 				// If it's associative
-				if (isset($config_var[2][0]) && is_array($config_var[2][0]))
-					$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
-				else
+				if (isset($config_var[2][0]) && is_array($config_var[2][0])) {
+									$context['config_vars'][$config_var[1]]['data'] = $config_var[2];
+				} else
 				{
-					foreach ($config_var[2] as $key => $item)
-						$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					foreach ($config_var[2] as $key => $item) {
+											$context['config_vars'][$config_var[1]]['data'][] = array($key, $item);
+					}
 				}
 			}
 
@@ -916,17 +946,19 @@ 
 			{
 				if (!is_numeric($k))
 				{
-					if (substr($k, 0, 2) == 'on')
-						$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
-					else
-						$context['config_vars'][$config_var[1]][$k] = $v;
+					if (substr($k, 0, 2) == 'on') {
+											$context['config_vars'][$config_var[1]]['javascript'] .= ' ' . $k . '="' . $v . '"';
+					} else {
+											$context['config_vars'][$config_var[1]][$k] = $v;
+					}
 				}
 
 				// See if there are any other labels that might fit?
-				if (isset($txt['setting_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
-				elseif (isset($txt['groups_' . $config_var[1]]))
-					$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				if (isset($txt['setting_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['setting_' . $config_var[1]];
+				} elseif (isset($txt['groups_' . $config_var[1]])) {
+									$context['config_vars'][$config_var[1]]['label'] = $txt['groups_' . $config_var[1]];
+				}
 			}
 
 			// Set the subtext in case it's part of the label.
@@ -959,8 +991,9 @@ 
 		// What are the options, eh?
 		$temp = parse_bbc(false);
 		$bbcTags = array();
-		foreach ($temp as $tag)
-			$bbcTags[] = $tag['tag'];
+		foreach ($temp as $tag) {
+					$bbcTags[] = $tag['tag'];
+		}
 
 		$bbcTags = array_unique($bbcTags);
 		$totalTags = count($bbcTags);
@@ -975,8 +1008,9 @@ 
 		$col = 0; $i = 0;
 		foreach ($bbcTags as $tag)
 		{
-			if ($i % $tagsPerColumn == 0 && $i != 0)
-				$col++;
+			if ($i % $tagsPerColumn == 0 && $i != 0) {
+							$col++;
+			}
 
 			$context['bbc_columns'][$col][] = array(
 				'tag' => $tag,
@@ -1019,18 +1053,21 @@ 
 	validateToken('admin-ssc');
 
 	// Fix the darn stupid cookiename! (more may not be allowed, but these for sure!)
-	if (isset($_POST['cookiename']))
-		$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	if (isset($_POST['cookiename'])) {
+			$_POST['cookiename'] = preg_replace('~[,;\s\.$]+~' . ($context['utf8'] ? 'u' : ''), '', $_POST['cookiename']);
+	}
 
 	// Fix the forum's URL if necessary.
 	if (isset($_POST['boardurl']))
 	{
-		if (substr($_POST['boardurl'], -10) == '/index.php')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-		elseif (substr($_POST['boardurl'], -1) == '/')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
-		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
-			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		if (substr($_POST['boardurl'], -10) == '/index.php') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
+		} elseif (substr($_POST['boardurl'], -1) == '/') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
+		}
+		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') {
+					$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		}
 	}
 
 	// Any passwords?
@@ -1065,21 +1102,21 @@ 
 	// Figure out which config vars we're saving here...
 	foreach ($config_vars as $var)
 	{
-		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]])))
-			continue;
+		if (!is_array($var) || $var[2] != 'file' || (!in_array($var[0], $config_bools) && !isset($_POST[$var[0]]))) {
+					continue;
+		}
 
 		$config_var = $var[0];
 
 		if (in_array($config_var, $config_passwords))
 		{
-			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1])
-				$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_strs))
+			if (isset($_POST[$config_var][1]) && $_POST[$config_var][0] == $_POST[$config_var][1]) {
+							$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var][0], '\'\\') . '\'';
+			}
+		} elseif (in_array($config_var, $config_strs))
 		{
 			$new_settings[$config_var] = '\'' . addcslashes($_POST[$config_var], '\'\\') . '\'';
-		}
-		elseif (in_array($config_var, $config_ints))
+		} elseif (in_array($config_var, $config_ints))
 		{
 			$new_settings[$config_var] = (int) $_POST[$config_var];
 
@@ -1088,17 +1125,17 @@ 
 			$new_settings[$config_var] = max($min, $new_settings[$config_var]);
 
 			// Is there a max value for this as well?
-			if (isset($var['max']))
-				$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
-		}
-		elseif (in_array($config_var, $config_bools))
+			if (isset($var['max'])) {
+							$new_settings[$config_var] = min($var['max'], $new_settings[$config_var]);
+			}
+		} elseif (in_array($config_var, $config_bools))
 		{
-			if (!empty($_POST[$config_var]))
-				$new_settings[$config_var] = '1';
-			else
-				$new_settings[$config_var] = '0';
-		}
-		else
+			if (!empty($_POST[$config_var])) {
+							$new_settings[$config_var] = '1';
+			} else {
+							$new_settings[$config_var] = '0';
+			}
+		} else
 		{
 			// This shouldn't happen, but it might...
 			fatal_error('Unknown config_var \'' . $config_var . '\'');
@@ -1114,30 +1151,35 @@ 
 	foreach ($config_vars as $config_var)
 	{
 		// We just saved the file-based settings, so skip their definitions.
-		if (!is_array($config_var) || $config_var[2] == 'file')
-			continue;
+		if (!is_array($config_var) || $config_var[2] == 'file') {
+					continue;
+		}
 
 		$new_setting = array($config_var[3], $config_var[0]);
 
 		// Select options need carried over, too.
-		if (isset($config_var[4]))
-			$new_setting[] = $config_var[4];
+		if (isset($config_var[4])) {
+					$new_setting[] = $config_var[4];
+		}
 
 		// Include min and max if necessary
-		if (isset($config_var['min']))
-			$new_setting['min'] = $config_var['min'];
+		if (isset($config_var['min'])) {
+					$new_setting['min'] = $config_var['min'];
+		}
 
-		if (isset($config_var['max']))
-			$new_setting['max'] = $config_var['max'];
+		if (isset($config_var['max'])) {
+					$new_setting['max'] = $config_var['max'];
+		}
 
 		// Rewrite the definition a bit.
 		$new_settings[] = $new_setting;
 	}
 
 	// Save the new database-based settings, if any.
-	if (!empty($new_settings))
-		saveDBSettings($new_settings);
-}
+	if (!empty($new_settings)) {
+			saveDBSettings($new_settings);
+	}
+	}
 
 /**
  * Helper function for saving database settings.
@@ -1155,22 +1197,25 @@ 
 	$inlinePermissions = array();
 	foreach ($config_vars as $var)
 	{
-		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags']))))
-			continue;
+		if (!isset($var[1]) || (!isset($_POST[$var[1]]) && $var[0] != 'check' && $var[0] != 'permissions' && $var[0] != 'boards' && ($var[0] != 'bbc' || !isset($_POST[$var[1] . '_enabledTags'])))) {
+					continue;
+		}
 
 		// Checkboxes!
-		elseif ($var[0] == 'check')
-			$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		elseif ($var[0] == 'check') {
+					$setArray[$var[1]] = !empty($_POST[$var[1]]) ? '1' : '0';
+		}
 		// Select boxes!
-		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2])))
-			$setArray[$var[1]] = $_POST[$var[1]];
-		elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
+		elseif ($var[0] == 'select' && in_array($_POST[$var[1]], array_keys($var[2]))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		} elseif ($var[0] == 'select' && !empty($var['multiple']) && array_intersect($_POST[$var[1]], array_keys($var[2])) != array())
 		{
 			// For security purposes we validate this line by line.
 			$lOptions = array();
-			foreach ($_POST[$var[1]] as $invar)
-				if (in_array($invar, array_keys($var[2])))
+			foreach ($_POST[$var[1]] as $invar) {
+							if (in_array($invar, array_keys($var[2])))
 					$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = json_encode($lOptions);
 		}
@@ -1184,18 +1229,20 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_row']($request))
-					$board_list[$row[0]] = true;
+				while ($row = $smcFunc['db_fetch_row']($request)) {
+									$board_list[$row[0]] = true;
+				}
 
 				$smcFunc['db_free_result']($request);
 			}
 
 			$lOptions = array();
 
-			if (!empty($_POST[$var[1]]))
-				foreach ($_POST[$var[1]] as $invar => $dummy)
+			if (!empty($_POST[$var[1]])) {
+							foreach ($_POST[$var[1]] as $invar => $dummy)
 					if (isset($board_list[$invar]))
 						$lOptions[] = $invar;
+			}
 
 			$setArray[$var[1]] = !empty($lOptions) ? implode(',', $lOptions) : '';
 		}
@@ -1209,8 +1256,9 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Floating point!
 		elseif ($var[0] == 'float')
@@ -1222,40 +1270,47 @@ 
 			$setArray[$var[1]] = max($min, $setArray[$var[1]]);
 
 			// Do we have a max value for this as well?
-			if (isset($var['max']))
-				$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			if (isset($var['max'])) {
+							$setArray[$var[1]] = min($var['max'], $setArray[$var[1]]);
+			}
 		}
 		// Text!
-		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time')))
-			$setArray[$var[1]] = $_POST[$var[1]];
+		elseif (in_array($var[0], array('text', 'large_text', 'color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time'))) {
+					$setArray[$var[1]] = $_POST[$var[1]];
+		}
 		// Passwords!
 		elseif ($var[0] == 'password')
 		{
-			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1])
-				$setArray[$var[1]] = $_POST[$var[1]][0];
+			if (isset($_POST[$var[1]][1]) && $_POST[$var[1]][0] == $_POST[$var[1]][1]) {
+							$setArray[$var[1]] = $_POST[$var[1]][0];
+			}
 		}
 		// BBC.
 		elseif ($var[0] == 'bbc')
 		{
 
 			$bbcTags = array();
-			foreach (parse_bbc(false) as $tag)
-				$bbcTags[] = $tag['tag'];
+			foreach (parse_bbc(false) as $tag) {
+							$bbcTags[] = $tag['tag'];
+			}
 
-			if (!isset($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array();
-			elseif (!is_array($_POST[$var[1] . '_enabledTags']))
-				$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			if (!isset($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array();
+			} elseif (!is_array($_POST[$var[1] . '_enabledTags'])) {
+							$_POST[$var[1] . '_enabledTags'] = array($_POST[$var[1] . '_enabledTags']);
+			}
 
 			$setArray[$var[1]] = implode(',', array_diff($bbcTags, $_POST[$var[1] . '_enabledTags']));
 		}
 		// Permissions?
-		elseif ($var[0] == 'permissions')
-			$inlinePermissions[] = $var[1];
+		elseif ($var[0] == 'permissions') {
+					$inlinePermissions[] = $var[1];
+		}
 	}
 
-	if (!empty($setArray))
-		updateSettings($setArray);
+	if (!empty($setArray)) {
+			updateSettings($setArray);
+	}
 
 	// If we have inline permissions we need to save them.
 	if (!empty($inlinePermissions) && allowedTo('manage_permissions'))
@@ -1292,18 +1347,21 @@ 
 	// put all of it into an array
 	foreach ($info_lines as $line)
 	{
-		if (preg_match('~(' . $remove . ')~', $line))
-			continue;
+		if (preg_match('~(' . $remove . ')~', $line)) {
+					continue;
+		}
 
 		// new category?
-		if (strpos($line, '<h2>') !== false)
-			$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		if (strpos($line, '<h2>') !== false) {
+					$category = preg_match('~<h2>(.*)</h2>~', $line, $title) ? $category = $title[1] : $category;
+		}
 
 		// load it as setting => value or the old setting local master
-		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = $val[2];
-		elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val))
-			$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		if (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = $val[2];
+		} elseif (preg_match('~<tr><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td><td[^>]+>([^<]*)</td></tr>~', $line, $val)) {
+					$pinfo[$category][$val[1]] = array($txt['phpinfo_localsettings'] => $val[2], $txt['phpinfo_defaultsettings'] => $val[3]);
+		}
 	}
 
 	// load it in to context and display it
@@ -1338,8 +1396,9 @@ 
 				$testAPI = new $cache_class_name();
 
 				// No Support?  NEXT!
-				if (!$testAPI->isSupported(true))
-					continue;
+				if (!$testAPI->isSupported(true)) {
+									continue;
+				}
 
 				$apis[$tryCache] = isset($txt[$tryCache . '_cache']) ? $txt[$tryCache . '_cache'] : $tryCache;
 			}
@@ -1364,8 +1423,9 @@ 
 	global $modSettings, $boardurl, $smcFunc;
 
 	// Already have a key?  Can't register again.
-	if (!empty($modSettings['sm_stats_key']))
-		return true;
+	if (!empty($modSettings['sm_stats_key'])) {
+			return true;
+	}
 
 	$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);
 	if ($fp)
@@ -1376,8 +1436,9 @@ 
 		fwrite($fp, $out);
 
 		$return_data = '';
-		while (!feof($fp))
-			$return_data .= fgets($fp, 128);
+		while (!feof($fp)) {
+					$return_data .= fgets($fp, 128);
+		}
 
 		fclose($fp);
 

Sources/MoveTopic.php

Braces +101 added lines, -72 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function allows to move a topic, making sure to ask the moderator
@@ -32,8 +33,9 @@ 
 {
 	global $txt, $board, $topic, $user_info, $context, $language, $scripturl, $smcFunc, $modSettings, $sourcedir;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT t.id_member_started, ms.subject, t.approved
@@ -49,8 +51,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it - if not approved?
-	if ($modSettings['postmod_active'] && !$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if ($modSettings['postmod_active'] && !$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Permission check!
 	// @todo
@@ -59,9 +62,9 @@ 
 		if ($id_member_started == $user_info['id'])
 		{
 			isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
 		}
-		else
-			isAllowedTo('move_any');
 	}
 
 	$context['move_any'] = $user_info['is_admin'] || $modSettings['topic_move_any'];
@@ -83,11 +86,13 @@ 
 		'not_redirection' => true,
 	);
 
-	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board)
-		$options['selected_board'] = $_SESSION['move_to_topic'];
+	if (!empty($_SESSION['move_to_topic']) && $_SESSION['move_to_topic'] != $board) {
+			$options['selected_board'] = $_SESSION['move_to_topic'];
+	}
 
-	if (!$context['move_any'])
-		$options['included_boards'] = $boards;
+	if (!$context['move_any']) {
+			$options['included_boards'] = $boards;
+	}
 
 	require_once($sourcedir . '/Subs-MessageIndex.php');
 	$context['categories'] = getBoardList($options);
@@ -138,12 +143,14 @@ 
 	global $txt, $topic, $scripturl, $sourcedir, $context;
 	global $board, $language, $user_info, $smcFunc;
 
-	if (empty($topic))
-		fatal_lang_error('no_access', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// You can't choose to have a redirection topic and use an empty reason.
-	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == ''))
-		fatal_lang_error('movetopic_no_reason', false);
+	if (isset($_POST['postRedirect']) && (!isset($_POST['reason']) || trim($_POST['reason']) == '')) {
+			fatal_lang_error('movetopic_no_reason', false);
+	}
 
 	moveTopicConcurrence();
 
@@ -163,16 +170,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Can they see it?
-	if (!$context['is_approved'])
-		isAllowedTo('approve_posts');
+	if (!$context['is_approved']) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Can they move topics on this board?
 	if (!allowedTo('move_any'))
 	{
-		if ($id_member_started == $user_info['id'])
-			isAllowedTo('move_own');
-		else
-			isAllowedTo('move_any');
+		if ($id_member_started == $user_info['id']) {
+					isAllowedTo('move_own');
+		} else {
+					isAllowedTo('move_any');
+		}
 	}
 
 	checkSession();
@@ -197,8 +206,9 @@ 
 			'blank_redirect' => '',
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board');
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board');
+	}
 	list ($pcounter, $board_name, $subject) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +220,9 @@ 
 	{
 		$_POST['custom_subject'] = strtr($smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_POST['custom_subject'])), array("\r" => '', "\n" => '', "\t" => ''));
 		// Keep checking the length.
-		if ($smcFunc['strlen']($_POST['custom_subject']) > 100)
-			$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		if ($smcFunc['strlen']($_POST['custom_subject']) > 100) {
+					$_POST['custom_subject'] = $smcFunc['substr']($_POST['custom_subject'], 0, 100);
+		}
 
 		// If it's still valid move onwards and upwards.
 		if ($_POST['custom_subject'] != '')
@@ -221,9 +232,9 @@ 
 				// Get a response prefix, but in the forum's default language.
 				if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix')))
 				{
-					if ($language === $user_info['language'])
-						$context['response_prefix'] = $txt['response_prefix'];
-					else
+					if ($language === $user_info['language']) {
+											$context['response_prefix'] = $txt['response_prefix'];
+					} else
 					{
 						loadLanguage('index', $language, false);
 						$context['response_prefix'] = $txt['response_prefix'];
@@ -263,8 +274,9 @@ 
 	if (isset($_POST['postRedirect']))
 	{
 		// Should be in the boardwide language.
-		if ($user_info['language'] != $language)
-			loadLanguage('index', $language);
+		if ($user_info['language'] != $language) {
+					loadLanguage('index', $language);
+		}
 
 		$_POST['reason'] = $smcFunc['htmlspecialchars']($_POST['reason'], ENT_QUOTES);
 		preparsecode($_POST['reason']);
@@ -328,8 +340,9 @@ 
 		$posters = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($posters[$row['id_member']]))
-				$posters[$row['id_member']] = 0;
+			if (!isset($posters[$row['id_member']])) {
+							$posters[$row['id_member']] = 0;
+			}
 
 			$posters[$row['id_member']]++;
 		}
@@ -338,11 +351,13 @@ 
 		foreach ($posters as $id_member => $posts)
 		{
 			// The board we're moving from counted posts, but not to.
-			if (empty($pcounter_from))
-				updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			if (empty($pcounter_from)) {
+							updateMemberData($id_member, array('posts' => 'posts - ' . $posts));
+			}
 			// The reverse: from didn't, to did.
-			else
-				updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			else {
+							updateMemberData($id_member, array('posts' => 'posts + ' . $posts));
+			}
 		}
 	}
 
@@ -350,17 +365,19 @@ 
 	moveTopics($topic, $_POST['toboard']);
 
 	// Log that they moved this topic.
-	if (!allowedTo('move_own') || $id_member_started != $user_info['id'])
-		logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	if (!allowedTo('move_own') || $id_member_started != $user_info['id']) {
+			logAction('move', array('topic' => $topic, 'board_from' => $board, 'board_to' => $_POST['toboard']));
+	}
 	// Notify people that this topic has been moved?
 	sendNotifications($topic, 'move');
 
 	// Why not go back to the original board in case they want to keep moving?
-	if (!isset($_REQUEST['goback']))
-		redirectexit('board=' . $board . '.0');
-	else
-		redirectexit('topic=' . $topic . '.0');
-}
+	if (!isset($_REQUEST['goback'])) {
+			redirectexit('board=' . $board . '.0');
+	} else {
+			redirectexit('topic=' . $topic . '.0');
+	}
+	}
 
 /**
  * Moves one or more topics to a specific board. (doesn't check permissions.)
@@ -376,18 +393,21 @@ 
 	global $sourcedir, $user_info, $modSettings, $smcFunc;
 
 	// Empty array?
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 
 	// Only a single topic.
-	if (is_numeric($topics))
-		$topics = array($topics);
+	if (is_numeric($topics)) {
+			$topics = array($topics);
+	}
 
 	$fromBoards = array();
 
 	// Destination board empty or equal to 0?
-	if (empty($toBoard))
-		return;
+	if (empty($toBoard)) {
+			return;
+	}
 
 	// Are we moving to the recycle board?
 	$isRecycleDest = !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] == $toBoard;
@@ -395,8 +415,9 @@ 
 	// Callback for search APIs to do their thing
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if ($searchAPI->supportsMethod('topicsMoved'))
-		$searchAPI->topicsMoved($topics, $toBoard);
+	if ($searchAPI->supportsMethod('topicsMoved')) {
+			$searchAPI->topicsMoved($topics, $toBoard);
+	}
 
 	// Determine the source boards...
 	$request = $smcFunc['db_query']('', '
@@ -410,8 +431,9 @@ 
 		)
 	);
 	// Num of rows = 0 -> no topics found. Num of rows > 1 -> topics are on multiple boards.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return;
+	}
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		if (!isset($fromBoards[$row['id_board']]['num_posts']))
@@ -429,10 +451,11 @@ 
 		$fromBoards[$row['id_board']]['unapproved_posts'] += $row['unapproved_posts'];
 
 		// Add the topics to the right type.
-		if ($row['approved'])
-			$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
-		else
-			$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		if ($row['approved']) {
+					$fromBoards[$row['id_board']]['num_topics'] += $row['num_topics'];
+		} else {
+					$fromBoards[$row['id_board']]['unapproved_topics'] += $row['num_topics'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -558,13 +581,14 @@ 
 			)
 		);
 		$approval_msgs = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$approval_msgs[] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$approval_msgs[] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Empty the approval queue for these, as we're going to approve them next.
-		if (!empty($approval_msgs))
-			$smcFunc['db_query']('', '
+		if (!empty($approval_msgs)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}approval_queue
 				WHERE id_msg IN ({array_int:message_list})
 					AND id_attach = {int:id_attach}',
@@ -573,6 +597,7 @@ 
 					'id_attach' => 0,
 				)
 			);
+		}
 
 		// Get all the current max and mins.
 		$request = $smcFunc['db_query']('', '
@@ -606,8 +631,8 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If not, update.
-			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max'])
-				$smcFunc['db_query']('', '
+			if ($row['first_msg'] != $topicMaxMin[$row['id_topic']]['min'] || $row['last_msg'] != $topicMaxMin[$row['id_topic']]['max']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET id_first_msg = {int:first_msg}, id_last_msg = {int:last_msg}
 					WHERE id_topic = {int:selected_topic}',
@@ -617,6 +642,7 @@ 
 						'selected_topic' => $row['id_topic'],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -675,9 +701,10 @@ 
 	}
 
 	// Update the cache?
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
-		foreach ($topics as $topic_id)
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3) {
+			foreach ($topics as $topic_id)
 			cache_put_data('topic_board-' . $topic_id, null, 120);
+	}
 
 	require_once($sourcedir . '/Subs-Post.php');
 
@@ -701,15 +728,17 @@ 
 {
 	global $board, $topic, $smcFunc, $scripturl;
 
-	if (isset($_GET['current_board']))
-		$move_from = (int) $_GET['current_board'];
+	if (isset($_GET['current_board'])) {
+			$move_from = (int) $_GET['current_board'];
+	}
 
-	if (empty($move_from) || empty($board) || empty($topic))
-		return true;
+	if (empty($move_from) || empty($board) || empty($topic)) {
+			return true;
+	}
 
-	if ($move_from == $board)
-		return true;
-	else
+	if ($move_from == $board) {
+			return true;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT m.subject, b.name

Sources/CacheAPI-xcache.php

Braces +19 added lines, -13 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * Our Cache API class
@@ -44,8 +45,9 @@ 
 	{
 		$supported = function_exists('xcache_get') && function_exists('xcache_set') && ini_get('xcache.var_size') > 0;
 
-		if ($test)
-			return $supported;
+		if ($test) {
+					return $supported;
+		}
 		return parent::isSupported() && $supported;
 	}
 
@@ -66,10 +68,11 @@ 
 	{
 		$key = $this->prefix . strtr($key, ':/', '-_');
 
-		if ($value === null)
-			return xcache_unset($key);
-		else
-			return xcache_set($key, $value, $ttl);
+		if ($value === null) {
+					return xcache_unset($key);
+		} else {
+					return xcache_set($key, $value, $ttl);
+		}
 	}
 
 	/**
@@ -88,10 +91,12 @@ 
 		}
 
 		// if passed a type, clear that type out
-		if ($type === '' || $type === 'user')
-			xcache_clear_cache(XC_TYPE_VAR, 0);
-		if ($type === '' || $type === 'data')
-			xcache_clear_cache(XC_TYPE_PHP, 0);
+		if ($type === '' || $type === 'user') {
+					xcache_clear_cache(XC_TYPE_VAR, 0);
+		}
+		if ($type === '' || $type === 'data') {
+					xcache_clear_cache(XC_TYPE_PHP, 0);
+		}
 
 		$this->invalidateCache();
 		return true;
@@ -110,8 +115,9 @@ 
 		// While we could md5 this when saving, this could be tricky to be sure it doesn't get corrupted on additional saves.
 		$config_vars[] = array('xcache_adminpass', $txt['cache_xcache_adminpass'], 'db', 'text', 0);
 
-		if (!isset($context['settings_post_javascript']))
-			$context['settings_post_javascript'] = '';
+		if (!isset($context['settings_post_javascript'])) {
+					$context['settings_post_javascript'] = '';
+		}
 
 		$context['settings_post_javascript'] .= '
 			$("#cache_accelerator").change(function (e) {

Sources/Profile-Modify.php

Braces +694 added lines, -518 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This defines every profile field known to man.
@@ -29,8 +30,9 @@ 
 	global $sourcedir, $profile_vars;
 
 	// Don't load this twice!
-	if (!empty($profile_fields) && !$force_reload)
-		return;
+	if (!empty($profile_fields) && !$force_reload) {
+			return;
+	}
 
 	/* This horrific array defines all the profile fields in the whole world!
 		In general each "field" has one array - the key of which is the database column name associated with said field. Each item
@@ -103,13 +105,14 @@ 
 				if (isset($_POST['bday2'], $_POST['bday3']) && $value > 0 && $_POST['bday2'] > 0)
 				{
 					// Set to blank?
-					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1)
-						$value = '0001-01-01';
-					else
-						$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					if ((int) $_POST['bday3'] == 1 && (int) $_POST['bday2'] == 1 && (int) $value == 1) {
+											$value = '0001-01-01';
+					} else {
+											$value = checkdate($value, $_POST['bday2'], $_POST['bday3'] < 4 ? 4 : $_POST['bday3']) ? sprintf('%04d-%02d-%02d', $_POST['bday3'] < 4 ? 4 : $_POST['bday3'], $_POST['bday1'], $_POST['bday2']) : '0001-01-01';
+					}
+				} else {
+									$value = '0001-01-01';
 				}
-				else
-					$value = '0001-01-01';
 
 				$profile_vars['birthdate'] = $value;
 				$cur_profile['birthdate'] = $value;
@@ -127,8 +130,7 @@ 
 				{
 					$value = checkdate($dates[2], $dates[3], $dates[1] < 4 ? 4 : $dates[1]) ? sprintf('%04d-%02d-%02d', $dates[1] < 4 ? 4 : $dates[1], $dates[2], $dates[3]) : '0001-01-01';
 					return true;
-				}
-				else
+				} else
 				{
 					$value = empty($cur_profile['birthdate']) ? '0001-01-01' : $cur_profile['birthdate'];
 					return false;
@@ -150,10 +152,11 @@ 
 					return $txt['invalid_registration'] . ' ' . strftime('%d %b %Y ' . (strpos($user_info['time_format'], '%H') !== false ? '%I:%M:%S %p' : '%H:%M:%S'), forum_time(false));
 				}
 				// As long as it doesn't equal "N/A"...
-				elseif ($value != $txt['not_applicable'] && $value != strtotime(strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600)))
-					$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
-				else
-					$value = $cur_profile['date_registered'];
+				elseif ($value != $txt['not_applicable'] && $value != strtotime(strftime('%Y-%m-%d', $cur_profile['date_registered'] + ($user_info['time_offset'] + $modSettings['time_offset']) * 3600))) {
+									$value = $value - ($user_info['time_offset'] + $modSettings['time_offset']) * 3600;
+				} else {
+									$value = $cur_profile['date_registered'];
+				}
 
 				return true;
 			},
@@ -177,8 +180,9 @@ 
 			{
 				global $context, $old_profile, $profile_vars, $sourcedir, $modSettings;
 
-				if (strtolower($value) == strtolower($old_profile['email_address']))
-					return false;
+				if (strtolower($value) == strtolower($old_profile['email_address'])) {
+									return false;
+				}
 
 				$isValid = profileValidateEmail($value, $context['id_member']);
 
@@ -254,11 +258,11 @@ 
 
 				if (isset($context['profile_languages'][$value]))
 				{
-					if ($context['user']['is_owner'] && empty($context['password_auth_failed']))
-						$_SESSION['language'] = $value;
+					if ($context['user']['is_owner'] && empty($context['password_auth_failed'])) {
+											$_SESSION['language'] = $value;
+					}
 					return true;
-				}
-				else
+				} else
 				{
 					$value = $cur_profile['lngfile'];
 					return false;
@@ -282,13 +286,14 @@ 
 
 					// Maybe they are trying to change their password as well?
 					$resetPassword = true;
-					if (isset($_POST['passwrd1']) && $_POST['passwrd1'] != '' && isset($_POST['passwrd2']) && $_POST['passwrd1'] == $_POST['passwrd2'] && validatePassword($_POST['passwrd1'], $value, array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email'])) == null)
-						$resetPassword = false;
+					if (isset($_POST['passwrd1']) && $_POST['passwrd1'] != '' && isset($_POST['passwrd2']) && $_POST['passwrd1'] == $_POST['passwrd2'] && validatePassword($_POST['passwrd1'], $value, array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email'])) == null) {
+											$resetPassword = false;
+					}
 
 					// Do the reset... this will send them an email too.
-					if ($resetPassword)
-						resetPassword($context['id_member'], $value);
-					elseif ($value !== null)
+					if ($resetPassword) {
+											resetPassword($context['id_member'], $value);
+					} elseif ($value !== null)
 					{
 						validateUsername($context['id_member'], trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $value)));
 						updateMemberData($context['id_member'], array('member_name' => $value));
@@ -312,20 +317,23 @@ 
 			'input_validate' => function(&$value) use ($sourcedir, $user_info, $smcFunc, $cur_profile)
 			{
 				// If we didn't try it then ignore it!
-				if ($value == '')
-					return false;
+				if ($value == '') {
+									return false;
+				}
 
 				// Do the two entries for the password even match?
-				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2'])
-					return 'bad_new_password';
+				if (!isset($_POST['passwrd2']) || $value != $_POST['passwrd2']) {
+									return 'bad_new_password';
+				}
 
 				// Let's get the validation function into play...
 				require_once($sourcedir . '/Subs-Auth.php');
 				$passwordErrors = validatePassword($value, $cur_profile['member_name'], array($cur_profile['real_name'], $user_info['username'], $user_info['name'], $user_info['email']));
 
 				// Were there errors?
-				if ($passwordErrors != null)
-					return 'password_' . $passwordErrors;
+				if ($passwordErrors != null) {
+									return 'password_' . $passwordErrors;
+				}
 
 				// Set up the new password variable... ready for storage.
 				$value = hash_password($cur_profile['member_name'], un_htmlspecialchars($value));
@@ -350,8 +358,9 @@ 
 			'permission' => 'profile_blurb',
 			'input_validate' => function(&$value) use ($smcFunc)
 			{
-				if ($smcFunc['strlen']($value) > 50)
-					return 'personal_text_too_long';
+				if ($smcFunc['strlen']($value) > 50) {
+									return 'personal_text_too_long';
+				}
 
 				return true;
 			},
@@ -386,10 +395,11 @@ 
 			'permission' => 'moderate_forum',
 			'input_validate' => function(&$value)
 			{
-				if (!is_numeric($value))
-					return 'digits_only';
-				else
-					$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				if (!is_numeric($value)) {
+									return 'digits_only';
+				} else {
+									$value = $value != '' ? strtr($value, array(',' => '', '.' => '', ' ' => '')) : 0;
+				}
 				return true;
 			},
 		),
@@ -405,15 +415,16 @@ 
 			{
 				$value = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $value));
 
-				if (trim($value) == '')
-					return 'no_name';
-				elseif ($smcFunc['strlen']($value) > 60)
-					return 'name_too_long';
-				elseif ($cur_profile['real_name'] != $value)
+				if (trim($value) == '') {
+									return 'no_name';
+				} elseif ($smcFunc['strlen']($value) > 60) {
+									return 'name_too_long';
+				} elseif ($cur_profile['real_name'] != $value)
 				{
 					require_once($sourcedir . '/Subs-Members.php');
-					if (isReservedName($value, $context['id_member']))
-						return 'name_taken';
+					if (isReservedName($value, $context['id_member'])) {
+											return 'name_taken';
+					}
 				}
 				return true;
 			},
@@ -471,8 +482,9 @@ 
 						'selected' => $set == $context['member']['smiley_set']['id']
 					);
 
-					if ($context['smiley_sets'][$i]['selected'])
-						$context['member']['smiley_set']['name'] = $set_names[$i];
+					if ($context['smiley_sets'][$i]['selected']) {
+											$context['member']['smiley_set']['name'] = $set_names[$i];
+					}
 				}
 				return true;
 			},
@@ -481,8 +493,9 @@ 
 				global $modSettings;
 
 				$smiley_sets = explode(',', $modSettings['smiley_sets_known']);
-				if (!in_array($value, $smiley_sets) && $value != 'none')
-					$value = '';
+				if (!in_array($value, $smiley_sets) && $value != 'none') {
+									$value = '';
+				}
 				return true;
 			},
 		),
@@ -497,8 +510,9 @@ 
 				loadLanguage('Settings');
 
 				$context['allow_no_censored'] = false;
-				if ($user_info['is_admin'] || $context['user']['is_owner'])
-					$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
+				if ($user_info['is_admin'] || $context['user']['is_owner']) {
+									$context['allow_no_censored'] = !empty($modSettings['allow_no_censored']);
+				}
 
 				return true;
 			},
@@ -545,8 +559,9 @@ 
 			'input_validate' => function($value)
 			{
 				$tz = smf_list_timezones();
-				if (!isset($tz[$value]))
-					return 'bad_timezone';
+				if (!isset($tz[$value])) {
+									return 'bad_timezone';
+				}
 
 				return true;
 			},
@@ -561,8 +576,9 @@ 
 			'enabled' => !empty($modSettings['titlesEnable']),
 			'input_validate' => function(&$value) use ($smcFunc)
 			{
-				if ($smcFunc['strlen']($value) > 50)
-					return 'user_title_too_long';
+				if ($smcFunc['strlen']($value) > 50) {
+									return 'user_title_too_long';
+				}
 
 				return true;
 			},
@@ -584,10 +600,12 @@ 
 			// Fix the URL...
 			'input_validate' => function(&$value)
 			{
-				if (strlen(trim($value)) > 0 && strpos($value, '://') === false)
-					$value = 'http://' . $value;
-				if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://'))
-					$value = '';
+				if (strlen(trim($value)) > 0 && strpos($value, '://') === false) {
+									$value = 'http://' . $value;
+				}
+				if (strlen($value) < 8 || (substr($value, 0, 7) !== 'http://' && substr($value, 0, 8) !== 'https://')) {
+									$value = '';
+				}
 				return true;
 			},
 			'link_with' => 'website',
@@ -601,16 +619,19 @@ 
 	foreach ($profile_fields as $key => $field)
 	{
 		// Do we have permission to do this?
-		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission']))
-			unset($profile_fields[$key]);
+		if (isset($field['permission']) && !allowedTo(($context['user']['is_owner'] ? array($field['permission'] . '_own', $field['permission'] . '_any') : $field['permission'] . '_any')) && !allowedTo($field['permission'])) {
+					unset($profile_fields[$key]);
+		}
 
 		// Is it enabled?
-		if (isset($field['enabled']) && !$field['enabled'])
-			unset($profile_fields[$key]);
+		if (isset($field['enabled']) && !$field['enabled']) {
+					unset($profile_fields[$key]);
+		}
 
 		// Is it specifically disabled?
-		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields)))
-			unset($profile_fields[$key]);
+		if (in_array($key, $disabled_fields) || (isset($field['link_with']) && in_array($field['link_with'], $disabled_fields))) {
+					unset($profile_fields[$key]);
+		}
 	}
 }
 
@@ -635,9 +656,10 @@ 
 	loadProfileFields(true);
 
 	// First check for any linked sets.
-	foreach ($profile_fields as $key => $field)
-		if (isset($field['link_with']) && in_array($field['link_with'], $fields))
+	foreach ($profile_fields as $key => $field) {
+			if (isset($field['link_with']) && in_array($field['link_with'], $fields))
 			$fields[] = $key;
+	}
 
 	$i = 0;
 	$last_type = '';
@@ -649,38 +671,46 @@ 
 			$cur_field = &$profile_fields[$field];
 
 			// Does it have a preload and does that preload succeed?
-			if (isset($cur_field['preload']) && !$cur_field['preload']())
-				continue;
+			if (isset($cur_field['preload']) && !$cur_field['preload']()) {
+							continue;
+			}
 
 			// If this is anything but complex we need to do more cleaning!
 			if ($cur_field['type'] != 'callback' && $cur_field['type'] != 'hidden')
 			{
-				if (!isset($cur_field['label']))
-					$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				if (!isset($cur_field['label'])) {
+									$cur_field['label'] = isset($txt[$field]) ? $txt[$field] : $field;
+				}
 
 				// Everything has a value!
-				if (!isset($cur_field['value']))
-					$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				if (!isset($cur_field['value'])) {
+									$cur_field['value'] = isset($cur_profile[$field]) ? $cur_profile[$field] : '';
+				}
 
 				// Any input attributes?
 				$cur_field['input_attr'] = !empty($cur_field['input_attr']) ? implode(',', $cur_field['input_attr']) : '';
 			}
 
 			// Was there an error with this field on posting?
-			if (isset($context['profile_errors'][$field]))
-				$cur_field['is_error'] = true;
+			if (isset($context['profile_errors'][$field])) {
+							$cur_field['is_error'] = true;
+			}
 
 			// Any javascript stuff?
-			if (!empty($cur_field['js_submit']))
-				$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
-			if (!empty($cur_field['js']))
-				$context['profile_javascript'] .= $cur_field['js'];
+			if (!empty($cur_field['js_submit'])) {
+							$context['profile_onsubmit_javascript'] .= $cur_field['js_submit'];
+			}
+			if (!empty($cur_field['js'])) {
+							$context['profile_javascript'] .= $cur_field['js'];
+			}
 
 			// Any template stuff?
-			if (!empty($cur_field['prehtml']))
-				$context['profile_prehtml'] .= $cur_field['prehtml'];
-			if (!empty($cur_field['posthtml']))
-				$context['profile_posthtml'] .= $cur_field['posthtml'];
+			if (!empty($cur_field['prehtml'])) {
+							$context['profile_prehtml'] .= $cur_field['prehtml'];
+			}
+			if (!empty($cur_field['posthtml'])) {
+							$context['profile_posthtml'] .= $cur_field['posthtml'];
+			}
 
 			// Finally put it into context?
 			if ($cur_field['type'] != 'hidden')
@@ -713,12 +743,14 @@ 
 	}, false);' : ''), true);
 
 	// Any onsubmit javascript?
-	if (!empty($context['profile_onsubmit_javascript']))
-		addInlineJavaScript($context['profile_onsubmit_javascript'], true);
+	if (!empty($context['profile_onsubmit_javascript'])) {
+			addInlineJavaScript($context['profile_onsubmit_javascript'], true);
+	}
 
 	// Any totally custom stuff?
-	if (!empty($context['profile_javascript']))
-		addInlineJavaScript($context['profile_javascript'], true);
+	if (!empty($context['profile_javascript'])) {
+			addInlineJavaScript($context['profile_javascript'], true);
+	}
 
 	// Free up some memory.
 	unset($profile_fields);
@@ -739,8 +771,9 @@ 
 
 	// This allows variables to call activities when they save - by default just to reload their settings
 	$context['profile_execute_on_save'] = array();
-	if ($context['user']['is_owner'])
-		$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	if ($context['user']['is_owner']) {
+			$context['profile_execute_on_save']['reload_user'] = 'profileReloadUser';
+	}
 
 	// Assume we log nothing.
 	$context['log_changes'] = array();
@@ -748,8 +781,9 @@ 
 	// Cycle through the profile fields working out what to do!
 	foreach ($profile_fields as $key => $field)
 	{
-		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature'))
-			continue;
+		if (!isset($_POST[$key]) || !empty($field['is_dummy']) || (isset($_POST['preview_signature']) && $key == 'signature')) {
+					continue;
+		}
 
 		// What gets updated?
 		$db_key = isset($field['save_key']) ? $field['save_key'] : $key;
@@ -777,12 +811,13 @@ 
 		$field['cast_type'] = empty($field['cast_type']) ? $field['type'] : $field['cast_type'];
 
 		// Finally, clean up certain types.
-		if ($field['cast_type'] == 'int')
-			$_POST[$key] = (int) $_POST[$key];
-		elseif ($field['cast_type'] == 'float')
-			$_POST[$key] = (float) $_POST[$key];
-		elseif ($field['cast_type'] == 'check')
-			$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		if ($field['cast_type'] == 'int') {
+					$_POST[$key] = (int) $_POST[$key];
+		} elseif ($field['cast_type'] == 'float') {
+					$_POST[$key] = (float) $_POST[$key];
+		} elseif ($field['cast_type'] == 'check') {
+					$_POST[$key] = !empty($_POST[$key]) ? 1 : 0;
+		}
 
 		// If we got here we're doing OK.
 		if ($field['type'] != 'hidden' && (!isset($old_profile[$key]) || $_POST[$key] != $old_profile[$key]))
@@ -793,11 +828,12 @@ 
 			$cur_profile[$key] = $_POST[$key];
 
 			// Are we logging it?
-			if (!empty($field['log_change']) && isset($old_profile[$key]))
-				$context['log_changes'][$key] = array(
+			if (!empty($field['log_change']) && isset($old_profile[$key])) {
+							$context['log_changes'][$key] = array(
 					'previous' => $old_profile[$key],
 					'new' => $_POST[$key],
 				);
+			}
 		}
 
 		// Logging group changes are a bit different...
@@ -830,10 +866,11 @@ 
 				{
 					foreach ($groups as $id => $group)
 					{
-						if (isset($context['member_groups'][$group]))
-							$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
-						else
-							unset($additional_groups[$type][$id]);
+						if (isset($context['member_groups'][$group])) {
+													$additional_groups[$type][$id] = $context['member_groups'][$group]['name'];
+						} else {
+													unset($additional_groups[$type][$id]);
+						}
 					}
 					$additional_groups[$type] = implode(', ', $additional_groups[$type]);
 				}
@@ -844,10 +881,11 @@ 
 	}
 
 	// @todo Temporary
-	if ($context['user']['is_owner'])
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
-	else
-		$changeOther = allowedTo('profile_extra_any');
+	if ($context['user']['is_owner']) {
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own'));
+	} else {
+			$changeOther = allowedTo('profile_extra_any');
+	}
 	if ($changeOther && empty($post_errors))
 	{
 		makeThemeChanges($context['id_member'], isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
@@ -855,8 +893,9 @@ 
 		{
 			$custom_fields_errors = makeCustomFieldChanges($context['id_member'], $_REQUEST['sa'], false, true);
 
-			if (!empty($custom_fields_errors))
-				$post_errors = array_merge($post_errors, $custom_fields_errors);
+			if (!empty($custom_fields_errors)) {
+							$post_errors = array_merge($post_errors, $custom_fields_errors);
+			}
 		}
 	}
 
@@ -882,9 +921,9 @@ 
 	if ($context['user']['is_owner'])
 	{
 		$changeOther = allowedTo(array('profile_extra_any', 'profile_extra_own', 'profile_website_any', 'profile_website_own', 'profile_signature_any', 'profile_signature_own'));
+	} else {
+			$changeOther = allowedTo(array('profile_extra_any', 'profile_website_any', 'profile_signature_any'));
 	}
-	else
-		$changeOther = allowedTo(array('profile_extra_any', 'profile_website_any', 'profile_signature_any'));
 
 	// Arrays of all the changes - makes things easier.
 	$profile_bools = array();
@@ -895,22 +934,25 @@ 
 		'ignore_boards',
 	);
 
-	if (isset($_POST['sa']) && $_POST['sa'] == 'ignoreboards' && empty($_POST['ignore_brd']))
-		$_POST['ignore_brd'] = array();
+	if (isset($_POST['sa']) && $_POST['sa'] == 'ignoreboards' && empty($_POST['ignore_brd'])) {
+			$_POST['ignore_brd'] = array();
+	}
 
 	unset($_POST['ignore_boards']); // Whatever it is set to is a dirty filthy thing.  Kinda like our minds.
 	if (isset($_POST['ignore_brd']))
 	{
-		if (!is_array($_POST['ignore_brd']))
-			$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		if (!is_array($_POST['ignore_brd'])) {
+					$_POST['ignore_brd'] = array($_POST['ignore_brd']);
+		}
 
 		foreach ($_POST['ignore_brd'] as $k => $d)
 		{
 			$d = (int) $d;
-			if ($d != 0)
-				$_POST['ignore_brd'][$k] = $d;
-			else
-				unset($_POST['ignore_brd'][$k]);
+			if ($d != 0) {
+							$_POST['ignore_brd'][$k] = $d;
+			} else {
+							unset($_POST['ignore_brd'][$k]);
+			}
 		}
 		$_POST['ignore_boards'] = implode(',', $_POST['ignore_brd']);
 		unset($_POST['ignore_brd']);
@@ -923,21 +965,26 @@ 
 		makeThemeChanges($memID, isset($_POST['id_theme']) ? (int) $_POST['id_theme'] : $old_profile['id_theme']);
 		//makeAvatarChanges($memID, $post_errors);
 
-		if (!empty($_REQUEST['sa']))
-			makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		if (!empty($_REQUEST['sa'])) {
+					makeCustomFieldChanges($memID, $_REQUEST['sa'], false);
+		}
 
-		foreach ($profile_bools as $var)
-			if (isset($_POST[$var]))
+		foreach ($profile_bools as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = empty($_POST[$var]) ? '0' : '1';
-		foreach ($profile_ints as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_ints as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var] != '' ? (int) $_POST[$var] : '';
-		foreach ($profile_floats as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_floats as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = (float) $_POST[$var];
-		foreach ($profile_strings as $var)
-			if (isset($_POST[$var]))
+		}
+		foreach ($profile_strings as $var) {
+					if (isset($_POST[$var]))
 				$profile_vars[$var] = $_POST[$var];
+		}
 	}
 }
 
@@ -971,8 +1018,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0))
-		fatal_lang_error('no_access', false);
+	if ((isset($_POST['options']) && count(array_intersect(array_keys($_POST['options']), $reservedVars)) != 0) || (isset($_POST['default_options']) && count(array_intersect(array_keys($_POST['default_options']), $reservedVars)) != 0)) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Don't allow any overriding of custom fields with default or non-default options.
 	$request = $smcFunc['db_query']('', '
@@ -984,8 +1032,9 @@ 
 		)
 	);
 	$custom_fields = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$custom_fields[] = $row['col_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$custom_fields[] = $row['col_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// These are the theme changes...
@@ -994,33 +1043,39 @@ 
 	{
 		foreach ($_POST['options'] as $opt => $val)
 		{
-			if (in_array($opt, $custom_fields))
-				continue;
+			if (in_array($opt, $custom_fields)) {
+							continue;
+			}
 
 			// These need to be controlled.
-			if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
-				$val = max(0, min($val, 50));
+			if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
+							$val = max(0, min($val, 50));
+			}
 			// We don't set this per theme anymore.
-			elseif ($opt == 'allow_no_censored')
-				continue;
+			elseif ($opt == 'allow_no_censored') {
+							continue;
+			}
 
 			$themeSetArray[] = array($memID, $id_theme, $opt, is_array($val) ? implode(',', $val) : $val);
 		}
 	}
 
 	$erase_options = array();
-	if (isset($_POST['default_options']) && is_array($_POST['default_options']))
-		foreach ($_POST['default_options'] as $opt => $val)
+	if (isset($_POST['default_options']) && is_array($_POST['default_options'])) {
+			foreach ($_POST['default_options'] as $opt => $val)
 		{
 			if (in_array($opt, $custom_fields))
 				continue;
+	}
 
 			// These need to be controlled.
-			if ($opt == 'topics_per_page' || $opt == 'messages_per_page')
-				$val = max(0, min($val, 50));
+			if ($opt == 'topics_per_page' || $opt == 'messages_per_page') {
+							$val = max(0, min($val, 50));
+			}
 			// Only let admins and owners change the censor.
-			elseif ($opt == 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner'])
-					continue;
+			elseif ($opt == 'allow_no_censored' && !$user_info['is_admin'] && !$context['user']['is_owner']) {
+								continue;
+			}
 
 			$themeSetArray[] = array($memID, 1, $opt, is_array($val) ? implode(',', $val) : $val);
 			$erase_options[] = $opt;
@@ -1056,8 +1111,9 @@ 
 
 		// Admins can choose any theme, even if it's not enabled...
 		$themes = allowedTo('admin_forum') ? explode(',', $modSettings['knownThemes']) : explode(',', $modSettings['enableThemes']);
-		foreach ($themes as $t)
-			cache_put_data('theme_settings-' . $t . ':' . $memID, null, 60);
+		foreach ($themes as $t) {
+					cache_put_data('theme_settings-' . $t . ':' . $memID, null, 60);
+		}
 	}
 }
 
@@ -1076,8 +1132,9 @@ 
 	if (isset($_POST['edit_notify_boards']) && !empty($_POST['notify_boards']))
 	{
 		// Make sure only integers are deleted.
-		foreach ($_POST['notify_boards'] as $index => $id)
-			$_POST['notify_boards'][$index] = (int) $id;
+		foreach ($_POST['notify_boards'] as $index => $id) {
+					$_POST['notify_boards'][$index] = (int) $id;
+		}
 
 		// id_board = 0 is reserved for topic notifications.
 		$_POST['notify_boards'] = array_diff($_POST['notify_boards'], array(0));
@@ -1096,8 +1153,9 @@ 
 	// We are editing topic notifications......
 	elseif (isset($_POST['edit_notify_topics']) && !empty($_POST['notify_topics']))
 	{
-		foreach ($_POST['notify_topics'] as $index => $id)
-			$_POST['notify_topics'][$index] = (int) $id;
+		foreach ($_POST['notify_topics'] as $index => $id) {
+					$_POST['notify_topics'][$index] = (int) $id;
+		}
 
 		// Make sure there are no zeros left.
 		$_POST['notify_topics'] = array_diff($_POST['notify_topics'], array(0));
@@ -1111,16 +1169,18 @@ 
 				'selected_member' => $memID,
 			)
 		);
-		foreach ($_POST['notify_topics'] as $topic)
-			setNotifyPrefs($memID, array('topic_notify_' . $topic => 0));
+		foreach ($_POST['notify_topics'] as $topic) {
+					setNotifyPrefs($memID, array('topic_notify_' . $topic => 0));
+		}
 	}
 
 	// We are removing topic preferences
 	elseif (isset($_POST['remove_notify_topics']) && !empty($_POST['notify_topics']))
 	{
 		$prefs = array();
-		foreach ($_POST['notify_topics'] as $topic)
-			$prefs[] = 'topic_notify_' . $topic;
+		foreach ($_POST['notify_topics'] as $topic) {
+					$prefs[] = 'topic_notify_' . $topic;
+		}
 		deleteNotifyPrefs($memID, $prefs);
 	}
 
@@ -1128,8 +1188,9 @@ 
 	elseif (isset($_POST['remove_notify_board']) && !empty($_POST['notify_boards']))
 	{
 		$prefs = array();
-		foreach ($_POST['notify_boards'] as $board)
-			$prefs[] = 'board_notify_' . $board;
+		foreach ($_POST['notify_boards'] as $board) {
+					$prefs[] = 'board_notify_' . $board;
+		}
 		deleteNotifyPrefs($memID, $prefs);
 	}
 }
@@ -1150,8 +1211,9 @@ 
 
 	$errors = array();
 
-	if ($sanitize && isset($_POST['customfield']))
-		$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	if ($sanitize && isset($_POST['customfield'])) {
+			$_POST['customfield'] = htmlspecialchars__recursive($_POST['customfield']);
+	}
 
 	$where = $area == 'register' ? 'show_reg != 0' : 'show_profile = {string:area}';
 
@@ -1176,48 +1238,49 @@ 
 			- The data is not invisible to users but editable by the owner (or if it is the user is not the owner)
 			- The area isn't registration, and if it is that the field is not supposed to be shown there.
 		*/
-		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area != 'register' || $row['show_reg'] == 0))
-			continue;
+		if ($row['private'] != 0 && !allowedTo('admin_forum') && ($memID != $user_info['id'] || $row['private'] != 2) && ($area != 'register' || $row['show_reg'] == 0)) {
+					continue;
+		}
 
 		// Validate the user data.
-		if ($row['field_type'] == 'check')
-			$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
-		elseif ($row['field_type'] == 'select' || $row['field_type'] == 'radio')
+		if ($row['field_type'] == 'check') {
+					$value = isset($_POST['customfield'][$row['col_name']]) ? 1 : 0;
+		} elseif ($row['field_type'] == 'select' || $row['field_type'] == 'radio')
 		{
 			$value = $row['default_value'];
-			foreach (explode(',', $row['field_options']) as $k => $v)
-				if (isset($_POST['customfield'][$row['col_name']]) && $_POST['customfield'][$row['col_name']] == $k)
+			foreach (explode(',', $row['field_options']) as $k => $v) {
+							if (isset($_POST['customfield'][$row['col_name']]) && $_POST['customfield'][$row['col_name']] == $k)
 					$value = $v;
+			}
 		}
 		// Otherwise some form of text!
 		else
 		{
 			$value = isset($_POST['customfield'][$row['col_name']]) ? $_POST['customfield'][$row['col_name']] : '';
-			if ($row['field_length'])
-				$value = $smcFunc['substr']($value, 0, $row['field_length']);
+			if ($row['field_length']) {
+							$value = $smcFunc['substr']($value, 0, $row['field_length']);
+			}
 
 			// Any masks?
 			if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
 			{
 				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_mail_fail';
-
-					else
-						$value = '';
-				}
-				elseif ($row['mask'] == 'number')
+					if ($returnErrors) {
+											$errors[] = 'custom_field_mail_fail';
+					} else {
+											$value = '';
+					}
+				} elseif ($row['mask'] == 'number')
 				{
 					$value = (int) $value;
-				}
-				elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
+				} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
 				{
-					if ($returnErrors)
-						$errors[] = 'custom_field_regex_fail';
-
-					else
-						$value = '';
+					if ($returnErrors) {
+											$errors[] = 'custom_field_regex_fail';
+					} else {
+											$value = '';
+					}
 				}
 			}
 		}
@@ -1243,8 +1306,9 @@ 
 
 	$hook_errors = call_integration_hook('integrate_save_custom_profile_fields', array(&$changes, &$log_changes, &$errors, $returnErrors, $memID, $area, $sanitize));
 
-	if (!empty($hook_errors) && is_array($hook_errors))
-		$errors = array_merge($errors, $hook_errors);
+	if (!empty($hook_errors) && is_array($hook_errors)) {
+			$errors = array_merge($errors, $hook_errors);
+	}
 
 	// Make those changes!
 	if (!empty($changes) && empty($context['password_auth_failed']) && empty($errors))
@@ -1262,9 +1326,10 @@ 
 		}
 	}
 
-	if ($returnErrors)
-		return $errors;
-}
+	if ($returnErrors) {
+			return $errors;
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1276,8 +1341,9 @@ 
 	global $context, $txt, $modSettings;
 
 	// Do a quick check to ensure people aren't getting here illegally!
-	if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist']))
-		fatal_lang_error('no_access', false);
+	if (!$context['user']['is_owner'] || empty($modSettings['enable_buddylist'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Can we email the user direct?
 	$context['can_moderate_forum'] = allowedTo('moderate_forum');
@@ -1307,9 +1373,10 @@ 
 	$context['sub_template'] = $subActions[$context['list_area']][0];
 	$call = call_helper($subActions[$context['list_area']][0], true);
 
-	if (!empty($call))
-		call_user_func($call, $memID);
-}
+	if (!empty($call)) {
+			call_user_func($call, $memID);
+	}
+	}
 
 /**
  * Show all the users buddies, as well as a add/delete interface.
@@ -1323,9 +1390,10 @@ 
 
 	// For making changes!
 	$buddiesArray = explode(',', $user_profile[$memID]['buddy_list']);
-	foreach ($buddiesArray as $k => $dummy)
-		if ($dummy == '')
+	foreach ($buddiesArray as $k => $dummy) {
+			if ($dummy == '')
 			unset($buddiesArray[$k]);
+	}
 
 	// Removing a buddy?
 	if (isset($_GET['remove']))
@@ -1337,10 +1405,11 @@ 
 		$_SESSION['prf-save'] = $txt['could_not_remove_person'];
 
 		// Heh, I'm lazy, do it the easy way...
-		foreach ($buddiesArray as $key => $buddy)
-			if ($buddy == (int) $_GET['remove'])
+		foreach ($buddiesArray as $key => $buddy) {
+					if ($buddy == (int) $_GET['remove'])
 			{
 				unset($buddiesArray[$key]);
+		}
 				$_SESSION['prf-save'] = true;
 			}
 
@@ -1350,8 +1419,7 @@ 
 
 		// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 		redirectexit('action=profile;area=lists;sa=buddies;u=' . $memID);
-	}
-	elseif (isset($_POST['new_buddy']))
+	} elseif (isset($_POST['new_buddy']))
 	{
 		checkSession();
 
@@ -1364,8 +1432,9 @@ 
 		{
 			$new_buddies[$k] = strtr(trim($new_buddies[$k]), array('\'' => '&#039;'));
 
-			if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name'])))
-				unset($new_buddies[$k]);
+			if (strlen($new_buddies[$k]) == 0 || in_array($new_buddies[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name']))) {
+							unset($new_buddies[$k]);
+			}
 		}
 
 		call_integration_hook('integrate_add_buddies', array($memID, &$new_buddies));
@@ -1385,16 +1454,18 @@ 
 				)
 			);
 
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$_SESSION['prf-save'] = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$_SESSION['prf-save'] = true;
+			}
 
 			// Add the new member to the buddies array.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (in_array($row['id_member'], $buddiesArray))
-					continue;
-				else
-					$buddiesArray[] = (int) $row['id_member'];
+				if (in_array($row['id_member'], $buddiesArray)) {
+									continue;
+				} else {
+									$buddiesArray[] = (int) $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -1424,18 +1495,20 @@ 
 
 	$context['custom_pf'] = array();
 	$disabled_fields = isset($modSettings['disabled_profile_fields']) ? array_flip(explode(',', $modSettings['disabled_profile_fields'])) : array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (!isset($disabled_fields[$row['col_name']]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (!isset($disabled_fields[$row['col_name']]))
 			$context['custom_pf'][$row['col_name']] = array(
 				'label' => $row['field_name'],
 				'type' => $row['field_type'],
 				'bbc' => !empty($row['bbc']),
 				'enclose' => $row['enclose'],
 			);
+	}
 
 	// Gotta disable the gender option.
-	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'Disabled')
-		unset($context['custom_pf']['cust_gender']);
+	if (isset($context['custom_pf']['cust_gender']) && $context['custom_pf']['cust_gender'] == 'Disabled') {
+			unset($context['custom_pf']['cust_gender']);
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -1452,8 +1525,9 @@ 
 				'buddy_list_count' => substr_count($user_profile[$memID]['buddy_list'], ',') + 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$buddies[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$buddies[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -1481,30 +1555,32 @@ 
 					continue;
 				}
 
-				if ($column['bbc'] && !empty($context['buddies'][$buddy]['options'][$key]))
-					$context['buddies'][$buddy]['options'][$key] = strip_tags(parse_bbc($context['buddies'][$buddy]['options'][$key]));
-
-				elseif ($column['type'] == 'check')
-					$context['buddies'][$buddy]['options'][$key] = $context['buddies'][$buddy]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				if ($column['bbc'] && !empty($context['buddies'][$buddy]['options'][$key])) {
+									$context['buddies'][$buddy]['options'][$key] = strip_tags(parse_bbc($context['buddies'][$buddy]['options'][$key]));
+				} elseif ($column['type'] == 'check') {
+									$context['buddies'][$buddy]['options'][$key] = $context['buddies'][$buddy]['options'][$key] == 0 ? $txt['no'] : $txt['yes'];
+				}
 
 				// Enclosing the user input within some other text?
-				if (!empty($column['enclose']) && !empty($context['buddies'][$buddy]['options'][$key]))
-					$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
+				if (!empty($column['enclose']) && !empty($context['buddies'][$buddy]['options'][$key])) {
+									$context['buddies'][$buddy]['options'][$key] = strtr($column['enclose'], array(
 						'{SCRIPTURL}' => $scripturl,
 						'{IMAGES_URL}' => $settings['images_url'],
 						'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 						'{INPUT}' => $context['buddies'][$buddy]['options'][$key],
 					));
+				}
 			}
 		}
 	}
 
 	if (isset($_SESSION['prf-save']))
 	{
-		if ($_SESSION['prf-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['prf-save'];
+		if ($_SESSION['prf-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['prf-save'];
+		}
 
 		unset($_SESSION['prf-save']);
 	}
@@ -1524,9 +1600,10 @@ 
 
 	// For making changes!
 	$ignoreArray = explode(',', $user_profile[$memID]['pm_ignore_list']);
-	foreach ($ignoreArray as $k => $dummy)
-		if ($dummy == '')
+	foreach ($ignoreArray as $k => $dummy) {
+			if ($dummy == '')
 			unset($ignoreArray[$k]);
+	}
 
 	// Removing a member from the ignore list?
 	if (isset($_GET['remove']))
@@ -1536,10 +1613,11 @@ 
 		$_SESSION['prf-save'] = $txt['could_not_remove_person'];
 
 		// Heh, I'm lazy, do it the easy way...
-		foreach ($ignoreArray as $key => $id_remove)
-			if ($id_remove == (int) $_GET['remove'])
+		foreach ($ignoreArray as $key => $id_remove) {
+					if ($id_remove == (int) $_GET['remove'])
 			{
 				unset($ignoreArray[$key]);
+		}
 				$_SESSION['prf-save'] = true;
 			}
 
@@ -1549,8 +1627,7 @@ 
 
 		// Redirect off the page because we don't like all this ugly query stuff to stick in the history.
 		redirectexit('action=profile;area=lists;sa=ignore;u=' . $memID);
-	}
-	elseif (isset($_POST['new_ignore']))
+	} elseif (isset($_POST['new_ignore']))
 	{
 		checkSession();
 		// Prepare the string for extraction...
@@ -1562,8 +1639,9 @@ 
 		{
 			$new_entries[$k] = strtr(trim($new_entries[$k]), array('\'' => '&#039;'));
 
-			if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name'])))
-				unset($new_entries[$k]);
+			if (strlen($new_entries[$k]) == 0 || in_array($new_entries[$k], array($user_profile[$memID]['member_name'], $user_profile[$memID]['real_name']))) {
+							unset($new_entries[$k]);
+			}
 		}
 
 		$_SESSION['prf-save'] = $txt['could_not_add_person'];
@@ -1581,16 +1659,18 @@ 
 				)
 			);
 
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$_SESSION['prf-save'] = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$_SESSION['prf-save'] = true;
+			}
 
 			// Add the new member to the buddies array.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (in_array($row['id_member'], $ignoreArray))
-					continue;
-				else
-					$ignoreArray[] = (int) $row['id_member'];
+				if (in_array($row['id_member'], $ignoreArray)) {
+									continue;
+				} else {
+									$ignoreArray[] = (int) $row['id_member'];
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
@@ -1619,8 +1699,9 @@ 
 				'ignore_list_count' => substr_count($user_profile[$memID]['pm_ignore_list'], ',') + 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$ignored[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$ignored[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($result);
 	}
 
@@ -1639,10 +1720,11 @@ 
 
 	if (isset($_SESSION['prf-save']))
 	{
-		if ($_SESSION['prf-save'] === true)
-			$context['saved_successful'] = true;
-		else
-			$context['saved_failed'] = $_SESSION['prf-save'];
+		if ($_SESSION['prf-save'] === true) {
+					$context['saved_successful'] = true;
+		} else {
+					$context['saved_failed'] = $_SESSION['prf-save'];
+		}
 
 		unset($_SESSION['prf-save']);
 	}
@@ -1658,8 +1740,9 @@ 
 	global $context, $txt;
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any')))
-		loadCustomFields($memID, 'account');
+	if (allowedTo(array('profile_identity_own', 'profile_identity_any', 'profile_password_own', 'profile_password_any'))) {
+			loadCustomFields($memID, 'account');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['account_info'];
@@ -1686,8 +1769,9 @@ 
 	global $context, $txt;
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_forum_own', 'profile_forum_any')))
-		loadCustomFields($memID, 'forumprofile');
+	if (allowedTo(array('profile_forum_own', 'profile_forum_any'))) {
+			loadCustomFields($memID, 'forumprofile');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['forumProfile_info'];
@@ -1720,18 +1804,21 @@ 
 	$dirs = array();
 	$files = array();
 
-	if (!$dir)
-		return array();
+	if (!$dir) {
+			return array();
+	}
 
 	while ($line = $dir->read())
 	{
-		if (in_array($line, array('.', '..', 'blank.png', 'index.php')))
-			continue;
+		if (in_array($line, array('.', '..', 'blank.png', 'index.php'))) {
+					continue;
+		}
 
-		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line))
-			$dirs[] = $line;
-		else
-			$files[] = $line;
+		if (is_dir($modSettings['avatar_directory'] . '/' . $directory . (!empty($directory) ? '/' : '') . $line)) {
+					$dirs[] = $line;
+		} else {
+					$files[] = $line;
+		}
 	}
 	$dir->close();
 
@@ -1752,14 +1839,15 @@ 
 	foreach ($dirs as $line)
 	{
 		$tmp = getAvatars($directory . (!empty($directory) ? '/' : '') . $line, $level + 1);
-		if (!empty($tmp))
-			$result[] = array(
+		if (!empty($tmp)) {
+					$result[] = array(
 				'filename' => $smcFunc['htmlspecialchars']($line),
 				'checked' => strpos($context['member']['avatar']['server_pic'], $line . '/') !== false,
 				'name' => '[' . $smcFunc['htmlspecialchars'](str_replace('_', ' ', $line)) . ']',
 				'is_dir' => true,
 				'files' => $tmp
 		);
+		}
 		unset($tmp);
 	}
 
@@ -1769,8 +1857,9 @@ 
 		$extension = substr(strrchr($line, '.'), 1);
 
 		// Make sure it is an image.
-		if (strcasecmp($extension, 'gif') != 0 && strcasecmp($extension, 'jpg') != 0 && strcasecmp($extension, 'jpeg') != 0 && strcasecmp($extension, 'png') != 0 && strcasecmp($extension, 'bmp') != 0)
-			continue;
+		if (strcasecmp($extension, 'gif') != 0 && strcasecmp($extension, 'jpg') != 0 && strcasecmp($extension, 'jpeg') != 0 && strcasecmp($extension, 'png') != 0 && strcasecmp($extension, 'bmp') != 0) {
+					continue;
+		}
 
 		$result[] = array(
 			'filename' => $smcFunc['htmlspecialchars']($line),
@@ -1778,8 +1867,9 @@ 
 			'name' => $smcFunc['htmlspecialchars'](str_replace('_', ' ', $filename)),
 			'is_dir' => false
 		);
-		if ($level == 1)
-			$context['avatar_list'][] = $directory . '/' . $line;
+		if ($level == 1) {
+					$context['avatar_list'][] = $directory . '/' . $line;
+		}
 	}
 
 	return $result;
@@ -1798,8 +1888,9 @@ 
 	loadSubTemplate('options');
 
 	loadThemeOptions($memID);
-	if (allowedTo(array('profile_extra_own', 'profile_extra_any')))
-		loadCustomFields($memID, 'theme');
+	if (allowedTo(array('profile_extra_own', 'profile_extra_any'))) {
+			loadCustomFields($memID, 'theme');
+	}
 
 	$context['sub_template'] = 'edit_options';
 	$context['page_desc'] = $txt['theme_info'];
@@ -1853,16 +1944,19 @@ 
 {
 	global $txt, $context, $modSettings, $smcFunc, $sourcedir;
 
-	if (!isset($context['token_check']))
-		$context['token_check'] = 'profile-nt' . $memID;
+	if (!isset($context['token_check'])) {
+			$context['token_check'] = 'profile-nt' . $memID;
+	}
 
 	is_not_guest();
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_extra_any');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_extra_any');
+	}
 
 	// Set the post action if we're coming from the profile...
-	if (!isset($context['action']))
-		$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . $memID;
+	if (!isset($context['action'])) {
+			$context['action'] = 'action=profile;area=notification;sa=alerts;u=' . $memID;
+	}
 
 	// What options are set
 	loadThemeOptions($memID);
@@ -1949,28 +2043,34 @@ 
 	);
 
 	// There are certain things that are disabled at the group level.
-	if (empty($modSettings['cal_enabled']))
-		unset($alert_types['calendar']);
+	if (empty($modSettings['cal_enabled'])) {
+			unset($alert_types['calendar']);
+	}
 
 	// Disable paid subscriptions at group level if they're disabled
-	if (empty($modSettings['paid_enabled']))
-		unset($alert_types['paidsubs']);
+	if (empty($modSettings['paid_enabled'])) {
+			unset($alert_types['paidsubs']);
+	}
 
 	// Disable membergroup requests at group level if they're disabled
-	if (empty($modSettings['show_group_membership']))
-		unset($alert_types['groupr'], $alert_types['members']['request_group']);
+	if (empty($modSettings['show_group_membership'])) {
+			unset($alert_types['groupr'], $alert_types['members']['request_group']);
+	}
 
 	// Disable mentions if they're disabled
-	if (empty($modSettings['enable_mentions']))
-		unset($alert_types['msg']['msg_mention']);
+	if (empty($modSettings['enable_mentions'])) {
+			unset($alert_types['msg']['msg_mention']);
+	}
 
 	// Disable likes if they're disabled
-	if (empty($modSettings['enable_likes']))
-		unset($alert_types['msg']['msg_like']);
+	if (empty($modSettings['enable_likes'])) {
+			unset($alert_types['msg']['msg_like']);
+	}
 
 	// Disable buddy requests if they're disabled
-	if (empty($modSettings['enable_buddylist']))
-		unset($alert_types['members']['buddy_request']);
+	if (empty($modSettings['enable_buddylist'])) {
+			unset($alert_types['members']['buddy_request']);
+	}
 
 	// Now, now, we could pass this through global but we should really get into the habit of
 	// passing content to hooks, not expecting hooks to splatter everything everywhere.
@@ -1998,15 +2098,17 @@ 
 			$perms_cache['manage_membergroups'] = in_array($memID, $members);
 		}
 
-		if (!($perms_cache['manage_membergroups'] || $can_mod != 0))
-			unset($alert_types['members']['request_group']);
+		if (!($perms_cache['manage_membergroups'] || $can_mod != 0)) {
+					unset($alert_types['members']['request_group']);
+		}
 
 		foreach ($alert_types as $group => $items)
 		{
 			foreach ($items as $alert_key => $alert_value)
 			{
-				if (!isset($alert_value['permission']))
-					continue;
+				if (!isset($alert_value['permission'])) {
+									continue;
+				}
 				if (!isset($perms_cache[$alert_value['permission']['name']]))
 				{
 					$in_board = !empty($alert_value['permission']['is_board']) ? 0 : null;
@@ -2014,12 +2116,14 @@ 
 					$perms_cache[$alert_value['permission']['name']] = in_array($memID, $members);
 				}
 
-				if (!$perms_cache[$alert_value['permission']['name']])
-					unset ($alert_types[$group][$alert_key]);
+				if (!$perms_cache[$alert_value['permission']['name']]) {
+									unset ($alert_types[$group][$alert_key]);
+				}
 			}
 
-			if (empty($alert_types[$group]))
-				unset ($alert_types[$group]);
+			if (empty($alert_types[$group])) {
+							unset ($alert_types[$group]);
+			}
 		}
 	}
 
@@ -2051,9 +2155,9 @@ 
 						$update_prefs[$this_option[1]] = !empty($_POST['opt_' . $this_option[1]]) ? 1 : 0;
 						break;
 					case 'select':
-						if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]]))
-							$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
-						else
+						if (isset($_POST['opt_' . $this_option[1]], $this_option['opts'][$_POST['opt_' . $this_option[1]]])) {
+													$update_prefs[$this_option[1]] = $_POST['opt_' . $this_option[1]];
+						} else
 						{
 							// We didn't have a sane value. Let's grab the first item from the possibles.
 							$keys = array_keys($this_option['opts']);
@@ -2073,23 +2177,28 @@ 
 				$this_value = 0;
 				foreach ($context['alert_bits'] as $type => $bitvalue)
 				{
-					if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always')
-						$this_value |= $bitvalue;
+					if ($this_options[$type] == 'yes' && !empty($_POST[$type . '_' . $item_key]) || $this_options[$type] == 'always') {
+											$this_value |= $bitvalue;
+					}
+				}
+				if (!isset($context['alert_prefs'][$item_key]) || $context['alert_prefs'][$item_key] != $this_value) {
+									$update_prefs[$item_key] = $this_value;
 				}
-				if (!isset($context['alert_prefs'][$item_key]) || $context['alert_prefs'][$item_key] != $this_value)
-					$update_prefs[$item_key] = $this_value;
 			}
 		}
 
-		if (!empty($_POST['opt_alert_timeout']))
-			$update_prefs['alert_timeout'] = $context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
+		if (!empty($_POST['opt_alert_timeout'])) {
+					$update_prefs['alert_timeout'] = $context['member']['alert_timeout'] = (int) $_POST['opt_alert_timeout'];
+		}
 
-		if (!empty($_POST['notify_announcements']))
-			$update_prefs['announcements'] = $context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
+		if (!empty($_POST['notify_announcements'])) {
+					$update_prefs['announcements'] = $context['member']['notify_announcements'] = (int) $_POST['notify_announcements'];
+		}
 
 		setNotifyPrefs((int) $memID, $update_prefs);
-		foreach ($update_prefs as $pref => $value)
-			$context['alert_prefs'][$pref] = $value;
+		foreach ($update_prefs as $pref => $value) {
+					$context['alert_prefs'][$pref] = $value;
+		}
 
 		makeNotificationChanges($memID);
 
@@ -2119,8 +2228,9 @@ 
 
 	// Now we're all set up.
 	is_not_guest();
-	if (!$context['user']['is_owner'])
-		fatal_error('no_access');
+	if (!$context['user']['is_owner']) {
+			fatal_error('no_access');
+	}
 
 	checkSession('get');
 
@@ -2152,8 +2262,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toMark) || empty($memID))
-		return false;
+	if (empty($toMark) || empty($memID)) {
+			return false;
+	}
 
 	$toMark = (array) $toMark;
 
@@ -2187,8 +2298,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($toDelete))
-		return false;
+	if (empty($toDelete)) {
+			return false;
+	}
 
 	$toDelete = (array) $toDelete;
 
@@ -2223,8 +2335,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($memID))
-		return false;
+	if (empty($memID)) {
+			return false;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_alert
@@ -2301,8 +2414,9 @@ 
 					{
 						$link = $topic['link'];
 
-						if ($topic['new'])
-							$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						if ($topic['new']) {
+													$link .= ' <a href="' . $topic['new_href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						}
 
 						$link .= '<br><span class="smalltext"><em>' . $txt['in'] . ' ' . $topic['board_link'] . '</em></span>';
 
@@ -2453,8 +2567,9 @@ 
 					{
 						$link = $board['link'];
 
-						if ($board['new'])
-							$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						if ($board['new']) {
+													$link .= ' <a href="' . $board['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>';
+						}
 
 						return $link;
 					},
@@ -2654,8 +2769,8 @@ 
 		)
 	);
 	$notification_boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$notification_boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$notification_boards[] = array(
 			'id' => $row['id_board'],
 			'name' => $row['name'],
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
@@ -2663,6 +2778,7 @@ 
 			'new' => $row['board_read'] < $row['id_msg_updated'],
 			'notify_pref' => isset($prefs['board_notify_' . $row['id_board']]) ? $prefs['board_notify_' . $row['id_board']] : (!empty($prefs['board_notify']) ? $prefs['board_notify'] : 0),
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $notification_boards;
@@ -2677,17 +2793,18 @@ 
 {
 	global $context, $options, $cur_profile, $smcFunc;
 
-	if (isset($_POST['default_options']))
-		$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	if (isset($_POST['default_options'])) {
+			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	}
 
 	if ($context['user']['is_owner'])
 	{
 		$context['member']['options'] = $options;
-		if (isset($_POST['options']) && is_array($_POST['options']))
-			foreach ($_POST['options'] as $k => $v)
+		if (isset($_POST['options']) && is_array($_POST['options'])) {
+					foreach ($_POST['options'] as $k => $v)
 				$context['member']['options'][$k] = $v;
-	}
-	else
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member, variable, value
@@ -2708,8 +2825,9 @@ 
 				continue;
 			}
 
-			if (isset($_POST['options'][$row['variable']]))
-				$row['value'] = $_POST['options'][$row['variable']];
+			if (isset($_POST['options'][$row['variable']])) {
+							$row['value'] = $_POST['options'][$row['variable']];
+			}
 			$context['member']['options'][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -2717,8 +2835,9 @@ 
 		// Load up the default theme options for any missing.
 		foreach ($temp as $k => $v)
 		{
-			if (!isset($context['member']['options'][$k]))
-				$context['member']['options'][$k] = $v;
+			if (!isset($context['member']['options'][$k])) {
+							$context['member']['options'][$k] = $v;
+			}
 		}
 	}
 }
@@ -2733,8 +2852,9 @@ 
 	global $context, $modSettings, $smcFunc, $cur_profile, $sourcedir;
 
 	// Have the admins enabled this option?
-	if (empty($modSettings['allow_ignore_boards']))
-		fatal_lang_error('ignoreboards_disallowed', 'user');
+	if (empty($modSettings['allow_ignore_boards'])) {
+			fatal_lang_error('ignoreboards_disallowed', 'user');
+	}
 
 	// Find all the boards this user is allowed to see.
 	$request = $smcFunc['db_query']('order_by_board_order', '
@@ -2754,12 +2874,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -2789,18 +2910,20 @@ 
 	}
 
 	$max_boards = ceil(count($temp_boards) / 2);
-	if ($max_boards == 1)
-		$max_boards = 2;
+	if ($max_boards == 1) {
+			$max_boards = 2;
+	}
 
 	// Now, alternate them so they can be shown left and right ;).
 	$context['board_columns'] = array();
 	for ($i = 0; $i < $max_boards; $i++)
 	{
 		$context['board_columns'][] = $temp_boards[$i];
-		if (isset($temp_boards[$i + $max_boards]))
-			$context['board_columns'][] = $temp_boards[$i + $max_boards];
-		else
-			$context['board_columns'][] = array();
+		if (isset($temp_boards[$i + $max_boards])) {
+					$context['board_columns'][] = $temp_boards[$i + $max_boards];
+		} else {
+					$context['board_columns'][] = array();
+		}
 	}
 
 	loadThemeOptions($memID);
@@ -2869,8 +2992,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// We should skip the administrator group if they don't have the admin_forum permission!
-		if ($row['id_group'] == 1 && !allowedTo('admin_forum'))
-			continue;
+		if ($row['id_group'] == 1 && !allowedTo('admin_forum')) {
+					continue;
+		}
 
 		$context['member_groups'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -2916,16 +3040,17 @@ 
 	$context['max_signature_length'] = $context['signature_limits']['max_length'];
 	// Warning message for signature image limits?
 	$context['signature_warning'] = '';
-	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
-	elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height'])
-		$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	if ($context['signature_limits']['max_image_width'] && $context['signature_limits']['max_image_height']) {
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_size'], $context['signature_limits']['max_image_width'], $context['signature_limits']['max_image_height']);
+	} elseif ($context['signature_limits']['max_image_width'] || $context['signature_limits']['max_image_height']) {
+			$context['signature_warning'] = sprintf($txt['profile_error_signature_max_image_' . ($context['signature_limits']['max_image_width'] ? 'width' : 'height')], $context['signature_limits'][$context['signature_limits']['max_image_width'] ? 'max_image_width' : 'max_image_height']);
+	}
 
 	$context['show_spellchecking'] = !empty($modSettings['enableSpellChecking']) && (function_exists('pspell_new') || (function_exists('enchant_broker_init') && ($txt['lang_charset'] == 'UTF-8' || function_exists('iconv'))));
 
-	if (empty($context['do_preview']))
-		$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
-	else
+	if (empty($context['do_preview'])) {
+			$context['member']['signature'] = empty($cur_profile['signature']) ? '' : str_replace(array('<br>', '<', '>', '"', '\''), array("\n", '&lt;', '&gt;', '&quot;', '&#039;'), $cur_profile['signature']);
+	} else
 	{
 		$signature = !empty($_POST['signature']) ? $_POST['signature'] : '';
 		$validation = profileValidateSignature($signature);
@@ -2935,8 +3060,9 @@ 
 			$context['post_errors'] = array();
 		}
 		$context['post_errors'][] = 'signature_not_yet_saved';
-		if ($validation !== true && $validation !== false)
-			$context['post_errors'][] = $validation;
+		if ($validation !== true && $validation !== false) {
+					$context['post_errors'][] = $validation;
+		}
 
 		censorText($context['member']['signature']);
 		$context['member']['current_signature'] = $context['member']['signature'];
@@ -2946,8 +3072,9 @@ 
 	}
 
 	// Load the spell checker?
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	}
 
 	return true;
 }
@@ -2981,8 +3108,7 @@ 
 			'external' => $cur_profile['avatar'] == 'gravatar://' || empty($modSettings['gravatarAllowExtraEmail']) || !empty($modSettings['gravatarOverride']) ? $cur_profile['email_address'] : substr($cur_profile['avatar'], 11)
 		);
 		$context['member']['avatar']['href'] = get_gravatar_url($context['member']['avatar']['external']);
-	}
-	elseif ($cur_profile['avatar'] == '' && $cur_profile['id_attach'] > 0 && $context['member']['avatar']['allow_upload'])
+	} elseif ($cur_profile['avatar'] == '' && $cur_profile['id_attach'] > 0 && $context['member']['avatar']['allow_upload'])
 	{
 		$context['member']['avatar'] += array(
 			'choice' => 'upload',
@@ -2992,33 +3118,34 @@ 
 		$context['member']['avatar']['href'] = empty($cur_profile['attachment_type']) ? $scripturl . '?action=dlattach;attach=' . $cur_profile['id_attach'] . ';type=avatar' : $modSettings['custom_avatar_url'] . '/' . $cur_profile['filename'];
 	}
 	// Use "avatar_original" here so we show what the user entered even if the image proxy is enabled
-	elseif ((stristr($cur_profile['avatar'], 'http://') || stristr($cur_profile['avatar'], 'https://')) && $context['member']['avatar']['allow_external'])
-		$context['member']['avatar'] += array(
+	elseif ((stristr($cur_profile['avatar'], 'http://') || stristr($cur_profile['avatar'], 'https://')) && $context['member']['avatar']['allow_external']) {
+			$context['member']['avatar'] += array(
 			'choice' => 'external',
 			'server_pic' => 'blank.png',
 			'external' => $cur_profile['avatar_original']
 		);
-	elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored'])
-		$context['member']['avatar'] += array(
+	} elseif ($cur_profile['avatar'] != '' && file_exists($modSettings['avatar_directory'] . '/' . $cur_profile['avatar']) && $context['member']['avatar']['allow_server_stored']) {
+			$context['member']['avatar'] += array(
 			'choice' => 'server_stored',
 			'server_pic' => $cur_profile['avatar'] == '' ? 'blank.png' : $cur_profile['avatar'],
 			'external' => 'http://'
 		);
-	else
-		$context['member']['avatar'] += array(
+	} else {
+			$context['member']['avatar'] += array(
 			'choice' => 'none',
 			'server_pic' => 'blank.png',
 			'external' => 'http://'
 		);
+	}
 
 	// Get a list of all the avatars.
 	if ($context['member']['avatar']['allow_server_stored'])
 	{
 		$context['avatar_list'] = array();
 		$context['avatars'] = is_dir($modSettings['avatar_directory']) ? getAvatars('', 0) : array();
+	} else {
+			$context['avatars'] = array();
 	}
-	else
-		$context['avatars'] = array();
 
 	// Second level selected avatar...
 	$context['avatar_selected'] = substr(strrchr($context['member']['avatar']['server_pic'], '/'), 1);
@@ -3047,19 +3174,22 @@ 
 			)
 		);
 		$protected_groups = array(1);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$protected_groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$protected_groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$protected_groups = array_unique($protected_groups);
 	}
 
 	// The account page allows the change of your id_group - but not to a protected group!
-	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0)
-		$value = (int) $value;
+	if (empty($protected_groups) || count(array_intersect(array((int) $value, $old_profile['id_group']), $protected_groups)) == 0) {
+			$value = (int) $value;
+	}
 	// ... otherwise it's the old group sir.
-	else
-		$value = $old_profile['id_group'];
+	else {
+			$value = $old_profile['id_group'];
+	}
 
 	// Find the additional membergroups (if any)
 	if (isset($_POST['additional_groups']) && is_array($_POST['additional_groups']))
@@ -3068,16 +3198,18 @@ 
 		foreach ($_POST['additional_groups'] as $group_id)
 		{
 			$group_id = (int) $group_id;
-			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups)))
-				$additional_groups[] = $group_id;
+			if (!empty($group_id) && (empty($protected_groups) || !in_array($group_id, $protected_groups))) {
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		// Put the protected groups back in there if you don't have permission to take them away.
 		$old_additional_groups = explode(',', $old_profile['additional_groups']);
 		foreach ($old_additional_groups as $group_id)
 		{
-			if (!empty($protected_groups) && in_array($group_id, $protected_groups))
-				$additional_groups[] = $group_id;
+			if (!empty($protected_groups) && in_array($group_id, $protected_groups)) {
+							$additional_groups[] = $group_id;
+			}
 		}
 
 		if (implode(',', $additional_groups) !== $old_profile['additional_groups'])
@@ -3109,18 +3241,20 @@ 
 			list ($another) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($another))
-				fatal_lang_error('at_least_one_admin', 'critical');
+			if (empty($another)) {
+							fatal_lang_error('at_least_one_admin', 'critical');
+			}
 		}
 	}
 
 	// If we are changing group status, update permission cache as necessary.
 	if ($value != $old_profile['id_group'] || isset($profile_vars['additional_groups']))
 	{
-		if ($context['user']['is_owner'])
-			$_SESSION['mc']['time'] = 0;
-		else
-			updateSettings(array('settings_updated' => time()));
+		if ($context['user']['is_owner']) {
+					$_SESSION['mc']['time'] = 0;
+		} else {
+					updateSettings(array('settings_updated' => time()));
+		}
 	}
 
 	// Announce to any hooks that we have changed groups, but don't allow them to change it.
@@ -3141,8 +3275,9 @@ 
 	global $modSettings, $sourcedir, $smcFunc, $profile_vars, $cur_profile, $context;
 
 	$memID = $context['id_member'];
-	if (empty($memID) && !empty($context['password_auth_failed']))
-		return false;
+	if (empty($memID) && !empty($context['password_auth_failed'])) {
+			return false;
+	}
 
 	require_once($sourcedir . '/ManageAttachments.php');
 
@@ -3153,8 +3288,9 @@ 
 	$downloadedExternalAvatar = false;
 	if ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && strlen($_POST['userpicpersonal']) > 7 && !empty($modSettings['avatar_download_external']))
 	{
-		if (!is_writable($uploadDir))
-			fatal_lang_error('attachments_no_write', 'critical');
+		if (!is_writable($uploadDir)) {
+					fatal_lang_error('attachments_no_write', 'critical');
+		}
 
 		require_once($sourcedir . '/Subs-Package.php');
 
@@ -3198,19 +3334,18 @@ 
 
 		// Get rid of their old avatar. (if uploaded.)
 		removeAttachments(array('id_member' => $memID));
-	}
-	elseif ($value == 'gravatar' && !empty($modSettings['gravatarEnabled']))
+	} elseif ($value == 'gravatar' && !empty($modSettings['gravatarEnabled']))
 	{
 		// One wasn't specified, or it's not allowed to use extra email addresses, or it's not a valid one, reset to default Gravatar.
-		if (empty($_POST['gravatarEmail']) || empty($modSettings['gravatarAllowExtraEmail']) || !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL))
-			$profile_vars['avatar'] = 'gravatar://';
-		else
-			$profile_vars['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $cur_profile['email_address'] ? $_POST['gravatarEmail'] : '');
+		if (empty($_POST['gravatarEmail']) || empty($modSettings['gravatarAllowExtraEmail']) || !filter_var($_POST['gravatarEmail'], FILTER_VALIDATE_EMAIL)) {
+					$profile_vars['avatar'] = 'gravatar://';
+		} else {
+					$profile_vars['avatar'] = 'gravatar://' . ($_POST['gravatarEmail'] != $cur_profile['email_address'] ? $_POST['gravatarEmail'] : '');
+		}
 
 		// Get rid of their old avatar. (if uploaded.)
 		removeAttachments(array('id_member' => $memID));
-	}
-	elseif ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && empty($modSettings['avatar_download_external']))
+	} elseif ($value == 'external' && allowedTo('profile_remote_avatar') && (stripos($_POST['userpicpersonal'], 'http://') === 0 || stripos($_POST['userpicpersonal'], 'https://') === 0) && empty($modSettings['avatar_download_external']))
 	{
 		// We need these clean...
 		$cur_profile['id_attach'] = 0;
@@ -3222,11 +3357,13 @@ 
 
 		$profile_vars['avatar'] = str_replace(' ', '%20', preg_replace('~action(?:=|%3d)(?!dlattach)~i', 'action-', $_POST['userpicpersonal']));
 
-		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///')
-			$profile_vars['avatar'] = '';
+		if ($profile_vars['avatar'] == 'http://' || $profile_vars['avatar'] == 'http:///') {
+					$profile_vars['avatar'] = '';
+		}
 		// Trying to make us do something we'll regret?
-		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://')
-			return 'bad_avatar_invalid_url';
+		elseif (substr($profile_vars['avatar'], 0, 7) != 'http://' && substr($profile_vars['avatar'], 0, 8) != 'https://') {
+					return 'bad_avatar_invalid_url';
+		}
 		// Should we check dimensions?
 		elseif (!empty($modSettings['avatar_max_height_external']) || !empty($modSettings['avatar_max_width_external']))
 		{
@@ -3236,9 +3373,9 @@ 
 			if (is_array($sizes) && (($sizes[0] > $modSettings['avatar_max_width_external'] && !empty($modSettings['avatar_max_width_external'])) || ($sizes[1] > $modSettings['avatar_max_height_external'] && !empty($modSettings['avatar_max_height_external']))))
 			{
 				// Houston, we have a problem. The avatar is too large!!
-				if ($modSettings['avatar_action_too_large'] == 'option_refuse')
-					return 'bad_avatar_too_large';
-				elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
+				if ($modSettings['avatar_action_too_large'] == 'option_refuse') {
+									return 'bad_avatar_too_large';
+				} elseif ($modSettings['avatar_action_too_large'] == 'option_download_and_resize')
 				{
 					// @todo remove this if appropriate
 					require_once($sourcedir . '/Subs-Graphics.php');
@@ -3248,26 +3385,27 @@ 
 						$cur_profile['id_attach'] = $modSettings['new_avatar_data']['id'];
 						$cur_profile['filename'] = $modSettings['new_avatar_data']['filename'];
 						$cur_profile['attachment_type'] = $modSettings['new_avatar_data']['type'];
+					} else {
+											return 'bad_avatar';
 					}
-					else
-						return 'bad_avatar';
 				}
 			}
 		}
-	}
-	elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
+	} elseif (($value == 'upload' && allowedTo('profile_upload_avatar')) || $downloadedExternalAvatar)
 	{
 		if ((isset($_FILES['attachment']['name']) && $_FILES['attachment']['name'] != '') || $downloadedExternalAvatar)
 		{
 			// Get the dimensions of the image.
 			if (!$downloadedExternalAvatar)
 			{
-				if (!is_writable($uploadDir))
-					fatal_lang_error('attachments_no_write', 'critical');
+				if (!is_writable($uploadDir)) {
+									fatal_lang_error('attachments_no_write', 'critical');
+				}
 
 				$new_filename = $uploadDir . '/' . getAttachmentFilename('avatar_tmp_' . $memID, false, null, true);
-				if (!move_uploaded_file($_FILES['attachment']['tmp_name'], $new_filename))
-					fatal_lang_error('attach_timeout', 'critical');
+				if (!move_uploaded_file($_FILES['attachment']['tmp_name'], $new_filename)) {
+									fatal_lang_error('attach_timeout', 'critical');
+				}
 
 				$_FILES['attachment']['tmp_name'] = $new_filename;
 			}
@@ -3380,17 +3518,19 @@ 
 			$profile_vars['avatar'] = '';
 
 			// Delete any temporary file.
-			if (file_exists($_FILES['attachment']['tmp_name']))
-				@unlink($_FILES['attachment']['tmp_name']);
+			if (file_exists($_FILES['attachment']['tmp_name'])) {
+							@unlink($_FILES['attachment']['tmp_name']);
+			}
 		}
 		// Selected the upload avatar option and had one already uploaded before or didn't upload one.
-		else
+		else {
+					$profile_vars['avatar'] = '';
+		}
+	} elseif ($value == 'gravatar' && allowedTo('profile_gravatar_avatar')) {
+			$profile_vars['avatar'] = 'gravatar://www.gravatar.com/avatar/' . md5(strtolower(trim($cur_profile['email_address'])));
+	} else {
 			$profile_vars['avatar'] = '';
 	}
-	elseif ($value == 'gravatar' && allowedTo('profile_gravatar_avatar'))
-		$profile_vars['avatar'] = 'gravatar://www.gravatar.com/avatar/' . md5(strtolower(trim($cur_profile['email_address'])));
-	else
-		$profile_vars['avatar'] = '';
 
 	// Setup the profile variables so it shows things right on display!
 	$cur_profile['avatar'] = $profile_vars['avatar'];
@@ -3438,9 +3578,9 @@ 
 		$smiley_parsed = $unparsed_signature;
 		parsesmileys($smiley_parsed);
 		$smiley_count = substr_count(strtolower($smiley_parsed), '<img') - substr_count(strtolower($unparsed_signature), '<img');
-		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0)
-			return 'signature_allow_smileys';
-		elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
+		if (!empty($sig_limits[4]) && $sig_limits[4] == -1 && $smiley_count > 0) {
+					return 'signature_allow_smileys';
+		} elseif (!empty($sig_limits[4]) && $sig_limits[4] > 0 && $smiley_count > $sig_limits[4])
 		{
 			$txt['profile_error_signature_max_smileys'] = sprintf($txt['profile_error_signature_max_smileys'], $sig_limits[4]);
 			return 'signature_max_smileys';
@@ -3453,14 +3593,15 @@ 
 			{
 				$limit_broke = 0;
 				// Attempt to allow all sizes of abuse, so to speak.
-				if ($matches[2][$ind] == 'px' && $size > $sig_limits[7])
-					$limit_broke = $sig_limits[7] . 'px';
-				elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75))
-					$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
-				elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16))
-					$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
-				elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18)
-					$limit_broke = 'large';
+				if ($matches[2][$ind] == 'px' && $size > $sig_limits[7]) {
+									$limit_broke = $sig_limits[7] . 'px';
+				} elseif ($matches[2][$ind] == 'pt' && $size > ($sig_limits[7] * 0.75)) {
+									$limit_broke = ((int) $sig_limits[7] * 0.75) . 'pt';
+				} elseif ($matches[2][$ind] == 'em' && $size > ((float) $sig_limits[7] / 16)) {
+									$limit_broke = ((float) $sig_limits[7] / 16) . 'em';
+				} elseif ($matches[2][$ind] != 'px' && $matches[2][$ind] != 'pt' && $matches[2][$ind] != 'em' && $sig_limits[7] < 18) {
+									$limit_broke = 'large';
+				}
 
 				if ($limit_broke)
 				{
@@ -3502,24 +3643,26 @@ 
 					$width = -1; $height = -1;
 
 					// Does it have predefined restraints? Width first.
-					if ($matches[6][$key])
-						$matches[2][$key] = $matches[6][$key];
+					if ($matches[6][$key]) {
+											$matches[2][$key] = $matches[6][$key];
+					}
 					if ($matches[2][$key] && $sig_limits[5] && $matches[2][$key] > $sig_limits[5])
 					{
 						$width = $sig_limits[5];
 						$matches[4][$key] = $matches[4][$key] * ($width / $matches[2][$key]);
+					} elseif ($matches[2][$key]) {
+											$width = $matches[2][$key];
 					}
-					elseif ($matches[2][$key])
-						$width = $matches[2][$key];
 					// ... and height.
 					if ($matches[4][$key] && $sig_limits[6] && $matches[4][$key] > $sig_limits[6])
 					{
 						$height = $sig_limits[6];
-						if ($width != -1)
-							$width = $width * ($height / $matches[4][$key]);
+						if ($width != -1) {
+													$width = $width * ($height / $matches[4][$key]);
+						}
+					} elseif ($matches[4][$key]) {
+											$height = $matches[4][$key];
 					}
-					elseif ($matches[4][$key])
-						$height = $matches[4][$key];
 
 					// If the dimensions are still not fixed - we need to check the actual image.
 					if (($width == -1 && $sig_limits[5]) || ($height == -1 && $sig_limits[6]))
@@ -3537,21 +3680,24 @@ 
 							if ($sizes[1] > $sig_limits[6] && $sig_limits[6])
 							{
 								$height = $sig_limits[6];
-								if ($width == -1)
-									$width = $sizes[0];
+								if ($width == -1) {
+																	$width = $sizes[0];
+								}
 								$width = $width * ($height / $sizes[1]);
+							} elseif ($width != -1) {
+															$height = $sizes[1];
 							}
-							elseif ($width != -1)
-								$height = $sizes[1];
 						}
 					}
 
 					// Did we come up with some changes? If so remake the string.
-					if ($width != -1 || $height != -1)
-						$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					if ($width != -1 || $height != -1) {
+											$replaces[$image] = '[img' . ($width != -1 ? ' width=' . round($width) : '') . ($height != -1 ? ' height=' . round($height) : '') . ']' . $matches[7][$key] . '[/img]';
+					}
+				}
+				if (!empty($replaces)) {
+									$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 				}
-				if (!empty($replaces))
-					$value = str_replace(array_keys($replaces), array_values($replaces), $value);
 			}
 		}
 
@@ -3595,10 +3741,12 @@ 
 	$email = strtr($email, array('&#039;' => '\''));
 
 	// Check the name and email for validity.
-	if (trim($email) == '')
-		return 'no_email';
-	if (!filter_var($email, FILTER_VALIDATE_EMAIL))
-		return 'bad_email';
+	if (trim($email) == '') {
+			return 'no_email';
+	}
+	if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+			return 'bad_email';
+	}
 
 	// Email addresses should be and stay unique.
 	$request = $smcFunc['db_query']('', '
@@ -3613,8 +3761,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		return 'email_taken';
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			return 'email_taken';
+	}
 	$smcFunc['db_free_result']($request);
 
 	return true;
@@ -3627,8 +3776,9 @@ 
 {
 	global $modSettings, $context, $cur_profile;
 
-	if (isset($_POST['passwrd2']) && $_POST['passwrd2'] != '')
-		setLoginCookie(60 * $modSettings['cookieTime'], $context['id_member'], hash_salt($_POST['passwrd1'], $cur_profile['password_salt']));
+	if (isset($_POST['passwrd2']) && $_POST['passwrd2'] != '') {
+			setLoginCookie(60 * $modSettings['cookieTime'], $context['id_member'], hash_salt($_POST['passwrd1'], $cur_profile['password_salt']));
+	}
 
 	loadUserSettings();
 	writeLog();
@@ -3644,8 +3794,9 @@ 
 	require_once($sourcedir . '/Subs-Post.php');
 
 	// Shouldn't happen but just in case.
-	if (empty($profile_vars['email_address']))
-		return;
+	if (empty($profile_vars['email_address'])) {
+			return;
+	}
 
 	$replacements = array(
 		'ACTIVATIONLINK' => $scripturl . '?action=activate;u=' . $context['id_member'] . ';code=' . $profile_vars['validation_code'],
@@ -3668,8 +3819,9 @@ 
 	$_SESSION['log_time'] = 0;
 	$_SESSION['login_' . $cookiename] = json_encode(array(0, '', 0));
 
-	if (isset($_COOKIE[$cookiename]))
-		$_COOKIE[$cookiename] = '';
+	if (isset($_COOKIE[$cookiename])) {
+			$_COOKIE[$cookiename] = '';
+	}
 
 	loadUserSettings();
 
@@ -3702,11 +3854,13 @@ 
 	$groups[] = $curMember['id_group'];
 
 	// Ensure the query doesn't croak!
-	if (empty($groups))
-		$groups = array(0);
+	if (empty($groups)) {
+			$groups = array(0);
+	}
 	// Just to be sure...
-	foreach ($groups as $k => $v)
-		$groups[$k] = (int) $v;
+	foreach ($groups as $k => $v) {
+			$groups[$k] = (int) $v;
+	}
 
 	// Get all the membergroups they can join.
 	$request = $smcFunc['db_query']('', '
@@ -3736,12 +3890,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Can they edit their primary group?
-		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1) || ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $groups)))
-			$context['can_edit_primary'] = true;
+		if (($row['id_group'] == $context['primary_group'] && $row['group_type'] > 1) || ($row['hidden'] != 2 && $context['primary_group'] == 0 && in_array($row['id_group'], $groups))) {
+					$context['can_edit_primary'] = true;
+		}
 
 		// If they can't manage (protected) groups, and it's not publically joinable or already assigned, they can't see it.
-		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group'])
-			continue;
+		if (((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) && $row['id_group'] != $context['primary_group']) {
+					continue;
+		}
 
 		$context['groups'][in_array($row['id_group'], $groups) ? 'member' : 'available'][$row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -3770,13 +3926,15 @@ 
 	);
 
 	// No changing primary one unless you have enough groups!
-	if (count($context['groups']['member']) < 2)
-		$context['can_edit_primary'] = false;
+	if (count($context['groups']['member']) < 2) {
+			$context['can_edit_primary'] = false;
+	}
 
 	// In the special case that someone is requesting membership of a group, setup some special context vars.
-	if (isset($_REQUEST['request']) && isset($context['groups']['available'][(int) $_REQUEST['request']]) && $context['groups']['available'][(int) $_REQUEST['request']]['type'] == 2)
-		$context['group_request'] = $context['groups']['available'][(int) $_REQUEST['request']];
-}
+	if (isset($_REQUEST['request']) && isset($context['groups']['available'][(int) $_REQUEST['request']]) && $context['groups']['available'][(int) $_REQUEST['request']]['type'] == 2) {
+			$context['group_request'] = $context['groups']['available'][(int) $_REQUEST['request']];
+	}
+	}
 
 /**
  * This function actually makes all the group changes
@@ -3791,10 +3949,12 @@ 
 	global $user_info, $context, $user_profile, $modSettings, $smcFunc;
 
 	// Let's be extra cautious...
-	if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership']))
-		isAllowedTo('manage_membergroups');
-	if (!isset($_REQUEST['gid']) && !isset($_POST['primary']))
-		fatal_lang_error('no_access', false);
+	if (!$context['user']['is_owner'] || empty($modSettings['show_group_membership'])) {
+			isAllowedTo('manage_membergroups');
+	}
+	if (!isset($_REQUEST['gid']) && !isset($_POST['primary'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	checkSession(isset($_GET['gid']) ? 'get' : 'post');
 
@@ -3813,8 +3973,9 @@ 
 	$foundTarget = $changeType == 'primary' && $group_id == 0 ? true : false;
 
 	// Sanity check!!
-	if ($group_id == 1)
-		isAllowedTo('admin_forum');
+	if ($group_id == 1) {
+			isAllowedTo('admin_forum');
+	}
 	// Protected groups too!
 	else
 	{
@@ -3831,8 +3992,9 @@ 
 		list ($is_protected) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if ($is_protected == 1)
-			isAllowedTo('admin_forum');
+		if ($is_protected == 1) {
+					isAllowedTo('admin_forum');
+		}
 	}
 
 	// What ever we are doing, we need to determine if changing primary is possible!
@@ -3854,36 +4016,43 @@ 
 			$group_name = $row['group_name'];
 
 			// Does the group type match what we're doing - are we trying to request a non-requestable group?
-			if ($changeType == 'request' && $row['group_type'] != 2)
-				fatal_lang_error('no_access', false);
+			if ($changeType == 'request' && $row['group_type'] != 2) {
+							fatal_lang_error('no_access', false);
+			}
 			// What about leaving a requestable group we are not a member of?
-			elseif ($changeType == 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']]))
-				fatal_lang_error('no_access', false);
-			elseif ($changeType == 'free' && $row['group_type'] != 3 && $row['group_type'] != 2)
-				fatal_lang_error('no_access', false);
+			elseif ($changeType == 'free' && $row['group_type'] == 2 && $old_profile['id_group'] != $row['id_group'] && !isset($addGroups[$row['id_group']])) {
+							fatal_lang_error('no_access', false);
+			} elseif ($changeType == 'free' && $row['group_type'] != 3 && $row['group_type'] != 2) {
+							fatal_lang_error('no_access', false);
+			}
 
 			// We can't change the primary group if this is hidden!
-			if ($row['hidden'] == 2)
-				$canChangePrimary = false;
+			if ($row['hidden'] == 2) {
+							$canChangePrimary = false;
+			}
 		}
 
 		// If this is their old primary, can we change it?
-		if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false)
-			$canChangePrimary = 1;
+		if ($row['id_group'] == $old_profile['id_group'] && ($row['group_type'] > 1 || $context['can_manage_membergroups']) && $canChangePrimary !== false) {
+					$canChangePrimary = 1;
+		}
 
 		// If we are not doing a force primary move, don't do it automatically if current primary is not 0.
-		if ($changeType != 'primary' && $old_profile['id_group'] != 0)
-			$canChangePrimary = false;
+		if ($changeType != 'primary' && $old_profile['id_group'] != 0) {
+					$canChangePrimary = false;
+		}
 
 		// If this is the one we are acting on, can we even act?
-		if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0))
-			$canChangePrimary = false;
+		if ((!$context['can_manage_protected'] && $row['group_type'] == 1) || (!$context['can_manage_membergroups'] && $row['group_type'] == 0)) {
+					$canChangePrimary = false;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Didn't find the target?
-	if (!$foundTarget)
-		fatal_lang_error('no_access', false);
+	if (!$foundTarget) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Final security check, don't allow users to promote themselves to admin.
 	if ($context['can_manage_membergroups'] && !allowedTo('admin_forum'))
@@ -3903,8 +4072,9 @@ 
 		list ($disallow) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if ($disallow)
-			isAllowedTo('admin_forum');
+		if ($disallow) {
+					isAllowedTo('admin_forum');
+		}
 	}
 
 	// If we're requesting, add the note then return.
@@ -3922,8 +4092,9 @@ 
 				'status_open' => 0,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('profile_error_already_requested_group');
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('profile_error_already_requested_group');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Log the request.
@@ -3957,10 +4128,11 @@ 
 		// Are we leaving?
 		if ($old_profile['id_group'] == $group_id || isset($addGroups[$group_id]))
 		{
-			if ($old_profile['id_group'] == $group_id)
-				$newPrimary = 0;
-			else
-				unset($addGroups[$group_id]);
+			if ($old_profile['id_group'] == $group_id) {
+							$newPrimary = 0;
+			} else {
+							unset($addGroups[$group_id]);
+			}
 		}
 		// ... if not, must be joining.
 		else
@@ -3968,36 +4140,42 @@ 
 			// Can we change the primary, and do we want to?
 			if ($canChangePrimary)
 			{
-				if ($old_profile['id_group'] != 0)
-					$addGroups[$old_profile['id_group']] = -1;
+				if ($old_profile['id_group'] != 0) {
+									$addGroups[$old_profile['id_group']] = -1;
+				}
 				$newPrimary = $group_id;
 			}
 			// Otherwise it's an additional group...
-			else
-				$addGroups[$group_id] = -1;
+			else {
+							$addGroups[$group_id] = -1;
+			}
 		}
 	}
 	// Finally, we must be setting the primary.
 	elseif ($canChangePrimary)
 	{
-		if ($old_profile['id_group'] != 0)
-			$addGroups[$old_profile['id_group']] = -1;
-		if (isset($addGroups[$group_id]))
-			unset($addGroups[$group_id]);
+		if ($old_profile['id_group'] != 0) {
+					$addGroups[$old_profile['id_group']] = -1;
+		}
+		if (isset($addGroups[$group_id])) {
+					unset($addGroups[$group_id]);
+		}
 		$newPrimary = $group_id;
 	}
 
 	// Finally, we can make the changes!
-	foreach ($addGroups as $id => $dummy)
-		if (empty($id))
+	foreach ($addGroups as $id => $dummy) {
+			if (empty($id))
 			unset($addGroups[$id]);
+	}
 	$addGroups = implode(',', array_flip($addGroups));
 
 	// Ensure that we don't cache permissions if the group is changing.
-	if ($context['user']['is_owner'])
-		$_SESSION['mc']['time'] = 0;
-	else
-		updateSettings(array('settings_updated' => time()));
+	if ($context['user']['is_owner']) {
+			$_SESSION['mc']['time'] = 0;
+	} else {
+			updateSettings(array('settings_updated' => time()));
+	}
 
 	updateMemberData($memID, array('id_group' => $newPrimary, 'additional_groups' => $addGroups));
 
@@ -4020,8 +4198,9 @@ 
 	if (empty($user_settings['tfa_secret']) && $context['user']['is_owner'])
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on'))
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != 'on')) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		// In some cases (forced 2FA or backup code) they would be forced to be redirected here,
 		// we do not want too much AJAX to confuse them.
@@ -4058,8 +4237,7 @@ 
 				$context['sub_template'] = 'tfasetup_backup';
 
 				return;
-			}
-			else
+			} else
 			{
 				$context['tfa_secret'] = $_SESSION['tfa_secret'];
 				$context['tfa_error'] = !$valid_code;
@@ -4067,8 +4245,7 @@ 
 				$context['tfa_pass_value'] = $_POST['passwd'];
 				$context['tfa_value'] = $_POST['tfa_code'];
 			}
-		}
-		else
+		} else
 		{
 			$totp = new \TOTP\Auth();
 			$secret = $totp->generateCode();
@@ -4078,17 +4255,16 @@ 
 		}
 
 		$context['tfa_qr_url'] = $totp->getQrCodeUrl($context['forum_name'] . ':' . $user_info['name'], $context['tfa_secret']);
-	}
-	elseif (isset($_REQUEST['disable']))
+	} elseif (isset($_REQUEST['disable']))
 	{
 		updateMemberData($memID, array(
 			'tfa_secret' => '',
 			'tfa_backup' => '',
 		));
 		redirectexit('action=profile;area=account;u=' . $memID);
+	} else {
+			redirectexit('action=profile;area=account;u=' . $memID);
+	}
 	}
-	else
-		redirectexit('action=profile;area=account;u=' . $memID);
-}
 
 ?>
\ No newline at end of file

Sources/Subs-Calendar.php

Braces +215 added lines, -157 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Get all birthdays within the given time range.
@@ -60,8 +61,7 @@ 
 				'max_year' => $year_high,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$result = $smcFunc['db_query']('birthday_array', '
 			SELECT id_member, real_name, YEAR(birthdate) AS birth_year, birthdate
@@ -91,10 +91,11 @@ 
 	$bday = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($year_low != $year_high)
-			$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
-		else
-			$age_year = $year_low;
+		if ($year_low != $year_high) {
+					$age_year = substr($row['birthdate'], 5) < substr($high_date, 5) ? $year_high : $year_low;
+		} else {
+					$age_year = $year_low;
+		}
 
 		$bday[$age_year . substr($row['birthdate'], 4)][] = array(
 			'id' => $row['id_member'],
@@ -108,8 +109,9 @@ 
 	ksort($bday);
 
 	// Set is_last, so the themes know when to stop placing separators.
-	foreach ($bday as $mday => $array)
-		$bday[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($bday as $mday => $array) {
+			$bday[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	return $bday;
 }
@@ -157,8 +159,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
 		// If the attached topic is not approved then for the moment pretend it doesn't exist
-		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved'])
-			continue;
+		if (!empty($row['id_first_msg']) && $modSettings['postmod_active'] && !$row['approved']) {
+					continue;
+		}
 
 		// Force a censor of the title - as often these are used by others.
 		censorText($row['title'], $use_permissions ? false : true);
@@ -167,8 +170,9 @@ 
 		list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
 
 		// Sanity check
-		if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-			continue;
+		if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+					continue;
+		}
 
 		// Get set up for the loop
 		$start_object = date_create($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''), timezone_open($tz));
@@ -232,8 +236,8 @@ 
 			);
 
 			// If we're using permissions (calendar pages?) then just ouput normal contextual style information.
-			if ($use_permissions)
-				$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
+			if ($use_permissions) {
+							$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
 					'href' => $row['id_board'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 					'link' => $row['id_board'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 					'can_edit' => allowedTo('calendar_edit_any') || ($row['id_member'] == $user_info['id'] && allowedTo('calendar_edit_own')),
@@ -241,9 +245,10 @@ 
 					'can_export' => !empty($modSettings['cal_export']) ? true : false,
 					'export_href' => $scripturl . '?action=calendar;sa=ical;eventid=' . $row['id_event'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 				));
+			}
 			// Otherwise, this is going to be cached and the VIEWER'S permissions should apply... just put together some info.
-			else
-				$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
+			else {
+							$events[date_format($cal_date, 'Y-m-d')][] = array_merge($eventProperties, array(
 					'href' => $row['id_topic'] == 0 ? '' : $scripturl . '?topic=' . $row['id_topic'] . '.0',
 					'link' => $row['id_topic'] == 0 ? $row['title'] : '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.0">' . $row['title'] . '</a>',
 					'can_edit' => false,
@@ -253,6 +258,7 @@ 
 					'poster' => $row['id_member'],
 					'allowed_groups' => explode(',', $row['member_groups']),
 				));
+			}
 
 			date_add($cal_date, date_interval_create_from_date_string('1 day'));
 		}
@@ -262,8 +268,9 @@ 
 	// If we're doing normal contextual data, go through and make things clear to the templates ;).
 	if ($use_permissions)
 	{
-		foreach ($events as $mday => $array)
-			$events[$mday][count($array) - 1]['is_last'] = true;
+		foreach ($events as $mday => $array) {
+					$events[$mday][count($array) - 1]['is_last'] = true;
+		}
 	}
 
 	ksort($events);
@@ -283,11 +290,12 @@ 
 	global $smcFunc;
 
 	// Get the lowest and highest dates for "all years".
-	if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
+	if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_dec}
 			OR event_date BETWEEN {date:all_year_jan} AND {date:all_year_high}';
-	else
-		$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	} else {
+			$allyear_part = 'event_date BETWEEN {date:all_year_low} AND {date:all_year_high}';
+	}
 
 	// Find some holidays... ;).
 	$result = $smcFunc['db_query']('', '
@@ -307,10 +315,11 @@ 
 	$holidays = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (substr($low_date, 0, 4) != substr($high_date, 0, 4))
-			$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
-		else
-			$event_year = substr($low_date, 0, 4);
+		if (substr($low_date, 0, 4) != substr($high_date, 0, 4)) {
+					$event_year = substr($row['event_date'], 5) < substr($high_date, 5) ? substr($high_date, 0, 4) : substr($low_date, 0, 4);
+		} else {
+					$event_year = substr($low_date, 0, 4);
+		}
 
 		$holidays[$event_year . substr($row['event_date'], 4)][] = $row['title'];
 	}
@@ -336,10 +345,12 @@ 
 	isAllowedTo('calendar_post');
 
 	// No board?  No topic?!?
-	if (empty($board))
-		fatal_lang_error('missing_board_id', false);
-	if (empty($topic))
-		fatal_lang_error('missing_topic_id', false);
+	if (empty($board)) {
+			fatal_lang_error('missing_board_id', false);
+	}
+	if (empty($topic)) {
+			fatal_lang_error('missing_topic_id', false);
+	}
 
 	// Administrator, Moderator, or owner.  Period.
 	if (!allowedTo('admin_forum') && !allowedTo('moderate_board'))
@@ -357,12 +368,14 @@ 
 		if ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// Not the owner of the topic.
-			if ($row['id_member_started'] != $user_info['id'])
-				fatal_lang_error('not_your_topic', 'user');
+			if ($row['id_member_started'] != $user_info['id']) {
+							fatal_lang_error('not_your_topic', 'user');
+			}
 		}
 		// Topic/Board doesn't exist.....
-		else
-			fatal_lang_error('calendar_no_topic', 'general');
+		else {
+					fatal_lang_error('calendar_no_topic', 'general');
+		}
 		$smcFunc['db_free_result']($result);
 	}
 }
@@ -450,14 +463,16 @@ 
 	if (!empty($calendarOptions['start_day']))
 	{
 		$nShift -= $calendarOptions['start_day'];
-		if ($nShift < 0)
-			$nShift = 7 + $nShift;
+		if ($nShift < 0) {
+					$nShift = 7 + $nShift;
+		}
 	}
 
 	// Number of rows required to fit the month.
 	$nRows = floor(($month_info['last_day']['day_of_month'] + $nShift) / 7);
-	if (($month_info['last_day']['day_of_month'] + $nShift) % 7)
-		$nRows++;
+	if (($month_info['last_day']['day_of_month'] + $nShift) % 7) {
+			$nRows++;
+	}
 
 	// Fetch the arrays for birthdays, posted events, and holidays.
 	$bday = $calendarOptions['show_birthdays'] ? getBirthdayRange($month_info['first_day']['date'], $month_info['last_day']['date']) : array();
@@ -470,8 +485,9 @@ 
 	{
 		$calendarGrid['week_days'][] = $count;
 		$count++;
-		if ($count == 7)
-			$count = 0;
+		if ($count == 7) {
+					$count = 0;
+		}
 	}
 
 	// Iterate through each week.
@@ -488,8 +504,9 @@ 
 		{
 			$nDay = ($nRow * 7) + $nCol - $nShift + 1;
 
-			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month'])
-				$nDay = 0;
+			if ($nDay < 1 || $nDay > $month_info['last_day']['day_of_month']) {
+							$nDay = 0;
+			}
 
 			$date = sprintf('%04d-%02d-%02d', $year, $month, $nDay);
 
@@ -507,8 +524,9 @@ 
 	}
 
 	// What is the last day of the month?
-	if ($is_previous === true)
-		$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	if ($is_previous === true) {
+			$calendarGrid['last_of_month'] = $month_info['last_day']['day_of_month'];
+	}
 
 	// We'll use the shift in the template.
 	$calendarGrid['shift'] = $nShift;
@@ -542,8 +560,9 @@ 
 	{
 		// Here we offset accordingly to get things to the real start of a week.
 		$date_diff = $day_of_week - $calendarOptions['start_day'];
-		if ($date_diff < 0)
-			$date_diff += 7;
+		if ($date_diff < 0) {
+					$date_diff += 7;
+		}
 		$new_timestamp = mktime(0, 0, 0, $month, $day, $year) - $date_diff * 86400;
 		$day = (int) strftime('%d', $new_timestamp);
 		$month = (int) strftime('%m', $new_timestamp);
@@ -673,18 +692,20 @@ 
 	{
 		foreach ($date_events as $event_key => $event_val)
 		{
-			if (in_array($event_val['id'], $temp))
-				unset($calendarGrid['events'][$date][$event_key]);
-			else
-				$temp[] = $event_val['id'];
+			if (in_array($event_val['id'], $temp)) {
+							unset($calendarGrid['events'][$date][$event_key]);
+			} else {
+							$temp[] = $event_val['id'];
+			}
 		}
 	}
 
 	// Give birthdays and holidays a friendly format, without the year
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$date_format = '%b %d';
-	else
-		$date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]);
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$date_format = '%b %d';
+	} else {
+			$date_format = str_replace(array('%Y', '%y', '%G', '%g', '%C', '%c', '%D'), array('', '', '', '', '', '%b %d', '%m/%d'), $matches[0]);
+	}
 
 	foreach (array('birthdays', 'holidays') as $type)
 	{
@@ -779,8 +800,9 @@ 
 	// Holidays between now and now + days.
 	for ($i = $now; $i < $now + $days_for_index; $i += 86400)
 	{
-		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)]))
-			$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		if (isset($cached_data['holidays'][strftime('%Y-%m-%d', $i)])) {
+					$return_data['calendar_holidays'] = array_merge($return_data['calendar_holidays'], $cached_data['holidays'][strftime('%Y-%m-%d', $i)]);
+		}
 	}
 
 	// Happy Birthday, guys and gals!
@@ -789,8 +811,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 		if (isset($cached_data['birthdays'][$loop_date]))
 		{
-			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy)
-				$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			foreach ($cached_data['birthdays'][$loop_date] as $index => $dummy) {
+							$cached_data['birthdays'][strftime('%Y-%m-%d', $i)][$index]['is_today'] = $loop_date === $today['date'];
+			}
 			$return_data['calendar_birthdays'] = array_merge($return_data['calendar_birthdays'], $cached_data['birthdays'][$loop_date]);
 		}
 	}
@@ -802,8 +825,9 @@ 
 		$loop_date = strftime('%Y-%m-%d', $i);
 
 		// No events today? Check the next day.
-		if (empty($cached_data['events'][$loop_date]))
-			continue;
+		if (empty($cached_data['events'][$loop_date])) {
+					continue;
+		}
 
 		// Loop through all events to add a few last-minute values.
 		foreach ($cached_data['events'][$loop_date] as $ev => $event)
@@ -816,9 +840,9 @@ 
 			{
 				unset($cached_data['events'][$loop_date][$ev]);
 				continue;
+			} else {
+							$duplicates[$this_event['topic'] . $this_event['title']] = true;
 			}
-			else
-				$duplicates[$this_event['topic'] . $this_event['title']] = true;
 
 			// Might be set to true afterwards, depending on the permissions.
 			$this_event['can_edit'] = false;
@@ -826,15 +850,18 @@ 
 			$this_event['date'] = $loop_date;
 		}
 
-		if (!empty($cached_data['events'][$loop_date]))
-			$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		if (!empty($cached_data['events'][$loop_date])) {
+					$return_data['calendar_events'] = array_merge($return_data['calendar_events'], $cached_data['events'][$loop_date]);
+		}
 	}
 
 	// Mark the last item so that a list separator can be used in the template.
-	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++)
-		$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
-	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++)
-		$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	for ($i = 0, $n = count($return_data['calendar_birthdays']); $i < $n; $i++) {
+			$return_data['calendar_birthdays'][$i]['is_last'] = !isset($return_data['calendar_birthdays'][$i + 1]);
+	}
+	for ($i = 0, $n = count($return_data['calendar_events']); $i < $n; $i++) {
+			$return_data['calendar_events'][$i]['is_last'] = !isset($return_data['calendar_events'][$i + 1]);
+	}
 
 	return array(
 		'data' => $return_data,
@@ -882,37 +909,46 @@ 
 		if (isset($_POST['start_date']))
 		{
 			$d = date_parse($_POST['start_date']);
-			if (!empty($d['error_count']) || !empty($d['warning_count']))
-				fatal_lang_error('invalid_date', false);
-			if (empty($d['year']))
-				fatal_lang_error('event_year_missing', false);
-			if (empty($d['month']))
-				fatal_lang_error('event_month_missing', false);
-		}
-		elseif (isset($_POST['start_datetime']))
+			if (!empty($d['error_count']) || !empty($d['warning_count'])) {
+							fatal_lang_error('invalid_date', false);
+			}
+			if (empty($d['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
+			if (empty($d['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
+		} elseif (isset($_POST['start_datetime']))
 		{
 			$d = date_parse($_POST['start_datetime']);
-			if (!empty($d['error_count']) || !empty($d['warning_count']))
-				fatal_lang_error('invalid_date', false);
-			if (empty($d['year']))
-				fatal_lang_error('event_year_missing', false);
-			if (empty($d['month']))
-				fatal_lang_error('event_month_missing', false);
+			if (!empty($d['error_count']) || !empty($d['warning_count'])) {
+							fatal_lang_error('invalid_date', false);
+			}
+			if (empty($d['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
+			if (empty($d['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
 		}
 		// The 2.0 way
 		else
 		{
 			// No month?  No year?
-			if (!isset($_POST['month']))
-				fatal_lang_error('event_month_missing', false);
-			if (!isset($_POST['year']))
-				fatal_lang_error('event_year_missing', false);
+			if (!isset($_POST['month'])) {
+							fatal_lang_error('event_month_missing', false);
+			}
+			if (!isset($_POST['year'])) {
+							fatal_lang_error('event_year_missing', false);
+			}
 
 			// Check the month and year...
-			if ($_POST['month'] < 1 || $_POST['month'] > 12)
-				fatal_lang_error('invalid_month', false);
-			if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear'])
-				fatal_lang_error('invalid_year', false);
+			if ($_POST['month'] < 1 || $_POST['month'] > 12) {
+							fatal_lang_error('invalid_month', false);
+			}
+			if ($_POST['year'] < $modSettings['cal_minyear'] || $_POST['year'] > $modSettings['cal_maxyear']) {
+							fatal_lang_error('invalid_year', false);
+			}
 		}
 	}
 
@@ -922,8 +958,9 @@ 
 	// If they want to us to calculate an end date, make sure it will fit in an acceptable range.
 	if (isset($_POST['span']))
 	{
-		if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan']))
-			fatal_lang_error('invalid_days_numb', false);
+		if (($_POST['span'] < 1) || (!empty($modSettings['cal_maxspan']) && $_POST['span'] > $modSettings['cal_maxspan'])) {
+					fatal_lang_error('invalid_days_numb', false);
+		}
 	}
 
 	// There is no need to validate the following values if we are just deleting the event.
@@ -933,24 +970,29 @@ 
 		if (empty($_POST['start_date']) && empty($_POST['start_datetime']))
 		{
 			// No day?
-			if (!isset($_POST['day']))
-				fatal_lang_error('event_day_missing', false);
+			if (!isset($_POST['day'])) {
+							fatal_lang_error('event_day_missing', false);
+			}
 
 			// Bad day?
-			if (!checkdate($_POST['month'], $_POST['day'], $_POST['year']))
-				fatal_lang_error('invalid_date', false);
+			if (!checkdate($_POST['month'], $_POST['day'], $_POST['year'])) {
+							fatal_lang_error('invalid_date', false);
+			}
 		}
 
-		if (!isset($_POST['evtitle']) && !isset($_POST['subject']))
-			fatal_lang_error('event_title_missing', false);
-		elseif (!isset($_POST['evtitle']))
-			$_POST['evtitle'] = $_POST['subject'];
+		if (!isset($_POST['evtitle']) && !isset($_POST['subject'])) {
+					fatal_lang_error('event_title_missing', false);
+		} elseif (!isset($_POST['evtitle'])) {
+					$_POST['evtitle'] = $_POST['subject'];
+		}
 
 		// No title?
-		if ($smcFunc['htmltrim']($_POST['evtitle']) === '')
-			fatal_lang_error('no_event_title', false);
-		if ($smcFunc['strlen']($_POST['evtitle']) > 100)
-			$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		if ($smcFunc['htmltrim']($_POST['evtitle']) === '') {
+					fatal_lang_error('no_event_title', false);
+		}
+		if ($smcFunc['strlen']($_POST['evtitle']) > 100) {
+					$_POST['evtitle'] = $smcFunc['substr']($_POST['evtitle'], 0, 100);
+		}
 		$_POST['evtitle'] = str_replace(';', '', $_POST['evtitle']);
 	}
 }
@@ -977,8 +1019,9 @@ 
 	);
 
 	// No results, return false.
-	if ($smcFunc['db_num_rows'] === 0)
-		return false;
+	if ($smcFunc['db_num_rows'] === 0) {
+			return false;
+	}
 
 	// Grab the results and return.
 	list ($poster) = $smcFunc['db_fetch_row']($request);
@@ -1112,8 +1155,9 @@ 
 	call_integration_hook('integrate_modify_event', array($event_id, &$eventOptions, &$event_columns, &$event_parameters));
 
 	$column_clauses = array();
-	foreach ($event_columns as $col => $crit)
-		$column_clauses[] = $col . ' = ' . $crit;
+	foreach ($event_columns as $col => $crit) {
+			$column_clauses[] = $col . ' = ' . $crit;
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}calendar
@@ -1198,8 +1242,9 @@ 
 	);
 
 	// If nothing returned, we are in poo, poo.
-	if ($smcFunc['db_num_rows']($request) === 0)
-		return false;
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			return false;
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1207,8 +1252,9 @@ 
 	list($start, $end, $allday, $span, $tz, $tz_abbrev) = buildEventDatetimes($row);
 
 	// Sanity check
-	if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-		return false;
+	if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+			return false;
+	}
 
 	$return_value = array(
 		'boards' => array(),
@@ -1345,24 +1391,27 @@ 
 
 	// Set $span, in case we need it
 	$span = isset($eventOptions['span']) ? $eventOptions['span'] : (isset($_POST['span']) ? $_POST['span'] : 0);
-	if ($span > 0)
-		$span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1;
+	if ($span > 0) {
+			$span = !empty($modSettings['cal_maxspan']) ? min($modSettings['cal_maxspan'], $span - 1) : $span - 1;
+	}
 
 	// Define the timezone for this event, falling back to the default if not provided
-	if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$tz = $eventOptions['tz'];
-	elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$tz = $_POST['tz'];
-	else
-		$tz = getUserTimezone();
+	if (!empty($eventOptions['tz']) && in_array($eventOptions['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$tz = $eventOptions['tz'];
+	} elseif (!empty($_POST['tz']) && in_array($_POST['tz'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$tz = $_POST['tz'];
+	} else {
+			$tz = getUserTimezone();
+	}
 
 	// Is this supposed to be an all day event, or should it have specific start and end times?
-	if (isset($eventOptions['allday']))
-		$allday = $eventOptions['allday'];
-	elseif (empty($_POST['allday']))
-		$allday = false;
-	else
-		$allday = true;
+	if (isset($eventOptions['allday'])) {
+			$allday = $eventOptions['allday'];
+	} elseif (empty($_POST['allday'])) {
+			$allday = false;
+	} else {
+			$allday = true;
+	}
 
 	// Input might come as individual parameters...
 	$start_year = isset($eventOptions['year']) ? $eventOptions['year'] : (isset($_POST['year']) ? $_POST['year'] : null);
@@ -1389,10 +1438,12 @@ 
 	$end_time_string = isset($eventOptions['end_time']) ? $eventOptions['end_time'] : (isset($_POST['end_time']) ? $_POST['end_time'] : null);
 
 	// If the date and time were given in separate strings, combine them
-	if (empty($start_string) && isset($start_date_string))
-		$start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : '');
-	if (empty($end_string) && isset($end_date_string))
-		$end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : '');
+	if (empty($start_string) && isset($start_date_string)) {
+			$start_string = $start_date_string . (isset($start_time_string) ? ' ' . $start_time_string : '');
+	}
+	if (empty($end_string) && isset($end_date_string)) {
+			$end_string = $end_date_string . (isset($end_time_string) ? ' ' . $end_time_string : '');
+	}
 
 	// If some form of string input was given, override individually defined options with it
 	if (isset($start_string))
@@ -1483,10 +1534,11 @@ 
 	if ($start_object >= $end_object)
 	{
 		$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz);
-		if ($span > 0)
-			date_add($end_object, date_interval_create_from_date_string($span . ' days'));
-		else
-			date_add($end_object, date_interval_create_from_date_string('1 hour'));
+		if ($span > 0) {
+					date_add($end_object, date_interval_create_from_date_string($span . ' days'));
+		} else {
+					date_add($end_object, date_interval_create_from_date_string('1 hour'));
+		}
 	}
 
 	// Is $end_object too late?
@@ -1499,9 +1551,9 @@ 
 			{
 				$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, $start_hour, $start_minute, $start_second) . ' ' . $tz);
 				date_add($end_object, date_interval_create_from_date_string($modSettings['cal_maxspan'] . ' days'));
+			} else {
+							$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz);
 			}
-			else
-				$end_object = date_create(sprintf('%04d-%02d-%02d %02d:%02d:%02d', $start_year, $start_month, $start_day, '11', '59', '59') . ' ' . $tz);
 		}
 	}
 
@@ -1514,8 +1566,7 @@ 
 		$start_time = null;
 		$end_time = null;
 		$tz = null;
-	}
-	else
+	} else
 	{
 		$start_time = date_format($start_object, 'H:i:s');
 		$end_time = date_format($end_object, 'H:i:s');
@@ -1536,16 +1587,18 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	// First, try to create a better date format, ignoring the "time" elements.
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$date_format = '%F';
-	else
-		$date_format = $matches[0];
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$date_format = '%F';
+	} else {
+			$date_format = $matches[0];
+	}
 
 	// We want a fairly compact version of the time, but as close as possible to the user's settings.
-	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$time_format = '%k:%M';
-	else
-		$time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	if (preg_match('~%[HkIlMpPrRSTX](?:[^%]*%[HkIlMpPrRSTX])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$time_format = '%k:%M';
+	} else {
+			$time_format = str_replace(array('%I', '%H', '%S', '%r', '%R', '%T'), array('%l', '%k', '', '%l:%M %p', '%k:%M', '%l:%M'), $matches[0]);
+	}
 
 	// Should this be an all day event?
 	$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
@@ -1554,8 +1607,9 @@ 
 	$span = 1 + date_interval_format(date_diff(date_create($row['start_date']), date_create($row['end_date'])), '%d');
 
 	// We need to have a defined timezone in the steps below
-	if (empty($row['timezone']))
-		$row['timezone'] = getUserTimezone();
+	if (empty($row['timezone'])) {
+			$row['timezone'] = getUserTimezone();
+	}
 
 	// Get most of the standard date information for the start and end datetimes
 	$start = date_parse($row['start_date'] . (!$allday ? ' ' . $row['start_time'] : ''));
@@ -1607,8 +1661,9 @@ 
 	global $smcFunc, $context, $user_info, $modSettings;
 	static $member_cache = array();
 
-	if (is_null($id_member) && $user_info['is_guest'] == false)
-		$id_member = $context['user']['id'];
+	if (is_null($id_member) && $user_info['is_guest'] == false) {
+			$id_member = $context['user']['id'];
+	}
 
 	//check if the cache got the data
 	if (isset($id_member) && isset($member_cache[$id_member]))
@@ -1630,11 +1685,13 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC)))
-		$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+	if (empty($timezone) || !in_array($timezone, timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) {
+			$timezone = isset($modSettings['default_timezone']) ? $modSettings['default_timezone'] : date_default_timezone_get();
+	}
 
-	if (isset($id_member))
-		$member_cache[$id_member] = $timezone;
+	if (isset($id_member)) {
+			$member_cache[$id_member] = $timezone;
+	}
 
 	return $timezone;
 }
@@ -1663,8 +1720,9 @@ 
 		)
 	);
 	$holidays = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$holidays[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$holidays[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $holidays;

Sources/Search.php

Braces +414 added lines, -307 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 // This defines two version types for checking the API's are compatible with this version of SMF.
 $GLOBALS['search_versions'] = array(
@@ -39,8 +40,9 @@ 
 	global $txt, $scripturl, $modSettings, $user_info, $context, $smcFunc, $sourcedir;
 
 	// Is the load average too high to allow searching just now?
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	loadLanguage('Search');
 	// Don't load this in XML mode.
@@ -88,23 +90,30 @@ 
 			@list ($k, $v) = explode('|\'|', $data);
 			$context['search_params'][$k] = $v;
 		}
-		if (isset($context['search_params']['brd']))
-			$context['search_params']['brd'] = $context['search_params']['brd'] == '' ? array() : explode(',', $context['search_params']['brd']);
+		if (isset($context['search_params']['brd'])) {
+					$context['search_params']['brd'] = $context['search_params']['brd'] == '' ? array() : explode(',', $context['search_params']['brd']);
+		}
 	}
 
-	if (isset($_REQUEST['search']))
-		$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	if (isset($_REQUEST['search'])) {
+			$context['search_params']['search'] = un_htmlspecialchars($_REQUEST['search']);
+	}
 
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
-	if (!empty($context['search_params']['searchtype']))
-		$context['search_params']['searchtype'] = 2;
-	if (!empty($context['search_params']['minage']))
-		$context['search_params']['minage'] = (int) $context['search_params']['minage'];
-	if (!empty($context['search_params']['maxage']))
-		$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
+	if (!empty($context['search_params']['searchtype'])) {
+			$context['search_params']['searchtype'] = 2;
+	}
+	if (!empty($context['search_params']['minage'])) {
+			$context['search_params']['minage'] = (int) $context['search_params']['minage'];
+	}
+	if (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
@@ -116,11 +125,13 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error === 'messages')
-				continue;
+			if ($search_error === 'messages') {
+							continue;
+			}
 
-			if ($search_error == 'string_too_long')
-				$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+			if ($search_error == 'string_too_long') {
+							$txt['error_string_too_long'] = sprintf($txt['error_string_too_long'], $context['search_string_limit']);
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -143,12 +154,13 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// This category hasn't been set up yet..
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'id' => $row['id_cat'],
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		// Set this board up, and let the template know when it's a child.  (indent them..)
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
@@ -159,8 +171,9 @@ 
 		);
 
 		// If a board wasn't checked that probably should have been ensure the board selection is selected, yo!
-		if (!$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board']))
-			$context['boards_check_all'] = false;
+		if (!$context['categories'][$row['id_cat']]['boards'][$row['id_board']]['selected'] && (empty($modSettings['recycle_enable']) || $row['id_board'] != $modSettings['recycle_board'])) {
+					$context['boards_check_all'] = false;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -182,18 +195,20 @@ 
 	}
 
 	$max_boards = ceil(count($temp_boards) / 2);
-	if ($max_boards == 1)
-		$max_boards = 2;
+	if ($max_boards == 1) {
+			$max_boards = 2;
+	}
 
 	// Now, alternate them so they can be shown left and right ;).
 	$context['board_columns'] = array();
 	for ($i = 0; $i < $max_boards; $i++)
 	{
 		$context['board_columns'][] = $temp_boards[$i];
-		if (isset($temp_boards[$i + $max_boards]))
-			$context['board_columns'][] = $temp_boards[$i + $max_boards];
-		else
-			$context['board_columns'][] = array();
+		if (isset($temp_boards[$i + $max_boards])) {
+					$context['board_columns'][] = $temp_boards[$i + $max_boards];
+		} else {
+					$context['board_columns'][] = array();
+		}
 	}
 
 	if (!empty($_REQUEST['topic']))
@@ -225,8 +240,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('topic_gone', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('topic_gone', false);
+		}
 
 		list ($context['search_topic']['subject']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
@@ -256,11 +272,13 @@ 
 	global $excludedWords, $participants, $smcFunc;
 
 	// if comming from the quick search box, and we want to search on members, well we need to do that ;)
-	if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members')
-		redirectexit($scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
+	if (isset($_REQUEST['search_selection']) && $_REQUEST['search_selection'] === 'members') {
+			redirectexit($scripturl . '?action=mlist;sa=search;fields=name,email;search=' . urlencode($_REQUEST['search']));
+	}
 
-	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search'])
-		fatal_lang_error('loadavg_search_disabled', false);
+	if (!empty($context['load_average']) && !empty($modSettings['loadavg_search']) && $context['load_average'] >= $modSettings['loadavg_search']) {
+			fatal_lang_error('loadavg_search_disabled', false);
+	}
 
 	// No, no, no... this is a bit hard on the server, so don't you go prefetching it!
 	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
@@ -307,8 +325,9 @@ 
 	}
 
 	// Zero weight.  Weightless :P.
-	if (empty($weight_total))
-		fatal_lang_error('search_invalid_weights');
+	if (empty($weight_total)) {
+			fatal_lang_error('search_invalid_weights');
+	}
 
 	// These vars don't require an interface, they're just here for tweaking.
 	$recentPercentage = 0.30;
@@ -326,11 +345,13 @@ 
 	$context['search_string_limit'] = 100;
 
 	loadLanguage('Search');
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('Search');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('Search');
+	}
 	//If we're doing XML we need to use the results template regardless really.
-	else
-		$context['sub_template'] = 'results';
+	else {
+			$context['sub_template'] = 'results';
+	}
 
 	// Are you allowed?
 	isAllowedTo('search_posts');
@@ -363,34 +384,39 @@ 
 			$search_params[$k] = $v;
 		}
 
-		if (isset($search_params['brd']))
-			$search_params['brd'] = empty($search_params['brd']) ? array() : explode(',', $search_params['brd']);
+		if (isset($search_params['brd'])) {
+					$search_params['brd'] = empty($search_params['brd']) ? array() : explode(',', $search_params['brd']);
+		}
 	}
 
 	// Store whether simple search was used (needed if the user wants to do another query).
-	if (!isset($search_params['advanced']))
-		$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	if (!isset($search_params['advanced'])) {
+			$search_params['advanced'] = empty($_REQUEST['advanced']) ? 0 : 1;
+	}
 
 	// 1 => 'allwords' (default, don't set as param) / 2 => 'anywords'.
-	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2))
-		$search_params['searchtype'] = 2;
+	if (!empty($search_params['searchtype']) || (!empty($_REQUEST['searchtype']) && $_REQUEST['searchtype'] == 2)) {
+			$search_params['searchtype'] = 2;
+	}
 
 	// Minimum age of messages. Default to zero (don't set param in that case).
-	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0))
-		$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	if (!empty($search_params['minage']) || (!empty($_REQUEST['minage']) && $_REQUEST['minage'] > 0)) {
+			$search_params['minage'] = !empty($search_params['minage']) ? (int) $search_params['minage'] : (int) $_REQUEST['minage'];
+	}
 
 	// Maximum age of messages. Default to infinite (9999 days: param not set).
-	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999))
-		$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	if (!empty($search_params['maxage']) || (!empty($_REQUEST['maxage']) && $_REQUEST['maxage'] < 9999)) {
+			$search_params['maxage'] = !empty($search_params['maxage']) ? (int) $search_params['maxage'] : (int) $_REQUEST['maxage'];
+	}
 
 	// Searching a specific topic?
 	if (!empty($_REQUEST['topic']) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'topic'))
 	{
 		$search_params['topic'] = empty($_REQUEST['search_selection']) ? (int) $_REQUEST['topic'] : (isset($_REQUEST['sd_topic']) ? (int) $_REQUEST['sd_topic'] : '');
 		$search_params['show_complete'] = true;
+	} elseif (!empty($search_params['topic'])) {
+			$search_params['topic'] = (int) $search_params['topic'];
 	}
-	elseif (!empty($search_params['topic']))
-		$search_params['topic'] = (int) $search_params['topic'];
 
 	if (!empty($search_params['minage']) || !empty($search_params['maxage']))
 	{
@@ -408,19 +434,21 @@ 
 			)
 		);
 		list ($minMsgID, $maxMsgID) = $smcFunc['db_fetch_row']($request);
-		if ($minMsgID < 0 || $maxMsgID < 0)
-			$context['search_errors']['no_messages_in_time_frame'] = true;
+		if ($minMsgID < 0 || $maxMsgID < 0) {
+					$context['search_errors']['no_messages_in_time_frame'] = true;
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['userspec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// If there's no specific user, then don't mention it in the main query.
-	if (empty($search_params['userspec']))
-		$userQuery = '';
-	else
+	if (empty($search_params['userspec'])) {
+			$userQuery = '';
+	} else
 	{
 		$userString = strtr($smcFunc['htmlspecialchars']($search_params['userspec'], ENT_QUOTES), array('&quot;' => '"'));
 		$userString = strtr($userString, array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -432,19 +460,21 @@ 
 		{
 			$possible_users[$k] = trim($possible_users[$k]);
 
-			if (strlen($possible_users[$k]) == 0)
-				unset($possible_users[$k]);
+			if (strlen($possible_users[$k]) == 0) {
+							unset($possible_users[$k]);
+			}
 		}
 
 		// Create a list of database-escaped search names.
 		$realNameMatches = array();
-		foreach ($possible_users as $possible_user)
-			$realNameMatches[] = $smcFunc['db_quote'](
+		foreach ($possible_users as $possible_user) {
+					$realNameMatches[] = $smcFunc['db_quote'](
 				'{string:possible_user}',
 				array(
 					'possible_user' => $possible_user
 				)
 			);
+		}
 
 		// Retrieve a list of possible members.
 		$request = $smcFunc['db_query']('', '
@@ -456,9 +486,9 @@ 
 			)
 		);
 		// Simply do nothing if there're too many members matching the criteria.
-		if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch)
-			$userQuery = '';
-		elseif ($smcFunc['db_num_rows']($request) == 0)
+		if ($smcFunc['db_num_rows']($request) > $maxMembersToSearch) {
+					$userQuery = '';
+		} elseif ($smcFunc['db_num_rows']($request) == 0)
 		{
 			$userQuery = $smcFunc['db_quote'](
 				'm.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})',
@@ -467,12 +497,12 @@ 
 					'match_possible_guest_names' => 'm.poster_name LIKE ' . implode(' OR m.poster_name LIKE ', $realNameMatches),
 				)
 			);
-		}
-		else
+		} else
 		{
 			$memberlist = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$memberlist[] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$memberlist[] = $row['id_member'];
+			}
 			$userQuery = $smcFunc['db_quote'](
 				'(m.id_member IN ({array_int:matched_members}) OR (m.id_member = {int:id_member_guest} AND ({raw:match_possible_guest_names})))',
 				array(
@@ -486,22 +516,25 @@ 
 	}
 
 	// If the boards were passed by URL (params=), temporarily put them back in $_REQUEST.
-	if (!empty($search_params['brd']) && is_array($search_params['brd']))
-		$_REQUEST['brd'] = $search_params['brd'];
+	if (!empty($search_params['brd']) && is_array($search_params['brd'])) {
+			$_REQUEST['brd'] = $search_params['brd'];
+	}
 
 	// Ensure that brd is an array.
 	if ((!empty($_REQUEST['brd']) && !is_array($_REQUEST['brd'])) || (!empty($_REQUEST['search_selection']) && $_REQUEST['search_selection'] == 'board'))
 	{
-		if (!empty($_REQUEST['brd']))
-			$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
-		else
-			$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		if (!empty($_REQUEST['brd'])) {
+					$_REQUEST['brd'] = strpos($_REQUEST['brd'], ',') !== false ? explode(',', $_REQUEST['brd']) : array($_REQUEST['brd']);
+		} else {
+					$_REQUEST['brd'] = isset($_REQUEST['sd_brd']) ? array($_REQUEST['sd_brd']) : array();
+		}
 	}
 
 	// Make sure all boards are integers.
-	if (!empty($_REQUEST['brd']))
-		foreach ($_REQUEST['brd'] as $id => $brd)
+	if (!empty($_REQUEST['brd'])) {
+			foreach ($_REQUEST['brd'] as $id => $brd)
 			$_REQUEST['brd'][$id] = (int) $brd;
+	}
 
 	// Special case for boards: searching just one topic?
 	if (!empty($search_params['topic']))
@@ -520,17 +553,18 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('topic_gone', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('topic_gone', false);
+		}
 
 		$search_params['brd'] = array();
 		list ($search_params['brd'][0]) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 	}
 	// Select all boards you've selected AND are allowed to see.
-	elseif ($user_info['is_admin'] && (!empty($search_params['advanced']) || !empty($_REQUEST['brd'])))
-		$search_params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
-	else
+	elseif ($user_info['is_admin'] && (!empty($search_params['advanced']) || !empty($_REQUEST['brd']))) {
+			$search_params['brd'] = empty($_REQUEST['brd']) ? array() : $_REQUEST['brd'];
+	} else
 	{
 		$see_board = empty($search_params['advanced']) ? 'query_wanna_see_board' : 'query_see_board';
 		$request = $smcFunc['db_query']('', '
@@ -548,19 +582,22 @@ 
 			)
 		);
 		$search_params['brd'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$search_params['brd'][] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$search_params['brd'][] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// This error should pro'bly only happen for hackers.
-		if (empty($search_params['brd']))
-			$context['search_errors']['no_boards_selected'] = true;
+		if (empty($search_params['brd'])) {
+					$context['search_errors']['no_boards_selected'] = true;
+		}
 	}
 
 	if (count($search_params['brd']) != 0)
 	{
-		foreach ($search_params['brd'] as $k => $v)
-			$search_params['brd'][$k] = (int) $v;
+		foreach ($search_params['brd'] as $k => $v) {
+					$search_params['brd'][$k] = (int) $v;
+		}
 
 		// If we've selected all boards, this parameter can be left empty.
 		$request = $smcFunc['db_query']('', '
@@ -574,15 +611,16 @@ 
 		list ($num_boards) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (count($search_params['brd']) == $num_boards)
+		if (count($search_params['brd']) == $num_boards) {
+					$boardQuery = '';
+		} elseif (count($search_params['brd']) == $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $search_params['brd'])) {
+					$boardQuery = '!= ' . $modSettings['recycle_board'];
+		} else {
+					$boardQuery = 'IN (' . implode(', ', $search_params['brd']) . ')';
+		}
+	} else {
 			$boardQuery = '';
-		elseif (count($search_params['brd']) == $num_boards - 1 && !empty($modSettings['recycle_board']) && !in_array($modSettings['recycle_board'], $search_params['brd']))
-			$boardQuery = '!= ' . $modSettings['recycle_board'];
-		else
-			$boardQuery = 'IN (' . implode(', ', $search_params['brd']) . ')';
 	}
-	else
-		$boardQuery = '';
 
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
@@ -596,11 +634,13 @@ 
 		'id_msg',
 	);
 	call_integration_hook('integrate_search_sort_columns', array(&$sort_columns));
-	if (empty($search_params['sort']) && !empty($_REQUEST['sort']))
-		list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	if (empty($search_params['sort']) && !empty($_REQUEST['sort'])) {
+			list ($search_params['sort'], $search_params['sort_dir']) = array_pad(explode('|', $_REQUEST['sort']), 2, '');
+	}
 	$search_params['sort'] = !empty($search_params['sort']) && in_array($search_params['sort'], $sort_columns) ? $search_params['sort'] : 'relevance';
-	if (!empty($search_params['topic']) && $search_params['sort'] === 'num_replies')
-		$search_params['sort'] = 'id_msg';
+	if (!empty($search_params['topic']) && $search_params['sort'] === 'num_replies') {
+			$search_params['sort'] = 'id_msg';
+	}
 
 	// Sorting direction: descending unless stated otherwise.
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
@@ -624,17 +664,19 @@ 
 	// What are we searching for?
 	if (empty($search_params['search']))
 	{
-		if (isset($_GET['search']))
-			$search_params['search'] = un_htmlspecialchars($_GET['search']);
-		elseif (isset($_POST['search']))
-			$search_params['search'] = $_POST['search'];
-		else
-			$search_params['search'] = '';
+		if (isset($_GET['search'])) {
+					$search_params['search'] = un_htmlspecialchars($_GET['search']);
+		} elseif (isset($_POST['search'])) {
+					$search_params['search'] = $_POST['search'];
+		} else {
+					$search_params['search'] = '';
+		}
 	}
 
 	// Nothing??
-	if (!isset($search_params['search']) || $search_params['search'] == '')
-		$context['search_errors']['invalid_search_string'] = true;
+	if (!isset($search_params['search']) || $search_params['search'] == '') {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 	// Too long?
 	elseif ($smcFunc['strlen']($search_params['search']) > $context['search_string_limit'])
 	{
@@ -648,8 +690,9 @@ 
 	$stripped_query = un_htmlspecialchars($smcFunc['strtolower']($stripped_query));
 
 	// This (hidden) setting will do fulltext searching in the most basic way.
-	if (!empty($modSettings['search_simple_fulltext']))
-		$stripped_query = strtr($stripped_query, array('"' => ''));
+	if (!empty($modSettings['search_simple_fulltext'])) {
+			$stripped_query = strtr($stripped_query, array('"' => ''));
+	}
 
 	$no_regexp = preg_match('~&#(?:\d{1,7}|x[0-9a-fA-F]{1,6});~', $stripped_query) === 1;
 
@@ -672,8 +715,9 @@ 
 	{
 		if ($word === '-')
 		{
-			if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				$excludedWords[] = $word;
+			if (($word = trim($phraseArray[$index], '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
+							$excludedWords[] = $word;
+			}
 			unset($phraseArray[$index]);
 		}
 	}
@@ -683,8 +727,9 @@ 
 	{
 		if (strpos(trim($word), '-') === 0)
 		{
-			if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words))
-				$excludedWords[] = $word;
+			if (($word = trim($word, '-_\' ')) !== '' && !in_array($word, $blacklisted_words)) {
+							$excludedWords[] = $word;
+			}
 			unset($wordArray[$index]);
 		}
 	}
@@ -697,8 +742,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		// Skip anything practically empty.
-		if (($searchArray[$index] = trim($value, '-_\' ')) === '')
-			unset($searchArray[$index]);
+		if (($searchArray[$index] = trim($value, '-_\' ')) === '') {
+					unset($searchArray[$index]);
+		}
 		// Skip blacklisted words. Make sure to note we skipped them in case we end up with nothing.
 		elseif (in_array($searchArray[$index], $blacklisted_words))
 		{
@@ -716,31 +762,37 @@ 
 
 	// Create an array of replacements for highlighting.
 	$context['mark'] = array();
-	foreach ($searchArray as $word)
-		$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	foreach ($searchArray as $word) {
+			$context['mark'][$word] = '<strong class="highlight">' . $word . '</strong>';
+	}
 
 	// Initialize two arrays storing the words that have to be searched for.
 	$orParts = array();
 	$searchWords = array();
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string' . (!empty($foundBlackListedWords) ? '_blacklist' : '')] = true;
+	}
 	// All words/sentences must match.
-	elseif (empty($search_params['searchtype']))
-		$orParts[0] = $searchArray;
+	elseif (empty($search_params['searchtype'])) {
+			$orParts[0] = $searchArray;
+	}
 	// Any word/sentence must match.
-	else
-		foreach ($searchArray as $index => $value)
+	else {
+			foreach ($searchArray as $index => $value)
 			$orParts[$index] = array($value);
+	}
 
 	// Don't allow duplicate error messages if one string is too short.
-	if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string']))
-		unset($context['search_errors']['invalid_search_string']);
+	if (isset($context['search_errors']['search_string_small_words'], $context['search_errors']['invalid_search_string'])) {
+			unset($context['search_errors']['invalid_search_string']);
+	}
 	// Make sure the excluded words are in all or-branches.
-	foreach ($orParts as $orIndex => $andParts)
-		foreach ($excludedWords as $word)
+	foreach ($orParts as $orIndex => $andParts) {
+			foreach ($excludedWords as $word)
 			$orParts[$orIndex][] = $word;
+	}
 
 	// Determine the or-branches and the fulltext search words.
 	foreach ($orParts as $orIndex => $andParts)
@@ -754,8 +806,9 @@ 
 		);
 
 		// Sort the indexed words (large words -> small words -> excluded words).
-		if ($searchAPI->supportsMethod('searchSort'))
-			usort($orParts[$orIndex], 'searchSort');
+		if ($searchAPI->supportsMethod('searchSort')) {
+					usort($orParts[$orIndex], 'searchSort');
+		}
 
 		foreach ($orParts[$orIndex] as $word)
 		{
@@ -767,15 +820,17 @@ 
 			if (!$is_excluded || count($subjectWords) === 1)
 			{
 				$searchWords[$orIndex]['subject_words'] = array_merge($searchWords[$orIndex]['subject_words'], $subjectWords);
-				if ($is_excluded)
-					$excludedSubjectWords = array_merge($excludedSubjectWords, $subjectWords);
+				if ($is_excluded) {
+									$excludedSubjectWords = array_merge($excludedSubjectWords, $subjectWords);
+				}
+			} else {
+							$excludedPhrases[] = $word;
 			}
-			else
-				$excludedPhrases[] = $word;
 
 			// Have we got indexes to prepare?
-			if ($searchAPI->supportsMethod('prepareIndexes'))
-				$searchAPI->prepareIndexes($word, $searchWords[$orIndex], $excludedIndexWords, $is_excluded);
+			if ($searchAPI->supportsMethod('prepareIndexes')) {
+							$searchAPI->prepareIndexes($word, $searchWords[$orIndex], $excludedIndexWords, $is_excluded);
+			}
 		}
 
 		// Search_force_index requires all AND parts to have at least one fulltext word.
@@ -783,8 +838,7 @@ 
 		{
 			$context['search_errors']['query_not_specific_enough'] = true;
 			break;
-		}
-		elseif ($search_params['subject_only'] && empty($searchWords[$orIndex]['subject_words']) && empty($excludedSubjectWords))
+		} elseif ($search_params['subject_only'] && empty($searchWords[$orIndex]['subject_words']) && empty($excludedSubjectWords))
 		{
 			$context['search_errors']['query_not_specific_enough'] = true;
 			break;
@@ -812,8 +866,9 @@ 
 		$found_misspelling = false;
 		foreach ($searchArray as $word)
 		{
-			if (empty($link))
-				continue;
+			if (empty($link)) {
+							continue;
+			}
 
 			// Don't check phrases.
 			if (preg_match('~^\w+$~', $word) === 0)
@@ -828,8 +883,7 @@ 
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
 				continue;
-			}
-			elseif (spell_check($link, $word))
+			} elseif (spell_check($link, $word))
 			{
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
@@ -840,11 +894,13 @@ 
 			foreach ($suggestions as $i => $s)
 			{
 				// Search is case insensitive.
-				if ($smcFunc['strtolower']($s) == $smcFunc['strtolower']($word))
-					unset($suggestions[$i]);
+				if ($smcFunc['strtolower']($s) == $smcFunc['strtolower']($word)) {
+									unset($suggestions[$i]);
+				}
 				// Plus, don't suggest something the user thinks is rude!
-				elseif ($suggestions[$i] != censorText($s))
-					unset($suggestions[$i]);
+				elseif ($suggestions[$i] != censorText($s)) {
+									unset($suggestions[$i]);
+				}
 			}
 
 			// Anything found?  If so, correct it!
@@ -854,8 +910,7 @@ 
 				$did_you_mean['search'][] = $suggestions[0];
 				$did_you_mean['display'][] = '<em><strong>' . $smcFunc['htmlspecialchars']($suggestions[0]) . '</strong></em>';
 				$found_misspelling = true;
-			}
-			else
+			} else
 			{
 				$did_you_mean['search'][] = $word;
 				$did_you_mean['display'][] = $smcFunc['htmlspecialchars']($word);
@@ -872,8 +927,7 @@ 
 				{
 					$temp_excluded['search'][] = '-"' . $word . '"';
 					$temp_excluded['display'][] = '-&quot;' . $smcFunc['htmlspecialchars']($word) . '&quot;';
-				}
-				else
+				} else
 				{
 					$temp_excluded['search'][] = '-' . $word;
 					$temp_excluded['display'][] = '-' . $smcFunc['htmlspecialchars']($word);
@@ -885,11 +939,13 @@ 
 
 			$temp_params = $search_params;
 			$temp_params['search'] = implode(' ', $did_you_mean['search']);
-			if (isset($temp_params['brd']))
-				$temp_params['brd'] = implode(',', $temp_params['brd']);
+			if (isset($temp_params['brd'])) {
+							$temp_params['brd'] = implode(',', $temp_params['brd']);
+			}
 			$context['params'] = array();
-			foreach ($temp_params as $k => $v)
-				$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+			foreach ($temp_params as $k => $v) {
+							$context['did_you_mean_params'][] = $k . '|\'|' . $v;
+			}
 			$context['did_you_mean_params'] = base64_encode(implode('|"|', $context['did_you_mean_params']));
 			$context['did_you_mean'] = implode(' ', $did_you_mean['display']);
 		}
@@ -897,18 +953,20 @@ 
 
 	// Let the user adjust the search query, should they wish?
 	$context['search_params'] = $search_params;
-	if (isset($context['search_params']['search']))
-		$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
-	if (isset($context['search_params']['userspec']))
-		$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	if (isset($context['search_params']['search'])) {
+			$context['search_params']['search'] = $smcFunc['htmlspecialchars']($context['search_params']['search']);
+	}
+	if (isset($context['search_params']['userspec'])) {
+			$context['search_params']['userspec'] = $smcFunc['htmlspecialchars']($context['search_params']['userspec']);
+	}
 
 	// Do we have captcha enabled?
 	if ($user_info['is_guest'] && !empty($modSettings['search_enable_captcha']) && empty($_SESSION['ss_vv_passed']) && (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search']))
 	{
 		// If we come from another search box tone down the error...
-		if (!isset($_REQUEST['search_vv']))
-			$context['search_errors']['need_verification_code'] = true;
-		else
+		if (!isset($_REQUEST['search_vv'])) {
+					$context['search_errors']['need_verification_code'] = true;
+		} else
 		{
 			require_once($sourcedir . '/Subs-Editor.php');
 			$verificationOptions = array(
@@ -918,12 +976,14 @@ 
 
 			if (is_array($context['require_verification']))
 			{
-				foreach ($context['require_verification'] as $error)
-					$context['search_errors'][$error] = true;
+				foreach ($context['require_verification'] as $error) {
+									$context['search_errors'][$error] = true;
+				}
 			}
 			// Don't keep asking for it - they've proven themselves worthy.
-			else
-				$_SESSION['ss_vv_passed'] = true;
+			else {
+							$_SESSION['ss_vv_passed'] = true;
+			}
 		}
 	}
 
@@ -931,19 +991,22 @@ 
 
 	// All search params have been checked, let's compile them to a single string... made less simple by PHP 4.3.9 and below.
 	$temp_params = $search_params;
-	if (isset($temp_params['brd']))
-		$temp_params['brd'] = implode(',', $temp_params['brd']);
+	if (isset($temp_params['brd'])) {
+			$temp_params['brd'] = implode(',', $temp_params['brd']);
+	}
 	$context['params'] = array();
-	foreach ($temp_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($temp_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 
 	if (!empty($context['params']))
 	{
 		// Due to old IE's 2083 character limit, we have to compress long search strings
 		$params = @gzcompress(implode('|"|', $context['params']));
 		// Gzcompress failed, use try non-gz
-		if (empty($params))
-			$params = implode('|"|', $context['params']);
+		if (empty($params)) {
+					$params = implode('|"|', $context['params']);
+		}
 		// Base64 encode, then replace +/= with uri safe ones that can be reverted
 		$context['params'] = str_replace(array('+', '/', '='), array('-', '_', '.'), base64_encode($params));
 	}
@@ -969,8 +1032,9 @@ 
 	}
 
 	// Spam me not, Spam-a-lot?
-	if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search'])
-		spamProtection('search');
+	if (empty($_SESSION['last_ss']) || $_SESSION['last_ss'] != $search_params['search']) {
+			spamProtection('search');
+	}
 	// Store the last search string to allow pages of results to be browsed.
 	$_SESSION['last_ss'] = $search_params['search'];
 
@@ -1030,8 +1094,9 @@ 
 						'where' => array(),
 					);
 
-					if ($modSettings['postmod_active'])
-						$subject_query['where'][] = 't.approved = {int:is_approved}';
+					if ($modSettings['postmod_active']) {
+											$subject_query['where'][] = 't.approved = {int:is_approved}';
+					}
 
 					$numTables = 0;
 					$prev_join = 0;
@@ -1043,8 +1108,7 @@ 
 						{
 							$subject_query['left_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}') . ' AND subj' . $numTables . '.id_topic = t.id_topic)';
 							$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
-						}
-						else
+						} else
 						{
 							$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 							$subject_query['where'][] = 'subj' . $numTables . '.word ' . (empty($modSettings['search_match_words']) ? 'LIKE {string:subject_words_' . $numTables . '_wild}' : '= {string:subject_words_' . $numTables . '}');
@@ -1062,14 +1126,18 @@ 
 						}
 						$subject_query['where'][] = $userQuery;
 					}
-					if (!empty($search_params['topic']))
-						$subject_query['where'][] = 't.id_topic = ' . $search_params['topic'];
-					if (!empty($minMsgID))
-						$subject_query['where'][] = 't.id_first_msg >= ' . $minMsgID;
-					if (!empty($maxMsgID))
-						$subject_query['where'][] = 't.id_last_msg <= ' . $maxMsgID;
-					if (!empty($boardQuery))
-						$subject_query['where'][] = 't.id_board ' . $boardQuery;
+					if (!empty($search_params['topic'])) {
+											$subject_query['where'][] = 't.id_topic = ' . $search_params['topic'];
+					}
+					if (!empty($minMsgID)) {
+											$subject_query['where'][] = 't.id_first_msg >= ' . $minMsgID;
+					}
+					if (!empty($maxMsgID)) {
+											$subject_query['where'][] = 't.id_last_msg <= ' . $maxMsgID;
+					}
+					if (!empty($boardQuery)) {
+											$subject_query['where'][] = 't.id_board ' . $boardQuery;
+					}
 					if (!empty($excludedPhrases))
 					{
 						if ($subject_query['from'] != '{db_prefix}messages AS m')
@@ -1089,8 +1157,9 @@ 
 					foreach ($weight_factors as $type => $value)
 					{
 						$relevance .= $weight[$type];
-						if (!empty($value['results']))
-							$relevance .= ' * ' . $value['results'];
+						if (!empty($value['results'])) {
+													$relevance .= ' * ' . $value['results'];
+						}
 						$relevance .= ' + ';
 					}
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
@@ -1128,20 +1197,23 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($inserts[$row[1]]))
-								continue;
+							if (isset($inserts[$row[1]])) {
+															continue;
+							}
 
-							foreach ($row as $key => $value)
-								$inserts[$row[1]][] = (int) $row[$key];
+							foreach ($row as $key => $value) {
+															$inserts[$row[1]][] = (int) $row[$key];
+							}
 						}
 						$smcFunc['db_free_result']($ignoreRequest);
 						$numSubjectResults = count($inserts);
+					} else {
+											$numSubjectResults += $smcFunc['db_affected_rows']();
 					}
-					else
-						$numSubjectResults += $smcFunc['db_affected_rows']();
 
-					if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results'])
-						break;
+					if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results']) {
+											break;
+					}
 				}
 
 				// If there's data to be inserted for non-IGNORE databases do it here!
@@ -1156,8 +1228,7 @@ 
 				}
 
 				$_SESSION['search_cache']['num_results'] = $numSubjectResults;
-			}
-			else
+			} else
 			{
 				$main_query = array(
 					'select' => array(
@@ -1189,8 +1260,7 @@ 
 					$main_query['weights'] = $weight_factors;
 
 					$main_query['group_by'][] = 't.id_topic';
-				}
-				else
+				} else
 				{
 					// This is outrageous!
 					$main_query['select']['id_topic'] = 'm.id_msg AS id_topic';
@@ -1211,8 +1281,9 @@ 
 						$main_query['where'][] = 't.id_topic = {int:topic}';
 						$main_query['parameters']['topic'] = $search_params['topic'];
 					}
-					if (!empty($search_params['show_complete']))
-						$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+					if (!empty($search_params['show_complete'])) {
+											$main_query['group_by'][] = 'm.id_msg, t.id_first_msg, t.id_last_msg';
+					}
 				}
 
 				// *** Get the subject results.
@@ -1239,14 +1310,15 @@ 
 					) !== false;
 
 					// Clean up some previous cache.
-					if (!$createTemporary)
-						$smcFunc['db_search_query']('delete_log_search_topics', '
+					if (!$createTemporary) {
+											$smcFunc['db_search_query']('delete_log_search_topics', '
 							DELETE FROM {db_prefix}log_search_topics
 							WHERE id_search = {int:search_id}',
 							array(
 								'search_id' => $_SESSION['search_cache']['id_search'],
 							)
 						);
+					}
 
 					foreach ($searchWords as $orIndex => $words)
 					{
@@ -1278,8 +1350,7 @@ 
 								$subject_query['where'][] = '(subj' . $numTables . '.word IS NULL)';
 								$subject_query['where'][] = 'm.body NOT ' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:body_not_' . $count . '}';
 								$subject_query['params']['body_not_' . $count++] = empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($subjectWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $subjectWord), '\\\'') . '[[:>:]]';
-							}
-							else
+							} else
 							{
 								$subject_query['inner_join'][] = '{db_prefix}log_search_subjects AS subj' . $numTables . ' ON (subj' . $numTables . '.id_topic = ' . ($prev_join === 0 ? 't' : 'subj' . $prev_join) . '.id_topic)';
 								$subject_query['where'][] = 'subj' . $numTables . '.word LIKE {string:subject_like_' . $count . '}';
@@ -1334,8 +1405,9 @@ 
 						call_integration_hook('integrate_subject_search_query', array(&$subject_query));
 
 						// Nothing to search for?
-						if (empty($subject_query['where']))
-							continue;
+						if (empty($subject_query['where'])) {
+													continue;
+						}
 
 						$ignoreRequest = $smcFunc['db_search_query']('insert_log_search_topics', ($smcFunc['db_support_ignore'] ? ( '
 							INSERT IGNORE INTO {db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics
@@ -1358,19 +1430,21 @@ 
 							{
 								$ind = $createTemporary ? 0 : 1;
 								// No duplicates!
-								if (isset($inserts[$row[$ind]]))
-									continue;
+								if (isset($inserts[$row[$ind]])) {
+																	continue;
+								}
 
 								$inserts[$row[$ind]] = $row;
 							}
 							$smcFunc['db_free_result']($ignoreRequest);
 							$numSubjectResults = count($inserts);
+						} else {
+													$numSubjectResults += $smcFunc['db_affected_rows']();
 						}
-						else
-							$numSubjectResults += $smcFunc['db_affected_rows']();
 
-						if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results'])
-							break;
+						if (!empty($modSettings['search_max_results']) && $numSubjectResults >= $modSettings['search_max_results']) {
+													break;
+						}
 					}
 
 					// Got some non-MySQL data to plonk in?
@@ -1388,8 +1462,9 @@ 
 					{
 						$main_query['weights']['subject']['search'] = 'CASE WHEN MAX(lst.id_topic) IS NULL THEN 0 ELSE 1 END';
 						$main_query['left_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_topics AS lst ON (' . ($createTemporary ? '' : 'lst.id_search = {int:id_search} AND ') . 'lst.id_topic = t.id_topic)';
-						if (!$createTemporary)
-							$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+						if (!$createTemporary) {
+													$main_query['parameters']['id_search'] = $_SESSION['search_cache']['id_search'];
+						}
 					}
 				}
 
@@ -1417,14 +1492,15 @@ 
 					) !== false;
 
 					// Clear, all clear!
-					if (!$createTemporary)
-						$smcFunc['db_search_query']('delete_log_search_messages', '
+					if (!$createTemporary) {
+											$smcFunc['db_search_query']('delete_log_search_messages', '
 							DELETE FROM {db_prefix}log_search_messages
 							WHERE id_search = {int:id_search}',
 							array(
 								'id_search' => $_SESSION['search_cache']['id_search'],
 							)
 						);
+					}
 
 					foreach ($searchWords as $orIndex => $words)
 					{
@@ -1458,19 +1534,21 @@ 
 								while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 								{
 									// No duplicates!
-									if (isset($inserts[$row[0]]))
-										continue;
+									if (isset($inserts[$row[0]])) {
+																			continue;
+									}
 
 									$inserts[$row[0]] = $row;
 								}
 								$smcFunc['db_free_result']($ignoreRequest);
 								$indexedResults = count($inserts);
+							} else {
+															$indexedResults += $smcFunc['db_affected_rows']();
 							}
-							else
-								$indexedResults += $smcFunc['db_affected_rows']();
 
-							if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults)
-								break;
+							if (!empty($maxMessageResults) && $indexedResults >= $maxMessageResults) {
+															break;
+							}
 						}
 					}
 
@@ -1490,8 +1568,7 @@ 
 						$context['search_errors']['query_not_specific_enough'] = true;
 						$_REQUEST['params'] = $context['params'];
 						return PlushSearch1();
-					}
-					elseif (!empty($indexedResults))
+					} elseif (!empty($indexedResults))
 					{
 						$main_query['inner_join'][] = '{db_prefix}' . ($createTemporary ? 'tmp_' : '') . 'log_search_messages AS lsm ON (lsm.id_msg = m.id_msg)';
 						if (!$createTemporary)
@@ -1513,15 +1590,18 @@ 
 						foreach ($words['all_words'] as $regularWord)
 						{
 							$where[] = 'm.body' . (in_array($regularWord, $excludedWords) ? ' NOT' : '') . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
-							if (in_array($regularWord, $excludedWords))
-								$where[] = 'm.subject NOT' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
+							if (in_array($regularWord, $excludedWords)) {
+															$where[] = 'm.subject NOT' . (empty($modSettings['search_match_words']) || $no_regexp ? ' LIKE ' : ' RLIKE ') . '{string:all_word_body_' . $count . '}';
+							}
 							$main_query['parameters']['all_word_body_' . $count++] = empty($modSettings['search_match_words']) || $no_regexp ? '%' . strtr($regularWord, array('_' => '\\_', '%' => '\\%')) . '%' : '[[:<:]]' . addcslashes(preg_replace(array('/([\[\]$.+*?|{}()])/'), array('[$1]'), $regularWord), '\\\'') . '[[:>:]]';
 						}
-						if (!empty($where))
-							$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
+						if (!empty($where)) {
+													$orWhere[] = count($where) > 1 ? '(' . implode(' AND ', $where) . ')' : $where[0];
+						}
+					}
+					if (!empty($orWhere)) {
+											$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 					}
-					if (!empty($orWhere))
-						$main_query['where'][] = count($orWhere) > 1 ? '(' . implode(' OR ', $orWhere) . ')' : $orWhere[0];
 
 					if (!empty($userQuery))
 					{
@@ -1559,8 +1639,9 @@ 
 					foreach ($main_query['weights'] as $type => $value)
 					{
 						$relevance .= $weight[$type];
-						if (!empty($value['search']))
-							$relevance .= ' * ' . $value['search'];
+						if (!empty($value['search'])) {
+													$relevance .= ' * ' . $value['search'];
+						}
 						$relevance .= ' + ';
 						$new_weight_total += $weight[$type];
 					}
@@ -1591,11 +1672,13 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($inserts[$row[2]]))
-								continue;
+							if (isset($inserts[$row[2]])) {
+															continue;
+							}
 
-							foreach ($row as $key => $value)
-								$inserts[$row[2]][] = (int) $row[$key];
+							foreach ($row as $key => $value) {
+															$inserts[$row[2]][] = (int) $row[$key];
+							}
 						}
 						$smcFunc['db_free_result']($ignoreRequest);
 
@@ -1603,8 +1686,9 @@ 
 						if (!empty($inserts))
 						{
 							$query_columns = array();
-							foreach ($main_query['select'] as $k => $v)
-								$query_columns[$k] = 'int';
+							foreach ($main_query['select'] as $k => $v) {
+															$query_columns[$k] = 'int';
+							}
 
 							$smcFunc['db_insert']('',
 								'{db_prefix}log_search_results',
@@ -1614,21 +1698,23 @@ 
 							);
 						}
 						$_SESSION['search_cache']['num_results'] += count($inserts);
+					} else {
+											$_SESSION['search_cache']['num_results'] = $smcFunc['db_affected_rows']();
 					}
-					else
-						$_SESSION['search_cache']['num_results'] = $smcFunc['db_affected_rows']();
 				}
 
 				// Insert subject-only matches.
 				if ($_SESSION['search_cache']['num_results'] < $modSettings['search_max_results'] && $numSubjectResults !== 0)
 				{
 					$relevance = '1000 * (';
-					foreach ($weight_factors as $type => $value)
-						if (isset($value['results']))
+					foreach ($weight_factors as $type => $value) {
+											if (isset($value['results']))
 						{
 							$relevance .= $weight[$type];
-							if (!empty($value['results']))
-								$relevance .= ' * ' . $value['results'];
+					}
+							if (!empty($value['results'])) {
+															$relevance .= ' * ' . $value['results'];
+							}
 							$relevance .= ' + ';
 						}
 					$relevance = substr($relevance, 0, -3) . ') / ' . $weight_total . ' AS relevance';
@@ -1662,8 +1748,9 @@ 
 						while ($row = $smcFunc['db_fetch_row']($ignoreRequest))
 						{
 							// No duplicates!
-							if (isset($usedIDs[$row[1]]))
-								continue;
+							if (isset($usedIDs[$row[1]])) {
+															continue;
+							}
 
 							$usedIDs[$row[1]] = true;
 							$inserts[] = $row;
@@ -1681,12 +1768,12 @@ 
 							);
 						}
 						$_SESSION['search_cache']['num_results'] += count($inserts);
+					} else {
+											$_SESSION['search_cache']['num_results'] += $smcFunc['db_affected_rows']();
 					}
-					else
-						$_SESSION['search_cache']['num_results'] += $smcFunc['db_affected_rows']();
+				} elseif ($_SESSION['search_cache']['num_results'] == -1) {
+									$_SESSION['search_cache']['num_results'] = 0;
 				}
-				elseif ($_SESSION['search_cache']['num_results'] == -1)
-					$_SESSION['search_cache']['num_results'] = 0;
 			}
 		}
 
@@ -1756,14 +1843,16 @@ 
 			)
 		);
 		$posters = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$posters[] = $row['id_member'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$posters[] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		call_integration_hook('integrate_search_message_list', array(&$msg_list, &$posters));
 
-		if (!empty($posters))
-			loadMemberData(array_unique($posters));
+		if (!empty($posters)) {
+					loadMemberData(array_unique($posters));
+		}
 
 		// Get the messages out for the callback - select enough that it can be made to look just like Display.
 		$messages_request = $smcFunc['db_query']('', '
@@ -1797,8 +1886,9 @@ 
 		);
 
 		// If there are no results that means the things in the cache got deleted, so pretend we have no topics anymore.
-		if ($smcFunc['db_num_rows']($messages_request) == 0)
-			$context['topics'] = array();
+		if ($smcFunc['db_num_rows']($messages_request) == 0) {
+					$context['topics'] = array();
+		}
 
 		// If we want to know who participated in what then load this now.
 		if (!empty($modSettings['enableParticipation']) && !$user_info['is_guest'])
@@ -1816,8 +1906,9 @@ 
 					'limit' => count($participants),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($result))
-				$participants[$row['id_topic']] = true;
+			while ($row = $smcFunc['db_fetch_assoc']($result)) {
+							$participants[$row['id_topic']] = true;
+			}
 			$smcFunc['db_free_result']($result);
 		}
 	}
@@ -1826,15 +1917,17 @@ 
 	$context['page_index'] = constructPageIndex($scripturl . '?action=search2;params=' . $context['params'], $_REQUEST['start'], $num_results, $modSettings['search_results_per_page'], false);
 
 	// Consider the search complete!
-	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('search_start:' . ($user_info['is_guest'] ? $user_info['ip'] : $user_info['id']), null, 90);
+	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('search_start:' . ($user_info['is_guest'] ? $user_info['ip'] : $user_info['id']), null, 90);
+	}
 
 	$context['key_words'] = &$searchArray;
 
 	// Setup the default topic icons... for checking they exist and the like!
 	$context['icon_sources'] = array();
-	foreach ($context['stable_icons'] as $icon)
-		$context['icon_sources'][$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$context['icon_sources'][$icon] = 'images_url';
+	}
 
 	$context['sub_template'] = 'results';
 	$context['page_title'] = $txt['search_results'];
@@ -1865,26 +1958,31 @@ 
 	global $boards_can, $participants, $smcFunc;
 	static $recycle_board = null;
 
-	if ($recycle_board === null)
-		$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
+	if ($recycle_board === null) {
+			$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
+	}
 
 	// Remember which message this is.  (ie. reply #83)
 	static $counter = null;
-	if ($counter == null || $reset)
-		$counter = $_REQUEST['start'] + 1;
+	if ($counter == null || $reset) {
+			$counter = $_REQUEST['start'] + 1;
+	}
 
 	// If the query returned false, bail.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Start from the beginning...
-	if ($reset)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Attempt to get the next message.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
-	if (!$message)
-		return false;
+	if (!$message) {
+			return false;
+	}
 
 	// Can't have an empty subject can we?
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1923,9 +2021,9 @@ 
 
 		if ($smcFunc['strlen']($message['body']) > $charLimit)
 		{
-			if (empty($context['key_words']))
-				$message['body'] = $smcFunc['substr']($message['body'], 0, $charLimit) . '<strong>...</strong>';
-			else
+			if (empty($context['key_words'])) {
+							$message['body'] = $smcFunc['substr']($message['body'], 0, $charLimit) . '<strong>...</strong>';
+			} else
 			{
 				$matchString = '';
 				$force_partial_word = false;
@@ -1934,18 +2032,20 @@ 
 					$keyword = un_htmlspecialchars($keyword);
 					$keyword = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', strtr($keyword, array('\\\'' => '\'', '&' => '&amp;')));
 
-					if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0)
-						$force_partial_word = true;
+					if (preg_match('~[\'\.,/@%&;:(){}\[\]_\-+\\\\]$~', $keyword) != 0 || preg_match('~^[\'\.,/@%&;:(){}\[\]_\-+\\\\]~', $keyword) != 0) {
+											$force_partial_word = true;
+					}
 					$matchString .= strtr(preg_quote($keyword, '/'), array('\*' => '.+?')) . '|';
 				}
 				$matchString = un_htmlspecialchars(substr($matchString, 0, -1));
 
 				$message['body'] = un_htmlspecialchars(strtr($message['body'], array('&nbsp;' => ' ', '<br>' => "\n", '&#91;' => '[', '&#93;' => ']', '&#58;' => ':', '&#64;' => '@')));
 
-				if (empty($modSettings['search_method']) || $force_partial_word)
-					preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
-				else
-					preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				if (empty($modSettings['search_method']) || $force_partial_word) {
+									preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?|^)(' . $matchString . ')(.{0,' . $charLimit . '}[\s\W]|[^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				} else {
+									preg_match_all('/([^\s\W]{' . $charLimit . '}[\s\W]|[\s\W].{0,' . $charLimit . '}?[\s\W]|^)(' . $matchString . ')([\s\W].{0,' . $charLimit . '}[\s\W]|[\s\W][^\s\W]{0,' . $charLimit . '})/is' . ($context['utf8'] ? 'u' : ''), $message['body'], $matches);
+				}
 
 				$message['body'] = '';
 				foreach ($matches[0] as $index => $match)
@@ -1958,8 +2058,7 @@ 
 			// Re-fix the international characters.
 			$message['body'] = preg_replace_callback('~(&amp;#(\d{1,7}|x[0-9a-fA-F]{1,6});)~', 'entity_fix__callback', $message['body']);
 		}
-	}
-	else
+	} else
 	{
 		// Run BBC interpreter on the message.
 		$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
@@ -1978,21 +2077,26 @@ 
 	// Sadly, we need to check the icon ain't broke.
 	if (!empty($modSettings['messageIconChecks_enable']))
 	{
-		if (!isset($context['icon_sources'][$message['first_icon']]))
-			$context['icon_sources'][$message['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		if (!isset($context['icon_sources'][$message['last_icon']]))
-			$context['icon_sources'][$message['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
-	}
-	else
+		if (!isset($context['icon_sources'][$message['first_icon']])) {
+					$context['icon_sources'][$message['first_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['first_icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+		if (!isset($context['icon_sources'][$message['last_icon']])) {
+					$context['icon_sources'][$message['last_icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['last_icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+	} else
 	{
-		if (!isset($context['icon_sources'][$message['first_icon']]))
-			$context['icon_sources'][$message['first_icon']] = 'images_url';
-		if (!isset($context['icon_sources'][$message['last_icon']]))
-			$context['icon_sources'][$message['last_icon']] = 'images_url';
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = 'images_url';
+		if (!isset($context['icon_sources'][$message['first_icon']])) {
+					$context['icon_sources'][$message['first_icon']] = 'images_url';
+		}
+		if (!isset($context['icon_sources'][$message['last_icon']])) {
+					$context['icon_sources'][$message['last_icon']] = 'images_url';
+		}
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = 'images_url';
+		}
 	}
 
 	// Do we have quote tag enabled?
@@ -2002,12 +2106,14 @@ 
 	$colorClass = 'windowbg';
 
 	// Sticky topics should get a different color, too.
-	if ($message['is_sticky'])
-		$colorClass .= ' sticky';
+	if ($message['is_sticky']) {
+			$colorClass .= ' sticky';
+	}
 
 	// Locked topics get special treatment as well.
-	if ($message['locked'])
-		$colorClass .= ' locked';
+	if ($message['locked']) {
+			$colorClass .= ' locked';
+	}
 
 	$output = array_merge($context['topics'][$message['id_msg']], array(
 		'id' => $message['id_topic'],
@@ -2151,8 +2257,9 @@ 
 
 	// Load up the search API we are going to use.
 	$modSettings['search_index'] = empty($modSettings['search_index']) ? 'standard' : $modSettings['search_index'];
-	if (!file_exists($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php'))
-		fatal_lang_error('search_api_missing');
+	if (!file_exists($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php')) {
+			fatal_lang_error('search_api_missing');
+	}
 	require_once($sourcedir . '/SearchAPI-' . ucwords($modSettings['search_index']) . '.php');
 
 	// Create an instance of the search API and check it is valid for this version of SMF.

Sources/Stats.php

Braces +112 added lines, -78 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Display some useful/interesting board statistics.
@@ -30,8 +31,9 @@ 
 
 	isAllowedTo('view_stats');
 	// Page disabled - redirect them out
-	if (empty($modSettings['trackStats']))
-		fatal_lang_error('feature_disabled', true);
+	if (empty($modSettings['trackStats'])) {
+			fatal_lang_error('feature_disabled', true);
+	}
 
 	if (!empty($_REQUEST['expand']))
 	{
@@ -39,31 +41,34 @@ 
 
 		$month = (int) substr($_REQUEST['expand'], 4);
 		$year = (int) substr($_REQUEST['expand'], 0, 4);
-		if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12)
-			$_SESSION['expanded_stats'][$year][] = $month;
-	}
-	elseif (!empty($_REQUEST['collapse']))
+		if ($year > 1900 && $year < 2200 && $month >= 1 && $month <= 12) {
+					$_SESSION['expanded_stats'][$year][] = $month;
+		}
+	} elseif (!empty($_REQUEST['collapse']))
 	{
 		$context['robot_no_index'] = true;
 
 		$month = (int) substr($_REQUEST['collapse'], 4);
 		$year = (int) substr($_REQUEST['collapse'], 0, 4);
-		if (!empty($_SESSION['expanded_stats'][$year]))
-			$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+		if (!empty($_SESSION['expanded_stats'][$year])) {
+					$_SESSION['expanded_stats'][$year] = array_diff($_SESSION['expanded_stats'][$year], array($month));
+		}
 	}
 
 	// Handle the XMLHttpRequest.
 	if (isset($_REQUEST['xml']))
 	{
 		// Collapsing stats only needs adjustments of the session variables.
-		if (!empty($_REQUEST['collapse']))
-			obExit(false);
+		if (!empty($_REQUEST['collapse'])) {
+					obExit(false);
+		}
 
 		$context['sub_template'] = 'stats';
 		$context['yearly'] = array();
 
-		if (empty($month) || empty($year))
-			return;
+		if (empty($month) || empty($year)) {
+					return;
+		}
 
 		getDailyStats('YEAR(date) = {int:year} AND MONTH(date) = {int:month}', array('year' => $year, 'month' => $month));
 		$context['yearly'][$year]['months'][$month]['date'] = array(
@@ -220,8 +225,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_num_posts < $row_members['posts'])
-			$max_num_posts = $row_members['posts'];
+		if ($max_num_posts < $row_members['posts']) {
+					$max_num_posts = $row_members['posts'];
+		}
 	}
 	$smcFunc['db_free_result']($members_result);
 
@@ -257,8 +263,9 @@ 
 			'link' => '<a href="' . $scripturl . '?board=' . $row_board['id_board'] . '.0">' . $row_board['name'] . '</a>'
 		);
 
-		if ($max_num_posts < $row_board['num_posts'])
-			$max_num_posts = $row_board['num_posts'];
+		if ($max_num_posts < $row_board['num_posts']) {
+					$max_num_posts = $row_board['num_posts'];
+		}
 	}
 	$smcFunc['db_free_result']($boards_result);
 
@@ -284,12 +291,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	// Topic replies top 10.
 	$topic_reply_result = $smcFunc['db_query']('', '
@@ -329,8 +337,9 @@ 
 			'link' => '<a href="' . $scripturl . '?topic=' . $row_topic_reply['id_topic'] . '.0">' . $row_topic_reply['subject'] . '</a>'
 		);
 
-		if ($max_num_replies < $row_topic_reply['num_replies'])
-			$max_num_replies = $row_topic_reply['num_replies'];
+		if ($max_num_replies < $row_topic_reply['num_replies']) {
+					$max_num_replies = $row_topic_reply['num_replies'];
+		}
 	}
 	$smcFunc['db_free_result']($topic_reply_result);
 
@@ -354,12 +363,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	// Topic views top 10.
 	$topic_view_result = $smcFunc['db_query']('', '
@@ -399,8 +409,9 @@ 
 			'link' => '<a href="' . $scripturl . '?topic=' . $row_topic_views['id_topic'] . '.0">' . $row_topic_views['subject'] . '</a>'
 		);
 
-		if ($max_num < $row_topic_views['num_views'])
-			$max_num = $row_topic_views['num_views'];
+		if ($max_num < $row_topic_views['num_views']) {
+					$max_num = $row_topic_views['num_views'];
+		}
 	}
 	$smcFunc['db_free_result']($topic_view_result);
 
@@ -425,15 +436,17 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member_started']] = $row['hits'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member_started']] = $row['hits'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		cache_put_data('stats_top_starters', $members, 360);
 	}
 
-	if (empty($members))
-		$members = array(0 => 0);
+	if (empty($members)) {
+			$members = array(0 => 0);
+	}
 
 	// Topic poster top 10.
 	$members_result = $smcFunc['db_query']('', '
@@ -458,8 +471,9 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_num < $members[$row_members['id_member']])
-			$max_num = $members[$row_members['id_member']];
+		if ($max_num < $members[$row_members['id_member']]) {
+					$max_num = $members[$row_members['id_member']];
+		}
 	}
 	ksort($context['stats_blocks']['starters']);
 	$smcFunc['db_free_result']($members_result);
@@ -488,8 +502,9 @@ 
 	while ($row_members = $smcFunc['db_fetch_assoc']($members_result))
 	{
 		$temp2[] = (int) $row_members['id_member'];
-		if (count($context['stats_blocks']['time_online']) >= 10)
-			continue;
+		if (count($context['stats_blocks']['time_online']) >= 10) {
+					continue;
+		}
 
 		// Figure out the days, hours and minutes.
 		$timeDays = floor($row_members['total_time_logged_in'] / 86400);
@@ -497,10 +512,12 @@ 
 
 		// Figure out which things to show... (days, hours, minutes, etc.)
 		$timelogged = '';
-		if ($timeDays > 0)
-			$timelogged .= $timeDays . $txt['totalTimeLogged5'];
-		if ($timeHours > 0)
-			$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		if ($timeDays > 0) {
+					$timelogged .= $timeDays . $txt['totalTimeLogged5'];
+		}
+		if ($timeHours > 0) {
+					$timelogged .= $timeHours . $txt['totalTimeLogged6'];
+		}
 		$timelogged .= floor(($row_members['total_time_logged_in'] % 3600) / 60) . $txt['totalTimeLogged7'];
 
 		$context['stats_blocks']['time_online'][] = array(
@@ -512,17 +529,20 @@ 
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_members['id_member'] . '">' . $row_members['real_name'] . '</a>'
 		);
 
-		if ($max_time_online < $row_members['total_time_logged_in'])
-			$max_time_online = $row_members['total_time_logged_in'];
+		if ($max_time_online < $row_members['total_time_logged_in']) {
+					$max_time_online = $row_members['total_time_logged_in'];
+		}
 	}
 	$smcFunc['db_free_result']($members_result);
 
-	foreach ($context['stats_blocks']['time_online'] as $i => $member)
-		$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	foreach ($context['stats_blocks']['time_online'] as $i => $member) {
+			$context['stats_blocks']['time_online'][$i]['percent'] = round(($member['seconds_online'] * 100) / $max_time_online);
+	}
 
 	// Cache the ones we found for a bit, just so we don't have to look again.
-	if ($temp !== $temp2)
-		cache_put_data('stats_total_time_members', $temp2, 480);
+	if ($temp !== $temp2) {
+			cache_put_data('stats_total_time_members', $temp2, 480);
+	}
 
 	// Likes.
 	if (!empty($modSettings['enable_likes']))
@@ -558,13 +578,15 @@ 
 				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>'
 			);
 
-			if ($max_liked_message < $row_liked_message['likes'])
-				$max_liked_message = $row_liked_message['likes'];
+			if ($max_liked_message < $row_liked_message['likes']) {
+							$max_liked_message = $row_liked_message['likes'];
+			}
 		}
 		$smcFunc['db_free_result']($liked_messages);
 
-		foreach ($context['stats_blocks']['liked_messages'] as $i => $liked_messages)
-			$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
+		foreach ($context['stats_blocks']['liked_messages'] as $i => $liked_messages) {
+					$context['stats_blocks']['liked_messages'][$i]['percent'] = round(($liked_messages['num'] * 100) / $max_liked_message);
+		}
 
 		// Liked users top 10.
 		$context['stats_blocks']['liked_users'] = array();
@@ -595,14 +617,16 @@ 
 				'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row_liked_users['liked_user'] . '">' . $row_liked_users['real_name'] . '</a>',
 			);
 
-			if ($max_liked_users < $row_liked_users['count'])
-				$max_liked_users = $row_liked_users['count'];
+			if ($max_liked_users < $row_liked_users['count']) {
+							$max_liked_users = $row_liked_users['count'];
+			}
 		}
 
 		$smcFunc['db_free_result']($liked_users);
 
-		foreach ($context['stats_blocks']['liked_users'] as $i => $liked_users)
-			$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
+		foreach ($context['stats_blocks']['liked_users'] as $i => $liked_users) {
+					$context['stats_blocks']['liked_users'][$i]['percent'] = round(($liked_users['num'] * 100) / $max_liked_users);
+		}
 	}
 
 	// Activity by month.
@@ -620,8 +644,8 @@ 
 		$ID_MONTH = $row_months['stats_year'] . sprintf('%02d', $row_months['stats_month']);
 		$expanded = !empty($_SESSION['expanded_stats'][$row_months['stats_year']]) && in_array($row_months['stats_month'], $_SESSION['expanded_stats'][$row_months['stats_year']]);
 
-		if (!isset($context['yearly'][$row_months['stats_year']]))
-			$context['yearly'][$row_months['stats_year']] = array(
+		if (!isset($context['yearly'][$row_months['stats_year']])) {
+					$context['yearly'][$row_months['stats_year']] = array(
 				'year' => $row_months['stats_year'],
 				'new_topics' => 0,
 				'new_posts' => 0,
@@ -633,6 +657,7 @@ 
 				'expanded' => false,
 				'current_year' => $row_months['stats_year'] == date('Y'),
 			);
+		}
 
 		$context['yearly'][$row_months['stats_year']]['months'][(int) $row_months['stats_month']] = array(
 			'id' => $ID_MONTH,
@@ -678,26 +703,30 @@ 
 		$context['yearly'][$year]['hits'] = comma_format($data['hits']);
 
 		// Keep a list of collapsed years.
-		if (!$data['expanded'] && !$data['current_year'])
-			$context['collapsed_years'][] = $year;
+		if (!$data['expanded'] && !$data['current_year']) {
+					$context['collapsed_years'][] = $year;
+		}
 	}
 
-	if (empty($_SESSION['expanded_stats']))
-		return;
+	if (empty($_SESSION['expanded_stats'])) {
+			return;
+	}
 
 	$condition_text = array();
 	$condition_params = array();
-	foreach ($_SESSION['expanded_stats'] as $year => $months)
-		if (!empty($months))
+	foreach ($_SESSION['expanded_stats'] as $year => $months) {
+			if (!empty($months))
 		{
 			$condition_text[] = 'YEAR(date) = {int:year_' . $year . '} AND MONTH(date) IN ({array_int:months_' . $year . '})';
+	}
 			$condition_params['year_' . $year] = $year;
 			$condition_params['months_' . $year] = $months;
 		}
 
 	// No daily stats to even look at?
-	if (empty($condition_text))
-		return;
+	if (empty($condition_text)) {
+			return;
+	}
 
 	getDailyStats(implode(' OR ', $condition_text), $condition_params);
 
@@ -723,8 +752,8 @@ 
 		ORDER BY stats_day ASC',
 		$condition_parameters
 	);
-	while ($row_days = $smcFunc['db_fetch_assoc']($days_result))
-		$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
+	while ($row_days = $smcFunc['db_fetch_assoc']($days_result)) {
+			$context['yearly'][$row_days['stats_year']]['months'][(int) $row_days['stats_month']]['days'][] = array(
 			'day' => sprintf('%02d', $row_days['stats_day']),
 			'month' => sprintf('%02d', $row_days['stats_month']),
 			'year' => $row_days['stats_year'],
@@ -734,6 +763,7 @@ 
 			'most_members_online' => comma_format($row_days['most_on']),
 			'hits' => comma_format($row_days['hits'])
 		);
+	}
 	$smcFunc['db_free_result']($days_result);
 }
 
@@ -751,16 +781,19 @@ 
 	global $modSettings, $user_info, $forum_version, $sourcedir;
 
 	// First, is it disabled?
-	if (empty($modSettings['enable_sm_stats']) || empty($modSettings['sm_stats_key']))
-		die();
+	if (empty($modSettings['enable_sm_stats']) || empty($modSettings['sm_stats_key'])) {
+			die();
+	}
 
 	// Are we saying who we are, and are we right? (OR an admin)
-	if (!$user_info['is_admin'] && (!isset($_GET['sid']) || $_GET['sid'] != $modSettings['sm_stats_key']))
-		die();
+	if (!$user_info['is_admin'] && (!isset($_GET['sid']) || $_GET['sid'] != $modSettings['sm_stats_key'])) {
+			die();
+	}
 
 	// Verify the referer...
-	if (!$user_info['is_admin'] && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085'))
-		die();
+	if (!$user_info['is_admin'] && (!isset($_SERVER['HTTP_REFERER']) || md5($_SERVER['HTTP_REFERER']) != '746cb59a1a0d5cf4bd240e5a67c73085')) {
+			die();
+	}
 
 	// Get some server versions.
 	require_once($sourcedir . '/Subs-Admin.php');
@@ -786,16 +819,17 @@ 
 	);
 
 	// Encode all the data, for security.
-	foreach ($stats_to_send as $k => $v)
-		$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+	foreach ($stats_to_send as $k => $v) {
+			$stats_to_send[$k] = urlencode($k) . '=' . urlencode($v);
+	}
 
 	// Turn this into the query string!
 	$stats_to_send = implode('&', $stats_to_send);
 
 	// If we're an admin, just plonk them out.
-	if ($user_info['is_admin'])
-		echo $stats_to_send;
-	else
+	if ($user_info['is_admin']) {
+			echo $stats_to_send;
+	} else
 	{
 		// Connect to the collection script.
 		$fp = @fsockopen('www.simplemachines.org', 80, $errno, $errstr);

Sources/DbSearch-postgresql.php

Spacing +7 added lines, -7 removed lines

@@ -38,12 +38,12 @@ 
 	$version = $smcFunc['db_get_version']();
 	// if we got a Beta Version
 	if (stripos($version, 'beta') !== false)
-		$version = substr($version, 0, stripos($version, 'beta')).'.0';
+		$version = substr($version, 0, stripos($version, 'beta')) . '.0';
 	// or RC
 	if (stripos($version, 'rc') !== false)
-		$version = substr($version, 0, stripos($version, 'rc')).'.0';
+		$version = substr($version, 0, stripos($version, 'rc')) . '.0';
 
-	if (version_compare($version,'9.5.0','>='))
+	if (version_compare($version, '9.5.0', '>='))
 		$smcFunc['db_support_ignore'] = true;
 }
 
@@ -55,7 +55,7 @@ 
  */
 function smf_db_search_support($search_type)
 {
-	$supported_types = array('custom','fulltext');
+	$supported_types = array('custom', 'fulltext');
 
 	return in_array($search_type, $supported_types);
 }
@@ -109,9 +109,9 @@ 
 	if (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 	{
 		$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
-		if ($smcFunc['db_support_ignore']){
+		if ($smcFunc['db_support_ignore']) {
 			//pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
-			$db_string = $db_string.' ON CONFLICT DO NOTHING';
+			$db_string = $db_string . ' ON CONFLICT DO NOTHING';
 		}
 		else
 		{
@@ -168,7 +168,7 @@ 
 		$language_ftx = $modSettings['search_language'];
 	else
 	{
-		$request = $smcFunc['db_query']('','
+		$request = $smcFunc['db_query']('', '
 			SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',
 			array(
 			'default_language' => 'default_text_search_config'

Braces +25 added lines, -19 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  *  Add the file functions to the $smcFunc array.
@@ -23,29 +24,33 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_search_query')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_search_query']) || $smcFunc['db_search_query'] != 'smf_db_search_query') {
+			$smcFunc += array(
 			'db_search_query' => 'smf_db_search_query',
 			'db_search_support' => 'smf_db_search_support',
 			'db_create_word_search' => 'smf_db_create_word_search',
 			'db_support_ignore' => false,
 			'db_search_language' => 'smf_db_search_language',
 		);
+	}
 
 	db_extend();
 
 	//pg 9.5 got ignore support
 	$version = $smcFunc['db_get_version']();
 	// if we got a Beta Version
-	if (stripos($version, 'beta') !== false)
-		$version = substr($version, 0, stripos($version, 'beta')).'.0';
+	if (stripos($version, 'beta') !== false) {
+			$version = substr($version, 0, stripos($version, 'beta')).'.0';
+	}
 	// or RC
-	if (stripos($version, 'rc') !== false)
-		$version = substr($version, 0, stripos($version, 'rc')).'.0';
+	if (stripos($version, 'rc') !== false) {
+			$version = substr($version, 0, stripos($version, 'rc')).'.0';
+	}
 
-	if (version_compare($version,'9.5.0','>='))
-		$smcFunc['db_support_ignore'] = true;
-}
+	if (version_compare($version,'9.5.0','>=')) {
+			$smcFunc['db_support_ignore'] = true;
+	}
+	}
 
 /**
  * This function will tell you whether this database type supports this search type.
@@ -104,16 +109,16 @@ 
 		),
 	);
 
-	if (isset($replacements[$identifier]))
-		$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	if (isset($replacements[$identifier])) {
+			$db_string = preg_replace(array_keys($replacements[$identifier]), array_values($replacements[$identifier]), $db_string);
+	}
 	if (preg_match('~^\s*INSERT\sIGNORE~i', $db_string) != 0)
 	{
 		$db_string = preg_replace('~^\s*INSERT\sIGNORE~i', 'INSERT', $db_string);
 		if ($smcFunc['db_support_ignore']){
 			//pg style "INSERT INTO.... ON CONFLICT DO NOTHING"
 			$db_string = $db_string.' ON CONFLICT DO NOTHING';
-		}
-		else
+		} else
 		{
 			// Don't error on multi-insert.
 			$db_values['db_error_skip'] = true;
@@ -121,8 +126,9 @@ 
 	}
 	
 	//fix double quotes
-	if ($identifier == 'insert_into_log_messages_fulltext')
-		$db_values = str_replace('"', "'", $db_values);
+	if ($identifier == 'insert_into_log_messages_fulltext') {
+			$db_values = str_replace('"', "'", $db_values);
+	}
 
 	$return = $smcFunc['db_query']('', $db_string,
 		$db_values, $connection
@@ -164,9 +170,9 @@ 
 	
 	$language_ftx = 'english';
 	
-	if (!empty($modSettings['search_language']))
-		$language_ftx = $modSettings['search_language'];
-	else
+	if (!empty($modSettings['search_language'])) {
+			$language_ftx = $modSettings['search_language'];
+	} else
 	{
 		$request = $smcFunc['db_query']('','
 			SELECT cfgname FROM pg_ts_config WHERE oid = current_setting({string:default_language})::regconfig',

SSI.php

Braces +426 added lines, -304 removed lines

@@ -12,8 +12,9 @@ 
  */
 
 // Don't do anything if SMF is already loaded.
-if (defined('SMF'))
+if (defined('SMF')) {
 	return true;
+}
 
 define('SMF', 'SSI');
 
@@ -28,16 +29,18 @@ 
 $time_start = microtime();
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 $ssi_error_reporting = error_reporting(defined('E_STRICT') ? E_ALL | E_STRICT : E_ALL);
 /* Set this to one of three values depending on what you want to happen in the case of a fatal error.
@@ -48,12 +51,14 @@ 
 $ssi_on_error_method = false;
 
 // Don't do john didley if the forum's been shut down completely.
-if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true))
+if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true)) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Load the important includes.
 require_once($sourcedir . '/QueryString.php');
@@ -78,34 +83,38 @@ 
 cleanRequest();
 
 // Seed the random generator?
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Check on any hacking attempts.
-if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers)
+} elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers) {
 	die('No direct access...');
-if (isset($_REQUEST['context']))
+}
+if (isset($_REQUEST['context'])) {
 	die('No direct access...');
+}
 
 // Gzip output? (because it must be boolean and true, this can't be hacked.)
-if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
+if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
 	ob_start('ob_gzhandler');
-else
+} else {
 	$modSettings['enableCompressedOutput'] = '0';
+}
 
 // Primarily, this is to fix the URLs...
 ob_start('ob_sessrewrite');
 
 // Start the session... known to scramble SSI includes in cases...
-if (!headers_sent())
+if (!headers_sent()) {
 	loadSession();
-else
+} else
 {
 	if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
 	{
@@ -139,12 +148,14 @@ 
 loadTheme(isset($ssi_theme) ? (int) $ssi_theme : 0);
 
 // @todo: probably not the best place, but somewhere it should be set...
-if (!headers_sent())
+if (!headers_sent()) {
 	header('Content-Type: text/html; charset=' . (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']));
+}
 
 // Take care of any banning that needs to be done.
-if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true))
+if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true)) {
 	is_not_banned();
+}
 
 // Do we allow guests in here?
 if (empty($ssi_guest_access) && empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && basename($_SERVER['PHP_SELF']) != 'SSI.php')
@@ -159,17 +170,19 @@ 
 {
 	$context['template_layers'] = $ssi_layers;
 	template_header();
-}
-else
+} else {
 	setupThemeContext();
+}
 
 // Make sure they didn't muss around with the settings... but only if it's not cli.
-if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
+if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
 	trigger_error($txt['ssi_session_broken'], E_USER_NOTICE);
+}
 
 // Without visiting the forum this session variable might not be set on submit.
-if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
+if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
 	$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
+}
 
 // Have the ability to easily add functions to SSI.
 call_integration_hook('integrate_SSI');
@@ -178,11 +191,13 @@ 
 if (basename($_SERVER['PHP_SELF']) == 'SSI.php')
 {
 	// You shouldn't just access SSI.php directly by URL!!
-	if (!isset($_GET['ssi_function']))
-		die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	if (!isset($_GET['ssi_function'])) {
+			die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	}
 	// Call a function passed by GET.
-	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest']))
-		call_user_func('ssi_' . $_GET['ssi_function']);
+	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest'])) {
+			call_user_func('ssi_' . $_GET['ssi_function']);
+	}
 	exit;
 }
 
@@ -199,9 +214,10 @@ 
  */
 function ssi_shutdown()
 {
-	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
-		template_footer();
-}
+	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
+			template_footer();
+	}
+	}
 
 /**
  * Display a welcome message, like: Hey, User, you have 0 messages, 0 are new.
@@ -214,15 +230,17 @@ 
 
 	if ($output_method == 'echo')
 	{
-		if ($context['user']['is_guest'])
-			echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
-		else
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		if ($context['user']['is_guest']) {
+					echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
+		} else {
+					echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		}
 	}
 	// Don't echo... then do what?!
-	else
-		return $context['user'];
-}
+	else {
+			return $context['user'];
+	}
+	}
 
 /**
  * Display a menu bar, like is displayed at the top of the forum.
@@ -233,12 +251,14 @@ 
 {
 	global $context;
 
-	if ($output_method == 'echo')
-		template_menu();
+	if ($output_method == 'echo') {
+			template_menu();
+	}
 	// What else could this do?
-	else
-		return $context['menu_buttons'];
-}
+	else {
+			return $context['menu_buttons'];
+	}
+	}
 
 /**
  * Show a logout link.
@@ -250,20 +270,23 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if ($redirect_to != '')
-		$_SESSION['logout_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['logout_url'] = $redirect_to;
+	}
 
 	// Guests can't log out.
-	if ($context['user']['is_guest'])
-		return false;
+	if ($context['user']['is_guest']) {
+			return false;
+	}
 
 	$link = '<a href="' . $scripturl . '?action=logout;' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['logout'] . '</a>';
 
-	if ($output_method == 'echo')
-		echo $link;
-	else
-		return $link;
-}
+	if ($output_method == 'echo') {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Recent post list:   [board] Subject by Poster    Date
@@ -279,17 +302,17 @@ 
 	global $modSettings, $context;
 
 	// Excluding certain boards...
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$include_boards = array();
 	}
@@ -326,8 +349,9 @@ 
 {
 	global $modSettings;
 
-	if (empty($post_ids))
-		return;
+	if (empty($post_ids)) {
+			return;
+	}
 
 	// Allow the user to request more than one - why not?
 	$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
@@ -362,8 +386,9 @@ 
 	global $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if (!empty($modSettings['enable_likes']))
-		$context['can_like'] = allowedTo('likes_like');
+	if (!empty($modSettings['enable_likes'])) {
+			$context['can_like'] = allowedTo('likes_like');
+	}
 
 	// Find all the posts. Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -429,12 +454,13 @@ 
 		);
 
 		// Get the likes for each message.
-		if (!empty($modSettings['enable_likes']))
-			$posts[$row['id_msg']]['likes'] = array(
+		if (!empty($modSettings['enable_likes'])) {
+					$posts[$row['id_msg']]['likes'] = array(
 				'count' => $row['likes'],
 				'you' => in_array($row['id_msg'], prepareLikesContext($row['id_topic'])),
 				'can_like' => !$context['user']['is_guest'] && $row['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -442,13 +468,14 @@ 
 	call_integration_hook('integrate_ssi_queryPosts', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -462,6 +489,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -479,25 +507,26 @@ 
 	global $settings, $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// Only some boards?.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$output_method = $include_boards;
 		$include_boards = array();
 	}
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	// Find all the posts in distinct topics.  Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -522,13 +551,15 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[$row['id_topic']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[$row['id_topic']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Did we find anything? If not, bail.
-	if (empty($topics))
-		return array();
+	if (empty($topics)) {
+			return array();
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -556,19 +587,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Censor the subject.
 		censorText($row['subject']);
 		censorText($row['body']);
 
 		// Recycled icon
-		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'])
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board']) {
+					$row['icon'] = 'recycled';
+		}
 
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		// Build the array.
 		$posts[] = array(
@@ -607,13 +641,14 @@ 
 	call_integration_hook('integrate_ssi_recentTopics', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -627,6 +662,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -651,27 +687,30 @@ 
 		)
 	);
 	$return = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[] = array(
 			'id' => $row['id_member'],
 			'name' => $row['real_name'],
 			'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 			'posts' => $row['posts']
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_topPoster', array(&$return));
 
 	// Just return all the top posters.
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	// Make a quick array to list the links in.
 	$temp_array = array();
-	foreach ($return as $member)
-		$temp_array[] = $member['link'];
+	foreach ($return as $member) {
+			$temp_array[] = $member['link'];
+	}
 
 	echo implode(', ', $temp_array);
 }
@@ -703,8 +742,8 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[] = array(
 			'id' => $row['id_board'],
 			'num_posts' => $row['num_posts'],
 			'num_topics' => $row['num_topics'],
@@ -713,14 +752,16 @@ 
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
 			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of boards, let them do that now.
 	call_integration_hook('integrate_ssi_topBoards', array(&$boards));
 
 	// If we shouldn't output or have nothing to output, just jump out.
-	if ($output_method != 'echo' || empty($boards))
-		return $boards;
+	if ($output_method != 'echo' || empty($boards)) {
+			return $boards;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -729,13 +770,14 @@ 
 				<th style="text-align: left">', $txt['board_topics'], '</th>
 				<th style="text-align: left">', $txt['posts'], '</th>
 			</tr>';
-	foreach ($boards as $sBoard)
-		echo '
+	foreach ($boards as $sBoard) {
+			echo '
 			<tr>
 				<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_topics']), '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_posts']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -768,12 +810,13 @@ 
 			)
 		);
 		$topic_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_ids[] = $row['id_topic'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_ids[] = $row['id_topic'];
+		}
 		$smcFunc['db_free_result']($request);
+	} else {
+			$topic_ids = array();
 	}
-	else
-		$topic_ids = array();
 
 	$request = $smcFunc['db_query']('', '
 		SELECT m.subject, m.id_topic, t.num_views, t.num_replies
@@ -812,8 +855,9 @@ 
 	// If mods want to do somthing with this list of topics, let them do that now.
 	call_integration_hook('integrate_ssi_topTopics', array(&$topics, $type));
 
-	if ($output_method != 'echo' || empty($topics))
-		return $topics;
+	if ($output_method != 'echo' || empty($topics)) {
+			return $topics;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -822,8 +866,8 @@ 
 				<th style="text-align: left">', $txt['views'], '</th>
 				<th style="text-align: left">', $txt['replies'], '</th>
 			</tr>';
-	foreach ($topics as $sTopic)
-		echo '
+	foreach ($topics as $sTopic) {
+			echo '
 			<tr>
 				<td style="text-align: left">
 					', $sTopic['link'], '
@@ -831,6 +875,7 @@ 
 				<td style="text-align: right">', comma_format($sTopic['num_views']), '</td>
 				<td style="text-align: right">', comma_format($sTopic['num_replies']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -866,12 +911,13 @@ 
 {
 	global $txt, $context;
 
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 	', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br>';
-	else
-		return $context['common_stats']['latest_member'];
-}
+	} else {
+			return $context['common_stats']['latest_member'];
+	}
+	}
 
 /**
  * Fetches a random member.
@@ -920,8 +966,9 @@ 
 	}
 
 	// Just to be sure put the random generator back to something... random.
-	if ($random_type != '')
-		mt_srand(time());
+	if ($random_type != '') {
+			mt_srand(time());
+	}
 
 	return $result;
 }
@@ -934,8 +981,9 @@ 
  */
 function ssi_fetchMember($member_ids = array(), $output_method = 'echo')
 {
-	if (empty($member_ids))
-		return;
+	if (empty($member_ids)) {
+			return;
+	}
 
 	// Can have more than one member if you really want...
 	$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
@@ -960,8 +1008,9 @@ 
  */
 function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
 {
-	if ($group_id === null)
-		return;
+	if ($group_id === null) {
+			return;
+	}
 
 	$query_where = '
 		id_group = {int:id_group}
@@ -988,8 +1037,9 @@ 
 {
 	global $smcFunc, $memberContext;
 
-	if ($query_where === null)
-		return;
+	if ($query_where === null) {
+			return;
+	}
 
 	// Fetch the members in question.
 	$request = $smcFunc['db_query']('', '
@@ -1002,12 +1052,14 @@ 
 		))
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($members))
-		return array();
+	if (empty($members)) {
+			return array();
+	}
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_queryMembers', array(&$members));
@@ -1016,23 +1068,25 @@ 
 	loadMemberData($members);
 
 	// Draw the table!
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		<table style="border: none" class="ssi_table">';
+	}
 
 	$query_members = array();
 	foreach ($members as $member)
 	{
 		// Load their context data.
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		// Store this member's information.
 		$query_members[$member] = $memberContext[$member];
 
 		// Only do something if we're echo'ing.
-		if ($output_method == 'echo')
-			echo '
+		if ($output_method == 'echo') {
+					echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					', $query_members[$member]['link'], '
@@ -1040,12 +1094,14 @@ 
 					<br>', $query_members[$member]['avatar']['image'], '
 				</td>
 			</tr>';
+		}
 	}
 
 	// End the table if appropriate.
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		</table>';
+	}
 
 	// Send back the data.
 	return $query_members;
@@ -1060,8 +1116,9 @@ 
 {
 	global $txt, $scripturl, $modSettings, $smcFunc;
 
-	if (!allowedTo('view_stats'))
-		return;
+	if (!allowedTo('view_stats')) {
+			return;
+	}
 
 	$totals = array(
 		'members' => $modSettings['totalMembers'],
@@ -1090,8 +1147,9 @@ 
 	// If mods want to do somthing with the board stats, let them do that now.
 	call_integration_hook('integrate_ssi_boardStats', array(&$totals));
 
-	if ($output_method != 'echo')
-		return $totals;
+	if ($output_method != 'echo') {
+			return $totals;
+	}
 
 	echo '
 		', $txt['total_members'], ': <a href="', $scripturl . '?action=mlist">', comma_format($totals['members']), '</a><br>
@@ -1120,8 +1178,8 @@ 
 	call_integration_hook('integrate_ssi_whosOnline', array(&$return));
 
 	// Add some redundancy for backwards compatibility reasons.
-	if ($output_method != 'echo')
-		return $return + array(
+	if ($output_method != 'echo') {
+			return $return + array(
 			'users' => $return['users_online'],
 			'guests' => $return['num_guests'],
 			'hidden' => $return['num_users_hidden'],
@@ -1129,29 +1187,35 @@ 
 			'num_users' => $return['num_users_online'],
 			'total_users' => $return['num_users_online'] + $return['num_guests'],
 		);
+	}
 
 	echo '
 		', comma_format($return['num_guests']), ' ', $return['num_guests'] == 1 ? $txt['guest'] : $txt['guests'], ', ', comma_format($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? $txt['user'] : $txt['users'];
 
 	$bracketList = array();
-	if (!empty($user_info['buddies']))
-		$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
-	if (!empty($return['num_spiders']))
-		$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
-	if (!empty($return['num_users_hidden']))
-		$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	if (!empty($user_info['buddies'])) {
+			$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
+	if (!empty($return['num_spiders'])) {
+			$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
+	if (!empty($return['num_users_hidden'])) {
+			$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	}
 
-	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	if (!empty($bracketList)) {
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo '<br>
 			', implode(', ', $return['list_users_online']);
 
 	// Showing membergroups?
-	if (!empty($settings['show_group_key']) && !empty($return['membergroups']))
-		echo '<br>
+	if (!empty($settings['show_group_key']) && !empty($return['membergroups'])) {
+			echo '<br>
 			[' . implode(']&nbsp;&nbsp;[', $return['membergroups']) . ']';
-}
+	}
+	}
 
 /**
  * Just like whosOnline except it also logs the online presence.
@@ -1162,11 +1226,12 @@ 
 {
 	writeLog();
 
-	if ($output_method != 'echo')
-		return ssi_whosOnline($output_method);
-	else
-		ssi_whosOnline($output_method);
-}
+	if ($output_method != 'echo') {
+			return ssi_whosOnline($output_method);
+	} else {
+			ssi_whosOnline($output_method);
+	}
+	}
 
 // Shows a login box.
 /**
@@ -1179,11 +1244,13 @@ 
 {
 	global $scripturl, $txt, $user_info, $context;
 
-	if ($redirect_to != '')
-		$_SESSION['login_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['login_url'] = $redirect_to;
+	}
 
-	if ($output_method != 'echo' || !$user_info['is_guest'])
-		return $user_info['is_guest'];
+	if ($output_method != 'echo' || !$user_info['is_guest']) {
+			return $user_info['is_guest'];
+	}
 
 	// Create a login token
 	createToken('login');
@@ -1235,8 +1302,9 @@ 
 
 	$boardsAllowed = array_intersect(boardsAllowedTo('poll_view'), boardsAllowedTo('poll_vote'));
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT p.id_poll, p.question, t.id_topic, p.max_votes, p.guest_vote, p.hide_results, p.expire_time
@@ -1269,12 +1337,14 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This user has voted on all the polls.
-	if (empty($row) || !is_array($row))
-		return array();
+	if (empty($row) || !is_array($row)) {
+			return array();
+	}
 
 	// If this is a guest who's voted we'll through ourselves to show poll to show the results.
-	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))))
-		return ssi_showPoll($row['id_topic'], $output_method);
+	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))))) {
+			return ssi_showPoll($row['id_topic'], $output_method);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(DISTINCT id_member)
@@ -1338,8 +1408,9 @@ 
 	// If mods want to do somthing with this list of polls, let them do that now.
 	call_integration_hook('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($allow_view_results)
 	{
@@ -1348,19 +1419,20 @@ 
 			<strong>', $return['question'], '</strong><br>
 			', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 			<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 			<input type="submit" value="', $txt['poll_vote'], '" class="button_submit">
 			<input type="hidden" name="poll" value="', $return['id'], '">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>';
+	} else {
+			echo $txt['poll_cannot_see'];
+	}
 	}
-	else
-		echo $txt['poll_cannot_see'];
-}
 
 /**
  * Shows the poll from the specified topic
@@ -1374,13 +1446,15 @@ 
 
 	$boardsAllowed = boardsAllowedTo('poll_view');
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
-	if ($topic === null && isset($_REQUEST['ssi_topic']))
-		$topic = (int) $_REQUEST['ssi_topic'];
-	else
-		$topic = (int) $topic;
+	if ($topic === null && isset($_REQUEST['ssi_topic'])) {
+			$topic = (int) $_REQUEST['ssi_topic'];
+	} else {
+			$topic = (int) $topic;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -1401,17 +1475,18 @@ 
 	);
 
 	// Either this topic has no poll, or the user cannot view it.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Check if they can vote.
 	$already_voted = false;
-	if (!empty($row['expire_time']) && $row['expire_time'] < time())
-		$allow_vote = false;
-	elseif ($user_info['is_guest'])
+	if (!empty($row['expire_time']) && $row['expire_time'] < time()) {
+			$allow_vote = false;
+	} elseif ($user_info['is_guest'])
 	{
 		// There's a difference between "allowed to vote" and "already voted"...
 		$allow_vote = $row['guest_vote'];
@@ -1421,10 +1496,9 @@ 
 		{
 			$already_voted = true;
 		}
-	}
-	elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board']))
-		$allow_vote = false;
-	else
+	} elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board'])) {
+			$allow_vote = false;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member
@@ -1506,8 +1580,9 @@ 
 	// If mods want to do somthing with this poll, let them do that now.
 	call_integration_hook('integrate_ssi_showPoll', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($return['allow_vote'])
 	{
@@ -1516,17 +1591,17 @@ 
 				<strong>', $return['question'], '</strong><br>
 				', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 				<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 				<input type="submit" value="', $txt['poll_vote'], '" class="button_submit">
 				<input type="hidden" name="poll" value="', $return['id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="ssi_poll">
@@ -1606,27 +1681,32 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		die;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			die;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// Too many options checked?
-	if (count($_REQUEST['options']) > $row['max_votes'])
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (count($_REQUEST['options']) > $row['max_votes']) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// It's a guest who has already voted?
 	if ($user_info['is_guest'])
 	{
 		// Guest voting disabled?
-		if (!$row['guest_vote'])
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		if (!$row['guest_vote']) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 		// Already voted?
-		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 	}
 
 	$sOptions = array();
@@ -1680,11 +1760,13 @@ 
 {
 	global $scripturl, $txt, $context;
 
-	if (!allowedTo('search_posts'))
-		return;
+	if (!allowedTo('search_posts')) {
+			return;
+	}
 
-	if ($output_method != 'echo')
-		return $scripturl . '?action=search';
+	if ($output_method != 'echo') {
+			return $scripturl . '?action=search';
+	}
 
 	echo '
 		<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -1706,8 +1788,9 @@ 
 	// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in $context.
 	call_integration_hook('integrate_ssi_news');
 
-	if ($output_method != 'echo')
-		return $context['random_news_line'];
+	if ($output_method != 'echo') {
+			return $context['random_news_line'];
+	}
 
 	echo $context['random_news_line'];
 }
@@ -1721,8 +1804,9 @@ 
 {
 	global $scripturl, $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => true,
@@ -1733,13 +1817,15 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_birthdays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_birthdays'];
+	}
 
-	foreach ($return['calendar_birthdays'] as $member)
-		echo '
+	foreach ($return['calendar_birthdays'] as $member) {
+			echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
-}
+	}
+	}
 
 /**
  * Shows today's holidays.
@@ -1750,8 +1836,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_holidays' => true,
@@ -1762,8 +1849,9 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_holidays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_holidays'];
+	}
 
 	echo '
 		', implode(', ', $return['calendar_holidays']);
@@ -1777,8 +1865,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_events' => true,
@@ -1789,14 +1878,16 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_events'];
+	if ($output_method != 'echo') {
+			return $return['calendar_events'];
+	}
 
 	foreach ($return['calendar_events'] as $event)
 	{
-		if ($event['can_edit'])
-			echo '
+		if ($event['can_edit']) {
+					echo '
 	<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+		}
 		echo '
 	' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 	}
@@ -1811,8 +1902,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => allowedTo('profile_view'),
@@ -1825,19 +1917,22 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
-	if (!empty($return['calendar_holidays']))
-		echo '
+	if (!empty($return['calendar_holidays'])) {
+			echo '
 			<span class="holiday">' . $txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
+	}
 	if (!empty($return['calendar_birthdays']))
 	{
 		echo '
 			<span class="birthday">' . $txt['birthdays_upcoming'] . '</span> ';
-		foreach ($return['calendar_birthdays'] as $member)
-			echo '
+		foreach ($return['calendar_birthdays'] as $member) {
+					echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
+		}
 		echo '
 			<br>';
 	}
@@ -1847,9 +1942,10 @@ 
 			<span class="event">' . $txt['events_upcoming'] . '</span> ';
 		foreach ($return['calendar_events'] as $event)
 		{
-			if ($event['can_edit'])
-				echo '
+			if ($event['can_edit']) {
+							echo '
 			<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+			}
 			echo '
 			' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 		}
@@ -1873,25 +1969,29 @@ 
 	loadLanguage('Stats');
 
 	// Must be integers....
-	if ($limit === null)
-		$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
-	else
-		$limit = (int) $limit;
-
-	if ($start === null)
-		$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
-	else
-		$start = (int) $start;
-
-	if ($board !== null)
-		$board = (int) $board;
-	elseif (isset($_GET['board']))
-		$board = (int) $_GET['board'];
-
-	if ($length === null)
-		$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
-	else
-		$length = (int) $length;
+	if ($limit === null) {
+			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
+	} else {
+			$limit = (int) $limit;
+	}
+
+	if ($start === null) {
+			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
+	} else {
+			$start = (int) $start;
+	}
+
+	if ($board !== null) {
+			$board = (int) $board;
+	} elseif (isset($_GET['board'])) {
+			$board = (int) $_GET['board'];
+	}
+
+	if ($length === null) {
+			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
+	} else {
+			$length = (int) $length;
+	}
 
 	$limit = max(0, $limit);
 	$start = max(0, $start);
@@ -1909,17 +2009,19 @@ 
 	);
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
-		if ($output_method == 'echo')
-			die($txt['ssi_no_guests']);
-		else
-			return array();
+		if ($output_method == 'echo') {
+					die($txt['ssi_no_guests']);
+		} else {
+					return array();
+		}
 	}
 	list ($board) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	if (!empty($modSettings['enable_likes']))
 	{
@@ -1943,12 +2045,14 @@ 
 		)
 	);
 	$posts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$posts[] = $row['id_first_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$posts[] = $row['id_first_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($posts))
-		return array();
+	if (empty($posts)) {
+			return array();
+	}
 
 	// Find the posts.
 	$request = $smcFunc['db_query']('', '
@@ -1978,24 +2082,28 @@ 
 			$last_space = strrpos($row['body'], ' ');
 			$last_open = strrpos($row['body'], '<');
 			$last_close = strrpos($row['body'], '>');
-			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
-				$cutoff = $last_open;
-			elseif (empty($last_close) || $last_close < $last_open)
-				$cutoff = $last_space;
+			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
+							$cutoff = $last_open;
+			} elseif (empty($last_close) || $last_close < $last_open) {
+							$cutoff = $last_space;
+			}
 
-			if ($cutoff !== false)
-				$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			if ($cutoff !== false) {
+							$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			}
 			$row['body'] .= '...';
 		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+					$row['icon'] = 'recycled';
+		}
 
 		// Check that this message icon is there...
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -2032,16 +2140,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($return))
-		return $return;
+	if (empty($return)) {
+			return $return;
+	}
 
 	$return[count($return) - 1]['is_last'] = true;
 
 	// If mods want to do somthing with this list of posts, let them do that now.
 	call_integration_hook('integrate_ssi_boardNews', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	foreach ($return as $news)
 	{
@@ -2093,9 +2203,10 @@ 
 		echo '
 			</div>';
 
-		if (!$news['is_last'])
-			echo '
+		if (!$news['is_last']) {
+					echo '
 			<hr>';
+		}
 	}
 }
 
@@ -2109,8 +2220,9 @@ 
 {
 	global $user_info, $scripturl, $modSettings, $txt, $context, $smcFunc;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	// Find all events which are happening in the near future that the member can see.
 	$request = $smcFunc['db_query']('', '
@@ -2136,20 +2248,23 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-		if (!empty($duplicates[$row['title'] . $row['id_topic']]))
-			continue;
+		if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
+					continue;
+		}
 
 		// Censor the title.
 		censorText($row['title']);
 
-		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false)))
-			$date = strftime('%Y-%m-%d', forum_time(false));
-		else
-			$date = $row['start_date'];
+		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false))) {
+					$date = strftime('%Y-%m-%d', forum_time(false));
+		} else {
+					$date = $row['start_date'];
+		}
 
 		// If the topic it is attached to is not approved then don't link it.
-		if (!empty($row['id_first_msg']) && !$row['approved'])
-			$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		if (!empty($row['id_first_msg']) && !$row['approved']) {
+					$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		}
 
 		$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
 
@@ -2175,24 +2290,27 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($return as $mday => $array)
-		$return[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($return as $mday => $array) {
+			$return[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	// If mods want to do somthing with this list of events, let them do that now.
 	call_integration_hook('integrate_ssi_recentEvents', array(&$return));
 
-	if ($output_method != 'echo' || empty($return))
-		return $return;
+	if ($output_method != 'echo' || empty($return)) {
+			return $return;
+	}
 
 	// Well the output method is echo.
 	echo '
 			<span class="event">' . $txt['events'] . '</span> ';
-	foreach ($return as $mday => $array)
-		foreach ($array as $event)
+	foreach ($return as $mday => $array) {
+			foreach ($array as $event)
 		{
 			if ($event['can_edit'])
 				echo '
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+	}
 
 			echo '
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
@@ -2211,8 +2329,9 @@ 
 	global $smcFunc;
 
 	// If $id is null, this was most likely called from a query string and should do nothing.
-	if ($id === null)
-		return;
+	if ($id === null) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT passwd, member_name, is_activated
@@ -2244,8 +2363,9 @@ 
 	$attachments_boards = boardsAllowedTo('view_attachments');
 
 	// No boards?  Adios amigo.
-	if (empty($attachments_boards))
-		return array();
+	if (empty($attachments_boards)) {
+			return array();
+	}
 
 	// Is it an array?
 	$attachment_ext = (array) $attachment_ext;
@@ -2329,8 +2449,9 @@ 
 	call_integration_hook('integrate_ssi_recentAttachments', array(&$attachments));
 
 	// So you just want an array?  Here you can have it.
-	if ($output_method == 'array' || empty($attachments))
-		return $attachments;
+	if ($output_method == 'array' || empty($attachments)) {
+			return $attachments;
+	}
 
 	// Give them the default.
 	echo '
@@ -2341,14 +2462,15 @@ 
 				<th style="text-align: left; padding: 2">', $txt['downloads'], '</th>
 				<th style="text-align: left; padding: 2">', $txt['filesize'], '</th>
 			</tr>';
-	foreach ($attachments as $attach)
-		echo '
+	foreach ($attachments as $attach) {
+			echo '
 			<tr>
 				<td>', $attach['file']['link'], '</td>
 				<td>', $attach['member']['link'], '</td>
 				<td style="text-align: center">', $attach['file']['downloads'], '</td>
 				<td>', $attach['file']['filesize'], '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }