SimpleMachines / SMF2.1

Sources/ManageServer.php

Braces +315 added lines, -243 removed lines

@@ -59,8 +59,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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;
 
@@ -142,10 +144,11 @@ 
 
 	// If no cert, force_ssl must remain 0
 	require_once($sourcedir . '/Subs.php');
-	if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl']))
-		$disable_force_ssl = true;
-	else
-		$disable_force_ssl = false;
+	if (!ssl_cert_found($boardurl) && empty($modSettings['force_ssl'])) {
+			$disable_force_ssl = true;
+	} else {
+			$disable_force_ssl = false;
+	}
 
 	/* If you're writing a mod, it's a bad idea to add things here....
 	For each option:
@@ -175,8 +178,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';
@@ -193,16 +197,18 @@ 
 			$registerSMStats = registerSMStats();
 
 			// Failed to register, disable it again.
-			if (empty($registerSMStats))
-				$_POST['enable_sm_stats'] = 0;
+			if (empty($registerSMStats)) {
+							$_POST['enable_sm_stats'] = 0;
+			}
 		}
 
 		// Ensure all URLs are aligned with the new force_ssl setting
 		// Treat unset like 0
-		if (isset($_POST['force_ssl']))
-			AlignURLsWithSSLSetting($_POST['force_ssl']);
-		else
-			AlignURLsWithSSLSetting(0);
+		if (isset($_POST['force_ssl'])) {
+					AlignURLsWithSSLSetting($_POST['force_ssl']);
+		} else {
+					AlignURLsWithSSLSetting(0);
+		}
 
 		saveSettings($config_vars);
 		$_SESSION['adm-save'] = true;
@@ -255,10 +261,11 @@ 
 	require_once($sourcedir . '/Subs-Admin.php');
 
 	// Check $boardurl
-	if (!empty($new_force_ssl))
-		$newval = strtr($boardurl, array('http://' => 'https://'));
-	else
-		$newval = strtr($boardurl, array('https://' => 'http://'));
+	if (!empty($new_force_ssl)) {
+			$newval = strtr($boardurl, array('http://' => 'https://'));
+	} else {
+			$newval = strtr($boardurl, array('https://' => 'http://'));
+	}
 	updateSettingsFile(array('boardurl' => '\'' . addslashes($newval) . '\''));
 
 	$new_settings = array();
@@ -266,20 +273,22 @@ 
 	// Check $smileys_url, but only if it points to a subfolder of $boardurl
 	if (BoardurlMatch($modSettings['smileys_url']))
 	{
-		if (!empty($new_force_ssl))
-			$newval = strtr($modSettings['smileys_url'], array('http://' => 'https://'));
-		else
-			$newval = strtr($modSettings['smileys_url'], array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+					$newval = strtr($modSettings['smileys_url'], array('http://' => 'https://'));
+		} else {
+					$newval = strtr($modSettings['smileys_url'], array('https://' => 'http://'));
+		}
 		$new_settings['smileys_url'] = $newval;
 	}
 
 	// Check $avatar_url, but only if it points to a subfolder of $boardurl
 	if (BoardurlMatch($modSettings['avatar_url']))
 	{
-		if (!empty($new_force_ssl))
-			$newval = strtr($modSettings['avatar_url'], array('http://' => 'https://'));
-		else
-			$newval = strtr($modSettings['avatar_url'], array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+					$newval = strtr($modSettings['avatar_url'], array('http://' => 'https://'));
+		} else {
+					$newval = strtr($modSettings['avatar_url'], array('https://' => 'http://'));
+		}
 		$new_settings['avatar_url'] = $newval;
 	}
 
@@ -287,16 +296,18 @@ 
 	// This one had been optional in the past, make sure it is set first
 	if (isset($modSettings['custom_avatar_url']) && BoardurlMatch($modSettings['custom_avatar_url']))
 	{
-		if (!empty($new_force_ssl))
-			$newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://'));
-		else
-			$newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://'));
+		if (!empty($new_force_ssl)) {
+					$newval = strtr($modSettings['custom_avatar_url'], array('http://' => 'https://'));
+		} else {
+					$newval = strtr($modSettings['custom_avatar_url'], array('https://' => 'http://'));
+		}
 		$new_settings['custom_avatar_url'] = $newval;
 	}
 
 	// Save updates to the settings table
-	if (!empty($new_settings))
-		updateSettings($new_settings, true);
+	if (!empty($new_settings)) {
+			updateSettings($new_settings, true);
+	}
 
 	// Now we move onto the themes.
 	// First, get a list of theme URLs...
@@ -317,10 +328,11 @@ 
 		// First check to see if it points to a subfolder of $boardurl
 		if (BoardurlMatch($row['value']))
 		{
-			if (!empty($new_force_ssl))
-				$newval = strtr($row['value'], array('http://' => 'https://'));
-			else
-				$newval = strtr($row['value'], array('https://' => 'http://'));
+			if (!empty($new_force_ssl)) {
+							$newval = strtr($row['value'], array('http://' => 'https://'));
+			} else {
+							$newval = strtr($row['value'], array('https://' => 'http://'));
+			}
 			$smcFunc['db_query']('', '
 				UPDATE {db_prefix}themes
 				   SET value = {string:theme_val}
@@ -360,11 +372,12 @@ 
 
 	// If leftmost portion of path matches boardurl, return true
 	$result = strpos($urlpath, $boardurlpath);
-	if ($result === false || $result != 0)
-		return false;
-	else
-		return true;
-}
+	if ($result === false || $result != 0) {
+			return false;
+	} else {
+			return true;
+	}
+	}
 
 /**
  * Basic database and paths settings - database name, host, etc.
@@ -403,8 +416,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(
 				'',
@@ -416,20 +430,22 @@ 
 
 	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';
 	$context['settings_title'] = $txt['database_settings'];
 	$context['save_disabled'] = $context['settings_not_writable'];
 
-	if (!$smcFunc['db_allow_persistent']())
-		addInlineJavaScript('
+	if (!$smcFunc['db_allow_persistent']()) {
+			addInlineJavaScript('
 			$(function()
 			{
 				$("#db_persist").prop("disabled", true);
 			});', true);
+	}
 
 	// Saving settings?
 	if (isset($_REQUEST['save']))
@@ -499,13 +515,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'];
@@ -516,14 +534,17 @@ 
 		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($modSettings['localCookies']) != empty($_POST['localCookies']) || empty($modSettings['globalCookies']) != empty($_POST['globalCookies']))
-			$scope_changed = true;
+		if (empty($modSettings['localCookies']) != empty($_POST['localCookies']) || empty($modSettings['globalCookies']) != empty($_POST['globalCookies'])) {
+					$scope_changed = true;
+		}
 
-		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);
 
@@ -606,8 +627,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']))
@@ -646,8 +668,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']);
@@ -684,8 +705,9 @@ 
 			}
 		}
 	}
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Saving again?
 	if (isset($_GET['save']))
@@ -713,8 +735,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);
@@ -737,24 +760,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)
 		{
@@ -790,8 +814,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'];
@@ -802,24 +827,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']);
 	}
 
@@ -855,10 +883,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']);
 	}
@@ -866,9 +895,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;
@@ -903,16 +932,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.
@@ -920,12 +952,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);
+					}
 				}
 			}
 		}
@@ -950,10 +983,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']);
 	}
@@ -965,26 +999,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]]))
@@ -1003,8 +1041,7 @@ 
 					default:
 						$value = $smcFunc['htmlspecialchars']($modSettings[$config_var[1]]);
 				}
-			}
-			else
+			} else
 			{
 				// Darn, it's empty. What type is expected?
 				switch ($config_var[0])
@@ -1044,16 +1081,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.
@@ -1067,12 +1107,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);
+					}
 				}
 			}
 
@@ -1081,17 +1122,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.
@@ -1124,8 +1167,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);
@@ -1140,8 +1184,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,
@@ -1184,18 +1229,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?
@@ -1230,21 +1278,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];
 
@@ -1253,17 +1301,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 . '\'');
@@ -1279,30 +1327,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.
@@ -1320,22 +1373,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]] = $smcFunc['json_encode']($lOptions);
 		}
@@ -1349,18 +1405,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) : '';
 		}
@@ -1374,8 +1432,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')
@@ -1387,40 +1446,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'))
@@ -1457,18 +1523,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
@@ -1503,8 +1572,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;
 			}
@@ -1529,8 +1599,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)
@@ -1541,8 +1612,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/DbExtra-mysql.php

Braces +72 added lines, -51 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the functions implemented in this file to the $smcFunc array.
@@ -23,8 +24,8 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table') {
+			$smcFunc += array(
 			'db_backup_table' => 'smf_db_backup_table',
 			'db_optimize_table' => 'smf_db_optimize_table',
 			'db_table_sql' => 'smf_db_table_sql',
@@ -33,7 +34,8 @@ 
 			'db_get_vendor' => 'smf_db_get_vendor',
 			'db_allow_persistent' => 'smf_db_allow_persistent',
 		);
-}
+	}
+	}
 
 /**
  * Backup $table to $backup_table.
@@ -75,8 +77,9 @@ 
 			));
 
 		// Old school or no school?
-		if ($request)
-			return $request;
+		if ($request) {
+					return $request;
+		}
 	}
 
 	// At this point, the quick method failed.
@@ -100,8 +103,9 @@ 
 	foreach ($create as $k => $l)
 	{
 		// Get the name of the auto_increment column.
-		if (strpos($l, 'auto_increment'))
-			$auto_inc = trim($l);
+		if (strpos($l, 'auto_increment')) {
+					$auto_inc = trim($l);
+		}
 
 		// For the engine type, see if we can work out what it is.
 		if (strpos($l, 'ENGINE') !== false || strpos($l, 'TYPE') !== false)
@@ -109,30 +113,36 @@ 
 			// Extract the engine type.
 			preg_match('~(ENGINE|TYPE)=(\w+)(\sDEFAULT)?(\sCHARSET=(\w+))?(\sCOLLATE=(\w+))?~', $l, $match);
 
-			if (!empty($match[1]))
-				$engine = $match[1];
+			if (!empty($match[1])) {
+							$engine = $match[1];
+			}
 
-			if (!empty($match[2]))
-				$engine = $match[2];
+			if (!empty($match[2])) {
+							$engine = $match[2];
+			}
 
-			if (!empty($match[5]))
-				$charset = $match[5];
+			if (!empty($match[5])) {
+							$charset = $match[5];
+			}
 
-			if (!empty($match[7]))
-				$collate = $match[7];
+			if (!empty($match[7])) {
+							$collate = $match[7];
+			}
 		}
 
 		// Skip everything but keys...
-		if (strpos($l, 'KEY') === false)
-			unset($create[$k]);
+		if (strpos($l, 'KEY') === false) {
+					unset($create[$k]);
+		}
 	}
 
-	if (!empty($create))
-		$create = '(
+	if (!empty($create)) {
+			$create = '(
 			' . implode('
 			', $create) . ')';
-	else
-		$create = '';
+	} else {
+			$create = '';
+	}
 
 	$request = $smcFunc['db_query']('', '
 		CREATE TABLE {raw:backup_table} {raw:create}
@@ -151,8 +161,9 @@ 
 
 	if ($auto_inc != '')
 	{
-		if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',')
-			$auto_inc = substr($auto_inc, 0, -1);
+		if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',') {
+					$auto_inc = substr($auto_inc, 0, -1);
+		}
 
 		$smcFunc['db_query']('', '
 			ALTER TABLE {raw:backup_table}
@@ -196,8 +207,9 @@ 
 				'table' => $table,
 			)
 		);
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	// How much left?
 	$request = $smcFunc['db_query']('', '
@@ -240,8 +252,9 @@ 
 		)
 	);
 	$tables = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$tables[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$tables[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $tables;
@@ -285,8 +298,9 @@ 
 		if (!empty($row['Default']) || $row['Null'] !== 'YES')
 		{
 			// Make a special case of auto-timestamp.
-			if ($row['Default'] == 'CURRENT_TIMESTAMP')
-				$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+			if ($row['Default'] == 'CURRENT_TIMESTAMP') {
+							$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+			}
 			// Text shouldn't have a default.
 			elseif ($row['Default'] !== null)
 			{
@@ -321,14 +335,16 @@ 
 		$row['Key_name'] = $row['Key_name'] == 'PRIMARY' ? 'PRIMARY KEY' : (empty($row['Non_unique']) ? 'UNIQUE ' : ($row['Comment'] == 'FULLTEXT' || (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') ? 'FULLTEXT ' : 'KEY ')) . '`' . $row['Key_name'] . '`';
 
 		// Is this the first column in the index?
-		if (empty($indexes[$row['Key_name']]))
-			$indexes[$row['Key_name']] = array();
+		if (empty($indexes[$row['Key_name']])) {
+					$indexes[$row['Key_name']] = array();
+		}
 
 		// A sub part, like only indexing 15 characters of a varchar.
-		if (!empty($row['Sub_part']))
-			$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`(' . $row['Sub_part'] . ')';
-		else
-			$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+		if (!empty($row['Sub_part'])) {
+					$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`(' . $row['Sub_part'] . ')';
+		} else {
+					$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -366,8 +382,9 @@ 
 {
 	static $ver;
 
-	if (!empty($ver))
-		return $ver;
+	if (!empty($ver)) {
+			return $ver;
+	}
 
 	global $smcFunc;
 
@@ -392,8 +409,9 @@ 
 	global $smcFunc;
 	static $db_type;
 
-	if (!empty($db_type))
-		return $db_type;
+	if (!empty($db_type)) {
+			return $db_type;
+	}
 
 	$request = $smcFunc['db_query']('', 'SELECT @@version_comment');
 	list ($comment) = $smcFunc['db_fetch_row']($request);
@@ -402,13 +420,15 @@ 
 	// Skip these if we don't have a comment.
 	if (!empty($comment))
 	{
-		if (stripos($comment, 'percona') !== false)
-			return 'Percona';
-		if (stripos($comment, 'mariadb') !== false)
-			return 'MariaDB';
+		if (stripos($comment, 'percona') !== false) {
+					return 'Percona';
+		}
+		if (stripos($comment, 'mariadb') !== false) {
+					return 'MariaDB';
+		}
+	} else {
+			return 'fail';
 	}
-	else
-		return 'fail';
 
 	return 'MySQL';
 }
@@ -421,10 +441,11 @@ 
 function smf_db_allow_persistent()
 {
 	$value = ini_get('mysqli.allow_persistent');
-	if (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1')
-		return true;
-	else
-		return false;
-}
+	if (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1') {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/DbExtra-postgresql.php

Braces +43 added lines, -32 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the functions implemented in this file to the $smcFunc array.
@@ -23,8 +24,8 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table') {
+			$smcFunc += array(
 			'db_backup_table' => 'smf_db_backup_table',
 			'db_optimize_table' => 'smf_db_optimize_table',
 			'db_table_sql' => 'smf_db_table_sql',
@@ -33,7 +34,8 @@ 
 			'db_get_vendor' => 'smf_db_get_vendor',
 			'db_allow_persistent' => 'smf_db_allow_persistent',
 		);
-}
+	}
+	}
 
 /**
  * Backup $table to $backup_table.
@@ -49,13 +51,14 @@ 
 
 	// Do we need to drop it first?
 	$tables = smf_db_list_tables(false, $backup_table);
-	if (!empty($tables))
-		$smcFunc['db_query']('', '
+	if (!empty($tables)) {
+			$smcFunc['db_query']('', '
 			DROP TABLE {raw:backup_table}',
 			array(
 				'backup_table' => $backup_table,
 			)
 		);
+	}
 
 	/**
 	 * @todo Should we create backups of sequences as well?
@@ -118,8 +121,9 @@ 
 			)
 		);
 
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -137,11 +141,12 @@ 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (isset($row['size']))
-			return ($old_size - $row['size']) / 1024;
-	else
-		return 0;
-}
+	if (isset($row['size'])) {
+				return ($old_size - $row['size']) / 1024;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * This function lists all tables in the database.
@@ -168,8 +173,9 @@ 
 	);
 
 	$tables = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$tables[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$tables[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $tables;
@@ -210,12 +216,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($row['data_type'] == 'character varying')
-			$row['data_type'] = 'varchar';
-		elseif ($row['data_type'] == 'character')
-			$row['data_type'] = 'char';
-		if ($row['character_maximum_length'])
-			$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		if ($row['data_type'] == 'character varying') {
+					$row['data_type'] = 'varchar';
+		} elseif ($row['data_type'] == 'character') {
+					$row['data_type'] = 'char';
+		}
+		if ($row['character_maximum_length']) {
+					$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		}
 
 		// Make the CREATE for this column.
 		$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
@@ -266,13 +274,14 @@ 
 	{
 		if ($row['is_primary'])
 		{
-			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-				continue;
+			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+							continue;
+			}
 
 			$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD PRIMARY KEY ("' . $matches[1] . '");';
+		} else {
+					$index_create .= $crlf . $row['inddef'] . ';';
 		}
-		else
-			$index_create .= $crlf . $row['inddef'] . ';';
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -291,8 +300,9 @@ 
 	global $db_connection;
 	static $ver;
 
-	if(!empty($ver))
-		return $ver;
+	if(!empty($ver)) {
+			return $ver;
+	}
 
 	$ver = pg_version($db_connection)['server'];
 
@@ -317,10 +327,11 @@ 
 function smf_db_allow_persistent()
 {
 	$value = ini_get('pgsql.allow_persistent');
-	if (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1')
-		return true;
-	else
-		return false;
-}
+	if (strtolower($value) == 'on' || strtolower($value) == 'true' || $value == '1') {
+			return true;
+	} else {
+			return false;
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs-Post.php

Braces +520 added lines, -389 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Takes a message and parses it, returning nothing.
@@ -31,8 +32,9 @@ 
 	global $user_info, $modSettings, $context, $sourcedir;
 
 	// This line makes all languages *theoretically* work even with the wrong charset ;).
-	if (empty($context['utf8']))
-		$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
+	if (empty($context['utf8'])) {
+			$message = preg_replace('~&#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $message);
+	}
 
 	// Clean up after nobbc ;).
 	$message = preg_replace_callback('~\[nobbc\](.+?)\[/nobbc\]~is', function($a)
@@ -47,17 +49,19 @@ 
 	$message = preg_replace('~\.{100,}~', '...', $message);
 
 	// Trim off trailing quotes - these often happen by accident.
-	while (substr($message, -7) == '[quote]')
-		$message = substr($message, 0, -7);
-	while (substr($message, 0, 8) == '[/quote]')
-		$message = substr($message, 8);
+	while (substr($message, -7) == '[quote]') {
+			$message = substr($message, 0, -7);
+	}
+	while (substr($message, 0, 8) == '[/quote]') {
+			$message = substr($message, 8);
+	}
 
 	// Find all code blocks, work out whether we'd be parsing them, then ensure they are all closed.
 	$in_tag = false;
 	$had_tag = false;
 	$codeopen = 0;
-	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches))
-		foreach ($matches[0] as $index => $dummy)
+	if (preg_match_all('~(\[(/)*code(?:=[^\]]+)?\])~is', $message, $matches)) {
+			foreach ($matches[0] as $index => $dummy)
 		{
 			// Closing?
 			if (!empty($matches[2][$index]))
@@ -65,6 +69,7 @@ 
 				// If it's closing and we're not in a tag we need to open it...
 				if (!$in_tag)
 					$codeopen = true;
+	}
 				// Either way we ain't in one any more.
 				$in_tag = false;
 			}
@@ -73,17 +78,20 @@ 
 			{
 				$had_tag = true;
 				// If we're in a tag don't do nought!
-				if (!$in_tag)
-					$in_tag = true;
+				if (!$in_tag) {
+									$in_tag = true;
+				}
 			}
 		}
 
 	// If we have an open tag, close it.
-	if ($in_tag)
-		$message .= '[/code]';
+	if ($in_tag) {
+			$message .= '[/code]';
+	}
 	// Open any ones that need to be open, only if we've never had a tag.
-	if ($codeopen && !$had_tag)
-		$message = '[code]' . $message;
+	if ($codeopen && !$had_tag) {
+			$message = '[code]' . $message;
+	}
 
 	// Replace code BBC with placeholders. We'll restore them at the end.
 	$parts = preg_split('~(\[/code\]|\[code(?:=[^\]]+)?\])~i', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
@@ -108,23 +116,26 @@ 
 	fixTags($message);
 
 	// Replace /me.+?\n with [me=name]dsf[/me]\n.
-	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false)
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
-	else
-		$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	if (strpos($user_info['name'], '[') !== false || strpos($user_info['name'], ']') !== false || strpos($user_info['name'], '\'') !== false || strpos($user_info['name'], '"') !== false) {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me="' . $user_info['name'] . '"]$2[/me]', $message);
+	} else {
+			$message = preg_replace('~(\A|\n)/me(?: | )([^\n]*)(?:\z)?~i', '$1[me=' . $user_info['name'] . ']$2[/me]', $message);
+	}
 
 	if (!$previewing && strpos($message, '[html]') !== false)
 	{
-		if (allowedTo('admin_forum'))
-			$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
+		if (allowedTo('admin_forum')) {
+					$message = preg_replace_callback('~\[html\](.+?)\[/html\]~is', function($m) {
 				return '[html]' . strtr(un_htmlspecialchars($m[1]), array("\n" => '
', '  ' => '  ', '[' => '[', ']' => ']')) . '[/html]';
+		}
 			}, $message);
 
 		// We should edit them out, or else if an admin edits the message they will get shown...
 		else
 		{
-			while (strpos($message, '[html]') !== false)
-				$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			while (strpos($message, '[html]') !== false) {
+							$message = preg_replace('~\[[/]?html\]~i', '', $message);
+			}
 		}
 	}
 
@@ -146,10 +157,12 @@ 
 
 	$list_open = substr_count($message, '[list]') + substr_count($message, '[list ');
 	$list_close = substr_count($message, '[/list]');
-	if ($list_close - $list_open > 0)
-		$message = str_repeat('[list]', $list_close - $list_open) . $message;
-	if ($list_open - $list_close > 0)
-		$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	if ($list_close - $list_open > 0) {
+			$message = str_repeat('[list]', $list_close - $list_open) . $message;
+	}
+	if ($list_open - $list_close > 0) {
+			$message = $message . str_repeat('[/list]', $list_open - $list_close);
+	}
 
 	$mistake_fixes = array(
 		// Find [table]s not followed by [tr].
@@ -198,8 +211,9 @@ 
 	);
 
 	// Fix up some use of tables without [tr]s, etc. (it has to be done more than once to catch it all.)
-	for ($j = 0; $j < 3; $j++)
-		$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	for ($j = 0; $j < 3; $j++) {
+			$message = preg_replace(array_keys($mistake_fixes), $mistake_fixes, $message);
+	}
 
 	// Remove empty bbc from the sections outside the code tags
 	$allowedEmpty = array(
@@ -210,24 +224,28 @@ 
 	require_once($sourcedir . '/Subs.php');
 
 	$alltags = array();
-	foreach (($codes = parse_bbc(false)) as $code)
-		if (!in_array($code['tag'], $allowedEmpty))
+	foreach (($codes = parse_bbc(false)) as $code) {
+			if (!in_array($code['tag'], $allowedEmpty))
 			$alltags[] = $code['tag'];
+	}
 
 	$alltags_regex = '\b' . implode("\b|\b", array_unique($alltags)) . '\b';
 
-	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message))
-		$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	while (preg_match('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', $message)) {
+			$message = preg_replace('~\[(' . $alltags_regex . ')[^\]]*\]\s*\[/\1\]\s?~i', '', $message);
+	}
 
 	// Restore code blocks
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Restore white space entities
-	if (!$previewing)
-		$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
-	else
-		$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	if (!$previewing) {
+			$message = strtr($message, array('  ' => '&nbsp; ', "\n" => '<br>', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	} else {
+			$message = strtr($message, array('  ' => '&nbsp; ', $context['utf8'] ? "\xC2\xA0" : "\xA0" => '&nbsp;'));
+	}
 
 	// Now let's quickly clean up things that will slow our parser (which are common in posted code.)
 	$message = strtr($message, array('[]' => '&#91;]', '[&#039;' => '&#91;&#039;'));
@@ -270,8 +288,9 @@ 
 		return "[time]" . timeformat("$m[1]", false) . "[/time]";
 	}, $message);
 
-	if (!empty($code_tags))
-		$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	if (!empty($code_tags)) {
+			$message = str_replace(array_keys($code_tags), array_values($code_tags), $message);
+	}
 
 	// Change breaks back to \n's and &nsbp; back to spaces.
 	return preg_replace('~<br( /)?' . '>~', "\n", str_replace('&nbsp;', ' ', $message));
@@ -352,8 +371,9 @@ 
 	);
 
 	// Fix each type of tag.
-	foreach ($fixArray as $param)
-		fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	foreach ($fixArray as $param) {
+			fixTag($message, $param['tag'], $param['protocols'], $param['embeddedUrl'], $param['hasEqualSign'], !empty($param['hasExtra']));
+	}
 
 	// Now fix possible security problems with images loading links automatically...
 	$message = preg_replace_callback('~(\[img.*?\])(.+?)\[/img\]~is', function($m)
@@ -378,10 +398,11 @@ 
 {
 	global $boardurl, $scripturl;
 
-	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0)
-		$domain_url = $match[1];
-	else
-		$domain_url = $boardurl . '/';
+	if (preg_match('~^([^:]+://[^/]+)~', $boardurl, $match) != 0) {
+			$domain_url = $match[1];
+	} else {
+			$domain_url = $boardurl . '/';
+	}
 
 	$replaces = array();
 
@@ -389,11 +410,11 @@ 
 	{
 		$quoted = preg_match('~\[(' . $myTag . ')=&quot;~', $message);
 		preg_match_all('~\[(' . $myTag . ')=' . ($quoted ? '&quot;(.*?)&quot;' : '([^\]]*?)') . '\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} elseif ($hasEqualSign) {
+			preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
+	} else {
+			preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 	}
-	elseif ($hasEqualSign)
-		preg_match_all('~\[(' . $myTag . ')=([^\]]*?)\](?:(.+?)\[/(' . $myTag . ')\])?~is', $message, $matches);
-	else
-		preg_match_all('~\[(' . $myTag . ($hasExtra ? '(?:[^\]]*?)' : '') . ')\](.+?)\[/(' . $myTag . ')\]~is', $message, $matches);
 
 	foreach ($matches[0] as $k => $dummy)
 	{
@@ -406,49 +427,53 @@ 
 		foreach ($protocols as $protocol)
 		{
 			$found = strncasecmp($replace, $protocol . '://', strlen($protocol) + 3) === 0;
-			if ($found)
-				break;
+			if ($found) {
+							break;
+			}
 		}
 
 		if (!$found && $protocols[0] == 'http')
 		{
-			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//')
-				$replace = $domain_url . $replace;
-			elseif (substr($replace, 0, 1) == '?')
-				$replace = $scripturl . $replace;
-			elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
+			if (substr($replace, 0, 1) == '/' && substr($replace, 0, 2) != '//') {
+							$replace = $domain_url . $replace;
+			} elseif (substr($replace, 0, 1) == '?') {
+							$replace = $scripturl . $replace;
+			} elseif (substr($replace, 0, 1) == '#' && $embeddedUrl)
 			{
 				$replace = '#' . preg_replace('~[^A-Za-z0-9_\-#]~', '', substr($replace, 1));
 				$this_tag = 'iurl';
 				$this_close = 'iurl';
+			} elseif (substr($replace, 0, 2) != '//') {
+							$replace = $protocols[0] . '://' . $replace;
 			}
-			elseif (substr($replace, 0, 2) != '//')
-				$replace = $protocols[0] . '://' . $replace;
-		}
-		elseif (!$found && $protocols[0] == 'ftp')
-			$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
-		elseif (!$found)
-			$replace = $protocols[0] . '://' . $replace;
-
-		if ($hasEqualSign && $embeddedUrl)
-			$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
-		elseif ($hasEqualSign)
-			$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
-		elseif ($embeddedUrl)
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
-		else
-			$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		} elseif (!$found && $protocols[0] == 'ftp') {
+					$replace = $protocols[0] . '://' . preg_replace('~^(?!ftps?)[^:]+://~', '', $replace);
+		} elseif (!$found) {
+					$replace = $protocols[0] . '://' . $replace;
+		}
+
+		if ($hasEqualSign && $embeddedUrl) {
+					$replaces[$matches[0][$k]] = '[' . $this_tag . '=&quot;' . $replace . '&quot;]' . (empty($matches[4][$k]) ? '' : $matches[3][$k] . '[/' . $this_close . ']');
+		} elseif ($hasEqualSign) {
+					$replaces['[' . $matches[1][$k] . '=' . $matches[2][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']';
+		} elseif ($embeddedUrl) {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . '=' . $replace . ']' . $matches[2][$k] . '[/' . $this_close . ']';
+		} else {
+					$replaces['[' . $matches[1][$k] . ']' . $matches[2][$k] . '[/' . $matches[3][$k] . ']'] = '[' . $this_tag . ']' . $replace . '[/' . $this_close . ']';
+		}
 	}
 
 	foreach ($replaces as $k => $v)
 	{
-		if ($k == $v)
-			unset($replaces[$k]);
+		if ($k == $v) {
+					unset($replaces[$k]);
+		}
 	}
 
-	if (!empty($replaces))
-		$message = strtr($message, $replaces);
-}
+	if (!empty($replaces)) {
+			$message = strtr($message, $replaces);
+	}
+	}
 
 /**
  * This function sends an email to the specified recipient(s).
@@ -492,8 +517,9 @@ 
 	}
 
 	// Nothing left? Nothing else to do
-	if (empty($to_array))
-		return true;
+	if (empty($to_array)) {
+			return true;
+	}
 
 	// Once upon a time, Hotmail could not interpret non-ASCII mails.
 	// In honour of those days, it's still called the 'hotmail fix'.
@@ -510,15 +536,17 @@ 
 		}
 
 		// Call this function recursively for the hotmail addresses.
-		if (!empty($hotmail_to))
-			$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		if (!empty($hotmail_to)) {
+					$mail_result = sendmail($hotmail_to, $subject, $message, $from, $message_id, $send_html, $priority, true, $is_private);
+		}
 
 		// The remaining addresses no longer need the fix.
 		$hotmail_fix = false;
 
 		// No other addresses left? Return instantly.
-		if (empty($to_array))
-			return $mail_result;
+		if (empty($to_array)) {
+					return $mail_result;
+		}
 	}
 
 	// Get rid of entities.
@@ -543,13 +571,15 @@ 
 	$headers .= 'Return-Path: ' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . $line_break;
 	$headers .= 'Date: ' . gmdate('D, d M Y H:i:s') . ' -0000' . $line_break;
 
-	if ($message_id !== null && empty($modSettings['mail_no_message_id']))
-		$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	if ($message_id !== null && empty($modSettings['mail_no_message_id'])) {
+			$headers .= 'Message-ID: <' . md5($scripturl . microtime()) . '-' . $message_id . strstr(empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from'], '@') . '>' . $line_break;
+	}
 	$headers .= 'X-Mailer: SMF' . $line_break;
 
 	// Pass this to the integration before we start modifying the output -- it'll make it easier later.
-	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true))
-		return false;
+	if (in_array(false, call_integration_hook('integrate_outgoing_email', array(&$subject, &$message, &$headers, &$to_array)), true)) {
+			return false;
+	}
 
 	// Save the original message...
 	$orig_message = $message;
@@ -598,17 +628,19 @@ 
 	}
 
 	// Are we using the mail queue, if so this is where we butt in...
-	if ($priority != 0)
-		return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	if ($priority != 0) {
+			return AddMailQueue(false, $to_array, $subject, $message, $headers, $send_html, $priority, $is_private);
+	}
 
 	// If it's a priority mail, send it now - note though that this should NOT be used for sending many at once.
 	elseif (!empty($modSettings['mail_limit']))
 	{
 		list ($last_mail_time, $mails_this_minute) = @explode('|', $modSettings['mail_recent']);
-		if (empty($mails_this_minute) || time() > $last_mail_time + 60)
-			$new_queue_stat = time() . '|' . 1;
-		else
-			$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		if (empty($mails_this_minute) || time() > $last_mail_time + 60) {
+					$new_queue_stat = time() . '|' . 1;
+		} else {
+					$new_queue_stat = $last_mail_time . '|' . ((int) $mails_this_minute + 1);
+		}
 
 		updateSettings(array('mail_recent' => $new_queue_stat));
 	}
@@ -642,8 +674,7 @@ 
 					log_error(sprintf($txt['mail_send_unable'], $to));
 					$mail_result = false;
 				}
-			}
-			catch(ErrorException $e)
+			} catch(ErrorException $e)
 			{
 				log_error($e->getMessage(), 'general', $e->getFile(), $e->getLine());
 				log_error(sprintf($txt['mail_send_unable'], $to));
@@ -653,12 +684,13 @@ 
 
 			// Wait, wait, I'm still sending here!
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 		}
+	} else {
+			$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 	}
-	else
-		$mail_result = $mail_result && smtp_mail($to_array, $subject, $message, $headers);
 
 	// Everything go smoothly?
 	return $mail_result;
@@ -684,8 +716,9 @@ 
 	static $cur_insert = array();
 	static $cur_insert_len = 0;
 
-	if ($cur_insert_len == 0)
-		$cur_insert = array();
+	if ($cur_insert_len == 0) {
+			$cur_insert = array();
+	}
 
 	// If we're flushing, make the final inserts - also if we're near the MySQL length limit!
 	if (($flush || $cur_insert_len > 800000) && !empty($cur_insert))
@@ -760,8 +793,9 @@ 
 	}
 
 	// If they are using SSI there is a good chance obExit will never be called.  So lets be nice and flush it for them.
-	if (SMF === 'SSI' || SMF === 'BACKGROUND')
-		return AddMailQueue(true);
+	if (SMF === 'SSI' || SMF === 'BACKGROUND') {
+			return AddMailQueue(true);
+	}
 
 	return true;
 }
@@ -792,23 +826,26 @@ 
 		'sent' => array()
 	);
 
-	if ($from === null)
-		$from = array(
+	if ($from === null) {
+			$from = array(
 			'id' => $user_info['id'],
 			'name' => $user_info['name'],
 			'username' => $user_info['username']
 		);
+	}
 
 	// This is the one that will go in their inbox.
 	$htmlmessage = $smcFunc['htmlspecialchars']($message, ENT_QUOTES);
 	preparsecode($htmlmessage);
 	$htmlsubject = strtr($smcFunc['htmlspecialchars']($subject), array("\r" => '', "\n" => '', "\t" => ''));
-	if ($smcFunc['strlen']($htmlsubject) > 100)
-		$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	if ($smcFunc['strlen']($htmlsubject) > 100) {
+			$htmlsubject = $smcFunc['substr']($htmlsubject, 0, 100);
+	}
 
 	// Make sure is an array
-	if (!is_array($recipients))
-		$recipients = array($recipients);
+	if (!is_array($recipients)) {
+			$recipients = array($recipients);
+	}
 
 	// Integrated PMs
 	call_integration_hook('integrate_personal_message', array(&$recipients, &$from, &$subject, &$message));
@@ -836,21 +873,23 @@ 
 				'usernames' => array_keys($usernames),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					if (isset($usernames[$smcFunc['strtolower']($row['member_name'])]))
 				$usernames[$smcFunc['strtolower']($row['member_name'])] = $row['id_member'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Replace the usernames with IDs. Drop usernames that couldn't be found.
-		foreach ($recipients as $rec_type => $rec)
-			foreach ($rec as $id => $member)
+		foreach ($recipients as $rec_type => $rec) {
+					foreach ($rec as $id => $member)
 			{
 				if (is_numeric($recipients[$rec_type][$id]))
 					continue;
+		}
 
-				if (!empty($usernames[$member]))
-					$recipients[$rec_type][$id] = $usernames[$member];
-				else
+				if (!empty($usernames[$member])) {
+									$recipients[$rec_type][$id] = $usernames[$member];
+				} else
 				{
 					$log['failed'][$id] = sprintf($txt['pm_error_user_not_found'], $recipients[$rec_type][$id]);
 					unset($recipients[$rec_type][$id]);
@@ -888,8 +927,9 @@ 
 		$delete = false;
 		foreach ($criteria as $criterium)
 		{
-			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false))
-				$delete = true;
+			if (($criterium['t'] == 'mid' && $criterium['v'] == $from['id']) || ($criterium['t'] == 'gid' && in_array($criterium['v'], $user_info['groups'])) || ($criterium['t'] == 'sub' && strpos($subject, $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($message, $criterium['v']) !== false)) {
+							$delete = true;
+			}
 			// If we're adding and one criteria don't match then we stop!
 			elseif (!$row['is_or'])
 			{
@@ -897,8 +937,9 @@ 
 				break;
 			}
 		}
-		if ($delete)
-			$deletes[$row['id_member']] = 1;
+		if ($delete) {
+					$deletes[$row['id_member']] = 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -913,8 +954,9 @@ 
 			array(
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$message_limit_cache[$row['id_group']] = $row['max_messages'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -922,8 +964,9 @@ 
 	require_once($sourcedir . '/Subs-Members.php');
 	$pmReadGroups = groupsAllowedTo('pm_read');
 
-	if (empty($modSettings['permission_enable_deny']))
-		$pmReadGroups['denied'] = array();
+	if (empty($modSettings['permission_enable_deny'])) {
+			$pmReadGroups['denied'] = array();
+	}
 
 	// Load their alert preferences
 	require_once($sourcedir . '/Subs-Notify.php');
@@ -955,8 +998,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't do anything for members to be deleted!
-		if (isset($deletes[$row['id_member']]))
-			continue;
+		if (isset($deletes[$row['id_member']])) {
+					continue;
+		}
 
 		// Load the preferences for this member (if any)
 		$prefs = !empty($notifyPrefs[$row['id_member']]) ? $notifyPrefs[$row['id_member']] : array();
@@ -977,8 +1021,9 @@ 
 		{
 			foreach ($groups as $id)
 			{
-				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id])
-					$message_limit = $message_limit_cache[$id];
+				if (isset($message_limit_cache[$id]) && $message_limit != 0 && $message_limit < $message_limit_cache[$id]) {
+									$message_limit = $message_limit_cache[$id];
+				}
 			}
 
 			if ($message_limit > 0 && $message_limit <= $row['instant_messages'])
@@ -1026,8 +1071,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Only 'send' the message if there are any recipients left.
-	if (empty($all_to))
-		return $log;
+	if (empty($all_to)) {
+			return $log;
+	}
 
 	// Insert the message itself and then grab the last insert id.
 	$id_pm = $smcFunc['db_insert']('',
@@ -1048,8 +1094,8 @@ 
 	if (!empty($id_pm))
 	{
 		// If this is new we need to set it part of it's own conversation.
-		if (empty($pm_head))
-			$smcFunc['db_query']('', '
+		if (empty($pm_head)) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}personal_messages
 				SET id_pm_head = {int:id_pm_head}
 				WHERE id_pm = {int:id_pm_head}',
@@ -1057,6 +1103,7 @@ 
 					'id_pm_head' => $id_pm,
 				)
 			);
+		}
 
 		// Some people think manually deleting personal_messages is fun... it's not. We protect against it though :)
 		$smcFunc['db_query']('', '
@@ -1072,8 +1119,9 @@ 
 		foreach ($all_to as $to)
 		{
 			$insertRows[] = array($id_pm, $to, in_array($to, $recipients['bcc']) ? 1 : 0, isset($deletes[$to]) ? 1 : 0, 1);
-			if (!in_array($to, $recipients['bcc']))
-				$to_list[] = $to;
+			if (!in_array($to, $recipients['bcc'])) {
+							$to_list[] = $to;
+			}
 		}
 
 		$smcFunc['db_insert']('insert',
@@ -1091,9 +1139,9 @@ 
 	{
 		censorText($message);
 		$message = trim(un_htmlspecialchars(strip_tags(strtr(parse_bbc($smcFunc['htmlspecialchars']($message), false), array('<br>' => "\n", '</div>' => "\n", '</li>' => "\n", '&#91;' => '[', '&#93;' => ']')))));
+	} else {
+			$message = '';
 	}
-	else
-		$message = '';
 
 	$to_names = array();
 	if (count($to_list) > 1)
@@ -1106,8 +1154,9 @@ 
 				'to_members' => $to_list,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$to_names[] = un_htmlspecialchars($row['real_name']);
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$to_names[] = un_htmlspecialchars($row['real_name']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 	$replacements = array(
@@ -1135,11 +1184,13 @@ 
 	loadLanguage('index+PersonalMessage');
 
 	// Add one to their unread and read message counts.
-	foreach ($all_to as $k => $id)
-		if (isset($deletes[$id]))
+	foreach ($all_to as $k => $id) {
+			if (isset($deletes[$id]))
 			unset($all_to[$k]);
-	if (!empty($all_to))
-		updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
+	if (!empty($all_to)) {
+			updateMemberData($all_to, array('instant_messages' => '+', 'unread_messages' => '+', 'new_pm' => 1));
+	}
 
 	return $log;
 }
@@ -1169,15 +1220,17 @@ 
 		// Let's, for now, assume there are only &#021;'ish characters.
 		$simple = true;
 
-		foreach ($matches[1] as $entity)
-			if ($entity > 128)
+		foreach ($matches[1] as $entity) {
+					if ($entity > 128)
 				$simple = false;
+		}
 		unset($matches);
 
-		if ($simple)
-			$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
+		if ($simple) {
+					$string = preg_replace_callback('~&#(\d{3,8});~', function($m)
 			{
 				return chr("$m[1]");
+		}
 			}, $string);
 		else
 		{
@@ -1185,8 +1238,9 @@ 
 			if (!$context['utf8'] && function_exists('iconv'))
 			{
 				$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-				if ($newstring)
-					$string = $newstring;
+				if ($newstring) {
+									$string = $newstring;
+				}
 			}
 
 			$string = preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $string);
@@ -1202,23 +1256,25 @@ 
 		if (!$context['utf8'] && function_exists('iconv'))
 		{
 			$newstring = @iconv($context['character_set'], 'UTF-8', $string);
-			if ($newstring)
-				$string = $newstring;
+			if ($newstring) {
+							$string = $newstring;
+			}
 		}
 
 		$entityConvert = function($m)
 		{
 			$c = $m[1];
-			if (strlen($c) === 1 && ord($c[0]) <= 0x7F)
-				return $c;
-			elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF)
-				return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF)
-				return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
-			elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7)
-				return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
-			else
-				return "";
+			if (strlen($c) === 1 && ord($c[0]) <= 0x7F) {
+							return $c;
+			} elseif (strlen($c) === 2 && ord($c[0]) >= 0xC0 && ord($c[0]) <= 0xDF) {
+							return "&#" . (((ord($c[0]) ^ 0xC0) << 6) + (ord($c[1]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 3 && ord($c[0]) >= 0xE0 && ord($c[0]) <= 0xEF) {
+							return "&#" . (((ord($c[0]) ^ 0xE0) << 12) + ((ord($c[1]) ^ 0x80) << 6) + (ord($c[2]) ^ 0x80)) . ";";
+			} elseif (strlen($c) === 4 && ord($c[0]) >= 0xF0 && ord($c[0]) <= 0xF7) {
+							return "&#" . (((ord($c[0]) ^ 0xF0) << 18) + ((ord($c[1]) ^ 0x80) << 12) + ((ord($c[2]) ^ 0x80) << 6) + (ord($c[3]) ^ 0x80)) . ";";
+			} else {
+							return "";
+			}
 		};
 
 		// Convert all 'special' characters to HTML entities.
@@ -1232,19 +1288,20 @@ 
 		$string = base64_encode($string);
 
 		// Show the characterset and the transfer-encoding for header strings.
-		if ($with_charset)
-			$string = '=?' . $charset . '?B?' . $string . '?=';
+		if ($with_charset) {
+					$string = '=?' . $charset . '?B?' . $string . '?=';
+		}
 
 		// Break it up in lines (mail body).
-		else
-			$string = chunk_split($string, 76, $line_break);
+		else {
+					$string = chunk_split($string, 76, $line_break);
+		}
 
 		return array($charset, $string, 'base64');
+	} else {
+			return array($charset, $string, '7bit');
+	}
 	}
-
-	else
-		return array($charset, $string, '7bit');
-}
 
 /**
  * Sends mail, like mail() but over SMTP.
@@ -1268,8 +1325,9 @@ 
 	if ($modSettings['mail_type'] == 3 && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
 	{
 		$socket = fsockopen($modSettings['smtp_host'], 110, $errno, $errstr, 2);
-		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.'))
-			$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		if (!$socket && (substr($modSettings['smtp_host'], 0, 5) == 'smtp.' || substr($modSettings['smtp_host'], 0, 11) == 'ssl://smtp.')) {
+					$socket = fsockopen(strtr($modSettings['smtp_host'], array('smtp.' => 'pop.')), 110, $errno, $errstr, 2);
+		}
 
 		if ($socket)
 		{
@@ -1290,8 +1348,9 @@ 
 		// Maybe we can still save this?  The port might be wrong.
 		if (substr($modSettings['smtp_host'], 0, 4) == 'ssl:' && (empty($modSettings['smtp_port']) || $modSettings['smtp_port'] == 25))
 		{
-			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3))
-				log_error($txt['smtp_port_ssl']);
+			if ($socket = fsockopen($modSettings['smtp_host'], 465, $errno, $errstr, 3)) {
+							log_error($txt['smtp_port_ssl']);
+			}
 		}
 
 		// Unable to connect!  Don't show any error message, but just log one and try to continue anyway.
@@ -1303,20 +1362,23 @@ 
 	}
 
 	// Wait for a response of 220, without "-" continuer.
-	if (!server_parse(null, $socket, '220'))
-		return false;
+	if (!server_parse(null, $socket, '220')) {
+			return false;
+	}
 
 	// Try and determine the servers name, fall back to the mail servers if not found
 	$helo = false;
-	if (function_exists('gethostname') && gethostname() !== false)
-		$helo = gethostname();
-	elseif (function_exists('php_uname'))
-		$helo = php_uname('n');
-	elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME']))
-		$helo = $_SERVER['SERVER_NAME'];
+	if (function_exists('gethostname') && gethostname() !== false) {
+			$helo = gethostname();
+	} elseif (function_exists('php_uname')) {
+			$helo = php_uname('n');
+	} elseif (array_key_exists('SERVER_NAME', $_SERVER) && !empty($_SERVER['SERVER_NAME'])) {
+			$helo = $_SERVER['SERVER_NAME'];
+	}
 
-	if (empty($helo))
-		$helo = $modSettings['smtp_host'];
+	if (empty($helo)) {
+			$helo = $modSettings['smtp_host'];
+	}
 
 	// SMTP = 1, SMTP - STARTTLS = 2
 	if (in_array($modSettings['mail_type'], array(1, 2)) && $modSettings['smtp_username'] != '' && $modSettings['smtp_password'] != '')
@@ -1328,33 +1390,39 @@ 
 			if ($modSettings['mail_type'] == 2 && preg_match("~250( |-)STARTTLS~mi", $response))
 			{
 				// Send STARTTLS to enable encryption
-				if (!server_parse('STARTTLS', $socket, '220'))
-					return false;
+				if (!server_parse('STARTTLS', $socket, '220')) {
+									return false;
+				}
 				// Enable the encryption
-				if (!@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT))
-					return false;
+				if (!@stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) {
+									return false;
+				}
 				// Send the EHLO command again
-				if (!server_parse('EHLO ' . $helo, $socket, null) == '250')
-					return false;
+				if (!server_parse('EHLO ' . $helo, $socket, null) == '250') {
+									return false;
+				}
 			}
 
-			if (!server_parse('AUTH LOGIN', $socket, '334'))
-				return false;
+			if (!server_parse('AUTH LOGIN', $socket, '334')) {
+							return false;
+			}
 			// Send the username and password, encoded.
-			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334'))
-				return false;
+			if (!server_parse(base64_encode($modSettings['smtp_username']), $socket, '334')) {
+							return false;
+			}
 			// The password is already encoded ;)
-			if (!server_parse($modSettings['smtp_password'], $socket, '235'))
-				return false;
+			if (!server_parse($modSettings['smtp_password'], $socket, '235')) {
+							return false;
+			}
+		} elseif (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
 		}
-		elseif (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
-	}
-	else
+	} else
 	{
 		// Just say "helo".
-		if (!server_parse('HELO ' . $helo, $socket, '250'))
-			return false;
+		if (!server_parse('HELO ' . $helo, $socket, '250')) {
+					return false;
+		}
 	}
 
 	// Fix the message for any lines beginning with a period! (the first is ignored, you see.)
@@ -1367,31 +1435,38 @@ 
 		// Reset the connection to send another email.
 		if ($i != 0)
 		{
-			if (!server_parse('RSET', $socket, '250'))
-				return false;
+			if (!server_parse('RSET', $socket, '250')) {
+							return false;
+			}
 		}
 
 		// From, to, and then start the data...
-		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250'))
-			return false;
-		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250'))
-			return false;
-		if (!server_parse('DATA', $socket, '354'))
-			return false;
+		if (!server_parse('MAIL FROM: <' . (empty($modSettings['mail_from']) ? $webmaster_email : $modSettings['mail_from']) . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('RCPT TO: <' . $mail_to . '>', $socket, '250')) {
+					return false;
+		}
+		if (!server_parse('DATA', $socket, '354')) {
+					return false;
+		}
 		fputs($socket, 'Subject: ' . $subject . "\r\n");
-		if (strlen($mail_to) > 0)
-			fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		if (strlen($mail_to) > 0) {
+					fputs($socket, 'To: <' . $mail_to . '>' . "\r\n");
+		}
 		fputs($socket, $headers . "\r\n\r\n");
 		fputs($socket, $message . "\r\n");
 
 		// Send a ., or in other words "end of data".
-		if (!server_parse('.', $socket, '250'))
-			return false;
+		if (!server_parse('.', $socket, '250')) {
+					return false;
+		}
 
 		// Almost done, almost done... don't stop me just yet!
 		@set_time_limit(300);
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 	}
 	fputs($socket, 'QUIT' . "\r\n");
 	fclose($socket);
@@ -1415,8 +1490,9 @@ 
 {
 	global $txt;
 
-	if ($message !== null)
-		fputs($socket, $message . "\r\n");
+	if ($message !== null) {
+			fputs($socket, $message . "\r\n");
+	}
 
 	// No response yet.
 	$server_response = '';
@@ -1432,8 +1508,9 @@ 
 		$response .= $server_response;
 	}
 
-	if ($code === null)
-		return substr($server_response, 0, 3);
+	if ($code === null) {
+			return substr($server_response, 0, 3);
+	}
 
 	if (substr($server_response, 0, 3) != $code)
 	{
@@ -1463,8 +1540,9 @@ 
 	// Create a pspell or enchant dictionary resource
 	$dict = spell_init();
 
-	if (!isset($_POST['spellstring']) || !$dict)
-		die;
+	if (!isset($_POST['spellstring']) || !$dict) {
+			die;
+	}
 
 	// Construct a bit of Javascript code.
 	$context['spell_js'] = '
@@ -1482,8 +1560,9 @@ 
 		$check_word = explode('|', $alphas[$i]);
 
 		// If the word is a known word, or spelled right...
-		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2]))
-			continue;
+		if (in_array($smcFunc['strtolower']($check_word[0]), $known_words) || spell_check($dict, $check_word[0]) || !isset($check_word[2])) {
+					continue;
+		}
 
 		// Find the word, and move up the "last occurrence" to here.
 		$found_words = true;
@@ -1497,20 +1576,23 @@ 
 		if (!empty($suggestions))
 		{
 			// But first check they aren't going to be censored - no naughty words!
-			foreach ($suggestions as $k => $word)
-				if ($suggestions[$k] != censorText($word))
+			foreach ($suggestions as $k => $word) {
+							if ($suggestions[$k] != censorText($word))
 					unset($suggestions[$k]);
+			}
 
-			if (!empty($suggestions))
-				$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			if (!empty($suggestions)) {
+							$context['spell_js'] .= '"' . implode('", "', $suggestions) . '"';
+			}
 		}
 
 		$context['spell_js'] .= ']),';
 	}
 
 	// If words were found, take off the last comma.
-	if ($found_words)
-		$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	if ($found_words) {
+			$context['spell_js'] = substr($context['spell_js'], 0, -1);
+	}
 
 	$context['spell_js'] .= '
 		);';
@@ -1545,11 +1627,13 @@ 
 	global $user_info, $smcFunc;
 
 	// Can't do it if there's no topics.
-	if (empty($topics))
-		return;
+	if (empty($topics)) {
+			return;
+	}
 	// It must be an array - it must!
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
 	// Get the subject and body...
 	$result = $smcFunc['db_query']('', '
@@ -1597,14 +1681,15 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (!empty($task_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($task_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			$task_rows,
 			array('id_task')
 		);
-}
+	}
+	}
 
 /**
  * Create a post, either as new topic (id_topic = 0) or in an existing one.
@@ -1642,9 +1727,9 @@ 
 	$msgOptions['send_notifications'] = isset($msgOptions['send_notifications']) ? (bool) $msgOptions['send_notifications'] : true;
 
 	// We need to know if the topic is approved. If we're told that's great - if not find out.
-	if (!$modSettings['postmod_active'])
-		$topicOptions['is_approved'] = true;
-	elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
+	if (!$modSettings['postmod_active']) {
+			$topicOptions['is_approved'] = true;
+	} elseif (!empty($topicOptions['id']) && !isset($topicOptions['is_approved']))
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT approved
@@ -1667,8 +1752,7 @@ 
 			$posterOptions['id'] = 0;
 			$posterOptions['name'] = $txt['guest_title'];
 			$posterOptions['email'] = '';
-		}
-		elseif ($posterOptions['id'] != $user_info['id'])
+		} elseif ($posterOptions['id'] != $user_info['id'])
 		{
 			$request = $smcFunc['db_query']('', '
 				SELECT member_name, email_address
@@ -1686,12 +1770,11 @@ 
 				$posterOptions['id'] = 0;
 				$posterOptions['name'] = $txt['guest_title'];
 				$posterOptions['email'] = '';
+			} else {
+							list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			}
-			else
-				list ($posterOptions['name'], $posterOptions['email']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$posterOptions['name'] = $user_info['name'];
 			$posterOptions['email'] = $user_info['email'];
@@ -1701,8 +1784,9 @@ 
 	if (!empty($modSettings['enable_mentions']))
 	{
 		$msgOptions['mentioned_members'] = Mentions::getMentionedMembers($msgOptions['body']);
-		if (!empty($msgOptions['mentioned_members']))
-			$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		if (!empty($msgOptions['mentioned_members'])) {
+					$msgOptions['body'] = Mentions::getBody($msgOptions['body'], $msgOptions['mentioned_members']);
+		}
 	}
 
 	// It's do or die time: forget any user aborts!
@@ -1735,12 +1819,13 @@ 
 	);
 
 	// Something went wrong creating the message...
-	if (empty($msgOptions['id']))
-		return false;
+	if (empty($msgOptions['id'])) {
+			return false;
+	}
 
 	// Fix the attachments.
-	if (!empty($msgOptions['attachments']))
-		$smcFunc['db_query']('', '
+	if (!empty($msgOptions['attachments'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}attachments
 			SET id_msg = {int:id_msg}
 			WHERE id_attach IN ({array_int:attachment_list})',
@@ -1749,6 +1834,7 @@ 
 				'id_msg' => $msgOptions['id'],
 			)
 		);
+	}
 
 	// What if we want to export new posts out to a CMS?
 	call_integration_hook('integrate_after_create_post', array($msgOptions, $topicOptions, $posterOptions, $message_columns, $message_parameters));
@@ -1825,20 +1911,23 @@ 
 			'id_topic' => $topicOptions['id'],
 			'counter_increment' => 1,
 		);
-		if ($msgOptions['approved'])
-			$topics_columns = array(
+		if ($msgOptions['approved']) {
+					$topics_columns = array(
 				'id_member_updated = {int:poster_id}',
 				'id_last_msg = {int:id_msg}',
 				'num_replies = num_replies + {int:counter_increment}',
 			);
-		else
-			$topics_columns = array(
+		} else {
+					$topics_columns = array(
 				'unapproved_posts = unapproved_posts + {int:counter_increment}',
 			);
-		if ($topicOptions['lock_mode'] !== null)
-			$topics_columns[] = 'locked = {int:locked}';
-		if ($topicOptions['sticky_mode'] !== null)
-			$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
+		if ($topicOptions['lock_mode'] !== null) {
+					$topics_columns[] = 'locked = {int:locked}';
+		}
+		if ($topicOptions['sticky_mode'] !== null) {
+					$topics_columns[] = 'is_sticky = {int:is_sticky}';
+		}
 
 		call_integration_hook('integrate_modify_topic', array(&$topics_columns, &$update_parameters, &$msgOptions, &$topicOptions, &$posterOptions));
 
@@ -1867,8 +1956,8 @@ 
 	);
 
 	// Increase the number of posts and topics on the board.
-	if ($msgOptions['approved'])
-		$smcFunc['db_query']('', '
+	if ($msgOptions['approved']) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + 1' . ($new_topic ? ', num_topics = num_topics + 1' : '') . '
 			WHERE id_board = {int:id_board}',
@@ -1876,7 +1965,7 @@ 
 				'id_board' => $topicOptions['board'],
 			)
 		);
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
@@ -1946,8 +2035,8 @@ 
 		}
 	}
 
-	if ($msgOptions['approved'] && empty($topicOptions['is_approved']))
-		$smcFunc['db_insert']('',
+	if ($msgOptions['approved'] && empty($topicOptions['is_approved'])) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array(
@@ -1959,19 +2048,22 @@ 
 			),
 			array('id_task')
 		);
+	}
 
 	// If there's a custom search index, it may need updating...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postCreated')))
-		$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postCreated'))) {
+			$searchAPI->postCreated($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	// Increase the post counter for the user that created the post.
 	if (!empty($posterOptions['update_post_count']) && !empty($posterOptions['id']) && $msgOptions['approved'])
 	{
 		// Are you the one that happened to create this post?
-		if ($user_info['id'] == $posterOptions['id'])
-			$user_info['posts']++;
+		if ($user_info['id'] == $posterOptions['id']) {
+					$user_info['posts']++;
+		}
 		updateMemberData($posterOptions['id'], array('posts' => '+'));
 	}
 
@@ -1979,19 +2071,21 @@ 
 	$_SESSION['last_read_topic'] = 0;
 
 	// Better safe than sorry.
-	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']]))
-		$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	if (isset($_SESSION['topicseen_cache'][$topicOptions['board']])) {
+			$_SESSION['topicseen_cache'][$topicOptions['board']]--;
+	}
 
 	// Update all the stats so everyone knows about this new topic and message.
 	updateStats('message', true, $msgOptions['id']);
 
 	// Update the last message on the board assuming it's approved AND the topic is.
-	if ($msgOptions['approved'])
-		updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	if ($msgOptions['approved']) {
+			updateLastMessages($topicOptions['board'], $new_topic || !empty($topicOptions['is_approved']) ? $msgOptions['id'] : 0);
+	}
 
 	// Queue createPost background notification
-	if ($msgOptions['send_notifications'] && $msgOptions['approved'])
-		$smcFunc['db_insert']('',
+	if ($msgOptions['send_notifications'] && $msgOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}background_tasks',
 			array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 			array('$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', $smcFunc['json_encode'](array(
@@ -2002,6 +2096,7 @@ 
 			)), 0),
 			array('id_task')
 		);
+	}
 
 	// Alright, done now... we can abort now, I guess... at least this much is done.
 	ignore_user_abort($previous_ignore_user_abort);
@@ -2028,14 +2123,18 @@ 
 
 	// This is longer than it has to be, but makes it so we only set/change what we have to.
 	$messages_columns = array();
-	if (isset($posterOptions['name']))
-		$messages_columns['poster_name'] = $posterOptions['name'];
-	if (isset($posterOptions['email']))
-		$messages_columns['poster_email'] = $posterOptions['email'];
-	if (isset($msgOptions['icon']))
-		$messages_columns['icon'] = $msgOptions['icon'];
-	if (isset($msgOptions['subject']))
-		$messages_columns['subject'] = $msgOptions['subject'];
+	if (isset($posterOptions['name'])) {
+			$messages_columns['poster_name'] = $posterOptions['name'];
+	}
+	if (isset($posterOptions['email'])) {
+			$messages_columns['poster_email'] = $posterOptions['email'];
+	}
+	if (isset($msgOptions['icon'])) {
+			$messages_columns['icon'] = $msgOptions['icon'];
+	}
+	if (isset($msgOptions['subject'])) {
+			$messages_columns['subject'] = $msgOptions['subject'];
+	}
 	if (isset($msgOptions['body']))
 	{
 		$messages_columns['body'] = $msgOptions['body'];
@@ -2062,8 +2161,9 @@ 
 		$messages_columns['modified_reason'] = $msgOptions['modify_reason'];
 		$messages_columns['id_msg_modified'] = $modSettings['maxMsgID'];
 	}
-	if (isset($msgOptions['smileys_enabled']))
-		$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	if (isset($msgOptions['smileys_enabled'])) {
+			$messages_columns['smileys_enabled'] = empty($msgOptions['smileys_enabled']) ? 0 : 1;
+	}
 
 	// Which columns need to be ints?
 	$messageInts = array('modified_time', 'id_msg_modified', 'smileys_enabled');
@@ -2081,23 +2181,27 @@ 
 		{
 			preg_match_all('/\[member\=([0-9]+)\]([^\[]*)\[\/member\]/U', $msgOptions['old_body'], $match);
 
-			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2]))
-				foreach ($match[1] as $i => $oldID)
+			if (isset($match[1]) && isset($match[2]) && is_array($match[1]) && is_array($match[2])) {
+							foreach ($match[1] as $i => $oldID)
 					$oldmentions[$oldID] = array('id' => $oldID, 'real_name' => $match[2][$i]);
+			}
 
-			if (empty($modSettings['search_custom_index_config']))
-				unset($msgOptions['old_body']);
+			if (empty($modSettings['search_custom_index_config'])) {
+							unset($msgOptions['old_body']);
+			}
 		}
 
 		$mentions = Mentions::getMentionedMembers($msgOptions['body']);
 		$messages_columns['body'] = $msgOptions['body'] = Mentions::getBody($msgOptions['body'], $mentions);
 
 		// Remove the poster.
-		if (isset($mentions[$user_info['id']]))
-			unset($mentions[$user_info['id']]);
+		if (isset($mentions[$user_info['id']])) {
+					unset($mentions[$user_info['id']]);
+		}
 
-		if (isset($oldmentions[$user_info['id']]))
-			unset($oldmentions[$user_info['id']]);
+		if (isset($oldmentions[$user_info['id']])) {
+					unset($oldmentions[$user_info['id']]);
+		}
 
 		if (is_array($mentions) && is_array($oldmentions) && count(array_diff_key($mentions, $oldmentions)) > 0 && count($mentions) > count($oldmentions))
 		{
@@ -2127,8 +2231,9 @@ 
 	}
 
 	// Nothing to do?
-	if (empty($messages_columns))
-		return true;
+	if (empty($messages_columns)) {
+			return true;
+	}
 
 	// Change the post.
 	$smcFunc['db_query']('', '
@@ -2189,8 +2294,9 @@ 
 	// If there's a custom search index, it needs to be modified...
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'postModified')))
-		$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	if (is_callable(array($searchAPI, 'postModified'))) {
+			$searchAPI->postModified($msgOptions, $topicOptions, $posterOptions);
+	}
 
 	if (isset($msgOptions['subject']))
 	{
@@ -2204,14 +2310,16 @@ 
 				'id_first_msg' => $msgOptions['id'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 1)
-			updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					updateStats('subject', $topicOptions['id'], $msgOptions['subject']);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Finally, if we are setting the approved state we need to do much more work :(
-	if ($modSettings['postmod_active'] && isset($msgOptions['approved']))
-		approvePosts($msgOptions['id'], $msgOptions['approved']);
+	if ($modSettings['postmod_active'] && isset($msgOptions['approved'])) {
+			approvePosts($msgOptions['id'], $msgOptions['approved']);
+	}
 
 	return true;
 }
@@ -2228,11 +2336,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($msgs))
-		$msgs = array($msgs);
+	if (!is_array($msgs)) {
+			$msgs = array($msgs);
+	}
 
-	if (empty($msgs))
-		return false;
+	if (empty($msgs)) {
+			return false;
+	}
 
 	// May as well start at the beginning, working out *what* we need to change.
 	$request = $smcFunc['db_query']('', '
@@ -2264,20 +2374,22 @@ 
 		$topics[] = $row['id_topic'];
 
 		// Ensure our change array exists already.
-		if (!isset($topic_changes[$row['id_topic']]))
-			$topic_changes[$row['id_topic']] = array(
+		if (!isset($topic_changes[$row['id_topic']])) {
+					$topic_changes[$row['id_topic']] = array(
 				'id_last_msg' => $row['id_last_msg'],
 				'approved' => $row['topic_approved'],
 				'replies' => 0,
 				'unapproved_posts' => 0,
 			);
-		if (!isset($board_changes[$row['id_board']]))
-			$board_changes[$row['id_board']] = array(
+		}
+		if (!isset($board_changes[$row['id_board']])) {
+					$board_changes[$row['id_board']] = array(
 				'posts' => 0,
 				'topics' => 0,
 				'unapproved_posts' => 0,
 				'unapproved_topics' => 0,
 			);
+		}
 
 		// If it's the first message then the topic state changes!
 		if ($row['id_msg'] == $row['id_first_msg'])
@@ -2298,14 +2410,13 @@ 
 				'poster' => $row['id_member'],
 				'new_topic' => true,
 			);
-		}
-		else
+		} else
 		{
 			$topic_changes[$row['id_topic']]['replies'] += $approve ? 1 : -1;
 
 			// This will be a post... but don't notify unless it's not followed by approved ones.
-			if ($row['id_msg'] > $row['id_last_msg'])
-				$notification_posts[$row['id_topic']] = array(
+			if ($row['id_msg'] > $row['id_last_msg']) {
+							$notification_posts[$row['id_topic']] = array(
 					'id' => $row['id_msg'],
 					'body' => $row['body'],
 					'subject' => $row['subject'],
@@ -2316,28 +2427,33 @@ 
 					'new_topic' => false,
 					'msg' => $row['id_msg'],
 				);
+			}
 		}
 
 		// If this is being approved and id_msg is higher than the current id_last_msg then it changes.
-		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg'])
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		if ($approve && $row['id_msg'] > $topic_changes[$row['id_topic']]['id_last_msg']) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_msg'];
+		}
 		// If this is being unapproved, and it's equal to the id_last_msg we need to find a new one!
-		elseif (!$approve)
-			// Default to the first message and then we'll override in a bit ;)
+		elseif (!$approve) {
+					// Default to the first message and then we'll override in a bit ;)
 			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_first_msg'];
+		}
 
 		$topic_changes[$row['id_topic']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['unapproved_posts'] += $approve ? -1 : 1;
 		$board_changes[$row['id_board']]['posts'] += $approve ? 1 : -1;
 
 		// Post count for the user?
-		if ($row['id_member'] && empty($row['count_posts']))
-			$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		if ($row['id_member'] && empty($row['count_posts'])) {
+					$member_post_changes[$row['id_member']] = isset($member_post_changes[$row['id_member']]) ? $member_post_changes[$row['id_member']] + 1 : 1;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($msgs))
-		return;
+	if (empty($msgs)) {
+			return;
+	}
 
 	// Now we have the differences make the changes, first the easy one.
 	$smcFunc['db_query']('', '
@@ -2364,14 +2480,15 @@ 
 				'approved' => 1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$topic_changes[$row['id_topic']]['id_last_msg'] = $row['id_last_msg'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// ... next the topics...
-	foreach ($topic_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($topic_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}topics
 			SET approved = {int:approved}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_replies = num_replies + {int:num_replies}, id_last_msg = {int:id_last_msg}
@@ -2384,10 +2501,11 @@ 
 				'id_topic' => $id,
 			)
 		);
+	}
 
 	// ... finally the boards...
-	foreach ($board_changes as $id => $changes)
-		$smcFunc['db_query']('', '
+	foreach ($board_changes as $id => $changes) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}boards
 			SET num_posts = num_posts + {int:num_posts}, unapproved_posts = unapproved_posts + {int:unapproved_posts},
 				num_topics = num_topics + {int:num_topics}, unapproved_topics = unapproved_topics + {int:unapproved_topics}
@@ -2400,13 +2518,14 @@ 
 				'id_board' => $id,
 			)
 		);
+	}
 
 	// Finally, least importantly, notifications!
 	if ($approve)
 	{
 		$task_rows = array();
-		foreach (array_merge($notification_topics, $notification_posts) as $topic)
-			$task_rows[] = array(
+		foreach (array_merge($notification_topics, $notification_posts) as $topic) {
+					$task_rows[] = array(
 				'$sourcedir/tasks/CreatePost-Notify.php', 'CreatePost_Notify_Background', $smcFunc['json_encode'](array(
 					'msgOptions' => array(
 						'id' => $topic['msg'],
@@ -2424,14 +2543,16 @@ 
 					'type' => $topic['new_topic'] ? 'topic' : 'reply',
 				)), 0
 			);
+		}
 
-		if ($notify)
-			$smcFunc['db_insert']('',
+		if ($notify) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}background_tasks',
 				array('task_file' => 'string', 'task_class' => 'string', 'task_data' => 'string', 'claimed_time' => 'int'),
 				$task_rows,
 				array('id_task')
 			);
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}approval_queue
@@ -2447,8 +2568,9 @@ 
 	else
 	{
 		$msgInserts = array();
-		foreach ($msgs as $msg)
-			$msgInserts[] = array($msg);
+		foreach ($msgs as $msg) {
+					$msgInserts[] = array($msg);
+		}
 
 		$smcFunc['db_insert']('ignore',
 			'{db_prefix}approval_queue',
@@ -2462,9 +2584,10 @@ 
 	updateLastMessages(array_keys($board_changes));
 
 	// Post count for the members?
-	if (!empty($member_post_changes))
-		foreach ($member_post_changes as $id_member => $count_change)
+	if (!empty($member_post_changes)) {
+			foreach ($member_post_changes as $id_member => $count_change)
 			updateMemberData($id_member, array('posts' => 'posts ' . ($approve ? '+' : '-') . ' ' . $count_change));
+	}
 
 	return true;
 }
@@ -2481,11 +2604,13 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($topics))
-		$topics = array($topics);
+	if (!is_array($topics)) {
+			$topics = array($topics);
+	}
 
-	if (empty($topics))
-		return false;
+	if (empty($topics)) {
+			return false;
+	}
 
 	$approve_type = $approve ? 0 : 1;
 
@@ -2501,8 +2626,9 @@ 
 		)
 	);
 	$msgs = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$msgs[] = $row['id_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$msgs[] = $row['id_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return approvePosts($msgs, $approve);
@@ -2525,11 +2651,13 @@ 
 	global $board_info, $board, $smcFunc;
 
 	// Please - let's be sane.
-	if (empty($setboards))
-		return false;
+	if (empty($setboards)) {
+			return false;
+	}
 
-	if (!is_array($setboards))
-		$setboards = array($setboards);
+	if (!is_array($setboards)) {
+			$setboards = array($setboards);
+	}
 
 	// If we don't know the id_msg we need to find it.
 	if (!$id_msg)
@@ -2547,15 +2675,16 @@ 
 			)
 		);
 		$lastMsg = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$lastMsg[$row['id_board']] = $row['id_msg'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$lastMsg[$row['id_board']] = $row['id_msg'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Just to note - there should only be one board passed if we are doing this.
-		foreach ($setboards as $id_board)
-			$lastMsg[$id_board] = $id_msg;
+		foreach ($setboards as $id_board) {
+					$lastMsg[$id_board] = $id_msg;
+		}
 	}
 
 	$parent_boards = array();
@@ -2570,10 +2699,11 @@ 
 			$lastModified[$id_board] = 0;
 		}
 
-		if (!empty($board) && $id_board == $board)
-			$parents = $board_info['parent_boards'];
-		else
-			$parents = getBoardParents($id_board);
+		if (!empty($board) && $id_board == $board) {
+					$parents = $board_info['parent_boards'];
+		} else {
+					$parents = getBoardParents($id_board);
+		}
 
 		// Ignore any parents on the top child level.
 		// @todo Why?
@@ -2582,10 +2712,11 @@ 
 			if ($parent['level'] != 0)
 			{
 				// If we're already doing this one as a board, is this a higher last modified?
-				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id])
-					$lastModified[$id] = $lastModified[$id_board];
-				elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board]))
-					$parent_boards[$id] = $lastModified[$id_board];
+				if (isset($lastModified[$id]) && $lastModified[$id_board] > $lastModified[$id]) {
+									$lastModified[$id] = $lastModified[$id_board];
+				} elseif (!isset($lastModified[$id]) && (!isset($parent_boards[$id]) || $parent_boards[$id] < $lastModified[$id_board])) {
+									$parent_boards[$id] = $lastModified[$id_board];
+				}
 			}
 		}
 	}
@@ -2598,23 +2729,24 @@ 
 	// Finally, to save on queries make the changes...
 	foreach ($parent_boards as $id => $msg)
 	{
-		if (!isset($parent_updates[$msg]))
-			$parent_updates[$msg] = array($id);
-		else
-			$parent_updates[$msg][] = $id;
+		if (!isset($parent_updates[$msg])) {
+					$parent_updates[$msg] = array($id);
+		} else {
+					$parent_updates[$msg][] = $id;
+		}
 	}
 
 	foreach ($lastMsg as $id => $msg)
 	{
-		if (!isset($board_updates[$msg . '-' . $lastModified[$id]]))
-			$board_updates[$msg . '-' . $lastModified[$id]] = array(
+		if (!isset($board_updates[$msg . '-' . $lastModified[$id]])) {
+					$board_updates[$msg . '-' . $lastModified[$id]] = array(
 				'id' => $msg,
 				'updated' => $lastModified[$id],
 				'boards' => array($id)
 			);
-
-		else
-			$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		} else {
+					$board_updates[$msg . '-' . $lastModified[$id]]['boards'][] = $id;
+		}
 	}
 
 	// Now commit the changes!
@@ -2706,11 +2838,13 @@ 
 	global $txt, $mbname, $scripturl, $settings;
 
 	// First things first, load up the email templates language file, if we need to.
-	if ($loadLang)
-		loadLanguage('EmailTemplates', $lang);
+	if ($loadLang) {
+			loadLanguage('EmailTemplates', $lang);
+	}
 
-	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body']))
-		fatal_lang_error('email_no_template', 'template', array($template));
+	if (!isset($txt[$template . '_subject']) || !isset($txt[$template . '_body'])) {
+			fatal_lang_error('email_no_template', 'template', array($template));
+	}
 
 	$ret = array(
 		'subject' => $txt[$template . '_subject'],
@@ -2760,17 +2894,18 @@ 
 function user_info_callback($matches)
 {
 	global $user_info;
-	if (empty($matches[1]))
-		return '';
+	if (empty($matches[1])) {
+			return '';
+	}
 
 	$use_ref = true;
 	$ref = &$user_info;
 
 	foreach (explode('.', $matches[1]) as $index)
 	{
-		if ($use_ref && isset($ref[$index]))
-			$ref = &$ref[$index];
-		else
+		if ($use_ref && isset($ref[$index])) {
+					$ref = &$ref[$index];
+		} else
 		{
 			$use_ref = false;
 			break;
@@ -2807,8 +2942,7 @@ 
 		if (!empty($lang_locale) && enchant_broker_dict_exists($context['enchant_broker'], $lang_locale))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $lang_locale);
-		}
-		elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
+		} elseif (enchant_broker_dict_exists($context['enchant_broker'], $txt['lang_dictionary']))
 		{
 			$enchant_link = enchant_broker_request_dict($context['enchant_broker'], $txt['lang_dictionary']);
 		}
@@ -2818,8 +2952,7 @@ 
 		{
 			$context['provider'] = 'enchant';
 			return $enchant_link;
-		}
-		else
+		} else
 		{
 			// Free up any resources used...
 			@enchant_broker_free($context['enchant_broker']);
@@ -2840,8 +2973,9 @@ 
 		$pspell_link = pspell_new($txt['lang_dictionary'], $txt['lang_spelling'], '', strtr($context['character_set'], array('iso-' => 'iso', 'ISO-' => 'iso')), PSPELL_FAST | PSPELL_RUN_TOGETHER);
 
 		// Most people don't have anything but English installed... So we use English as a last resort.
-		if (!$pspell_link)
-			$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		if (!$pspell_link) {
+					$pspell_link = pspell_new('en', '', '', '', PSPELL_FAST | PSPELL_RUN_TOGETHER);
+		}
 
 		error_reporting($old);
 		ob_end_clean();
@@ -2881,8 +3015,7 @@ 
 			$word = iconv($txt['lang_character_set'], 'UTF-8', $word);
 		}
 		return enchant_dict_check($dict, $word);
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_check($dict, $word);
 	}
@@ -2918,13 +3051,11 @@ 
 			}
 
 			return $suggestions;
-		}
-		else
+		} else
 		{
 			return enchant_dict_suggest($dict, $word);
 		}
-	}
-	elseif ($context['provider'] == 'pspell')
+	} elseif ($context['provider'] == 'pspell')
 	{
 		return pspell_suggest($dict, $word);
 	}

Sources/ManageMembergroups.php

Braces +128 added lines, -88 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 
 /**
@@ -44,8 +45,9 @@ 
 	$_REQUEST['sa'] = isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]) ? $_REQUEST['sa'] : (allowedTo('manage_membergroups') ? 'index' : 'settings');
 
 	// Is it elsewhere?
-	if (isset($subActions[$_REQUEST['sa']][2]))
-		require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	if (isset($subActions[$_REQUEST['sa']][2])) {
+			require_once($sourcedir . '/' . $subActions[$_REQUEST['sa']][2]);
+	}
 
 	// Do the permission check, you might not be allowed her.
 	isAllowedTo($subActions[$_REQUEST['sa']][1]);
@@ -104,19 +106,20 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 							$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -329,12 +332,14 @@ 
 		call_integration_hook('integrate_add_membergroup', array($id_group, $postCountBasedGroup));
 
 		// Update the post groups now, if this is a post group!
-		if (isset($_POST['min_posts']))
-			updateStats('postgroups');
+		if (isset($_POST['min_posts'])) {
+					updateStats('postgroups');
+		}
 
 		// You cannot set permissions for post groups if they are disabled.
-		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups']))
-			$_POST['perm_type'] = '';
+		if ($postCountBasedGroup && empty($modSettings['permission_enable_postgroups'])) {
+					$_POST['perm_type'] = '';
+		}
 
 		if ($_POST['perm_type'] == 'predefined')
 		{
@@ -364,8 +369,9 @@ 
 				$smcFunc['db_free_result']($request);
 
 				// Protected groups are... well, protected!
-				if ($copy_type == 1)
-					fatal_lang_error('membergroup_does_not_exist');
+				if ($copy_type == 1) {
+									fatal_lang_error('membergroup_does_not_exist');
+				}
 			}
 
 			// Don't allow copying of a real priviledged person!
@@ -383,18 +389,20 @@ 
 			$inserts = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions']))
-					$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				if (empty($context['illegal_permissions']) || !in_array($row['permission'], $context['illegal_permissions'])) {
+									$inserts[] = array($id_group, $row['permission'], $row['add_deny']);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}permissions',
 					array('id_group' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'permission')
 				);
+			}
 
 			$request = $smcFunc['db_query']('', '
 				SELECT id_profile, permission, add_deny
@@ -405,17 +413,19 @@ 
 				)
 			);
 			$inserts = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$inserts[] = array($id_group, $row['id_profile'], $row['permission'], $row['add_deny']);
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($inserts))
-				$smcFunc['db_insert']('insert',
+			if (!empty($inserts)) {
+							$smcFunc['db_insert']('insert',
 					'{db_prefix}board_permissions',
 					array('id_group' => 'int', 'id_profile' => 'int', 'permission' => 'string', 'add_deny' => 'int'),
 					$inserts,
 					array('id_group', 'id_profile', 'permission')
 				);
+			}
 
 			// Also get some membergroup information if we're copying and not copying from guests...
 			if ($copy_id > 0 && $_POST['perm_type'] == 'copy')
@@ -468,14 +478,15 @@ 
 		$changed_boards['allow'] = array();
 		$changed_boards['deny'] = array();
 		$changed_boards['ignore'] = array();
-		foreach ($accesses as $group_id => $action)
-			$changed_boards[$action][] = (int) $group_id;
+		foreach ($accesses as $group_id => $action) {
+					$changed_boards[$action][] = (int) $group_id;
+		}
 
 		foreach (array('allow', 'deny') as $board_action)
 		{
 			// Only do this if they have special access requirements.
-			if (!empty($changed_boards[$board_action]))
-				$smcFunc['db_query']('', '
+			if (!empty($changed_boards[$board_action])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 					WHERE id_board IN ({array_int:board_list})',
@@ -487,11 +498,13 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
+			}
 		}
 
 		// If this is joinable then set it to show group membership in people's profiles.
-		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1)
-			updateSettings(array('show_group_membership' => 1));
+		if (empty($modSettings['show_group_membership']) && $_POST['group_type'] > 1) {
+					updateSettings(array('show_group_membership' => 1));
+		}
 
 		// Rebuild the group cache.
 		updateSettings(array(
@@ -512,8 +525,9 @@ 
 	$context['undefined_group'] = !isset($_REQUEST['postgroup']) && !isset($_REQUEST['generalgroup']);
 	$context['allow_protected'] = allowedTo('admin_forum');
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	$result = $smcFunc['db_query']('', '
 		SELECT id_group, group_name
@@ -530,11 +544,12 @@ 
 		)
 	);
 	$context['groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($result))
-		$context['groups'][] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($result)) {
+			$context['groups'][] = array(
 			'id' => $row['id_group'],
 			'name' => $row['group_name']
 		);
+	}
 	$smcFunc['db_free_result']($result);
 
 	$request = $smcFunc['db_query']('', '
@@ -551,12 +566,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(
@@ -604,8 +620,9 @@ 
 	require_once($sourcedir . '/Subs-Membergroups.php');
 	$result = deleteMembergroups((int) $_REQUEST['group']);
 	// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-	if ($result === 'group_cannot_delete_sub')
-		fatal_lang_error('membergroups_cannot_delete_paid', false);
+	if ($result === 'group_cannot_delete_sub') {
+			fatal_lang_error('membergroups_cannot_delete_paid', false);
+	}
 
 	// Go back to the membergroup index.
 	redirectexit('action=admin;area=membergroups;');
@@ -627,8 +644,9 @@ 
 
 	$_REQUEST['group'] = isset($_REQUEST['group']) && $_REQUEST['group'] > 0 ? (int) $_REQUEST['group'] : 0;
 
-	if (!empty($modSettings['deny_boards_access']))
-		loadLanguage('ManagePermissions');
+	if (!empty($modSettings['deny_boards_access'])) {
+			loadLanguage('ManagePermissions');
+	}
 
 	// Make sure this group is editable.
 	if (!empty($_REQUEST['group']))
@@ -650,8 +668,9 @@ 
 	}
 
 	// Now, do we have a valid id?
-	if (empty($_REQUEST['group']))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (empty($_REQUEST['group'])) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// People who can manage boards are a bit special.
 	require_once($sourcedir . '/Subs-Members.php');
@@ -682,8 +701,9 @@ 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		$result = deleteMembergroups($_REQUEST['group']);
 		// Need to throw a warning if it went wrong, but this is the only one we have a message for...
-		if ($result === 'group_cannot_delete_sub')
-			fatal_lang_error('membergroups_cannot_delete_paid', false);
+		if ($result === 'group_cannot_delete_sub') {
+					fatal_lang_error('membergroups_cannot_delete_paid', false);
+		}
 
 		redirectexit('action=admin;area=membergroups;');
 	}
@@ -760,16 +780,18 @@ 
 				$request = $smcFunc['db_query']('', '
 					SELECT id_board
 					FROM {db_prefix}boards');
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$accesses[(int) $row['id_board']] = 'allow';
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$accesses[(int) $row['id_board']] = 'allow';
+				}
 				$smcFunc['db_free_result']($request);
 			}
 
 			$changed_boards['allow'] = array();
 			$changed_boards['deny'] = array();
 			$changed_boards['ignore'] = array();
-			foreach ($accesses as $group_id => $action)
-				$changed_boards[$action][] = (int) $group_id;
+			foreach ($accesses as $group_id => $action) {
+							$changed_boards[$action][] = (int) $group_id;
+			}
 
 			foreach (array('allow', 'deny') as $board_action)
 			{
@@ -785,8 +807,8 @@ 
 						'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$smcFunc['db_query']('', '
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = {string:member_group_access}
 						WHERE id_board = {int:current_board}',
@@ -796,11 +818,12 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Add the membergroup to all boards that hadn't been set yet.
-				if (!empty($changed_boards[$board_action]))
-					$smcFunc['db_query']('', '
+				if (!empty($changed_boards[$board_action])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}boards
 						SET {raw:column} = CASE WHEN {raw:column} = {string:blank_string} THEN {string:group_id_string} ELSE CONCAT({raw:column}, {string:comma_group}) END
 						WHERE id_board IN ({array_int:board_list})
@@ -814,6 +837,7 @@ 
 							'column' => $board_action == 'allow' ? 'member_groups' : 'deny_member_groups',
 						)
 					);
+				}
 			}
 		}
 
@@ -839,12 +863,14 @@ 
 				)
 			);
 			$updates = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$updates[$row['additional_groups']][] = $row['id_member'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$updates[$row['additional_groups']][] = $row['id_member'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			foreach ($updates as $additional_groups => $memberArray)
-				updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			foreach ($updates as $additional_groups => $memberArray) {
+							updateMemberData($memberArray, array('additional_groups' => implode(',', array_diff(explode(',', $additional_groups), array((int) $_REQUEST['group'])))));
+			}
 
 			// Sorry, but post groups can't moderate boards
 			$smcFunc['db_query']('', '
@@ -854,8 +880,7 @@ 
 					'current_group' => (int) $_REQUEST['group'],
 				)
 			);
-		}
-		elseif ($_REQUEST['group'] != 3)
+		} elseif ($_REQUEST['group'] != 3)
 		{
 			// Making it a hidden group? If so remove everyone with it as primary group (Actually, just make them additional).
 			if ($_POST['group_hidden'] == 2)
@@ -870,8 +895,9 @@ 
 					)
 				);
 				$updates = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$updates[$row['additional_groups']][] = $row['id_member'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$updates[$row['additional_groups']][] = $row['id_member'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				foreach ($updates as $additional_groups => $memberArray)
@@ -913,8 +939,9 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// Do we need to update the setting?
-			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable))
-				updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			if ((empty($modSettings['show_group_membership']) && $have_joinable) || (!empty($modSettings['show_group_membership']) && !$have_joinable)) {
+							updateSettings(array('show_group_membership' => $have_joinable ? 1 : 0));
+			}
 		}
 
 		// Do we need to set inherited permissions?
@@ -947,8 +974,9 @@ 
 				{
 					$moderators[$k] = trim($moderators[$k]);
 
-					if (strlen($moderators[$k]) == 0)
-						unset($moderators[$k]);
+					if (strlen($moderators[$k]) == 0) {
+											unset($moderators[$k]);
+					}
 				}
 
 				// Find all the id_member's for the member_name's in the list.
@@ -964,8 +992,9 @@ 
 							'count' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -973,8 +1002,9 @@ 
 			if (!empty($_POST['moderator_list']))
 			{
 				$moderators = array();
-				foreach ($_POST['moderator_list'] as $moderator)
-					$moderators[] = (int) $moderator;
+				foreach ($_POST['moderator_list'] as $moderator) {
+									$moderators[] = (int) $moderator;
+				}
 
 				if (!empty($moderators))
 				{
@@ -988,8 +1018,9 @@ 
 							'num_moderators' => count($moderators),
 						)
 					);
-					while ($row = $smcFunc['db_fetch_assoc']($request))
-						$group_moderators[] = $row['id_member'];
+					while ($row = $smcFunc['db_fetch_assoc']($request)) {
+											$group_moderators[] = $row['id_member'];
+					}
 					$smcFunc['db_free_result']($request);
 				}
 			}
@@ -1001,8 +1032,9 @@ 
 			if (!empty($group_moderators))
 			{
 				$mod_insert = array();
-				foreach ($group_moderators as $moderator)
-					$mod_insert[] = array($_REQUEST['group'], $moderator);
+				foreach ($group_moderators as $moderator) {
+									$mod_insert[] = array($_REQUEST['group'], $moderator);
+				}
 
 				$smcFunc['db_insert']('insert',
 					'{db_prefix}group_moderators',
@@ -1036,8 +1068,9 @@ 
 			'current_group' => (int) $_REQUEST['group'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -1074,14 +1107,16 @@ 
 		)
 	);
 	$context['group']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['group']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['group']['moderator_list'] = empty($context['group']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['group']['moderators']) . '&quot;';
 
-	if (!empty($context['group']['moderators']))
-		list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	if (!empty($context['group']['moderators'])) {
+			list ($context['group']['last_moderator_id']) = array_slice(array_keys($context['group']['moderators']), -1);
+	}
 
 	// Get a list of boards this membergroup is allowed to see.
 	$context['boards'] = array();
@@ -1101,12 +1136,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(
@@ -1154,19 +1190,22 @@ 
 				$image_info = getimagesize($settings['default_theme_dir'] . '/images/membericons/' . $value);
 
 				// If this is bigger than 128 in width or 32 in height, skip this one.
-				if ($image_info == false || $image_info[0] > 128 || $image_info[1] > 32)
-					continue;
+				if ($image_info == false || $image_info[0] > 128 || $image_info[1] > 32) {
+									continue;
+				}
 
 				// Else it's valid. Add it in.
-				else
-					$context['possible_icons'][] = $value;
+				else {
+									$context['possible_icons'][] = $value;
+				}
 			}
 		}
 	}
 
 	// Insert our JS, if we have possible icons.
-	if (!empty($context['possible_icons']))
-		loadJavaScriptFile('icondropdown.js', array('validate' => true, 'minimize' => true), 'smf_icondropdown');
+	if (!empty($context['possible_icons'])) {
+			loadJavaScriptFile('icondropdown.js', array('validate' => true, 'minimize' => true), 'smf_icondropdown');
+	}
 
 	loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
 
@@ -1188,8 +1227,9 @@ 
 		)
 	);
 	$context['inheritable_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['inheritable_groups'][$row['id_group']] = $row['group_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	call_integration_hook('integrate_view_membergroup');

Sources/PersonalMessage.php

Braces +633 added lines, -471 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This helps organize things...
@@ -37,13 +38,14 @@ 
 
 	loadLanguage('PersonalMessage+Drafts');
 
-	if (!isset($_REQUEST['xml']))
-		loadTemplate('PersonalMessage');
+	if (!isset($_REQUEST['xml'])) {
+			loadTemplate('PersonalMessage');
+	}
 
 	// Load up the members maximum message capacity.
-	if ($user_info['is_admin'])
-		$context['message_limit'] = 0;
-	elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
+	if ($user_info['is_admin']) {
+			$context['message_limit'] = 0;
+	} elseif (($context['message_limit'] = cache_get_data('msgLimit:' . $user_info['id'], 360)) === null)
 	{
 		// @todo Why do we do this?  It seems like if they have any limit we should use it.
 		$request = $smcFunc['db_query']('', '
@@ -78,8 +80,9 @@ 
 	}
 
 	// a previous message was sent successfully? show a small indication.
-	if (isset($_GET['done']) && ($_GET['done'] == 'sent'))
-		$context['pm_sent'] = true;
+	if (isset($_GET['done']) && ($_GET['done'] == 'sent')) {
+			$context['pm_sent'] = true;
+	}
 
 	$context['labels'] = array();
 
@@ -210,11 +213,11 @@ 
 	{
 		$_REQUEST['sa'] = '';
 		MessageFolder();
-	}
-	else
+	} else
 	{
-		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup')
-			messageIndexBar($_REQUEST['sa']);
+		if (!isset($_REQUEST['xml']) && $_REQUEST['sa'] != 'popup') {
+					messageIndexBar($_REQUEST['sa']);
+		}
 
 		call_helper($subActions[$_REQUEST['sa']]);
 	}
@@ -291,16 +294,17 @@ 
 	);
 
 	// Handle labels.
-	if (empty($context['currently_using_labels']))
-		unset($pm_areas['labels']);
-	else
+	if (empty($context['currently_using_labels'])) {
+			unset($pm_areas['labels']);
+	} else
 	{
 		// Note we send labels by id as it will have less problems in the querystring.
 		$unread_in_labels = 0;
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 			// Count the amount of unread items in labels.
 			$unread_in_labels += $label['unread_messages'];
@@ -314,8 +318,9 @@ 
 			);
 		}
 
-		if (!empty($unread_in_labels))
-			$pm_areas['labels']['title'] .= ' <span class="amt">' . $unread_in_labels . '</span>';
+		if (!empty($unread_in_labels)) {
+					$pm_areas['labels']['title'] .= ' <span class="amt">' . $unread_in_labels . '</span>';
+		}
 	}
 
 	$pm_areas['folders']['areas']['inbox']['unread_messages'] = &$context['labels'][-1]['unread_messages'];
@@ -353,8 +358,9 @@ 
 	unset($pm_areas);
 
 	// No menu means no access.
-	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession()))
-		fatal_lang_error('no_access', false);
+	if (!$pm_include_data && (!$user_info['is_guest'] || validateSession())) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['pm_menu_id'] = $context['max_menu_id'];
@@ -365,9 +371,10 @@ 
 	$context['menu_item_selected'] = $current_area;
 
 	// Set the template for this area and add the profile layer.
-	if (!isset($_REQUEST['xml']))
-		$context['template_layers'][] = 'pm';
-}
+	if (!isset($_REQUEST['xml'])) {
+			$context['template_layers'][] = 'pm';
+	}
+	}
 
 /**
  * The popup for when we ask for the popup from the user.
@@ -399,8 +406,9 @@ 
 		)
 	);
 	$pms = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$pms[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$pms[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($pms))
@@ -428,8 +436,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!empty($row['id_member_from']))
-				$senders[] = $row['id_member_from'];
+			if (!empty($row['id_member_from'])) {
+							$senders[] = $row['id_member_from'];
+			}
 
 			$row['replied_to_you'] = $row['id_pm'] != $row['id_pm_head'];
 			$row['time'] = timeformat($row['timestamp']);
@@ -439,13 +448,15 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$senders = loadMemberData($senders);
-		foreach ($senders as $member)
-			loadMemberContext($member);
+		foreach ($senders as $member) {
+					loadMemberContext($member);
+		}
 
 		// Having loaded everyone, attach them to the PMs.
-		foreach ($context['unread_pms'] as $id_pm => $details)
-			if (!empty($memberContext[$details['id_member_from']]))
+		foreach ($context['unread_pms'] as $id_pm => $details) {
+					if (!empty($memberContext[$details['id_member_from']]))
 				$context['unread_pms'][$id_pm]['member'] = &$memberContext[$details['id_member_from']];
+		}
 	}
 }
 
@@ -465,12 +476,13 @@ 
 	}
 
 	// Make sure the starting location is valid.
-	if (isset($_GET['start']) && $_GET['start'] != 'new')
-		$_GET['start'] = (int) $_GET['start'];
-	elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first']))
-		$_GET['start'] = 0;
-	else
-		$_GET['start'] = 'new';
+	if (isset($_GET['start']) && $_GET['start'] != 'new') {
+			$_GET['start'] = (int) $_GET['start'];
+	} elseif (!isset($_GET['start']) && !empty($options['view_newest_pm_first'])) {
+			$_GET['start'] = 0;
+	} else {
+			$_GET['start'] = 'new';
+	}
 
 	// Set up some basic theme stuff.
 	$context['from_or_to'] = $context['folder'] != 'sent' ? 'from' : 'to';
@@ -487,8 +499,7 @@ 
 	{
 		$labelQuery = '
 			AND pmr.in_inbox = 1';
-	}
-	elseif ($context['folder'] != 'sent')
+	} elseif ($context['folder'] != 'sent')
 	{
 		$labelJoin = '
 			INNER JOIN {db_prefix}pm_labeled_messages AS pl ON (pl.id_pm = pmr.id_pm)';
@@ -530,22 +541,24 @@ 
 	$txt['delete_all'] = str_replace('PMBOX', $pmbox, $txt['delete_all']);
 
 	// Now, build the link tree!
-	if ($context['current_label_id'] == -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] == -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'],
 			'name' => $pmbox
 		);
+	}
 
 	// Build it further for a label.
-	if ($context['current_label_id'] != -1)
-		$context['linktree'][] = array(
+	if ($context['current_label_id'] != -1) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=pm;f=' . $context['folder'] . ';l=' . $context['current_label_id'],
 			'name' => $txt['pm_current_label'] . ': ' . $context['current_label']
 		);
+	}
 
 	// Figure out how many messages there are.
-	if ($context['folder'] == 'sent')
-		$request = $smcFunc['db_query']('', '
+	if ($context['folder'] == 'sent') {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}personal_messages AS pm
 			WHERE pm.id_member_from = {int:current_member}
@@ -555,8 +568,8 @@ 
 				'not_deleted' => 0,
 			)
 		);
-	else
-		$request = $smcFunc['db_query']('', '
+	} else {
+			$request = $smcFunc['db_query']('', '
 			SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 			FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 				INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -567,6 +580,7 @@ 
 				'not_deleted' => 0,
 			)
 		);
+	}
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -575,10 +589,11 @@ 
 	$maxPerPage = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Start on the last page.
-	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages)
-		$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
-	elseif ($_GET['start'] < 0)
-		$_GET['start'] = 0;
+	if (!is_numeric($_GET['start']) || $_GET['start'] >= $max_messages) {
+			$_GET['start'] = ($max_messages - 1) - (($max_messages - 1) % $maxPerPage);
+	} elseif ($_GET['start'] < 0) {
+			$_GET['start'] = 0;
+	}
 
 	// ... but wait - what if we want to start from a specific message?
 	if (isset($_GET['pmid']))
@@ -586,19 +601,21 @@ 
 		$pmID = (int) $_GET['pmid'];
 
 		// Make sure you have access to this PM.
-		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmID, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['current_pm'] = $pmID;
 
 		// With only one page of PM's we're gonna want page 1.
-		if ($max_messages <= $maxPerPage)
-			$_GET['start'] = 0;
+		if ($max_messages <= $maxPerPage) {
+					$_GET['start'] = 0;
+		}
 		// If we pass kstart we assume we're in the right place.
 		elseif (!isset($_GET['kstart']))
 		{
-			if ($context['folder'] == 'sent')
-				$request = $smcFunc['db_query']('', '
+			if ($context['folder'] == 'sent') {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}personal_messages
 					WHERE id_member_from = {int:current_member}
@@ -610,8 +627,8 @@ 
 						'id_pm' => $pmID,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT COUNT(' . ($context['display_mode'] == 2 ? 'DISTINCT pm.id_pm_head' : '*') . ')
 					FROM {db_prefix}pm_recipients AS pmr' . ($context['display_mode'] == 2 ? '
 						INNER JOIN {db_prefix}personal_messages AS pm ON (pm.id_pm = pmr.id_pm)' : '') . $labelJoin . '
@@ -624,6 +641,7 @@ 
 						'id_pm' => $pmID,
 					)
 				);
+			}
 
 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
@@ -638,8 +656,9 @@ 
 	{
 		$pmsg = (int) $_GET['pmsg'];
 
-		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox'))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg, $context['folder'] == 'sent' ? 'outbox' : 'inbox')) {
+					fatal_lang_error('no_access', false);
+		}
 	}
 
 	// Set up the page index.
@@ -734,8 +753,9 @@ 
 	{
 		if (!isset($recipients[$row['id_pm']]))
 		{
-			if (isset($row['id_member_from']))
-				$posters[$row['id_pm']] = $row['id_member_from'];
+			if (isset($row['id_member_from'])) {
+							$posters[$row['id_pm']] = $row['id_member_from'];
+			}
 			$pms[$row['id_pm']] = $row['id_pm'];
 			$recipients[$row['id_pm']] = array(
 				'to' => array(),
@@ -744,29 +764,33 @@ 
 		}
 
 		// Keep track of the last message so we know what the head is without another query!
-		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm']))
-			$lastData = array(
+		if ((empty($pmID) && (empty($options['view_newest_pm_first']) || !isset($lastData))) || empty($lastData) || (!empty($pmID) && $pmID == $row['id_pm'])) {
+					$lastData = array(
 				'id' => $row['id_pm'],
 				'head' => $row['id_pm_head'],
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Make sure that we have been given a correct head pm id!
-	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id'])
-		fatal_lang_error('no_access', false);
+	if ($context['display_mode'] == 2 && !empty($pmID) && $pmID != $lastData['id']) {
+			fatal_lang_error('no_access', false);
+	}
 
 	if (!empty($pms))
 	{
 		// Select the correct current message.
-		if (empty($pmID))
-			$context['current_pm'] = $lastData['id'];
+		if (empty($pmID)) {
+					$context['current_pm'] = $lastData['id'];
+		}
 
 		// This is a list of the pm's that are used for "full" display.
-		if ($context['display_mode'] == 0)
-			$display_pms = $pms;
-		else
-			$display_pms = array($context['current_pm']);
+		if ($context['display_mode'] == 0) {
+					$display_pms = $pms;
+		} else {
+					$display_pms = array($context['current_pm']);
+		}
 
 		// At this point we know the main id_pm's. But - if we are looking at conversations we need the others!
 		if ($context['display_mode'] == 2)
@@ -788,16 +812,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// This is, frankly, a joke. We will put in a workaround for people sending to themselves - yawn!
-				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1)
-					continue;
-				elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1)
-					continue;
+				if ($context['folder'] == 'sent' && $row['id_member_from'] == $user_info['id'] && $row['deleted_by_sender'] == 1) {
+									continue;
+				} elseif ($row['id_member'] == $user_info['id'] & $row['deleted'] == 1) {
+									continue;
+				}
 
-				if (!isset($recipients[$row['id_pm']]))
-					$recipients[$row['id_pm']] = array(
+				if (!isset($recipients[$row['id_pm']])) {
+									$recipients[$row['id_pm']] = array(
 						'to' => array(),
 						'bcc' => array()
 					);
+				}
 				$display_pms[] = $row['id_pm'];
 				$posters[$row['id_pm']] = $row['id_member_from'];
 			}
@@ -848,8 +874,9 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -866,9 +893,10 @@ 
 		// Make sure we don't load unnecessary data.
 		if ($context['display_mode'] == 1)
 		{
-			foreach ($posters as $k => $v)
-				if (!in_array($k, $display_pms))
+			foreach ($posters as $k => $v) {
+							if (!in_array($k, $display_pms))
 					unset($posters[$k]);
+			}
 		}
 
 		// Load any users....
@@ -879,8 +907,9 @@ 
 		{
 			// Get the order right.
 			$orderBy = array();
-			foreach (array_reverse($pms) as $pm)
-				$orderBy[] = 'pm.id_pm = ' . $pm;
+			foreach (array_reverse($pms) as $pm) {
+							$orderBy[] = 'pm.id_pm = ' . $pm;
+			}
 
 			// Seperate query for these bits!
 			$subjects_request = $smcFunc['db_query']('', '
@@ -926,9 +955,9 @@ 
 			// Allow mods to add additional buttons here
 			call_integration_hook('integrate_conversation_buttons');
 		}
+	} else {
+			$messages_request = false;
 	}
-	else
-		$messages_request = false;
 
 	$context['can_send_pm'] = allowedTo('pm_send');
 	$context['can_send_email'] = allowedTo('moderate_forum');
@@ -939,11 +968,13 @@ 
 	if ($context['folder'] != 'sent' && !empty($context['labels'][(int) $context['current_label_id']]['unread_messages']))
 	{
 		// If the display mode is "old sk00l" do them all...
-		if ($context['display_mode'] == 0)
-			markMessages(null, $context['current_label_id']);
+		if ($context['display_mode'] == 0) {
+					markMessages(null, $context['current_label_id']);
+		}
 		// Otherwise do just the current one!
-		elseif (!empty($context['current_pm']))
-			markMessages($display_pms, $context['current_label_id']);
+		elseif (!empty($context['current_pm'])) {
+					markMessages($display_pms, $context['current_label_id']);
+		}
 	}
 }
 
@@ -961,8 +992,9 @@ 
 
 	// Count the current message number....
 	static $counter = null;
-	if ($counter === null || $reset)
-		$counter = $context['start'];
+	if ($counter === null || $reset) {
+			$counter = $context['start'];
+	}
 
 	static $temp_pm_selected = null;
 	if ($temp_pm_selected === null)
@@ -1007,19 +1039,22 @@ 
 	}
 
 	// Bail if it's false, ie. no messages.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Reset the data?
-	if ($reset == true)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset == true) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Get the next one... bail if anything goes wrong.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
 	if (!$message)
 	{
-		if ($type != 'subject')
-			$smcFunc['db_free_result']($messages_request);
+		if ($type != 'subject') {
+					$smcFunc['db_free_result']($messages_request);
+		}
 
 		return false;
 	}
@@ -1039,8 +1074,7 @@ 
 		$memberContext[$message['id_member_from']]['email'] = '';
 		$memberContext[$message['id_member_from']]['show_email'] = false;
 		$memberContext[$message['id_member_from']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		$memberContext[$message['id_member_from']]['can_view_profile'] = allowedTo('profile_view') || ($message['id_member_from'] == $user_info['id'] && !$user_info['is_guest']);
 		$memberContext[$message['id_member_from']]['can_see_warning'] = !isset($context['disabled_fields']['warning_status']) && $memberContext[$message['id_member_from']]['warning_status'] && ($context['user']['can_mod'] || (!empty($modSettings['warning_show']) && ($modSettings['warning_show'] > 1 || $message['id_member_from'] == $user_info['id'])));
@@ -1081,9 +1115,10 @@ 
 	$counter++;
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member_from']]['custom_fields']))
-		foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member_from']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member_from']]['custom_fields'] as $custom)
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
 	call_integration_hook('integrate_prepare_pm_context', array(&$output, &$message, $counter));
 
@@ -1107,22 +1142,28 @@ 
 			$context['search_params'][$k] = $v;
 		}
 	}
-	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 (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']['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']['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 (!empty($context['search_params']['maxage'])) {
+			$context['search_params']['maxage'] = (int) $context['search_params']['maxage'];
+	}
 
 	$context['search_params']['subject_only'] = !empty($context['search_params']['subject_only']);
 	$context['search_params']['show_complete'] = !empty($context['search_params']['show_complete']);
@@ -1149,8 +1190,9 @@ 
 		$context['search_errors']['messages'] = array();
 		foreach ($context['search_errors'] as $search_error => $dummy)
 		{
-			if ($search_error == 'messages')
-				continue;
+			if ($search_error == 'messages') {
+							continue;
+			}
 
 			$context['search_errors']['messages'][] = $txt['error_' . $search_error];
 		}
@@ -1172,8 +1214,9 @@ 
 	global $scripturl, $modSettings, $user_info, $context, $txt;
 	global $memberContext, $smcFunc;
 
-	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);
+	}
 
 	/**
 	 * @todo For the moment force the folder to the inbox.
@@ -1202,35 +1245,40 @@ 
 	$context['start'] = isset($_GET['start']) ? (int) $_GET['start'] : 0;
 
 	// 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'];
+	}
 
 	$search_params['subject_only'] = !empty($search_params['subject_only']) || !empty($_REQUEST['subject_only']);
 	$search_params['show_complete'] = !empty($search_params['show_complete']) || !empty($_REQUEST['show_complete']);
 
 	// Default the user name to a wildcard matching every user (*).
-	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*'))
-		$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	if (!empty($search_params['user_spec']) || (!empty($_REQUEST['userspec']) && $_REQUEST['userspec'] != '*')) {
+			$search_params['userspec'] = isset($search_params['userspec']) ? $search_params['userspec'] : $_REQUEST['userspec'];
+	}
 
 	// This will be full of all kinds of parameters!
 	$searchq_parameters = array();
 
 	// 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('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));
@@ -1242,8 +1290,9 @@ 
 		{
 			$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]);
+			}
 		}
 
 		if (!empty($possible_users))
@@ -1255,8 +1304,9 @@ 
 			{
 				$where_params['name_' . $k] = $v;
 				$where_clause[] = '{raw:real_name} LIKE {string:name_' . $k . '}';
-				if (!isset($where_params['real_name']))
-					$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				if (!isset($where_params['real_name'])) {
+									$where_params['real_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(real_name)' : 'real_name';
+				}
 			}
 
 			// Who matches those criteria?
@@ -1269,28 +1319,28 @@ 
 			);
 
 			// 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 = 'AND pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
-			}
-			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 = 'AND (pm.id_member_from IN ({array_int:member_list}) OR (pm.id_member_from = 0 AND ({raw:pm_from_name} LIKE {raw:guest_user_name_implode})))';
 				$searchq_parameters['guest_user_name_implode'] = '\'' . implode('\' OR ' . ($smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name') . ' LIKE \'', $possible_users) . '\'';
 				$searchq_parameters['member_list'] = $memberlist;
 				$searchq_parameters['pm_from_name'] = $smcFunc['db_case_sensitive'] ? 'LOWER(pm.from_name)' : 'pm.from_name';
 			}
 			$smcFunc['db_free_result']($request);
+		} else {
+					$userQuery = '';
 		}
-		else
-			$userQuery = '';
 	}
 
 	// Setup the sorting variables...
@@ -1298,8 +1348,9 @@ 
 	$sort_columns = array(
 		'pm.id_pm',
 	);
-	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'] : 'pm.id_pm';
 	$search_params['sort_dir'] = !empty($search_params['sort_dir']) && $search_params['sort_dir'] == 'asc' ? 'asc' : 'desc';
 
@@ -1309,24 +1360,27 @@ 
 	if ($context['folder'] == 'inbox' && !empty($search_params['advanced']) && $context['currently_using_labels'])
 	{
 		// Came here from pagination?  Put them back into $_REQUEST for sanitization.
-		if (isset($search_params['labels']))
-			$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		if (isset($search_params['labels'])) {
+					$_REQUEST['searchlabel'] = explode(',', $search_params['labels']);
+		}
 
 		// Assuming we have some labels - make them all integers.
 		if (!empty($_REQUEST['searchlabel']) && is_array($_REQUEST['searchlabel']))
 		{
-			foreach ($_REQUEST['searchlabel'] as $key => $id)
-				$_REQUEST['searchlabel'][$key] = (int) $id;
+			foreach ($_REQUEST['searchlabel'] as $key => $id) {
+							$_REQUEST['searchlabel'][$key] = (int) $id;
+			}
+		} else {
+					$_REQUEST['searchlabel'] = array();
 		}
-		else
-			$_REQUEST['searchlabel'] = array();
 
 		// Now that everything is cleaned up a bit, make the labels a param.
 		$search_params['labels'] = implode(',', $_REQUEST['searchlabel']);
 
 		// No labels selected? That must be an error!
-		if (empty($_REQUEST['searchlabel']))
-			$context['search_errors']['no_labels_selected'] = true;
+		if (empty($_REQUEST['searchlabel'])) {
+					$context['search_errors']['no_labels_selected'] = true;
+		}
 		// Otherwise prepare the query!
 		elseif (count($_REQUEST['searchlabel']) != count($context['labels']))
 		{
@@ -1349,8 +1403,7 @@ 
 					// Not searching the inbox - PM must be labeled
 					$labelQuery = ' AND pml.id_label IN ({array_int:labels})';
 					$labelJoin = ' INNER JOIN {db_prefix}pm_labeled_messages AS pml ON (pml.id_pm = pmr.id_pm)';
-				}
-				else
+				} else
 				{
 					// Searching the inbox - PM doesn't have to be labeled
 					$labelQuery = ' AND (' . substr($labelQuery, 5) . ' OR pml.id_label IN ({array_int:labels}))';
@@ -1365,8 +1418,9 @@ 
 	// What are we actually searching for?
 	$search_params['search'] = !empty($search_params['search']) ? $search_params['search'] : (isset($_REQUEST['search']) ? $_REQUEST['search'] : '');
 	// If we ain't got nothing - we should error!
-	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;
+	}
 
 	// Extract phrase parts first (e.g. some words "this is a phrase" some more words.)
 	preg_match_all('~(?:^|\s)([-]?)"([^"]+)"(?:$|\s)~' . ($context['utf8'] ? 'u' : ''), $search_params['search'], $matches, PREG_PATTERN_ORDER);
@@ -1379,12 +1433,14 @@ 
 	$excludedWords = array();
 
 	// .. first, we check for things like -"some words", but not "-some words".
-	foreach ($matches[1] as $index => $word)
-		if ($word == '-')
+	foreach ($matches[1] as $index => $word) {
+			if ($word == '-')
 		{
 			$word = $smcFunc['strtolower'](trim($searchArray[$index]));
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+	}
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($searchArray[$index]);
 		}
 
@@ -1394,8 +1450,9 @@ 
 		if (strpos(trim($word), '-') === 0)
 		{
 			$word = substr($smcFunc['strtolower']($word), 1);
-			if (strlen($word) > 0)
-				$excludedWords[] = $word;
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($tempSearch[$index]);
 		}
 	}
@@ -1406,9 +1463,9 @@ 
 	foreach ($searchArray as $index => $value)
 	{
 		$searchArray[$index] = $smcFunc['strtolower'](trim($value));
-		if ($searchArray[$index] == '')
-			unset($searchArray[$index]);
-		else
+		if ($searchArray[$index] == '') {
+					unset($searchArray[$index]);
+		} else
 		{
 			// Sort out entities first.
 			$searchArray[$index] = $smcFunc['htmlspecialchars']($searchArray[$index]);
@@ -1418,27 +1475,32 @@ 
 
 	// 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>';
+	}
 
 	// This contains *everything*
 	$searchWords = array_merge($searchArray, $excludedWords);
 
 	// Make sure at least one word is being searched for.
-	if (empty($searchArray))
-		$context['search_errors']['invalid_search_string'] = true;
+	if (empty($searchArray)) {
+			$context['search_errors']['invalid_search_string'] = true;
+	}
 
 	// Sort out the search query so the user can edit it - if they want.
 	$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']);
+	}
 
 	// Now we have all the parameters, combine them together for pagination and the like...
 	$context['params'] = array();
-	foreach ($search_params as $k => $v)
-		$context['params'][] = $k . '|\'|' . $v;
+	foreach ($search_params as $k => $v) {
+			$context['params'][] = $k . '|\'|' . $v;
+	}
 	$context['params'] = base64_encode(implode('|"|', $context['params']));
 
 	// Compile the subject query part.
@@ -1446,26 +1508,31 @@ 
 
 	foreach ($searchWords as $index => $word)
 	{
-		if ($word == '')
-			continue;
+		if ($word == '') {
+					continue;
+		}
 
-		if ($search_params['subject_only'])
-			$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
-		else
-			$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		if ($search_params['subject_only']) {
+					$andQueryParts[] = 'pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '}';
+		} else {
+					$andQueryParts[] = '(pm.subject' . (in_array($word, $excludedWords) ? ' NOT' : '') . ' LIKE {string:search_' . $index . '} ' . (in_array($word, $excludedWords) ? 'AND pm.body NOT' : 'OR pm.body') . ' LIKE {string:search_' . $index . '})';
+		}
 		$searchq_parameters['search_' . $index] = '%' . strtr($word, array('_' => '\\_', '%' => '\\%')) . '%';
 	}
 
 	$searchQuery = ' 1=1';
-	if (!empty($andQueryParts))
-		$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	if (!empty($andQueryParts)) {
+			$searchQuery = implode(!empty($search_params['searchtype']) && $search_params['searchtype'] == 2 ? ' OR ' : ' AND ', $andQueryParts);
+	}
 
 	// Age limits?
 	$timeQuery = '';
-	if (!empty($search_params['minage']))
-		$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
-	if (!empty($search_params['maxage']))
-		$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	if (!empty($search_params['minage'])) {
+			$timeQuery .= ' AND pm.msgtime < ' . (time() - $search_params['minage'] * 86400);
+	}
+	if (!empty($search_params['maxage'])) {
+			$timeQuery .= ' AND pm.msgtime > ' . (time() - $search_params['maxage'] * 86400);
+	}
 
 	// If we have errors - return back to the first screen...
 	if (!empty($context['search_errors']))
@@ -1551,8 +1618,9 @@ 
 			)
 		);
 		$real_pm_ids = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$real_pm_ids[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1582,8 +1650,9 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($context['folder'] == 'sent' || empty($row['bcc']))
-				$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			if ($context['folder'] == 'sent' || empty($row['bcc'])) {
+							$recipients[$row['id_pm']][empty($row['bcc']) ? 'to' : 'bcc'][] = empty($row['id_member_to']) ? $txt['guest_title'] : '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . '">' . $row['to_name'] . '</a>';
+			}
 
 			if ($row['id_member_to'] == $user_info['id'] && $context['folder'] != 'sent')
 			{
@@ -1604,12 +1673,14 @@ 
 				while ($row2 = $smcFunc['db_fetch_assoc']($request2))
 				{
 					$l_id = $row2['id_label'];
-					if (isset($context['labels'][$l_id]))
-						$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					if (isset($context['labels'][$l_id])) {
+											$context['message_labels'][$row['id_pm']][$l_id] = array('id' => $l_id, 'name' => $context['labels'][$l_id]['name']);
+					}
 
 					// Here we find the first label on a message - for linking to posts in results
-					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1)
-						$context['first_label'][$row['id_pm']] = $l_id;
+					if (!isset($context['first_label'][$row['id_pm']]) && $row['in_inbox'] != 1) {
+											$context['first_label'][$row['id_pm']] = $l_id;
+					}
 				}
 
 				$smcFunc['db_free_result']($request2);
@@ -1736,8 +1807,9 @@ 
 		list ($postCount) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
-			fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour']) {
+					fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+		}
 	}
 
 	// Quoting/Replying to a message?
@@ -1746,8 +1818,9 @@ 
 		$pmsg = (int) $_REQUEST['pmsg'];
 
 		// Make sure this is yours.
-		if (!isAccessiblePM($pmsg))
-			fatal_lang_error('no_access', false);
+		if (!isAccessiblePM($pmsg)) {
+					fatal_lang_error('no_access', false);
+		}
 
 		// Work out whether this is one you've received?
 		$request = $smcFunc['db_query']('', '
@@ -1784,8 +1857,9 @@ 
 				'id_pm' => $pmsg,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('pm_not_yours', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('pm_not_yours', false);
+		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1796,9 +1870,9 @@ 
 		// Add 'Re: ' to it....
 		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'];
@@ -1807,22 +1881,25 @@ 
 			cache_put_data('response_prefix', $context['response_prefix'], 600);
 		}
 		$form_subject = $row_quoted['subject'];
-		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0)
-			$form_subject = $context['response_prefix'] . $form_subject;
+		if ($context['reply'] && trim($context['response_prefix']) != '' && $smcFunc['strpos']($form_subject, trim($context['response_prefix'])) !== 0) {
+					$form_subject = $context['response_prefix'] . $form_subject;
+		}
 
 		if (isset($_REQUEST['quote']))
 		{
 			// Remove any nested quotes and <br>...
 			$form_message = preg_replace('~<br ?/?' . '>~i', "\n", $row_quoted['body']);
-			if (!empty($modSettings['removeNestedQuotes']))
-				$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
-			if (empty($row_quoted['id_member']))
-				$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
-			else
-				$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			if (!empty($modSettings['removeNestedQuotes'])) {
+							$form_message = preg_replace(array('~\n?\[quote.*?\].+?\[/quote\]\n?~is', '~^\n~', '~\[/quote\]~'), '', $form_message);
+			}
+			if (empty($row_quoted['id_member'])) {
+							$form_message = '[quote author=&quot;' . $row_quoted['real_name'] . '&quot;]' . "\n" . $form_message . "\n" . '[/quote]';
+			} else {
+							$form_message = '[quote author=' . $row_quoted['real_name'] . ' link=action=profile;u=' . $row_quoted['id_member'] . ' date=' . $row_quoted['msgtime'] . ']' . "\n" . $form_message . "\n" . '[/quote]';
+			}
+		} else {
+					$form_message = '';
 		}
-		else
-			$form_message = '';
 
 		// Do the BBC thang on the message.
 		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);
@@ -1843,8 +1920,7 @@ 
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),
 			'body' => $row_quoted['body']
 		);
-	}
-	else
+	} else
 	{
 		$context['quoted_message'] = false;
 		$form_subject = '';
@@ -1863,11 +1939,12 @@ 
 		if ($_REQUEST['u'] == 'all' && isset($row_quoted))
 		{
 			// Firstly, to reply to all we clearly already have $row_quoted - so have the original member from.
-			if ($row_quoted['id_member'] != $user_info['id'])
-				$context['recipients']['to'][] = array(
+			if ($row_quoted['id_member'] != $user_info['id']) {
+							$context['recipients']['to'][] = array(
 					'id' => $row_quoted['id_member'],
 					'name' => $smcFunc['htmlspecialchars']($row_quoted['real_name']),
 				);
+			}
 
 			// Now to get the others.
 			$request = $smcFunc['db_query']('', '
@@ -1883,18 +1960,19 @@ 
 					'not_bcc' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$_REQUEST['u'] = explode(',', $_REQUEST['u']);
-			foreach ($_REQUEST['u'] as $key => $uID)
-				$_REQUEST['u'][$key] = (int) $uID;
+			foreach ($_REQUEST['u'] as $key => $uID) {
+							$_REQUEST['u'][$key] = (int) $uID;
+			}
 
 			$_REQUEST['u'] = array_unique($_REQUEST['u']);
 
@@ -1908,22 +1986,24 @@ 
 					'limit' => count($_REQUEST['u']),
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['recipients']['to'][] = array(
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['recipients']['to'][] = array(
 					'id' => $row['id_member'],
 					'name' => $row['real_name'],
 				);
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get a literal name list in case the user has JavaScript disabled.
 		$names = array();
-		foreach ($context['recipients']['to'] as $to)
-			$names[] = $to['name'];
+		foreach ($context['recipients']['to'] as $to) {
+					$names[] = $to['name'];
+		}
 		$context['to_value'] = empty($names) ? '' : '&quot;' . implode('&quot;, &quot;', $names) . '&quot;';
+	} else {
+			$context['to_value'] = '';
 	}
-	else
-		$context['to_value'] = '';
 
 	// Set the defaults...
 	$context['subject'] = $form_subject;
@@ -1993,8 +2073,9 @@ 
 
 	// validate with loadMemberData()
 	$memberResult = loadMemberData($user_info['id'], false);
-	if (!$memberResult)
-		fatal_lang_error('not_a_user', false);
+	if (!$memberResult) {
+			fatal_lang_error('not_a_user', false);
+	}
 	list ($memID) = $memberResult;
 
 	// drafts is where the functions reside
@@ -2020,9 +2101,9 @@ 
 		$context['sub_template'] = 'send';
 		loadJavaScriptFile('PersonalMessage.js', array('defer' => false, 'minimize' => true), 'smf_pms');
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+	} else {
+			$context['sub_template'] = 'pm';
 	}
-	else
-		$context['sub_template'] = 'pm';
 
 	$context['page_title'] = $txt['send_message'];
 
@@ -2083,10 +2164,11 @@ 
 		);
 		if ($smcFunc['db_num_rows']($request) == 0)
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_not_yours', false);
-			else
-				$error_types[] = 'pm_not_yours';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_not_yours', false);
+			} else {
+							$error_types[] = 'pm_not_yours';
+			}
 		}
 		$row_quoted = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
@@ -2133,14 +2215,16 @@ 
 		$context['post_error'][$error_type] = true;
 		if (isset($txt['error_' . $error_type]))
 		{
-			if ($error_type == 'long_message')
-				$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			if ($error_type == 'long_message') {
+							$txt['error_' . $error_type] = sprintf($txt['error_' . $error_type], $modSettings['max_messageLength']);
+			}
 			$context['post_error']['messages'][] = $txt['error_' . $error_type];
 		}
 
 		// If it's not a minor error flag it as such.
-		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject')))
-			$context['error_type'] = 'serious';
+		if (!in_array($error_type, array('new_reply', 'not_approved', 'new_replies', 'old_topic', 'need_qr_verification', 'no_subject'))) {
+					$context['error_type'] = 'serious';
+		}
 	}
 
 	// We need to load the editor once more.
@@ -2198,8 +2282,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 
 	// PM Drafts enabled and needed?
-	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft'])))
-		require_once($sourcedir . '/Drafts.php');
+	if ($context['drafts_pm_save'] && (isset($_POST['save_draft']) || isset($_POST['id_pm_draft']))) {
+			require_once($sourcedir . '/Drafts.php');
+	}
 
 	loadLanguage('PersonalMessage', '', false);
 
@@ -2229,24 +2314,27 @@ 
 
 		if (!empty($postCount) && $postCount >= $modSettings['pm_posts_per_hour'])
 		{
-			if (!isset($_REQUEST['xml']))
-				fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
-			else
-				$post_errors[] = 'pm_too_many_per_hour';
+			if (!isset($_REQUEST['xml'])) {
+							fatal_lang_error('pm_too_many_per_hour', true, array($modSettings['pm_posts_per_hour']));
+			} else {
+							$post_errors[] = 'pm_too_many_per_hour';
+			}
 		}
 	}
 
 	// If your session timed out, show an error, but do allow to re-submit.
-	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (!isset($_REQUEST['xml']) && checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	$_REQUEST['subject'] = isset($_REQUEST['subject']) ? trim($_REQUEST['subject']) : '';
 	$_REQUEST['to'] = empty($_POST['to']) ? (empty($_GET['to']) ? '' : $_GET['to']) : $_POST['to'];
 	$_REQUEST['bcc'] = empty($_POST['bcc']) ? (empty($_GET['bcc']) ? '' : $_GET['bcc']) : $_POST['bcc'];
 
 	// Route the input from the 'u' parameter to the 'to'-list.
-	if (!empty($_POST['u']))
-		$_POST['recipient_to'] = explode(',', $_POST['u']);
+	if (!empty($_POST['u'])) {
+			$_POST['recipient_to'] = explode(',', $_POST['u']);
+	}
 
 	// Construct the list of recipients.
 	$recipientList = array();
@@ -2258,8 +2346,9 @@ 
 		$recipientList[$recipientType] = array();
 		if (!empty($_POST['recipient_' . $recipientType]) && is_array($_POST['recipient_' . $recipientType]))
 		{
-			foreach ($_POST['recipient_' . $recipientType] as $recipient)
-				$recipientList[$recipientType][] = (int) $recipient;
+			foreach ($_POST['recipient_' . $recipientType] as $recipient) {
+							$recipientList[$recipientType][] = (int) $recipient;
+			}
 		}
 
 		// Are there also literal names set?
@@ -2273,10 +2362,11 @@ 
 
 			foreach ($namedRecipientList[$recipientType] as $index => $recipient)
 			{
-				if (strlen(trim($recipient)) > 0)
-					$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
-				else
-					unset($namedRecipientList[$recipientType][$index]);
+				if (strlen(trim($recipient)) > 0) {
+									$namedRecipientList[$recipientType][$index] = $smcFunc['htmlspecialchars']($smcFunc['strtolower'](trim($recipient)));
+				} else {
+									unset($namedRecipientList[$recipientType][$index]);
+				}
 			}
 
 			if (!empty($namedRecipientList[$recipientType]))
@@ -2306,8 +2396,9 @@ 
 		}
 
 		// Selected a recipient to be deleted? Remove them now.
-		if (!empty($_POST['delete_recipient']))
-			$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		if (!empty($_POST['delete_recipient'])) {
+					$recipientList[$recipientType] = array_diff($recipientList[$recipientType], array((int) $_POST['delete_recipient']));
+		}
 
 		// Make sure we don't include the same name twice
 		$recipientList[$recipientType] = array_unique($recipientList[$recipientType]);
@@ -2317,8 +2408,9 @@ 
 	$is_recipient_change = !empty($_POST['delete_recipient']) || !empty($_POST['to_submit']) || !empty($_POST['bcc_submit']);
 
 	// Check if there's at least one recipient.
-	if (empty($recipientList['to']) && empty($recipientList['bcc']))
-		$post_errors[] = 'no_to';
+	if (empty($recipientList['to']) && empty($recipientList['bcc'])) {
+			$post_errors[] = 'no_to';
+	}
 
 	// Make sure that we remove the members who did get it from the screen.
 	if (!$is_recipient_change)
@@ -2332,28 +2424,31 @@ 
 				// Since we already have a post error, remove the previous one.
 				$post_errors = array_diff($post_errors, array('no_to'));
 
-				foreach ($namesNotFound[$recipientType] as $name)
-					$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				foreach ($namesNotFound[$recipientType] as $name) {
+									$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+				}
 			}
 		}
 	}
 
 	// Did they make any mistakes?
-	if ($_REQUEST['subject'] == '')
-		$post_errors[] = 'no_subject';
-	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '')
-		$post_errors[] = 'no_message';
-	elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength'])
-		$post_errors[] = 'long_message';
-	else
+	if ($_REQUEST['subject'] == '') {
+			$post_errors[] = 'no_subject';
+	}
+	if (!isset($_REQUEST['message']) || $_REQUEST['message'] == '') {
+			$post_errors[] = 'no_message';
+	} elseif (!empty($modSettings['max_messageLength']) && $smcFunc['strlen']($_REQUEST['message']) > $modSettings['max_messageLength']) {
+			$post_errors[] = 'long_message';
+	} else
 	{
 		// Preparse the message.
 		$message = $_REQUEST['message'];
 		preparsecode($message);
 
 		// Make sure there's still some content left without the tags.
-		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false))
-			$post_errors[] = 'no_message';
+		if ($smcFunc['htmltrim'](strip_tags(parse_bbc($smcFunc['htmlspecialchars']($message, ENT_QUOTES), false), '<img>')) === '' && (!allowedTo('admin_forum') || strpos($message, '[html]') === false)) {
+					$post_errors[] = 'no_message';
+		}
 	}
 
 	// Wrong verification code?
@@ -2365,13 +2460,15 @@ 
 		);
 		$context['require_verification'] = create_control_verification($verificationOptions, true);
 
-		if (is_array($context['require_verification']))
-			$post_errors = array_merge($post_errors, $context['require_verification']);
+		if (is_array($context['require_verification'])) {
+					$post_errors = array_merge($post_errors, $context['require_verification']);
+		}
 	}
 
 	// If they did, give a chance to make ammends.
-	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml']))
-		return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	if (!empty($post_errors) && !$is_recipient_change && !isset($_REQUEST['preview']) && !isset($_REQUEST['xml'])) {
+			return messagePostError($post_errors, $namedRecipientList, $recipientList);
+	}
 
 	// Want to take a second glance before you send?
 	if (isset($_REQUEST['preview']))
@@ -2402,8 +2499,9 @@ 
 		foreach ($namesNotFound as $recipientType => $names)
 		{
 			$post_errors[] = 'bad_' . $recipientType;
-			foreach ($names as $name)
-				$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			foreach ($names as $name) {
+							$context['send_log']['failed'][] = sprintf($txt['pm_error_user_not_found'], $name);
+			}
 		}
 
 		return messagePostError(array(), $namedRecipientList, $recipientList);
@@ -2433,13 +2531,14 @@ 
 	checkSubmitOnce('check');
 
 	// Do the actual sending of the PM.
-	if (!empty($recipientList['to']) || !empty($recipientList['bcc']))
-		$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
-	else
-		$context['send_log'] = array(
+	if (!empty($recipientList['to']) || !empty($recipientList['bcc'])) {
+			$context['send_log'] = sendpm($recipientList, $_REQUEST['subject'], $_REQUEST['message'], true, null, !empty($_REQUEST['pm_head']) ? (int) $_REQUEST['pm_head'] : 0);
+	} else {
+			$context['send_log'] = array(
 			'sent' => array(),
 			'failed' => array()
 		);
+	}
 
 	// Mark the message as "replied to".
 	if (!empty($context['send_log']['sent']) && !empty($_REQUEST['replied_to']) && isset($_REQUEST['f']) && $_REQUEST['f'] == 'inbox')
@@ -2457,11 +2556,12 @@ 
 	}
 
 	// If one or more of the recipient were invalid, go back to the post screen with the failed usernames.
-	if (!empty($context['send_log']['failed']))
-		return messagePostError($post_errors, $namesNotFound, array(
+	if (!empty($context['send_log']['failed'])) {
+			return messagePostError($post_errors, $namesNotFound, array(
 			'to' => array_intersect($recipientList['to'], $context['send_log']['failed']),
 			'bcc' => array_intersect($recipientList['bcc'], $context['send_log']['failed'])
 		));
+	}
 
 	// Message sent successfully?
 	if (!empty($context['send_log']) && empty($context['send_log']['failed']))
@@ -2469,8 +2569,9 @@ 
 		$context['current_label_redirect'] = $context['current_label_redirect'] . ';done=sent';
 
 		// If we had a PM draft for this one, then its time to remove it since it was just sent
-		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft']))
-			DeleteDraft($_POST['id_pm_draft']);
+		if ($context['drafts_pm_save'] && !empty($_POST['id_pm_draft'])) {
+					DeleteDraft($_POST['id_pm_draft']);
+		}
 	}
 
 	// Go back to the where they sent from, if possible...
@@ -2485,24 +2586,28 @@ 
 
 	checkSession('request');
 
-	if (isset($_REQUEST['del_selected']))
-		$_REQUEST['pm_action'] = 'delete';
+	if (isset($_REQUEST['del_selected'])) {
+			$_REQUEST['pm_action'] = 'delete';
+	}
 
 	if (isset($_REQUEST['pm_action']) && $_REQUEST['pm_action'] != '' && !empty($_REQUEST['pms']) && is_array($_REQUEST['pms']))
 	{
-		foreach ($_REQUEST['pms'] as $pm)
-			$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		foreach ($_REQUEST['pms'] as $pm) {
+					$_REQUEST['pm_actions'][(int) $pm] = $_REQUEST['pm_action'];
+		}
 	}
 
-	if (empty($_REQUEST['pm_actions']))
-		redirectexit($context['current_label_redirect']);
+	if (empty($_REQUEST['pm_actions'])) {
+			redirectexit($context['current_label_redirect']);
+	}
 
 	// If we are in conversation, we may need to apply this to every message in the conversation.
 	if ($context['display_mode'] == 2 && isset($_REQUEST['conversation']))
 	{
 		$id_pms = array();
-		foreach ($_REQUEST['pm_actions'] as $pm => $dummy)
-			$id_pms[] = (int) $pm;
+		foreach ($_REQUEST['pm_actions'] as $pm => $dummy) {
+					$id_pms[] = (int) $pm;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_pm_head, id_pm
@@ -2513,8 +2618,9 @@ 
 			)
 		);
 		$pm_heads = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$pm_heads[$row['id_pm_head']] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -2528,8 +2634,9 @@ 
 		// Copy the action from the single to PM to the others.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]]))
-				$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			if (isset($pm_heads[$row['id_pm_head']]) && isset($_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]])) {
+							$_REQUEST['pm_actions'][$row['id_pm']] = $_REQUEST['pm_actions'][$pm_heads[$row['id_pm_head']]];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
@@ -2540,22 +2647,21 @@ 
 	$labels = array();
 	foreach ($_REQUEST['pm_actions'] as $pm => $action)
 	{
-		if ($action === 'delete')
-			$to_delete[] = (int) $pm;
-		else
+		if ($action === 'delete') {
+					$to_delete[] = (int) $pm;
+		} else
 		{
 			if (substr($action, 0, 4) == 'add_')
 			{
 				$type = 'add';
 				$action = substr($action, 4);
-			}
-			elseif (substr($action, 0, 4) == 'rem_')
+			} elseif (substr($action, 0, 4) == 'rem_')
 			{
 				$type = 'rem';
 				$action = substr($action, 4);
+			} else {
+							$type = 'unk';
 			}
-			else
-				$type = 'unk';
 
 			if ($action == '-1' || (int) $action > 0)
 			{
@@ -2566,8 +2672,9 @@ 
 	}
 
 	// Deleting, it looks like?
-	if (!empty($to_delete))
-		deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	if (!empty($to_delete)) {
+			deleteMessages($to_delete, $context['display_mode'] == 2 ? null : $context['folder']);
+	}
 
 	// Are we labeling anything?
 	if (!empty($to_label) && $context['folder'] == 'inbox')
@@ -2633,8 +2740,7 @@ 
 				}
 
 				$smcFunc['db_free_result']($request2);
-			}
-			elseif ($type == 'rem')
+			} elseif ($type == 'rem')
 			{
 				// If we're removing from the inbox, see if we have at least one other label.
 				// This query is faster than the one above
@@ -2666,21 +2772,25 @@ 
 			if ($to_label[$row['id_pm']] != '-1')
 			{
 				// If this label is in the list and we're not adding it, remove it
-				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add')
-					unset($labels[$to_label[$row['id_pm']]]);
-				else if ($type !== 'rem')
-					$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				if (array_key_exists($to_label[$row['id_pm']], $labels) && $type !== 'add') {
+									unset($labels[$to_label[$row['id_pm']]]);
+				} else if ($type !== 'rem') {
+									$labels[$to_label[$row['id_pm']]] = $to_label[$row['id_pm']];
+				}
 			}
 
 			// Removing all labels or just removing the inbox label
-			if ($type == 'rem' && empty($labels))
-				$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			if ($type == 'rem' && empty($labels)) {
+							$in_inbox = (empty($context['can_remove_inbox']) ? 1 : 0);
+			}
 			// Adding new labels, but removing inbox and applying new ones
-			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels))
-				$in_inbox = 0;
+			elseif ($type == 'add' && !empty($options['pm_remove_inbox_label']) && !empty($labels)) {
+							$in_inbox = 0;
+			}
 			// Just adding it to the inbox
-			else
-				$in_inbox = 1;
+			else {
+							$in_inbox = 1;
+			}
 
 			// Are we adding it to or removing it from the inbox?
 			if ($in_inbox != $row['in_inbox'])
@@ -2722,8 +2832,9 @@ 
 			if (!empty($labels_to_apply))
 			{
 				$inserts = array();
-				foreach ($labels_to_apply as $label)
-					$inserts[] = array($row['id_pm'], $label);
+				foreach ($labels_to_apply as $label) {
+									$inserts[] = array($row['id_pm'], $label);
+				}
 
 				$smcFunc['db_insert']('',
 					'{db_prefix}pm_labeled_messages',
@@ -2767,11 +2878,13 @@ 
 	checkSession('get');
 
 	// If all then delete all messages the user has.
-	if ($_REQUEST['f'] == 'all')
-		deleteMessages(null, null);
+	if ($_REQUEST['f'] == 'all') {
+			deleteMessages(null, null);
+	}
 	// Otherwise just the selected folder.
-	else
-		deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	else {
+			deleteMessages(null, $_REQUEST['f'] != 'sent' ? 'inbox' : 'sent');
+	}
 
 	// Done... all gone.
 	redirectexit($context['current_label_redirect']);
@@ -2808,8 +2921,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$toDelete[] = $row[0];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$toDelete[] = $row[0];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Select all messages in their inbox older than $deleteTime.
@@ -2826,8 +2940,9 @@ 
 				'msgtime' => $deleteTime,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$toDelete[] = $row['id_pm'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$toDelete[] = $row['id_pm'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Delete the actual messages.
@@ -2858,26 +2973,29 @@ 
 {
 	global $user_info, $smcFunc;
 
-	if ($owner === null)
-		$owner = array($user_info['id']);
-	elseif (empty($owner))
-		return;
-	elseif (!is_array($owner))
-		$owner = array($owner);
+	if ($owner === null) {
+			$owner = array($user_info['id']);
+	} elseif (empty($owner)) {
+			return;
+	} elseif (!is_array($owner)) {
+			$owner = array($owner);
+	}
 
 	if ($personal_messages !== null)
 	{
-		if (empty($personal_messages) || !is_array($personal_messages))
-			return;
+		if (empty($personal_messages) || !is_array($personal_messages)) {
+					return;
+		}
 
-		foreach ($personal_messages as $index => $delete_id)
-			$personal_messages[$index] = (int) $delete_id;
+		foreach ($personal_messages as $index => $delete_id) {
+					$personal_messages[$index] = (int) $delete_id;
+		}
 
 		$where = '
 				AND id_pm IN ({array_int:pm_list})';
+	} else {
+			$where = '';
 	}
-	else
-		$where = '';
 
 	if ($folder == 'sent' || $folder === null)
 	{
@@ -2912,17 +3030,19 @@ 
 		// ...And update the statistics accordingly - now including unread messages!.
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if ($row['is_read'])
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
-			else
-				updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			if ($row['is_read']) {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages']));
+			} else {
+							updateMemberData($row['id_member'], array('instant_messages' => $where == '' ? 0 : 'instant_messages - ' . $row['num_deleted_messages'], 'unread_messages' => $where == '' ? 0 : 'unread_messages - ' . $row['num_deleted_messages']));
+			}
 
 			// If this is the current member we need to make their message count correct.
 			if ($user_info['id'] == $row['id_member'])
 			{
 				$user_info['messages'] -= $row['num_deleted_messages'];
-				if (!($row['is_read']))
-					$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				if (!($row['is_read'])) {
+									$user_info['unread_messages'] -= $row['num_deleted_messages'];
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -2990,8 +3110,9 @@ 
 		)
 	);
 	$remove_pms = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$remove_pms[] = $row['sender'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$remove_pms[] = $row['sender'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($remove_pms))
@@ -3036,8 +3157,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if ($owner === null)
-		$owner = $user_info['id'];
+	if ($owner === null) {
+			$owner = $user_info['id'];
+	}
 
 	$in_inbox = '';
 
@@ -3061,8 +3183,7 @@ 
 		}
 
 		$smcFunc['db_free_result']($get_messages);
-	}
-	elseif ($label = '-1')
+	} elseif ($label = '-1')
 	{
 		// Marking all PMs in your inbox read
 		$in_inbox = '
@@ -3087,8 +3208,9 @@ 
 	{
 		if ($owner == $user_info['id'])
 		{
-			foreach ($context['labels'] as $label)
-				$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			foreach ($context['labels'] as $label) {
+							$context['labels'][(int) $label['id']]['unread_messages'] = 0;
+			}
 		}
 
 		$result = $smcFunc['db_query']('', '
@@ -3108,8 +3230,9 @@ 
 		{
 			$total_unread += $row['num'];
 
-			if ($owner != $user_info['id'] || empty($row['id_pm']))
-				continue;
+			if ($owner != $user_info['id'] || empty($row['id_pm'])) {
+							continue;
+			}
 
 			$this_labels = array();
 
@@ -3133,11 +3256,13 @@ 
 
 			$smcFunc['db_free_result']($result2);
 
-			foreach ($this_labels as $this_label)
-				$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			foreach ($this_labels as $this_label) {
+							$context['labels'][$this_label]['unread_messages'] += $row['num'];
+			}
 
-			if ($row['in_inbox'] == 1)
-				$context['labels'][-1]['unread_messages'] += $row['num'];
+			if ($row['in_inbox'] == 1) {
+							$context['labels'][-1]['unread_messages'] += $row['num'];
+			}
 		}
 		$smcFunc['db_free_result']($result);
 
@@ -3146,8 +3271,9 @@ 
 		updateMemberData($owner, array('unread_messages' => $total_unread));
 
 		// If it was for the current member, reflect this in the $user_info array too.
-		if ($owner == $user_info['id'])
-			$user_info['unread_messages'] = $total_unread;
+		if ($owner == $user_info['id']) {
+					$user_info['unread_messages'] = $total_unread;
+		}
 	}
 }
 
@@ -3175,8 +3301,9 @@ 
 	// Add all existing labels to the array to save, slashing them as necessary...
 	foreach ($context['labels'] as $label)
 	{
-		if ($label['id'] != -1)
-			$the_labels[$label['id']] = $label['name'];
+		if ($label['id'] != -1) {
+					$the_labels[$label['id']] = $label['name'];
+		}
 	}
 
 	if (isset($_POST[$context['session_var']]))
@@ -3195,8 +3322,9 @@ 
 		{
 			$_POST['label'] = strtr($smcFunc['htmlspecialchars'](trim($_POST['label'])), array(',' => '&#044;'));
 
-			if ($smcFunc['strlen']($_POST['label']) > 30)
-				$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			if ($smcFunc['strlen']($_POST['label']) > 30) {
+							$_POST['label'] = $smcFunc['substr']($_POST['label'], 0, 30);
+			}
 			if ($_POST['label'] != '')
 			{
 				$the_labels[] = $_POST['label'];
@@ -3217,24 +3345,25 @@ 
 		{
 			foreach ($the_labels as $id => $name)
 			{
-				if ($id == -1)
-					continue;
-				elseif (isset($_POST['label_name'][$id]))
+				if ($id == -1) {
+									continue;
+				} elseif (isset($_POST['label_name'][$id]))
 				{
 					$_POST['label_name'][$id] = trim(strtr($smcFunc['htmlspecialchars']($_POST['label_name'][$id]), array(',' => '&#044;')));
 
-					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30)
-						$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					if ($smcFunc['strlen']($_POST['label_name'][$id]) > 30) {
+											$_POST['label_name'][$id] = $smcFunc['substr']($_POST['label_name'][$id], 0, 30);
+					}
 					if ($_POST['label_name'][$id] != '')
 					{
 						// Changing the name of this label?
-						if ($the_labels[$id] != $_POST['label_name'][$id])
-							$label_updates[$id] = $_POST['label_name'][$id];
+						if ($the_labels[$id] != $_POST['label_name'][$id]) {
+													$label_updates[$id] = $_POST['label_name'][$id];
+						}
 
 						$the_labels[(int) $id] = $_POST['label_name'][$id];
 
-					}
-					else
+					} else
 					{
 						unset($the_labels[(int) $id]);
 						$labels_to_remove[] = $id;
@@ -3248,8 +3377,9 @@ 
 		if (!empty($labels_to_add))
 		{
 			$inserts = array();
-			foreach ($labels_to_add AS $label)
-				$inserts[] = array($user_info['id'], $label);
+			foreach ($labels_to_add AS $label) {
+							$inserts[] = array($user_info['id'], $label);
+			}
 
 			$smcFunc['db_insert']('', '{db_prefix}pm_labels', array('id_member' => 'int', 'name' => 'string-30'), $inserts, array());
 		}
@@ -3339,8 +3469,9 @@ 
 				// Each action...
 				foreach ($rule['actions'] as $k2 => $action)
 				{
-					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove))
-						continue;
+					if ($action['t'] != 'lab' || !in_array($action['v'], $labels_to_remove)) {
+											continue;
+					}
 
 					$rule_changes[] = $rule['id'];
 
@@ -3355,8 +3486,8 @@ 
 		{
 			$rule_changes = array_unique($rule_changes);
 			// Update/delete as appropriate.
-			foreach ($rule_changes as $k => $id)
-				if (!empty($context['rules'][$id]['actions']))
+			foreach ($rule_changes as $k => $id) {
+							if (!empty($context['rules'][$id]['actions']))
 				{
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}pm_rules
@@ -3369,12 +3500,13 @@ 
 							'actions' => $smcFunc['json_encode']($context['rules'][$id]['actions']),
 						)
 					);
+			}
 					unset($rule_changes[$k]);
 				}
 
 			// Anything left here means it's lost all actions...
-			if (!empty($rule_changes))
-				$smcFunc['db_query']('', '
+			if (!empty($rule_changes)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}pm_rules
 					WHERE id_rule IN ({array_int:rule_list})
 							AND id_member = {int:current_member}',
@@ -3383,6 +3515,7 @@ 
 						'rule_list' => $rule_changes,
 					)
 				);
+			}
 		}
 
 		// Make sure we're not caching this!
@@ -3452,8 +3585,9 @@ 
 		// Save the fields.
 		saveProfileFields();
 
-		if (!empty($profile_vars))
-			updateMemberData($user_info['id'], $profile_vars);
+		if (!empty($profile_vars)) {
+					updateMemberData($user_info['id'], $profile_vars);
+		}
 	}
 
 	setupProfileContext(
@@ -3478,13 +3612,15 @@ 
 	global $user_info, $language, $modSettings, $smcFunc;
 
 	// Check that this feature is even enabled!
-	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg']))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['enableReportPM']) || empty($_REQUEST['pmsg'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$pmsg = (int) $_REQUEST['pmsg'];
 
-	if (!isAccessiblePM($pmsg, 'inbox'))
-		fatal_lang_error('no_access', false);
+	if (!isAccessiblePM($pmsg, 'inbox')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$context['pm_id'] = $pmsg;
 	$context['page_title'] = $txt['pm_report_title'];
@@ -3506,8 +3642,9 @@ 
 			)
 		);
 		$context['admins'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['admins'][$row['id_member']] = $row['real_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['admins'][$row['id_member']] = $row['real_name'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// How many admins in total?
@@ -3536,8 +3673,9 @@ 
 			)
 		);
 		// Can only be a hacker here!
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 		list ($subject, $body, $time, $memberFromID, $memberFromName) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -3561,15 +3699,17 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// If it's hidden still don't reveal their names - privacy after all ;)
-			if ($row['bcc'])
-				$hidden_recipients++;
-			else
-				$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			if ($row['bcc']) {
+							$hidden_recipients++;
+			} else {
+							$recipients[] = '[url=' . $scripturl . '?action=profile;u=' . $row['id_member_to'] . ']' . $row['to_name'] . '[/url]';
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if ($hidden_recipients)
-			$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		if ($hidden_recipients) {
+					$recipients[] = sprintf($txt['pm_report_pm_hidden'], $hidden_recipients);
+		}
 
 		// Now let's get out and loop through the admins.
 		$request = $smcFunc['db_query']('', '
@@ -3585,8 +3725,9 @@ 
 		);
 
 		// Maybe we shouldn't advertise this?
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('no_access', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('no_access', false);
+		}
 
 		$memberFromName = un_htmlspecialchars($memberFromName);
 
@@ -3605,8 +3746,9 @@ 
 				// Make the body.
 				$report_body = str_replace(array('{REPORTER}', '{SENDER}'), array(un_htmlspecialchars($user_info['name']), $memberFromName), $txt['pm_report_pm_user_sent']);
 				$report_body .= "\n" . '[b]' . $_POST['reason'] . '[/b]' . "\n\n";
-				if (!empty($recipients))
-					$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				if (!empty($recipients)) {
+									$report_body .= $txt['pm_report_pm_other_recipients'] . ' ' . implode(', ', $recipients) . "\n\n";
+				}
 				$report_body .= $txt['pm_report_pm_unedited_below'] . "\n" . '[quote author=' . (empty($memberFromID) ? '&quot;' . $memberFromName . '&quot;' : $memberFromName . ' link=action=profile;u=' . $memberFromID . ' date=' . $time) . ']' . "\n" . un_htmlspecialchars($body) . '[/quote]';
 
 				// Plonk it in the array ;)
@@ -3626,12 +3768,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Send a different email for each language.
-		foreach ($messagesToSend as $lang => $message)
-			sendpm($message['recipients'], $message['subject'], $message['body']);
+		foreach ($messagesToSend as $lang => $message) {
+					sendpm($message['recipients'], $message['subject'], $message['body']);
+		}
 
 		// Give the user their own language back!
-		if (!empty($modSettings['userLanguage']))
-			loadLanguage('PersonalMessage', '', false);
+		if (!empty($modSettings['userLanguage'])) {
+					loadLanguage('PersonalMessage', '', false);
+		}
 
 		// Leave them with a template.
 		$context['sub_template'] = 'report_message_complete';
@@ -3677,8 +3821,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Hide hidden groups!
-		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups'))
-			continue;
+		if ($row['hidden'] && !$row['can_moderate'] && !allowedTo('manage_membergroups')) {
+					continue;
+		}
 
 		$context['groups'][$row['id_group']] = $row['group_name'];
 	}
@@ -3704,9 +3849,10 @@ 
 			$context['rule'] = $context['rules'][$context['rid']];
 			$members = array();
 			// Need to get member names!
-			foreach ($context['rule']['criteria'] as $k => $criteria)
-				if ($criteria['t'] == 'mid' && !empty($criteria['v']))
+			foreach ($context['rule']['criteria'] as $k => $criteria) {
+							if ($criteria['t'] == 'mid' && !empty($criteria['v']))
 					$members[(int) $criteria['v']] = $k;
+			}
 
 			if (!empty($members))
 			{
@@ -3718,19 +3864,20 @@ 
 						'member_list' => array_keys($members),
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$context['rule']['criteria'][$members[$row['id_member']]]['v'] = $row['member_name'];
+				}
 				$smcFunc['db_free_result']($request);
 			}
-		}
-		else
-			$context['rule'] = array(
+		} else {
+					$context['rule'] = array(
 				'id' => '',
 				'name' => '',
 				'criteria' => array(),
 				'actions' => array(),
 				'logic' => 'and',
 			);
+		}
 	}
 	// Saving?
 	elseif (isset($_GET['save']))
@@ -3740,22 +3887,25 @@ 
 
 		// Name is easy!
 		$ruleName = $smcFunc['htmlspecialchars'](trim($_POST['rule_name']));
-		if (empty($ruleName))
-			fatal_lang_error('pm_rule_no_name', false);
+		if (empty($ruleName)) {
+					fatal_lang_error('pm_rule_no_name', false);
+		}
 
 		// Sanity check...
-		if (empty($_POST['ruletype']) || empty($_POST['acttype']))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($_POST['ruletype']) || empty($_POST['acttype'])) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// Let's do the criteria first - it's also hardest!
 		$criteria = array();
 		foreach ($_POST['ruletype'] as $ind => $type)
 		{
 			// Check everything is here...
-			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]])))
-				continue;
-			elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind]))
-				continue;
+			if ($type == 'gid' && (!isset($_POST['ruledefgroup'][$ind]) || !isset($context['groups'][$_POST['ruledefgroup'][$ind]]))) {
+							continue;
+			} elseif ($type != 'bud' && !isset($_POST['ruledef'][$ind])) {
+							continue;
+			}
 
 			// Members need to be found.
 			if ($type == 'mid')
@@ -3779,13 +3929,13 @@ 
 				$smcFunc['db_free_result']($request);
 
 				$criteria[] = array('t' => 'mid', 'v' => $memID);
+			} elseif ($type == 'bud') {
+							$criteria[] = array('t' => 'bud', 'v' => 1);
+			} elseif ($type == 'gid') {
+							$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
+			} elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '') {
+							$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 			}
-			elseif ($type == 'bud')
-				$criteria[] = array('t' => 'bud', 'v' => 1);
-			elseif ($type == 'gid')
-				$criteria[] = array('t' => 'gid', 'v' => (int) $_POST['ruledefgroup'][$ind]);
-			elseif (in_array($type, array('sub', 'msg')) && trim($_POST['ruledef'][$ind]) != '')
-				$criteria[] = array('t' => $type, 'v' => $smcFunc['htmlspecialchars'](trim($_POST['ruledef'][$ind])));
 		}
 
 		// Also do the actions!
@@ -3795,26 +3945,29 @@ 
 		foreach ($_POST['acttype'] as $ind => $type)
 		{
 			// Picking a valid label?
-			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]])))
-				continue;
+			if ($type == 'lab' && (!isset($_POST['labdef'][$ind]) || !isset($context['labels'][$_POST['labdef'][$ind]]))) {
+							continue;
+			}
 
 			// Record what we're doing.
-			if ($type == 'del')
-				$doDelete = 1;
-			elseif ($type == 'lab')
-				$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			if ($type == 'del') {
+							$doDelete = 1;
+			} elseif ($type == 'lab') {
+							$actions[] = array('t' => 'lab', 'v' => (int) $_POST['labdef'][$ind]);
+			}
 		}
 
-		if (empty($criteria) || (empty($actions) && !$doDelete))
-			fatal_lang_error('pm_rule_no_criteria', false);
+		if (empty($criteria) || (empty($actions) && !$doDelete)) {
+					fatal_lang_error('pm_rule_no_criteria', false);
+		}
 
 		// What are we storing?
 		$criteria = $smcFunc['json_encode']($criteria);
 		$actions = $smcFunc['json_encode']($actions);
 
 		// Create the rule?
-		if (empty($context['rid']))
-			$smcFunc['db_insert']('',
+		if (empty($context['rid'])) {
+					$smcFunc['db_insert']('',
 				'{db_prefix}pm_rules',
 				array(
 					'id_member' => 'int', 'rule_name' => 'string', 'criteria' => 'string', 'actions' => 'string',
@@ -3825,8 +3978,8 @@ 
 				),
 				array('id_rule')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}pm_rules
 				SET rule_name = {string:rule_name}, criteria = {string:criteria}, actions = {string:actions},
 					delete_pm = {int:delete_pm}, is_or = {int:is_or}
@@ -3842,6 +3995,7 @@ 
 					'actions' => $actions,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3850,11 +4004,12 @@ 
 	{
 		checkSession();
 		$toDelete = array();
-		foreach ($_POST['delrule'] as $k => $v)
-			$toDelete[] = (int) $k;
+		foreach ($_POST['delrule'] as $k => $v) {
+					$toDelete[] = (int) $k;
+		}
 
-		if (!empty($toDelete))
-			$smcFunc['db_query']('', '
+		if (!empty($toDelete)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}pm_rules
 				WHERE id_rule IN ({array_int:delete_list})
 					AND id_member = {int:current_member}',
@@ -3863,6 +4018,7 @@ 
 					'delete_list' => $toDelete,
 				)
 			);
+		}
 
 		redirectexit('action=pm;sa=manrules');
 	}
@@ -3881,8 +4037,9 @@ 
 	loadRules();
 
 	// No rules?
-	if (empty($context['rules']))
-		return;
+	if (empty($context['rules'])) {
+			return;
+	}
 
 	// Just unread ones?
 	$ruleQuery = $all_messages ? '' : ' AND pmr.is_new = 1';
@@ -3912,8 +4069,9 @@ 
 			// Loop through all the criteria hoping to make a match.
 			foreach ($rule['criteria'] as $criterium)
 			{
-				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false))
-					$match = true;
+				if (($criterium['t'] == 'mid' && $criterium['v'] == $row['id_member_from']) || ($criterium['t'] == 'gid' && $criterium['v'] == $row['id_group']) || ($criterium['t'] == 'sub' && strpos($row['subject'], $criterium['v']) !== false) || ($criterium['t'] == 'msg' && strpos($row['body'], $criterium['v']) !== false)) {
+									$match = true;
+				}
 				// If we're adding and one criteria don't match then we stop!
 				elseif ($rule['logic'] == 'and')
 				{
@@ -3925,17 +4083,18 @@ 
 			// If we have a match the rule must be true - act!
 			if ($match)
 			{
-				if ($rule['delete'])
-					$actions['deletes'][] = $row['id_pm'];
-				else
+				if ($rule['delete']) {
+									$actions['deletes'][] = $row['id_pm'];
+				} else
 				{
 					foreach ($rule['actions'] as $ruleAction)
 					{
 						if ($ruleAction['t'] == 'lab')
 						{
 							// Get a basic pot started!
-							if (!isset($actions['labels'][$row['id_pm']]))
-								$actions['labels'][$row['id_pm']] = array();
+							if (!isset($actions['labels'][$row['id_pm']])) {
+															$actions['labels'][$row['id_pm']] = array();
+							}
 							$actions['labels'][$row['id_pm']][] = $ruleAction['v'];
 						}
 					}
@@ -3946,8 +4105,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Deletes are easy!
-	if (!empty($actions['deletes']))
-		deleteMessages($actions['deletes']);
+	if (!empty($actions['deletes'])) {
+			deleteMessages($actions['deletes']);
+	}
 
 	// Relabel?
 	if (!empty($actions['labels']))
@@ -3974,8 +4134,7 @@ 
 								'current_member' => $user_info['id'],
 							)
 						);
-					}
-					else
+					} else
 					{
 						$realLabels[] = $label['id'];
 					}
@@ -3984,8 +4143,9 @@ 
 
 			$inserts = array();
 			// Now we insert the label info
-			foreach ($realLabels as $a_label)
-				$inserts[] = array($pm, $a_label);
+			foreach ($realLabels as $a_label) {
+							$inserts[] = array($pm, $a_label);
+			}
 
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}pm_labeled_messages',
@@ -4006,8 +4166,9 @@ 
 {
 	global $user_info, $context, $smcFunc;
 
-	if (isset($context['rules']) && !$reload)
-		return;
+	if (isset($context['rules']) && !$reload) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -4031,8 +4192,9 @@ 
 			'logic' => $row['is_or'] ? 'or' : 'and',
 		);
 
-		if ($row['delete_pm'])
-			$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		if ($row['delete_pm']) {
+					$context['rules'][$row['id_rule']]['actions'][] = array('t' => 'del', 'v' => 1);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 }

Sources/Display.php

Braces +292 added lines, -214 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The central part of the board - topic display.
@@ -34,8 +35,9 @@ 
 	global $messages_request, $language, $smcFunc;
 
 	// What are you gonna display if these are empty?!
-	if (empty($topic))
-		fatal_lang_error('no_board', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_board', false);
+	}
 
 	// Load the proper template.
 	loadTemplate('Display');
@@ -52,15 +54,17 @@ 
 	$context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Let's do some work on what to search index.
-	if (count($_GET) > 2)
-		foreach ($_GET as $k => $v)
+	if (count($_GET) > 2) {
+			foreach ($_GET as $k => $v)
 		{
 			if (!in_array($k, array('topic', 'board', 'start', session_name())))
 				$context['robot_no_index'] = true;
+	}
 		}
 
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
-		$context['robot_no_index'] = true;
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Find the previous or next topic.  Make a fuss if there are no more.
 	if (isset($_REQUEST['prev_next']) && ($_REQUEST['prev_next'] == 'prev' || $_REQUEST['prev_next'] == 'next'))
@@ -172,8 +176,9 @@ 
 			$topic_parameters
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('not_a_topic', false, 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('not_a_topic', false, 404);
+	}
 	$context['topicinfo'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +215,9 @@ 
 	$context['topic_unwatched'] = isset($context['topicinfo']['unwatched']) ? $context['topicinfo']['unwatched'] : 0;
 
 	// Add up unapproved replies to get real number of replies...
-	if ($modSettings['postmod_active'] && $approve_posts)
-		$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
+	if ($modSettings['postmod_active'] && $approve_posts) {
+			$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
+	}
 
 	// If this topic has unapproved posts, we need to work out how many posts the user can see, for page indexing.
 	if ($modSettings['postmod_active'] && $context['topicinfo']['unapproved_posts'] && !$user_info['is_guest'] && !$approve_posts)
@@ -231,11 +237,11 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$context['total_visible_posts'] = $context['num_replies'] + $myUnapprovedPosts + ($context['topicinfo']['approved'] ? 1 : 0);
+	} elseif ($user_info['is_guest']) {
+			$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
+	} else {
+			$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
 	}
-	elseif ($user_info['is_guest'])
-		$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
-	else
-		$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
 
 	// The start isn't a number; it's information about what to do, where to go.
 	if (!is_numeric($_REQUEST['start']))
@@ -248,8 +254,7 @@ 
 			{
 				$context['start_from'] = $context['total_visible_posts'] - 1;
 				$_REQUEST['start'] = empty($options['view_newest_first']) ? $context['start_from'] : 0;
-			}
-			else
+			} else
 			{
 				// Find the earliest unread message in the topic. (the use of topics here is just for both tables.)
 				$request = $smcFunc['db_query']('', '
@@ -277,9 +282,9 @@ 
 		if (substr($_REQUEST['start'], 0, 4) == 'from')
 		{
 			$timestamp = (int) substr($_REQUEST['start'], 4);
-			if ($timestamp === 0)
-				$_REQUEST['start'] = 0;
-			else
+			if ($timestamp === 0) {
+							$_REQUEST['start'] = 0;
+			} else
 			{
 				// Find the number of messages posted before said time...
 				$request = $smcFunc['db_query']('', '
@@ -307,11 +312,11 @@ 
 		elseif (substr($_REQUEST['start'], 0, 3) == 'msg')
 		{
 			$virtual_msg = (int) substr($_REQUEST['start'], 3);
-			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg'])
-				$context['start_from'] = $context['total_visible_posts'] - 1;
-			elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg'])
-				$context['start_from'] = 0;
-			else
+			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg']) {
+							$context['start_from'] = $context['total_visible_posts'] - 1;
+			} elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg']) {
+							$context['start_from'] = 0;
+			} else
 			{
 				// Find the start value for that message......
 				$request = $smcFunc['db_query']('', '
@@ -394,21 +399,25 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['id_member']))
-				continue;
+			if (empty($row['id_member'])) {
+							continue;
+			}
 
-			if (!empty($row['online_color']))
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			else
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			if (!empty($row['online_color'])) {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+			} else {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
-			if ($is_buddy)
-				$link = '<strong>' . $link . '</strong>';
+			if ($is_buddy) {
+							$link = '<strong>' . $link . '</strong>';
+			}
 
 			// Add them both to the list and to the more detailed list.
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			}
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
 				'username' => $row['member_name'],
@@ -420,8 +429,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 
 		// The number of guests is equal to the rows minus the ones we actually used ;).
@@ -435,11 +445,13 @@ 
 
 	// If all is set, but not allowed... just unset it.
 	$can_show_all = !empty($modSettings['enableAllMessages']) && $context['total_visible_posts'] > $context['messages_per_page'] && $context['total_visible_posts'] < $modSettings['enableAllMessages'];
-	if (isset($_REQUEST['all']) && !$can_show_all)
-		unset($_REQUEST['all']);
+	if (isset($_REQUEST['all']) && !$can_show_all) {
+			unset($_REQUEST['all']);
+	}
 	// Otherwise, it must be allowed... so pretend start was -1.
-	elseif (isset($_REQUEST['all']))
-		$_REQUEST['start'] = -1;
+	elseif (isset($_REQUEST['all'])) {
+			$_REQUEST['start'] = -1;
+	}
 
 	// Construct the page index, allowing for the .START method...
 	$context['page_index'] = constructPageIndex($scripturl . '?topic=' . $topic . '.%1$d', $_REQUEST['start'], $context['total_visible_posts'], $context['messages_per_page'], true);
@@ -476,8 +488,9 @@ 
 			$_REQUEST['start'] = 0;
 		}
 		// They aren't using it, but the *option* is there, at least.
-		else
-			$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
+		else {
+					$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
+		}
 	}
 
 	// Build the link tree.
@@ -493,14 +506,16 @@ 
 	if (!empty($board_info['moderators']))
 	{
 		// Add a link for each moderator...
-		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		foreach ($board_info['moderators'] as $mod) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		}
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
 		// Add a link for each moderator group as well...
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		foreach ($board_info['moderator_groups'] as $mod_group) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	if (!empty($context['link_moderators']))
@@ -531,9 +546,9 @@ 
 	// For quick reply we need a response prefix in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix', 600)))
 	{
-		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'];
@@ -565,8 +580,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;
+			}
 
 			$linked_calendar_event = array(
 				'id' => $row['id_event'],
@@ -615,8 +631,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($context['linked_calendar_events']))
-			$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
+		if (!empty($context['linked_calendar_events'])) {
+					$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
+		}
 	}
 
 	// Create the poll info if it exists.
@@ -679,8 +696,9 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Got we multi choice?
-		if ($pollinfo['max_votes'] > 1)
-			$realtotal = $pollinfo['total'];
+		if ($pollinfo['max_votes'] > 1) {
+					$realtotal = $pollinfo['total'];
+		}
 
 		// If this is a guest we need to do our best to work out if they have voted, and what they voted for.
 		if ($user_info['is_guest'] && $pollinfo['guest_vote'] && allowedTo('poll_vote'))
@@ -693,20 +711,21 @@ 
 				foreach ($guestinfo as $i => $guestvoted)
 				{
 					$guestvoted = explode(',', $guestvoted);
-					if ($guestvoted[0] == $context['topicinfo']['id_poll'])
-						break;
+					if ($guestvoted[0] == $context['topicinfo']['id_poll']) {
+											break;
+					}
 				}
 				// Has the poll been reset since guest voted?
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
 				{
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
-					if (!empty($guestinfo))
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					else
-						unset($_COOKIE['guest_poll_vote']);
-				}
-				else
+					if (!empty($guestinfo)) {
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+					} else {
+											unset($_COOKIE['guest_poll_vote']);
+					}
+				} else
 				{
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
@@ -820,23 +839,29 @@ 
 		// Build the poll moderation button array.
 		$context['poll_buttons'] = array();
 
-		if ($context['allow_return_vote'])
-			$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
+		if ($context['allow_return_vote']) {
+					$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
+		}
 
-		if ($context['show_view_results_button'])
-			$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
+		if ($context['show_view_results_button']) {
+					$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
+		}
 
-		if ($context['allow_change_vote'])
-			$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['allow_change_vote']) {
+					$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
-		if ($context['allow_lock_poll'])
-			$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['allow_lock_poll']) {
+					$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
-		if ($context['allow_edit_poll'])
-			$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
+		if ($context['allow_edit_poll']) {
+					$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
+		}
 
-		if ($context['can_remove_poll'])
-			$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['can_remove_poll']) {
+					$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
 		// Allow mods to add additional buttons here
 		call_integration_hook('integrate_poll_buttons');
@@ -872,9 +897,9 @@ 
 	{
 		$start_char = 'C';
 		$page_id = $ascending ? $context['topicinfo']['id_first_msg'] : $context['topicinfo']['id_last_msg'];
+	} else {
+			$start_char = null;
 	}
-	else
-		$start_char = null;
 
 	$limit = $context['messages_per_page'];
 
@@ -888,17 +913,17 @@ 
 		{
 			$ascending_seek = true;
 			$page_operator = $ascending ? '>=' : '<=';
-		}
-		else
+		} else
 		{
 			$ascending_seek = false;
 			$page_operator = $ascending ? '<=' : '>=';
 		}
 
-		if ($start_char === 'C')
-			$limit_seek = $limit;
-		else
-			$limit_seek  = $limit + 1;
+		if ($start_char === 'C') {
+					$limit_seek = $limit;
+		} else {
+					$limit_seek  = $limit + 1;
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT id_msg, id_member, approved
@@ -921,21 +946,23 @@ 
 		$found_msg = false;
 
 		// Fallback
-		if ($smcFunc['db_num_rows']($request) < 1)
-			unset($start_char);
-		else
+		if ($smcFunc['db_num_rows']($request) < 1) {
+					unset($start_char);
+		} else
 		{
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// Check if the start msg is in our result
-				if ($row['id_msg'] == $page_id)
-					$found_msg = true;
+				if ($row['id_msg'] == $page_id) {
+									$found_msg = true;
+				}
 
 				// Skip the the start msg if we not in mode C
 				if ($start_char === 'C' || $row['id_msg'] != $page_id)
 				{
-					if (!empty($row['id_member']))
-						$all_posters[$row['id_msg']] = $row['id_member'];
+					if (!empty($row['id_member'])) {
+											$all_posters[$row['id_msg']] = $row['id_member'];
+					}
 
 					$messages[] = $row['id_msg'];
 				}
@@ -951,8 +978,9 @@ 
 		}
 
 		// Before Page bring in the right order
-		if (!empty($start_char) && $start_char === 'L')
-			krsort($messages);
+		if (!empty($start_char) && $start_char === 'L') {
+					krsort($messages);
+		}
 	}
 
 	// Jump to page
@@ -987,14 +1015,16 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!empty($row['id_member']))
-				$all_posters[$row['id_msg']] = $row['id_member'];
+			if (!empty($row['id_member'])) {
+							$all_posters[$row['id_msg']] = $row['id_member'];
+			}
 			$messages[] = $row['id_msg'];
 		}
 
 		// Sort the messages into the correct display order
-		if (!$ascending)
-			sort($messages);
+		if (!$ascending) {
+					sort($messages);
+		}
 	}
 
 	// Remember the paging data for next time
@@ -1014,8 +1044,9 @@ 
 	if (!$user_info['is_guest'] && !empty($messages))
 	{
 		$mark_at_msg = max($messages);
-		if ($mark_at_msg >= $context['topicinfo']['id_last_msg'])
-			$mark_at_msg = $modSettings['maxMsgID'];
+		if ($mark_at_msg >= $context['topicinfo']['id_last_msg']) {
+					$mark_at_msg = $modSettings['maxMsgID'];
+		}
 		if ($mark_at_msg >= $context['topicinfo']['new_from'])
 		{
 			$smcFunc['db_insert']($context['topicinfo']['new_from'] == 0 ? 'ignore' : 'replace',
@@ -1047,8 +1078,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// Find if this topic is marked for notification...
-			if (!empty($row['id_topic']))
-				$context['is_marked_notify'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['is_marked_notify'] = true;
+			}
 
 			// Only do this once, but mark the notifications as "not sent yet" for next time.
 			if (!empty($row['sent']) && $do_once)
@@ -1070,8 +1102,9 @@ 
 		}
 
 		// Have we recently cached the number of new topics in this board, and it's still a lot?
-		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5)
-			$_SESSION['topicseen_cache'][$board]--;
+		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5) {
+					$_SESSION['topicseen_cache'][$board]--;
+		}
 		// Mark board as seen if this is the only new topic.
 		elseif (isset($_REQUEST['topicseen']))
 		{
@@ -1095,14 +1128,16 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If there're no real new topics in this board, mark the board as seen.
-			if (empty($numNewTopics))
-				$_REQUEST['boardseen'] = true;
-			else
-				$_SESSION['topicseen_cache'][$board] = $numNewTopics;
+			if (empty($numNewTopics)) {
+							$_REQUEST['boardseen'] = true;
+			} else {
+							$_SESSION['topicseen_cache'][$board] = $numNewTopics;
+			}
 		}
 		// Probably one less topic - maybe not, but even if we decrease this too fast it will only make us look more often.
-		elseif (isset($_SESSION['topicseen_cache'][$board]))
-			$_SESSION['topicseen_cache'][$board]--;
+		elseif (isset($_SESSION['topicseen_cache'][$board])) {
+					$_SESSION['topicseen_cache'][$board]--;
+		}
 
 		// Mark board as seen if we came using last post link from BoardIndex. (or other places...)
 		if (isset($_REQUEST['boardseen']))
@@ -1159,23 +1194,26 @@ 
 			$temp = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-					continue;
+				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+									continue;
+				}
 
 				$temp[$row['id_attach']] = $row;
 				$temp[$row['id_attach']]['topic'] = $topic;
 				$temp[$row['id_attach']]['board'] = $board;
 
-				if (!isset($context['loaded_attachments'][$row['id_msg']]))
-					$context['loaded_attachments'][$row['id_msg']] = array();
+				if (!isset($context['loaded_attachments'][$row['id_msg']])) {
+									$context['loaded_attachments'][$row['id_msg']] = array();
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// This is better than sorting it with the query...
 			ksort($temp);
 
-			foreach ($temp as $row)
-				$context['loaded_attachments'][$row['id_msg']][] = $row;
+			foreach ($temp as $row) {
+							$context['loaded_attachments'][$row['id_msg']][] = $row;
+			}
 		}
 
 		$msg_parameters = array(
@@ -1202,21 +1240,23 @@ 
 		);
 
 		// And the likes
-		if (!empty($modSettings['enable_likes']))
-			$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
+		if (!empty($modSettings['enable_likes'])) {
+					$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
+		}
 
 		// Go to the last message if the given time is beyond the time of the last message.
-		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies'])
-			$context['start_from'] = $context['topicinfo']['num_replies'];
+		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies']) {
+					$context['start_from'] = $context['topicinfo']['num_replies'];
+		}
 
 		// Since the anchor information is needed on the top of the page we load these variables beforehand.
 		$context['first_message'] = isset($messages[$firstIndex]) ? $messages[$firstIndex] : $messages[0];
-		if (empty($options['view_newest_first']))
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
-		else
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
-	}
-	else
+		if (empty($options['view_newest_first'])) {
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
+		} else {
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
+		}
+	} else
 	{
 		$messages_request = false;
 		$context['first_message'] = 0;
@@ -1251,8 +1291,9 @@ 
 		'can_restore_msg' => 'move_any',
 		'can_like' => 'likes_like',
 	);
-	foreach ($common_permissions as $contextual => $perm)
-		$context[$contextual] = allowedTo($perm);
+	foreach ($common_permissions as $contextual => $perm) {
+			$context[$contextual] = allowedTo($perm);
+	}
 
 	// Permissions with _any/_own versions.  $context[YYY] => ZZZ_any/_own.
 	$anyown_permissions = array(
@@ -1265,8 +1306,9 @@ 
 		'can_reply_unapproved' => 'post_unapproved_replies',
 		'can_view_warning' => 'profile_warning',
 	);
-	foreach ($anyown_permissions as $contextual => $perm)
-		$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+	foreach ($anyown_permissions as $contextual => $perm) {
+			$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+	}
 
 	if (!$user_info['is_admin'] && $context['can_move'] && !$modSettings['topic_move_any'])
 	{
@@ -1312,8 +1354,9 @@ 
 	// Check if the draft functions are enabled and that they have permission to use them (for quick reply.)
 	$context['drafts_save'] = !empty($modSettings['drafts_post_enabled']) && allowedTo('post_draft') && $context['can_reply'];
 	$context['drafts_autosave'] = !empty($context['drafts_save']) && !empty($modSettings['drafts_autosave_enabled']);
-	if (!empty($context['drafts_save']))
-		loadLanguage('Drafts');
+	if (!empty($context['drafts_save'])) {
+			loadLanguage('Drafts');
+	}
 
 	// When was the last time this topic was replied to?  Should we warn them about it?
 	if (!empty($modSettings['oldTopicDays']) && ($context['can_reply'] || $context['can_reply_unapproved']) && empty($context['topicinfo']['is_sticky']))
@@ -1374,26 +1417,31 @@ 
 	// Message icons - customized icons are off?
 	$context['icons'] = getMessageIcons($board);
 
-	if (!empty($context['icons']))
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	if (!empty($context['icons'])) {
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	}
 
 	// Build the normal button array.
 	$context['normal_buttons'] = array();
 
-	if ($context['can_reply'])
-		$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
+	if ($context['can_reply']) {
+			$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
+	}
 
-	if ($context['can_add_poll'])
-		$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
+	if ($context['can_add_poll']) {
+			$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
+	}
 
-	if ($context['can_mark_unread'])
-		$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_mark_unread']) {
+			$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_print'])
-		$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
+	if ($context['can_print']) {
+			$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
+	}
 
-	if ($context['can_set_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_set_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'text' => 'notify_topic_' . $context['topic_notification_mode'],
 			'sub_buttons' => array(
 				array(
@@ -1415,38 +1463,47 @@ 
 				),
 			),
 		);
+	}
 
 	// Build the mod button array
 	$context['mod_buttons'] = array();
 
-	if ($context['can_move'])
-		$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
+	if ($context['can_move']) {
+			$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
+	}
 
-	if ($context['can_delete'])
-		$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_delete']) {
+			$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_lock'])
-		$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_lock']) {
+			$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_sticky'])
-		$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_sticky']) {
+			$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_merge'])
-		$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
+	if ($context['can_merge']) {
+			$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
+	}
 
-	if ($context['calendar_post'])
-		$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
+	if ($context['calendar_post']) {
+			$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
+	}
 
 	// Restore topic. eh?  No monkey business.
-	if ($context['can_restore_topic'])
-		$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_restore_topic']) {
+			$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Show a message in case a recently posted message became unapproved.
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
 
 	// Don't want to show this forever...
-	if ($context['becomesUnapproved'])
-		unset($_SESSION['becomesUnapproved']);
+	if ($context['becomesUnapproved']) {
+			unset($_SESSION['becomesUnapproved']);
+	}
 
 	// Allow adding new mod buttons easily.
 	// Note: $context['normal_buttons'] and $context['mod_buttons'] are added for backward compatibility with 2.0, but are deprecated and should not be used
@@ -1455,12 +1512,14 @@ 
 	call_integration_hook('integrate_mod_buttons', array(&$context['mod_buttons']));
 
 	// Load the drafts js file
-	if ($context['drafts_autosave'])
-		loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
+	if ($context['drafts_autosave']) {
+			loadJavaScriptFile('drafts.js', array('defer' => false, 'minimize' => true), 'smf_drafts');
+	}
 
 	// Spellcheck
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false, 'minimize' => true), 'smf_spellcheck');
+	}
 
 	// topic.js
 	loadJavaScriptFile('topic.js', array('defer' => false, 'minimize' => true), 'smf_topic');
@@ -1494,16 +1553,19 @@ 
 	static $counter = null;
 
 	// If the query returned false, bail.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Remember which message this is.  (ie. reply #83)
-	if ($counter === null || $reset)
-		$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
+	if ($counter === null || $reset) {
+			$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
+	}
 
 	// 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);
@@ -1517,19 +1579,21 @@ 
 	if (empty($context['icon_sources']))
 	{
 		$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';
+		}
 	}
 
 	// Message Icon Management... check the images exist.
 	if (empty($modSettings['messageIconChecks_disable']))
 	{
 		// If the current icon isn't known, then we need to do something...
-		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';
+		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';
+		}
+	} elseif (!isset($context['icon_sources'][$message['icon']])) {
+			$context['icon_sources'][$message['icon']] = 'images_url';
 	}
-	elseif (!isset($context['icon_sources'][$message['icon']]))
-		$context['icon_sources'][$message['icon']] = 'images_url';
 
 	// If you're a lazy bum, you probably didn't give a subject...
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1554,8 +1618,7 @@ 
 		$memberContext[$message['id_member']]['email'] = $message['poster_email'];
 		$memberContext[$message['id_member']]['show_email'] = allowedTo('moderate_forum');
 		$memberContext[$message['id_member']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		// Define this here to make things a bit more readable
 		$can_view_warning = $context['user']['can_mod'] || allowedTo('view_warning_any') || ($message['id_member'] == $user_info['id'] && allowedTo('view_warning_own'));
@@ -1578,8 +1641,9 @@ 
 	$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
 
 	// If it's in the recycle bin we need to override whatever icon we did have.
-	if (!empty($board_info['recycle']))
-		$message['icon'] = 'recycled';
+	if (!empty($board_info['recycle'])) {
+			$message['icon'] = 'recycled';
+	}
 
 	require_once($sourcedir . '/Subs-Attachments.php');
 
@@ -1623,32 +1687,36 @@ 
 	}
 
 	// Are likes enable?
-	if (!empty($modSettings['enable_likes']))
-		$output['likes'] = array(
+	if (!empty($modSettings['enable_likes'])) {
+			$output['likes'] = array(
 			'count' => $message['likes'],
 			'you' => in_array($message['id_msg'], $context['my_likes']),
 			'can_like' => !$context['user']['is_guest'] && $message['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 		);
+	}
 
 	// Is this user the message author?
 	$output['is_message_author'] = $message['id_member'] == $user_info['id'];
-	if (!empty($output['modified']['name']))
-		$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
+	if (!empty($output['modified']['name'])) {
+			$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
+	}
 
 	// Did they give a reason for editing?
-	if (!empty($output['modified']['name']) && !empty($output['modified']['reason']))
-		$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
+	if (!empty($output['modified']['name']) && !empty($output['modified']['reason'])) {
+			$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
+	}
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member']]['custom_fields']))
-		foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
-	if (empty($options['view_newest_first']))
-		$counter++;
-
-	else
-		$counter--;
+	if (empty($options['view_newest_first'])) {
+			$counter++;
+	} else {
+			$counter--;
+	}
 
 	call_integration_hook('integrate_prepare_display_context', array(&$output, &$message, $counter));
 
@@ -1674,8 +1742,9 @@ 
  */
 function approved_attach_sort($a, $b)
 {
-	if ($a['is_approved'] == $b['is_approved'])
-		return 0;
+	if ($a['is_approved'] == $b['is_approved']) {
+			return 0;
+	}
 
 	return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
 }
