SimpleMachines / SMF2.1

Sources/Themes.php

Braces +345 added lines, -269 removed lines

@@ -30,8 +30,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Subaction handler - manages the action and delegates control to the proper
@@ -103,12 +104,12 @@ 
 	cache_put_data('minimized_css', null);
 
 	// Follow the sa or just go to administration.
-	if (isset($_GET['sa']) && !empty($subActions[$_GET['sa']]))
-		call_helper($subActions[$_GET['sa']]);
-
-	else
-		call_helper($subActions['admin']);
-}
+	if (isset($_GET['sa']) && !empty($subActions[$_GET['sa']])) {
+			call_helper($subActions[$_GET['sa']]);
+	} else {
+			call_helper($subActions['admin']);
+	}
+	}
 
 /**
  * This function allows administration of themes and their settings,
@@ -130,15 +131,16 @@ 
 		checkSession();
 		validateToken('admin-tm');
 
-		if (isset($_POST['options']['known_themes']))
-			foreach ($_POST['options']['known_themes'] as $key => $id)
+		if (isset($_POST['options']['known_themes'])) {
+					foreach ($_POST['options']['known_themes'] as $key => $id)
 				$_POST['options']['known_themes'][$key] = (int) $id;
+		} else {
+					fatal_lang_error('themes_none_selectable', false);
+		}
 
-		else
-			fatal_lang_error('themes_none_selectable', false);
-
-		if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes']))
-			fatal_lang_error('themes_default_selectable', false);
+		if (!in_array($_POST['options']['theme_guests'], $_POST['options']['known_themes'])) {
+					fatal_lang_error('themes_default_selectable', false);
+		}
 
 		// Commit the new settings.
 		updateSettings(array(
@@ -146,8 +148,9 @@ 
 			'theme_guests' => $_POST['options']['theme_guests'],
 			'knownThemes' => implode(',', $_POST['options']['known_themes']),
 		));
-		if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes']))
-			updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+		if ((int) $_POST['theme_reset'] == 0 || in_array($_POST['theme_reset'], $_POST['options']['known_themes'])) {
+					updateMemberData(null, array('id_theme' => (int) $_POST['theme_reset']));
+		}
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=admin');
 	}
@@ -166,8 +169,9 @@ 
 	// Look for a non existent theme directory. (ie theme87.)
 	$theme_dir = $boarddir . '/Themes/theme';
 	$i = 1;
-	while (file_exists($theme_dir . $i))
-		$i++;
+	while (file_exists($theme_dir . $i)) {
+			$i++;
+	}
 
 	$context['new_theme_name'] = 'theme' . $i;
 
@@ -189,8 +193,9 @@ 
 	loadLanguage('Admin');
 	isAllowedTo('admin_forum');
 
-	if (isset($_REQUEST['th']))
-		return SetThemeSettings();
+	if (isset($_REQUEST['th'])) {
+			return SetThemeSettings();
+	}
 
 	if (isset($_POST['save']))
 	{
@@ -274,12 +279,13 @@ 
 		$context['themes'] = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($context['themes'][$row['id_theme']]))
-				$context['themes'][$row['id_theme']] = array(
+			if (!isset($context['themes'][$row['id_theme']])) {
+							$context['themes'][$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'num_default_options' => 0,
 					'num_members' => 0,
 				);
+			}
 			$context['themes'][$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -293,8 +299,9 @@ 
 				'guest_member' => -1,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['themes'][$row['id_theme']]['num_default_options'] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Need to make sure we don't do custom fields.
@@ -305,8 +312,9 @@ 
 			)
 		);
 		$customFields = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$customFields[] = $row['col_name'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$customFields[] = $row['col_name'];
+		}
 		$smcFunc['db_free_result']($request);
 		$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
 
@@ -321,14 +329,16 @@ 
 				'custom_fields' => empty($customFields) ? array() : $customFields,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['themes'][$row['id_theme']]['num_members'] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// There has to be a Settings template!
-		foreach ($context['themes'] as $k => $v)
-			if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
+		foreach ($context['themes'] as $k => $v) {
+					if (empty($v['theme_dir']) || (!file_exists($v['theme_dir'] . '/Settings.template.php') && empty($v['num_members'])))
 				unset($context['themes'][$k]);
+		}
 
 		loadTemplate('Themes');
 		$context['sub_template'] = 'reset_list';
@@ -343,16 +353,19 @@ 
 		checkSession();
 		validateToken('admin-sto');
 
-		if (empty($_POST['options']))
-			$_POST['options'] = array();
-		if (empty($_POST['default_options']))
-			$_POST['default_options'] = array();
+		if (empty($_POST['options'])) {
+					$_POST['options'] = array();
+		}
+		if (empty($_POST['default_options'])) {
+					$_POST['default_options'] = array();
+		}
 
 		// Set up the sql query.
 		$setValues = array();
 
-		foreach ($_POST['options'] as $opt => $val)
-			$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		foreach ($_POST['options'] as $opt => $val) {
+					$setValues[] = array(-1, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		}
 
 		$old_settings = array();
 		foreach ($_POST['default_options'] as $opt => $val)
@@ -366,8 +379,8 @@ 
 		if (!empty($setValues))
 		{
 			// Are there options in non-default themes set that should be cleared?
-			if (!empty($old_settings))
-				$smcFunc['db_query']('', '
+			if (!empty($old_settings)) {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
 					WHERE id_theme != {int:default_theme}
 						AND id_member = {int:guest_member}
@@ -378,6 +391,7 @@ 
 						'old_settings' => $old_settings,
 					)
 				);
+			}
 
 			$smcFunc['db_insert']('replace',
 				'{db_prefix}themes',
@@ -391,8 +405,7 @@ 
 		cache_put_data('theme_settings-1', null, 90);
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
-	}
-	elseif (isset($_POST['submit']) && $_POST['who'] == 1)
+	} elseif (isset($_POST['submit']) && $_POST['who'] == 1)
 	{
 		checkSession();
 		validateToken('admin-sto');
@@ -405,9 +418,9 @@ 
 		$old_settings = array();
 		foreach ($_POST['default_options'] as $opt => $val)
 		{
-			if ($_POST['default_options_master'][$opt] == 0)
-				continue;
-			elseif ($_POST['default_options_master'][$opt] == 1)
+			if ($_POST['default_options_master'][$opt] == 0) {
+							continue;
+			} elseif ($_POST['default_options_master'][$opt] == 1)
 			{
 				// Delete then insert for ease of database compatibility!
 				$smcFunc['db_query']('substring', '
@@ -433,8 +446,7 @@ 
 				);
 
 				$old_settings[] = $opt;
-			}
-			elseif ($_POST['default_options_master'][$opt] == 2)
+			} elseif ($_POST['default_options_master'][$opt] == 2)
 			{
 				$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
@@ -449,8 +461,8 @@ 
 		}
 
 		// Delete options from other themes.
-		if (!empty($old_settings))
-			$smcFunc['db_query']('', '
+		if (!empty($old_settings)) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}themes
 				WHERE id_theme != {int:default_theme}
 					AND id_member > {int:no_member}
@@ -461,12 +473,13 @@ 
 					'old_settings' => $old_settings,
 				)
 			);
+		}
 
 		foreach ($_POST['options'] as $opt => $val)
 		{
-			if ($_POST['options_master'][$opt] == 0)
-				continue;
-			elseif ($_POST['options_master'][$opt] == 1)
+			if ($_POST['options_master'][$opt] == 0) {
+							continue;
+			} elseif ($_POST['options_master'][$opt] == 1)
 			{
 				// Delete then insert for ease of database compatibility - again!
 				$smcFunc['db_query']('substring', '
@@ -491,8 +504,7 @@ 
 						'value' => (is_array($val) ? implode(',', $val) : $val),
 					)
 				);
-			}
-			elseif ($_POST['options_master'][$opt] == 2)
+			} elseif ($_POST['options_master'][$opt] == 2)
 			{
 				$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}themes
@@ -509,8 +521,7 @@ 
 		}
 
 		redirectexit('action=admin;area=theme;' . $context['session_var'] . '=' . $context['session_id'] . ';sa=reset');
-	}
-	elseif (!empty($_GET['who']) && $_GET['who'] == 2)
+	} elseif (!empty($_GET['who']) && $_GET['who'] == 2)
 	{
 		checkSession('get');
 		validateToken('admin-stor', 'request');
@@ -525,8 +536,9 @@ 
 				)
 			);
 			$customFields = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$customFields[] = $row['col_name'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$customFields[] = $row['col_name'];
+			}
 			$smcFunc['db_free_result']($request);
 		}
 		$customFieldsQuery = empty($customFields) ? '' : ('AND variable NOT IN ({array_string:custom_fields})');
@@ -581,13 +593,13 @@ 
 			)
 		);
 		$context['theme_options'] = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['theme_options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['theme_options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		$context['theme_options_reset'] = false;
-	}
-	else
+	} else
 	{
 		$context['theme_options'] = array();
 		$context['theme_options_reset'] = true;
@@ -596,8 +608,9 @@ 
 	foreach ($context['options'] as $i => $setting)
 	{
 		// Just skip separators
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
 		// Is this disabled?
 		if (isset($setting['enabled']) && $setting['enabled'] === false)
@@ -606,15 +619,17 @@ 
 			continue;
 		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$context['options'][$i]['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$context['options'][$i]['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$context['options'][$i]['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$context['options'][$i]['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$context['options'][$i]['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$context['options'][$i]['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$context['options'][$i]['type'] = 'list';
+		if (isset($setting['options'])) {
+					$context['options'][$i]['type'] = 'list';
+		}
 
 		$context['options'][$i]['value'] = !isset($context['theme_options'][$setting['id']]) ? '' : $context['theme_options'][$setting['id']];
 	}
@@ -639,8 +654,9 @@ 
 {
 	global $txt, $context, $settings, $modSettings, $smcFunc;
 
-	if (empty($_GET['th']) && empty($_GET['id']))
-		return ThemeAdmin();
+	if (empty($_GET['th']) && empty($_GET['id'])) {
+			return ThemeAdmin();
+	}
 
 	$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
@@ -651,8 +667,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// Validate inputs/user.
-	if (empty($_GET['th']))
-		fatal_lang_error('no_theme', false);
+	if (empty($_GET['th'])) {
+			fatal_lang_error('no_theme', false);
+	}
 
 	// Fetch the smiley sets...
 	$sets = explode(',', 'none,' . $modSettings['smiley_sets_known']);
@@ -660,8 +677,9 @@ 
 	$context['smiley_sets'] = array(
 		'' => $txt['smileys_no_default']
 	);
-	foreach ($sets as $i => $set)
-		$context['smiley_sets'][$set] = $smcFunc['htmlspecialchars']($set_names[$i]);
+	foreach ($sets as $i => $set) {
+			$context['smiley_sets'][$set] = $smcFunc['htmlspecialchars']($set_names[$i]);
+	}
 
 	$old_id = $settings['theme_id'];
 	$old_settings = $settings;
@@ -686,8 +704,9 @@ 
 	if (file_exists($settings['theme_dir'] . '/index.template.php'))
 	{
 		$file_contents = implode('', file($settings['theme_dir'] . '/index.template.php'));
-		if (preg_match('~\$settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches))
-				eval('global $settings;' . $matches[0]);
+		if (preg_match('~\$settings\[\'theme_variants\'\]\s*=(.+?);~', $file_contents, $matches)) {
+						eval('global $settings;' . $matches[0]);
+		}
 	}
 
 	// Let mods hook into the theme settings.
@@ -699,37 +718,45 @@ 
 		checkSession();
 		validateToken('admin-sts');
 
-		if (empty($_POST['options']))
-			$_POST['options'] = array();
-		if (empty($_POST['default_options']))
-			$_POST['default_options'] = array();
+		if (empty($_POST['options'])) {
+					$_POST['options'] = array();
+		}
+		if (empty($_POST['default_options'])) {
+					$_POST['default_options'] = array();
+		}
 
 		// Make sure items are cast correctly.
 		foreach ($context['theme_settings'] as $item)
 		{
 			// Disregard this item if this is just a separator.
-			if (!is_array($item))
-				continue;
+			if (!is_array($item)) {
+							continue;
+			}
 
 			foreach (array('options', 'default_options') as $option)
 			{
-				if (!isset($_POST[$option][$item['id']]))
-					continue;
+				if (!isset($_POST[$option][$item['id']])) {
+									continue;
+				}
 				// Checkbox.
-				elseif (empty($item['type']))
-					$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
+				elseif (empty($item['type'])) {
+									$_POST[$option][$item['id']] = $_POST[$option][$item['id']] ? 1 : 0;
+				}
 				// Number
-				elseif ($item['type'] == 'number')
-					$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
+				elseif ($item['type'] == 'number') {
+									$_POST[$option][$item['id']] = (int) $_POST[$option][$item['id']];
+				}
 			}
 		}
 
 		// Set up the sql query.
 		$inserts = array();
-		foreach ($_POST['options'] as $opt => $val)
-			$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
-		foreach ($_POST['default_options'] as $opt => $val)
-			$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+		foreach ($_POST['options'] as $opt => $val) {
+					$inserts[] = array(0, $_GET['th'], $opt, is_array($val) ? implode(',', $val) : $val);
+		}
+		foreach ($_POST['default_options'] as $opt => $val) {
+					$inserts[] = array(0, 1, $opt, is_array($val) ? implode(',', $val) : $val);
+		}
 		// If we're actually inserting something..
 		if (!empty($inserts))
 		{
@@ -755,8 +782,9 @@ 
 
 	foreach ($settings as $setting => $dummy)
 	{
-		if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs')))
-			$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+		if (!in_array($setting, array('theme_url', 'theme_dir', 'images_url', 'template_dirs'))) {
+					$settings[$setting] = htmlspecialchars__recursive($settings[$setting]);
+		}
 	}
 
 	$context['settings'] = $context['theme_settings'];
@@ -765,18 +793,21 @@ 
 	foreach ($context['settings'] as $i => $setting)
 	{
 		// Separators are dummies, so leave them alone.
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
-		if (!isset($setting['type']) || $setting['type'] == 'bool')
-			$context['settings'][$i]['type'] = 'checkbox';
-		elseif ($setting['type'] == 'int' || $setting['type'] == 'integer')
-			$context['settings'][$i]['type'] = 'number';
-		elseif ($setting['type'] == 'string')
-			$context['settings'][$i]['type'] = 'text';
+		if (!isset($setting['type']) || $setting['type'] == 'bool') {
+					$context['settings'][$i]['type'] = 'checkbox';
+		} elseif ($setting['type'] == 'int' || $setting['type'] == 'integer') {
+					$context['settings'][$i]['type'] = 'number';
+		} elseif ($setting['type'] == 'string') {
+					$context['settings'][$i]['type'] = 'text';
+		}
 
-		if (isset($setting['options']))
-			$context['settings'][$i]['type'] = 'list';
+		if (isset($setting['options'])) {
+					$context['settings'][$i]['type'] = 'list';
+		}
 
 		$context['settings'][$i]['value'] = !isset($settings[$setting['id']]) ? '' : $settings[$setting['id']];
 	}
@@ -829,8 +860,9 @@ 
 	$themeID = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
 	// You can't delete the default theme!
-	if ($themeID == 1)
-		fatal_lang_error('no_access', false);
+	if ($themeID == 1) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$theme_info = get_single_theme($themeID);
 
@@ -838,8 +870,9 @@ 
 	remove_theme($themeID);
 
 	// And remove all its files and folders too.
-	if (!empty($theme_info) && !empty($theme_info['theme_dir']))
-		remove_dir($theme_info['theme_dir']);
+	if (!empty($theme_info) && !empty($theme_info['theme_dir'])) {
+			remove_dir($theme_info['theme_dir']);
+	}
 
 	// Go back to the list page.
 	redirectexit('action=admin;area=theme;sa=list;' . $context['session_var'] . '=' . $context['session_id'] . ';done=removing');
@@ -864,12 +897,14 @@ 
 	$enableThemes = explode(',', $modSettings['enableThemes']);
 
 	// Are we disabling it?
-	if (isset($_GET['disabled']))
-		$enableThemes = array_diff($enableThemes, array($themeID));
+	if (isset($_GET['disabled'])) {
+			$enableThemes = array_diff($enableThemes, array($themeID));
+	}
 
 	// Nope? then enable it!
-	else
-		$enableThemes[] = (string) $themeID;
+	else {
+			$enableThemes[] = (string) $themeID;
+	}
 
 	// Update the setting.
 	$enableThemes = strtr(implode(',', $enableThemes), array(',,' => ','));
@@ -904,18 +939,21 @@ 
 
 	$_SESSION['id_theme'] = 0;
 
-	if (isset($_GET['id']))
-		$_GET['th'] = $_GET['id'];
+	if (isset($_GET['id'])) {
+			$_GET['th'] = $_GET['id'];
+	}
 
 	// Saving a variant cause JS doesn't work - pretend it did ;)
 	if (isset($_POST['save']))
 	{
 		// Which theme?
-		foreach ($_POST['save'] as $k => $v)
-			$_GET['th'] = (int) $k;
+		foreach ($_POST['save'] as $k => $v) {
+					$_GET['th'] = (int) $k;
+		}
 
-		if (isset($_POST['vrt'][$k]))
-			$_GET['vrt'] = $_POST['vrt'][$k];
+		if (isset($_POST['vrt'][$k])) {
+					$_GET['vrt'] = $_POST['vrt'][$k];
+		}
 	}
 
 	// Have we made a decision, or are we just browsing?
@@ -1004,10 +1042,10 @@ 
 				);
 				cache_put_data('theme_settings-' . $_GET['th'] . ':' . (int) $_REQUEST['u'], null, 90);
 
-				if ($user_info['id'] == $_REQUEST['u'])
-					$_SESSION['id_variant'] = 0;
-			}
-			elseif ($_GET['th'] == 0)
+				if ($user_info['id'] == $_REQUEST['u']) {
+									$_SESSION['id_variant'] = 0;
+				}
+			} elseif ($_GET['th'] == 0)
 			{
 				// Remove any custom variants.
 				$smcFunc['db_query']('', '
@@ -1088,12 +1126,13 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!isset($context['available_themes'][$row['id_theme']]))
-				$context['available_themes'][$row['id_theme']] = array(
+			if (!isset($context['available_themes'][$row['id_theme']])) {
+							$context['available_themes'][$row['id_theme']] = array(
 					'id' => $row['id_theme'],
 					'selected' => $context['current_theme'] == $row['id_theme'],
 					'num_users' => 0
 				);
+			}
 			$context['available_themes'][$row['id_theme']][$row['variable']] = $row['value'];
 		}
 		$smcFunc['db_free_result']($request);
@@ -1106,9 +1145,9 @@ 
 			'num_users' => 0
 		);
 		$guest_theme = 0;
+	} else {
+			$guest_theme = $modSettings['theme_guests'];
 	}
-	else
-		$guest_theme = $modSettings['theme_guests'];
 
 	$request = $smcFunc['db_query']('', '
 		SELECT id_theme, COUNT(*) AS the_count
@@ -1121,15 +1160,17 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Figure out which theme it is they are REALLY using.
-		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes'])))
-			$row['id_theme'] = $guest_theme;
-		elseif (empty($modSettings['theme_allow']))
-			$row['id_theme'] = $guest_theme;
+		if (!empty($modSettings['knownThemes']) && !in_array($row['id_theme'], explode(',', $modSettings['knownThemes']))) {
+					$row['id_theme'] = $guest_theme;
+		} elseif (empty($modSettings['theme_allow'])) {
+					$row['id_theme'] = $guest_theme;
+		}
 
-		if (isset($context['available_themes'][$row['id_theme']]))
-			$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
-		else
-			$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
+		if (isset($context['available_themes'][$row['id_theme']])) {
+					$context['available_themes'][$row['id_theme']]['num_users'] += $row['the_count'];
+		} else {
+					$context['available_themes'][$guest_theme]['num_users'] += $row['the_count'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -1148,8 +1189,9 @@ 
 				'id_member' => isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'pick' ? array(-1, $context['current_member']) : array(-1),
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$variant_preferences[$row['id_theme']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$variant_preferences[$row['id_theme']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1160,17 +1202,18 @@ 
 	foreach ($context['available_themes'] as $id_theme => $theme_data)
 	{
 		// Don't try to load the forum or board default theme's data... it doesn't have any!
-		if ($id_theme == 0)
-			continue;
+		if ($id_theme == 0) {
+					continue;
+		}
 
 		// The thumbnail needs the correct path.
 		$settings['images_url'] = &$theme_data['images_url'];
 
-		if (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php'))
-			include($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php');
-		elseif (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php'))
-			include($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php');
-		else
+		if (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php')) {
+					include($theme_data['theme_dir'] . '/languages/Settings.' . $user_info['language'] . '.php');
+		} elseif (file_exists($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php')) {
+					include($theme_data['theme_dir'] . '/languages/Settings.' . $language . '.php');
+		} else
 		{
 			$txt['theme_thumbnail_href'] = $theme_data['images_url'] . '/thumbnail.png';
 			$txt['theme_description'] = '';
@@ -1195,15 +1238,17 @@ 
 					loadLanguage('Settings');
 
 					$context['available_themes'][$id_theme]['variants'] = array();
-					foreach ($settings['theme_variants'] as $variant)
-						$context['available_themes'][$id_theme]['variants'][$variant] = array(
+					foreach ($settings['theme_variants'] as $variant) {
+											$context['available_themes'][$id_theme]['variants'][$variant] = array(
 							'label' => isset($txt['variant_' . $variant]) ? $txt['variant_' . $variant] : $variant,
 							'thumbnail' => !file_exists($theme_data['theme_dir'] . '/images/thumbnail.png') || file_exists($theme_data['theme_dir'] . '/images/thumbnail_' . $variant . '.png') ? $theme_data['images_url'] . '/thumbnail_' . $variant . '.png' : ($theme_data['images_url'] . '/thumbnail.png'),
 						);
+					}
 
 					$context['available_themes'][$id_theme]['selected_variant'] = isset($_GET['vrt']) ? $_GET['vrt'] : (!empty($variant_preferences[$id_theme]) ? $variant_preferences[$id_theme] : (!empty($settings['default_variant']) ? $settings['default_variant'] : $settings['theme_variants'][0]));
-					if (!isset($context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail']))
-						$context['available_themes'][$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					if (!isset($context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'])) {
+											$context['available_themes'][$id_theme]['selected_variant'] = $settings['theme_variants'][0];
+					}
 
 					$context['available_themes'][$id_theme]['thumbnail_href'] = $context['available_themes'][$id_theme]['variants'][$context['available_themes'][$id_theme]['selected_variant']]['thumbnail'];
 					// Allow themes to override the text.
@@ -1219,8 +1264,9 @@ 
 	// As long as we're not doing the default theme...
 	if (!isset($_REQUEST['u']) || $_REQUEST['u'] >= 0)
 	{
-		if ($guest_theme != 0)
-			$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+		if ($guest_theme != 0) {
+					$context['available_themes'][0] = $context['available_themes'][$guest_theme];
+		}
 
 		$context['available_themes'][0]['id'] = 0;
 		$context['available_themes'][0]['name'] = $txt['theme_forum_default'];
@@ -1269,14 +1315,16 @@ 
 		$action = $smcFunc['htmlspecialchars'](trim($_GET['do']));
 
 		// Got any info from the specific form?
-		if (!isset($_POST['save_' . $action]))
-			fatal_lang_error('theme_install_no_action', false);
+		if (!isset($_POST['save_' . $action])) {
+					fatal_lang_error('theme_install_no_action', false);
+		}
 
 		validateToken('admin-t-' . $action);
 
 		// Hopefully the themes directory is writable, or we might have a problem.
-		if (!is_writable($themedir))
-			fatal_lang_error('theme_install_write_error', 'critical');
+		if (!is_writable($themedir)) {
+					fatal_lang_error('theme_install_write_error', 'critical');
+		}
 
 		// Call the function and handle the result.
 		$result = $subActions[$action]();
@@ -1291,9 +1339,10 @@ 
 	}
 
 	// Nope, show a nice error.
-	else
-		fatal_lang_error('theme_install_no_action', false);
-}
+	else {
+			fatal_lang_error('theme_install_no_action', false);
+	}
+	}
 
 /**
  * Installs a theme from a theme package.
@@ -1309,8 +1358,9 @@ 
 	$dirtemp = $themedir . '/temp';
 
 	// Make sure the temp dir doesn't already exist
-	if (file_exists($dirtemp))
-		remove_dir($dirtemp);
+	if (file_exists($dirtemp)) {
+			remove_dir($dirtemp);
+	}
 
 	// Create the temp dir.
 	mkdir($dirtemp, 0777);
@@ -1322,17 +1372,20 @@ 
 		smf_chmod($dirtemp, '0755');
 
 		// How about now?
-		if (!is_writable($dirtemp))
-			fatal_lang_error('theme_install_write_error', 'critical');
+		if (!is_writable($dirtemp)) {
+					fatal_lang_error('theme_install_write_error', 'critical');
+		}
 	}
 
 	// This happens when the admin session is gone and the user has to login again.
-	if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz']))
-		redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+	if (!isset($_FILES) || !isset($_FILES['theme_gz']) || empty($_FILES['theme_gz'])) {
+			redirectexit('action=admin;area=theme;sa=admin;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Another error check layer, something went wrong with the upload.
-	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0)
-		fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
+	if (isset($_FILES['theme_gz']['error']) && $_FILES['theme_gz']['error'] != 0) {
+			fatal_lang_error('theme_install_error_file_' . $_FILES['theme_gz']['error'], false);
+	}
 
 	// Get the theme's name.
 	$name = pathinfo($_FILES['theme_gz']['name'], PATHINFO_FILENAME);
@@ -1363,11 +1416,10 @@ 
 
 		// return all the info.
 		return $context['to_install'];
+	} else {
+			fatal_lang_error('theme_install_error_title', false);
+	}
 	}
-
-	else
-		fatal_lang_error('theme_install_error_title', false);
-}
 
 /**
  * Makes a copy from the default theme, assigns a name for it and installs it.
@@ -1381,15 +1433,17 @@ 
 	global $forum_version;
 
 	// There's gotta be something to work with.
-	if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy']))
-		fatal_lang_error('theme_install_error_title', false);
+	if (!isset($_REQUEST['copy']) || empty($_REQUEST['copy'])) {
+			fatal_lang_error('theme_install_error_title', false);
+	}
 
 	// Get a cleaner version.
 	$name = preg_replace('~[^A-Za-z0-9_\- ]~', '', $_REQUEST['copy']);
 
 	// Is there a theme already named like this?
-	if (file_exists($themedir . '/' . $name))
-		fatal_lang_error('theme_install_already_dir', false);
+	if (file_exists($themedir . '/' . $name)) {
+			fatal_lang_error('theme_install_already_dir', false);
+	}
 
 	// This is a brand new theme so set all possible values.
 	$context['to_install'] = array(
@@ -1409,8 +1463,9 @@ 
 
 	// Buy some time.
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	// Create subdirectories for css and javascript files.
 	mkdir($context['to_install']['theme_dir'] . '/css', 0777);
@@ -1446,12 +1501,13 @@ 
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['variable'] == 'theme_templates')
-			$theme_templates = $row['value'];
-		elseif ($row['variable'] == 'theme_layers')
-			$theme_layers = $row['value'];
-		else
-			continue;
+		if ($row['variable'] == 'theme_templates') {
+					$theme_templates = $row['value'];
+		} elseif ($row['variable'] == 'theme_layers') {
+					$theme_layers = $row['value'];
+		} else {
+					continue;
+		}
 	}
 
 	$smcFunc['db_free_result']($request);
@@ -1510,12 +1566,14 @@ 
 	global $themedir, $themeurl, $context;
 
 	// Cannot use the theme dir as a theme dir.
-	if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath($themedir))
-		fatal_lang_error('theme_install_invalid_dir', false);
+	if (!isset($_REQUEST['theme_dir']) || empty($_REQUEST['theme_dir']) || rtrim(realpath($_REQUEST['theme_dir']), '/\\') == realpath($themedir)) {
+			fatal_lang_error('theme_install_invalid_dir', false);
+	}
 
 	// Check is there is "something" on the dir.
-	elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml'))
-		fatal_lang_error('theme_install_error', false);
+	elseif (!is_dir($_REQUEST['theme_dir']) || !file_exists($_REQUEST['theme_dir'] . '/theme_info.xml')) {
+			fatal_lang_error('theme_install_error', false);
+	}
 
 	$name = basename($_REQUEST['theme_dir']);
 	$name = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $name);
@@ -1559,24 +1617,27 @@ 
 	}
 
 	// Any special layers?
-	if (isset($settings['catch_action']['layers']))
-		$context['template_layers'] = $settings['catch_action']['layers'];
+	if (isset($settings['catch_action']['layers'])) {
+			$context['template_layers'] = $settings['catch_action']['layers'];
+	}
 
 	// Any function to call?
 	if (isset($settings['catch_action']['function']))
 	{
 		$hook = $settings['catch_action']['function'];
 
-		if (!isset($settings['catch_action']['filename']))
-			$settings['catch_action']['filename'] = '';
+		if (!isset($settings['catch_action']['filename'])) {
+					$settings['catch_action']['filename'] = '';
+		}
 
 		add_integration_function('integrate_wrap_action', $hook, false, $settings['catch_action']['filename'], false);
 		call_integration_hook('integrate_wrap_action');
 	}
 	// And finally, the main sub template ;).
-	if (isset($settings['catch_action']['sub_template']))
-		$context['sub_template'] = $settings['catch_action']['sub_template'];
-}
+	if (isset($settings['catch_action']['sub_template'])) {
+			$context['sub_template'] = $settings['catch_action']['sub_template'];
+	}
+	}
 
 /**
  * Set an option via javascript.
@@ -1595,12 +1656,14 @@ 
 	checkSession('get');
 
 	// This good-for-nothing pixel is being used to keep the session alive.
-	if (empty($_GET['var']) || !isset($_GET['val']))
-		redirectexit($settings['images_url'] . '/blank.png');
+	if (empty($_GET['var']) || !isset($_GET['val'])) {
+			redirectexit($settings['images_url'] . '/blank.png');
+	}
 
 	// Sorry, guests can't go any further than this.
-	if ($user_info['is_guest'] || $user_info['id'] == 0)
-		obExit(false);
+	if ($user_info['is_guest'] || $user_info['id'] == 0) {
+			obExit(false);
+	}
 
 	$reservedVars = array(
 		'actual_theme_url',
@@ -1623,8 +1686,9 @@ 
 	);
 
 	// Can't change reserved vars.
-	if (in_array(strtolower($_GET['var']), $reservedVars))
-		redirectexit($settings['images_url'] . '/blank.png');
+	if (in_array(strtolower($_GET['var']), $reservedVars)) {
+			redirectexit($settings['images_url'] . '/blank.png');
+	}
 
 	// Use a specific theme?
 	if (isset($_GET['th']) || isset($_GET['id']))
@@ -1640,8 +1704,9 @@ 
 	{
 		$options['admin_preferences'] = !empty($options['admin_preferences']) ? $smcFunc['json_decode']($options['admin_preferences'], true) : array();
 		// New thingy...
-		if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5)
-			$options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+		if (isset($_GET['admin_key']) && strlen($_GET['admin_key']) < 5) {
+					$options['admin_preferences'][$_GET['admin_key']] = $_GET['val'];
+		}
 
 		// Change the value to be something nice,
 		$_GET['val'] = $smcFunc['json_encode']($options['admin_preferences']);
@@ -1671,8 +1736,9 @@ 
 	global $context, $scripturl, $boarddir, $smcFunc, $txt;
 
 	// @todo Should this be removed?
-	if (isset($_REQUEST['preview']))
-		die('die() with fire');
+	if (isset($_REQUEST['preview'])) {
+			die('die() with fire');
+	}
 
 	isAllowedTo('admin_forum');
 	loadTemplate('Themes');
@@ -1686,11 +1752,11 @@ 
 		foreach ($context['themes'] as $key => $theme)
 		{
 			// There has to be a Settings template!
-			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css'))
-				unset($context['themes'][$key]);
-
-			else
-				$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
+			if (!file_exists($theme['theme_dir'] . '/index.template.php') && !file_exists($theme['theme_dir'] . '/css/index.css')) {
+							unset($context['themes'][$key]);
+			} else {
+							$context['themes'][$key]['can_edit_style'] = file_exists($theme['theme_dir'] . '/css/index.css');
+			}
 		}
 
 		$context['sub_template'] = 'edit_list';
@@ -1705,22 +1771,24 @@ 
 	$context['theme_id'] = $currentTheme['id'];
 	$context['browse_title'] = sprintf($txt['themeadmin_browsing_theme'], $currentTheme['name']);
 
-	if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css'))
-		fatal_lang_error('theme_edit_missing', false);
+	if (!file_exists($currentTheme['theme_dir'] . '/index.template.php') && !file_exists($currentTheme['theme_dir'] . '/css/index.css')) {
+			fatal_lang_error('theme_edit_missing', false);
+	}
 
 	if (!isset($_REQUEST['filename']))
 	{
 		if (isset($_GET['directory']))
 		{
-			if (substr($_GET['directory'], 0, 1) == '.')
-				$_GET['directory'] = '';
-			else
+			if (substr($_GET['directory'], 0, 1) == '.') {
+							$_GET['directory'] = '';
+			} else
 			{
 				$_GET['directory'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_GET['directory']);
 
 				$temp = realpath($currentTheme['theme_dir'] . '/' . $_GET['directory']);
-				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-					$_GET['directory'] = '';
+				if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+									$_GET['directory'] = '';
+				}
 			}
 		}
 
@@ -1739,37 +1807,39 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=edit;directory=' . $temp,
 				'size' => '',
 			));
+		} else {
+					$context['theme_files'] = get_file_listing($currentTheme['theme_dir'], '');
 		}
-		else
-			$context['theme_files'] = get_file_listing($currentTheme['theme_dir'], '');
 
 		$context['sub_template'] = 'edit_browse';
 
 		return;
-	}
-	else
+	} else
 	{
-		if (substr($_REQUEST['filename'], 0, 1) == '.')
-			$_REQUEST['filename'] = '';
-		else
+		if (substr($_REQUEST['filename'], 0, 1) == '.') {
+					$_REQUEST['filename'] = '';
+		} else
 		{
 			$_REQUEST['filename'] = preg_replace(array('~^[\./\\:\0\n\r]+~', '~[\\\\]~', '~/[\./]+~'), array('', '/', '/'), $_REQUEST['filename']);
 
 			$temp = realpath($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir']))
-				$_REQUEST['filename'] = '';
+			if (empty($temp) || substr($temp, 0, strlen(realpath($currentTheme['theme_dir']))) != realpath($currentTheme['theme_dir'])) {
+							$_REQUEST['filename'] = '';
+			}
 		}
 
-		if (empty($_REQUEST['filename']))
-			fatal_lang_error('theme_edit_missing', false);
+		if (empty($_REQUEST['filename'])) {
+					fatal_lang_error('theme_edit_missing', false);
+		}
 	}
 
 	if (isset($_POST['save']))
 	{
 		if (checkSession('post', '', false) == '' && validateToken('admin-te-' . md5($_GET['th'] . '-' . $_REQUEST['filename']), 'post', false) == true)
 		{
-			if (is_array($_POST['entire_file']))
-				$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+			if (is_array($_POST['entire_file'])) {
+							$_POST['entire_file'] = implode("\n", $_POST['entire_file']);
+			}
 
 			$_POST['entire_file'] = rtrim(strtr($_POST['entire_file'], array("\r" => '', '   ' => "\t")));
 
@@ -1781,10 +1851,11 @@ 
 				fclose($fp);
 
 				$error = @file_get_contents($currentTheme['theme_url'] . '/tmp_' . session_id() . '.php');
-				if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0)
-					$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
-				else
-					unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
+				if (preg_match('~ <b>(\d+)</b><br( /)?' . '>$~i', $error) != 0) {
+									$error_file = $currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php';
+				} else {
+									unlink($currentTheme['theme_dir'] . '/tmp_' . session_id() . '.php');
+				}
 			}
 
 			if (!isset($error_file))
@@ -1805,10 +1876,11 @@ 
 			$context['sub_template'] = 'edit_file';
 
 			// Recycle the submitted data.
-			if (is_array($_POST['entire_file']))
-				$context['entire_file'] = $smcFunc['htmlspecialchars'](implode("\n", $_POST['entire_file']));
-			else
-				$context['entire_file'] = $smcFunc['htmlspecialchars']($_POST['entire_file']);
+			if (is_array($_POST['entire_file'])) {
+							$context['entire_file'] = $smcFunc['htmlspecialchars'](implode("\n", $_POST['entire_file']));
+			} else {
+							$context['entire_file'] = $smcFunc['htmlspecialchars']($_POST['entire_file']);
+			}
 
 			$context['edit_filename'] = $smcFunc['htmlspecialchars']($_POST['filename']);
 
@@ -1831,17 +1903,17 @@ 
 		$context['sub_template'] = 'edit_style';
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(file_get_contents($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']), array("\t" => '   ')));
-	}
-	elseif (substr($_REQUEST['filename'], -13) == '.template.php')
+	} elseif (substr($_REQUEST['filename'], -13) == '.template.php')
 	{
 		$context['sub_template'] = 'edit_template';
 
-		if (!isset($error_file))
-			$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
-		else
+		if (!isset($error_file)) {
+					$file_data = file($currentTheme['theme_dir'] . '/' . $_REQUEST['filename']);
+		} else
 		{
-			if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0)
-				$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
+			if (preg_match('~(<b>.+?</b>:.+?<b>).+?(</b>.+?<b>\d+</b>)<br( /)?' . '>$~i', $error, $match) != 0) {
+							$context['parse_error'] = $match[1] . $_REQUEST['filename'] . $match[2];
+			}
 			$file_data = file($error_file);
 			unlink($error_file);
 		}
@@ -1855,8 +1927,9 @@ 
 				// Try to format the functions a little nicer...
 				$context['file_parts'][$j]['data'] = trim($context['file_parts'][$j]['data']) . "\n";
 
-				if (empty($context['file_parts'][$j]['lines']))
-					unset($context['file_parts'][$j]);
+				if (empty($context['file_parts'][$j]['lines'])) {
+									unset($context['file_parts'][$j]);
+				}
 				$context['file_parts'][++$j] = array('lines' => 0, 'line' => $i + 1, 'data' => '');
 			}
 
@@ -1865,8 +1938,7 @@ 
 		}
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(implode('', $file_data), array("\t" => '   ')));
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'edit_file';
 
@@ -1892,8 +1964,9 @@ 
 
 	$_GET['th'] = isset($_GET['th']) ? (int) $_GET['th'] : (int) $_GET['id'];
 
-	if (empty($_GET['th']))
-		fatal_lang_error('theme_install_invalid_id');
+	if (empty($_GET['th'])) {
+			fatal_lang_error('theme_install_invalid_id');
+	}
 
 	// Get the theme info.
 	$theme = get_single_theme($_GET['th']);
@@ -1901,25 +1974,24 @@ 
 
 	if (isset($_REQUEST['template']) && preg_match('~[\./\\\\:\0]~', $_REQUEST['template']) == 0)
 	{
-		if (file_exists($settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php'))
-			$filename = $settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
-
-		else
-			fatal_lang_error('no_access', false);
+		if (file_exists($settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php')) {
+					$filename = $settings['default_theme_dir'] . '/' . $_REQUEST['template'] . '.template.php';
+		} else {
+					fatal_lang_error('no_access', false);
+		}
 
 		$fp = fopen($theme['theme_dir'] . '/' . $_REQUEST['template'] . '.template.php', 'w');
 		fwrite($fp, file_get_contents($filename));
 		fclose($fp);
 
 		redirectexit('action=admin;area=theme;th=' . $context['theme_id'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=copy');
-	}
-	elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
+	} elseif (isset($_REQUEST['lang_file']) && preg_match('~^[^\./\\\\:\0]\.[^\./\\\\:\0]$~', $_REQUEST['lang_file']) != 0)
 	{
-		if (file_exists($settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php'))
-			$filename = $settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
-
-		else
-			fatal_lang_error('no_access', false);
+		if (file_exists($settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php')) {
+					$filename = $settings['default_theme_dir'] . '/languages/' . $_REQUEST['template'] . '.php';
+		} else {
+					fatal_lang_error('no_access', false);
+		}
 
 		$fp = fopen($theme['theme_dir'] . '/languages/' . $_REQUEST['lang_file'] . '.php', 'w');
 		fwrite($fp, file_get_contents($filename));
@@ -1934,16 +2006,18 @@ 
 	$dir = dir($settings['default_theme_dir']);
 	while ($entry = $dir->read())
 	{
-		if (substr($entry, -13) == '.template.php')
-			$templates[] = substr($entry, 0, -13);
+		if (substr($entry, -13) == '.template.php') {
+					$templates[] = substr($entry, 0, -13);
+		}
 	}
 	$dir->close();
 
 	$dir = dir($settings['default_theme_dir'] . '/languages');
 	while ($entry = $dir->read())
 	{
-		if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches))
-			$lang_files[] = $matches[1];
+		if (preg_match('~^([^\.]+\.[^\.]+)\.php$~', $entry, $matches)) {
+					$lang_files[] = $matches[1];
+		}
 	}
 	$dir->close();
 
@@ -1951,21 +2025,23 @@ 
 	natcasesort($lang_files);
 
 	$context['available_templates'] = array();
-	foreach ($templates as $template)
-		$context['available_templates'][$template] = array(
+	foreach ($templates as $template) {
+			$context['available_templates'][$template] = array(
 			'filename' => $template . '.template.php',
 			'value' => $template,
 			'already_exists' => false,
 			'can_copy' => is_writable($theme['theme_dir']),
 		);
+	}
 	$context['available_language_files'] = array();
-	foreach ($lang_files as $file)
-		$context['available_language_files'][$file] = array(
+	foreach ($lang_files as $file) {
+			$context['available_language_files'][$file] = array(
 			'filename' => $file . '.php',
 			'value' => $file,
 			'already_exists' => false,
 			'can_copy' => file_exists($theme['theme_dir'] . '/languages') ? is_writable($theme['theme_dir'] . '/languages') : is_writable($theme['theme_dir']),
 		);
+	}
 
 	$dir = dir($theme['theme_dir']);
 	while ($entry = $dir->read())

Themes/default/Poll.template.php

Braces +12 added lines, -8 removed lines

@@ -38,8 +38,8 @@ 
 		}
 	</script>';
 
-	if (!empty($context['poll_error']['messages']))
-		echo '
+	if (!empty($context['poll_error']['messages'])) {
+			echo '
 			<div class="errorbox">
 				<dl class="poll_error">
 					<dt>
@@ -50,6 +50,7 @@ 
 					</dt>
 				</dl>
 			</div>';
+	}
 
 	// Start the main poll form.
 	echo '
@@ -79,8 +80,9 @@ 
 								<input type="text" name="options[', $choice['id'], ']" id="options-', $choice['id'], '" value="', $choice['label'], '" size="80" maxlength="255">';
 
 		// Does this option have a vote count yet, or is it new?
-		if ($choice['votes'] != -1)
-			echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
+		if ($choice['votes'] != -1) {
+					echo ' (', $choice['votes'], ' ', $txt['votes'], ')';
+		}
 
 		echo '
 							</dd>';
@@ -118,14 +120,15 @@ 
 								<input type="checkbox" id="poll_change_vote" name="poll_change_vote"', !empty($context['poll']['change_vote']) ? ' checked' : '', '>
 							</dd>';
 
-		if ($context['poll']['guest_vote_allowed'])
-			echo '
+		if ($context['poll']['guest_vote_allowed']) {
+					echo '
 							<dt>
 								<label for="poll_guest_vote">', $txt['poll_guest_vote'], ':</label>
 							</dt>
 							<dd>
 								<input type="checkbox" id="poll_guest_vote" name="poll_guest_vote"', !empty($context['poll']['guest_vote']) ? ' checked' : '', '>
 							</dd>';
+		}
 	}
 
 	echo '
@@ -141,12 +144,13 @@ 
 					</fieldset>';
 
 	// If this is an edit, we can allow them to reset the vote counts.
-	if ($context['is_edit'])
-		echo '
+	if ($context['is_edit']) {
+			echo '
 					<fieldset id="poll_reset">
 						<legend>', $txt['reset_votes'], '</legend>
 						<input type="checkbox" name="resetVoteCount" value="on"> ' . $txt['reset_votes_check'] . '
 					</fieldset>';
+	}
 	echo '
 					<input type="submit" name="post" value="', $txt['save'], '" onclick="return submitThisOnce(this);" accesskey="s" class="button">
 				</div><!-- .roundframe -->

Themes/default/PersonalMessage.template.php

Spacing +19 added lines, -19 removed lines

@@ -230,7 +230,7 @@ 
 
 				foreach ($message['custom_fields']['above_member'] as $custom)
 					echo '
-							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+							<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 						</ul>
@@ -279,7 +279,7 @@ 
 			if (!empty($message['custom_fields']['below_avatar']))
 				foreach ($message['custom_fields']['below_avatar'] as $custom)
 					echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 			if (!$message['member']['is_guest'])
 				echo '
@@ -321,7 +321,7 @@ 
 
 					foreach ($message['custom_fields']['icons'] as $custom)
 						echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 					echo '
 							</ol>
@@ -385,7 +385,7 @@ 
 				if (!empty($message['custom_fields']['standard']))
 					foreach ($message['custom_fields']['standard'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['title'], ': ', $custom['value'], '</li>';
 
 				// Are we showing the warning status?
 				if ($message['member']['can_see_warning'])
@@ -396,7 +396,7 @@ 
 				if (!empty($message['custom_fields']['bottom_poster']))
 					foreach ($message['custom_fields']['bottom_poster'] as $custom)
 						echo '
-						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+						<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -497,7 +497,7 @@ 
 
 				foreach ($message['custom_fields']['above_signature'] as $custom)
 					echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 							</ul>
@@ -520,7 +520,7 @@ 
 
 				foreach ($message['custom_fields']['below_signature'] as $custom)
 					echo '
-								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+								<li class="custom ', $custom['col_name'], '">', $custom['value'], '</li>';
 
 				echo '
 							</ul>
@@ -656,7 +656,7 @@ 
 	while ($message = $context['get_pmessage']('subject'))
 	{
 		echo '
-			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '','">
+			<tr class="windowbg', $message['is_unread'] ? ' unread_pm' : '', '">
 				<td class="table_icon">
 					<script>
 						currentLabels[', $message['id'], '] = {';
@@ -956,13 +956,13 @@ 
 				// You can only reply if they are not a guest...
 				if (!$message['member']['is_guest'])
 					echo '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button, '</a>', $context['menu_separator'], '
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button, '</a> ', $context['menu_separator'];
 
 				// This is for "forwarding" - even if the member is gone.
 				else
 					echo '
-					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
+					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button, '</a>', $context['menu_separator'];
 			}
 
 			echo '
@@ -1062,7 +1062,7 @@ 
 				<div class="', empty($context['error_type']) || $context['error_type'] != 'serious' ? 'noticebox' : 'errorbox', '"', empty($context['post_error']['messages']) ? ' style="display: none"' : '', ' id="errors">
 					<dl>
 						<dt>
-							<strong id="error_serious">', $txt['error_while_submitting'] , '</strong>
+							<strong id="error_serious">', $txt['error_while_submitting'], '</strong>
 						</dt>
 						<dd class="error" id="error_list">
 							', empty($context['post_error']['messages']) ? '' : implode('<br>', $context['post_error']['messages']), '
@@ -1118,7 +1118,7 @@ 
 						<span', (isset($context['post_error']['no_subject']) ? ' class="error"' : ''), ' id="caption_subject">', $txt['subject'], ':</span>
 					</dt>
 					<dd id="pm_subject">
-						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"',isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
+						<input type="text" name="subject" value="', $context['subject'], '" tabindex="', $context['tabindex']++, '" size="80" maxlength="80"', isset($context['post_error']['no_subject']) ? ' class="error"' : '', '>
 					</dd>
 				</dl>';
 
@@ -1471,7 +1471,7 @@ 
 		echo '
 		<div class="block righttext">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
-			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
+			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'], '" class="button you_sure">
 		</div>';
 
 	echo '
@@ -1635,7 +1635,7 @@ 
 	if (!empty($context['rules']))
 		echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
-			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
+			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'], '" class="button smalltext you_sure">';
 
 	echo '
 		</div>
@@ -1878,9 +1878,9 @@ 
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
-					<option value="">', $txt['pm_rule_sel_action'] , ':</option>
-					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'] , '</option>
-					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'] , '</option>
+					<option value="">', $txt['pm_rule_sel_action'], ':</option>
+					<option value="lab"', $action['t'] == 'lab' ? ' selected' : '', '>', $txt['pm_rule_label'], '</option>
+					<option value="del"', $action['t'] == 'del' ? ' selected' : '', '>', $txt['pm_rule_delete'], '</option>
 				</select>
 				<span id="labdiv', $k, '">
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
@@ -1992,7 +1992,7 @@ 
 			</div>
 			<ul class="quickbuttons">
 				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;id_draft=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '"><span class="generic_icons modifybutton"></span>', $txt['draft_edit'], '</a></li>
-				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'] ,'?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
+				<li><a href="', $scripturl, '?action=pm;sa=showpmdrafts;delete=', $draft['id_draft'], ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', $txt['draft_remove'], '?" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['draft_delete'], '</a></li>
 			</ul>
 		</div><!-- .windowbg -->';
 		}

Braces +285 added lines, -199 removed lines

@@ -21,8 +21,8 @@ 
 	<div id="personal_messages">';
 
 	// Show the capacity bar, if available.
-	if (!empty($context['limit_bar']))
-		echo '
+	if (!empty($context['limit_bar'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">
 				<span class="floatleft">', $txt['pm_capacity'], ':</span>
@@ -32,14 +32,16 @@ 
 				<span class="floatright', $context['limit_bar']['percent'] > 90 ? ' alert' : '', '">', $context['limit_bar']['text'], '</span>
 			</h3>
 		</div>';
+	}
 
 	// Message sent? Show a small indication.
-	if (isset($context['pm_sent']))
-		echo '
+	if (isset($context['pm_sent'])) {
+			echo '
 		<div class="infobox">
 			', $txt['pm_sent'], '
 		</div>';
-}
+	}
+	}
 
 /**
  * Just the end of the index bar, nothing special.
@@ -68,13 +70,13 @@ 
 		</div>
 		<div class="pm_unread">';
 
-	if (empty($context['unread_pms']))
-		echo '
+	if (empty($context['unread_pms'])) {
+			echo '
 			<div class="no_unread">', $txt['pm_no_unread'], '</div>';
-	else
+	} else
 	{
-		foreach ($context['unread_pms'] as $id_pm => $pm_details)
-			echo '
+		foreach ($context['unread_pms'] as $id_pm => $pm_details) {
+					echo '
 			<div class="unread">
 				', !empty($pm_details['member']) ? $pm_details['member']['avatar']['image'] : '', '
 				<div class="details">
@@ -85,6 +87,7 @@ 
 					</div>
 				</div>
 			</div>';
+		}
 	}
 
 	echo '
@@ -193,14 +196,15 @@ 
 	if ($context['get_pmessage']('message', true))
 	{
 		// Show the helpful titlebar - generally.
-		if ($context['display_mode'] != 1)
-			echo '
+		if ($context['display_mode'] != 1) {
+					echo '
 			<div class="cat_bar">
 				<h3 class="catbg">
 					<span id="author">', $txt['author'], '</span>
 					<span id="topic_title">', $txt[$context['display_mode'] == 0 ? 'messages' : 'conversation'], '</span>
 				</h3>
 			</div>';
+		}
 
 		// Show a few buttons if we are in conversation mode and outputting the first message.
 		if ($context['display_mode'] == 2)
@@ -228,9 +232,10 @@ 
 					<div class="custom_fields_above_member">
 						<ul class="nolist">';
 
-				foreach ($message['custom_fields']['above_member'] as $custom)
-					echo '
+				foreach ($message['custom_fields']['above_member'] as $custom) {
+									echo '
 							<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 
 				echo '
 						</ul>
@@ -242,25 +247,28 @@ 
 						<a id="msg', $message['id'], '"></a>';
 
 			// Show online and offline buttons?
-			if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest'])
-				echo '
+			if (!empty($modSettings['onlineEnable']) && !$message['member']['is_guest']) {
+							echo '
 						<span class="' . ($message['member']['online']['is_online'] == 1 ? 'on' : 'off') . '" title="' . $message['member']['online']['text'] . '"></span>';
+			}
 
 			// Custom fields BEFORE the username?
-			if (!empty($message['custom_fields']['before_member']))
-				foreach ($message['custom_fields']['before_member'] as $custom)
+			if (!empty($message['custom_fields']['before_member'])) {
+							foreach ($message['custom_fields']['before_member'] as $custom)
 					echo '
 						<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+			}
 
 			// Show a link to the member's profile.
 			echo '
 				', $message['member']['link'];
 
 				// Custom fields AFTER the username?
-				if (!empty($message['custom_fields']['after_member']))
-					foreach ($message['custom_fields']['after_member'] as $custom)
+				if (!empty($message['custom_fields']['after_member'])) {
+									foreach ($message['custom_fields']['after_member'] as $custom)
 						echo '
 						<span class="custom ', $custom['col_name'], '">', $custom['value'], '</span>';
+				}
 
 			echo '
 					</h4>';
@@ -269,48 +277,56 @@ 
 					<ul class="user_info">';
 
 			// Show the user's avatar.
-			if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image']))
-				echo '
+			if (!empty($modSettings['show_user_images']) && empty($options['show_no_avatars']) && !empty($message['member']['avatar']['image'])) {
+							echo '
 						<li class="avatar">
 							<a href="', $scripturl, '?action=profile;u=', $message['member']['id'], '">', $message['member']['avatar']['image'], '</a>
 						</li>';
+			}
 
 			// Are there any custom fields below the avatar?
-			if (!empty($message['custom_fields']['below_avatar']))
-				foreach ($message['custom_fields']['below_avatar'] as $custom)
+			if (!empty($message['custom_fields']['below_avatar'])) {
+							foreach ($message['custom_fields']['below_avatar'] as $custom)
 					echo '
 						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+			}
 
-			if (!$message['member']['is_guest'])
-				echo '
+			if (!$message['member']['is_guest']) {
+							echo '
 						<li class="icons">', $message['member']['group_icons'], '</li>';
+			}
 			// Show the member's primary group (like 'Administrator') if they have one.
-			if (isset($message['member']['group']) && $message['member']['group'] != '')
-				echo '
+			if (isset($message['member']['group']) && $message['member']['group'] != '') {
+							echo '
 						<li class="membergroup">', $message['member']['group'], '</li>';
+			}
 
 			// Show the member's custom title, if they have one.
-			if (isset($message['member']['title']) && $message['member']['title'] != '')
-				echo '
+			if (isset($message['member']['title']) && $message['member']['title'] != '') {
+							echo '
 						<li class="title">', $message['member']['title'], '</li>';
+			}
 
 			// Don't show these things for guests.
 			if (!$message['member']['is_guest'])
 			{
 				// Show the post group if and only if they have no other group or the option is on, and they are in a post group.
-				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '')
-					echo '
+				if ((empty($modSettings['hide_post_group']) || $message['member']['group'] == '') && $message['member']['post_group'] != '') {
+									echo '
 						<li class="postgroup">', $message['member']['post_group'], '</li>';
+				}
 
 				// Show how many posts they have made.
-				if (!isset($context['disabled_fields']['posts']))
-					echo '
+				if (!isset($context['disabled_fields']['posts'])) {
+									echo '
 						<li class="postcount">', $txt['member_postcount'], ': ', $message['member']['posts'], '</li>';
+				}
 
 				// Show their personal text?
-				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '')
-					echo '
+				if (!empty($modSettings['show_blurb']) && $message['member']['blurb'] != '') {
+									echo '
 						<li class="blurb">', $message['member']['blurb'], '</li>';
+				}
 
 				// Any custom fields to show as icons?
 				if (!empty($message['custom_fields']['icons']))
@@ -319,9 +335,10 @@ 
 						<li class="im_icons">
 							<ol>';
 
-					foreach ($message['custom_fields']['icons'] as $custom)
-						echo '
+					foreach ($message['custom_fields']['icons'] as $custom) {
+											echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+					}
 
 					echo '
 							</ol>
@@ -329,25 +346,28 @@ 
 				}
 
 				// Show the IP to this user for this post - because you can moderate?
-				if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip']))
-					echo '
+				if (!empty($context['can_moderate_forum']) && !empty($message['member']['ip'])) {
+									echo '
 						<li class="poster_ip">
 							<a href="', $scripturl, '?action=', !empty($message['member']['is_guest']) ? 'trackip' : 'profile;area=tracking;sa=ip;u=' . $message['member']['id'], ';searchip=', $message['member']['ip'], '">', $message['member']['ip'], '</a> <a href="', $scripturl, '?action=helpadmin;help=see_admin_ip" onclick="return reqOverlayDiv(this.href);" class="help">(?)</a>
 						</li>';
+				}
 
 				// Or, should we show it because this is you?
-				elseif ($message['can_see_ip'])
-					echo '
+				elseif ($message['can_see_ip']) {
+									echo '
 						<li class="poster_ip">
 							<a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $message['member']['ip'], '</a>
 						</li>';
+				}
 
 				// Okay, you are logged in, then we can show something about why IPs are logged...
-				else
-					echo '
+				else {
+									echo '
 						<li class="poster_ip">
 							<a href="', $scripturl, '?action=helpadmin;help=see_member_ip" onclick="return reqOverlayDiv(this.href);" class="help">', $txt['logged'], '</a>
 						</li>';
+				}
 
 				// Show the profile, website, email address, and personal message buttons.
 				if ($message['member']['show_profile_buttons'])
@@ -357,24 +377,28 @@ 
 							<ol class="profile_icons">';
 
 					// Show the profile button
-					if ($message['member']['can_view_profile'])
-						echo '
+					if ($message['member']['can_view_profile']) {
+											echo '
 								<li><a href="', $message['member']['href'], '">', ($settings['use_image_buttons'] ? '<img src="' . $settings['images_url'] . '/icons/profile_sm.png" alt="' . $txt['view_profile'] . '" title="' . $txt['view_profile'] . '">' : $txt['view_profile']), '</a></li>';
+					}
 
 					// Don't show an icon if they haven't specified a website.
-					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website']))
-						echo '
+					if ($message['member']['website']['url'] != '' && !isset($context['disabled_fields']['website'])) {
+											echo '
 								<li><a href="', $message['member']['website']['url'], '" title="' . $message['member']['website']['title'] . '" target="_blank" rel="noopener">', ($settings['use_image_buttons'] ? '<span class="generic_icons www centericon" title="' . $message['member']['website']['title'] . '"></span>' : $txt['www']), '</a></li>';
+					}
 
 					// Don't show the email address if they want it hidden.
-					if ($message['member']['show_email'])
-						echo '
+					if ($message['member']['show_email']) {
+											echo '
 								<li><a href="mailto:', $message['member']['email'], '" rel="nofollow">', ($settings['use_image_buttons'] ? '<span class="generic_icons mail centericon" title="' . $txt['email'] . '"></span>' : $txt['email']), '</a></li>';
+					}
 
 					// Since we know this person isn't a guest, you *can* message them.
-					if ($context['can_send_pm'])
-						echo '
+					if ($context['can_send_pm']) {
+											echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;u=', $message['member']['id'], '" title="', $message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline'], '">', $settings['use_image_buttons'] ? '<span class="generic_icons im_' . ($message['member']['online']['is_online'] ? 'on' : 'off') . ' centericon" title="' . ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']) . '"></span> ' : ($message['member']['online']['is_online'] ? $txt['pm_online'] : $txt['pm_offline']), '</a></li>';
+					}
 
 					echo '
 							</ol>
@@ -382,21 +406,24 @@ 
 				}
 
 				// Any custom fields for standard placement?
-				if (!empty($message['custom_fields']['standard']))
-					foreach ($message['custom_fields']['standard'] as $custom)
+				if (!empty($message['custom_fields']['standard'])) {
+									foreach ($message['custom_fields']['standard'] as $custom)
 						echo '
 						<li class="custom ', $custom['col_name'] ,'">', $custom['title'], ': ', $custom['value'], '</li>';
+				}
 
 				// Are we showing the warning status?
-				if ($message['member']['can_see_warning'])
-					echo '
+				if ($message['member']['can_see_warning']) {
+									echo '
 						<li class="warning">', $context['can_issue_warning'] ? '<a href="' . $scripturl . '?action=profile;area=issuewarning;u=' . $message['member']['id'] . '">' : '', '<span class="generic_icons warning_', $message['member']['warning_status'], '"></span>', $context['can_issue_warning'] ? '</a>' : '', '<span class="warn_', $message['member']['warning_status'], '">', $txt['warn_' . $message['member']['warning_status']], '</span></li>';
+				}
 
 				// Are there any custom fields to show at the bottom of the poster info?
-				if (!empty($message['custom_fields']['bottom_poster']))
-					foreach ($message['custom_fields']['bottom_poster'] as $custom)
+				if (!empty($message['custom_fields']['bottom_poster'])) {
+									foreach ($message['custom_fields']['bottom_poster'] as $custom)
 						echo '
 						<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 			}
 
 			// Done with the information about the poster... on to the post itself.
@@ -415,25 +442,29 @@ 
 							<span class="smalltext">&#171; <strong> ', $txt['sent_to'], ':</strong> ';
 
 			// People it was sent directly to....
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 								<strong> ', $txt['on'], ':</strong> ', $message['time'], ' &#187;
 							</span>';
 
 			// If we're in the sent items, show who it was sent to besides the "To:" people.
-			if (!empty($message['recipients']['bcc']))
-				echo '<br>
+			if (!empty($message['recipients']['bcc'])) {
+							echo '<br>
 							<span class="smalltext">&#171; <strong> ', $txt['pm_bcc'], ':</strong> ', implode(', ', $message['recipients']['bcc']), ' &#187;</span>';
+			}
 
-			if (!empty($message['is_replied_to']))
-				echo '<br>
+			if (!empty($message['is_replied_to'])) {
+							echo '<br>
 							<span class="smalltext">&#171; ', $context['folder'] == 'sent' ? $txt['pm_sent_is_replied_to'] : $txt['pm_is_replied_to'], ' &#187;</span>';
+			}
 
 			echo '
 						</div><!-- .keyinfo -->
@@ -443,13 +474,15 @@ 
 							', $message['body'], '
 						</div>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-				echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+							echo '
 						<div class="under_message">';
+			}
 
-			if ($message['can_report'])
-				echo '
+			if ($message['can_report']) {
+							echo '
 							<a href="' . $scripturl . '?action=pm;sa=report;l=' . $context['current_label_id'] . ';pmsg=' . $message['id'] . '" class="floatright">' . $txt['pm_report_to_admin'] . '</a>';
+			}
 
 			echo '
 							<ul class="quickbuttons">';
@@ -461,32 +494,36 @@ 
 				if (!$message['member']['is_guest'])
 				{
 					// Is there than more than one recipient you can reply to?
-					if ($message['number_recipients'] > 1)
-						echo '
+					if ($message['number_recipients'] > 1) {
+											echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=all"><span class="generic_icons reply_all_button"></span>', $txt['reply_to_all'], '</a></li>';
+					}
 
 					echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '"><span class="generic_icons reply_button"></span>', $txt['reply'], '</a></li>
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote', $context['folder'] == 'sent' ? '' : ';u=' . $message['member']['id'], '"><span class="generic_icons quote"></span>', $txt['quote_action'], '</a></li>';
 				}
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 								<li><a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote"><span class="generic_icons quote"></span>', $txt['reply_quote'], '</a></li>';
+				}
 			}
 			echo '
 								<li><a href="', $scripturl, '?action=pm;sa=pmactions;pm_actions%5b', $message['id'], '%5D=delete;f=', $context['folder'], ';start=', $context['start'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';', $context['session_var'], '=', $context['session_id'], '" data-confirm="', addslashes($txt['remove_message_question']), '" class="you_sure"><span class="generic_icons remove_button"></span>', $txt['delete'], '</a></li>';
 
-			if (empty($context['display_mode']))
-				echo '
+			if (empty($context['display_mode'])) {
+							echo '
 								<li><input type="checkbox" name="pms[]" id="deletedisplay', $message['id'], '" value="', $message['id'], '" onclick="document.getElementById(\'deletelisting', $message['id'], '\').checked = this.checked;"></li>';
+			}
 
 			echo '
 							</ul>';
 
-			if ($message['can_report'] || $context['can_send_pm'])
-			echo '
+			if ($message['can_report'] || $context['can_send_pm']) {
+						echo '
 						</div><!-- .under_message -->';
+			}
 
 			// Are there any custom profile fields for above the signature?
 			if (!empty($message['custom_fields']['above_signature']))
@@ -495,9 +532,10 @@ 
 						<div class="custom_fields_above_signature">
 							<ul class="nolist">';
 
-				foreach ($message['custom_fields']['above_signature'] as $custom)
-					echo '
+				foreach ($message['custom_fields']['above_signature'] as $custom) {
+									echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 
 				echo '
 							</ul>
@@ -505,11 +543,12 @@ 
 			}
 
 			// Show the member's signature?
-			if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled'])
-				echo '
+			if (!empty($message['member']['signature']) && empty($options['show_no_signatures']) && $context['signature_enabled']) {
+							echo '
 						<div class="signature">
 							', $message['member']['signature'], '
 						</div>';
+			}
 
 			// Are there any custom profile fields for below the signature?
 			if (!empty($message['custom_fields']['below_signature']))
@@ -518,9 +557,10 @@ 
 						<div class="custom_fields_below_signature">
 							<ul class="nolist">';
 
-				foreach ($message['custom_fields']['below_signature'] as $custom)
-					echo '
+				foreach ($message['custom_fields']['below_signature'] as $custom) {
+									echo '
 								<li class="custom ', $custom['col_name'] ,'">', $custom['value'], '</li>';
+				}
 
 				echo '
 							</ul>
@@ -547,10 +587,11 @@ 
 						echo '
 								<option value="" disabled>', $txt['pm_msg_label_apply'], ':</option>';
 
-						foreach ($context['labels'] as $label)
-							if (!isset($message['labels'][$label['id']]))
+						foreach ($context['labels'] as $label) {
+													if (!isset($message['labels'][$label['id']]))
 								echo '
 								<option value="', $label['id'], '">', $label['name'], '</option>';
+						}
 					}
 
 					// ... and are there any that can be removed?
@@ -559,9 +600,10 @@ 
 						echo '
 								<option value="" disabled>', $txt['pm_msg_label_remove'], ':</option>';
 
-						foreach ($message['labels'] as $label)
-							echo '
+						foreach ($message['labels'] as $label) {
+													echo '
 								<option value="', $label['id'], '">&nbsp;', $label['name'], '</option>';
+						}
 					}
 					echo '
 							</select>
@@ -580,14 +622,15 @@ 
 			</div><!-- .windowbg -->';
 		}
 
-		if (empty($context['display_mode']))
-			echo '
+		if (empty($context['display_mode'])) {
+					echo '
 			<div class="pagesection">
 				<div class="floatleft">', $context['page_index'], '</div>
 				<div class="floatright">
 					<input type="submit" name="del_selected" value="', $txt['quickmod_delete_selected'], '" onclick="if (!confirm(\'', $txt['delete_selected_confirm'], '\')) return false;" class="button">
 				</div>
 			</div>';
+		}
 
 		// Show a few buttons if we are in conversation mode and outputting the first message.
 		elseif ($context['display_mode'] == 2 && isset($context['conversation_buttons']))
@@ -647,11 +690,12 @@ 
 		</thead>
 		<tbody>';
 
-	if (!$context['show_delete'])
-		echo '
+	if (!$context['show_delete']) {
+			echo '
 			<tr class="windowbg">
 				<td colspan="5">', $txt['pm_alert_none'], '</td>
 			</tr>';
+	}
 
 	while ($message = $context['get_pmessage']('subject'))
 	{
@@ -709,17 +753,19 @@ 
 
 			foreach ($context['labels'] as $label)
 			{
-				if ($label['id'] != $context['current_label_id'])
-					echo '
+				if ($label['id'] != $context['current_label_id']) {
+									echo '
 				<option value="add_', $label['id'], '">&nbsp;', $label['name'], '</option>';
+				}
 			}
 
 			echo '
 				<option value="" disabled>', $txt['pm_msg_label_remove'], ':</option>';
 
-			foreach ($context['labels'] as $label)
-				echo '
+			foreach ($context['labels'] as $label) {
+							echo '
 				<option value="rem_', $label['id'], '">&nbsp;', $label['name'], '</option>';
+			}
 
 			echo '
 			</select>
@@ -744,11 +790,12 @@ 
 {
 	global $context, $scripturl, $txt;
 
-	if (!empty($context['search_errors']))
-		echo '
+	if (!empty($context['search_errors'])) {
+			echo '
 		<div class="errorbox">
 			', implode('<br>', $context['search_errors']['messages']), '
 		</div>';
+	}
 
 	echo '
 	<form action="', $scripturl, '?action=pm;sa=search2" method="post" accept-charset="', $context['character_set'], '" name="searchform" id="searchform">
@@ -816,9 +863,10 @@ 
 				</dd>
 			</dl>';
 
-	if (!$context['currently_using_labels'])
-		echo '
+	if (!$context['currently_using_labels']) {
+			echo '
 				<input type="submit" name="pm_search" value="', $txt['pm_search_go'], '" class="button floatright">';
+	}
 
 	echo '
 		</div><!-- .roundframe -->';
@@ -837,12 +885,13 @@ 
 				<div id="advanced_panel_div">
 					<ul id="searchLabelsExpand">';
 
-		foreach ($context['search_labels'] as $label)
-			echo '
+		foreach ($context['search_labels'] as $label) {
+					echo '
 						<li>
 							<label for="searchlabel_', $label['id'], '"><input type="checkbox" id="searchlabel_', $label['id'], '" name="searchlabel[', $label['id'], ']" value="', $label['id'], '"', $label['checked'] ? ' checked' : '', '>
 							', $label['name'], '</label>
 						</li>';
+		}
 
 		echo '
 					</ul>
@@ -904,8 +953,8 @@ 
 		</div>';
 
 	// Complete results?
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
-		echo '
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
+			echo '
 		<table class="table_grid">
 			<thead>
 				<tr class="title_bar">
@@ -915,6 +964,7 @@ 
 				</tr>
 			</thead>
 			<tbody>';
+	}
 
 	// Print each message out...
 	foreach ($context['personal_messages'] as $message)
@@ -934,12 +984,14 @@ 
 
 			// Show the recipients.
 			// @todo This doesn't deal with the sent item searching quite right for bcc.
-			if (!empty($message['recipients']['to']))
-				echo implode(', ', $message['recipients']['to']);
+			if (!empty($message['recipients']['to'])) {
+							echo implode(', ', $message['recipients']['to']);
+			}
 
 			// Otherwise, we're just going to say "some people"...
-			elseif ($context['folder'] != 'sent')
-				echo '(', $txt['pm_undisclosed_recipients'], ')';
+			elseif ($context['folder'] != 'sent') {
+							echo '(', $txt['pm_undisclosed_recipients'], ')';
+			}
 
 			echo '
 				</h3>
@@ -954,15 +1006,17 @@ 
 				$reply_button = create_button('im_reply.png', 'reply', 'reply', 'class="centericon"');
 
 				// You can only reply if they are not a guest...
-				if (!$message['member']['is_guest'])
-					echo '
+				if (!$message['member']['is_guest']) {
+									echo '
 					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote;u=', $context['folder'] == 'sent' ? '' : $message['member']['id'], '">', $quote_button , '</a>', $context['menu_separator'], '
 					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';u=', $message['member']['id'], '">', $reply_button , '</a> ', $context['menu_separator'];
+				}
 
 				// This is for "forwarding" - even if the member is gone.
-				else
-					echo '
+				else {
+									echo '
 					<a href="', $scripturl, '?action=pm;sa=send;f=', $context['folder'], $context['current_label_id'] != -1 ? ';l=' . $context['current_label_id'] : '', ';pmsg=', $message['id'], ';quote">', $quote_button , '</a>', $context['menu_separator'];
+				}
 			}
 
 			echo '
@@ -971,27 +1025,30 @@ 
 		}
 		// Otherwise just a simple list!
 		// @todo No context at all of the search?
-		else
-			echo '
+		else {
+					echo '
 				<tr class="windowbg">
 					<td>', $message['time'], '</td>
 					<td>', $message['link'], '</td>
 					<td>', $message['member']['link'], '</td>
 				</tr>';
+		}
 	}
 
 	// Finish off the page...
-	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages']))
-		echo '
+	if (empty($context['search_params']['show_complete']) && !empty($context['personal_messages'])) {
+			echo '
 			</tbody>
 		</table>';
+	}
 
 	// No results?
-	if (empty($context['personal_messages']))
-		echo '
+	if (empty($context['personal_messages'])) {
+			echo '
 		<div class="windowbg">
 			<p class="centertext">', $txt['pm_search_none_found'], '</p>
 		</div>';
+	}
 
 	echo '
 		<div class="pagesection">
@@ -1016,15 +1073,17 @@ 
 		</div>
 		<div class="windowbg">';
 
-		if (!empty($context['send_log']['sent']))
-			foreach ($context['send_log']['sent'] as $log_entry)
+		if (!empty($context['send_log']['sent'])) {
+					foreach ($context['send_log']['sent'] as $log_entry)
 				echo '
 			<span class="error">', $log_entry, '</span><br>';
+		}
 
-		if (!empty($context['send_log']['failed']))
-			foreach ($context['send_log']['failed'] as $log_entry)
+		if (!empty($context['send_log']['failed'])) {
+					foreach ($context['send_log']['failed'] as $log_entry)
 				echo '
 			<span class="error">', $log_entry, '</span><br>';
+		}
 
 		echo '
 		</div>
@@ -1070,12 +1129,13 @@ 
 					</dl>
 				</div>';
 
-	if (!empty($modSettings['drafts_pm_enabled']))
-		echo '
+	if (!empty($modSettings['drafts_pm_enabled'])) {
+			echo '
 				<div id="draft_section" class="infobox"', isset($context['draft_saved']) ? '' : ' style="display: none;"', '>',
 					sprintf($txt['draft_pm_saved'], $scripturl . '?action=pm;sa=showpmdrafts'), '
 					', (!empty($modSettings['drafts_keep_days']) ? ' <strong>' . sprintf($txt['draft_save_warning'], $modSettings['drafts_keep_days']) . '</strong>' : ''), '
 				</div>';
+	}
 
 	echo '
 				<dl id="post_header">';
@@ -1141,22 +1201,24 @@ 
 						<dt><strong>', $txt['subject'], '</strong></dt>
 						<dd><strong>', $txt['draft_saved_on'], '</strong></dd>';
 
-		foreach ($context['drafts'] as $draft)
-			echo '
+		foreach ($context['drafts'] as $draft) {
+					echo '
 						<dt>', $draft['link'], '</dt>
 						<dd>', $draft['poster_time'], '</dd>';
+		}
 		echo '
 					</dl>
 				</div>';
 	}
 
 	// Require an image to be typed to save spamming?
-	if ($context['require_verification'])
-		echo '
+	if ($context['require_verification']) {
+			echo '
 				<div class="post_verification">
 					<strong>', $txt['pm_visual_verification_label'], ':</strong>
 					', template_control_verification($context['visual_verification_id'], 'all'), '
 				</div>';
+	}
 
 	// Send, Preview, spellcheck buttons.
 	echo '
@@ -1274,8 +1336,8 @@ 
 			}';
 
 	// Code for showing and hiding drafts
-	if (!empty($context['drafts']))
-		echo '
+	if (!empty($context['drafts'])) {
+			echo '
 			var oSwapDraftOptions = new smc_Toggle({
 				bToggleEnabled: true,
 				bCurrentlyCollapsed: true,
@@ -1297,13 +1359,14 @@ 
 					}
 				]
 			});';
+	}
 
 	echo '
 		</script>';
 
 	// Show the message you're replying to.
-	if ($context['reply'])
-		echo '
+	if ($context['reply']) {
+			echo '
 		<br><br>
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['subject'], ': ', $context['quoted_message']['subject'], '</h3>
@@ -1317,6 +1380,7 @@ 
 			', $context['quoted_message']['body'], '
 		</div>
 		<br class="clear">';
+	}
 
 	echo '
 		<script>
@@ -1328,23 +1392,25 @@ 
 				sToControlId: \'to_control\',
 				aToRecipients: [';
 
-	foreach ($context['recipients']['to'] as $i => $member)
-		echo '
+	foreach ($context['recipients']['to'] as $i => $member) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['to']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
 				aBccRecipients: [';
 
-	foreach ($context['recipients']['bcc'] as $i => $member)
-		echo '
+	foreach ($context['recipients']['bcc'] as $i => $member) {
+			echo '
 					{
 						sItemId: ', JavaScriptEscape($member['id']), ',
 						sItemName: ', JavaScriptEscape($member['name']), '
 					}', $i == count($context['recipients']['bcc']) - 1 ? '' : ',';
+	}
 
 	echo '
 				],
@@ -1433,26 +1499,28 @@ 
 					</th>
 					<th class="centertext table_icon">';
 
-	if (count($context['labels']) > 2)
-		echo '
+	if (count($context['labels']) > 2) {
+			echo '
 						<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 					</th>
 				</tr>
 			</thead>
 			<tbody>';
-	if (count($context['labels']) < 2)
-		echo '
+	if (count($context['labels']) < 2) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="2">', $txt['pm_labels_no_exist'], '</td>
 				</tr>';
-	else
+	} else
 	{
 		foreach ($context['labels'] as $label)
 		{
-			if ($label['id'] == -1)
-				continue;
+			if ($label['id'] == -1) {
+							continue;
+			}
 
 				echo '
 				<tr class="windowbg">
@@ -1467,12 +1535,13 @@ 
 			</tbody>
 		</table>';
 
-	if (!count($context['labels']) < 2)
-		echo '
+	if (!count($context['labels']) < 2) {
+			echo '
 		<div class="block righttext">
 			<input type="submit" name="save" value="', $txt['save'], '" class="button">
 			<input type="submit" name="delete" value="', $txt['quickmod_delete_selected'], '" data-confirm="', $txt['pm_labels_delete'] ,'" class="button you_sure">
 		</div>';
+	}
 
 	echo '
 		<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
@@ -1528,9 +1597,10 @@ 
 					<select name="id_admin">
 						<option value="0">', $txt['pm_report_all_admins'], '</option>';
 
-		foreach ($context['admins'] as $id => $name)
-			echo '
+		foreach ($context['admins'] as $id => $name) {
+					echo '
 						<option value="', $id, '">', $name, '</option>';
+		}
 
 		echo '
 					</select>
@@ -1593,9 +1663,10 @@ 
 					</th>
 					<th class="centertext table_icon">';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 						<input type="checkbox" onclick="invertAll(this, this.form);">';
+	}
 
 	echo '
 					</th>
@@ -1603,16 +1674,17 @@ 
 			</thead>
 			<tbody>';
 
-	if (empty($context['rules']))
-		echo '
+	if (empty($context['rules'])) {
+			echo '
 				<tr class="windowbg">
 					<td colspan="2">
 						', $txt['pm_rules_none'], '
 					</td>
 				</tr>';
+	}
 
-	foreach ($context['rules'] as $rule)
-		echo '
+	foreach ($context['rules'] as $rule) {
+			echo '
 				<tr class="windowbg">
 					<td>
 						<a href="', $scripturl, '?action=pm;sa=manrules;add;rid=', $rule['id'], '">', $rule['name'], '</a>
@@ -1621,6 +1693,7 @@ 
 						<input type="checkbox" name="delrule[', $rule['id'], ']">
 					</td>
 				</tr>';
+	}
 
 	echo '
 			</tbody>
@@ -1628,14 +1701,16 @@ 
 		<div class="righttext">
 			<a class="button" href="', $scripturl, '?action=pm;sa=manrules;add;rid=0">', $txt['pm_add_rule'], '</a>';
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			[<a href="', $scripturl, '?action=pm;sa=manrules;apply;', $context['session_var'], '=', $context['session_id'], '" onclick="return confirm(\'', $txt['pm_js_apply_rules_confirm'], '\');">', $txt['pm_apply_rules'], '</a>]';
+	}
 
-	if (!empty($context['rules']))
-		echo '
+	if (!empty($context['rules'])) {
+			echo '
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			<input type="submit" name="delselected" value="', $txt['pm_delete_selected_rule'], '" data-confirm="', $txt['pm_js_delete_rule_confirm'] ,'" class="button smalltext you_sure">';
+	}
 
 	echo '
 		</div>
@@ -1657,14 +1732,16 @@ 
 		var groups = new Array()
 		var labels = new Array()';
 
-	foreach ($context['groups'] as $id => $title)
-		echo '
+	foreach ($context['groups'] as $id => $title) {
+			echo '
 		groups[', $id, '] = "', addslashes($title), '";';
+	}
 
-	foreach ($context['labels'] as $label)
-		if ($label['id'] != -1)
+	foreach ($context['labels'] as $label) {
+			if ($label['id'] != -1)
 			echo '
 		labels[', ($label['id']), '] = "', addslashes($label['name']), '";';
+	}
 
 	echo '
 		function addCriteriaOption()
@@ -1679,8 +1756,9 @@ 
 
 			setOuterHTML(document.getElementById("criteriaAddHere"), \'<br><select name="ruletype[\' + criteriaNum + \']" id="ruletype\' + criteriaNum + \'" onchange="updateRuleDef(\' + criteriaNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_criteria_pick']), ':<\' + \'/option><option value="mid">', addslashes($txt['pm_rule_mid']), '<\' + \'/option><option value="gid">', addslashes($txt['pm_rule_gid']), '<\' + \'/option><option value="sub">', addslashes($txt['pm_rule_sub']), '<\' + \'/option><option value="msg">', addslashes($txt['pm_rule_msg']), '<\' + \'/option><option value="bud">', addslashes($txt['pm_rule_bud']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="defdiv\' + criteriaNum + \'" style="display: none;"><input type="text" name="ruledef[\' + criteriaNum + \']" id="ruledef\' + criteriaNum + \'" onkeyup="rebuildRuleDesc();" value=""><\' + \'/span><span id="defseldiv\' + criteriaNum + \'" style="display: none;"><select name="ruledefgroup[\' + criteriaNum + \']" id="ruledefgroup\' + criteriaNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_group']), '<\' + \'/option>';
 
-	foreach ($context['groups'] as $id => $group)
-		echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	foreach ($context['groups'] as $id => $group) {
+			echo '<option value="', $id, '">', strtr($group, array("'" => "\'")), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="criteriaAddHere"><\' + \'/span>\');
 			}
@@ -1697,9 +1775,10 @@ 
 
 				setOuterHTML(document.getElementById("actionAddHere"), \'<br><select name="acttype[\' + actionNum + \']" id="acttype\' + actionNum + \'" onchange="updateActionDef(\' + actionNum + \'); rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_action']), ':<\' + \'/option><option value="lab">', addslashes($txt['pm_rule_label']), '<\' + \'/option><option value="del">', addslashes($txt['pm_rule_delete']), '<\' + \'/option><\' + \'/select>&nbsp;<span id="labdiv\' + actionNum + \'" style="display: none;"><select name="labdef[\' + actionNum + \']" id="labdef\' + actionNum + \'" onchange="rebuildRuleDesc();"><option value="">', addslashes($txt['pm_rule_sel_label']), '<\' + \'/option>';
 
-	foreach ($context['labels'] as $label)
-		if ($label['id'] != -1)
+	foreach ($context['labels'] as $label) {
+			if ($label['id'] != -1)
 			echo '<option value="', ($label['id']), '">', addslashes($label['name']), '<\' + \'/option>';
+	}
 
 	echo '<\' + \'/select><\' + \'/span><span id="actionAddHere"><\' + \'/span>\');
 			}
@@ -1813,19 +1892,20 @@ 
 	$isFirst = true;
 	foreach ($context['rule']['criteria'] as $k => $criteria)
 	{
-		if (!$isFirst && $criteria['t'] == '')
-			echo '<div id="removeonjs1">';
-
-		elseif (!$isFirst)
-			echo '<br>';
+		if (!$isFirst && $criteria['t'] == '') {
+					echo '<div id="removeonjs1">';
+		} elseif (!$isFirst) {
+					echo '<br>';
+		}
 
 		echo '
 				<select name="ruletype[', $k, ']" id="ruletype', $k, '" onchange="updateRuleDef(', $k, '); rebuildRuleDesc();">
 					<option value="">', $txt['pm_rule_criteria_pick'], ':</option>';
 
-		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr)
-			echo '
+		foreach (array('mid', 'gid', 'sub', 'msg', 'bud') as $cr) {
+					echo '
 					<option value="', $cr, '"', $criteria['t'] == $cr ? ' selected' : '', '>', $txt['pm_rule_' . $cr], '</option>';
+		}
 
 		echo '
 				</select>
@@ -1836,19 +1916,20 @@ 
 					<select name="ruledefgroup[', $k, ']" id="ruledefgroup', $k, '" onchange="rebuildRuleDesc();">
 						<option value="">', $txt['pm_rule_sel_group'], '</option>';
 
-		foreach ($context['groups'] as $id => $group)
-			echo '
+		foreach ($context['groups'] as $id => $group) {
+					echo '
 						<option value="', $id, '"', $criteria['t'] == 'gid' && $criteria['v'] == $id ? ' selected' : '', '>', $group, '</option>';
+		}
 		echo '
 					</select>
 				</span>';
 
 		// If this is the dummy we add a means to hide for non js users.
-		if ($isFirst)
-			$isFirst = false;
-
-		elseif ($criteria['t'] == '')
-			echo '</div><!-- .removeonjs1 -->';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($criteria['t'] == '') {
+					echo '</div><!-- .removeonjs1 -->';
+		}
 	}
 
 	echo '
@@ -1871,10 +1952,11 @@ 
 	$isFirst = true;
 	foreach ($context['rule']['actions'] as $k => $action)
 	{
-		if (!$isFirst && $action['t'] == '')
-			echo '<div id="removeonjs2">';
-		elseif (!$isFirst)
-			echo '<br>';
+		if (!$isFirst && $action['t'] == '') {
+					echo '<div id="removeonjs2">';
+		} elseif (!$isFirst) {
+					echo '<br>';
+		}
 
 		echo '
 				<select name="acttype[', $k, ']" id="acttype', $k, '" onchange="updateActionDef(', $k, '); rebuildRuleDesc();">
@@ -1886,20 +1968,21 @@ 
 					<select name="labdef[', $k, ']" id="labdef', $k, '" onchange="rebuildRuleDesc();">
 						<option value="">', $txt['pm_rule_sel_label'], '</option>';
 
-		foreach ($context['labels'] as $label)
-			if ($label['id'] != -1)
+		foreach ($context['labels'] as $label) {
+					if ($label['id'] != -1)
 				echo '
 						<option value="', ($label['id']), '"', $action['t'] == 'lab' && $action['v'] == $label['id'] ? ' selected' : '', '>', $label['name'], '</option>';
+		}
 
 		echo '
 					</select>
 				</span>';
 
-		if ($isFirst)
-			$isFirst = false;
-
-		elseif ($action['t'] == '')
-			echo '</div><!-- .removeonjs2 -->';
+		if ($isFirst) {
+					$isFirst = false;
+		} elseif ($action['t'] == '') {
+					echo '</div><!-- .removeonjs2 -->';
+		}
 	}
 
 	echo '
@@ -1923,22 +2006,25 @@ 
 		echo '
 	<script>';
 
-	foreach ($context['rule']['criteria'] as $k => $c)
-		echo '
+	foreach ($context['rule']['criteria'] as $k => $c) {
+			echo '
 			updateRuleDef(', $k, ');';
+	}
 
-	foreach ($context['rule']['actions'] as $k => $c)
-		echo '
+	foreach ($context['rule']['actions'] as $k => $c) {
+			echo '
 			updateActionDef(', $k, ');';
+	}
 
 	echo '
 			rebuildRuleDesc();';
 
 	// If this isn't a new rule and we have JS enabled remove the JS compatibility stuff.
-	if ($context['rid'])
-		echo '
+	if ($context['rid']) {
+			echo '
 			document.getElementById("removeonjs1").style.display = "none";
 			document.getElementById("removeonjs2").style.display = "none";';
+	}
 
 	echo '
 			document.getElementById("addonjs1").style.display = "";
@@ -1966,12 +2052,12 @@ 
 		</div>';
 
 	// No drafts? Just show an informative message.
-	if (empty($context['drafts']))
-		echo '
+	if (empty($context['drafts'])) {
+			echo '
 		<div class="windowbg centertext">
 			', $txt['draft_none'], '
 		</div>';
-	else
+	} else
 	{
 		// For every draft to be displayed, give it its own div, and show the important details of the draft.
 		foreach ($context['drafts'] as $draft)

Sources/PersonalMessage.php

Doc Comments +1 added lines, -1 removed lines

@@ -4051,7 +4051,7 @@
  *

  * @param int $pmID The ID of the PM

  * @param string $validFor Which folders this is valud for - can be 'inbox', 'outbox' or 'in_or_outbox'

- * @return boolean Whether the PM is accessible in that folder for the current user

+ * @return boolean|null Whether the PM is accessible in that folder for the current user

  */

 function isAccessiblePM($pmID, $validFor = 'in_or_outbox')

 {

Braces +673 added lines, -510 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4

  */

 

-if (!defined('SMF'))

-	die('No direct access...');

+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']]))

-				$context['unread_pms'][$id_pm]['member'] = &$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';

@@ -484,9 +496,10 @@ 
 		list ($sig_limits, $sig_bbc) = explode(':', $modSettings['signature_settings']);

 		$sig_limits = explode(',', $sig_limits);

 

-		if (!empty($sig_limits[5]) || !empty($sig_limits[6]))

-			addInlineCss('

-	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');

+		if (!empty($sig_limits[5]) || !empty($sig_limits[6])) {
+					addInlineCss('

+	.signature img { ' . (!empty($sig_limits[5]) ? 'max-width: ' . (int) $sig_limits[5] . 'px; ' : '') . (!empty($sig_limits[6]) ? 'max-height: ' . (int) $sig_limits[6] . 'px; ' : '') . '}');
+		}
 	}

 

 	$labelJoin = '';

@@ -498,8 +511,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)';

@@ -541,22 +553,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}

