SimpleMachines / SMF2.1

Sources/Subs-Notify.php

Braces +17 added lines, -11 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Fetches the list of preferences (or a single/subset of preferences) for
@@ -30,8 +31,9 @@ 
 	// We want this as an array whether it is or not.
 	$members = is_array($members) ? $members : (array) $members;
 
-	if (!empty($prefs))
-		$prefs = is_array($prefs) ? $prefs : (array) $prefs;
+	if (!empty($prefs)) {
+			$prefs = is_array($prefs) ? $prefs : (array) $prefs;
+	}
 
 	$result = array();
 
@@ -56,9 +58,10 @@ 
 	// We may want to keep the default values separate from a given user's. Or we might not.
 	if ($process_default && isset($result[0]))
 	{
-		foreach ($members as $member)
-			if (!isset($result[$member]))
+		foreach ($members as $member) {
+					if (!isset($result[$member]))
 				$result[$member] = $result[0];
+		}
 
 		unset ($result[0]);
 	}
@@ -76,12 +79,14 @@ 
 {
 	global $smcFunc;
 
-	if (empty($prefs) || !is_int($memID))
-		return;
+	if (empty($prefs) || !is_int($memID)) {
+			return;
+	}
 
 	$update_rows = array();
-	foreach ($prefs as $k => $v)
-		$update_rows[] = array($memID, $k, $v);
+	foreach ($prefs as $k => $v) {
+			$update_rows[] = array($memID, $k, $v);
+	}
 
 	$smcFunc['db_insert']('replace',
 		'{db_prefix}user_alerts_prefs',
@@ -101,8 +106,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($prefs) || empty($memID))
-		return;
+	if (empty($prefs) || empty($memID)) {
+			return;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}user_alerts_prefs

Sources/CacheAPI-sqlite.php

Braces +3 added lines, -3 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('Hacking attempt...');
+}
 
 /**
  * SQLite Cache API class
@@ -161,8 +162,7 @@ 
 		if (is_null($dir) || !is_writable($dir))
 		{
 			$this->cachedir = $cachedir_sqlite;
-		}
-		else
+		} else
 		{
 			$this->cachedir = $dir;
 		}

Sources/ManageLanguages.php

Braces +190 added lines, -142 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the main function for the languages area.
@@ -153,11 +154,11 @@ 
 	$language_list = new xmlArray(fetch_web_data($url), true);
 
 	// Check that the site responded and that the language exists.
-	if (!$language_list->exists('languages'))
-		$context['smf_error'] = 'no_response';
-	elseif (!$language_list->exists('languages/language'))
-		$context['smf_error'] = 'no_files';
-	else
+	if (!$language_list->exists('languages')) {
+			$context['smf_error'] = 'no_response';
+	} elseif (!$language_list->exists('languages/language')) {
+			$context['smf_error'] = 'no_files';
+	} else
 	{
 		$language_list = $language_list->path('languages[0]');
 		$lang_files = $language_list->set('language');
@@ -165,8 +166,9 @@ 
 		foreach ($lang_files as $file)
 		{
 			// Were we searching?
-			if (!empty($context['smf_search_term']) && strpos($file->fetch('name'), $smcFunc['strtolower']($context['smf_search_term'])) === false)
-				continue;
+			if (!empty($context['smf_search_term']) && strpos($file->fetch('name'), $smcFunc['strtolower']($context['smf_search_term'])) === false) {
+							continue;
+			}
 
 			$smf_languages[] = array(
 				'id' => $file->fetch('id'),
@@ -177,10 +179,11 @@ 
 				'install_link' => '<a href="' . $scripturl . '?action=admin;area=languages;sa=downloadlang;did=' . $file->fetch('id') . ';' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['add_language_smf_install'] . '</a>',
 			);
 		}
-		if (empty($smf_languages))
-			$context['smf_error'] = 'no_files';
-		else
-			return $smf_languages;
+		if (empty($smf_languages)) {
+					$context['smf_error'] = 'no_files';
+		} else {
+					return $smf_languages;
+		}
 	}
 }
 
@@ -202,8 +205,9 @@ 
 	require_once($sourcedir . '/Subs-Package.php');
 
 	// Clearly we need to know what to request.
-	if (!isset($_GET['did']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['did'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Some lovely context.
 	$context['download_id'] = $_GET['did'];
@@ -223,8 +227,9 @@ 
 		foreach ($_POST['copy_file'] as $file)
 		{
 			// Check it's not very bad.
-			if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file)))
-				fatal_error($txt['languages_download_illegal_paths']);
+			if (strpos($file, '..') !== false || (strpos($file, 'Themes') !== 0 && !preg_match('~agreement\.[A-Za-z-_0-9]+\.txt$~', $file))) {
+							fatal_error($txt['languages_download_illegal_paths']);
+			}
 
 			$chmod_files[] = $boarddir . '/' . $file;
 			$install_files[] = $file;
@@ -235,8 +240,9 @@ 
 		$files_left = $file_status['files']['notwritable'];
 
 		// Something not writable?
-		if (!empty($files_left))
-			$context['error_message'] = $txt['languages_download_not_chmod'];
+		if (!empty($files_left)) {
+					$context['error_message'] = $txt['languages_download_not_chmod'];
+		}
 		// Otherwise, go go go!
 		elseif (!empty($install_files))
 		{
@@ -251,11 +257,13 @@ 
 	}
 
 	// Open up the old china.
-	if (!isset($archive_content))
-		$archive_content = read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(strtr($forum_version, array('SMF ' => ''))) . ';fetch=' . urlencode($_GET['did']), null);
+	if (!isset($archive_content)) {
+			$archive_content = read_tgz_file('https://download.simplemachines.org/fetch_language.php?version=' . urlencode(strtr($forum_version, array('SMF ' => ''))) . ';fetch=' . urlencode($_GET['did']), null);
+	}
 
-	if (empty($archive_content))
-		fatal_error($txt['add_language_error_no_response']);
+	if (empty($archive_content)) {
+			fatal_error($txt['add_language_error_no_response']);
+	}
 
 	// Now for each of the files, let's do some *stuff*
 	$context['files'] = array(
@@ -270,8 +278,9 @@ 
 		$extension = substr($filename, strrpos($filename, '.') + 1);
 
 		// Don't do anything with files we don't understand.
-		if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt')))
-			continue;
+		if (!in_array($extension, array('php', 'jpg', 'gif', 'jpeg', 'png', 'txt'))) {
+					continue;
+		}
 
 		// Basic data.
 		$context_data = array(
@@ -290,8 +299,9 @@ 
 		// Does the file exist, is it different and can we overwrite?
 		if (file_exists($boarddir . '/' . $file['filename']))
 		{
-			if (is_writable($boarddir . '/' . $file['filename']))
-				$context_data['writable'] = true;
+			if (is_writable($boarddir . '/' . $file['filename'])) {
+							$context_data['writable'] = true;
+			}
 
 			// Finally, do we actually think the content has changed?
 			if ($file['size'] == filesize($boarddir . '/' . $file['filename']) && $file['md5'] == md5_file($boarddir . '/' . $file['filename']))
@@ -304,16 +314,17 @@ 
 			{
 				$context_data['exists'] = 'same';
 				$context_data['default_copy'] = false;
+			} else {
+							$context_data['exists'] = 'different';
 			}
-			else
-				$context_data['exists'] = 'different';
 		}
 		// No overwrite?
 		else
 		{
 			// Can we at least stick it in the directory...
-			if (is_writable($boarddir . '/' . $dirname))
-				$context_data['writable'] = true;
+			if (is_writable($boarddir . '/' . $dirname)) {
+							$context_data['writable'] = true;
+			}
 		}
 
 		// I love PHP files, that's why I'm a developer and not an artistic type spending my time drinking absinth and living a life of sin...
@@ -328,8 +339,9 @@ 
 			list ($name, $language) = explode('.', $filename);
 
 			// Let's get the new version, I like versions, they tell me that I'm up to date.
-			if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1)
-				$context_data['version'] = $match[1];
+			if (preg_match('~\s*Version:\s+(.+?);\s*' . preg_quote($name, '~') . '~i', $file['preview'], $match) == 1) {
+							$context_data['version'] = $match[1];
+			}
 
 			// Now does the old file exist - if so what is it's version?
 			if (file_exists($boarddir . '/' . $file['filename']))
@@ -345,34 +357,35 @@ 
 					$context_data['cur_version'] = $match[1];
 
 					// How does this compare?
-					if ($context_data['cur_version'] == $context_data['version'])
-						$context_data['version_compare'] = 'same';
-					elseif ($context_data['cur_version'] > $context_data['version'])
-						$context_data['version_compare'] = 'older';
+					if ($context_data['cur_version'] == $context_data['version']) {
+											$context_data['version_compare'] = 'same';
+					} elseif ($context_data['cur_version'] > $context_data['version']) {
+											$context_data['version_compare'] = 'older';
+					}
 
 					// Don't recommend copying if the version is the same.
-					if ($context_data['version_compare'] != 'newer')
-						$context_data['default_copy'] = false;
+					if ($context_data['version_compare'] != 'newer') {
+											$context_data['default_copy'] = false;
+					}
 				}
 			}
 
 			// Add the context data to the main set.
 			$context['files']['lang'][] = $context_data;
-		}
-		elseif ($extension == '.txt' && stripos($filename, 'agreement') !== false)
+		} elseif ($extension == '.txt' && stripos($filename, 'agreement') !== false)
 		{
 			// Registration agreement is a primary file
 			$context['files']['lang'][] = $context_data;
-		}
-		else
+		} else
 		{
 			// There shouldn't be anything else, but load this into "other" in case we decide to handle it in the future
 			$context['files']['other'][] = $context_data;
 		}
 
 		// Collect together all non-writable areas.
-		if (!$context_data['writable'])
-			$context['make_writable'][] = $context_data['destination'];
+		if (!$context_data['writable']) {
+					$context['make_writable'][] = $context_data['destination'];
+		}
 	}
 
 	// Before we go to far can we make anything writable, eh, eh?
@@ -387,22 +400,24 @@ 
 		{
 			if ($type == 'lang')
 			{
-				foreach ($data as $k => $file)
-					if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
+				foreach ($data as $k => $file) {
+									if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 						$context['files'][$type][$k]['writable'] = true;
-			}
-			else
+				}
+			} else
 			{
-				foreach ($data as $theme => $files)
-					foreach ($files as $k => $file)
+				foreach ($data as $theme => $files) {
+									foreach ($files as $k => $file)
 						if (!$file['writable'] && !in_array($file['destination'], $context['still_not_writable']))
 							$context['files'][$type][$theme][$k]['writable'] = true;
+				}
 			}
 		}
 
 		// Are we going to need more language stuff?
-		if (!empty($context['still_not_writable']))
-			loadLanguage('Packages');
+		if (!empty($context['still_not_writable'])) {
+					loadLanguage('Packages');
+		}
 	}
 
 	// This is the list for the main files.
@@ -615,12 +630,13 @@ 
 	highlightSelected("list_language_list_' . ($language == '' ? 'english' : $language) . '");', true);
 
 	// Display a warning if we cannot edit the default setting.
-	if (!is_writable($boarddir . '/Settings.php'))
-		$listOptions['additional_rows'][] = array(
+	if (!is_writable($boarddir . '/Settings.php')) {
+			$listOptions['additional_rows'][] = array(
 				'position' => 'after_title',
 				'value' => $txt['language_settings_writable'],
 				'class' => 'smalltext alert',
 			);
+	}
 
 	require_once($sourcedir . '/Subs-List.php');
 	createList($listOptions);
@@ -662,10 +678,11 @@ 
 
 	// Put them back.
 	$settings['actual_theme_dir'] = $backup_actual_theme_dir;
-	if (!empty($backup_base_theme_dir))
-		$settings['base_theme_dir'] = $backup_base_theme_dir;
-	else
-		unset($settings['base_theme_dir']);
+	if (!empty($backup_base_theme_dir)) {
+			$settings['base_theme_dir'] = $backup_base_theme_dir;
+	} else {
+			unset($settings['base_theme_dir']);
+	}
 
 	// Get the language files and data...
 	foreach ($context['languages'] as $lang)
@@ -694,13 +711,15 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Default?
-		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']]))
-			$row['lngfile'] = $language;
+		if (empty($row['lngfile']) || !isset($languages[$row['lngfile']])) {
+					$row['lngfile'] = $language;
+		}
 
-		if (!isset($languages[$row['lngfile']]) && isset($languages['english']))
-			$languages['english']['count'] += $row['num_users'];
-		elseif (isset($languages[$row['lngfile']]))
-			$languages[$row['lngfile']]['count'] += $row['num_users'];
+		if (!isset($languages[$row['lngfile']]) && isset($languages['english'])) {
+					$languages['english']['count'] += $row['num_users'];
+		} elseif (isset($languages[$row['lngfile']])) {
+					$languages[$row['lngfile']]['count'] += $row['num_users'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -740,13 +759,15 @@ 
 
 	call_integration_hook('integrate_language_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get our languages. No cache
 	getLanguages(false);
-	foreach ($context['languages'] as $lang)
-		$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+	foreach ($context['languages'] as $lang) {
+			$config_vars['language'][4][$lang['filename']] = array($lang['filename'], $lang['name']);
+	}
 
 	// Saving settings?
 	if (isset($_REQUEST['save']))
@@ -756,8 +777,9 @@ 
 		call_integration_hook('integrate_save_language_settings', array(&$config_vars));
 
 		saveSettings($config_vars);
-		if (!$settings_not_writable && !$settings_backup_fail)
-			$_SESSION['adm-save'] = true;
+		if (!$settings_not_writable && !$settings_backup_fail) {
+					$_SESSION['adm-save'] = true;
+		}
 		redirectexit('action=admin;area=languages;sa=settings');
 	}
 
@@ -766,10 +788,11 @@ 
 	$context['settings_title'] = $txt['language_settings'];
 	$context['save_disabled'] = $settings_not_writable;
 
-	if ($settings_not_writable)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
-	elseif ($settings_backup_fail)
-		$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	if ($settings_not_writable) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['settings_not_writable'] . '</strong></div><br>';
+	} elseif ($settings_backup_fail) {
+			$context['settings_message'] = '<div class="centertext"><strong>' . $txt['admin_backup_fail'] . '</strong></div><br>';
+	}
 
 	// Fill the config array.
 	prepareServerSettingsContext($config_vars);
@@ -816,8 +839,9 @@ 
 			'theme_dir' => $settings['default_theme_dir'],
 		),
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$themes[$row['id_theme']][$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// This will be where we look
@@ -829,14 +853,16 @@ 
 	// Check we have themes with a path and a name - just in case - and add the path.
 	foreach ($themes as $id => $data)
 	{
-		if (count($data) != 2)
-			unset($themes[$id]);
-		elseif (is_dir($data['theme_dir'] . '/languages'))
-			$lang_dirs[$id] = $data['theme_dir'] . '/languages';
+		if (count($data) != 2) {
+					unset($themes[$id]);
+		} elseif (is_dir($data['theme_dir'] . '/languages')) {
+					$lang_dirs[$id] = $data['theme_dir'] . '/languages';
+		}
 
 		// How about image directories?
-		if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id']))
-			$images_dirs[$id] = $data['theme_dir'] . '/images/' . $context['lang_id'];
+		if (is_dir($data['theme_dir'] . '/images/' . $context['lang_id'])) {
+					$images_dirs[$id] = $data['theme_dir'] . '/images/' . $context['lang_id'];
+		}
 	}
 
 	$current_file = $file_id ? $lang_dirs[$theme_id] . '/' . $file_id . '.' . $context['lang_id'] . '.php' : '';
@@ -850,15 +876,17 @@ 
 		while ($entry = $dir->read())
 		{
 			// We're only after the files for this language.
-			if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0)
-				continue;
+			if (preg_match('~^([A-Za-z]+)\.' . $context['lang_id'] . '\.php$~', $entry, $matches) == 0) {
+							continue;
+			}
 
-			if (!isset($context['possible_files'][$theme]))
-				$context['possible_files'][$theme] = array(
+			if (!isset($context['possible_files'][$theme])) {
+							$context['possible_files'][$theme] = array(
 					'id' => $theme,
 					'name' => $themes[$theme]['name'],
 					'files' => array(),
 				);
+			}
 
 			$context['possible_files'][$theme]['files'][] = array(
 				'id' => $matches[1],
@@ -887,31 +915,36 @@ 
 		{
 			$_SESSION['last_backup_for'] = $context['lang_id'] . '$$$';
 			$result = package_create_backup('backup_lang_' . $context['lang_id']);
-			if (!$result)
-				fatal_lang_error('could_not_language_backup', false);
+			if (!$result) {
+							fatal_lang_error('could_not_language_backup', false);
+			}
 		}
 
 		// Second, loop through the array to remove the files.
 		foreach ($lang_dirs as $curPath)
 		{
-			foreach ($context['possible_files'][1]['files'] as $lang)
-				if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
+			foreach ($context['possible_files'][1]['files'] as $lang) {
+							if (file_exists($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php'))
 					unlink($curPath . '/' . $lang['id'] . '.' . $context['lang_id'] . '.php');
+			}
 
 			// Check for the email template.
-			if (file_exists($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php'))
-				unlink($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php');
+			if (file_exists($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php')) {
+							unlink($curPath . '/EmailTemplates.' . $context['lang_id'] . '.php');
+			}
 		}
 
 		// Third, the agreement file.
-		if (file_exists($boarddir . '/agreement.' . $context['lang_id'] . '.txt'))
-			unlink($boarddir . '/agreement.' . $context['lang_id'] . '.txt');
+		if (file_exists($boarddir . '/agreement.' . $context['lang_id'] . '.txt')) {
+					unlink($boarddir . '/agreement.' . $context['lang_id'] . '.txt');
+		}
 
 		// Fourth, a related images folder, if it exists...
-		if (!empty($images_dirs))
-			foreach ($images_dirs as $curPath)
+		if (!empty($images_dirs)) {
+					foreach ($images_dirs as $curPath)
 				if (is_dir($curPath))
 					deltree($curPath);
+		}
 
 		// Members can no longer use this language.
 		$smcFunc['db_query']('', '
@@ -995,8 +1028,9 @@ 
 		foreach ($_POST['entry'] as $k => $v)
 		{
 			// Only try to save if it's changed!
-			if ($_POST['entry'][$k] != $_POST['comp'][$k])
-				$save_strings[$k] = cleanLangString($v, false);
+			if ($_POST['entry'][$k] != $_POST['comp'][$k]) {
+							$save_strings[$k] = cleanLangString($v, false);
+			}
 		}
 	}
 
@@ -1030,12 +1064,13 @@ 
 		if ($multiline_cache)
 		{
 			preg_match('~\$(helptxt|txt|editortxt)\[\'(.+)\'\]\s?=\s?(.+);~ms', strtr($multiline_cache, array("\r" => '')), $matches);
-			if (!empty($matches[3]))
-				$entries[$matches[2]] = array(
+			if (!empty($matches[3])) {
+							$entries[$matches[2]] = array(
 					'type' => $matches[1],
 					'full' => $matches[0],
 					'entry' => $matches[3],
 				);
+			}
 		}
 
 		// These are the entries we can definitely save.
@@ -1046,8 +1081,9 @@ 
 		{
 			// Ignore some things we set separately.
 			$ignore_files = array('lang_character_set', 'lang_locale', 'lang_dictionary', 'lang_spelling', 'lang_rtl');
-			if (in_array($entryKey, $ignore_files))
-				continue;
+			if (in_array($entryKey, $ignore_files)) {
+							continue;
+			}
 
 			// These are arrays that need breaking out.
 			$arrays = array('days', 'days_short', 'months', 'months_titles', 'months_short', 'happy_birthday_author', 'karlbenson1_author', 'nite0859_author', 'zwaldowski_author', 'geezmo_author', 'karlbenson2_author');
@@ -1080,9 +1116,9 @@ 
 					{
 						$save_cache['entries'][$cur_index] = strtr($save_strings[$entryKey . '-+- ' . $cur_index], array('\'' => ''));
 						$save_cache['enabled'] = true;
+					} else {
+											$save_cache['entries'][$cur_index] = $subValue;
 					}
-					else
-						$save_cache['entries'][$cur_index] = $subValue;
 
 					$context['file_entries'][] = array(
 						'key' => $entryKey . '-+- ' . $cur_index,
@@ -1105,9 +1141,9 @@ 
 						{
 							$items[] = $k2 . ' => \'' . $v2 . '\'';
 							$cur_index = $k2;
+						} else {
+													$items[] = '\'' . $v2 . '\'';
 						}
-						else
-							$items[] = '\'' . $v2 . '\'';
 
 						$cur_index++;
 					}
@@ -1117,15 +1153,15 @@ 
 						'replace' => '$' . $entryValue['type'] . '[\'' . $entryKey . '\'] = array(' . implode(', ', $items) . ');',
 					);
 				}
-			}
-			else
+			} else
 			{
 				// Saving?
 				if (isset($save_strings[$entryKey]) && $save_strings[$entryKey] != $entryValue['entry'])
 				{
 					// @todo Fix this properly.
-					if ($save_strings[$entryKey] == '')
-						$save_strings[$entryKey] = '\'\'';
+					if ($save_strings[$entryKey] == '') {
+											$save_strings[$entryKey] = '\'\'';
+					}
 
 					// Set the new value.
 					$entryValue['entry'] = $save_strings[$entryKey];
@@ -1151,8 +1187,9 @@ 
 			checkSession();
 
 			$file_contents = implode('', file($current_file));
-			foreach ($final_saves as $save)
-				$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+			foreach ($final_saves as $save) {
+							$file_contents = strtr($file_contents, array($save['find'] => $save['replace']));
+			}
 
 			// Save the actual changes.
 			$fp = fopen($current_file, 'w+');
@@ -1167,8 +1204,9 @@ 
 	}
 
 	// If we saved, redirect.
-	if ($madeSave)
-		redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+	if ($madeSave) {
+			redirectexit('action=admin;area=languages;sa=editlang;lid=' . $context['lang_id']);
+	}
 
 	createToken('admin-mlang');
 }
@@ -1200,8 +1238,9 @@ 
 				// Toggle the escape.
 				$is_escape = !$is_escape;
 				// If we're now escaped don't add this string.
-				if ($is_escape)
-					continue;
+				if ($is_escape) {
+									continue;
+				}
 			}
 			// Special case - parsed string with line break etc?
 			elseif (($string{$i} == 'n' || $string{$i} == 't') && $in_string == 2 && $is_escape)
@@ -1218,11 +1257,13 @@ 
 				if ($in_string != 2 && ($in_string != 1 || !$is_escape))
 				{
 					// Is it the end of a single quote string?
-					if ($in_string == 1)
-						$in_string = 0;
+					if ($in_string == 1) {
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 1;
+					else {
+											$in_string = 1;
+					}
 
 					// Don't actually include this character!
 					continue;
@@ -1235,19 +1276,22 @@ 
 				if ($in_string != 1 && ($in_string != 2 || !$is_escape))
 				{
 					// Is it the end of a double quote string?
-					if ($in_string == 2)
-						$in_string = 0;
+					if ($in_string == 2) {
+											$in_string = 0;
+					}
 					// Otherwise it's the start!
-					else
-						$in_string = 2;
+					else {
+											$in_string = 2;
+					}
 
 					// Don't actually include this character!
 					continue;
 				}
 			}
 			// A join/space outside of a string is simply removed.
-			elseif ($in_string == 0 && (empty($string{$i}) || $string{$i} == '.'))
-				continue;
+			elseif ($in_string == 0 && (empty($string{$i}) || $string{$i} == '.')) {
+							continue;
+			}
 			// Start of a variable?
 			elseif ($in_string == 0 && $string{$i} == '$')
 			{
@@ -1281,8 +1325,7 @@ 
 
 		// Unhtml then rehtml the whole thing!
 		$new_string = $smcFunc['htmlspecialchars'](un_htmlspecialchars($new_string));
-	}
-	else
+	} else
 	{
 		// Keep track of what we're doing...
 		$in_string = 0;
@@ -1311,10 +1354,11 @@ 
 				preg_match('~\{%([\$A-Za-z0-9\'\[\]_-]+)%\}~', substr($string, $i), $matches);
 				if (!empty($matches[1]))
 				{
-					if ($in_string == 1)
-						$new_string .= '\' . ';
-					elseif ($new_string)
-						$new_string .= ' . ';
+					if ($in_string == 1) {
+											$new_string .= '\' . ';
+					} elseif ($new_string) {
+											$new_string .= ' . ';
+					}
 
 					$new_string .= $matches[1];
 					$i += strlen($matches[1]) + 3;
@@ -1327,8 +1371,9 @@ 
 			elseif ($string{$i} == '<')
 			{
 				// Probably HTML?
-				if ($string{$i + 1} != ' ')
-					$in_html = true;
+				if ($string{$i + 1} != ' ') {
+									$in_html = true;
+				}
 				// Assume we need an entity...
 				else
 				{
@@ -1340,8 +1385,9 @@ 
 			elseif ($string{$i} == '>')
 			{
 				// Will it be HTML?
-				if ($in_html)
-					$in_html = false;
+				if ($in_html) {
+									$in_html = false;
+				}
 				// Otherwise we need an entity...
 				else
 				{
@@ -1350,8 +1396,9 @@ 
 				}
 			}
 			// Is it a slash? If so escape it...
-			if ($string{$i} == '\\')
-				$new_string .= '\\';
+			if ($string{$i} == '\\') {
+							$new_string .= '\\';
+			}
 			// The infamous double quote?
 			elseif ($string{$i} == '"')
 			{
@@ -1374,10 +1421,11 @@ 
 		}
 
 		// If we ended as a string then close it off.
-		if ($in_string == 1)
-			$new_string .= '\'';
-		elseif ($in_string == 2)
-			$new_string .= '"';
+		if ($in_string == 1) {
+					$new_string .= '\'';
+		} elseif ($in_string == 2) {
+					$new_string .= '"';
+		}
 	}
 
 	return $new_string;

Sources/Errors.php

Braces +117 added lines, -83 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Log an error, if the error logging is enabled.
@@ -36,8 +37,9 @@ 
 	static $tried_hook = false;
 
 	// Check if error logging is actually on.
-	if (empty($modSettings['enableErrorLogging']))
-		return $error_message;
+	if (empty($modSettings['enableErrorLogging'])) {
+			return $error_message;
+	}
 
 	// Basically, htmlspecialchars it minus &. (for entities!)
 	$error_message = strtr($error_message, array('<' => '&lt;', '>' => '&gt;', '"' => '&quot;'));
@@ -45,22 +47,26 @@ 
 
 	// Add a file and line to the error message?
 	// Don't use the actual txt entries for file and line but instead use %1$s for file and %2$s for line
-	if ($file == null)
-		$file = '';
-	else
-		// Window style slashes don't play well, lets convert them to the unix style.
+	if ($file == null) {
+			$file = '';
+	} else {
+			// Window style slashes don't play well, lets convert them to the unix style.
 		$file = str_replace('\\', '/', $file);
+	}
 
-	if ($line == null)
-		$line = 0;
-	else
-		$line = (int) $line;
+	if ($line == null) {
+			$line = 0;
+	} else {
+			$line = (int) $line;
+	}
 
 	// Just in case there's no id_member or IP set yet.
-	if (empty($user_info['id']))
-		$user_info['id'] = 0;
-	if (empty($user_info['ip']))
-		$user_info['ip'] = '';
+	if (empty($user_info['id'])) {
+			$user_info['id'] = 0;
+	}
+	if (empty($user_info['ip'])) {
+			$user_info['ip'] = '';
+	}
 
 	// Find the best query string we can...
 	$query_string = empty($_SERVER['QUERY_STRING']) ? (empty($_SERVER['REQUEST_URL']) ? '' : str_replace($scripturl, '', $_SERVER['REQUEST_URL'])) : $_SERVER['QUERY_STRING'];
@@ -69,8 +75,9 @@ 
 	$query_string = $smcFunc['htmlspecialchars']((SMF == 'SSI' || SMF == 'BACKGROUND' ? '' : '?') . preg_replace(array('~;sesc=[^&;]+~', '~' . session_name() . '=' . session_id() . '[&;]~'), array(';sesc', ''), $query_string));
 
 	// Just so we know what board error messages are from.
-	if (isset($_POST['board']) && !isset($_GET['board']))
-		$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	if (isset($_POST['board']) && !isset($_GET['board'])) {
+			$query_string .= ($query_string == '' ? 'board=' : ';board=') . $_POST['board'];
+	}
 
 	// What types of categories do we have?
 	$known_error_types = array(
@@ -132,12 +139,14 @@ 
 	global $txt;
 
 	// Send the appropriate HTTP status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// We don't have $txt yet, but that's okay...
-	if (empty($txt))
-		die($error);
+	if (empty($txt)) {
+			die($error);
+	}
 
 	log_error_online($error, false);
 	setup_fatal_error_context($log ? log_error($error, $log) : $error);
@@ -164,8 +173,9 @@ 
 	static $fatal_error_called = false;
 
 	// Send the status header - set this to 0 or false if you don't want to send one at all
-	if (!empty($status))
-		send_http_status($status);
+	if (!empty($status)) {
+			send_http_status($status);
+	}
 
 	// Try to load a theme if we don't have one.
 	if (empty($context['theme_loaded']) && empty($fatal_error_called))
@@ -175,8 +185,9 @@ 
 	}
 
 	// If we have no theme stuff we can't have the language file...
-	if (empty($context['theme_loaded']))
-		die($error);
+	if (empty($context['theme_loaded'])) {
+			die($error);
+	}
 
 	$reload_lang_file = true;
 	// Log the error in the forum's language, but don't waste the time if we aren't logging
@@ -212,8 +223,9 @@ 
 	global $settings, $modSettings, $db_show_debug;
 
 	// Ignore errors if we're ignoring them or they are strict notices from PHP 5 (which cannot be solved without breaking PHP 4.)
-	if (error_reporting() == 0 || (defined('E_STRICT') && $error_level == E_STRICT && !empty($modSettings['enableErrorLogging'])))
-		return;
+	if (error_reporting() == 0 || (defined('E_STRICT') && $error_level == E_STRICT && !empty($modSettings['enableErrorLogging']))) {
+			return;
+	}
 
 	if (strpos($file, 'eval()') !== false && !empty($settings['current_include_filename']))
 	{
@@ -221,19 +233,22 @@ 
 		$count = count($array);
 		for ($i = 0; $i < $count; $i++)
 		{
-			if ($array[$i]['function'] != 'loadSubTemplate')
-				continue;
+			if ($array[$i]['function'] != 'loadSubTemplate') {
+							continue;
+			}
 
 			// This is a bug in PHP, with eval, it seems!
-			if (empty($array[$i]['args']))
-				$i++;
+			if (empty($array[$i]['args'])) {
+							$i++;
+			}
 			break;
 		}
 
-		if (isset($array[$i]) && !empty($array[$i]['args']))
-			$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
-		else
-			$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		if (isset($array[$i]) && !empty($array[$i]['args'])) {
+					$file = realpath($settings['current_include_filename']) . ' (' . $array[$i]['args'][0] . ' sub template - eval?)';
+		} else {
+					$file = realpath($settings['current_include_filename']) . ' (eval?)';
+		}
 	}
 
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -242,8 +257,9 @@ 
 		if ($error_level % 255 != E_ERROR)
 		{
 			$temporary = ob_get_contents();
-			if (substr($temporary, -2) == '="')
-				echo '"';
+			if (substr($temporary, -2) == '="') {
+							echo '"';
+			}
 		}
 
 		// Debugging!  This should look like a PHP error message.
@@ -259,23 +275,27 @@ 
 	call_integration_hook('integrate_output_error', array($message, $error_type, $error_level, $file, $line));
 
 	// Dying on these errors only causes MORE problems (blank pages!)
-	if ($file == 'Unknown')
-		return;
+	if ($file == 'Unknown') {
+			return;
+	}
 
 	// If this is an E_ERROR or E_USER_ERROR.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR)
-		obExit(false);
-	else
-		return;
+	if ($error_level % 255 == E_ERROR) {
+			obExit(false);
+	} else {
+			return;
+	}
 
 	// If this is an E_ERROR, E_USER_ERROR, E_WARNING, or E_USER_WARNING.... die.  Violently so.
-	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING)
-		fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	if ($error_level % 255 == E_ERROR || $error_level % 255 == E_WARNING) {
+			fatal_error(allowedTo('admin_forum') ? $message : $error_string, false);
+	}
 
 	// We should NEVER get to this point.  Any fatal error MUST quit, or very bad things can happen.
-	if ($error_level % 255 == E_ERROR)
-		die('No direct access...');
-}
+	if ($error_level % 255 == E_ERROR) {
+			die('No direct access...');
+	}
+	}
 
 /**
  * It is called by {@link fatal_error()} and {@link fatal_lang_error()}.
@@ -291,24 +311,28 @@ 
 
 	// Attempt to prevent a recursive loop.
 	++$level;
-	if ($level > 1)
-		return false;
+	if ($level > 1) {
+			return false;
+	}
 
 	// Maybe they came from dlattach or similar?
-	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded']))
-		loadTheme();
+	if (SMF != 'SSI' && SMF != 'BACKGROUND' && empty($context['theme_loaded'])) {
+			loadTheme();
+	}
 
 	// Don't bother indexing errors mate...
 	$context['robot_no_index'] = true;
 
-	if (!isset($context['error_title']))
-		$context['error_title'] = $txt['error_occured'];
+	if (!isset($context['error_title'])) {
+			$context['error_title'] = $txt['error_occured'];
+	}
 	$context['error_message'] = isset($context['error_message']) ? $context['error_message'] : $error_message;
 
 	$context['error_code'] = isset($error_code) ? 'id="' . $error_code . '" ' : '';
 
-	if (empty($context['page_title']))
-		$context['page_title'] = $context['error_title'];
+	if (empty($context['page_title'])) {
+			$context['page_title'] = $context['error_title'];
+	}
 
 	loadTemplate('Errors');
 	$context['sub_template'] = 'fatal_error';
@@ -316,23 +340,26 @@ 
 	// If this is SSI, what do they want us to do?
 	if (SMF == 'SSI')
 	{
-		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method))
-			$ssi_on_error_method();
-		elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			loadSubTemplate('fatal_error');
+		if (!empty($ssi_on_error_method) && $ssi_on_error_method !== true && is_callable($ssi_on_error_method)) {
+					$ssi_on_error_method();
+		} elseif (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					loadSubTemplate('fatal_error');
+		}
 
 		// No layers?
-		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true)
-			exit;
+		if (empty($ssi_on_error_method) || $ssi_on_error_method !== true) {
+					exit;
+		}
 	}
 	// Alternatively from the cron call?
 	elseif (SMF == 'BACKGROUND')
 	{
 		// We can't rely on even having language files available.
-		if (defined('FROM_CLI') && FROM_CLI)
-			echo 'cron error: ', $context['error_message'];
-		else
-			echo 'An error occurred. More information may be available in your logs.';
+		if (defined('FROM_CLI') && FROM_CLI) {
+					echo 'cron error: ', $context['error_message'];
+		} else {
+					echo 'An error occurred. More information may be available in your logs.';
+		}
 		exit;
 	}
 
@@ -360,8 +387,8 @@ 
 
 	set_fatal_error_headers();
 
-	if (!empty($maintenance))
-		echo '<!DOCTYPE html>
+	if (!empty($maintenance)) {
+			echo '<!DOCTYPE html>
 <html>
 	<head>
 		<meta name="robots" content="noindex">
@@ -372,6 +399,7 @@ 
 		', $mmessage, '
 	</body>
 </html>';
+	}
 
 	die();
 }
@@ -393,15 +421,17 @@ 
 	// For our purposes, we're gonna want this on if at all possible.
 	$modSettings['cache_enable'] = '1';
 
-	if (($temp = cache_get_data('db_last_error', 600)) !== null)
-		$db_last_error = max($db_last_error, $temp);
+	if (($temp = cache_get_data('db_last_error', 600)) !== null) {
+			$db_last_error = max($db_last_error, $temp);
+	}
 
 	if ($db_last_error < time() - 3600 * 24 * 3 && empty($maintenance) && !empty($db_error_send))
 	{
 		// Avoid writing to the Settings.php file if at all possible; use shared memory instead.
 		cache_put_data('db_last_error', time(), 600);
-		if (($temp = cache_get_data('db_last_error', 600)) === null)
-			logLastDatabaseError();
+		if (($temp = cache_get_data('db_last_error', 600)) === null) {
+					logLastDatabaseError();
+		}
 
 		// Language files aren't loaded yet :(.
 		$db_error = @$smcFunc['db_error']($db_connection);
@@ -482,12 +512,14 @@ 
 	global $smcFunc, $user_info, $modSettings;
 
 	// Don't bother if Who's Online is disabled.
-	if (empty($modSettings['who_enabled']))
-		return;
+	if (empty($modSettings['who_enabled'])) {
+			return;
+	}
 
 	// Maybe they came from SSI or similar where sessions are not recorded?
-	if (SMF == 'SSI' || SMF == 'BACKGROUND')
-		return;
+	if (SMF == 'SSI' || SMF == 'BACKGROUND') {
+			return;
+	}
 
 	$session_id = $user_info['is_guest'] ? 'ip' . $user_info['ip'] : session_id();
 
@@ -506,8 +538,9 @@ 
 		$url = smf_json_decode($url, true);
 		$url['error'] = $error;
 
-		if (!empty($sprintf))
-			$url['error_params'] = $sprintf;
+		if (!empty($sprintf)) {
+					$url['error_params'] = $sprintf;
+		}
 
 		$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_online
@@ -538,10 +571,11 @@ 
 
 	$protocol = preg_match('~HTTP/1\.[01]~i', $_SERVER['SERVER_PROTOCOL']) ? $_SERVER['SERVER_PROTOCOL'] : 'HTTP/1.0';
 
-	if (!isset($statuses[$code]))
-		header($protocol . ' 500 Internal Server Error');
-	else
-		header($protocol . ' ' . $code . ' ' . $statuses[$code]);
-}
+	if (!isset($statuses[$code])) {
+			header($protocol . ' 500 Internal Server Error');
+	} else {
+			header($protocol . ' ' . $code . ' ' . $statuses[$code]);
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/ManageServer.php

Braces +265 added lines, -204 removed lines

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

Sources/Profile-Actions.php

Braces +117 added lines, -86 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Activate an account.
@@ -48,8 +49,9 @@ 
 		logAction('approve_member', array('member' => $memID), 'admin');
 
 		// If we are doing approval, update the stats for the member just in case.
-		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15)))
-			updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		if (in_array($user_profile[$memID]['is_activated'], array(3, 4, 5, 13, 14, 15))) {
+					updateSettings(array('unapprovedMembers' => ($modSettings['unapprovedMembers'] > 1 ? $modSettings['unapprovedMembers'] - 1 : 0)));
+		}
 
 		// Make sure we update the stats too.
 		updateStats('member', false);
@@ -76,8 +78,9 @@ 
 	$issueErrors = array();
 
 	// Doesn't hurt to be overly cautious.
-	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning'))
-		fatal_lang_error('no_access', false);
+	if (empty($modSettings['warning_enable']) || ($context['user']['is_owner'] && !$cur_profile['warning']) || !allowedTo('issue_warning')) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the base (errors related) stuff done.
 	loadLanguage('Errors');
@@ -135,16 +138,18 @@ 
 
 		// This cannot be empty!
 		$_POST['warn_reason'] = isset($_POST['warn_reason']) ? trim($_POST['warn_reason']) : '';
-		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner'])
-			$issueErrors[] = 'warning_no_reason';
+		if ($_POST['warn_reason'] == '' && !$context['user']['is_owner']) {
+					$issueErrors[] = 'warning_no_reason';
+		}
 		$_POST['warn_reason'] = $smcFunc['htmlspecialchars']($_POST['warn_reason']);
 
 		$_POST['warning_level'] = (int) $_POST['warning_level'];
 		$_POST['warning_level'] = max(0, min(100, $_POST['warning_level']));
-		if ($_POST['warning_level'] < $context['min_allowed'])
-			$_POST['warning_level'] = $context['min_allowed'];
-		elseif ($_POST['warning_level'] > $context['max_allowed'])
-			$_POST['warning_level'] = $context['max_allowed'];
+		if ($_POST['warning_level'] < $context['min_allowed']) {
+					$_POST['warning_level'] = $context['min_allowed'];
+		} elseif ($_POST['warning_level'] > $context['max_allowed']) {
+					$_POST['warning_level'] = $context['max_allowed'];
+		}
 
 		// Do we actually have to issue them with a PM?
 		$id_notice = 0;
@@ -152,8 +157,9 @@ 
 		{
 			$_POST['warn_sub'] = trim($_POST['warn_sub']);
 			$_POST['warn_body'] = trim($_POST['warn_body']);
-			if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-				$issueErrors[] = 'warning_notify_blank';
+			if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+							$issueErrors[] = 'warning_notify_blank';
+			}
 			// Send the PM?
 			else
 			{
@@ -190,8 +196,8 @@ 
 		if (empty($issueErrors))
 		{
 			// Log what we've done!
-			if (!$context['user']['is_owner'])
-				$smcFunc['db_insert']('',
+			if (!$context['user']['is_owner']) {
+							$smcFunc['db_insert']('',
 					'{db_prefix}log_comments',
 					array(
 						'id_member' => 'int', 'member_name' => 'string', 'comment_type' => 'string', 'id_recipient' => 'int', 'recipient_name' => 'string-255',
@@ -203,14 +209,14 @@ 
 					),
 					array('id_comment')
 				);
+			}
 
 			// Make the change.
 			updateMemberData($memID, array('warning' => $_POST['warning_level']));
 
 			// Leave a lovely message.
 			$context['profile_updated'] = $context['user']['is_owner'] ? $txt['profile_updated_own'] : $txt['profile_warning_success'];
-		}
-		else
+		} else
 		{
 			// Try to remember some bits.
 			$context['warning_data'] = array(
@@ -229,8 +235,9 @@ 
 	{
 		$warning_body = !empty($_POST['warn_body']) ? trim(censorText($_POST['warn_body'])) : '';
 		$context['preview_subject'] = !empty($_POST['warn_sub']) ? trim($smcFunc['htmlspecialchars']($_POST['warn_sub'])) : '';
-		if (empty($_POST['warn_sub']) || empty($_POST['warn_body']))
-			$issueErrors[] = 'warning_notify_blank';
+		if (empty($_POST['warn_sub']) || empty($_POST['warn_body'])) {
+					$issueErrors[] = 'warning_notify_blank';
+		}
 
 		if (!empty($_POST['warn_body']))
 		{
@@ -254,8 +261,9 @@ 
 	{
 		// Fill in the suite of errors.
 		$context['post_errors'] = array();
-		foreach ($issueErrors as $error)
-			$context['post_errors'][] = $txt[$error];
+		foreach ($issueErrors as $error) {
+					$context['post_errors'][] = $txt[$error];
+		}
 	}
 
 
@@ -272,9 +280,10 @@ 
 		$modSettings['warning_mute'] => $txt['profile_warning_effect_mute'],
 	);
 	$context['current_level'] = 0;
-	foreach ($context['level_effects'] as $limit => $dummy)
-		if ($context['member']['warning'] >= $limit)
+	foreach ($context['level_effects'] as $limit => $dummy) {
+			if ($context['member']['warning'] >= $limit)
 			$context['current_level'] = $limit;
+	}
 
 	$listOptions = array(
 		'id' => 'view_warnings',
@@ -337,11 +346,12 @@ 
 							' . $warning['reason'] . '
 						</div>';
 
-						if (!empty($warning['id_notice']))
-							$ret .= '
+						if (!empty($warning['id_notice'])) {
+													$ret .= '
 						<div class="floatright">
 							<a href="' . $scripturl . '?action=moderate;area=notice;nid=' . $warning['id_notice'] . '" onclick="window.open(this.href, \'\', \'scrollbars=yes,resizable=yes,width=400,height=250\');return false;" target="_blank" class="new_win" title="' . $txt['profile_warning_previous_notice'] . '"><span class="generic_icons filter centericon"></span></a>
 						</div>';
+						}
 
 						return $ret;
 					},
@@ -413,8 +423,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If we're not warning for a message skip any that are.
-		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false)
-			continue;
+		if (!$context['warning_for_message'] && strpos($row['body'], '{MESSAGE}') !== false) {
+					continue;
+		}
 
 		$context['notification_templates'][] = array(
 			'title' => $row['template_title'],
@@ -424,16 +435,18 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Setup the "default" templates.
-	foreach (array('spamming', 'offence', 'insulting') as $type)
-		$context['notification_templates'][] = array(
+	foreach (array('spamming', 'offence', 'insulting') as $type) {
+			$context['notification_templates'][] = array(
 			'title' => $txt['profile_warning_notify_title_' . $type],
 			'body' => sprintf($txt['profile_warning_notify_template_outline' . (!empty($context['warning_for_message']) ? '_post' : '')], $txt['profile_warning_notify_for_' . $type]),
 		);
+	}
 
 	// Replace all the common variables in the templates.
-	foreach ($context['notification_templates'] as $k => $name)
-		$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
-}
+	foreach ($context['notification_templates'] as $k => $name) {
+			$context['notification_templates'][$k]['body'] = strtr($name['body'], array('{MEMBER}' => un_htmlspecialchars($context['member']['name']), '{MESSAGE}' => '[url=' . $scripturl . '?msg=' . $context['warning_for_message'] . ']' . un_htmlspecialchars($context['warned_message_subject']) . '[/url]', '{SCRIPTURL}' => $scripturl, '{FORUMNAME}' => $mbname, '{REGARDS}' => $txt['regards_team']));
+	}
+	}
 
 /**
  * Get the number of warnings a user has. Callback for $listOptions['get_count'] in issueWarning()
@@ -517,10 +530,11 @@ 
 {
 	global $txt, $context, $modSettings, $cur_profile;
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	// Permissions for removing stuff...
 	$context['can_delete_posts'] = !$context['user']['is_owner'] && allowedTo('moderate_forum');
@@ -547,10 +561,11 @@ 
 
 	// @todo Add a way to delete pms as well?
 
-	if (!$context['user']['is_owner'])
-		isAllowedTo('profile_remove_any');
-	elseif (!allowedTo('profile_remove_any'))
-		isAllowedTo('profile_remove_own');
+	if (!$context['user']['is_owner']) {
+			isAllowedTo('profile_remove_any');
+	} elseif (!allowedTo('profile_remove_any')) {
+			isAllowedTo('profile_remove_own');
+	}
 
 	checkSession();
 
@@ -576,8 +591,9 @@ 
 		list ($another) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($another))
-			fatal_lang_error('at_least_one_admin', 'critical');
+		if (empty($another)) {
+					fatal_lang_error('at_least_one_admin', 'critical');
+		}
 	}
 
 	// This file is needed for the deleteMembers function.
@@ -656,8 +672,9 @@ 
 					)
 				);
 				$topicIDs = array();
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$topicIDs[] = $row['id_topic'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$topicIDs[] = $row['id_topic'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				// Actually remove the topics. Ignore recycling if we want to perma-delete things...
@@ -680,8 +697,9 @@ 
 			// This could take a while... but ya know it's gonna be worth it in the end.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (function_exists('apache_reset_timeout'))
-					@apache_reset_timeout();
+				if (function_exists('apache_reset_timeout')) {
+									@apache_reset_timeout();
+				}
 
 				removeMessage($row['id_msg']);
 			}
@@ -689,8 +707,9 @@ 
 		}
 
 		// Only delete this poor members account if they are actually being booted out of camp.
-		if (isset($_POST['deleteAccount']))
-			deleteMembers($memID);
+		if (isset($_POST['deleteAccount'])) {
+					deleteMembers($memID);
+		}
 	}
 	// Do they need approval to delete?
 	elseif (!empty($modSettings['approveAccountDeletion']) && !allowedTo('moderate_forum'))
@@ -741,18 +760,18 @@ 
 		{
 			foreach ($costs as $duration => $cost)
 			{
-				if ($cost != 0)
-					$cost_array[$duration] = $cost;
+				if ($cost != 0) {
+									$cost_array[$duration] = $cost;
+				}
 			}
-		}
-		else
+		} else
 		{
 			$cost_array['fixed'] = $costs['fixed'];
 		}
 
-		if (empty($cost_array))
-			unset($context['subscriptions'][$id]);
-		else
+		if (empty($cost_array)) {
+					unset($context['subscriptions'][$id]);
+		} else
 		{
 			$context['subscriptions'][$id]['member'] = 0;
 			$context['subscriptions'][$id]['subscribed'] = false;
@@ -765,13 +784,15 @@ 
 	foreach ($gateways as $id => $gateway)
 	{
 		$gateways[$id] = new $gateway['display_class']();
-		if (!$gateways[$id]->gatewayEnabled())
-			unset($gateways[$id]);
+		if (!$gateways[$id]->gatewayEnabled()) {
+					unset($gateways[$id]);
+		}
 	}
 
 	// No gateways yet?
-	if (empty($gateways))
-		fatal_error($txt['paid_admin_not_setup_gateway']);
+	if (empty($gateways)) {
+			fatal_error($txt['paid_admin_not_setup_gateway']);
+	}
 
 	// Get the current subscriptions.
 	$request = $smcFunc['db_query']('', '
@@ -786,8 +807,9 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// The subscription must exist!
-		if (!isset($context['subscriptions'][$row['id_subscribe']]))
-			continue;
+		if (!isset($context['subscriptions'][$row['id_subscribe']])) {
+					continue;
+		}
 
 		$context['current'][$row['id_subscribe']] = array(
 			'id' => $row['id_sublog'],
@@ -801,8 +823,9 @@ 
 			'status_text' => $row['status'] == 0 ? ($row['payments_pending'] ? $txt['paid_pending'] : $txt['paid_finished']) : $txt['paid_active'],
 		);
 
-		if ($row['status'] == 1)
-			$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		if ($row['status'] == 1) {
+					$context['subscriptions'][$row['id_subscribe']]['subscribed'] = true;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -853,21 +876,25 @@ 
 	if (isset($_GET['confirm']) && isset($_POST['sub_id']) && is_array($_POST['sub_id']))
 	{
 		// Hopefully just one.
-		foreach ($_POST['sub_id'] as $k => $v)
-			$ID_SUB = (int) $k;
+		foreach ($_POST['sub_id'] as $k => $v) {
+					$ID_SUB = (int) $k;
+		}
 
-		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0)
-			fatal_lang_error('paid_sub_not_active');
+		if (!isset($context['subscriptions'][$ID_SUB]) || $context['subscriptions'][$ID_SUB]['active'] == 0) {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Simplify...
 		$context['sub'] = $context['subscriptions'][$ID_SUB];
 		$period = 'xx';
-		if ($context['sub']['flexible'])
-			$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		if ($context['sub']['flexible']) {
+					$period = isset($_POST['cur'][$ID_SUB]) && isset($context['sub']['costs'][$_POST['cur'][$ID_SUB]]) ? $_POST['cur'][$ID_SUB] : 'xx';
+		}
 
 		// Check we have a valid cost.
-		if ($context['sub']['flexible'] && $period == 'xx')
-			fatal_lang_error('paid_sub_not_active');
+		if ($context['sub']['flexible'] && $period == 'xx') {
+					fatal_lang_error('paid_sub_not_active');
+		}
 
 		// Sort out the cost/currency.
 		$context['currency'] = $modSettings['paid_currency_code'];
@@ -880,8 +907,7 @@ 
 			$context['cost'] = sprintf($modSettings['paid_currency_symbol'], $context['value']) . '/' . $txt[$_POST['cur'][$ID_SUB]];
 			// The period value for paypal.
 			$context['paypal_period'] = strtoupper(substr($_POST['cur'][$ID_SUB], 0, 1));
-		}
-		else
+		} else
 		{
 			// Real cost...
 			$context['value'] = $context['sub']['costs']['fixed'];
@@ -898,13 +924,15 @@ 
 		foreach ($gateways as $id => $gateway)
 		{
 			$fields = $gateways[$id]->fetchGatewayFields($context['sub']['id'] . '+' . $memID, $context['sub'], $context['value'], $period, $scripturl . '?action=profile;u=' . $memID . ';area=subscriptions;sub_id=' . $context['sub']['id'] . ';done');
-			if (!empty($fields['form']))
-				$context['gateways'][] = $fields;
+			if (!empty($fields['form'])) {
+							$context['gateways'][] = $fields;
+			}
 		}
 
 		// Bugger?!
-		if (empty($context['gateways']))
-			fatal_error($txt['paid_admin_not_setup_gateway']);
+		if (empty($context['gateways'])) {
+					fatal_error($txt['paid_admin_not_setup_gateway']);
+		}
 
 		// Now we are going to assume they want to take this out ;)
 		$new_data = array($context['sub']['id'], $context['value'], $period, 'prepay');
@@ -912,16 +940,19 @@ 
 		{
 			// What are the details like?
 			$current_pending = array();
-			if ($context['current'][$context['sub']['id']]['pending_details'] != '')
-				$current_pending = smf_json_decode($context['current'][$context['sub']['id']]['pending_details'], true);
+			if ($context['current'][$context['sub']['id']]['pending_details'] != '') {
+							$current_pending = smf_json_decode($context['current'][$context['sub']['id']]['pending_details'], true);
+			}
 			// Don't get silly.
-			if (count($current_pending) > 9)
-				$current_pending = array();
+			if (count($current_pending) > 9) {
+							$current_pending = array();
+			}
 			$pending_count = 0;
 			// Only record real pending payments as will otherwise confuse the admin!
-			foreach ($current_pending as $pending)
-				if ($pending[3] == 'payback')
+			foreach ($current_pending as $pending) {
+							if ($pending[3] == 'payback')
 					$pending_count++;
+			}
 
 			if (!in_array($new_data, $current_pending))
 			{
@@ -966,9 +997,9 @@ 
 
 		// Quit.
 		return;
+	} else {
+			$context['sub_template'] = 'user_subscription';
+	}
 	}
-	else
-		$context['sub_template'] = 'user_subscription';
-}
 
 ?>
\ No newline at end of file

Sources/ManageBans.php

Braces +258 added lines, -207 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Ban center. The main entrance point for all ban center functions.
@@ -120,10 +121,11 @@ 
 	}
 
 	// Create a date string so we don't overload them with date info.
-	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0]))
-		$context['ban_time_format'] = $user_info['time_format'];
-	else
-		$context['ban_time_format'] = $matches[0];
+	if (preg_match('~%[AaBbCcDdeGghjmuYy](?:[^%]*%[AaBbCcDdeGghjmuYy])*~', $user_info['time_format'], $matches) == 0 || empty($matches[0])) {
+			$context['ban_time_format'] = $user_info['time_format'];
+	} else {
+			$context['ban_time_format'] = $matches[0];
+	}
 
 	$listOptions = array(
 		'id' => 'ban_list',
@@ -201,16 +203,19 @@ 
 					'function' => function($rowData) use ($txt)
 					{
 						// This ban never expires...whahaha.
-						if ($rowData['expire_time'] === null)
-							return $txt['never'];
+						if ($rowData['expire_time'] === null) {
+													return $txt['never'];
+						}
 
 						// This ban has already expired.
-						elseif ($rowData['expire_time'] < time())
-							return sprintf('<span class="red">%1$s</span>', $txt['ban_expired']);
+						elseif ($rowData['expire_time'] < time()) {
+													return sprintf('<span class="red">%1$s</span>', $txt['ban_expired']);
+						}
 
 						// Still need to wait a few days for this ban to expire.
-						else
-							return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+						else {
+													return sprintf('%1$d&nbsp;%2$s', ceil(($rowData['expire_time'] - time()) / (60 * 60 * 24)), $txt['ban_days']);
+						}
 					},
 				),
 				'sort' => array(
@@ -309,8 +314,9 @@ 
 		)
 	);
 	$bans = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$bans[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$bans[] = $row;
+	}
 
 	$smcFunc['db_free_result']($request);
 
@@ -352,8 +358,9 @@ 
 {
 	global $txt, $modSettings, $context, $scripturl, $smcFunc, $sourcedir;
 
-	if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty($context['ban_errors']))
-		BanEdit2();
+	if ((isset($_POST['add_ban']) || isset($_POST['modify_ban']) || isset($_POST['remove_selection'])) && empty($context['ban_errors'])) {
+			BanEdit2();
+	}
 
 	$ban_group_id = isset($context['ban']['id']) ? $context['ban']['id'] : (isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0);
 
@@ -364,10 +371,10 @@ 
 
 	if (!empty($context['ban_errors']))
 	{
-		foreach ($context['ban_errors'] as $error)
-			$context['error_messages'][$error] = $txt[$error];
-	}
-	else
+		foreach ($context['ban_errors'] as $error) {
+					$context['error_messages'][$error] = $txt[$error];
+		}
+	} else
 	{
 		// If we're editing an existing ban, get it from the database.
 		if (!empty($ban_group_id))
@@ -403,12 +410,13 @@ 
 						'data' => array(
 							'function' => function($ban_item) use ($txt)
 							{
-								if (in_array($ban_item['type'], array('ip', 'hostname', 'email')))
-									return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
-								elseif ($ban_item['type'] == 'user')
-									return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
-								else
-									return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+								if (in_array($ban_item['type'], array('ip', 'hostname', 'email'))) {
+																	return '<strong>' . $txt[$ban_item['type']] . ':</strong>&nbsp;' . $ban_item[$ban_item['type']];
+								} elseif ($ban_item['type'] == 'user') {
+																	return '<strong>' . $txt['username'] . ':</strong>&nbsp;' . $ban_item['user']['link'];
+								} else {
+																	return '<strong>' . $txt['unknown'] . ':</strong>&nbsp;' . $ban_item['no_bantype_selected'];
+								}
 							},
 							'style' => 'text-align: left;',
 						),
@@ -546,8 +554,9 @@ 
 					$context['ban']['from_user'] = true;
 
 					// Would be nice if we could also ban the hostname.
-					if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup']))
-						$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+					if ((preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $context['ban_suggestions']['main_ip']) == 1 || isValidIPv6($context['ban_suggestions']['main_ip'])) && empty($modSettings['disableHostnameLookup'])) {
+											$context['ban_suggestions']['hostname'] = host_from_ip($context['ban_suggestions']['main_ip']);
+					}
 
 					$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
 				}
@@ -615,8 +624,9 @@ 
 			'items_per_page' => $items_per_page,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('ban_not_found', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('ban_not_found', false);
+	}
 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
@@ -653,18 +663,15 @@ 
 			{
 				$ban_items[$row['id_ban']]['type'] = 'ip';
 				$ban_items[$row['id_ban']]['ip'] = range2ip($row['ip_low'], $row['ip_high']);
-			}
-			elseif (!empty($row['hostname']))
+			} elseif (!empty($row['hostname']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'hostname';
 				$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
-			}
-			elseif (!empty($row['email_address']))
+			} elseif (!empty($row['email_address']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'email';
 				$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
-			}
-			elseif (!empty($row['id_member']))
+			} elseif (!empty($row['id_member']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'user';
 				$ban_items[$row['id_ban']]['user'] = array(
@@ -730,9 +737,10 @@ 
 	$search_list += array('ips_in_messages' => 'banLoadAdditionalIPsMember', 'ips_in_errors' => 'banLoadAdditionalIPsError');
 
 	$return = array();
-	foreach ($search_list as $key => $callable)
-		if (is_callable($callable))
+	foreach ($search_list as $key => $callable) {
+			if (is_callable($callable))
 			$return[$key] = call_user_func($callable, $member_id);
+	}
 
 	return $return;
 }
@@ -757,8 +765,9 @@ 
 			'current_user' => $member_id,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_ips[] = inet_dtop($row['poster_ip']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_ips[] = inet_dtop($row['poster_ip']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_ips;
@@ -783,8 +792,9 @@ 
 			'current_user' => $member_id,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-	    $error_ips[] = inet_dtop($row['ip']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+		    $error_ips[] = inet_dtop($row['ip']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $error_ips;
@@ -825,11 +835,13 @@ 
 		$ban_info['cannot']['login'] = !empty($ban_info['full_ban']) || empty($_POST['cannot_login']) ? 0 : 1;
 
 		// Adding a new ban group
-		if (empty($_REQUEST['bg']))
-			$ban_group_id = insertBanGroup($ban_info);
+		if (empty($_REQUEST['bg'])) {
+					$ban_group_id = insertBanGroup($ban_info);
+		}
 		// Editing an existing ban group
-		else
-			$ban_group_id = updateBanGroup($ban_info);
+		else {
+					$ban_group_id = updateBanGroup($ban_info);
+		}
 
 		if (is_numeric($ban_group_id))
 		{
@@ -840,9 +852,10 @@ 
 		$context['ban'] = $ban_info;
 	}
 
-	if (isset($_POST['ban_suggestions']))
-		// @TODO: is $_REQUEST['bi'] ever set?
+	if (isset($_POST['ban_suggestions'])) {
+			// @TODO: is $_REQUEST['bi'] ever set?
 		$saved_triggers = saveTriggers($_POST['ban_suggestions'], $ban_info['id'], isset($_REQUEST['u']) ? (int) $_REQUEST['u'] : 0, isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0);
+	}
 
 	// Something went wrong somewhere... Oh well, let's go back.
 	if (!empty($context['ban_errors']))
@@ -852,8 +865,9 @@ 
 		$context['ban_suggestions'] = array_merge($context['ban_suggestions'], getMemberData((int) $_REQUEST['u']));
 
 		// Not strictly necessary, but it's nice
-		if (!empty($context['ban_suggestions']['member']['id']))
-			$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+		if (!empty($context['ban_suggestions']['member']['id'])) {
+					$context['ban_suggestions']['other_ips'] = banLoadAdditionalIPs($context['ban_suggestions']['member']['id']);
+		}
 		return BanEdit();
 	}
 	$context['ban_suggestions']['saved_triggers'] = !empty($saved_triggers) ? $saved_triggers : array();
@@ -900,10 +914,11 @@ 
 
 	foreach ($suggestions as $key => $value)
 	{
-		if (is_array($value))
-			$triggers[$key] = $value;
-		else
-			$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
+		if (is_array($value)) {
+					$triggers[$key] = $value;
+		} else {
+					$triggers[$value] = !empty($_POST[$value]) ? $_POST[$value] : '';
+		}
 	}
 
 	$ban_triggers = validateTriggers($triggers);
@@ -911,16 +926,18 @@ 
 	// Time to save!
 	if (!empty($ban_triggers['ban_triggers']) && empty($context['ban_errors']))
 	{
-		if (empty($ban_id))
-			addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
-		else
-			updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		if (empty($ban_id)) {
+					addTriggers($ban_group, $ban_triggers['ban_triggers'], $ban_triggers['log_info']);
+		} else {
+					updateTriggers($ban_id, $ban_group, array_shift($ban_triggers['ban_triggers']), $ban_triggers['log_info']);
+		}
+	}
+	if (!empty($context['ban_errors'])) {
+			return $triggers;
+	} else {
+			return false;
+	}
 	}
-	if (!empty($context['ban_errors']))
-		return $triggers;
-	else
-		return false;
-}
 
 /**
  * This function removes a bunch of triggers based on ids
@@ -934,14 +951,17 @@ 
 {
 	global $smcFunc, $scripturl;
 
-	if ($group_id !== false)
-		$group_id = (int) $group_id;
+	if ($group_id !== false) {
+			$group_id = (int) $group_id;
+	}
 
-	if (empty($group_id) && empty($items_ids))
-		return false;
+	if (empty($group_id) && empty($items_ids)) {
+			return false;
+	}
 
-	if (!is_array($items_ids))
-		$items_ids = array($items_ids);
+	if (!is_array($items_ids)) {
+			$items_ids = array($items_ids);
+	}
 
 	$log_info = array();
 	$ban_items = array();
@@ -979,8 +999,7 @@ 
 					'bantype' => ($is_range ? 'ip_range' : 'main_ip'),
 					'value' => $ban_items[$row['id_ban']]['ip'],
 				);
-			}
-			elseif (!empty($row['hostname']))
+			} elseif (!empty($row['hostname']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'hostname';
 				$ban_items[$row['id_ban']]['hostname'] = str_replace('%', '*', $row['hostname']);
@@ -988,8 +1007,7 @@ 
 					'bantype' => 'hostname',
 					'value' => $row['hostname'],
 				);
-			}
-			elseif (!empty($row['email_address']))
+			} elseif (!empty($row['email_address']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'email';
 				$ban_items[$row['id_ban']]['email'] = str_replace('%', '*', $row['email_address']);
@@ -997,8 +1015,7 @@ 
 					'bantype' => 'email',
 					'value' => $ban_items[$row['id_ban']]['email'],
 				);
-			}
-			elseif (!empty($row['id_member']))
+			} elseif (!empty($row['id_member']))
 			{
 				$ban_items[$row['id_ban']]['type'] = 'user';
 				$ban_items[$row['id_ban']]['user'] = array(
@@ -1031,8 +1048,7 @@ 
 				'ban_group' => $group_id,
 			)
 		);
-	}
-	elseif (!empty($items_ids))
+	} elseif (!empty($items_ids))
 	{
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}ban_items
@@ -1057,13 +1073,15 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($group_ids))
-		$group_ids = array($group_ids);
+	if (!is_array($group_ids)) {
+			$group_ids = array($group_ids);
+	}
 
 	$group_ids = array_unique($group_ids);
 
-	if (empty($group_ids))
-		return false;
+	if (empty($group_ids)) {
+			return false;
+	}
 
 	$smcFunc['db_query']('', '
 		DELETE FROM {db_prefix}ban_groups
@@ -1087,21 +1105,23 @@ 
 {
 	global $smcFunc;
 
-	if (empty($ids))
-		$smcFunc['db_query']('truncate_table', '
+	if (empty($ids)) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_banned',
 			array(
 			)
 		);
-	else
+	} else
 	{
-		if (!is_array($ids))
-			$ids = array($ids);
+		if (!is_array($ids)) {
+					$ids = array($ids);
+		}
 
 		$ids = array_unique($ids);
 
-		if (empty($ids))
-			return false;
+		if (empty($ids)) {
+					return false;
+		}
 
 		$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_banned
@@ -1127,8 +1147,9 @@ 
 {
 	global $context, $smcFunc;
 
-	if (empty($triggers))
-		$context['ban_erros'][] = 'ban_empty_triggers';
+	if (empty($triggers)) {
+			$context['ban_erros'][] = 'ban_empty_triggers';
+	}
 
 	$ban_triggers = array();
 	$log_info = array();
@@ -1137,39 +1158,39 @@ 
 	{
 		if (!empty($value))
 		{
-			if ($key == 'member')
-				continue;
+			if ($key == 'member') {
+							continue;
+			}
 
 			if ($key == 'main_ip')
 			{
 				$value = trim($value);
 				$ip_parts = ip2range($value);
-				if (!checkExistingTriggerIP($ip_parts, $value))
-					$context['ban_erros'][] = 'invalid_ip';
-				else
+				if (!checkExistingTriggerIP($ip_parts, $value)) {
+									$context['ban_erros'][] = 'invalid_ip';
+				} else
 				{
 					$ban_triggers['main_ip'] = array(
 						'ip_low' => $ip_parts['low'],
 						'ip_high' => $ip_parts['high']
 					);
 				}
-			}
-			elseif ($key == 'hostname')
+			} elseif ($key == 'hostname')
 			{
-				if (preg_match('/[^\w.\-*]/', $value) == 1)
-					$context['ban_erros'][] = 'invalid_hostname';
-				else
+				if (preg_match('/[^\w.\-*]/', $value) == 1) {
+									$context['ban_erros'][] = 'invalid_hostname';
+				} else
 				{
 					// Replace the * wildcard by a MySQL wildcard %.
 					$value = substr(str_replace('*', '%', $value), 0, 255);
 
 					$ban_triggers['hostname']['hostname'] = $value;
 				}
-			}
-			elseif ($key == 'email')
+			} elseif ($key == 'email')
 			{
-				if (preg_match('/[^\w.\-\+*@]/', $value) == 1)
-					$context['ban_erros'][] = 'invalid_email';
+				if (preg_match('/[^\w.\-\+*@]/', $value) == 1) {
+									$context['ban_erros'][] = 'invalid_email';
+				}
 
 				// Check the user is not banning an admin.
 				$request = $smcFunc['db_query']('', '
@@ -1183,15 +1204,15 @@ 
 						'email' => $value,
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) != 0)
-					$context['ban_erros'][] = 'no_ban_admin';
+				if ($smcFunc['db_num_rows']($request) != 0) {
+									$context['ban_erros'][] = 'no_ban_admin';
+				}
 				$smcFunc['db_free_result']($request);
 
 				$value = substr(strtolower(str_replace('*', '%', $value)), 0, 255);
 
 				$ban_triggers['email']['email_address'] = $value;
-			}
-			elseif ($key == 'user')
+			} elseif ($key == 'user')
 			{
 				$user = preg_replace('~&amp;#(\d{4,5}|[2-9]\d{2,4}|1[2-9]\d);~', '&#$1;', $smcFunc['htmlspecialchars']($value, ENT_QUOTES));
 
@@ -1205,8 +1226,9 @@ 
 						'username' => $user,
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) == 0)
-					$context['ban_erros'][] = 'invalid_username';
+				if ($smcFunc['db_num_rows']($request) == 0) {
+									$context['ban_erros'][] = 'invalid_username';
+				}
 				list ($value, $isAdmin) = $smcFunc['db_fetch_row']($request);
 				$smcFunc['db_free_result']($request);
 
@@ -1214,25 +1236,25 @@ 
 				{
 					unset($value);
 					$context['ban_erros'][] = 'no_ban_admin';
+				} else {
+									$ban_triggers['user']['id_member'] = $value;
 				}
-				else
-					$ban_triggers['user']['id_member'] = $value;
-			}
-			elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
+			} elseif (in_array($key, array('ips_in_messages', 'ips_in_errors')))
 			{
 				// Special case, those two are arrays themselves
 				$values = array_unique($value);
 				// Don't add the main IP again.
-				if (isset($triggers['main_ip']))
-					$values = array_diff($values, array($triggers['main_ip']));
+				if (isset($triggers['main_ip'])) {
+									$values = array_diff($values, array($triggers['main_ip']));
+				}
 				unset($value);
 				foreach ($values as $val)
 				{
 					$val = trim($val);
 					$ip_parts = ip2range($val);
-					if (!checkExistingTriggerIP($ip_parts, $val))
-						$context['ban_erros'][] = 'invalid_ip';
-					else
+					if (!checkExistingTriggerIP($ip_parts, $val)) {
+											$context['ban_erros'][] = 'invalid_ip';
+					} else
 					{
 						$ban_triggers[$key][] = array(
 							'ip_low' => $ip_parts['low'],
@@ -1245,15 +1267,16 @@ 
 						);
 					}
 				}
+			} else {
+							$context['ban_erros'][] = 'no_bantype_selected';
 			}
-			else
-				$context['ban_erros'][] = 'no_bantype_selected';
 
-			if (isset($value) && !is_array($value))
-				$log_info[] = array(
+			if (isset($value) && !is_array($value)) {
+							$log_info[] = array(
 					'value' => $value,
 					'bantype' => $key,
 				);
+			}
 		}
 	}
 	return array('ban_triggers' => $ban_triggers, 'log_info' => $log_info);
@@ -1273,8 +1296,9 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_id_empty';
+	if (empty($group_id)) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -1299,18 +1323,21 @@ 
 	foreach ($triggers as $key => $trigger)
 	{
 		// Exceptions, exceptions, exceptions...always exceptions... :P
-		if (in_array($key, array('ips_in_messages', 'ips_in_errors')))
-			foreach ($trigger as $real_trigger)
+		if (in_array($key, array('ips_in_messages', 'ips_in_errors'))) {
+					foreach ($trigger as $real_trigger)
 				$insertTriggers[] = array_merge($values, $real_trigger);
-		else
-			$insertTriggers[] = array_merge($values, $trigger);
+		} else {
+					$insertTriggers[] = array_merge($values, $trigger);
+		}
 	}
 
-	if (empty($insertTriggers))
-		$context['ban_errors'][] = 'ban_no_triggers';
+	if (empty($insertTriggers)) {
+			$context['ban_errors'][] = 'ban_no_triggers';
+	}
 
-	if (!empty($context['ban_errors']))
-		return false;
+	if (!empty($context['ban_errors'])) {
+			return false;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}ban_items',
@@ -1338,15 +1365,19 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_item))
-		$context['ban_errors'][] = 'ban_ban_item_empty';
-	if (empty($group_id))
-		$context['ban_errors'][] = 'ban_id_empty';
-	if (empty($trigger))
-		$context['ban_errors'][] = 'ban_no_triggers';
+	if (empty($ban_item)) {
+			$context['ban_errors'][] = 'ban_ban_item_empty';
+	}
+	if (empty($group_id)) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
+	if (empty($trigger)) {
+			$context['ban_errors'][] = 'ban_no_triggers';
+	}
 
-	if (!empty($context['ban_errors']))
-		return;
+	if (!empty($context['ban_errors'])) {
+			return;
+	}
 
 	// Preset all values that are required.
 	$values = array(
@@ -1387,8 +1418,9 @@ 
  */
 function logTriggersUpdates($logs, $new = true, $removal = false)
 {
-	if (empty($logs))
-		return;
+	if (empty($logs)) {
+			return;
+	}
 
 	$log_name_map = array(
 		'main_ip' => 'ip_range',
@@ -1399,14 +1431,15 @@ 
 	);
 
 	// Log the addion of the ban entries into the moderation log.
-	foreach ($logs as $log)
-		logAction('ban' . ($removal == true ? 'remove' : ''), array(
+	foreach ($logs as $log) {
+			logAction('ban' . ($removal == true ? 'remove' : ''), array(
 			$log_name_map[$log['bantype']] => $log['value'],
 			'new' => empty($new) ? 0 : 1,
 			'remove' => empty($removal) ? 0 : 1,
 			'type' => $log['bantype'],
 		));
-}
+	}
+	}
 
 /**
  * Updates an existing ban group
@@ -1420,12 +1453,15 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_info['name']))
-		$context['ban_errors'][] = 'ban_name_empty';
-	if (empty($ban_info['id']))
-		$context['ban_errors'][] = 'ban_id_empty';
-	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	if (empty($ban_info['name'])) {
+			$context['ban_errors'][] = 'ban_name_empty';
+	}
+	if (empty($ban_info['id'])) {
+			$context['ban_errors'][] = 'ban_id_empty';
+	}
+	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login'])) {
+			$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	}
 
 	if (!empty($ban_info['id']))
 	{
@@ -1440,8 +1476,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 0)
-			$context['ban_errors'][] = 'ban_not_found';
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					$context['ban_errors'][] = 'ban_not_found';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1459,13 +1496,15 @@ 
 				'new_ban_name' => $ban_info['name'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 0)
-			$context['ban_errors'][] = 'ban_name_exists';
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					$context['ban_errors'][] = 'ban_name_exists';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($context['ban_errors']))
-		return $ban_info['id'];
+	if (!empty($context['ban_errors'])) {
+			return $ban_info['id'];
+	}
 
 	$smcFunc['db_query']('', '
 		UPDATE {db_prefix}ban_groups
@@ -1509,10 +1548,12 @@ 
 {
 	global $smcFunc, $context;
 
-	if (empty($ban_info['name']))
-		$context['ban_errors'][] = 'ban_name_empty';
-	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login']))
-		$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	if (empty($ban_info['name'])) {
+			$context['ban_errors'][] = 'ban_name_empty';
+	}
+	if (empty($ban_info['cannot']['access']) && empty($ban_info['cannot']['register']) && empty($ban_info['cannot']['post']) && empty($ban_info['cannot']['login'])) {
+			$context['ban_errors'][] = 'ban_unknown_restriction_type';
+	}
 
 	if (!empty($ban_info['name']))
 	{
@@ -1527,13 +1568,15 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) == 1)
-			$context['ban_errors'][] = 'ban_name_exists';
+		if ($smcFunc['db_num_rows']($request) == 1) {
+					$context['ban_errors'][] = 'ban_name_exists';
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($context['ban_errors']))
-		return;
+	if (!empty($context['ban_errors'])) {
+			return;
+	}
 
 	// Yes yes, we're ready to add now.
 	$ban_info['id'] = $smcFunc['db_insert']('',
@@ -1550,8 +1593,9 @@ 
 		1
 	);
 
-	if (empty($ban_info['id']))
-		$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+	if (empty($ban_info['id'])) {
+			$context['ban_errors'][] = 'impossible_insert_new_bangroup';
+	}
 
 	return $ban_info['id'];
 }
@@ -1576,24 +1620,24 @@ 
 	$ban_group = isset($_REQUEST['bg']) ? (int) $_REQUEST['bg'] : 0;
 	$ban_id = isset($_REQUEST['bi']) ? (int) $_REQUEST['bi'] : 0;
 
-	if (empty($ban_group))
-		fatal_lang_error('ban_not_found', false);
+	if (empty($ban_group)) {
+			fatal_lang_error('ban_not_found', false);
+	}
 
 	if (isset($_POST['add_new_trigger']) && !empty($_POST['ban_suggestions']))
 	{
 		saveTriggers($_POST['ban_suggestions'], $ban_group, 0, $ban_id);
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-	}
-	elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
+	} elseif (isset($_POST['edit_trigger']) && !empty($_POST['ban_suggestions']))
 	{
 		// The first replaces the old one, the others are added new (simplification, otherwise it would require another query and some work...)
 		saveTriggers(array_shift($_POST['ban_suggestions']), $ban_group, 0, $ban_id);
-		if (!empty($_POST['ban_suggestions']))
-			saveTriggers($_POST['ban_suggestions'], $ban_group);
+		if (!empty($_POST['ban_suggestions'])) {
+					saveTriggers($_POST['ban_suggestions'], $ban_group);
+		}
 
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
-	}
-	elseif (isset($_POST['edit_trigger']))
+	} elseif (isset($_POST['edit_trigger']))
 	{
 		removeBanTriggers($ban_id);
 		redirectexit('action=admin;area=ban;sa=edit' . (!empty($ban_group) ? ';bg=' . $ban_group : ''));
@@ -1624,8 +1668,7 @@ 
 			),
 			'is_new' => true,
 		);
-	}
-	else
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT
@@ -1642,8 +1685,9 @@ 
 				'ban_group' => $ban_group,
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) == 0)
-			fatal_lang_error('ban_not_found', false);
+		if ($smcFunc['db_num_rows']($request) == 0) {
+					fatal_lang_error('ban_not_found', false);
+		}
 		$row = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1692,8 +1736,9 @@ 
 		removeBanTriggers($_POST['remove']);
 
 		// Rehabilitate some members.
-		if ($_REQUEST['entity'] == 'member')
-			updateBanMembers();
+		if ($_REQUEST['entity'] == 'member') {
+					updateBanMembers();
+		}
 
 		// Make sure the ban cache is refreshed.
 		updateSettings(array('banLastUpdated' => time()));
@@ -1806,8 +1851,7 @@ 
 			'default' => 'bi.ip_low, bi.ip_high, bi.ip_low',
 			'reverse' => 'bi.ip_low DESC, bi.ip_high DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'hostname')
+	} elseif ($context['selected_entity'] === 'hostname')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'function' => function($rowData) use ($smcFunc)
@@ -1819,8 +1863,7 @@ 
 			'default' => 'bi.hostname',
 			'reverse' => 'bi.hostname DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'email')
+	} elseif ($context['selected_entity'] === 'email')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'function' => function($rowData) use ($smcFunc)
@@ -1832,8 +1875,7 @@ 
 			'default' => 'bi.email_address',
 			'reverse' => 'bi.email_address DESC',
 		);
-	}
-	elseif ($context['selected_entity'] === 'member')
+	} elseif ($context['selected_entity'] === 'member')
 	{
 		$listOptions['columns']['banned_entity']['data'] = array(
 			'sprintf' => array(
@@ -1897,8 +1939,9 @@ 
 		)
 	);
 	$ban_triggers = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$ban_triggers[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$ban_triggers[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $ban_triggers;
@@ -1954,8 +1997,9 @@ 
 		validateToken('admin-bl');
 
 		// 'Delete all entries' button was pressed.
-		if (!empty($_POST['removeAll']))
-			removeBanLogs();
+		if (!empty($_POST['removeAll'])) {
+					removeBanLogs();
+		}
 		// 'Delete selection' button was pressed.
 		else
 		{
@@ -2164,12 +2208,15 @@ 
 	$low = inet_dtop($low);
 	$high = inet_dtop($high);
 
-	if ($low == '255.255.255.255') return 'unknown';
-	if ($low == $high)
-	    return $low;
-	else
-	    return $low . '-' . $high;
-}
+	if ($low == '255.255.255.255') {
+		return 'unknown';
+	}
+	if ($low == $high) {
+		    return $low;
+	} else {
+		    return $low . '-' . $high;
+	}
+	}
 
 /**
  * Checks whether a given IP range already exists in the trigger list.
@@ -2245,15 +2292,17 @@ 
 	$memberEmailWild = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if ($row['id_member'])
-			$memberIDs[$row['id_member']] = $row['id_member'];
+		if ($row['id_member']) {
+					$memberIDs[$row['id_member']] = $row['id_member'];
+		}
 		if ($row['email_address'])
 		{
 			// Does it have a wildcard - if so we can't do a IN on it.
-			if (strpos($row['email_address'], '%') !== false)
-				$memberEmailWild[$row['email_address']] = $row['email_address'];
-			else
-				$memberEmails[$row['email_address']] = $row['email_address'];
+			if (strpos($row['email_address'], '%') !== false) {
+							$memberEmailWild[$row['email_address']] = $row['email_address'];
+			} else {
+							$memberEmails[$row['email_address']] = $row['email_address'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
@@ -2304,14 +2353,15 @@ 
 	}
 
 	// We welcome our new members in the realm of the banned.
-	if (!empty($newMembers))
-		$smcFunc['db_query']('', '
+	if (!empty($newMembers)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}log_online
 			WHERE id_member IN ({array_int:new_banned_members})',
 			array(
 				'new_banned_members' => $newMembers,
 			)
 		);
+	}
 
 	// Find members that are wrongfully marked as banned.
 	$request = $smcFunc['db_query']('', '
@@ -2338,9 +2388,10 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($updates))
-		foreach ($updates as $newStatus => $members)
+	if (!empty($updates)) {
+			foreach ($updates as $newStatus => $members)
 			updateMemberData($members, array('is_activated' => $newStatus));
+	}
 
 	// Update the latest member and our total members as banning may change them.
 	updateStats('member');

Sources/Subs-Sound.php

Braces +32 added lines, -20 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Creates a wave file that spells the letters of $word.
@@ -32,8 +33,9 @@ 
 	global $settings, $user_info;
 
 	// Allow max 2 requests per 20 seconds.
-	if (($ip = cache_get_data('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = cache_get_data('wave_file/' . $user_info['ip2'], 20)) > 2)
-		die(header('HTTP/1.1 400 Bad Request'));
+	if (($ip = cache_get_data('wave_file/' . $user_info['ip'], 20)) > 2 || ($ip2 = cache_get_data('wave_file/' . $user_info['ip2'], 20)) > 2) {
+			die(header('HTTP/1.1 400 Bad Request'));
+	}
 	cache_put_data('wave_file/' . $user_info['ip'], $ip ? $ip + 1 : 1, 20);
 	cache_put_data('wave_file/' . $user_info['ip2'], $ip2 ? $ip2 + 1 : 1, 20);
 
@@ -42,16 +44,19 @@ 
 	mt_srand(end($tmp));
 
 	// Try to see if there's a sound font in the user's language.
-	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav'))
-		$sound_language = $user_info['language'];
+	if (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.' . $user_info['language'] . '.wav')) {
+			$sound_language = $user_info['language'];
+	}
 
 	// English should be there.
-	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav'))
-		$sound_language = 'english';
+	elseif (file_exists($settings['default_theme_dir'] . '/fonts/sound/a.english.wav')) {
+			$sound_language = 'english';
+	}
 
 	// Guess not...
-	else
-		return false;
+	else {
+			return false;
+	}
 
 	// File names are in lower case so lets make sure that we are only using a lower case string
 	$word = strtolower($word);
@@ -61,20 +66,25 @@ 
 	for ($i = 0; $i < strlen($word); $i++)
 	{
 		$sound_letter = implode('', file($settings['default_theme_dir'] . '/fonts/sound/' . $word{$i} . '.' . $sound_language . '.wav'));
-		if (strpos($sound_letter, 'data') === false)
-			return false;
+		if (strpos($sound_letter, 'data') === false) {
+					return false;
+		}
 
 		$sound_letter = substr($sound_letter, strpos($sound_letter, 'data') + 8);
 		switch ($word{$i} === 's' ? 0 : mt_rand(0, 2))
 		{
-			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
+			case 0 : for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++) {
+								for ($k = 0, $m = round(mt_rand(15, 25) / 10);
+			}
+			$k < $m; $k++) {
+											$sound_word .= $word{$i} === 's' ? $sound_letter{$j} : chr(mt_rand(max(ord($sound_letter{$j}) - 1, 0x00), min(ord($sound_letter{$j}) + 1, 0xFF)));
+					}
 			break;
 
 			case 1:
-				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2)
-					$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j + 1} : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j} : $sound_letter{$j + 1}) . $sound_letter{$j + 1} . (mt_rand(0, 3) == 0 ? $sound_letter{$j + 1} : '');
+				for ($j = 0, $n = strlen($sound_letter) - 1; $j < $n; $j += 2) {
+									$sound_word .= (mt_rand(0, 3) == 0 ? '' : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j + 1} : $sound_letter{$j}) . (mt_rand(0, 3) === 0 ? $sound_letter{$j} : $sound_letter{$j + 1}) . $sound_letter{$j + 1} . (mt_rand(0, 3) == 0 ? $sound_letter{$j + 1} : '');
+				}
 				$sound_word .= str_repeat($sound_letter{$n}, 2);
 			break;
 
@@ -82,10 +92,12 @@ 
 				$shift = 0;
 				for ($j = 0, $n = strlen($sound_letter); $j < $n; $j++)
 				{
-					if (mt_rand(0, 10) === 0)
-						$shift += mt_rand(-3, 3);
-					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++)
-						$sound_word .= chr(min(max(ord($sound_letter{$j}) + $shift, 0x00), 0xFF));
+					if (mt_rand(0, 10) === 0) {
+											$shift += mt_rand(-3, 3);
+					}
+					for ($k = 0, $m = round(mt_rand(15, 25) / 10); $k < $m; $k++) {
+											$sound_word .= chr(min(max(ord($sound_letter{$j}) + $shift, 0x00), 0xFF));
+					}
 				}
 			break;
 

Sources/Themes.php

Braces +348 added lines, -271 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})');
@@ -578,13 +590,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;
@@ -593,30 +605,32 @@ 
 	foreach ($context['options'] as $i => $setting)
 	{
 		// Just skip separators
-		if (!is_array($setting))
-			continue;
+		if (!is_array($setting)) {
+					continue;
+		}
 
 		// Is this disabled?
 		if ($setting['id'] == 'calendar_start_day' && empty($modSettings['cal_enabled']))
 		{
 			unset($context['options'][$i]);
 			continue;
-		}
-		elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
+		} elseif (($setting['id'] == 'topics_per_page' || $setting['id'] == 'messages_per_page') && !empty($modSettings['disableCustomPerPage']))
 		{
 			unset($context['options'][$i]);
 			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']];
 	}
@@ -641,8 +655,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'];
 
@@ -653,8 +668,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']);
@@ -662,8 +678,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;
@@ -688,8 +705,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]);
+		}
 	}
 
 	// Submitting!
@@ -698,37 +716,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))
 		{
@@ -754,8 +780,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'];
@@ -764,18 +791,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']];
 	}
@@ -828,8 +858,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);
 
@@ -837,8 +868,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');
@@ -863,12 +895,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(',,' => ','));
@@ -903,18 +937,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?
@@ -992,8 +1029,9 @@ 
 		else
 		{
 			// The forum's default theme is always 0 and we
-			if (isset($_GET['th']) && $_GET['th'] == 0)
-					$_GET['th'] = $modSettings['theme_guests'];
+			if (isset($_GET['th']) && $_GET['th'] == 0) {
+								$_GET['th'] = $modSettings['theme_guests'];
+			}
 
 			updateMemberData((int) $_REQUEST['u'], array('id_theme' => (int) $_GET['th']));
 
@@ -1007,8 +1045,9 @@ 
 				);
 				cache_put_data('theme_settings-' . $_GET['th'] . ':' . (int) $_REQUEST['u'], null, 90);
 
-				if ($user_info['id'] == $_REQUEST['u'])
-					$_SESSION['id_variant'] = 0;
+				if ($user_info['id'] == $_REQUEST['u']) {
+									$_SESSION['id_variant'] = 0;
+				}
 			}
 
 			redirectexit('action=profile;u=' . (int) $_REQUEST['u'] . ';area=theme');
@@ -1077,12 +1116,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);
@@ -1095,9 +1135,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
@@ -1110,15 +1150,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);
 
@@ -1137,8 +1179,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);
 	}
 
@@ -1149,17 +1192,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'] = '';
@@ -1184,15 +1228,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.
@@ -1208,8 +1254,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'];
@@ -1258,14 +1305,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]();
@@ -1280,9 +1329,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.
@@ -1298,8 +1348,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);
@@ -1311,17 +1362,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);
@@ -1352,11 +1406,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.
@@ -1370,15 +1423,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(
@@ -1398,8 +1453,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);
@@ -1435,12 +1491,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);
@@ -1499,12 +1556,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);
@@ -1548,24 +1607,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.
@@ -1584,12 +1646,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',
@@ -1612,8 +1676,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']))
@@ -1629,8 +1694,9 @@ 
 	{
 		$options['admin_preferences'] = !empty($options['admin_preferences']) ? smf_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'] = json_encode($options['admin_preferences']);
@@ -1660,8 +1726,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');
@@ -1675,11 +1742,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';
@@ -1694,22 +1761,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'] = '';
+				}
 			}
 		}
 
@@ -1728,37 +1797,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")));
 
@@ -1770,10 +1841,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))
@@ -1794,10 +1866,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']);
 
@@ -1820,17 +1893,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);
 		}
@@ -1844,8 +1917,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' => '');
 			}
 
@@ -1854,8 +1928,7 @@ 
 		}
 
 		$context['entire_file'] = $smcFunc['htmlspecialchars'](strtr(implode('', $file_data), array("\t" => '   ')));
-	}
-	else
+	} else
 	{
 		$context['sub_template'] = 'edit_file';
 
@@ -1881,8 +1954,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']);
@@ -1890,25 +1964,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));
@@ -1923,16 +1996,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();
 
@@ -1940,21 +2015,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())