@@ -1692,16 +1761,19 @@ 
 
 	require_once($sourcedir . '/RemoveTopic.php');
 
-	if (empty($_REQUEST['msgs']))
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	if (empty($_REQUEST['msgs'])) {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
 
 	$messages = array();
-	foreach ($_REQUEST['msgs'] as $dummy)
-		$messages[] = (int) $dummy;
+	foreach ($_REQUEST['msgs'] as $dummy) {
+			$messages[] = (int) $dummy;
+	}
 
 	// We are restoring messages. We handle this in another place.
-	if (isset($_REQUEST['restore_selected']))
-		redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['restore_selected'])) {
+			redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 	if (isset($_REQUEST['split_selection']))
 	{
 		$request = $smcFunc['db_query']('', '
@@ -1720,8 +1792,9 @@ 
 	}
 
 	// Allowed to delete any message?
-	if (allowedTo('delete_any'))
-		$allowed_all = true;
+	if (allowedTo('delete_any')) {
+			$allowed_all = true;
+	}
 	// Allowed to delete replies to their messages?
 	elseif (allowedTo('delete_replies'))
 	{
@@ -1738,13 +1811,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$allowed_all = $starter == $user_info['id'];
+	} else {
+			$allowed_all = false;
 	}
-	else
-		$allowed_all = false;
 
 	// Make sure they're allowed to delete their own messages, if not any.
-	if (!$allowed_all)
-		isAllowedTo('delete_own');
+	if (!$allowed_all) {
+			isAllowedTo('delete_own');
+	}
 
 	// Allowed to remove which messages?
 	$request = $smcFunc['db_query']('', '
@@ -1764,8 +1838,9 @@ 
 	$messages = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-			continue;
+		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+					continue;
+		}
 
 		$messages[$row['id_msg']] = array($row['subject'], $row['id_member']);
 	}
@@ -1788,17 +1863,20 @@ 
 	foreach ($messages as $message => $info)
 	{
 		// Just skip the first message - if it's not the last.
-		if ($message == $first_message && $message != $last_message)
-			continue;
+		if ($message == $first_message && $message != $last_message) {
+					continue;
+		}
 		// If the first message is going then don't bother going back to the topic as we're effectively deleting it.
-		elseif ($message == $first_message)
-			$topicGone = true;
+		elseif ($message == $first_message) {
+					$topicGone = true;
+		}
 
 		removeMessage($message);
 
 		// Log this moderation action ;).
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
-			logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
+					logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
+		}
 	}
 
 	redirectexit(!empty($topicGone) ? 'board=' . $board : 'topic=' . $topic . '.' . $_REQUEST['start']);