@@ -565,9 +579,9 @@ 
 				'current_member' => $user_info['id'],

 				'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 . '

@@ -577,7 +591,8 @@ 
 				'current_member' => $user_info['id'],

 				'not_deleted' => 0,

 			)

-		);

+		);
+	}
 	list ($max_messages) = $smcFunc['db_fetch_row']($request);

 	$smcFunc['db_free_result']($request);

 

@@ -586,10 +601,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']))

@@ -597,19 +613,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}

@@ -620,9 +638,9 @@ 
 						'not_deleted' => 0,

 						'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 . '

@@ -634,7 +652,8 @@ 
 						'not_deleted' => 0,

 						'id_pm' => $pmID,

 					)

-				);

+				);
+			}
 

 			list ($_GET['start']) = $smcFunc['db_fetch_row']($request);

 			$smcFunc['db_free_result']($request);

@@ -649,8 +668,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.

@@ -744,8 +764,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(),

@@ -754,29 +775,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)

@@ -798,16 +823,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 (!isset($recipients[$row['id_pm']]))

-					$recipients[$row['id_pm']] = array(

+				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(

 						'to' => array(),

 						'bcc' => array()

-					);

+					);
+				}
 				$display_pms[] = $row['id_pm'];

 				$posters[$row['id_pm']] = $row['id_member_from'];

 			}

@@ -858,8 +885,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);

@@ -876,9 +904,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))

-					unset($posters[$k]);

+			foreach ($posters as $k => $v) {
+							if (!in_array($k, $display_pms))

+					unset($posters[$k]);
+			}
 		}

 

 		// Load any users....

@@ -889,8 +918,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']('', '

@@ -936,9 +966,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');

@@ -949,11 +979,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']);
+		}
 	}

 }

 

@@ -971,8 +1003,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)

@@ -1017,19 +1050,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;

 	}

@@ -1049,8 +1085,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'])));

@@ -1091,9 +1126,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)

-			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $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));

 

@@ -1117,22 +1153,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']);

@@ -1159,8 +1201,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];

 		}

@@ -1182,8 +1225,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.

@@ -1212,35 +1256,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('%' => '\%', '_' => '\_', '*' => '%', '?' => '_'));

@@ -1252,8 +1301,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))

@@ -1265,8 +1315,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?

@@ -1279,28 +1330,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...

@@ -1308,8 +1359,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';

 

@@ -1319,24 +1371,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;

-		}

-		else

-			$_REQUEST['searchlabel'] = array();

+			foreach ($_REQUEST['searchlabel'] as $key => $id) {
+							$_REQUEST['searchlabel'][$key] = (int) $id;
+			}
+		} 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']))

 		{

@@ -1359,8 +1414,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}))';