Sources/Groups.php

Braces +80 added lines, -59 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Entry point function, permission checks, admin bars, etc.
@@ -99,27 +100,27 @@ 
 					'function' => function($rowData) use ($scripturl)
 					{
 						// Since the moderator group has no explicit members, no link is needed.
-						if ($rowData['id_group'] == 3)
-							$group_name = $rowData['group_name'];
-						else
+						if ($rowData['id_group'] == 3) {
+													$group_name = $rowData['group_name'];
+						} else
 						{
 							$color_style = empty($rowData['online_color']) ? '' : sprintf(' style="color: %1$s;"', $rowData['online_color']);
 
 							if (allowedTo('manage_membergroups'))
 							{
 								$group_name = sprintf('<a href="%1$s?action=admin;area=membergroups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
-							}
-							else
+							} else
 							{
 								$group_name = sprintf('<a href="%1$s?action=groups;sa=members;group=%2$d"%3$s>%4$s</a>', $scripturl, $rowData['id_group'], $color_style, $rowData['group_name']);
 							}
 						}
 
 						// Add a help option for moderator and administrator.
-						if ($rowData['id_group'] == 1)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
-						elseif ($rowData['id_group'] == 3)
-							$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						if ($rowData['id_group'] == 1) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_administrator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						} elseif ($rowData['id_group'] == 3) {
+													$group_name .= sprintf(' (<a href="%1$s?action=helpadmin;help=membergroup_moderator" onclick="return reqOverlayDiv(this.href);">?</a>)', $scripturl);
+						}
 
 						return $group_name;
 					},