@@ -1375,8 +1429,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);

@@ -1389,12 +1444,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;

+			$word = $smcFunc['strtolower'](trim($searchArray[$index]));
+	}
+			if (strlen($word) > 0) {
+							$excludedWords[] = $word;
+			}
 			unset($searchArray[$index]);

 		}

 

@@ -1404,8 +1461,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]);

 		}

 	}

@@ -1416,9 +1474,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]);

@@ -1428,27 +1486,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.

@@ -1456,26 +1519,31 @@ 
 

 	foreach ($searchWords as $index => $word)

 	{

-		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 ($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 . '})';
+		}
 		$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']))

@@ -1561,8 +1629,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);

 	}

 

@@ -1592,8 +1661,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')

 			{

@@ -1614,12 +1684,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);

@@ -1746,8 +1818,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?

@@ -1756,8 +1829,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']('', '

@@ -1794,8 +1868,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);

 

@@ -1806,9 +1881,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'];

@@ -1817,22 +1892,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]';

-		}

-		else

-			$form_message = '';

+			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 = '';
+		}
 

 		// Do the BBC thang on the message.

 		$row_quoted['body'] = parse_bbc($row_quoted['body'], true, 'pm' . $row_quoted['id_pm']);

@@ -1853,8 +1931,7 @@ 
 			'timestamp' => forum_time(true, $row_quoted['msgtime']),

 			'body' => $row_quoted['body']

 		);

-	}

-	else

+	} else

 	{

 		$context['quoted_message'] = false;

 		$form_subject = '';

@@ -1873,11 +1950,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']('', '

@@ -1893,18 +1971,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']);

 

@@ -1918,22 +1997,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;

@@ -2003,8 +2084,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

@@ -2030,9 +2112,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'];

 

@@ -2093,10 +2175,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);

@@ -2143,14 +2226,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.

@@ -2208,8 +2293,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);

 

@@ -2239,24 +2325,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();

@@ -2268,8 +2357,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?

@@ -2283,10 +2373,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]))

@@ -2316,8 +2407,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]);

@@ -2327,8 +2419,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)

@@ -2342,28 +2435,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?

@@ -2375,13 +2471,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']))

@@ -2412,8 +2510,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);

@@ -2443,13 +2542,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')

@@ -2467,11 +2567,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']))

@@ -2479,8 +2580,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...

@@ -2495,24 +2597,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

@@ -2523,8 +2629,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']('', '

@@ -2538,8 +2645,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);

 	}

@@ -2550,22 +2658,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)

 			{

@@ -2576,8 +2683,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')

@@ -2643,8 +2751,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

@@ -2676,21 +2783,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'])

@@ -2732,8 +2843,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',

@@ -2777,11 +2889,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']);

@@ -2818,8 +2932,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.

@@ -2836,8 +2951,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.

@@ -2868,26 +2984,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)

 	{

@@ -2922,17 +3041,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);