@@ -198,8 +199,9 @@ 
 	$_REQUEST['group'] = isset($_REQUEST['group']) ? (int) $_REQUEST['group'] : 0;
 
 	// No browsing of guests, membergroup 0 or moderators.
-	if (in_array($_REQUEST['group'], array(-1, 0, 3)))
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if (in_array($_REQUEST['group'], array(-1, 0, 3))) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// Load up the group details.
 	$request = $smcFunc['db_query']('', '
@@ -214,8 +216,9 @@ 
 		)
 	);
 	// Doesn't exist?
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 	$context['group'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -248,21 +251,25 @@ 
 			'name' => $row['real_name']
 		);
 
-		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1)
-			$context['group']['can_moderate'] = true;
+		if ($user_info['id'] == $row['id_member'] && $context['group']['group_type'] != 1) {
+					$context['group']['can_moderate'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// If this group is hidden then it can only "exists" if the user can moderate it!
-	if ($context['group']['hidden'] && !$context['group']['can_moderate'])
-		fatal_lang_error('membergroup_does_not_exist', false);
+	if ($context['group']['hidden'] && !$context['group']['can_moderate']) {
+			fatal_lang_error('membergroup_does_not_exist', false);
+	}
 
 	// You can only assign membership if you are the moderator and/or can manage groups!
-	if (!$context['group']['can_moderate'])
-		$context['group']['assignable'] = 0;
+	if (!$context['group']['can_moderate']) {
+			$context['group']['assignable'] = 0;
+	}
 	// Non-admins cannot assign admins.
-	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum'))
-		$context['group']['assignable'] = 0;
+	elseif ($context['group']['id'] == 1 && !allowedTo('admin_forum')) {
+			$context['group']['assignable'] = 0;
+	}
 
 	// Removing member from group?
 	if (isset($_POST['remove']) && !empty($_REQUEST['rem']) && is_array($_REQUEST['rem']) && $context['group']['assignable'])
@@ -271,8 +278,9 @@ 
 		validateToken('mod-mgm');
 
 		// Make sure we're dealing with integers only.
-		foreach ($_REQUEST['rem'] as $key => $group)
-			$_REQUEST['rem'][$key] = (int) $group;
+		foreach ($_REQUEST['rem'] as $key => $group) {
+					$_REQUEST['rem'][$key] = (int) $group;
+		}
 
 		require_once($sourcedir . '/Subs-Membergroups.php');
 		removeMembersFromGroups($_REQUEST['rem'], $_REQUEST['group'], true);
@@ -295,16 +303,18 @@ 
 		{
 			$member_names[$index] = trim($smcFunc['strtolower']($member_names[$index]));
 
-			if (strlen($member_names[$index]) == 0)
-				unset($member_names[$index]);
+			if (strlen($member_names[$index]) == 0) {
+							unset($member_names[$index]);
+			}
 		}
 
 		// Any passed by ID?
 		$member_ids = array();
-		if (!empty($_REQUEST['member_add']))
-			foreach ($_REQUEST['member_add'] as $id)
+		if (!empty($_REQUEST['member_add'])) {
+					foreach ($_REQUEST['member_add'] as $id)
 				if ($id > 0)
 					$member_ids[] = (int) $id;
+		}
 
 		// Construct the query pelements.
 		if (!empty($member_ids))
@@ -332,8 +342,9 @@ 
 					'id_group' => $_REQUEST['group'],
 				))
 			);