@@ -3000,8 +3121,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))

@@ -3046,8 +3168,9 @@ 
 {

 	global $user_info, $context, $smcFunc;

 

-	if ($owner === null)

-		$owner = $user_info['id'];

+	if ($owner === null) {
+			$owner = $user_info['id'];
+	}
 

 	$in_inbox = '';

 

@@ -3071,8 +3194,7 @@ 
 		}

 

 		$smcFunc['db_free_result']($get_messages);

-	}

-	elseif ($label = '-1')

+	} elseif ($label = '-1')

 	{

 		// Marking all PMs in your inbox read

 		$in_inbox = '

@@ -3097,8 +3219,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']('', '

@@ -3118,8 +3241,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();

 

@@ -3143,11 +3267,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);

 

@@ -3156,8 +3282,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;
+		}
 	}

 }

 

@@ -3185,8 +3312,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']]))

@@ -3205,8 +3333,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'];

@@ -3227,23 +3356,24 @@ 
 		{

 			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;

@@ -3257,8 +3387,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());

 		}

@@ -3348,8 +3479,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'];

 

@@ -3364,8 +3496,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

@@ -3377,13 +3509,14 @@ 
 							'id_rule' => $id,

 							'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}',

@@ -3391,7 +3524,8 @@ 
 						'current_member' => $user_info['id'],

 						'rule_list' => $rule_changes,

 					)

-				);

+				);
+			}
 		}

 

 		// Make sure we're not caching this!

@@ -3461,8 +3595,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(

@@ -3487,13 +3622,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'];

@@ -3515,8 +3652,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?

@@ -3545,8 +3683,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);

 

@@ -3570,15 +3709,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']('', '

@@ -3594,8 +3735,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);

 

@@ -3614,8 +3756,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 ;)

@@ -3635,12 +3778,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';

@@ -3686,8 +3831,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'];

 	}

@@ -3713,9 +3859,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']))

-					$members[(int) $criteria['v']] = $k;

+			foreach ($context['rule']['criteria'] as $k => $criteria) {
+							if ($criteria['t'] == 'mid' && !empty($criteria['v']))

+					$members[(int) $criteria['v']] = $k;
+			}
 

 			if (!empty($members))

 			{

@@ -3727,19 +3874,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']))

@@ -3749,22 +3897,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')

@@ -3788,13 +3939,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!

@@ -3804,26 +3955,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',

@@ -3833,9 +3987,9 @@ 
 					$user_info['id'], $ruleName, $criteria, $actions, $doDelete, $isOr,

 				),

 				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}

@@ -3850,7 +4004,8 @@ 
 					'criteria' => $criteria,

 					'actions' => $actions,

 				)