-			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);
 		}
 
@@ -372,10 +383,11 @@ 
 	$context['sort_direction'] = isset($_REQUEST['desc']) ? 'down' : 'up';
 
 	// The where on the query is interesting. Non-moderators should only see people who are in this group as primary.
-	if ($context['group']['can_moderate'])
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
-	else
-		$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	if ($context['group']['can_moderate']) {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group} OR FIND_IN_SET({int:group}, additional_groups) != 0';
+	} else {
+			$where = $context['group']['is_post_group'] ? 'id_post_group = {int:group}' : 'id_group = {int:group}';
+	}
 
 	// Count members of the group.
 	$request = $smcFunc['db_query']('', '
@@ -416,8 +428,9 @@ 
 		$last_online = empty($row['last_login']) ? $txt['never'] : timeformat($row['last_login']);
 
 		// Italicize the online note if they aren't activated.
-		if ($row['is_activated'] % 10 != 1)
-			$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		if ($row['is_activated'] % 10 != 1) {
+					$last_online = '<em title="' . $txt['not_activated'] . '">' . $last_online . '</em>';
+		}
 
 		$context['members'][] = array(
 			'id' => $row['id_member'],
@@ -437,9 +450,10 @@ 
 	$context['page_title'] = $txt['membergroups_members_title'] . ': ' . $context['group']['name'];
 	createToken('mod-mgm');
 
-	if ($context['group']['assignable'])
-		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-}
+	if ($context['group']['assignable']) {
+			loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
+	}
+	}
 
 /**
  * Show and manage all group requests.
@@ -453,16 +467,18 @@ 
 	$context['sub_template'] = 'show_list';
 
 	// Verify we can be here.
-	if ($user_info['mod_cache']['gq'] == '0=1')
-		isAllowedTo('manage_membergroups');
+	if ($user_info['mod_cache']['gq'] == '0=1') {
+			isAllowedTo('manage_membergroups');
+	}
 
 	// Normally, we act normally...
 	$where = ($user_info['mod_cache']['gq'] == '1=1' || $user_info['mod_cache']['gq'] == '0=1' ? $user_info['mod_cache']['gq'] : 'lgr.' . $user_info['mod_cache']['gq']);
 
-	if (isset($_GET['closed']))
-		$where .= ' AND lgr.status != {int:status_open}';
-	else
-		$where .= ' AND lgr.status = {int:status_open}';
+	if (isset($_GET['closed'])) {
+			$where .= ' AND lgr.status != {int:status_open}';
+	} else {
+			$where .= ' AND lgr.status = {int:status_open}';
+	}
 
 	$where_parameters = array(
 		'status_open' => 0,
@@ -475,8 +491,9 @@ 
 		validateToken('mod-gr');
 
 		// Clean the values.
-		foreach ($_POST['groupr'] as $k => $request)
-			$_POST['groupr'][$k] = (int) $request;
+		foreach ($_POST['groupr'] as $k => $request) {
+					$_POST['groupr'][$k] = (int) $request;
+		}
 
 		$log_changes = array();
 
@@ -513,8 +530,8 @@ 
 			$request_list = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!isset($log_changes[$row['id_request']]))
-					$log_changes[$row['id_request']] = array(
+				if (!isset($log_changes[$row['id_request']])) {
+									$log_changes[$row['id_request']] = array(
 						'id_request' => $row['id_request'],
 						'status' => $_POST['req_action'] == 'approve' ? 1 : 2, // 1 = approved, 2 = rejected
 						'id_member_acted' => $user_info['id'],
@@ -522,6 +539,7 @@ 
 						'time_acted' => time(),
 						'act_reason' => $_POST['req_action'] != 'approve' && !empty($_POST['groupreason']) && !empty($_POST['groupreason'][$row['id_request']]) ? $smcFunc['htmlspecialchars']($_POST['groupreason'][$row['id_request']], ENT_QUOTES) : '',
 					);
+				}
 				$request_list[] = $row['id_request'];
 			}
 			$smcFunc['db_free_result']($request);
@@ -744,21 +762,24 @@ 
 	$group_requests = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (empty($row['reason']))
-			$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
-		else
-			$reason = censorText($row['reason']);
+		if (empty($row['reason'])) {
+					$reason = '<em>(' . $txt['mc_groupr_no_reason'] . ')</em>';
+		} else {
+					$reason = censorText($row['reason']);
+		}
 
 		if (isset($_GET['closed']))
 		{
-			if ($row['status'] == 1)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
-			elseif ($row['status'] == 2)
-				$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			if ($row['status'] == 1) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_approved'] . '</strong>';
+			} elseif ($row['status'] == 2) {
+							$reason .= '<br><br><strong>' . $txt['mc_groupr_rejected'] . '</strong>';
+			}
 
 				$reason .= ' (' . timeformat($row['time_acted']) . ')';
-			if (!empty($row['act_reason']))
-				$reason .= '<br><br>' . censorText($row['act_reason']);
+			if (!empty($row['act_reason'])) {
+							$reason .= '<br><br>' . censorText($row['act_reason']);
+			}
 		}
 
 		$group_requests[] = array(

Sources/ManageBoards.php

Braces +147 added lines, -114 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main dispatcher; doesn't do anything, just delegates.
@@ -92,18 +93,19 @@ 
 		checkSession('get');
 		validateToken('admin-bm-' . (int) $_REQUEST['src_board'], 'request');
 
-		if ($_REQUEST['move_to'] === 'top')
-			$boardOptions = array(
+		if ($_REQUEST['move_to'] === 'top') {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_category' => (int) $_REQUEST['target_cat'],
 				'move_first_child' => true,
 			);
-		else
-			$boardOptions = array(
+		} else {
+					$boardOptions = array(
 				'move_to' => $_REQUEST['move_to'],
 				'target_board' => (int) $_REQUEST['target_board'],
 				'move_first_child' => true,
 			);
+		}
 		modifyBoard((int) $_REQUEST['src_board'], $boardOptions);
 	}
 
@@ -148,15 +150,16 @@ 
 			$security = $context['session_var'] . '=' . $context['session_id'] . ';' . $context['admin-bm-' . $context['move_board'] . '_token_var'] . '=' . $context['admin-bm-' . $context['move_board'] . '_token'];
 			foreach ($boardList[$catid] as $boardid)
 			{
-				if (!isset($context['categories'][$catid]['move_link']))
-					$context['categories'][$catid]['move_link'] = array(
+				if (!isset($context['categories'][$catid]['move_link'])) {
+									$context['categories'][$catid]['move_link'] = array(
 						'child_level' => 0,
 						'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
 						'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_board=' . $boardid . ';move_to=before;' . $security,
 					);
+				}
 
-				if (!$context['categories'][$catid]['boards'][$boardid]['move'])
-				$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
+				if (!$context['categories'][$catid]['boards'][$boardid]['move']) {
+								$context['categories'][$catid]['boards'][$boardid]['move_links'] = array(
 					array(
 						'child_level' => $boards[$boardid]['level'],
 						'label' => $txt['mboards_order_after'] . '\'' . $smcFunc['htmlspecialchars']($boards[$boardid]['name']) . '\'',
@@ -170,34 +173,39 @@ 
 						'class' => 'here',
 					),
 				);
+				}
 
 				$difference = $boards[$boardid]['level'] - $prev_child_level;
-				if ($difference == 1)
-					array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
-				elseif ($difference < 0)
+				if ($difference == 1) {
+									array_push($stack, !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']) ? array_shift($context['categories'][$catid]['boards'][$prev_board]['move_links']) : null);
+				} elseif ($difference < 0)
 				{
-					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-						$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
-					for ($i = 0; $i < -$difference; $i++)
-						if (($temp = array_pop($stack)) != null)
+					if (empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+											$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array();
+					}
+					for ($i = 0; $i < -$difference; $i++) {
+											if (($temp = array_pop($stack)) != null)
 							array_unshift($context['categories'][$catid]['boards'][$prev_board]['move_links'], $temp);
+					}
 				}
 
 				$prev_board = $boardid;
 				$prev_child_level = $boards[$boardid]['level'];
 
 			}
-			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links']))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
-			elseif (!empty($stack))
-				$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			if (!empty($stack) && !empty($context['categories'][$catid]['boards'][$prev_board]['move_links'])) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = array_merge($stack, $context['categories'][$catid]['boards'][$prev_board]['move_links']);
+			} elseif (!empty($stack)) {
+							$context['categories'][$catid]['boards'][$prev_board]['move_links'] = $stack;
+			}
 
-			if (empty($boardList[$catid]))
-				$context['categories'][$catid]['move_link'] = array(
+			if (empty($boardList[$catid])) {
+							$context['categories'][$catid]['move_link'] = array(
 					'child_level' => 0,
 					'label' => $txt['mboards_order_before'] . ' \'' . $smcFunc['htmlspecialchars']($tree['node']['name']) . '\'',
 					'href' => $scripturl . '?action=admin;area=manageboards;sa=move;src_board=' . $context['move_board'] . ';target_cat=' . $catid . ';move_to=top;' . $security,
 				);
+			}
 		}
 	}
 
@@ -253,9 +261,9 @@ 
 		);
 	}
 	// Category doesn't exist, man... sorry.
-	elseif (!isset($cat_tree[$_REQUEST['cat']]))
-		redirectexit('action=admin;area=manageboards');
-	else
+	elseif (!isset($cat_tree[$_REQUEST['cat']])) {
+			redirectexit('action=admin;area=manageboards');
+	} else
 	{
 		$context['category'] = array(
 			'id' => $_REQUEST['cat'],
@@ -267,30 +275,31 @@ 
 			'is_empty' => empty($cat_tree[$_REQUEST['cat']]['children'])
 		);
 
-		foreach ($boardList[$_REQUEST['cat']] as $child_board)
-			$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		foreach ($boardList[$_REQUEST['cat']] as $child_board) {
+					$context['category']['children'][] = str_repeat('-', $boards[$child_board]['level']) . ' ' . $boards[$child_board]['name'];
+		}
 	}
 
 	$prevCat = 0;
 	foreach ($cat_tree as $catid => $tree)
 	{
-		if ($catid == $_REQUEST['cat'] && $prevCat > 0)
-			$context['category_order'][$prevCat]['selected'] = true;
-		elseif ($catid != $_REQUEST['cat'])
-			$context['category_order'][$catid] = array(
+		if ($catid == $_REQUEST['cat'] && $prevCat > 0) {
+					$context['category_order'][$prevCat]['selected'] = true;
+		} elseif ($catid != $_REQUEST['cat']) {
+					$context['category_order'][$catid] = array(
 				'id' => $catid,
 				'name' => $txt['mboards_order_after'] . $tree['node']['name'],
 				'selected' => false,
 				'true_name' => $tree['node']['name']
 			);
+		}
 		$prevCat = $catid;
 	}
 	if (!isset($_REQUEST['delete']))
 	{
 		$context['sub_template'] = 'modify_category';
 		$context['page_title'] = $_REQUEST['sa'] == 'newcat' ? $txt['mboards_new_cat_name'] : $txt['catEdit'];
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_category_delete';
 		$context['page_title'] = $txt['mboards_delete_cat'];
@@ -327,8 +336,9 @@ 
 	{
 		$catOptions = array();
 
-		if (isset($_POST['cat_order']))
-			$catOptions['move_after'] = (int) $_POST['cat_order'];
+		if (isset($_POST['cat_order'])) {
+					$catOptions['move_after'] = (int) $_POST['cat_order'];
+		}
 
 		// Change "This & That" to "This &amp; That" but don't change "&cent" to "&amp;cent;"...
 		$catOptions['cat_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['cat_name']), false, '', $context['description_allowed_tags']);
@@ -336,10 +346,11 @@ 
 
 		$catOptions['is_collapsible'] = isset($_POST['collapse']);
 
-		if (isset($_POST['add']))
-			createCategory($catOptions);
-		else
-			modifyCategory($_POST['cat'], $catOptions);
+		if (isset($_POST['add'])) {
+					createCategory($catOptions);
+		} else {
+					modifyCategory($_POST['cat'], $catOptions);
+		}
 	}
 	// If they want to delete - first give them confirmation.
 	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['empty']))
@@ -353,13 +364,14 @@ 
 		// First off - check if we are moving all the current boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['cat_to']))
-				fatal_lang_error('mboards_delete_error');
+			if (empty($_POST['cat_to'])) {
+							fatal_lang_error('mboards_delete_error');
+			}
 
 			deleteCategories(array($_POST['cat']), (int) $_POST['cat_to']);
+		} else {
+					deleteCategories(array($_POST['cat']));
 		}
-		else
-			deleteCategories(array($_POST['cat']));
 	}
 
 	redirectexit('action=admin;area=manageboards');
@@ -404,8 +416,9 @@ 
 	if ($_REQUEST['sa'] == 'newboard')
 	{
 		// Category doesn't exist, man... sorry.
-		if (empty($_REQUEST['cat']))
-			redirectexit('action=admin;area=manageboards');
+		if (empty($_REQUEST['cat'])) {
+					redirectexit('action=admin;area=manageboards');
+		}
 
 		// Some things that need to be setup for a new board.
 		$curBoard = array(
@@ -429,8 +442,7 @@ 
 			'category' => (int) $_REQUEST['cat'],
 			'no_children' => true,
 		);
-	}
-	else
+	} else
 	{
 		// Just some easy shortcuts.
 		$curBoard = &$boards[$_REQUEST['boardid']];
@@ -478,8 +490,9 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1)
-			$curBoard['member_groups'][] = $row['id_group'];
+		if ($_REQUEST['sa'] == 'newboard' && $row['min_posts'] == -1) {
+					$curBoard['member_groups'][] = $row['id_group'];
+		}
 
 		$context['groups'][(int) $row['id_group']] = array(
 			'id' => $row['id_group'],
@@ -492,8 +505,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Category doesn't exist, man... sorry.
-	if (!isset($boardList[$curBoard['category']]))
-		redirectexit('action=admin;area=manageboards');
+	if (!isset($boardList[$curBoard['category']])) {
+			redirectexit('action=admin;area=manageboards');
+	}
 
 	foreach ($boardList[$curBoard['category']] as $boardid)
 	{
@@ -507,8 +521,7 @@ 
 				'is_child' => false,
 				'selected' => true
 			);
-		}
-		else
+		} else
 		{
 			$context['board_order'][] = array(
 				'id' => $boardid,
@@ -525,19 +538,21 @@ 
 		$context['can_move_children'] = false;
 		$context['children'] = $boards[$_REQUEST['boardid']]['tree']['children'];
 
-		foreach ($context['board_order'] as $lBoard)
-			if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
+		foreach ($context['board_order'] as $lBoard) {
+					if ($lBoard['is_child'] == false && $lBoard['selected'] == false)
 				$context['can_move_children'] = true;
+		}
 	}
 
 	// Get other available categories.
 	$context['categories'] = array();
-	foreach ($cat_tree as $catID => $tree)
-		$context['categories'][] = array(
+	foreach ($cat_tree as $catID => $tree) {
+			$context['categories'][] = array(
 			'id' => $catID == $curBoard['category'] ? 0 : $catID,
 			'name' => $tree['node']['name'],
 			'selected' => $catID == $curBoard['category']
 		);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT mem.id_member, mem.real_name
@@ -549,14 +564,16 @@ 
 		)
 	);
 	$context['board']['moderators'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderators'][$row['id_member']] = $row['real_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_list'] = empty($context['board']['moderators']) ? '' : '&quot;' . implode('&quot;, &quot;', $context['board']['moderators']) . '&quot;';
 
-	if (!empty($context['board']['moderators']))
-		list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	if (!empty($context['board']['moderators'])) {
+			list ($context['board']['last_moderator_id']) = array_slice(array_keys($context['board']['moderators']), -1);
+	}
 
 	// Get all the groups assigned as moderators
 	$request = $smcFunc['db_query']('', '
@@ -568,14 +585,16 @@ 
 		)
 	);
 	$context['board']['moderator_groups'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['board']['moderator_groups'][$row['id_group']] = $context['groups'][$row['id_group']]['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$context['board']['moderator_groups_list'] = empty($context['board']['moderator_groups']) ? '' : '&quot;' . implode('&quot;, &qout;', $context['board']['moderator_groups']) . '&quot;';
 
-	if (!empty($context['board']['moderator_groups']))
-		list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	if (!empty($context['board']['moderator_groups'])) {
+			list ($context['board']['last_moderator_group_id']) = array_slice(array_keys($context['board']['moderator_groups']), -1);
+	}
 
 	// Get all the themes...
 	$request = $smcFunc['db_query']('', '
@@ -587,8 +606,9 @@ 
 		)
 	);
 	$context['themes'] = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$context['themes'][] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$context['themes'][] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!isset($_REQUEST['delete']))
@@ -596,8 +616,7 @@ 
 		$context['sub_template'] = 'modify_board';
 		$context['page_title'] = $txt['boardsEdit'];
 		loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'confirm_board_delete';
 		$context['page_title'] = $txt['mboards_delete_board'];
@@ -641,8 +660,9 @@ 
 		// Change the boardorder of this board?
 		elseif (!empty($_POST['placement']) && !empty($_POST['board_order']))
 		{
-			if (!in_array($_POST['placement'], array('before', 'after', 'child')))
-				fatal_lang_error('mangled_post', false);
+			if (!in_array($_POST['placement'], array('before', 'after', 'child'))) {
+							fatal_lang_error('mangled_post', false);
+			}
 
 			$boardOptions['move_to'] = $_POST['placement'];
 			$boardOptions['target_board'] = (int) $_POST['board_order'];
@@ -655,13 +675,14 @@ 
 		$boardOptions['access_groups'] = array();
 		$boardOptions['deny_groups'] = array();
 
-		if (!empty($_POST['groups']))
-			foreach ($_POST['groups'] as $group => $action)
+		if (!empty($_POST['groups'])) {
+					foreach ($_POST['groups'] as $group => $action)
 			{
 				if ($action == 'allow')
 					$boardOptions['access_groups'][] = (int) $group;
-				elseif ($action == 'deny')
-					$boardOptions['deny_groups'][] = (int) $group;
+		} elseif ($action == 'deny') {
+									$boardOptions['deny_groups'][] = (int) $group;
+				}
 			}
 
 		// People with manage-boards are special.
@@ -673,8 +694,9 @@ 
 		// Secondly, make sure those with super cow powers (like apt-get, or in this case manage boards) are upgraded.
 		$boardOptions['access_groups'] = array_unique(array_merge($boardOptions['access_groups'], $board_managers));
 
-		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255)
-			fatal_lang_error('too_many_groups', false);
+		if (strlen(implode(',', $boardOptions['access_groups'])) > 255 || strlen(implode(',', $boardOptions['deny_groups'])) > 255) {
+					fatal_lang_error('too_many_groups', false);
+		}
 
 		// Do not allow HTML tags. Parse the string.
 		$boardOptions['board_name'] = parse_bbc($smcFunc['htmlspecialchars']($_POST['board_name']), false, '', $context['description_allowed_tags']);
@@ -685,8 +707,9 @@ 
 		if (isset($_POST['moderator_list']) && is_array($_POST['moderator_list']))
 		{
 			$moderators = array();
-			foreach ($_POST['moderator_list'] as $moderator)
-				$moderators[(int) $moderator] = (int) $moderator;
+			foreach ($_POST['moderator_list'] as $moderator) {
+							$moderators[(int) $moderator] = (int) $moderator;
+			}
 			$boardOptions['moderators'] = $moderators;
 		}
 
@@ -695,8 +718,9 @@ 
 		if (isset($_POST['moderator_group_list']) && is_array($_POST['moderator_group_list']))
 		{
 			$moderator_groups = array();
-			foreach ($_POST['moderator_group_list'] as $moderator_group)
-				$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			foreach ($_POST['moderator_group_list'] as $moderator_group) {
+							$moderator_groups[(int) $moderator_group] = (int) $moderator_group;
+			}
 			$boardOptions['moderator_groups'] = $moderator_groups;
 		}
 
@@ -722,56 +746,62 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If we're turning redirection on check the board doesn't have posts in it - if it does don't make it a redirection board.
-			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts)
-				unset($boardOptions['redirect']);
+			if ($boardOptions['redirect'] && empty($oldRedirect) && $numPosts) {
+							unset($boardOptions['redirect']);
+			}
 			// Reset the redirection count when switching on/off.
-			elseif (empty($boardOptions['redirect']) != empty($oldRedirect))
-				$boardOptions['num_posts'] = 0;
+			elseif (empty($boardOptions['redirect']) != empty($oldRedirect)) {
+							$boardOptions['num_posts'] = 0;
+			}
 			// Resetting the count?
-			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect']))
-				$boardOptions['num_posts'] = 0;
+			elseif ($boardOptions['redirect'] && !empty($_POST['reset_redirect'])) {
+							$boardOptions['num_posts'] = 0;
+			}
 		}
 
 		// Create a new board...
 		if (isset($_POST['add']))
 		{
 			// New boards by default go to the bottom of the category.
-			if (empty($_POST['new_cat']))
-				$boardOptions['target_category'] = (int) $_POST['cur_cat'];
-			if (!isset($boardOptions['move_to']))
-				$boardOptions['move_to'] = 'bottom';
+			if (empty($_POST['new_cat'])) {
+							$boardOptions['target_category'] = (int) $_POST['cur_cat'];
+			}
+			if (!isset($boardOptions['move_to'])) {
+							$boardOptions['move_to'] = 'bottom';
+			}
 
 			createBoard($boardOptions);
 		}
 
 		// ...or update an existing board.
-		else
-			modifyBoard($_POST['boardid'], $boardOptions);
-	}
-	elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
+		else {
+					modifyBoard($_POST['boardid'], $boardOptions);
+		}
+	} elseif (isset($_POST['delete']) && !isset($_POST['confirmation']) && !isset($_POST['no_children']))
 	{
 		EditBoard();
 		return;
-	}
-	elseif (isset($_POST['delete']))
+	} elseif (isset($_POST['delete']))
 	{
 		// First off - check if we are moving all the current child boards first - before we start deleting!
 		if (isset($_POST['delete_action']) && $_POST['delete_action'] == 1)
 		{
-			if (empty($_POST['board_to']))
-				fatal_lang_error('mboards_delete_board_error');
+			if (empty($_POST['board_to'])) {
+							fatal_lang_error('mboards_delete_board_error');
+			}
 
 			deleteBoards(array($_POST['boardid']), (int) $_POST['board_to']);
+		} else {
+					deleteBoards(array($_POST['boardid']), 0);
 		}
-		else
-			deleteBoards(array($_POST['boardid']), 0);
 	}
 
-	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions')
-		redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
-	else
-		redirectexit('action=admin;area=manageboards');
-}
+	if (isset($_REQUEST['rid']) && $_REQUEST['rid'] == 'permissions') {
+			redirectexit('action=admin;area=permissions;sa=board;' . $context['session_var'] . '=' . $context['session_id']);
+	} else {
+			redirectexit('action=admin;area=manageboards');
+	}
+	}
 
 /**
  * Used to retrieve data for modifying a board category
@@ -808,8 +838,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This would probably never happen, but just to be sure.
-	if ($cat .= $allowed_sa[1])
-		die(str_replace(',', ' to', $cat));
+	if ($cat .= $allowed_sa[1]) {
+			die(str_replace(',', ' to', $cat));
+	}
 
 	redirectexit();
 }
@@ -835,8 +866,9 @@ 
 			'empty_string' => '',
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$recycle_boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	if (!empty($recycle_boards))
@@ -844,9 +876,9 @@ 
 		require_once($sourcedir . '/Subs-Boards.php');
 		sortBoards($recycle_boards);
 		$recycle_boards = array('') + $recycle_boards;
+	} else {
+			$recycle_boards = array('');
 	}
-	else
-		$recycle_boards = array('');
 
 	// Here and the board settings...
 	$config_vars = array(
@@ -864,8 +896,9 @@ 
 
 	call_integration_hook('integrate_modify_board_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Needed for the settings template.
 	require_once($sourcedir . '/ManageServer.php');