-			);

+			);
+		}
 

 		redirectexit('action=pm;sa=manrules');

 	}

@@ -3859,11 +4014,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}',

@@ -3871,7 +4027,8 @@ 
 					'current_member' => $user_info['id'],

 					'delete_list' => $toDelete,

 				)

-			);

+			);
+		}
 

 		redirectexit('action=pm;sa=manrules');

 	}

@@ -3890,8 +4047,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';

@@ -3921,8 +4079,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')

 				{

@@ -3934,17 +4093,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'];

 						}

 					}

@@ -3955,8 +4115,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']))

@@ -3983,8 +4144,7 @@ 
 								'current_member' => $user_info['id'],

 							)

 						);

-					}

-					else

+					} else

 					{

 						$realLabels[] = $label['id'];

 					}

@@ -3993,8 +4153,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',

@@ -4015,8 +4176,9 @@ 
 {

 	global $user_info, $context, $smcFunc;

 

-	if (isset($context['rules']) && !$reload)

-		return;

+	if (isset($context['rules']) && !$reload) {
+			return;
+	}
 

 	$request = $smcFunc['db_query']('', '

 		SELECT

@@ -4040,8 +4202,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/Notify.php

Braces +20 added lines, -18 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Turn off/on notification for a particular board.
@@ -34,8 +35,9 @@ 
 	is_not_guest();
 
 	// You have to specify a board to turn notifications on!
-	if (empty($board))
-		fatal_lang_error('no_board', false);
+	if (empty($board)) {
+			fatal_lang_error('no_board', false);
+	}
 
 	// No subaction: find out what to do.
 	if (isset($_GET['mode']))
@@ -48,16 +50,16 @@ 
 		require_once($sourcedir . '/Subs-Notify.php');
 		setNotifyPrefs($user_info['id'], array('board_notify_' . $board => $alertPref));
 
-		if ($mode > 1)
-			// Turn notification on.  (note this just blows smoke if it's already on.)
+		if ($mode > 1) {
+					// Turn notification on.  (note this just blows smoke if it's already on.)
 			$smcFunc['db_insert']('ignore',
 				'{db_prefix}log_notify',
 				array('id_member' => 'int', 'id_board' => 'int'),
 				array($user_info['id'], $board),
 				array('id_member', 'id_board')
 			);
-		else
-			$smcFunc['db_query']('', '
+		} else {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_notify
 				WHERE id_member = {int:current_member}
 				AND id_board = {int:current_board}',
@@ -66,6 +68,7 @@ 
 					'current_member' => $user_info['id'],
 				)
 			);
+		}
 	}
 
 	// Back to the board!
@@ -80,10 +83,10 @@ 
 			),
 		);
 		$context['sub_template'] = 'generic_xml';
+	} else {
+			redirectexit('board=' . $board . '.' . $_REQUEST['start']);
+	}
 	}
-	else
-		redirectexit('board=' . $board . '.' . $_REQUEST['start']);
-}
 
 /**
  * Turn off/on unread replies subscription for a topic as well as sets individual topic's alert preferences
@@ -128,8 +131,7 @@ 
 					'id_msg' => 0,
 					'unwatched' => empty($mode) ? 1 : 0,
 				);
-			}
-			else
+			} else
 			{
 				$insert = false;
 				$log['unwatched'] = empty($mode) ? 1 : 0;
@@ -156,9 +158,8 @@ 
 					array($user_info['id'], $log['id_topic']),
 					array('id_member', 'id_board')
 				);
-			}
-			else
-				$smcFunc['db_query']('', '
+			} else {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}log_notify
 					WHERE id_topic = {int:topic}
 						AND id_member = {int:member}',
@@ -166,6 +167,7 @@ 
 						'topic' => $log['id_topic'],
 						'member' => $user_info['id'],
 					));
+			}
 		}
 	}
 
@@ -181,9 +183,9 @@ 
 			),
 		);
 		$context['sub_template'] = 'generic_xml';
+	} else {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
 	}
-	else
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
-}
 
 ?>
\ No newline at end of file