SimpleMachines / SMF2.1

Sources/ManageSearch.php

Braces +109 added lines, -90 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main entry point for the admin search settings screen.
@@ -107,11 +108,13 @@ 
 	// Perhaps the search method wants to add some settings?
 	require_once($sourcedir . '/Search.php');
 	$searchAPI = findSearchAPI();
-	if (is_callable(array($searchAPI, 'searchSettings')))
-		call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	if (is_callable(array($searchAPI, 'searchSettings'))) {
+			call_user_func_array(array($searchAPI, 'searchSettings'), array(&$config_vars));
+	}
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	$context['page_title'] = $txt['search_settings_title'];
 	$context['sub_template'] = 'show_settings';
@@ -126,8 +129,9 @@ 
 
 		call_integration_hook('integrate_save_search_settings');
 
-		if (empty($_POST['search_results_per_page']))
-			$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		if (empty($_POST['search_results_per_page'])) {
+					$_POST['search_results_per_page'] = !empty($modSettings['search_results_per_page']) ? $modSettings['search_results_per_page'] : $modSettings['defaultMaxMessages'];
+		}
 		saveDBSettings($config_vars);
 		$_SESSION['adm-save'] = true;
 		redirectexit('action=admin;area=managesearch;sa=settings;' . $context['session_var'] . '=' . $context['session_id']);
@@ -177,17 +181,20 @@ 
 		call_integration_hook('integrate_save_search_weights');
 
 		$changes = array();
-		foreach ($factors as $factor)
-			$changes[$factor] = (int) $_POST[$factor];
+		foreach ($factors as $factor) {
+					$changes[$factor] = (int) $_POST[$factor];
+		}
 		updateSettings($changes);
 	}
 
 	$context['relative_weights'] = array('total' => 0);
-	foreach ($factors as $factor)
-		$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	foreach ($factors as $factor) {
+			$context['relative_weights']['total'] += isset($modSettings[$factor]) ? $modSettings[$factor] : 0;
+	}
 
-	foreach ($factors as $factor)
-		$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	foreach ($factors as $factor) {
+			$context['relative_weights'][$factor] = round(100 * (isset($modSettings[$factor]) ? $modSettings[$factor] : 0) / $context['relative_weights']['total'], 1);
+	}
 
 	createToken('admin-msw');
 }
@@ -215,8 +222,9 @@ 
 	$context['search_apis'] = loadSearchAPIs();
 
 	// Detect whether a fulltext index is set.
-	if ($context['supports_fulltext'])
-		detectFulltextIndex();
+	if ($context['supports_fulltext']) {
+			detectFulltextIndex();
+	}
 
 	if (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'createfulltext')
 	{
@@ -252,8 +260,7 @@ 
 					'language' => $language_ftx
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Make sure it's gone before creating it.
 			$smcFunc['db_query']('', '
@@ -273,8 +280,7 @@ 
 		}
 
 		$context['fulltext_index'] = 'body';
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removefulltext' && !empty($context['fulltext_index']))
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -291,12 +297,12 @@ 
 		$context['fulltext_index'] = '';
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'fulltext') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
+		}
+	} elseif (!empty($_REQUEST['sa']) && $_REQUEST['sa'] == 'removecustom')
 	{
 		checkSession('get');
 		validateToken('admin-msm', 'get');
@@ -318,12 +324,12 @@ 
 		));
 
 		// Go back to the default search method.
-		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-			updateSettings(array(
+		if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+					updateSettings(array(
 				'search_index' => '',
 			));
-	}
-	elseif (isset($_POST['save']))
+		}
+	} elseif (isset($_POST['save']))
 	{
 		checkSession();
 		validateToken('admin-msmpost');
@@ -345,8 +351,8 @@ 
 	// Get some info about the messages table, to show its size and index size.
 	if ($db_type == 'mysql' || $db_type == 'mysqli')
 	{
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -355,14 +361,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -374,8 +381,8 @@ 
 		}
 
 		// Now check the custom index table, if it exists at all.
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				FROM {string:database_name}
 				LIKE {string:table_name}',
@@ -384,14 +391,15 @@ 
 					'table_name' => str_replace('_', '\_', $match[2]) . 'log_search_words',
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW TABLE STATUS
 				LIKE {string:table_name}',
 				array(
 					'table_name' => str_replace('_', '\_', $db_prefix) . 'log_search_words',
 				)
 			);
+		}
 		if ($request !== false && $smcFunc['db_num_rows']($request) == 1)
 		{
 			// Only do this if the user has permission to execute this query.
@@ -400,8 +408,7 @@ 
 			$context['table_info']['custom_index_length'] = $row['Data_length'] + $row['Index_length'];
 			$smcFunc['db_free_result']($request);
 		}
-	}
-	elseif ($db_type == 'postgresql')
+	} elseif ($db_type == 'postgresql')
 	{
 		// In order to report the sizes correctly we need to perform vacuum (optimize) on the tables we will be using.
 		//db_extend();
@@ -443,38 +450,38 @@ 
 					$context['table_info']['data_length'] = (int) $row['table_size'];
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['fulltext_length'] = (int) $row['index_size'];
-				}
-				elseif ($row['indexname'] == $db_prefix . 'log_search_words')
+				} elseif ($row['indexname'] == $db_prefix . 'log_search_words')
 				{
 					$context['table_info']['index_length'] = (int) $row['index_size'];
 					$context['table_info']['custom_index_length'] = (int) $row['index_size'];
 				}
 			}
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			// Didn't work for some reason...
+		} else {
+					// Didn't work for some reason...
 			$context['table_info'] = array(
 				'data_length' => $txt['not_applicable'],
 				'index_length' => $txt['not_applicable'],
 				'fulltext_length' => $txt['not_applicable'],
 				'custom_index_length' => $txt['not_applicable'],
 			);
-	}
-	else
-		$context['table_info'] = array(
+		}
+	} else {
+			$context['table_info'] = array(
 			'data_length' => $txt['not_applicable'],
 			'index_length' => $txt['not_applicable'],
 			'fulltext_length' => $txt['not_applicable'],
 			'custom_index_length' => $txt['not_applicable'],
 		);
+	}
 
 	// Format the data and index length in kilobytes.
 	foreach ($context['table_info'] as $type => $size)
 	{
 		// If it's not numeric then just break.  This database engine doesn't support size.
-		if (!is_numeric($size))
-			break;
+		if (!is_numeric($size)) {
+					break;
+		}
 
 		$context['table_info'][$type] = comma_format($context['table_info'][$type] / 1024) . ' ' . $txt['search_method_kilobytes'];
 	}
@@ -503,8 +510,9 @@ 
 
 	// Scotty, we need more time...
 	@set_time_limit(600);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'method';
 	$context['page_title'] = $txt['search_index_custom'];
@@ -534,8 +542,7 @@ 
 		$context['start'] = (int) $context['index_settings']['resume_at'];
 		unset($context['index_settings']['resume_at']);
 		$context['step'] = 1;
-	}
-	else
+	} else
 	{
 		$context['index_settings'] = array(
 			'bytes_per_word' => isset($_REQUEST['bytes_per_word']) && isset($index_properties[$_REQUEST['bytes_per_word']]) ? (int) $_REQUEST['bytes_per_word'] : 2,
@@ -544,12 +551,14 @@ 
 		$context['step'] = isset($_REQUEST['step']) ? (int) $_REQUEST['step'] : 0;
 
 		// admin timeouts are painful when building these long indexes - but only if we actually have such things enabled
-		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1)
-			$_SESSION['admin_time'] = time();
+		if (empty($modSettings['securityDisable']) && $_SESSION['admin_time'] + 3300 < time() && $context['step'] >= 1) {
+					$_SESSION['admin_time'] = time();
+		}
 	}
 
-	if ($context['step'] !== 0)
-		checkSession('request');
+	if ($context['step'] !== 0) {
+			checkSession('request');
+	}
 
 	// Step 0: let the user determine how they like their index.
 	if ($context['step'] === 0)
@@ -578,12 +587,14 @@ 
 			$smcFunc['db_create_word_search']($index_properties[$context['index_settings']['bytes_per_word']]['column_definition']);
 
 			// Temporarily switch back to not using a search index.
-			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom')
-				updateSettings(array('search_index' => ''));
+			if (!empty($modSettings['search_index']) && $modSettings['search_index'] == 'custom') {
+							updateSettings(array('search_index' => ''));
+			}
 
 			// Don't let simultanious processes be updating the search index.
-			if (!empty($modSettings['search_custom_index_config']))
-				updateSettings(array('search_custom_index_config' => ''));
+			if (!empty($modSettings['search_custom_index_config'])) {
+							updateSettings(array('search_custom_index_config' => ''));
+			}
 		}
 
 		$num_messages = array(
@@ -599,16 +610,16 @@ 
 				'starting_id' => $context['start'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$num_messages[empty($row['todo']) ? 'done' : 'todo'] = $row['num_messages'];
+		}
 
 		if (empty($num_messages['todo']))
 		{
 			$context['step'] = 2;
 			$context['percentage'] = 80;
 			$context['start'] = 0;
-		}
-		else
+		} else
 		{
 			// Number of seconds before the next step.
 			$stop = time() + 3;
@@ -649,21 +660,22 @@ 
 
 				$context['start'] += $forced_break ? $number_processed : $messages_per_batch;
 
-				if (!empty($inserts))
-					$smcFunc['db_insert']('ignore',
+				if (!empty($inserts)) {
+									$smcFunc['db_insert']('ignore',
 						'{db_prefix}log_search_words',
 						array('id_word' => 'int', 'id_msg' => 'int'),
 						$inserts,
 						array('id_word', 'id_msg')
 					);
+				}
 				if ($num_messages['todo'] === 0)
 				{
 					$context['step'] = 2;
 					$context['start'] = 0;
 					break;
+				} else {
+									updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 				}
-				else
-					updateSettings(array('search_custom_index_resume' => json_encode(array_merge($context['index_settings'], array('resume_at' => $context['start'])))));
 			}
 
 			// Since there are still two steps to go, 80% is the maximum here.
@@ -674,9 +686,9 @@ 
 	// Step 2: removing the words that occur too often and are of no use.
 	elseif ($context['step'] === 2)
 	{
-		if ($context['index_settings']['bytes_per_word'] < 4)
-			$context['step'] = 3;
-		else
+		if ($context['index_settings']['bytes_per_word'] < 4) {
+					$context['step'] = 3;
+		} else
 		{
 			$stop_words = $context['start'] === 0 || empty($modSettings['search_stopwords']) ? array() : explode(',', $modSettings['search_stopwords']);
 			$stop = time() + 3;
@@ -697,20 +709,22 @@ 
 						'minimum_messages' => $max_messages,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					$stop_words[] = $row['id_word'];
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									$stop_words[] = $row['id_word'];
+				}
 				$smcFunc['db_free_result']($request);
 
 				updateSettings(array('search_stopwords' => implode(',', $stop_words)));
 
-				if (!empty($stop_words))
-					$smcFunc['db_query']('', '
+				if (!empty($stop_words)) {
+									$smcFunc['db_query']('', '
 						DELETE FROM {db_prefix}log_search_words
 						WHERE id_word in ({array_int:stop_words})',
 						array(
 							'stop_words' => $stop_words,
 						)
 					);
+				}
 
 				$context['start'] += $index_properties[$context['index_settings']['bytes_per_word']]['step_size'];
 				if ($context['start'] > $index_properties[$context['index_settings']['bytes_per_word']]['max_size'])
@@ -771,8 +785,9 @@ 
 					$searchAPI = new $search_class_name();
 
 					// No Support?  NEXT!
-					if (!$searchAPI->is_supported)
-						continue;
+					if (!$searchAPI->is_supported) {
+											continue;
+					}
 
 					$apis[$index_name] = array(
 						'filename' => $file,
@@ -819,10 +834,10 @@ 
 				'messages_ftx' => $db_prefix . 'messages_ftx',
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['fulltext_index'][] = $row['indexname'];
-	}
-	else
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['fulltext_index'][] = $row['indexname'];
+		}
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SHOW INDEX
@@ -833,17 +848,19 @@ 
 		$context['fulltext_index'] = '';
 		if ($request !== false || $smcFunc['db_num_rows']($request) != 0)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if ($row['Column_name'] == 'body' && (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT' || isset($row['Comment']) && $row['Comment'] == 'FULLTEXT'))
 				$context['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (is_array($context['fulltext_index']))
-				$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			if (is_array($context['fulltext_index'])) {
+							$context['fulltext_index'] = array_unique($context['fulltext_index']);
+			}
 		}
 
-		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0)
-			$request = $smcFunc['db_query']('', '
+		if (preg_match('~^`(.+?)`\.(.+?)$~', $db_prefix, $match) !== 0) {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			FROM {string:database_name}
 			LIKE {string:table_name}',
@@ -852,20 +869,22 @@ 
 				'table_name' => str_replace('_', '\_', $match[2]) . 'messages',
 			)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 			SHOW TABLE STATUS
 			LIKE {string:table_name}',
 			array(
 				'table_name' => str_replace('_', '\_', $db_prefix) . 'messages',
 			)
 			);
+		}
 
 		if ($request !== false)
 		{
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-			if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+						if (isset($row['Engine']) && strtolower($row['Engine']) != 'myisam' && !(strtolower($row['Engine']) == 'innodb' && version_compare($smcFunc['db_get_version'], '5.6.4', '>=')))
 				$context['cannot_create_fulltext'] = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}

Sources/DbExtra-mysql.php

Braces +66 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the functions implemented in this file to the $smcFunc array.
@@ -23,8 +24,8 @@ 
 {
 	global $smcFunc;
 
-	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table')
-		$smcFunc += array(
+	if (!isset($smcFunc['db_backup_table']) || $smcFunc['db_backup_table'] != 'smf_db_backup_table') {
+			$smcFunc += array(
 			'db_backup_table' => 'smf_db_backup_table',
 			'db_optimize_table' => 'smf_db_optimize_table',
 			'db_table_sql' => 'smf_db_table_sql',
@@ -32,7 +33,8 @@ 
 			'db_get_version' => 'smf_db_get_version',
 			'db_get_engine' => 'smf_db_get_engine',
 		);
-}
+	}
+	}
 
 /**
  * Backup $table to $backup_table.
@@ -74,8 +76,9 @@ 
 			));
 
 		// Old school or no school?
-		if ($request)
-			return $request;
+		if ($request) {
+					return $request;
+		}
 	}
 
 	// At this point, the quick method failed.
@@ -99,8 +102,9 @@ 
 	foreach ($create as $k => $l)
 	{
 		// Get the name of the auto_increment column.
-		if (strpos($l, 'auto_increment'))
-			$auto_inc = trim($l);
+		if (strpos($l, 'auto_increment')) {
+					$auto_inc = trim($l);
+		}
 
 		// For the engine type, see if we can work out what it is.
 		if (strpos($l, 'ENGINE') !== false || strpos($l, 'TYPE') !== false)
@@ -108,30 +112,36 @@ 
 			// Extract the engine type.
 			preg_match('~(ENGINE|TYPE)=(\w+)(\sDEFAULT)?(\sCHARSET=(\w+))?(\sCOLLATE=(\w+))?~', $l, $match);
 
-			if (!empty($match[1]))
-				$engine = $match[1];
+			if (!empty($match[1])) {
+							$engine = $match[1];
+			}
 
-			if (!empty($match[2]))
-				$engine = $match[2];
+			if (!empty($match[2])) {
+							$engine = $match[2];
+			}
 
-			if (!empty($match[5]))
-				$charset = $match[5];
+			if (!empty($match[5])) {
+							$charset = $match[5];
+			}
 
-			if (!empty($match[7]))
-				$collate = $match[7];
+			if (!empty($match[7])) {
+							$collate = $match[7];
+			}
 		}
 
 		// Skip everything but keys...
-		if (strpos($l, 'KEY') === false)
-			unset($create[$k]);
+		if (strpos($l, 'KEY') === false) {
+					unset($create[$k]);
+		}
 	}
 
-	if (!empty($create))
-		$create = '(
+	if (!empty($create)) {
+			$create = '(
 			' . implode('
 			', $create) . ')';
-	else
-		$create = '';
+	} else {
+			$create = '';
+	}
 
 	$request = $smcFunc['db_query']('', '
 		CREATE TABLE {raw:backup_table} {raw:create}
@@ -150,8 +160,9 @@ 
 
 	if ($auto_inc != '')
 	{
-		if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',')
-			$auto_inc = substr($auto_inc, 0, -1);
+		if (preg_match('~\`(.+?)\`\s~', $auto_inc, $match) != 0 && substr($auto_inc, -1, 1) == ',') {
+					$auto_inc = substr($auto_inc, 0, -1);
+		}
 
 		$smcFunc['db_query']('', '
 			ALTER TABLE {raw:backup_table}
@@ -195,8 +206,9 @@ 
 				'table' => $table,
 			)
 		);
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	// How much left?
 	$request = $smcFunc['db_query']('', '
@@ -239,8 +251,9 @@ 
 		)
 	);
 	$tables = array();
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$tables[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$tables[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $tables;
@@ -284,8 +297,9 @@ 
 		if (!empty($row['Default']) || $row['Null'] !== 'YES')
 		{
 			// Make a special case of auto-timestamp.
-			if ($row['Default'] == 'CURRENT_TIMESTAMP')
-				$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+			if ($row['Default'] == 'CURRENT_TIMESTAMP') {
+							$schema_create .= ' /*!40102 NOT NULL default CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP */';
+			}
 			// Text shouldn't have a default.
 			elseif ($row['Default'] !== null)
 			{
@@ -320,14 +334,16 @@ 
 		$row['Key_name'] = $row['Key_name'] == 'PRIMARY' ? 'PRIMARY KEY' : (empty($row['Non_unique']) ? 'UNIQUE ' : ($row['Comment'] == 'FULLTEXT' || (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') ? 'FULLTEXT ' : 'KEY ')) . '`' . $row['Key_name'] . '`';
 
 		// Is this the first column in the index?
-		if (empty($indexes[$row['Key_name']]))
-			$indexes[$row['Key_name']] = array();
+		if (empty($indexes[$row['Key_name']])) {
+					$indexes[$row['Key_name']] = array();
+		}
 
 		// A sub part, like only indexing 15 characters of a varchar.
-		if (!empty($row['Sub_part']))
-			$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`(' . $row['Sub_part'] . ')';
-		else
-			$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+		if (!empty($row['Sub_part'])) {
+					$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`(' . $row['Sub_part'] . ')';
+		} else {
+					$indexes[$row['Key_name']][$row['Seq_in_index']] = '`' . $row['Column_name'] . '`';
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -365,8 +381,9 @@ 
 {
 	static $ver;
 
-	if (!empty($ver))
-		return $ver;
+	if (!empty($ver)) {
+			return $ver;
+	}
 
 	global $smcFunc;
 
@@ -391,8 +408,9 @@ 
 	global $smcFunc;
 	static $db_type;
 
-	if (!empty($db_type))
-		return $db_type;
+	if (!empty($db_type)) {
+			return $db_type;
+	}
 
 	$request = $smcFunc['db_query']('', 'SELECT @@version_comment');
 	list ($comment) = $smcFunc['db_fetch_row']($request);
@@ -401,13 +419,15 @@ 
 	// Skip these if we don't have a comment.
 	if (!empty($comment))
 	{
-		if (stripos($comment, 'percona') !== false)
-			return 'Percona';
-		if (stripos($comment, 'mariadb') !== false)
-			return 'MariaDB';
+		if (stripos($comment, 'percona') !== false) {
+					return 'Percona';
+		}
+		if (stripos($comment, 'mariadb') !== false) {
+					return 'MariaDB';
+		}
+	} else {
+			return 'fail';
 	}
-	else
-		return 'fail';
 
 	return 'MySQL';
 }

Sources/DbPackages-mysql.php

Braces +127 added lines, -101 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Add the file functions to the $smcFunc array.
@@ -52,8 +53,9 @@ 
 		'messages', 'moderators', 'package_servers', 'permission_profiles', 'permissions', 'personal_messages',
 		'pm_recipients', 'poll_choices', 'polls', 'scheduled_tasks', 'sessions', 'settings', 'smileys',
 		'themes', 'topics');
-	foreach ($reservedTables as $k => $table_name)
-		$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	foreach ($reservedTables as $k => $table_name) {
+			$reservedTables[$k] = strtolower($db_prefix . $table_name);
+	}
 
 	// We in turn may need the extra stuff.
 	db_extend('extra');
@@ -105,8 +107,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// First - no way do we touch SMF tables.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Log that we'll want to remove this on uninstall.
 	$db_package_log[] = array('remove_table', $table_name);
@@ -116,16 +119,18 @@ 
 	if (in_array($full_table_name, $tables))
 	{
 		// This is a sad day... drop the table? If not, return false (error) by default.
-		if ($if_exists == 'overwrite')
-			$smcFunc['db_drop_table']($table_name);
-		else
-			return $if_exists == 'ignore';
+		if ($if_exists == 'overwrite') {
+					$smcFunc['db_drop_table']($table_name);
+		} else {
+					return $if_exists == 'ignore';
+		}
 	}
 
 	// Righty - let's do the damn thing!
 	$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
-	foreach ($columns as $column)
-		$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	foreach ($columns as $column) {
+			$table_query .= "\n\t" . smf_db_create_query_column($column) . ',';
+	}
 
 	// Loop through the indexes next...
 	foreach ($indexes as $index)
@@ -133,19 +138,21 @@ 
 		$columns = implode(',', $index['columns']);
 
 		// Is it the primary?
-		if (isset($index['type']) && $index['type'] == 'primary')
-			$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
-		else
+		if (isset($index['type']) && $index['type'] == 'primary') {
+					$table_query .= "\n\t" . 'PRIMARY KEY (' . implode(',', $index['columns']) . '),';
+		} else
 		{
-			if (empty($index['name']))
-				$index['name'] = implode('_', $index['columns']);
+			if (empty($index['name'])) {
+							$index['name'] = implode('_', $index['columns']);
+			}
 			$table_query .= "\n\t" . (isset($index['type']) && $index['type'] == 'unique' ? 'UNIQUE' : 'KEY') . ' ' . $index['name'] . ' (' . $columns . '),';
 		}
 	}
 
 	// No trailing commas!
-	if (substr($table_query, -1) == ',')
-		$table_query = substr($table_query, 0, -1);
+	if (substr($table_query, -1) == ',') {
+			$table_query = substr($table_query, 0, -1);
+	}
 
 	// Which engine do we want here?
 	if (empty($engines))
@@ -155,8 +162,9 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($get_engines))
 		{
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
-				$engines[] = $row['Engine'];
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+							$engines[] = $row['Engine'];
+			}
 		}
 
 		$smcFunc['db_free_result']($get_engines);
@@ -170,8 +178,9 @@ 
 	}
 
 	$table_query .= ') ENGINE=' . $parameters['engine'];
-	if (!empty($db_character_set) && $db_character_set == 'utf8')
-		$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	if (!empty($db_character_set) && $db_character_set == 'utf8') {
+			$table_query .= ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	}
 
 	// Create the table!
 	$smcFunc['db_query']('', $table_query,
@@ -203,8 +212,9 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// God no - dropping one of these = bad.
-	if (in_array(strtolower($table_name), $reservedTables))
-		return false;
+	if (in_array(strtolower($table_name), $reservedTables)) {
+			return false;
+	}
 
 	// Does it exist?
 	if (in_array($full_table_name, $smcFunc['db_list_tables']()))
@@ -245,14 +255,16 @@ 
 
 	// Does it exist - if so don't add it again!
 	$columns = $smcFunc['db_list_columns']($table_name, false);
-	foreach ($columns as $column)
-		if ($column == $column_info['name'])
+	foreach ($columns as $column) {
+			if ($column == $column_info['name'])
 		{
 			// If we're going to overwrite then use change column.
 			if ($if_exists == 'update')
 				return $smcFunc['db_change_column']($table_name, $column_info['name'], $column_info);
-			else
-				return false;
+	}
+			else {
+							return false;
+			}
 		}
 
 	// Get the specifics...
@@ -262,8 +274,9 @@ 
 	// Allow unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now add the thing!
 	$query = '
@@ -295,8 +308,8 @@ 
 
 	// Does it exist?
 	$columns = $smcFunc['db_list_columns']($table_name, true);
-	foreach ($columns as $column)
-		if ($column['name'] == $column_name)
+	foreach ($columns as $column) {
+			if ($column['name'] == $column_name)
 		{
 			$smcFunc['db_query']('', '
 				ALTER TABLE ' . $table_name . '
@@ -305,6 +318,7 @@ 
 					'security_override' => true,
 				)
 			);
+	}
 
 			return true;
 		}
@@ -331,37 +345,47 @@ 
 	// Check it does exist!
 	$columns = $smcFunc['db_list_columns']($table_name, true);
 	$old_info = null;
-	foreach ($columns as $column)
-		if ($column['name'] == $old_column)
+	foreach ($columns as $column) {
+			if ($column['name'] == $old_column)
 			$old_info = $column;
+	}
 
 	// Nothing?
-	if ($old_info == null)
-		return false;
+	if ($old_info == null) {
+			return false;
+	}
 
 	// Get the right bits.
-	if (!isset($column_info['name']))
-		$column_info['name'] = $old_column;
-	if (!isset($column_info['default']))
-		$column_info['default'] = $old_info['default'];
-	if (!isset($column_info['null']))
-		$column_info['null'] = $old_info['null'];
-	if (!isset($column_info['auto']))
-		$column_info['auto'] = $old_info['auto'];
-	if (!isset($column_info['type']))
-		$column_info['type'] = $old_info['type'];
-	if (!isset($column_info['size']) || !is_numeric($column_info['size']))
-		$column_info['size'] = $old_info['size'];
-	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')))
-		$column_info['unsigned'] = '';
+	if (!isset($column_info['name'])) {
+			$column_info['name'] = $old_column;
+	}
+	if (!isset($column_info['default'])) {
+			$column_info['default'] = $old_info['default'];
+	}
+	if (!isset($column_info['null'])) {
+			$column_info['null'] = $old_info['null'];
+	}
+	if (!isset($column_info['auto'])) {
+			$column_info['auto'] = $old_info['auto'];
+	}
+	if (!isset($column_info['type'])) {
+			$column_info['type'] = $old_info['type'];
+	}
+	if (!isset($column_info['size']) || !is_numeric($column_info['size'])) {
+			$column_info['size'] = $old_info['size'];
+	}
+	if (!isset($column_info['unsigned']) || !in_array($column_info['type'], array('int', 'tinyint', 'smallint', 'mediumint', 'bigint'))) {
+			$column_info['unsigned'] = '';
+	}
 
 	list ($type, $size) = $smcFunc['db_calculate_type']($column_info['type'], $column_info['size']);
 
 	// Allow for unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column_info['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	$smcFunc['db_query']('', '
 		ALTER TABLE ' . $table_name . '
@@ -391,21 +415,23 @@ 
 	$table_name = str_replace('{db_prefix}', $db_prefix, $table_name);
 
 	// No columns = no index.
-	if (empty($index_info['columns']))
-		return false;
+	if (empty($index_info['columns'])) {
+			return false;
+	}
 	$columns = implode(',', $index_info['columns']);
 
 	// No name - make it up!
 	if (empty($index_info['name']))
 	{
 		// No need for primary.
-		if (isset($index_info['type']) && $index_info['type'] == 'primary')
-			$index_info['name'] = '';
-		else
-			$index_info['name'] = implode('_', $index_info['columns']);
+		if (isset($index_info['type']) && $index_info['type'] == 'primary') {
+					$index_info['name'] = '';
+		} else {
+					$index_info['name'] = implode('_', $index_info['columns']);
+		}
+	} else {
+			$index_info['name'] = $index_info['name'];
 	}
-	else
-		$index_info['name'] = $index_info['name'];
 
 	// Log that we are going to want to remove this!
 	$db_package_log[] = array('remove_index', $table_name, $index_info['name']);
@@ -418,10 +444,11 @@ 
 		if ($index['name'] == $index_info['name'] || ($index['type'] == 'primary' && isset($index_info['type']) && $index_info['type'] == 'primary'))
 		{
 			// If we want to overwrite simply remove the current one then continue.
-			if ($if_exists != 'update' || $index['type'] == 'primary')
-				return false;
-			else
-				$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			if ($if_exists != 'update' || $index['type'] == 'primary') {
+							return false;
+			} else {
+							$smcFunc['db_remove_index']($table_name, $index_info['name']);
+			}
 		}
 	}
 
@@ -435,8 +462,7 @@ 
 				'security_override' => true,
 			)
 		);
-	}
-	else
+	} else
 	{
 		$smcFunc['db_query']('', '
 			ALTER TABLE ' . $table_name . '
@@ -520,8 +546,7 @@ 
 		$types = array(
 			'inet' => 'varbinary',
 		);
-	}
-	else
+	} else
 	{
 		$types = array(
 			'varbinary' => 'inet',
@@ -535,16 +560,15 @@ 
 		{
 			$type_size = 16;
 			$type_name = 'varbinary';
-		}
-		elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
+		} elseif ($type_name == 'varbinary' && $reverse && $type_size == 16)
 		{
 			$type_name = 'inet';
 			$type_size = null;
+		} elseif ($type_name == 'varbinary') {
+					$type_name = 'varbinary';
+		} else {
+					$type_name = $types[$type_name];
 		}
-		elseif ($type_name == 'varbinary')
-			$type_name = 'varbinary';
-		else
-			$type_name = $types[$type_name];
 	}
 
 	return array($type_name, $type_size);
@@ -612,8 +636,7 @@ 
 		if (!$detail)
 		{
 			$columns[] = $row['Field'];
-		}
-		else
+		} else
 		{
 			// Is there an auto_increment?
 			$auto = strpos($row['Extra'], 'auto_increment') !== false ? true : false;
@@ -623,10 +646,10 @@ 
 			{
 				$type = $matches[1];
 				$size = $matches[2];
-				if (!empty($matches[3]) && $matches[3] == 'unsigned')
-					$unsigned = true;
-			}
-			else
+				if (!empty($matches[3]) && $matches[3] == 'unsigned') {
+									$unsigned = true;
+				}
+			} else
 			{
 				$type = $row['Type'];
 				$size = null;
@@ -677,19 +700,20 @@ 
 	$indexes = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!$detail)
-			$indexes[] = $row['Key_name'];
-		else
+		if (!$detail) {
+					$indexes[] = $row['Key_name'];
+		} else
 		{
 			// What is the type?
-			if ($row['Key_name'] == 'PRIMARY')
-				$type = 'primary';
-			elseif (empty($row['Non_unique']))
-				$type = 'unique';
-			elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT')
-				$type = 'fulltext';
-			else
-				$type = 'index';
+			if ($row['Key_name'] == 'PRIMARY') {
+							$type = 'primary';
+			} elseif (empty($row['Non_unique'])) {
+							$type = 'unique';
+			} elseif (isset($row['Index_type']) && $row['Index_type'] == 'FULLTEXT') {
+							$type = 'fulltext';
+			} else {
+							$type = 'index';
+			}
 
 			// This is the first column we've seen?
 			if (empty($indexes[$row['Key_name']]))
@@ -702,10 +726,11 @@ 
 			}
 
 			// Is it a partial index?
-			if (!empty($row['Sub_part']))
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
-			else
-				$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			if (!empty($row['Sub_part'])) {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'] . '(' . $row['Sub_part'] . ')';
+			} else {
+							$indexes[$row['Key_name']]['columns'][] = $row['Column_name'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($result);
@@ -727,11 +752,11 @@ 
 	if (!empty($column['auto']))
 	{
 		$default = 'auto_increment';
+	} elseif (isset($column['default']) && $column['default'] !== null) {
+			$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
+	} else {
+			$default = '';
 	}
-	elseif (isset($column['default']) && $column['default'] !== null)
-		$default = 'default \'' . $smcFunc['db_escape_string']($column['default']) . '\'';
-	else
-		$default = '';
 
 	// Sort out the size... and stuff...
 	$column['size'] = isset($column['size']) && is_numeric($column['size']) ? $column['size'] : null;
@@ -740,8 +765,9 @@ 
 	// Allow unsigned integers (mysql only)
 	$unsigned = in_array($type, array('int', 'tinyint', 'smallint', 'mediumint', 'bigint')) && !empty($column['unsigned']) ? 'unsigned ' : '';
 
-	if ($size !== null)
-		$type = $type . '(' . $size . ')';
+	if ($size !== null) {
+			$type = $type . '(' . $size . ')';
+	}
 
 	// Now just put it together!
 	return '`' . $column['name'] . '` ' . $type . ' ' . (!empty($unsigned) ? $unsigned : '') . (!empty($column['null']) ? '' : 'NOT NULL') . ' ' . $default;

Sources/Subs-Themes.php

Braces +67 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Gets a single theme's info.
@@ -27,8 +28,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// No data, no fun!
-	if (empty($id))
-		return false;
+	if (empty($id)) {
+			return false;
+	}
 
 	// Make sure $id is an int.
 	$id = (int) $id;
@@ -171,8 +173,9 @@ 
 	global $sourcedir, $forum_version, $txt, $scripturl, $context;
 	global $explicit_images;
 
-	if (empty($path))
-		return false;
+	if (empty($path)) {
+			return false;
+	}
 
 	$xml_data = array();
 	$explicit_images = false;
@@ -229,9 +232,10 @@ 
 	);
 
 	// Assign the values to be stored.
-	foreach ($xml_elements as $var => $name)
-		if (!empty($theme_info_xml[$name]))
+	foreach ($xml_elements as $var => $name) {
+			if (!empty($theme_info_xml[$name]))
 			$xml_data[$var] = $theme_info_xml[$name];
+	}
 
 	// Add the supported versions.
 	$xml_data['install_for'] = $install_versions;
@@ -243,8 +247,9 @@ 
 		$explicit_images = true;
 	}
 
-	if (!empty($theme_info_xml['extra']))
-		$xml_data += smf_json_decode($theme_info_xml['extra'], true);
+	if (!empty($theme_info_xml['extra'])) {
+			$xml_data += smf_json_decode($theme_info_xml['extra'], true);
+	}
 
 	return $xml_data;
 }
@@ -262,12 +267,14 @@ 
 	global $settings, $explicit_images;
 
 	// External use? no problem!
-	if ($to_install)
-		$context['to_install'] = $to_install;
+	if ($to_install) {
+			$context['to_install'] = $to_install;
+	}
 
 	// One last check.
-	if (empty($context['to_install']['theme_dir']) || basename($context['to_install']['theme_dir']) == 'Themes')
-		fatal_lang_error('theme_install_invalid_dir', false);
+	if (empty($context['to_install']['theme_dir']) || basename($context['to_install']['theme_dir']) == 'Themes') {
+			fatal_lang_error('theme_install_invalid_dir', false);
+	}
 
 	// OK, is this a newer version of an already installed theme?
 	if (!empty($context['to_install']['version']))
@@ -292,8 +299,8 @@ 
 		$smcFunc['db_free_result']($request);
 
 		// Got something, lets figure it out what to do next.
-		if (!empty($to_update) && !empty($to_update['version']))
-			switch (compareVersions($context['to_install']['version'], $to_update['version']))
+		if (!empty($to_update) && !empty($to_update['version'])) {
+					switch (compareVersions($context['to_install']['version'], $to_update['version']))
 			{
 				case 1: // Got a newer version, update the old entry.
 					$smcFunc['db_query']('', '
@@ -307,6 +314,7 @@ 
 							'id_theme' => $to_update['id_theme'],
 						)
 					);
+		}
 
 					// Done with the update, tell the user about it.
 					$context['to_install']['updated'] = true;
@@ -372,13 +380,15 @@ 
 				$context['to_install']['base_theme_url'] = $temp['theme_url'];
 				$context['to_install']['base_theme_dir'] = $temp['theme_dir'];
 
-				if (empty($explicit_images) && !empty($context['to_install']['base_theme_url']))
-					$context['to_install']['theme_url'] = $context['to_install']['base_theme_url'];
+				if (empty($explicit_images) && !empty($context['to_install']['base_theme_url'])) {
+									$context['to_install']['theme_url'] = $context['to_install']['base_theme_url'];
+				}
 			}
 
 			// Nope, sorry, couldn't find any theme already installed.
-			else
-				fatal_lang_error('package_get_error_theme_no_based_on_found', false, $context['to_install']['based_on']);
+			else {
+							fatal_lang_error('package_get_error_theme_no_based_on_found', false, $context['to_install']['based_on']);
+			}
 		}
 
 		unset($context['to_install']['based_on']);
@@ -401,16 +411,18 @@ 
 	call_integration_hook('integrate_theme_install', array(&$context['to_install'], $id_theme));
 
 	$inserts = array();
-	foreach ($context['to_install'] as $var => $val)
-		$inserts[] = array($id_theme, $var, $val);
+	foreach ($context['to_install'] as $var => $val) {
+			$inserts[] = array($id_theme, $var, $val);
+	}
 
-	if (!empty($inserts))
-		$smcFunc['db_insert']('insert',
+	if (!empty($inserts)) {
+			$smcFunc['db_insert']('insert',
 			'{db_prefix}themes',
 			array('id_theme' => 'int', 'variable' => 'string-255', 'value' => 'string-65534'),
 			$inserts,
 			array('id_theme', 'variable')
 		);
+	}
 
 	// Update the known and enable Theme's settings.
 	$known = strtr($modSettings['knownThemes'] . ',' . $id_theme, array(',,' => ','));
@@ -429,21 +441,24 @@ 
  */
 function remove_dir($path)
 {
-	if (empty($path))
-		return false;
+	if (empty($path)) {
+			return false;
+	}
 
 	if (is_dir($path))
 	{
 		$objects = scandir($path);
 
-		foreach ($objects as $object)
-			if ($object != '.' && $object != '..')
+		foreach ($objects as $object) {
+					if ($object != '.' && $object != '..')
 			{
 				if (filetype($path . '/' . $object) == 'dir')
 					remove_dir($path . '/' . $object);
+		}
 
-				else
-					unlink($path . '/' . $object);
+				else {
+									unlink($path . '/' . $object);
+				}
 			}
 	}
 
@@ -462,8 +477,9 @@ 
 	global $smcFunc, $modSettings;
 
 	// Can't delete the default theme, sorry!
-	if (empty($themeID) || $themeID == 1)
-		return false;
+	if (empty($themeID) || $themeID == 1) {
+			return false;
+	}
 
 	$known = explode(',', $modSettings['knownThemes']);
 	$enable = explode(',', $modSettings['enableThemes']);
@@ -513,8 +529,9 @@ 
 	updateSettings(array('enableThemes' => $enable, 'knownThemes' => $known));
 
 	// Fix it if the theme was the overall default theme.
-	if ($modSettings['theme_guests'] == $themeID)
-		updateSettings(array('theme_guests' => '1'));
+	if ($modSettings['theme_guests'] == $themeID) {
+			updateSettings(array('theme_guests' => '1'));
+	}
 
 	return true;
 }
@@ -531,13 +548,15 @@ 
 	global $scripturl, $txt, $context;
 
 	// Is it even a directory?
-	if (!is_dir($path))
-		fatal_lang_error('error_invalid_dir', 'critical');
+	if (!is_dir($path)) {
+			fatal_lang_error('error_invalid_dir', 'critical');
+	}
 
 	$dir = dir($path);
 	$entries = array();
-	while ($entry = $dir->read())
-		$entries[] = $entry;
+	while ($entry = $dir->read()) {
+			$entries[] = $entry;
+	}
 	$dir->close();
 
 	natcasesort($entries);
@@ -548,11 +567,12 @@ 
 	foreach ($entries as $entry)
 	{
 		// Skip all dot files, including .htaccess.
-		if (substr($entry, 0, 1) == '.' || $entry == 'CVS')
-			continue;
+		if (substr($entry, 0, 1) == '.' || $entry == 'CVS') {
+					continue;
+		}
 
-		if (is_dir($path . '/' . $entry))
-			$listing1[] = array(
+		if (is_dir($path . '/' . $entry)) {
+					$listing1[] = array(
 				'filename' => $entry,
 				'is_writable' => is_writable($path . '/' . $entry),
 				'is_directory' => true,
@@ -562,13 +582,14 @@ 
 				'href' => $scripturl . '?action=admin;area=theme;th=' . $_GET['th'] . ';' . $context['session_var'] . '=' . $context['session_id'] . ';sa=edit;directory=' . $relative . $entry,
 				'size' => '',
 			);
-		else
+		} else
 		{
 			$size = filesize($path . '/' . $entry);
-			if ($size > 2048 || $size == 1024)
-				$size = comma_format($size / 1024) . ' ' . $txt['themeadmin_edit_kilobytes'];
-			else
-				$size = comma_format($size) . ' ' . $txt['themeadmin_edit_bytes'];
+			if ($size > 2048 || $size == 1024) {
+							$size = comma_format($size / 1024) . ' ' . $txt['themeadmin_edit_kilobytes'];
+			} else {
+							$size = comma_format($size) . ' ' . $txt['themeadmin_edit_bytes'];
+			}
 
 			$listing2[] = array(
 				'filename' => $entry,

Sources/ReportedContent.php

Braces +61 added lines, -46 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Sets and call a function based on the given subaction. Acts as a dispatcher function.
@@ -54,8 +55,9 @@ 
 	);
 
 	// This comes under the umbrella of moderating posts.
-	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1')
-		isAllowedTo('moderate_forum');
+	if ($context['report_type'] == 'members' || $user_info['mod_cache']['bq'] == '0=1') {
+			isAllowedTo('moderate_forum');
+	}
 
 	$subActions = array(
 		'show' => 'ShowReports',
@@ -70,11 +72,11 @@ 
 	call_integration_hook('integrate_reported_' . $context['report_type'], array(&$subActions));
 
 	// By default we call the open sub-action.
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
-
-	else
-		$context['sub_action'] = 'show';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$context['sub_action'] = $smcFunc['htmltrim']($smcFunc['htmlspecialchars']($_REQUEST['sa']), ENT_QUOTES);
+	} else {
+			$context['sub_action'] = 'show';
+	}
 
 	// Hi Ho Silver Away!
 	call_helper($subActions[$context['sub_action']]);
@@ -116,11 +118,13 @@ 
 
 		// All the ones to update...
 		$toClose = array();
-		foreach ($_POST['close'] as $rid)
-			$toClose[] = (int) $rid;
+		foreach ($_POST['close'] as $rid) {
+					$toClose[] = (int) $rid;
+		}
 
-		if (!empty($toClose))
-			updateReport('closed', 1, $toClose);
+		if (!empty($toClose)) {
+					updateReport('closed', 1, $toClose);
+		}
 
 		// Set the confirmation message.
 		$_SESSION['rc_confirmation'] = 'close_all';
@@ -178,8 +182,9 @@ 
 	$reportComments = array();
 
 	// Have to at least give us something to work with.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please
 	$report_id = (int) $_REQUEST['rid'];
@@ -187,8 +192,9 @@ 
 	// Get the report details.
 	$report = getReportDetails($report_id);
 
-	if (!$report)
-		fatal_lang_error('mc_no_modreport_found');
+	if (!$report) {
+			fatal_lang_error('mc_no_modreport_found');
+	}
 
 	// Build the report data - basic details first, then extra stuff based on the type
 	$context['report'] = array(
@@ -214,8 +220,7 @@ 
 				'href' => $scripturl . '?action=profile;u=' . $report['id_user'],
 			),
 		);
-	}
-	else
+	} else
 	{
 		$extraDetails = array(
 			'topic_id' => $report['id_topic'],
@@ -238,8 +243,9 @@ 
 
 	$reportComments = getReportComments($report_id);
 
-	if (!empty($reportComments))
-		$context['report'] = array_merge($context['report'], $reportComments);
+	if (!empty($reportComments)) {
+			$context['report'] = array_merge($context['report'], $reportComments);
+	}
 
 	// What have the other moderators done to this message?
 	require_once($sourcedir . '/Modlog.php');
@@ -260,8 +266,7 @@ 
 			1,
 			true,
 		);
-	}
-	else
+	} else
 	{
 		$params = array(
 			'lm.id_topic = {int:id_topic}
@@ -361,16 +366,16 @@ 
 	createList($listOptions);
 
 	// Make sure to get the correct tab selected.
-	if ($context['report']['closed'])
-		$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	if ($context['report']['closed']) {
+			$context[$context['moderation_menu_name']]['current_subsection'] = 'closed';
+	}
 
 	// Finally we are done :P
 	if ($context['report_type'] == 'members')
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmemberreport'], $context['report']['user']['name']);
 		$context['sub_template'] = 'viewmemberreport';
-	}
-	else
+	} else
 	{
 		$context['page_title'] = sprintf($txt['mc_viewmodreport'], $context['report']['subject'], $context['report']['author']['name']);
 		$context['sub_template'] = 'viewmodreport';
@@ -395,8 +400,9 @@ 
 	$comment = array();
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// Integers only please.
 	$report_id = (int) $_REQUEST['rid'];
@@ -421,8 +427,9 @@ 
 		checkSession('get');
 		validateToken('mod-reportC-delete', 'get');
 
-		if (empty($_REQUEST['mid']))
-			fatal_lang_error('mc_reportedp_comment_none_found');
+		if (empty($_REQUEST['mid'])) {
+					fatal_lang_error('mc_reportedp_comment_none_found');
+		}
 
 		$comment_id = (int) $_REQUEST['mid'];
 
@@ -430,15 +437,17 @@ 
 		$comment = getCommentModDetails($comment_id);
 
 		// Perhaps somebody else already deleted this fine gem...
-		if (empty($comment))
-			fatal_lang_error('report_action_message_delete_issue');
+		if (empty($comment)) {
+					fatal_lang_error('report_action_message_delete_issue');
+		}
 
 		// Can you actually do this?
 		$comment_owner = $user_info['id'] == $comment['id_member'];
 
 		// Nope! sorry.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_delete_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_delete_cannot');
+		}
 
 		// All good!
 		deleteModComment($comment_id);
@@ -465,11 +474,13 @@ 
 	checkSession(isset($_REQUEST['save']) ? 'post' : 'get');
 
 	// The report ID is a must.
-	if (empty($_REQUEST['rid']))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_REQUEST['rid'])) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
-	if (empty($_REQUEST['mid']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($_REQUEST['mid'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Integers only please.
 	$context['report_id'] = (int) $_REQUEST['rid'];
@@ -477,8 +488,9 @@ 
 
 	$context['comment'] = getCommentModDetails($context['comment_id']);
 
-	if (empty($context['comment']))
-		fatal_lang_error('mc_reportedp_comment_none_found');
+	if (empty($context['comment'])) {
+			fatal_lang_error('mc_reportedp_comment_none_found');
+	}
 
 	// Set up the comforting bits...
 	$context['page_title'] = $txt['mc_reported_posts'];
@@ -489,15 +501,17 @@ 
 		validateToken('mod-reportC-edit');
 
 		// Make sure there is some data to edit on the DB.
-		if (empty($context['comment']))
-			fatal_lang_error('report_action_message_edit_issue');
+		if (empty($context['comment'])) {
+					fatal_lang_error('report_action_message_edit_issue');
+		}
 
 		// Still there, good, now lets see if you can actually edit it...
 		$comment_owner = $user_info['id'] == $context['comment']['id_member'];
 
 		// So, you aren't neither an admin or the comment owner huh? that's too bad.
-		if (!allowedTo('admin_forum') && !$comment_owner)
-			fatal_lang_error('report_action_message_edit_cannot');
+		if (!allowedTo('admin_forum') && !$comment_owner) {
+					fatal_lang_error('report_action_message_edit_cannot');
+		}
 
 		// All good!
 		$edited_comment = trim($smcFunc['htmlspecialchars']($_POST['mod_comment']));
@@ -523,8 +537,9 @@ 
 	checkSession('get');
 
 	// We need to do something!
-	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed'])))
-		fatal_lang_error('mc_reportedp_none_found');
+	if (empty($_GET['rid']) && (!isset($_GET['ignore']) || !isset($_GET['closed']))) {
+			fatal_lang_error('mc_reportedp_none_found');
+	}
 
 	// What are we gonna do?
 	$action = isset($_GET['ignore']) ? 'ignore' : 'closed';

Sources/Load.php

Braces +798 added lines, -602 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Load the $modSettings array.
@@ -25,13 +26,14 @@ 
 	global $cache_enable, $sourcedir, $context;
 
 	// Most database systems have not set UTF-8 as their default input charset.
-	if (!empty($db_character_set))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set)) {
+			$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_character_set' => $db_character_set,
 			)
 		);
+	}
 
 	// We need some caching support, maybe.
 	loadCacheAccelerator();
@@ -46,27 +48,35 @@ 
 			)
 		);
 		$modSettings = array();
-		if (!$request)
-			display_db_error();
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$modSettings[$row[0]] = $row[1];
+		if (!$request) {
+					display_db_error();
+		}
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$modSettings[$row[0]] = $row[1];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Do a few things to protect against missing settings or settings with invalid values...
-		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999)
-			$modSettings['defaultMaxTopics'] = 20;
-		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999)
-			$modSettings['defaultMaxMessages'] = 15;
-		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999)
-			$modSettings['defaultMaxMembers'] = 30;
-		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999)
-			$modSettings['defaultMaxListItems'] = 15;
+		if (empty($modSettings['defaultMaxTopics']) || $modSettings['defaultMaxTopics'] <= 0 || $modSettings['defaultMaxTopics'] > 999) {
+					$modSettings['defaultMaxTopics'] = 20;
+		}
+		if (empty($modSettings['defaultMaxMessages']) || $modSettings['defaultMaxMessages'] <= 0 || $modSettings['defaultMaxMessages'] > 999) {
+					$modSettings['defaultMaxMessages'] = 15;
+		}
+		if (empty($modSettings['defaultMaxMembers']) || $modSettings['defaultMaxMembers'] <= 0 || $modSettings['defaultMaxMembers'] > 999) {
+					$modSettings['defaultMaxMembers'] = 30;
+		}
+		if (empty($modSettings['defaultMaxListItems']) || $modSettings['defaultMaxListItems'] <= 0 || $modSettings['defaultMaxListItems'] > 999) {
+					$modSettings['defaultMaxListItems'] = 15;
+		}
 
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+		}
 
-		if (!empty($cache_enable))
-			cache_put_data('modSettings', $modSettings, 90);
+		if (!empty($cache_enable)) {
+					cache_put_data('modSettings', $modSettings, 90);
+		}
 	}
 
 	$modSettings['cache_enable'] = $cache_enable;
@@ -86,8 +96,9 @@ 
 		};
 	$fix_utf8mb4 = function($string) use ($utf8)
 	{
-		if (!$utf8)
-			return $string;
+		if (!$utf8) {
+					return $string;
+		}
 
 		$i = 0;
 		$len = strlen($string);
@@ -99,18 +110,15 @@ 
 			{
 				$new_string .= $string[$i];
 				$i++;
-			}
-			elseif ($ord < 224)
+			} elseif ($ord < 224)
 			{
 				$new_string .= $string[$i] . $string[$i + 1];
 				$i += 2;
-			}
-			elseif ($ord < 240)
+			} elseif ($ord < 240)
 			{
 				$new_string .= $string[$i] . $string[$i + 1] . $string[$i + 2];
 				$i += 3;
-			}
-			elseif ($ord < 248)
+			} elseif ($ord < 248)
 			{
 				// Magic happens.
 				$val = (ord($string[$i]) & 0x07) << 18;
@@ -154,8 +162,7 @@ 
 			{
 				$result = array_search($needle, array_slice($haystack_arr, $offset));
 				return is_int($result) ? $result + $offset : false;
-			}
-			else
+			} else
 			{
 				$needle_arr = preg_split('~(&#' . (empty($modSettings['disableEntityCheck']) ? '\d{1,7}' : '021') . ';|&quot;|&amp;|&lt;|&gt;|&nbsp;|.)~' . ($utf8 ? 'u' : '') . '', $ent_check($needle), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 				$needle_size = count($needle_arr);
@@ -164,8 +171,9 @@ 
 				while ((int) $result === $result)
 				{
 					$offset += $result;
-					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr)
-						return $offset;
+					if (array_slice($haystack_arr, $offset, $needle_size) === $needle_arr) {
+											return $offset;
+					}
 					$result = array_search($needle_arr[0], array_slice($haystack_arr, ++$offset));
 				}
 				return false;
@@ -203,8 +211,9 @@ 
 			$string = $ent_check($string);
 			preg_match('~^(' . $ent_list . '|.){' . $smcFunc['strlen'](substr($string, 0, $length)) . '}~' . ($utf8 ? 'u' : ''), $string, $matches);
 			$string = $matches[0];
-			while (strlen($string) > $length)
-				$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			while (strlen($string) > $length) {
+							$string = preg_replace('~(?:' . $ent_list . '|.)$~' . ($utf8 ? 'u' : ''), '', $string);
+			}
 			return $string;
 		},
 		'ucfirst' => $utf8 ? function($string) use (&$smcFunc)
@@ -214,23 +223,25 @@ 
 		'ucwords' => $utf8 ? function($string) use (&$smcFunc)
 		{
 			$words = preg_split('~([\s\r\n\t]+)~', $string, -1, PREG_SPLIT_DELIM_CAPTURE);
-			for ($i = 0, $n = count($words); $i < $n; $i += 2)
-				$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			for ($i = 0, $n = count($words); $i < $n; $i += 2) {
+							$words[$i] = $smcFunc['ucfirst']($words[$i]);
+			}
 			return implode('', $words);
 		} : 'ucwords',
 	);
 
 	// Setting the timezone is a requirement for some functions.
-	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list()))
-		date_default_timezone_set($modSettings['default_timezone']);
-	else
+	if (isset($modSettings['default_timezone']) && in_array($modSettings['default_timezone'], timezone_identifiers_list())) {
+			date_default_timezone_set($modSettings['default_timezone']);
+	} else
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$modSettings['default_timezone'] = $ini_tz;
-		else
-			$modSettings['default_timezone'] = '';
+		if (!empty($ini_tz)) {
+					$modSettings['default_timezone'] = $ini_tz;
+		} else {
+					$modSettings['default_timezone'] = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($modSettings['default_timezone'], timezone_identifiers_list()))
@@ -248,22 +259,26 @@ 
 		if (($modSettings['load_average'] = cache_get_data('loadavg', 90)) == null)
 		{
 			$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 average[s]?: (\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 average[s]?: (\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)
-				cache_put_data('loadavg', $modSettings['load_average'], 90);
+			if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+							cache_put_data('loadavg', $modSettings['load_average'], 90);
+			}
 		}
 
-		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0)
-			call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		if (!empty($modSettings['load_average']) || $modSettings['load_average'] === 0.0) {
+					call_integration_hook('integrate_load_average', array($modSettings['load_average']));
+		}
 
-		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum'])
-			display_loadavg_error();
+		if (!empty($modSettings['loadavg_forum']) && !empty($modSettings['load_average']) && $modSettings['load_average'] >= $modSettings['loadavg_forum']) {
+					display_loadavg_error();
+		}
 	}
 
 	// Is post moderation alive and well? Everywhere else assumes this has been defined, so let's make sure it is.
@@ -284,8 +299,9 @@ 
 	if (defined('SMF_INTEGRATION_SETTINGS'))
 	{
 		$integration_settings = smf_json_decode(SMF_INTEGRATION_SETTINGS, true);
-		foreach ($integration_settings as $hook => $function)
-			add_integration_function($hook, $function, '', false);
+		foreach ($integration_settings as $hook => $function) {
+					add_integration_function($hook, $function, '', false);
+		}
 	}
 
 	// Any files to pre include?
@@ -295,8 +311,9 @@ 
 		foreach ($pre_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -400,27 +417,28 @@ 
 				break;
 			}
 		}
+	} else {
+			$id_member = 0;
 	}
-	else
-		$id_member = 0;
 
 	if (empty($id_member) && isset($_COOKIE[$cookiename]))
 	{
 		$cookie_data = smf_json_decode($_COOKIE[$cookiename], true, false);
 
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_COOKIE[$cookiename]);
+		}
 
 		list ($id_member, $password) = $cookie_data;
 		$id_member = !empty($id_member) && strlen($password) > 0 ? (int) $id_member : 0;
-	}
-	elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
+	} elseif (empty($id_member) && isset($_SESSION['login_' . $cookiename]) && ($_SESSION['USER_AGENT'] == $_SERVER['HTTP_USER_AGENT'] || !empty($modSettings['disableCheckUA'])))
 	{
 		// @todo Perhaps we can do some more checking on this, such as on the first octet of the IP?
 		$cookie_data = smf_json_decode($_SESSION['login_' . $cookiename]);
 
-		if (empty($cookie_data))
-			$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		if (empty($cookie_data)) {
+					$cookie_data = safe_unserialize($_SESSION['login_' . $cookiename]);
+		}
 
 		list ($id_member, $password, $login_span) = $cookie_data;
 		$id_member = !empty($id_member) && strlen($password) == 128 && $login_span > time() ? (int) $id_member : 0;
@@ -445,30 +463,34 @@ 
 			$user_settings = $smcFunc['db_fetch_assoc']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false)
-				$user_settings['avatar'] = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($user_settings['avatar']) . '&hash=' . md5($user_settings['avatar'] . $image_proxy_secret);
+			if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($user_settings['avatar'], 'http://') !== false) {
+							$user_settings['avatar'] = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($user_settings['avatar']) . '&hash=' . md5($user_settings['avatar'] . $image_proxy_secret);
+			}
 
-			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-				cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+							cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+			}
 		}
 
 		// Did we find 'im?  If not, junk it.
 		if (!empty($user_settings))
 		{
 			// As much as the password should be right, we can assume the integration set things up.
-			if (!empty($already_verified) && $already_verified === true)
-				$check = true;
+			if (!empty($already_verified) && $already_verified === true) {
+							$check = true;
+			}
 			// SHA-512 hash should be 128 characters long.
-			elseif (strlen($password) == 128)
-				$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
-			else
-				$check = false;
+			elseif (strlen($password) == 128) {
+							$check = hash_salt($user_settings['passwd'], $user_settings['password_salt']) == $password;
+			} else {
+							$check = false;
+			}
 
 			// Wrong password or not activated - either way, you're going nowhere.
 			$id_member = $check && ($user_settings['is_activated'] == 1 || $user_settings['is_activated'] == 11) ? (int) $user_settings['id_member'] : 0;
+		} else {
+					$id_member = 0;
 		}
-		else
-			$id_member = 0;
 
 		// If we no longer have the member maybe they're being all hackey, stop brute force!
 		if (!$id_member)
@@ -490,13 +512,15 @@ 
 				{
 					$tfa_data = smf_json_decode($_COOKIE[$tfacookie]);
 
-					if (is_null($tfa_data))
-						$tfa_data = safe_unserialize($_COOKIE[$tfacookie]);
+					if (is_null($tfa_data)) {
+											$tfa_data = safe_unserialize($_COOKIE[$tfacookie]);
+					}
 
 					list ($tfamember, $tfasecret) = $tfa_data;
 
-					if ((int) $tfamember != $id_member)
-						$tfasecret = null;
+					if ((int) $tfamember != $id_member) {
+											$tfasecret = null;
+					}
 				}
 
 				if (empty($tfasecret) || hash_salt($user_settings['tfa_backup'], $user_settings['password_salt']) != $tfasecret)
@@ -516,10 +540,12 @@ 
 		// Are we forcing 2FA? Need to check if the user groups actually require 2FA
 		elseif (!empty($modSettings['tfa_mode']) && $modSettings['tfa_mode'] >= 2 && $id_member && empty($user_settings['tfa_secret']))
 		{
-			if ($modSettings['tfa_mode'] == 2) //only do this if we are just forcing SOME membergroups
+			if ($modSettings['tfa_mode'] == 2) {
+				//only do this if we are just forcing SOME membergroups
 			{
 				//Build an array of ALL user membergroups.
 				$full_groups = array($user_settings['id_group']);
+			}
 				if (!empty($user_settings['additional_groups']))
 				{
 					$full_groups = array_merge($full_groups, explode(',', $user_settings['additional_groups']));
@@ -539,15 +565,17 @@ 
 				);
 				$row = $smcFunc['db_fetch_assoc']($request);
 				$smcFunc['db_free_result']($request);
+			} else {
+							$row['total'] = 1;
 			}
-			else
-				$row['total'] = 1; //simplifies logics in the next "if"
+			//simplifies logics in the next "if"
 
 			$area = !empty($_REQUEST['area']) ? $_REQUEST['area'] : '';
 			$action = !empty($_REQUEST['action']) ? $_REQUEST['action'] : '';
 
-			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup'))
-				redirectexit('action=profile;area=tfasetup;forced');
+			if ($row['total'] > 0 && !in_array($action, array('profile', 'logout')) || ($action == 'profile' && $area != 'tfasetup')) {
+							redirectexit('action=profile;area=tfasetup;forced');
+			}
 		}
 	}
 
@@ -584,33 +612,37 @@ 
 				updateMemberData($id_member, array('id_msg_last_visit' => (int) $modSettings['maxMsgID'], 'last_login' => time(), 'member_ip' => $_SERVER['REMOTE_ADDR'], 'member_ip2' => $_SERVER['BAN_CHECK_IP']));
 				$user_settings['last_login'] = time();
 
-				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-					cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+									cache_put_data('user_settings-' . $id_member, $user_settings, 60);
+				}
 
-				if (!empty($modSettings['cache_enable']))
-					cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				if (!empty($modSettings['cache_enable'])) {
+									cache_put_data('user_last_visit-' . $id_member, $_SESSION['id_msg_last_visit'], 5 * 3600);
+				}
 			}
+		} elseif (empty($_SESSION['id_msg_last_visit'])) {
+					$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
 		}
-		elseif (empty($_SESSION['id_msg_last_visit']))
-			$_SESSION['id_msg_last_visit'] = $user_settings['id_msg_last_visit'];
 
 		$username = $user_settings['member_name'];
 
-		if (empty($user_settings['additional_groups']))
-			$user_info = array(
+		if (empty($user_settings['additional_groups'])) {
+					$user_info = array(
 				'groups' => array($user_settings['id_group'], $user_settings['id_post_group'])
 			);
-		else
-			$user_info = array(
+		} else {
+					$user_info = array(
 				'groups' => array_merge(
 					array($user_settings['id_group'], $user_settings['id_post_group']),
 					explode(',', $user_settings['additional_groups'])
 				)
 			);
+		}
 
 		// Because history has proven that it is possible for groups to go bad - clean up in case.
-		foreach ($user_info['groups'] as $k => $v)
-			$user_info['groups'][$k] = (int) $v;
+		foreach ($user_info['groups'] as $k => $v) {
+					$user_info['groups'][$k] = (int) $v;
+		}
 
 		// This is a logged in user, so definitely not a spider.
 		$user_info['possibly_robot'] = false;
@@ -624,8 +656,7 @@ 
 			$time_system = new DateTime('now', $tz_system);
 			$time_user = new DateTime('now', $tz_user);
 			$user_info['time_offset'] = ($tz_user->getOffset($time_user) - $tz_system->getOffset($time_system)) / 3600;
-		}
-		else
+		} else
 		{
 			// !!! Compatibility.
 			$user_info['time_offset'] = empty($user_settings['time_offset']) ? 0 : $user_settings['time_offset'];
@@ -639,16 +670,18 @@ 
 		$user_info = array('groups' => array(-1));
 		$user_settings = array();
 
-		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member']))
-			$_COOKIE[$cookiename] = '';
+		if (isset($_COOKIE[$cookiename]) && empty($context['tfa_member'])) {
+					$_COOKIE[$cookiename] = '';
+		}
 
 		// Expire the 2FA cookie
 		if (isset($_COOKIE[$cookiename . '_tfa']) && empty($context['tfa_member']))
 		{
 			$tfa_data = smf_json_decode($_COOKIE[$cookiename . '_tfa'], true);
 
-			if (is_null($tfa_data))
-				$tfa_data = safe_unserialize($_COOKIE[$cookiename . '_tfa']);
+			if (is_null($tfa_data)) {
+							$tfa_data = safe_unserialize($_COOKIE[$cookiename . '_tfa']);
+			}
 
 			list ($id, $user, $exp, $state, $preserve) = $tfa_data;
 
@@ -660,19 +693,20 @@ 
 		}
 
 		// Create a login token if it doesn't exist yet.
-		if (!isset($_SESSION['token']['post-login']))
-			createToken('login');
-		else
-			list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		if (!isset($_SESSION['token']['post-login'])) {
+					createToken('login');
+		} else {
+					list ($context['login_token_var'],,, $context['login_token']) = $_SESSION['token']['post-login'];
+		}
 
 		// Do we perhaps think this is a search robot? Check every five minutes just in case...
 		if ((!empty($modSettings['spider_mode']) || !empty($modSettings['spider_group'])) && (!isset($_SESSION['robot_check']) || $_SESSION['robot_check'] < time() - 300))
 		{
 			require_once($sourcedir . '/ManageSearchEngines.php');
 			$user_info['possibly_robot'] = SpiderCheck();
+		} elseif (!empty($modSettings['spider_mode'])) {
+					$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		}
-		elseif (!empty($modSettings['spider_mode']))
-			$user_info['possibly_robot'] = isset($_SESSION['id_robot']) ? $_SESSION['id_robot'] : 0;
 		// If we haven't turned on proper spider hunts then have a guess!
 		else
 		{
@@ -720,8 +754,9 @@ 
 	$user_info['groups'] = array_unique($user_info['groups']);
 
 	// Make sure that the last item in the ignore boards array is valid. If the list was too long it could have an ending comma that could cause problems.
-	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1]))
-		unset($user_info['ignoreboards'][$tmp]);
+	if (!empty($user_info['ignoreboards']) && empty($user_info['ignoreboards'][$tmp = count($user_info['ignoreboards']) - 1])) {
+			unset($user_info['ignoreboards'][$tmp]);
+	}
 
 	// Allow the user to change their language.
 	if (!empty($modSettings['userLanguage']))
@@ -734,31 +769,36 @@ 
 			$user_info['language'] = strtr($_GET['language'], './\\:', '____');
 
 			// Make it permanent for members.
-			if (!empty($user_info['id']))
-				updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
-			else
-				$_SESSION['language'] = $user_info['language'];
+			if (!empty($user_info['id'])) {
+							updateMemberData($user_info['id'], array('lngfile' => $user_info['language']));
+			} else {
+							$_SESSION['language'] = $user_info['language'];
+			}
+		} elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')])) {
+					$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 		}
-		elseif (!empty($_SESSION['language']) && isset($languages[strtr($_SESSION['language'], './\\:', '____')]))
-			$user_info['language'] = strtr($_SESSION['language'], './\\:', '____');
 	}
 
 	// Just build this here, it makes it easier to change/use - administrators can see all boards.
-	if ($user_info['is_admin'])
-		$user_info['query_see_board'] = '1=1';
+	if ($user_info['is_admin']) {
+			$user_info['query_see_board'] = '1=1';
+	}
 	// Otherwise just the groups in $user_info['groups'].
-	else
-		$user_info['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $user_info['groups']) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $user_info['groups']) . ', b.deny_member_groups) = 0)' : '') . (isset($user_info['mod_cache']) ? ' OR ' . $user_info['mod_cache']['mq'] : '') . ')';
+	else {
+			$user_info['query_see_board'] = '((FIND_IN_SET(' . implode(', b.member_groups) != 0 OR FIND_IN_SET(', $user_info['groups']) . ', b.member_groups) != 0)' . (!empty($modSettings['deny_boards_access']) ? ' AND (FIND_IN_SET(' . implode(', b.deny_member_groups) = 0 AND FIND_IN_SET(', $user_info['groups']) . ', b.deny_member_groups) = 0)' : '') . (isset($user_info['mod_cache']) ? ' OR ' . $user_info['mod_cache']['mq'] : '') . ')';
+	}
 
 	// Build the list of boards they WANT to see.
 	// This will take the place of query_see_boards in certain spots, so it better include the boards they can see also
 
 	// If they aren't ignoring any boards then they want to see all the boards they can see
-	if (empty($user_info['ignoreboards']))
-		$user_info['query_wanna_see_board'] = $user_info['query_see_board'];
+	if (empty($user_info['ignoreboards'])) {
+			$user_info['query_wanna_see_board'] = $user_info['query_see_board'];
+	}
 	// Ok I guess they don't want to see all the boards
-	else
-		$user_info['query_wanna_see_board'] = '(' . $user_info['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $user_info['ignoreboards']) . '))';
+	else {
+			$user_info['query_wanna_see_board'] = '(' . $user_info['query_see_board'] . ' AND b.id_board NOT IN (' . implode(',', $user_info['ignoreboards']) . '))';
+	}
 
 	call_integration_hook('integrate_user_info');
 }
@@ -816,9 +856,9 @@ 
 		}
 
 		// Remember redirection is the key to avoiding fallout from your bosses.
-		if (!empty($topic))
-			redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
-		else
+		if (!empty($topic)) {
+					redirectexit('topic=' . $topic . '.msg' . $_REQUEST['msg'] . '#msg' . $_REQUEST['msg']);
+		} else
 		{
 			loadPermissions();
 			loadTheme();
@@ -836,10 +876,11 @@ 
 	if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 	{
 		// @todo SLOW?
-		if (!empty($topic))
-			$temp = cache_get_data('topic_board-' . $topic, 120);
-		else
-			$temp = cache_get_data('board-' . $board, 120);
+		if (!empty($topic)) {
+					$temp = cache_get_data('topic_board-' . $topic, 120);
+		} else {
+					$temp = cache_get_data('board-' . $board, 120);
+		}
 
 		if (!empty($temp))
 		{
@@ -877,8 +918,9 @@ 
 			$row = $smcFunc['db_fetch_assoc']($request);
 
 			// Set the current board.
-			if (!empty($row['id_board']))
-				$board = $row['id_board'];
+			if (!empty($row['id_board'])) {
+							$board = $row['id_board'];
+			}
 
 			// Basic operating information. (globals... :/)
 			$board_info = array(
@@ -914,21 +956,23 @@ 
 
 			do
 			{
-				if (!empty($row['id_moderator']))
-					$board_info['moderators'][$row['id_moderator']] = array(
+				if (!empty($row['id_moderator'])) {
+									$board_info['moderators'][$row['id_moderator']] = array(
 						'id' => $row['id_moderator'],
 						'name' => $row['real_name'],
 						'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 						'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 					);
+				}
 
-				if (!empty($row['id_moderator_group']))
-					$board_info['moderator_groups'][$row['id_moderator_group']] = array(
+				if (!empty($row['id_moderator_group'])) {
+									$board_info['moderator_groups'][$row['id_moderator_group']] = array(
 						'id' => $row['id_moderator_group'],
 						'name' => $row['group_name'],
 						'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 						'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 					);
+				}
 			}
 			while ($row = $smcFunc['db_fetch_assoc']($request));
 
@@ -960,12 +1004,12 @@ 
 			if (!empty($modSettings['cache_enable']) && (empty($topic) || $modSettings['cache_enable'] >= 3))
 			{
 				// @todo SLOW?
-				if (!empty($topic))
-					cache_put_data('topic_board-' . $topic, $board_info, 120);
+				if (!empty($topic)) {
+									cache_put_data('topic_board-' . $topic, $board_info, 120);
+				}
 				cache_put_data('board-' . $board, $board_info, 120);
 			}
-		}
-		else
+		} else
 		{
 			// Otherwise the topic is invalid, there are no moderators, etc.
 			$board_info = array(
@@ -979,8 +1023,9 @@ 
 		$smcFunc['db_free_result']($request);
 	}
 
-	if (!empty($topic))
-		$_GET['board'] = (int) $board;
+	if (!empty($topic)) {
+			$_GET['board'] = (int) $board;
+	}
 
 	if (!empty($board))
 	{
@@ -990,10 +1035,12 @@ 
 		// Now check if the user is a moderator.
 		$user_info['is_mod'] = isset($board_info['moderators'][$user_info['id']]) || count(array_intersect($user_info['groups'], $moderator_groups)) != 0;
 
-		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
-		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin'])
-			$board_info['error'] = 'access';
+		if (count(array_intersect($user_info['groups'], $board_info['groups'])) == 0 && !$user_info['is_admin']) {
+					$board_info['error'] = 'access';
+		}
+		if (!empty($modSettings['deny_boards_access']) && count(array_intersect($user_info['groups'], $board_info['deny_groups'])) != 0 && !$user_info['is_admin']) {
+					$board_info['error'] = 'access';
+		}
 
 		// Build up the linktree.
 		$context['linktree'] = array_merge(
@@ -1016,8 +1063,9 @@ 
 	$context['current_board'] = $board;
 
 	// No posting in redirection boards!
-	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect']))
-		$board_info['error'] == 'post_in_redirect';
+	if (!empty($_REQUEST['action']) && $_REQUEST['action'] == 'post' && !empty($board_info['redirect'])) {
+			$board_info['error'] == 'post_in_redirect';
+	}
 
 	// Hacker... you can't see this topic, I'll tell you that. (but moderators can!)
 	if (!empty($board_info['error']) && (!empty($modSettings['deny_boards_access']) || $board_info['error'] != 'access' || !$user_info['is_mod']))
@@ -1043,24 +1091,23 @@ 
 			ob_end_clean();
 			header('HTTP/1.1 403 Forbidden');
 			die;
-		}
-		elseif ($board_info['error'] == 'post_in_redirect')
+		} elseif ($board_info['error'] == 'post_in_redirect')
 		{
 			// Slightly different error message here...
 			fatal_lang_error('cannot_post_redirect', false);
-		}
-		elseif ($user_info['is_guest'])
+		} elseif ($user_info['is_guest'])
 		{
 			loadLanguage('Errors');
 			is_not_guest($txt['topic_gone']);
+		} else {
+					fatal_lang_error('topic_gone', false);
 		}
-		else
-			fatal_lang_error('topic_gone', false);
 	}
 
-	if ($user_info['is_mod'])
-		$user_info['groups'][] = 3;
-}
+	if ($user_info['is_mod']) {
+			$user_info['groups'][] = 3;
+	}
+	}
 
 /**
  * Load this user's permissions.
@@ -1081,8 +1128,9 @@ 
 		asort($cache_groups);
 		$cache_groups = implode(',', $cache_groups);
 		// If it's a spider then cache it different.
-		if ($user_info['possibly_robot'])
-			$cache_groups .= '-spider';
+		if ($user_info['possibly_robot']) {
+					$cache_groups .= '-spider';
+		}
 
 		if ($modSettings['cache_enable'] >= 2 && !empty($board) && ($temp = cache_get_data('permissions:' . $cache_groups . ':' . $board, 240)) != null && time() - 240 > $modSettings['settings_updated'])
 		{
@@ -1090,9 +1138,9 @@ 
 			banPermissions();
 
 			return;
+		} elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated']) {
+					list ($user_info['permissions'], $removals) = $temp;
 		}
-		elseif (($temp = cache_get_data('permissions:' . $cache_groups, 240)) != null && time() - 240 > $modSettings['settings_updated'])
-			list ($user_info['permissions'], $removals) = $temp;
 	}
 
 	// If it is detected as a robot, and we are restricting permissions as a special group - then implement this.
@@ -1114,23 +1162,26 @@ 
 		$removals = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (isset($cache_groups))
-			cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		if (isset($cache_groups)) {
+					cache_put_data('permissions:' . $cache_groups, array($user_info['permissions'], $removals), 240);
+		}
 	}
 
 	// Get the board permissions.
 	if (!empty($board))
 	{
 		// Make sure the board (if any) has been loaded by loadBoard().
-		if (!isset($board_info['profile']))
-			fatal_lang_error('no_board');
+		if (!isset($board_info['profile'])) {
+					fatal_lang_error('no_board');
+		}
 
 		$request = $smcFunc['db_query']('', '
 			SELECT permission, add_deny
@@ -1146,20 +1197,23 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['add_deny']))
-				$removals[] = $row['permission'];
-			else
-				$user_info['permissions'][] = $row['permission'];
+			if (empty($row['add_deny'])) {
+							$removals[] = $row['permission'];
+			} else {
+							$user_info['permissions'][] = $row['permission'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Remove all the permissions they shouldn't have ;).
-	if (!empty($modSettings['permission_enable_deny']))
-		$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	if (!empty($modSettings['permission_enable_deny'])) {
+			$user_info['permissions'] = array_diff($user_info['permissions'], $removals);
+	}
 
-	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2)
-		cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	if (isset($cache_groups) && !empty($board) && $modSettings['cache_enable'] >= 2) {
+			cache_put_data('permissions:' . $cache_groups . ':' . $board, array($user_info['permissions'], null), 240);
+	}
 
 	// Banned?  Watch, don't touch..
 	banPermissions();
@@ -1171,17 +1225,18 @@ 
 		{
 			require_once($sourcedir . '/Subs-Auth.php');
 			rebuildModCache();
+		} else {
+					$user_info['mod_cache'] = $_SESSION['mc'];
 		}
-		else
-			$user_info['mod_cache'] = $_SESSION['mc'];
 
 		// This is a useful phantom permission added to the current user, and only the current user while they are logged in.
 		// For example this drastically simplifies certain changes to the profile area.
 		$user_info['permissions'][] = 'is_not_guest';
 		// And now some backwards compatibility stuff for mods and whatnot that aren't expecting the new permissions.
 		$user_info['permissions'][] = 'profile_view_own';
-		if (in_array('profile_view', $user_info['permissions']))
-			$user_info['permissions'][] = 'profile_view_any';
+		if (in_array('profile_view', $user_info['permissions'])) {
+					$user_info['permissions'][] = 'profile_view_any';
+		}
 	}
 }
 
@@ -1199,8 +1254,9 @@ 
 	global $image_proxy_enabled, $image_proxy_secret, $boardurl;
 
 	// Can't just look for no users :P.
-	if (empty($users))
-		return array();
+	if (empty($users)) {
+			return array();
+	}
 
 	// Pass the set value
 	$context['loadMemberContext_set'] = $set;
@@ -1215,8 +1271,9 @@ 
 		for ($i = 0, $n = count($users); $i < $n; $i++)
 		{
 			$data = cache_get_data('member_data-' . $set . '-' . $users[$i], 240);
-			if ($data == null)
-				continue;
+			if ($data == null) {
+							continue;
+			}
 
 			$loaded_ids[] = $data['id_member'];
 			$user_profile[$data['id_member']] = $data;
@@ -1280,13 +1337,16 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// Take care of proxying avatar if required, do this here for maximum reach
-			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false)
-				$row['avatar'] = $boardurl . '/proxy.php?request=' . urlencode($row['avatar']) . '&hash=' . md5($row['avatar'] . $image_proxy_secret);
+			if ($image_proxy_enabled && !empty($row['avatar']) && stripos($row['avatar'], 'http://') !== false) {
+							$row['avatar'] = $boardurl . '/proxy.php?request=' . urlencode($row['avatar']) . '&hash=' . md5($row['avatar'] . $image_proxy_secret);
+			}
 
-			if (isset($row['member_ip']))
-				$row['member_ip'] = inet_dtop($row['member_ip']);
-			if (isset($row['member_ip2']))
-				$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			if (isset($row['member_ip'])) {
+							$row['member_ip'] = inet_dtop($row['member_ip']);
+			}
+			if (isset($row['member_ip2'])) {
+							$row['member_ip2'] = inet_dtop($row['member_ip2']);
+			}
 			$new_loaded_ids[] = $row['id_member'];
 			$loaded_ids[] = $row['id_member'];
 			$row['options'] = array();
@@ -1305,8 +1365,9 @@ 
 				'loaded_ids' => $new_loaded_ids,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$user_profile[$row['id_member']]['options'][$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -1317,10 +1378,11 @@ 
 	{
 		foreach ($loaded_ids as $a_member)
 		{
-			if (!empty($user_profile[$a_member]['additional_groups']))
-				$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
-			else
-				$groups = array($user_profile[$a_member]['id_group']);
+			if (!empty($user_profile[$a_member]['additional_groups'])) {
+							$groups = array_merge(array($user_profile[$a_member]['id_group']), explode(',', $user_profile[$a_member]['additional_groups']));
+			} else {
+							$groups = array($user_profile[$a_member]['id_group']);
+			}
 
 			$temp = array_intersect($groups, array_keys($board_info['moderator_groups']));
 
@@ -1333,8 +1395,9 @@ 
 
 	if (!empty($new_loaded_ids) && !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 3)
 	{
-		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++)
-			cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		for ($i = 0, $n = count($new_loaded_ids); $i < $n; $i++) {
+					cache_put_data('member_data-' . $set . '-' . $new_loaded_ids[$i], $user_profile[$new_loaded_ids[$i]], 240);
+		}
 	}
 
 	// Are we loading any moderators?  If so, fix their group data...
@@ -1360,14 +1423,17 @@ 
 		foreach ($temp_mods as $id)
 		{
 			// By popular demand, don't show admins or global moderators as moderators.
-			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2)
-				$user_profile[$id]['member_group'] = $row['member_group'];
+			if ($user_profile[$id]['id_group'] != 1 && $user_profile[$id]['id_group'] != 2) {
+							$user_profile[$id]['member_group'] = $row['member_group'];
+			}
 
 			// If the Moderator group has no color or icons, but their group does... don't overwrite.
-			if (!empty($row['icons']))
-				$user_profile[$id]['icons'] = $row['icons'];
-			if (!empty($row['member_group_color']))
-				$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			if (!empty($row['icons'])) {
+							$user_profile[$id]['icons'] = $row['icons'];
+			}
+			if (!empty($row['member_group_color'])) {
+							$user_profile[$id]['member_group_color'] = $row['member_group_color'];
+			}
 		}
 	}
 
@@ -1389,12 +1455,14 @@ 
 	static $loadedLanguages = array();
 
 	// If this person's data is already loaded, skip it.
-	if (isset($dataLoaded[$user]))
-		return true;
+	if (isset($dataLoaded[$user])) {
+			return true;
+	}
 
 	// We can't load guests or members not loaded by loadMemberData()!
-	if ($user == 0)
-		return false;
+	if ($user == 0) {
+			return false;
+	}
 	if (!isset($user_profile[$user]))
 	{
 		trigger_error('loadMemberContext(): member id ' . $user . ' not previously loaded by loadMemberData()', E_USER_WARNING);
@@ -1420,12 +1488,16 @@ 
 	$buddy_list = !empty($profile['buddy_list']) ? explode(',', $profile['buddy_list']) : array();
 
 	//We need a little fallback for the membergroup icons. If it doesn't exist in the current theme, fallback to default theme
-	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) //icon is set and exists
+	if (isset($profile['icons'][1]) && file_exists($settings['actual_theme_dir'] . '/images/membericons/' . $profile['icons'][1])) {
+		//icon is set and exists
 		$group_icon_url = $settings['images_url'] . '/membericons/' . $profile['icons'][1];
-	elseif (isset($profile['icons'][1])) //icon is set and doesn't exist, fallback to default
+	} elseif (isset($profile['icons'][1])) {
+		//icon is set and doesn't exist, fallback to default
 		$group_icon_url = $settings['default_images_url'] . '/membericons/' . $profile['icons'][1];
-	else //not set, bye bye
+	} else {
+		//not set, bye bye
 		$group_icon_url = '';
+	}
 
 	// These minimal values are always loaded
 	$memberContext[$user] = array(
@@ -1444,8 +1516,9 @@ 
 	if ($context['loadMemberContext_set'] != 'minimal')
 	{
 		// Go the extra mile and load the user's native language name.
-		if (empty($loadedLanguages))
-			$loadedLanguages = getLanguages();
+		if (empty($loadedLanguages)) {
+					$loadedLanguages = getLanguages();
+		}
 
 		$memberContext[$user] += array(
 			'username_color' => '<span ' . (!empty($profile['member_group_color']) ? 'style="color:' . $profile['member_group_color'] . ';"' : '') . '>' . $profile['member_name'] . '</span>',
@@ -1499,31 +1572,33 @@ 
 	{
 		if (!empty($modSettings['gravatarOverride']) || (!empty($modSettings['gravatarEnabled']) && stristr($profile['avatar'], 'gravatar://')))
 		{
-			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11)
-				$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
-			else
-				$image = get_gravatar_url($profile['email_address']);
-		}
-		else
+			if (!empty($modSettings['gravatarAllowExtraEmail']) && stristr($profile['avatar'], 'gravatar://') && strlen($profile['avatar']) > 11) {
+							$image = get_gravatar_url($smcFunc['substr']($profile['avatar'], 11));
+			} else {
+							$image = get_gravatar_url($profile['email_address']);
+			}
+		} else
 		{
 			// So it's stored in the member table?
 			if (!empty($profile['avatar']))
 			{
 				$image = (stristr($profile['avatar'], 'http://') || stristr($profile['avatar'], 'https://')) ? $profile['avatar'] : $modSettings['avatar_url'] . '/' . $profile['avatar'];
+			} elseif (!empty($profile['filename'])) {
+							$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			}
-			elseif (!empty($profile['filename']))
-				$image = $modSettings['custom_avatar_url'] . '/' . $profile['filename'];
 			// Right... no avatar...use the default one
-			else
-				$image = $modSettings['avatar_url'] . '/default.png';
+			else {
+							$image = $modSettings['avatar_url'] . '/default.png';
+			}
 		}
-		if (!empty($image))
-			$memberContext[$user]['avatar'] = array(
+		if (!empty($image)) {
+					$memberContext[$user]['avatar'] = array(
 				'name' => $profile['avatar'],
 				'image' => '<img class="avatar" src="' . $image . '" alt="avatar_' . $profile['member_name'] . '">',
 				'href' => $image,
 				'url' => $image,
 			);
+		}
 	}
 
 	// Are we also loading the members custom fields into context?
@@ -1531,35 +1606,41 @@ 
 	{
 		$memberContext[$user]['custom_fields'] = array();
 
-		if (!isset($context['display_fields']))
-			$context['display_fields'] = smf_json_decode($modSettings['displayFields'], true);
+		if (!isset($context['display_fields'])) {
+					$context['display_fields'] = smf_json_decode($modSettings['displayFields'], true);
+		}
 
 		foreach ($context['display_fields'] as $custom)
 		{
-			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']]))
-				continue;
+			if (!isset($custom['col_name']) || trim($custom['col_name']) == '' || empty($profile['options'][$custom['col_name']])) {
+							continue;
+			}
 
 			$value = $profile['options'][$custom['col_name']];
 
 			// Don't show the "disabled" option for the "gender" field.
-			if ($custom['col_name'] == 'cust_gender' && $value == 'Disabled')
-				continue;
+			if ($custom['col_name'] == 'cust_gender' && $value == 'Disabled') {
+							continue;
+			}
 
 			// BBC?
-			if ($custom['bbc'])
-				$value = parse_bbc($value);
+			if ($custom['bbc']) {
+							$value = parse_bbc($value);
+			}
 			// ... or checkbox?
-			elseif (isset($custom['type']) && $custom['type'] == 'check')
-				$value = $value ? $txt['yes'] : $txt['no'];
+			elseif (isset($custom['type']) && $custom['type'] == 'check') {
+							$value = $value ? $txt['yes'] : $txt['no'];
+			}
 
 			// Enclosing the user input within some other text?
-			if (!empty($custom['enclose']))
-				$value = strtr($custom['enclose'], array(
+			if (!empty($custom['enclose'])) {
+							$value = strtr($custom['enclose'], array(
 					'{SCRIPTURL}' => $scripturl,
 					'{IMAGES_URL}' => $settings['images_url'],
 					'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 					'{INPUT}' => $value,
 				));
+			}
 
 			$memberContext[$user]['custom_fields'][] = array(
 				'title' => !empty($custom['title']) ? $custom['title'] : $custom['col_name'],
@@ -1586,8 +1667,9 @@ 
 	global $smcFunc, $txt, $scripturl, $settings;
 
 	// Do not waste my time...
-	if (empty($users) || empty($params))
-		return false;
+	if (empty($users) || empty($params)) {
+			return false;
+	}
 
 	// Make sure it's an array.
 	$users = !is_array($users) ? array($users) : array_unique($users);
@@ -1611,31 +1693,36 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// BBC?
-		if (!empty($row['bbc']))
-			$row['value'] = parse_bbc($row['value']);
+		if (!empty($row['bbc'])) {
+					$row['value'] = parse_bbc($row['value']);
+		}
 
 		// ... or checkbox?
-		elseif (isset($row['type']) && $row['type'] == 'check')
-			$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		elseif (isset($row['type']) && $row['type'] == 'check') {
+					$row['value'] = !empty($row['value']) ? $txt['yes'] : $txt['no'];
+		}
 
 		// Enclosing the user input within some other text?
-		if (!empty($row['enclose']))
-			$row['value'] = strtr($row['enclose'], array(
+		if (!empty($row['enclose'])) {
+					$row['value'] = strtr($row['enclose'], array(
 				'{SCRIPTURL}' => $scripturl,
 				'{IMAGES_URL}' => $settings['images_url'],
 				'{DEFAULT_IMAGES_URL}' => $settings['default_images_url'],
 				'{INPUT}' => un_htmlspecialchars($row['value']),
 			));
+		}
 
 		// Send a simple array if there is just 1 param
-		if (count($params) == 1)
-			$return[$row['id_member']] = $row;
+		if (count($params) == 1) {
+					$return[$row['id_member']] = $row;
+		}
 
 		// More than 1? knock yourself out...
 		else
 		{
-			if (!isset($return[$row['id_member']]))
-				$return[$row['id_member']] = array();
+			if (!isset($return[$row['id_member']])) {
+							$return[$row['id_member']] = array();
+			}
 
 			$return[$row['id_member']][$row['variable']] = $row;
 		}
@@ -1669,8 +1756,9 @@ 
 	global $context;
 
 	// Don't know any browser!
-	if (empty($context['browser']))
-		detectBrowser();
+	if (empty($context['browser'])) {
+			detectBrowser();
+	}
 
 	return !empty($context['browser'][$browser]) || !empty($context['browser']['is_' . $browser]) ? true : false;
 }
@@ -1688,8 +1776,9 @@ 
 	global $context, $settings, $options, $sourcedir, $ssi_theme, $smcFunc, $language, $board, $image_proxy_enabled;
 
 	// The theme was specified by parameter.
-	if (!empty($id_theme))
-		$id_theme = (int) $id_theme;
+	if (!empty($id_theme)) {
+			$id_theme = (int) $id_theme;
+	}
 	// The theme was specified by REQUEST.
 	elseif (!empty($_REQUEST['theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
 	{
@@ -1697,51 +1786,58 @@ 
 		$_SESSION['id_theme'] = $id_theme;
 	}
 	// The theme was specified by REQUEST... previously.
-	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum')))
-		$id_theme = (int) $_SESSION['id_theme'];
+	elseif (!empty($_SESSION['id_theme']) && (!empty($modSettings['theme_allow']) || allowedTo('admin_forum'))) {
+			$id_theme = (int) $_SESSION['id_theme'];
+	}
 	// The theme is just the user's choice. (might use ?board=1;theme=0 to force board theme.)
-	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme']))
-		$id_theme = $user_info['theme'];
+	elseif (!empty($user_info['theme']) && !isset($_REQUEST['theme'])) {
+			$id_theme = $user_info['theme'];
+	}
 	// The theme was specified by the board.
-	elseif (!empty($board_info['theme']))
-		$id_theme = $board_info['theme'];
+	elseif (!empty($board_info['theme'])) {
+			$id_theme = $board_info['theme'];
+	}
 	// The theme is the forum's default.
-	else
-		$id_theme = $modSettings['theme_guests'];
+	else {
+			$id_theme = $modSettings['theme_guests'];
+	}
 
 	// Verify the id_theme... no foul play.
 	// Always allow the board specific theme, if they are overriding.
-	if (!empty($board_info['theme']) && $board_info['override_theme'])
-		$id_theme = $board_info['theme'];
+	if (!empty($board_info['theme']) && $board_info['override_theme']) {
+			$id_theme = $board_info['theme'];
+	}
 	// If they have specified a particular theme to use with SSI allow it to be used.
-	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme)
-		$id_theme = (int) $id_theme;
-	elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
+	elseif (!empty($ssi_theme) && $id_theme == $ssi_theme) {
+			$id_theme = (int) $id_theme;
+	} elseif (!empty($modSettings['enableThemes']) && !allowedTo('admin_forum'))
 	{
 		$themes = explode(',', $modSettings['enableThemes']);
-		if (!in_array($id_theme, $themes))
-			$id_theme = $modSettings['theme_guests'];
-		else
+		if (!in_array($id_theme, $themes)) {
+					$id_theme = $modSettings['theme_guests'];
+		} else {
+					$id_theme = (int) $id_theme;
+		}
+	} else {
 			$id_theme = (int) $id_theme;
 	}
-	else
-		$id_theme = (int) $id_theme;
 
 	$member = empty($user_info['id']) ? -1 : $user_info['id'];
 
 	// Disable image proxy if we don't have SSL enabled
-	if (empty($modSettings['force_ssl']) || $modSettings['force_ssl'] < 2)
-		$image_proxy_enabled = false;
+	if (empty($modSettings['force_ssl']) || $modSettings['force_ssl'] < 2) {
+			$image_proxy_enabled = false;
+	}
 
 	if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2 && ($temp = cache_get_data('theme_settings-' . $id_theme . ':' . $member, 60)) != null && time() - 60 > $modSettings['settings_updated'])
 	{
 		$themeData = $temp;
 		$flag = true;
+	} elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated']) {
+			$themeData = $temp + array($member => array());
+	} else {
+			$themeData = array(-1 => array(), 0 => array(), $member => array());
 	}
-	elseif (($temp = cache_get_data('theme_settings-' . $id_theme, 90)) != null && time() - 60 > $modSettings['settings_updated'])
-		$themeData = $temp + array($member => array());
-	else
-		$themeData = array(-1 => array(), 0 => array(), $member => array());
 
 	if (empty($flag))
 	{
@@ -1760,31 +1856,37 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($result))
 		{
 			// There are just things we shouldn't be able to change as members.
-			if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url')))
-				continue;
+			if ($row['id_member'] != 0 && in_array($row['variable'], array('actual_theme_url', 'actual_images_url', 'base_theme_dir', 'base_theme_url', 'default_images_url', 'default_theme_dir', 'default_theme_url', 'default_template', 'images_url', 'number_recent_posts', 'smiley_sets_default', 'theme_dir', 'theme_id', 'theme_layers', 'theme_templates', 'theme_url'))) {
+							continue;
+			}
 
 			// If this is the theme_dir of the default theme, store it.
-			if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member']))
-				$themeData[0]['default_' . $row['variable']] = $row['value'];
+			if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1' && empty($row['id_member'])) {
+							$themeData[0]['default_' . $row['variable']] = $row['value'];
+			}
 
 			// If this isn't set yet, is a theme option, or is not the default theme..
-			if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1')
-				$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+			if (!isset($themeData[$row['id_member']][$row['variable']]) || $row['id_theme'] != '1') {
+							$themeData[$row['id_member']][$row['variable']] = substr($row['variable'], 0, 5) == 'show_' ? $row['value'] == '1' : $row['value'];
+			}
 		}
 		$smcFunc['db_free_result']($result);
 
-		if (!empty($themeData[-1]))
-			foreach ($themeData[-1] as $k => $v)
+		if (!empty($themeData[-1])) {
+					foreach ($themeData[-1] as $k => $v)
 			{
 				if (!isset($themeData[$member][$k]))
 					$themeData[$member][$k] = $v;
+		}
 			}
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2)
-			cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= 2) {
+					cache_put_data('theme_settings-' . $id_theme . ':' . $member, $themeData, 60);
+		}
 		// Only if we didn't already load that part of the cache...
-		elseif (!isset($temp))
-			cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+		elseif (!isset($temp)) {
+					cache_put_data('theme_settings-' . $id_theme, array(-1 => $themeData[-1], 0 => $themeData[0]), 90);
+		}
 	}
 
 	$settings = $themeData[0];
@@ -1801,20 +1903,24 @@ 
 	$settings['template_dirs'][] = $settings['theme_dir'];
 
 	// Based on theme (if there is one).
-	if (!empty($settings['base_theme_dir']))
-		$settings['template_dirs'][] = $settings['base_theme_dir'];
+	if (!empty($settings['base_theme_dir'])) {
+			$settings['template_dirs'][] = $settings['base_theme_dir'];
+	}
 
 	// Lastly the default theme.
-	if ($settings['theme_dir'] != $settings['default_theme_dir'])
-		$settings['template_dirs'][] = $settings['default_theme_dir'];
+	if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+			$settings['template_dirs'][] = $settings['default_theme_dir'];
+	}
 
-	if (!$initialize)
-		return;
+	if (!$initialize) {
+			return;
+	}
 
 	// Check to see if we're forcing SSL
 	if (!empty($modSettings['force_ssl']) && $modSettings['force_ssl'] == 2 && empty($maintenance) &&
-		(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') && SMF != 'SSI')
-		redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')));
+		(!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') && SMF != 'SSI') {
+			redirectexit(strtr($_SERVER['REQUEST_URL'], array('http://' => 'https://')));
+	}
 
 	// Check to see if they're accessing it from the wrong place.
 	if (isset($_SERVER['HTTP_HOST']) || isset($_SERVER['SERVER_NAME']))
@@ -1822,8 +1928,9 @@ 
 		$detected_url = isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on' ? 'https://' : 'http://';
 		$detected_url .= empty($_SERVER['HTTP_HOST']) ? $_SERVER['SERVER_NAME'] . (empty($_SERVER['SERVER_PORT']) || $_SERVER['SERVER_PORT'] == '80' ? '' : ':' . $_SERVER['SERVER_PORT']) : $_SERVER['HTTP_HOST'];
 		$temp = preg_replace('~/' . basename($scripturl) . '(/.+)?$~', '', strtr(dirname($_SERVER['PHP_SELF']), '\\', '/'));
-		if ($temp != '/')
-			$detected_url .= $temp;
+		if ($temp != '/') {
+					$detected_url .= $temp;
+		}
 	}
 	if (isset($detected_url) && $detected_url != $boardurl)
 	{
@@ -1835,8 +1942,9 @@ 
 			foreach ($aliases as $alias)
 			{
 				// Rip off all the boring parts, spaces, etc.
-				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias))
-					$do_fix = true;
+				if ($detected_url == trim($alias) || strtr($detected_url, array('http://' => '', 'https://' => '')) == trim($alias)) {
+									$do_fix = true;
+				}
 			}
 		}
 
@@ -1844,20 +1952,22 @@ 
 		if (empty($do_fix) && strtr($detected_url, array('://' => '://www.')) == $boardurl && (empty($_GET) || count($_GET) == 1) && SMF != 'SSI')
 		{
 			// Okay, this seems weird, but we don't want an endless loop - this will make $_GET not empty ;).
-			if (empty($_GET))
-				redirectexit('wwwRedirect');
-			else
+			if (empty($_GET)) {
+							redirectexit('wwwRedirect');
+			} else
 			{
 				list ($k, $v) = each($_GET);
 
-				if ($k != 'wwwRedirect')
-					redirectexit('wwwRedirect;' . $k . '=' . $v);
+				if ($k != 'wwwRedirect') {
+									redirectexit('wwwRedirect;' . $k . '=' . $v);
+				}
 			}
 		}
 
 		// #3 is just a check for SSL...
-		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl)
-			$do_fix = true;
+		if (strtr($detected_url, array('https://' => 'http://')) == $boardurl) {
+					$do_fix = true;
+		}
 
 		// Okay, #4 - perhaps it's an IP address?  We're gonna want to use that one, then. (assuming it's the IP or something...)
 		if (!empty($do_fix) || preg_match('~^http[s]?://(?:[\d\.:]+|\[[\d:]+\](?::\d+)?)(?:$|/)~', $detected_url) == 1)
@@ -1891,8 +2001,9 @@ 
 					$board_info['moderators'][$k]['link'] = strtr($dummy['link'], array('"' . $oldurl => '"' . $boardurl));
 				}
 			}
-			foreach ($context['linktree'] as $k => $dummy)
-				$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			foreach ($context['linktree'] as $k => $dummy) {
+							$context['linktree'][$k]['url'] = strtr($dummy['url'], array($oldurl => $boardurl));
+			}
 		}
 	}
 	// Set up the contextual user array.
@@ -1911,16 +2022,16 @@ 
 			'email' => $user_info['email'],
 			'ignoreusers' => $user_info['ignoreusers'],
 		);
-		if (!$context['user']['is_guest'])
-			$context['user']['name'] = $user_info['name'];
-		elseif ($context['user']['is_guest'] && !empty($txt['guest_title']))
-			$context['user']['name'] = $txt['guest_title'];
+		if (!$context['user']['is_guest']) {
+					$context['user']['name'] = $user_info['name'];
+		} elseif ($context['user']['is_guest'] && !empty($txt['guest_title'])) {
+					$context['user']['name'] = $txt['guest_title'];
+		}
 
 		// Determine the current smiley set.
 		$user_info['smiley_set'] = (!in_array($user_info['smiley_set'], explode(',', $modSettings['smiley_sets_known'])) && $user_info['smiley_set'] != 'none') || empty($modSettings['smiley_sets_enable']) ? (!empty($settings['smiley_sets_default']) ? $settings['smiley_sets_default'] : $modSettings['smiley_sets_default']) : $user_info['smiley_set'];
 		$context['user']['smiley_set'] = $user_info['smiley_set'];
-	}
-	else
+	} else
 	{
 		$context['user'] = array(
 			'id' => -1,
@@ -1936,18 +2047,24 @@ 
 	}
 
 	// Some basic information...
-	if (!isset($context['html_headers']))
-		$context['html_headers'] = '';
-	if (!isset($context['javascript_files']))
-		$context['javascript_files'] = array();
-	if (!isset($context['css_files']))
-		$context['css_files'] = array();
-	if (!isset($context['css_header']))
-		$context['css_header'] = array();
-	if (!isset($context['javascript_inline']))
-		$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
-	if (!isset($context['javascript_vars']))
-		$context['javascript_vars'] = array();
+	if (!isset($context['html_headers'])) {
+			$context['html_headers'] = '';
+	}
+	if (!isset($context['javascript_files'])) {
+			$context['javascript_files'] = array();
+	}
+	if (!isset($context['css_files'])) {
+			$context['css_files'] = array();
+	}
+	if (!isset($context['css_header'])) {
+			$context['css_header'] = array();
+	}
+	if (!isset($context['javascript_inline'])) {
+			$context['javascript_inline'] = array('standard' => array(), 'defer' => array());
+	}
+	if (!isset($context['javascript_vars'])) {
+			$context['javascript_vars'] = array();
+	}
 
 	$context['login_url'] = (!empty($modSettings['force_ssl']) && $modSettings['force_ssl'] < 2 ? strtr($scripturl, array('http://' => 'https://')) : $scripturl) . '?action=login2';
 	$context['menu_separator'] = !empty($settings['use_image_buttons']) ? ' ' : ' | ';
@@ -1959,8 +2076,9 @@ 
 	$context['current_action'] = isset($_REQUEST['action']) ? $smcFunc['htmlspecialchars']($_REQUEST['action']) : null;
 	$context['current_subaction'] = isset($_REQUEST['sa']) ? $_REQUEST['sa'] : null;
 	$context['can_register'] = empty($modSettings['registration_method']) || $modSettings['registration_method'] != 3;
-	if (isset($modSettings['load_average']))
-		$context['load_average'] = $modSettings['load_average'];
+	if (isset($modSettings['load_average'])) {
+			$context['load_average'] = $modSettings['load_average'];
+	}
 
 	// Detect the browser. This is separated out because it's also used in attachment downloads
 	detectBrowser();
@@ -1974,8 +2092,9 @@ 
 	// This allows sticking some HTML on the page output - useful for controls.
 	$context['insert_after_template'] = '';
 
-	if (!isset($txt))
-		$txt = array();
+	if (!isset($txt)) {
+			$txt = array();
+	}
 
 	$simpleActions = array(
 		'findmember',
@@ -2021,9 +2140,10 @@ 
 
 	// See if theres any extra param to check.
 	$requiresXML = false;
-	foreach ($extraParams as $key => $extra)
-		if (isset($_REQUEST[$extra]))
+	foreach ($extraParams as $key => $extra) {
+			if (isset($_REQUEST[$extra]))
 			$requiresXML = true;
+	}
 
 	// Output is fully XML, so no need for the index template.
 	if (isset($_REQUEST['xml']) && (in_array($context['current_action'], $xmlActions) || $requiresXML))
@@ -2038,37 +2158,39 @@ 
 	{
 		loadLanguage('index+Modifications');
 		$context['template_layers'] = array();
-	}
-
-	else
+	} else
 	{
 		// Custom templates to load, or just default?
-		if (isset($settings['theme_templates']))
-			$templates = explode(',', $settings['theme_templates']);
-		else
-			$templates = array('index');
+		if (isset($settings['theme_templates'])) {
+					$templates = explode(',', $settings['theme_templates']);
+		} else {
+					$templates = array('index');
+		}
 
 		// Load each template...
-		foreach ($templates as $template)
-			loadTemplate($template);
+		foreach ($templates as $template) {
+					loadTemplate($template);
+		}
 
 		// ...and attempt to load their associated language files.
 		$required_files = implode('+', array_merge($templates, array('Modifications')));
 		loadLanguage($required_files, '', false);
 
 		// Custom template layers?
-		if (isset($settings['theme_layers']))
-			$context['template_layers'] = explode(',', $settings['theme_layers']);
-		else
-			$context['template_layers'] = array('html', 'body');
+		if (isset($settings['theme_layers'])) {
+					$context['template_layers'] = explode(',', $settings['theme_layers']);
+		} else {
+					$context['template_layers'] = array('html', 'body');
+		}
 	}
 
 	// Initialize the theme.
 	loadSubTemplate('init', 'ignore');
 
 	// Allow overriding the board wide time/number formats.
-	if (empty($user_settings['time_format']) && !empty($txt['time_format']))
-		$user_info['time_format'] = $txt['time_format'];
+	if (empty($user_settings['time_format']) && !empty($txt['time_format'])) {
+			$user_info['time_format'] = $txt['time_format'];
+	}
 
 	// Set the character set from the template.
 	$context['character_set'] = empty($modSettings['global_character_set']) ? $txt['lang_character_set'] : $modSettings['global_character_set'];
@@ -2076,12 +2198,14 @@ 
 	$context['right_to_left'] = !empty($txt['lang_rtl']);
 
 	// Guests may still need a name.
-	if ($context['user']['is_guest'] && empty($context['user']['name']))
-		$context['user']['name'] = $txt['guest_title'];
+	if ($context['user']['is_guest'] && empty($context['user']['name'])) {
+			$context['user']['name'] = $txt['guest_title'];
+	}
 
 	// Any theme-related strings that need to be loaded?
-	if (!empty($settings['require_theme_strings']))
-		loadLanguage('ThemeStrings', '', false);
+	if (!empty($settings['require_theme_strings'])) {
+			loadLanguage('ThemeStrings', '', false);
+	}
 
 	// Make a special URL for the language.
 	$settings['lang_images_url'] = $settings['images_url'] . '/' . (!empty($txt['image_lang']) ? $txt['image_lang'] : $user_info['language']);
@@ -2092,8 +2216,9 @@ 
 	// Here is my luvly Responsive CSS
 	loadCSSFile('responsive.css', array('force_current' => false, 'validate' => true, 'minimize' => true), 'smf_responsive');
 
-	if ($context['right_to_left'])
-		loadCSSFile('rtl.css', array(), 'smf_rtl');
+	if ($context['right_to_left']) {
+			loadCSSFile('rtl.css', array(), 'smf_rtl');
+	}
 
 	// We allow theme variants, because we're cool.
 	$context['theme_variant'] = '';
@@ -2101,14 +2226,17 @@ 
 	if (!empty($settings['theme_variants']))
 	{
 		// Overriding - for previews and that ilk.
-		if (!empty($_REQUEST['variant']))
-			$_SESSION['id_variant'] = $_REQUEST['variant'];
+		if (!empty($_REQUEST['variant'])) {
+					$_SESSION['id_variant'] = $_REQUEST['variant'];
+		}
 		// User selection?
-		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum'))
-			$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		if (empty($settings['disable_user_variant']) || allowedTo('admin_forum')) {
+					$context['theme_variant'] = !empty($_SESSION['id_variant']) ? $_SESSION['id_variant'] : (!empty($options['theme_variant']) ? $options['theme_variant'] : '');
+		}
 		// If not a user variant, select the default.
-		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants']))
-			$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		if ($context['theme_variant'] == '' || !in_array($context['theme_variant'], $settings['theme_variants'])) {
+					$context['theme_variant'] = !empty($settings['default_variant']) && in_array($settings['default_variant'], $settings['theme_variants']) ? $settings['default_variant'] : $settings['theme_variants'][0];
+		}
 
 		// Do this to keep things easier in the templates.
 		$context['theme_variant'] = '_' . $context['theme_variant'];
@@ -2117,20 +2245,23 @@ 
 		if (!empty($context['theme_variant']))
 		{
 			loadCSSFile('index' . $context['theme_variant'] . '.css', array(), 'smf_index' . $context['theme_variant']);
-			if ($context['right_to_left'])
-				loadCSSFile('rtl' . $context['theme_variant'] . '.css', array(), 'smf_rtl' . $context['theme_variant']);
+			if ($context['right_to_left']) {
+							loadCSSFile('rtl' . $context['theme_variant'] . '.css', array(), 'smf_rtl' . $context['theme_variant']);
+			}
 		}
 	}
 
 	// Let's be compatible with old themes!
-	if (!function_exists('template_html_above') && in_array('html', $context['template_layers']))
-		$context['template_layers'] = array('main');
+	if (!function_exists('template_html_above') && in_array('html', $context['template_layers'])) {
+			$context['template_layers'] = array('main');
+	}
 
 	$context['tabindex'] = 1;
 
 	// Compatibility.
-	if (!isset($settings['theme_version']))
-		$modSettings['memberCount'] = $modSettings['totalMembers'];
+	if (!isset($settings['theme_version'])) {
+			$modSettings['memberCount'] = $modSettings['totalMembers'];
+	}
 
 	// Default JS variables for use in every theme
 	$context['javascript_vars'] = array(
@@ -2149,18 +2280,18 @@ 
 	);
 
 	// Add the JQuery library to the list of files to load.
-	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn')
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local')
-		loadJavaScriptFile('jquery-2.1.4.min.js', array('seed' => false), 'smf_jquery');
-
-	elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom')
-		loadJavaScriptFile($modSettings['jquery_custom'], array(), 'smf_jquery');
+	if (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'cdn') {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source']) && $modSettings['jquery_source'] == 'local') {
+			loadJavaScriptFile('jquery-2.1.4.min.js', array('seed' => false), 'smf_jquery');
+	} elseif (isset($modSettings['jquery_source'], $modSettings['jquery_custom']) && $modSettings['jquery_source'] == 'custom') {
+			loadJavaScriptFile($modSettings['jquery_custom'], array(), 'smf_jquery');
+	}
 
 	// Auto loading? template_javascript() will take care of the local half of this.
-	else
-		loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
+	else {
+			loadJavaScriptFile('https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js', array('external' => true), 'smf_jquery');
+	}
 
 	// Queue our JQuery plugins!
 	loadJavaScriptFile('smf_jquery_plugins.js', array('minimize' => true), 'smf_jquery_plugins');
@@ -2183,12 +2314,12 @@ 
 			require_once($sourcedir . '/ScheduledTasks.php');
 
 			// What to do, what to do?!
-			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time())
-				AutoTask();
-			else
-				ReduceMailQueue();
-		}
-		else
+			if (empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time()) {
+							AutoTask();
+			} else {
+							ReduceMailQueue();
+			}
+		} else
 		{
 			$type = empty($modSettings['next_task_time']) || $modSettings['next_task_time'] < time() ? 'task' : 'mailq';
 			$ts = $type == 'mailq' ? $modSettings['mail_next_send'] : $modSettings['next_task_time'];
@@ -2239,8 +2370,9 @@ 
 		foreach ($theme_includes as $include)
 		{
 			$include = strtr(trim($include), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
-			if (file_exists($include))
-				require_once($include);
+			if (file_exists($include)) {
+							require_once($include);
+			}
 		}
 	}
 
@@ -2270,16 +2402,19 @@ 
 	// Do any style sheets first, cause we're easy with those.
 	if (!empty($style_sheets))
 	{
-		if (!is_array($style_sheets))
-			$style_sheets = array($style_sheets);
+		if (!is_array($style_sheets)) {
+					$style_sheets = array($style_sheets);
+		}
 
-		foreach ($style_sheets as $sheet)
-			loadCSSFile($sheet . '.css', array(), $sheet);
+		foreach ($style_sheets as $sheet) {
+					loadCSSFile($sheet . '.css', array(), $sheet);
+		}
 	}
 
 	// No template to load?
-	if ($template_name === false)
-		return true;
+	if ($template_name === false) {
+			return true;
+	}
 
 	$loaded = false;
 	foreach ($settings['template_dirs'] as $template_dir)
@@ -2294,12 +2429,14 @@ 
 
 	if ($loaded)
 	{
-		if ($db_show_debug === true)
-			$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		if ($db_show_debug === true) {
+					$context['debug']['templates'][] = $template_name . ' (' . basename($template_dir) . ')';
+		}
 
 		// If they have specified an initialization function for this template, go ahead and call it now.
-		if (function_exists('template_' . $template_name . '_init'))
-			call_user_func('template_' . $template_name . '_init');
+		if (function_exists('template_' . $template_name . '_init')) {
+					call_user_func('template_' . $template_name . '_init');
+		}
 	}
 	// Hmmm... doesn't exist?!  I don't suppose the directory is wrong, is it?
 	elseif (!file_exists($settings['default_theme_dir']) && file_exists($boarddir . '/Themes/default'))
@@ -2319,13 +2456,14 @@ 
 		loadTemplate($template_name);
 	}
 	// Cause an error otherwise.
-	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal)
-		fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
-	elseif ($fatal)
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
-	else
-		return false;
-}
+	elseif ($template_name != 'Errors' && $template_name != 'index' && $fatal) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $template_name));
+	} elseif ($fatal) {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load Themes/default/%s.template.php!', (string) $template_name), 'template'));
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Load a sub-template.
@@ -2343,17 +2481,19 @@ 
 {
 	global $context, $txt, $db_show_debug;
 
-	if ($db_show_debug === true)
-		$context['debug']['sub_templates'][] = $sub_template_name;
+	if ($db_show_debug === true) {
+			$context['debug']['sub_templates'][] = $sub_template_name;
+	}
 
 	// Figure out what the template function is named.
 	$theme_function = 'template_' . $sub_template_name;
-	if (function_exists($theme_function))
-		$theme_function();
-	elseif ($fatal === false)
-		fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
-	elseif ($fatal !== 'ignore')
-		die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	if (function_exists($theme_function)) {
+			$theme_function();
+	} elseif ($fatal === false) {
+			fatal_lang_error('theme_template_error', 'template', array((string) $sub_template_name));
+	} elseif ($fatal !== 'ignore') {
+			die(log_error(sprintf(isset($txt['theme_template_error']) ? $txt['theme_template_error'] : 'Unable to load the %s sub template!', (string) $sub_template_name), 'template'));
+	}
 
 	// Are we showing debugging for templates?  Just make sure not to do it before the doctype...
 	if (allowedTo('admin_forum') && isset($_REQUEST['debug']) && !in_array($sub_template_name, array('init', 'main_below')) && ob_get_length() > 0 && !isset($_REQUEST['xml']))
@@ -2390,8 +2530,9 @@ 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.css?alp21 filenames
 	$has_seed = strpos($fileName, '.css?');
@@ -2408,13 +2549,10 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
+			} else {
+							$fileUrl = false;
 			}
-
-			else
-				$fileUrl = false;
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/css/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2429,12 +2567,14 @@ 
 	}
 
 	// Add it to the array for use in the template
-	if (!empty($fileName))
-		$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	if (!empty($fileName)) {
+			$context['css_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	}
 
-	if (!empty($context['right_to_left']) && !empty($params['rtl']))
-		loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
-}
+	if (!empty($context['right_to_left']) && !empty($params['rtl'])) {
+			loadCSSFile($params['rtl'], array_diff_key($params, array('rtl' => 0)));
+	}
+	}
 
 /**
  * Add a block of inline css code to be executed later
@@ -2451,8 +2591,9 @@ 
 	global $context;
 
 	// Gotta add something...
-	if (empty($css))
-		return false;
+	if (empty($css)) {
+			return false;
+	}
 
 	$context['css_header'][] = $css;
 }
@@ -2487,8 +2628,9 @@ 
 	$params['validate'] = isset($params['validate']) ? $params['validate'] : true;
 
 	// If this is an external file, automatically set this to false.
-	if (!empty($params['external']))
-		$params['minimize'] = false;
+	if (!empty($params['external'])) {
+			$params['minimize'] = false;
+	}
 
 	// Account for shorthand like admin.js?alp21 filenames
 	$has_seed = strpos($fileName, '.js?');
@@ -2505,16 +2647,12 @@ 
 			{
 				$fileUrl = $settings['default_theme_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 				$filePath = $settings['default_theme_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
-			}
-
-			else
+			} else
 			{
 				$fileUrl = false;
 				$filePath = false;
 			}
-		}
-
-		else
+		} else
 		{
 			$fileUrl = $settings[$themeRef . '_url'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
 			$filePath = $settings[$themeRef . '_dir'] . '/scripts/' . $fileName . ($has_seed ? '' : $params['seed']);
@@ -2529,9 +2667,10 @@ 
 	}
 
 	// Add it to the array for use in the template
-	if (!empty($fileName))
-		$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
-}
+	if (!empty($fileName)) {
+			$context['javascript_files'][$id] = array('fileUrl' => $fileUrl, 'filePath' => $filePath, 'fileName' => $fileName, 'options' => $params);
+	}
+	}
 
 /**
  * Add a Javascript variable for output later (for feeding text strings and similar to JS)
@@ -2545,9 +2684,10 @@ 
 {
 	global $context;
 
-	if (!empty($key) && (!empty($value) || $value === '0'))
-		$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
-}
+	if (!empty($key) && (!empty($value) || $value === '0')) {
+			$context['javascript_vars'][$key] = !empty($escape) ? JavaScriptEscape($value) : $value;
+	}
+	}
 
 /**
  * Add a block of inline Javascript code to be executed later
@@ -2564,8 +2704,9 @@ 
 {
 	global $context;
 
-	if (empty($javascript))
-		return false;
+	if (empty($javascript)) {
+			return false;
+	}
 
 	$context['javascript_inline'][($defer === true ? 'defer' : 'standard')][] = $javascript;
 }
@@ -2586,15 +2727,18 @@ 
 	static $already_loaded = array();
 
 	// Default to the user's language.
-	if ($lang == '')
-		$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	if ($lang == '') {
+			$lang = isset($user_info['language']) ? $user_info['language'] : $language;
+	}
 
 	// Do we want the English version of language file as fallback?
-	if (empty($modSettings['disable_language_fallback']) && $lang != 'english')
-		loadLanguage($template_name, 'english', false);
+	if (empty($modSettings['disable_language_fallback']) && $lang != 'english') {
+			loadLanguage($template_name, 'english', false);
+	}
 
-	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang)
-		return $lang;
+	if (!$force_reload && isset($already_loaded[$template_name]) && $already_loaded[$template_name] == $lang) {
+			return $lang;
+	}
 
 	// Make sure we have $settings - if not we're in trouble and need to find it!
 	if (empty($settings['default_theme_dir']))
@@ -2605,8 +2749,9 @@ 
 
 	// What theme are we in?
 	$theme_name = basename($settings['theme_url']);
-	if (empty($theme_name))
-		$theme_name = 'unknown';
+	if (empty($theme_name)) {
+			$theme_name = 'unknown';
+	}
 
 	// For each file open it up and write it out!
 	foreach (explode('+', $template_name) as $template)
@@ -2685,8 +2830,9 @@ 
 	}
 
 	// Keep track of what we're up to soldier.
-	if ($db_show_debug === true)
-		$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	if ($db_show_debug === true) {
+			$context['debug']['language_files'][] = $template_name . '.' . $lang . ' (' . $theme_name . ')';
+	}
 
 	// Remember what we have loaded, and in which language.
 	$already_loaded[$template_name] = $lang;
@@ -2732,8 +2878,9 @@ 
 				)
 			);
 			// In the EXTREMELY unlikely event this happens, give an error message.
-			if ($smcFunc['db_num_rows']($result) == 0)
-				fatal_lang_error('parent_not_found', 'critical');
+			if ($smcFunc['db_num_rows']($result) == 0) {
+							fatal_lang_error('parent_not_found', 'critical');
+			}
 			while ($row = $smcFunc['db_fetch_assoc']($result))
 			{
 				if (!isset($boards[$row['id_board']]))
@@ -2750,8 +2897,8 @@ 
 					);
 				}
 				// If a moderator exists for this board, add that moderator for all children too.
-				if (!empty($row['id_moderator']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderators'][$row['id_moderator']] = array(
 							'id' => $row['id_moderator'],
@@ -2759,11 +2906,12 @@ 
 							'href' => $scripturl . '?action=profile;u=' . $row['id_moderator'],
 							'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_moderator'] . '">' . $row['real_name'] . '</a>'
 						);
+				}
 					}
 
 				// If a moderator group exists for this board, add that moderator group for all children too
-				if (!empty($row['id_moderator_group']))
-					foreach ($boards as $id => $dummy)
+				if (!empty($row['id_moderator_group'])) {
+									foreach ($boards as $id => $dummy)
 					{
 						$boards[$id]['moderator_groups'][$row['id_moderator_group']] = array(
 							'id' => $row['id_moderator_group'],
@@ -2771,6 +2919,7 @@ 
 							'href' => $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'],
 							'link' => '<a href="' . $scripturl . '?action=groups;sa=members;group=' . $row['id_moderator_group'] . '">' . $row['group_name'] . '</a>'
 						);
+				}
 					}
 			}
 			$smcFunc['db_free_result']($result);
@@ -2798,23 +2947,27 @@ 
 	if (!$use_cache || ($context['languages'] = cache_get_data('known_languages' . ($favor_utf8 ? '' : '_all'), !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600)) == null)
 	{
 		// If we don't have our ucwords function defined yet, let's load the settings data.
-		if (empty($smcFunc['ucwords']))
-			reloadSettings();
+		if (empty($smcFunc['ucwords'])) {
+					reloadSettings();
+		}
 
 		// If we don't have our theme information yet, let's get it.
-		if (empty($settings['default_theme_dir']))
-			loadTheme(0, false);
+		if (empty($settings['default_theme_dir'])) {
+					loadTheme(0, false);
+		}
 
 		// Default language directories to try.
 		$language_directories = array(
 			$settings['default_theme_dir'] . '/languages',
 		);
-		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir'])
-			$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		if (!empty($settings['actual_theme_dir']) && $settings['actual_theme_dir'] != $settings['default_theme_dir']) {
+					$language_directories[] = $settings['actual_theme_dir'] . '/languages';
+		}
 
 		// We possibly have a base theme directory.
-		if (!empty($settings['base_theme_dir']))
-			$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		if (!empty($settings['base_theme_dir'])) {
+					$language_directories[] = $settings['base_theme_dir'] . '/languages';
+		}
 
 		// Remove any duplicates.
 		$language_directories = array_unique($language_directories);
@@ -2828,20 +2981,21 @@ 
 		foreach ($language_directories as $language_dir)
 		{
 			// Can't look in here... doesn't exist!
-			if (!file_exists($language_dir))
-				continue;
+			if (!file_exists($language_dir)) {
+							continue;
+			}
 
 			$dir = dir($language_dir);
 			while ($entry = $dir->read())
 			{
 				// Look for the index language file....
-				if (!preg_match('~^index\.(.+)\.php$~', $entry, $matches))
-					continue;
-
-				if (!empty($langList) && !empty($langList[$matches[1]]))
-					$langName = $langList[$matches[1]];
+				if (!preg_match('~^index\.(.+)\.php$~', $entry, $matches)) {
+									continue;
+				}
 
-				else
+				if (!empty($langList) && !empty($langList[$matches[1]])) {
+									$langName = $langList[$matches[1]];
+				} else
 				{
 					$langName = $smcFunc['ucwords'](strtr($matches[1], array('_' => ' ')));
 
@@ -2884,20 +3038,23 @@ 
 		}
 
 		// Do we need to store the lang list?
-		if (empty($langList))
-			updateSettings(array('langList' => json_encode($catchLang)));
+		if (empty($langList)) {
+					updateSettings(array('langList' => json_encode($catchLang)));
+		}
 
 		// Favoring UTF8? Then prevent us from selecting non-UTF8 versions.
 		if ($favor_utf8)
 		{
-			foreach ($context['languages'] as $lang)
-				if (substr($lang['filename'], strlen($lang['filename']) - 5, 5) != '-utf8' && isset($context['languages'][$lang['filename'] . '-utf8']))
+			foreach ($context['languages'] as $lang) {
+							if (substr($lang['filename'], strlen($lang['filename']) - 5, 5) != '-utf8' && isset($context['languages'][$lang['filename'] . '-utf8']))
 					unset($context['languages'][$lang['filename']]);
+			}
 		}
 
 		// Let's cash in on this deal.
-		if (!empty($modSettings['cache_enable']))
-			cache_put_data('known_languages' . ($favor_utf8 ? '' : '_all'), $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		if (!empty($modSettings['cache_enable'])) {
+					cache_put_data('known_languages' . ($favor_utf8 ? '' : '_all'), $context['languages'], !empty($modSettings['cache_enable']) && $modSettings['cache_enable'] < 1 ? 86400 : 3600);
+		}
 	}
 
 	return $context['languages'];
@@ -2920,8 +3077,9 @@ 
 	global $modSettings, $options, $txt;
 	static $censor_vulgar = null, $censor_proper;
 
-	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '')
-		return $text;
+	if ((!empty($options['show_no_censored']) && !empty($modSettings['allow_no_censored']) && !$force) || empty($modSettings['censor_vulgar']) || trim($text) === '') {
+			return $text;
+	}
 
 	// If they haven't yet been loaded, load them.
 	if ($censor_vulgar == null)
@@ -2949,9 +3107,9 @@ 
 	{
 		$func = !empty($modSettings['censorIgnoreCase']) ? 'str_ireplace' : 'str_replace';
 		$text = $func($censor_vulgar, $censor_proper, $text);
+	} else {
+			$text = preg_replace($censor_vulgar, $censor_proper, $text);
 	}
-	else
-		$text = preg_replace($censor_vulgar, $censor_proper, $text);
 
 	return $text;
 }
@@ -2977,38 +3135,42 @@ 
 	@ini_set('track_errors', '1');
 
 	// Don't include the file more than once, if $once is true.
-	if ($once && in_array($filename, $templates))
-		return;
+	if ($once && in_array($filename, $templates)) {
+			return;
+	}
 	// Add this file to the include list, whether $once is true or not.
-	else
-		$templates[] = $filename;
+	else {
+			$templates[] = $filename;
+	}
 
 	// Are we going to use eval?
 	if (empty($modSettings['disableTemplateEval']))
 	{
 		$file_found = file_exists($filename) && eval('?' . '>' . rtrim(file_get_contents($filename))) !== false;
 		$settings['current_include_filename'] = $filename;
-	}
-	else
+	} else
 	{
 		$file_found = file_exists($filename);
 
-		if ($once && $file_found)
-			require_once($filename);
-		elseif ($file_found)
-			require($filename);
+		if ($once && $file_found) {
+					require_once($filename);
+		} elseif ($file_found) {
+					require($filename);
+		}
 	}
 
 	if ($file_found !== true)
 	{
 		ob_end_clean();
-		if (!empty($modSettings['enableCompressedOutput']))
-			@ob_start('ob_gzhandler');
-		else
-			ob_start();
+		if (!empty($modSettings['enableCompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
-		if (isset($_GET['debug']))
-			header('Content-Type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		if (isset($_GET['debug'])) {
+					header('Content-Type: application/xhtml+xml; charset=' . (empty($context['character_set']) ? 'ISO-8859-1' : $context['character_set']));
+		}
 
 		// Don't cache error pages!!
 		header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -3027,12 +3189,13 @@ 
 		echo '<!DOCTYPE html>
 <html', !empty($context['right_to_left']) ? ' dir="rtl"' : '', '>
 	<head>';
-		if (isset($context['character_set']))
-			echo '
+		if (isset($context['character_set'])) {
+					echo '
 		<meta charset="', $context['character_set'], '">';
+		}
 
-		if (!empty($maintenance) && !allowedTo('admin_forum'))
-			echo '
+		if (!empty($maintenance) && !allowedTo('admin_forum')) {
+					echo '
 		<title>', $mtitle, '</title>
 	</head>
 	<body>
@@ -3040,8 +3203,8 @@ 
 		', $mmessage, '
 	</body>
 </html>';
-		elseif (!allowedTo('admin_forum'))
-			echo '
+		} elseif (!allowedTo('admin_forum')) {
+					echo '
 		<title>', $txt['template_parse_error'], '</title>
 	</head>
 	<body>
@@ -3049,15 +3212,17 @@ 
 		', $txt['template_parse_error_message'], '
 	</body>
 </html>';
-		else
+		} else
 		{
 			require_once($sourcedir . '/Subs-Package.php');
 
 			$error = fetch_web_data($boardurl . strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
-			if (empty($error) && ini_get('track_errors') && !empty($php_errormsg))
-				$error = $php_errormsg;
-			if (empty($error))
-				$error = $txt['template_parse_errmsg'];
+			if (empty($error) && ini_get('track_errors') && !empty($php_errormsg)) {
+							$error = $php_errormsg;
+			}
+			if (empty($error)) {
+							$error = $txt['template_parse_errmsg'];
+			}
 
 			$error = strtr($error, array('<b>' => '<strong>', '</b>' => '</strong>'));
 
@@ -3068,11 +3233,12 @@ 
 		<h3>', $txt['template_parse_error'], '</h3>
 		', sprintf($txt['template_parse_error_details'], strtr($filename, array($boarddir => '', strtr($boarddir, '\\', '/') => '')));
 
-			if (!empty($error))
-				echo '
+			if (!empty($error)) {
+							echo '
 		<hr>
 
 		<div style="margin: 0 20px;"><pre>', strtr(strtr($error, array('<strong>' . $boarddir => '<strong>...', '<strong>' . strtr($boarddir, '\\', '/') => '<strong>...')), '\\', '/'), '</pre></div>';
+			}
 
 			// I know, I know... this is VERY COMPLICATED.  Still, it's good.
 			if (preg_match('~ <strong>(\d+)</strong><br( /)?' . '>$~i', $error, $match) != 0)
@@ -3082,10 +3248,11 @@ 
 				$data2 = preg_split('~\<br( /)?\>~', $data2);
 
 				// Fix the PHP code stuff...
-				if (!isBrowser('gecko'))
-					$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
-				else
-					$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				if (!isBrowser('gecko')) {
+									$data2 = str_replace("\t", '<span style="white-space: pre;">' . "\t" . '</span>', $data2);
+				} else {
+									$data2 = str_replace('<pre style="display: inline;">' . "\t" . '</pre>', "\t", $data2);
+				}
 
 				// Now we get to work around a bug in PHP where it doesn't escape <br>s!
 				$j = -1;
@@ -3093,8 +3260,9 @@ 
 				{
 					$j++;
 
-					if (substr_count($line, '<br>') == 0)
-						continue;
+					if (substr_count($line, '<br>') == 0) {
+											continue;
+					}
 
 					$n = substr_count($line, '<br>');
 					for ($i = 0; $i < $n; $i++)
@@ -3113,38 +3281,42 @@ 
 				// Figure out what the color coding was before...
 				$line = max($match[1] - 9, 1);
 				$last_line = '';
-				for ($line2 = $line - 1; $line2 > 1; $line2--)
-					if (strpos($data2[$line2], '<') !== false)
+				for ($line2 = $line - 1; $line2 > 1; $line2--) {
+									if (strpos($data2[$line2], '<') !== false)
 					{
 						if (preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line2], $color_match) != 0)
 							$last_line = $color_match[1];
+				}
 						break;
 					}
 
 				// Show the relevant lines...
 				for ($n = min($match[1] + 4, count($data2) + 1); $line <= $n; $line++)
 				{
-					if ($line == $match[1])
-						echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					if ($line == $match[1]) {
+											echo '</pre><div style="background-color: #ffb0b5;"><pre style="margin: 0;">';
+					}
 
 					echo '<span style="color: black;">', sprintf('%' . strlen($n) . 's', $line), ':</span> ';
-					if (isset($data2[$line]) && $data2[$line] != '')
-						echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					if (isset($data2[$line]) && $data2[$line] != '') {
+											echo substr($data2[$line], 0, 2) == '</' ? preg_replace('~^</[^>]+>~', '', $data2[$line]) : $last_line . $data2[$line];
+					}
 
 					if (isset($data2[$line]) && preg_match('~(<[^/>]+>)[^<]*$~', $data2[$line], $color_match) != 0)
 					{
 						$last_line = $color_match[1];
 						echo '</', substr($last_line, 1, 4), '>';
+					} elseif ($last_line != '' && strpos($data2[$line], '<') !== false) {
+											$last_line = '';
+					} elseif ($last_line != '' && $data2[$line] != '') {
+											echo '</', substr($last_line, 1, 4), '>';
 					}
-					elseif ($last_line != '' && strpos($data2[$line], '<') !== false)
-						$last_line = '';
-					elseif ($last_line != '' && $data2[$line] != '')
-						echo '</', substr($last_line, 1, 4), '>';
 
-					if ($line == $match[1])
-						echo '</pre></div><pre style="margin: 0;">';
-					else
-						echo "\n";
+					if ($line == $match[1]) {
+											echo '</pre></div><pre style="margin: 0;">';
+					} else {
+											echo "\n";
+					}
 				}
 
 				echo '</pre></div>';
@@ -3168,8 +3340,9 @@ 
 	global $db_type, $db_name, $ssi_db_user, $ssi_db_passwd, $sourcedir, $db_prefix, $db_port;
 
 	// Figure out what type of database we are using.
-	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
-		$db_type = 'mysql';
+	if (empty($db_type) || !file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php')) {
+			$db_type = 'mysql';
+	}
 
 	// Load the file for the database.
 	require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
@@ -3177,8 +3350,9 @@ 
 	$db_options = array();
 
 	// Add in the port if needed
-	if (!empty($db_port))
-		$db_options['port'] = $db_port;
+	if (!empty($db_port)) {
+			$db_options['port'] = $db_port;
+	}
 
 	// If we are in SSI try them first, but don't worry if it doesn't work, we have the normal username and password we can use.
 	if (SMF == 'SSI' && !empty($ssi_db_user) && !empty($ssi_db_passwd))
@@ -3197,13 +3371,15 @@ 
 	}
 
 	// Safe guard here, if there isn't a valid connection lets put a stop to it.
-	if (!$db_connection)
-		display_db_error();
+	if (!$db_connection) {
+			display_db_error();
+	}
 
 	// If in SSI mode fix up the prefix.
-	if (SMF == 'SSI')
-		db_fix_prefix($db_prefix, $db_name);
-}
+	if (SMF == 'SSI') {
+			db_fix_prefix($db_prefix, $db_name);
+	}
+	}
 
 /**
  * Try to load up a supported caching method. This is saved in $cacheAPI if we are not overriding it.
@@ -3217,10 +3393,11 @@ 
 	global $sourcedir, $cacheAPI, $cache_accelerator;
 
 	// Not overriding this and we have a cacheAPI, send it back.
-	if (empty($overrideCache) && is_object($cacheAPI))
-		return $cacheAPI;
-	elseif (is_null($cacheAPI))
-		$cacheAPI = false;
+	if (empty($overrideCache) && is_object($cacheAPI)) {
+			return $cacheAPI;
+	} elseif (is_null($cacheAPI)) {
+			$cacheAPI = false;
+	}
 
 	// Make sure our class is in session.
 	require_once($sourcedir . '/Class-CacheAPI.php');
@@ -3241,8 +3418,9 @@ 
 		if (!$testAPI->isSupported())
 		{
 			// Can we save ourselves?
-			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf')
-				return loadCacheAccelerator(null, false);
+			if (!empty($fallbackSMF) && is_null($overrideCache) && $tryAccelerator != 'smf') {
+							return loadCacheAccelerator(null, false);
+			}
 			return false;
 		}
 
@@ -3254,9 +3432,9 @@ 
 		{
 			$cacheAPI = $testAPI;
 			return $cacheAPI;
+		} else {
+					return $testAPI;
 		}
-		else
-			return $testAPI;
 	}
 }
 
@@ -3276,8 +3454,9 @@ 
 
 	// @todo Why are we doing this if caching is disabled?
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('pre_cache_quick_get', array(&$key, &$file, &$function, &$params, &$level));
+	}
 
 	/* Refresh the cache if either:
 		1. Caching is disabled.
@@ -3291,16 +3470,19 @@ 
 		require_once($sourcedir . '/' . $file);
 		$cache_block = call_user_func_array($function, $params);
 
-		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level)
-			cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		if (!empty($modSettings['cache_enable']) && $modSettings['cache_enable'] >= $level) {
+					cache_put_data($key, $cache_block, $cache_block['expires'] - time());
+		}
 	}
 
 	// Some cached data may need a freshening up after retrieval.
-	if (!empty($cache_block['post_retri_eval']))
-		eval($cache_block['post_retri_eval']);
+	if (!empty($cache_block['post_retri_eval'])) {
+			eval($cache_block['post_retri_eval']);
+	}
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('post_cache_quick_get', array(&$cache_block));
+	}
 
 	return $cache_block['data'];
 }
@@ -3327,8 +3509,9 @@ 
 	global $boardurl, $modSettings, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3341,12 +3524,14 @@ 
 	$value = $value === null ? null : json_encode($value);
 	$cacheAPI->putData($key, $value, $ttl);
 
-	if (function_exists('call_integration_hook'))
-		call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	if (function_exists('call_integration_hook')) {
+			call_integration_hook('cache_put_data', array(&$key, &$value, &$ttl));
+	}
 
-	if (isset($db_show_debug) && $db_show_debug === true)
-		$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
-}
+	if (isset($db_show_debug) && $db_show_debug === true) {
+			$cache_hits[$cache_count]['t'] = array_sum(explode(' ', microtime())) - array_sum(explode(' ', $st));
+	}
+	}
 
 /**
  * Gets the value from the cache specified by key, so long as it is not older than ttl seconds.
@@ -3362,8 +3547,9 @@ 
 	global $boardurl, $modSettings, $cache_enable, $cacheAPI;
 	global $cache_hits, $cache_count, $cache_misses, $cache_count_misses, $db_show_debug;
 
-	if (empty($cache_enable) || empty($cacheAPI))
-		return;
+	if (empty($cache_enable) || empty($cacheAPI)) {
+			return;
+	}
 
 	$cache_count = isset($cache_count) ? $cache_count + 1 : 1;
 	if (isset($db_show_debug) && $db_show_debug === true)
@@ -3383,16 +3569,18 @@ 
 
 		if (empty($value))
 		{
-			if (!is_array($cache_misses))
-				$cache_misses = array();
+			if (!is_array($cache_misses)) {
+							$cache_misses = array();
+			}
 
 			$cache_count_misses = isset($cache_count_misses) ? $cache_count_misses + 1 : 1;
 			$cache_misses[$cache_count_misses] = array('k' => $original_key, 'd' => 'get');
 		}
 	}
 
-	if (function_exists('call_integration_hook') && isset($value))
-		call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	if (function_exists('call_integration_hook') && isset($value)) {
+			call_integration_hook('cache_get_data', array(&$key, &$ttl, &$value));
+	}
 
 	return empty($value) ? null : smf_json_decode($value, true);
 }
@@ -3414,8 +3602,9 @@ 
 	global $cachedir, $sourcedir, $modSettings, $cacheAPI;
 
 	// If we can't get to the API, can't do this.
-	if (empty($cacheAPI))
-		return false;
+	if (empty($cacheAPI)) {
+			return false;
+	}
 
 	// Ask the API to do the heavy lifting. cleanCache also calls invalidateCache to be sure.
 	$value = $cacheAPI->cleanCache($type);
@@ -3440,8 +3629,9 @@ 
 	global $modSettings, $boardurl, $smcFunc, $image_proxy_enabled, $image_proxy_secret;
 
 	// Come on!
-	if (empty($data))
-		return array();
+	if (empty($data)) {
+			return array();
+	}
 
 	// Set a nice default var.
 	$image = '';
@@ -3449,11 +3639,11 @@ 
 	// Gravatar has been set as mandatory!
 	if (!empty($modSettings['gravatarOverride']))
 	{
-		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://'))
-			$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
-
-		else if (!empty($data['email']))
-			$image = get_gravatar_url($data['email']);
+		if (!empty($modSettings['gravatarAllowExtraEmail']) && !empty($data['avatar']) && stristr($data['avatar'], 'gravatar://')) {
+					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+		} else if (!empty($data['email'])) {
+					$image = get_gravatar_url($data['email']);
+		}
 	}
 
 	// Look if the user has a gravatar field or has set an external url as avatar.
@@ -3465,54 +3655,60 @@ 
 			// Gravatar.
 			if (stristr($data['avatar'], 'gravatar://'))
 			{
-				if ($data['avatar'] == 'gravatar://')
-					$image = get_gravatar_url($data['email']);
-
-				elseif (!empty($modSettings['gravatarAllowExtraEmail']))
-					$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				if ($data['avatar'] == 'gravatar://') {
+									$image = get_gravatar_url($data['email']);
+				} elseif (!empty($modSettings['gravatarAllowExtraEmail'])) {
+									$image = get_gravatar_url($smcFunc['substr']($data['avatar'], 11));
+				}
 			}
 
 			// External url.
 			else
 			{
 				// Using ssl?
-				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false)
-					$image = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($data['avatar']) . '&hash=' . md5($data['avatar'] . $image_proxy_secret);
+				if (!empty($modSettings['force_ssl']) && $image_proxy_enabled && stripos($data['avatar'], 'http://') !== false) {
+									$image = strtr($boardurl, array('http://' => 'https://')) . '/proxy.php?request=' . urlencode($data['avatar']) . '&hash=' . md5($data['avatar'] . $image_proxy_secret);
+				}
 
 				// Just a plain external url.
-				else
-					$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				else {
+									$image = (stristr($data['avatar'], 'http://') || stristr($data['avatar'], 'https://')) ? $data['avatar'] : $modSettings['avatar_url'] . '/' . $data['avatar'];
+				}
 			}
 		}
 
 		// Perhaps this user has an attachment as avatar...
-		else if (!empty($data['filename']))
-			$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		else if (!empty($data['filename'])) {
+					$image = $modSettings['custom_avatar_url'] . '/' . $data['filename'];
+		}
 
 		// Right... no avatar... use our default image.
-		else
-			$image = $modSettings['avatar_url'] . '/default.png';
+		else {
+					$image = $modSettings['avatar_url'] . '/default.png';
+		}
 	}
 
 	call_integration_hook('integrate_set_avatar_data', array(&$image, &$data));
 
 	// At this point in time $image has to be filled unless you chose to force gravatar and the user doesn't have the needed data to retrieve it... thus a check for !empty() is still needed.
-	if (!empty($image))
-		return array(
+	if (!empty($image)) {
+			return array(
 			'name' => !empty($data['avatar']) ? $data['avatar'] : '',
 			'image' => '<img class="avatar" src="' . $image . '" />',
 			'href' => $image,
 			'url' => $image,
 		);
+	}
 
 	// Fallback to make life easier for everyone...
-	else
-		return array(
+	else {
+			return array(
 			'name' => '',
 			'image' => '',
 			'href' => '',
 			'url' => '',
 		);
-}
+	}
+	}
 
 ?>
\ No newline at end of file

Sources/Subs-Attachments.php

Braces +294 added lines, -222 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Check if the current directory is still valid or not.
@@ -28,22 +29,24 @@ 
 	global $boarddir, $modSettings, $context;
 
 	// Not pretty, but since we don't want folders created for every post. It'll do unless a better solution can be found.
-	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin')
-		$doit = true;
-	elseif (empty($modSettings['automanage_attachments']))
-		return;
-	elseif (!isset($_FILES))
-		return;
-	elseif (isset($_FILES['attachment']))
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
+	if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'admin') {
+			$doit = true;
+	} elseif (empty($modSettings['automanage_attachments'])) {
+			return;
+	} elseif (!isset($_FILES)) {
+			return;
+	} elseif (isset($_FILES['attachment'])) {
+			foreach ($_FILES['attachment']['tmp_name'] as $dummy)
 			if (!empty($dummy))
 			{
 				$doit = true;
+	}
 				break;
 			}
 
-	if (!isset($doit))
-		return;
+	if (!isset($doit)) {
+			return;
+	}
 
 	$year = date('Y');
 	$month = date('m');
@@ -55,21 +58,25 @@ 
 
 	if (!empty($modSettings['attachment_basedirectories']) && !empty($modSettings['use_subdirectories_for_attachments']))
 	{
-			if (!is_array($modSettings['attachment_basedirectories']))
-				$modSettings['attachment_basedirectories'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
+			if (!is_array($modSettings['attachment_basedirectories'])) {
+							$modSettings['attachment_basedirectories'] = smf_json_decode($modSettings['attachment_basedirectories'], true);
+			}
 			$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	if ($modSettings['automanage_attachments'] == 1)
 	{
-		if (!isset($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = array();
-		if (!is_array($modSettings['last_attachments_directory']))
-			$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
-		if (!isset($modSettings['last_attachments_directory'][$base_dir]))
-			$modSettings['last_attachments_directory'][$base_dir] = 0;
+		if (!isset($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = array();
+		}
+		if (!is_array($modSettings['last_attachments_directory'])) {
+					$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
+		}
+		if (!isset($modSettings['last_attachments_directory'][$base_dir])) {
+					$modSettings['last_attachments_directory'][$base_dir] = 0;
+		}
 	}
 
 	$basedirectory = (!empty($modSettings['use_subdirectories_for_attachments']) ? ($modSettings['basedirectory_for_attachments']) : $boarddir);
@@ -98,12 +105,14 @@ 
 			$updir = '';
 	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
-	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir))
-		$outputCreation = automanage_attachments_create_directory($updir);
-	elseif (in_array($updir, $modSettings['attachmentUploadDir']))
-		$outputCreation = true;
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+	}
+	if (!in_array($updir, $modSettings['attachmentUploadDir']) && !empty($updir)) {
+			$outputCreation = automanage_attachments_create_directory($updir);
+	} elseif (in_array($updir, $modSettings['attachmentUploadDir'])) {
+			$outputCreation = true;
+	}
 
 	if ($outputCreation)
 	{
@@ -140,8 +149,9 @@ 
 		$count = count($tree);
 
 		$directory = attachments_init_dir($tree, $count);
-		if ($directory === false)
-			return false;
+		if ($directory === false) {
+					return false;
+		}
 	}
 
 	$directory .= DIRECTORY_SEPARATOR . array_shift($tree);
@@ -169,8 +179,9 @@ 
 	}
 
 	// Everything seems fine...let's create the .htaccess
-	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess'))
-		secureDirectory($updir, true);
+	if (!file_exists($directory . DIRECTORY_SEPARATOR . '.htaccess')) {
+			secureDirectory($updir, true);
+	}
 
 	$sep = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? '\/' : DIRECTORY_SEPARATOR;
 	$updir = rtrim($updir, $sep);
@@ -202,8 +213,9 @@ 
 {
 	global $modSettings, $boarddir;
 
-	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1))
-		return;
+	if (!isset($modSettings['automanage_attachments']) || (!empty($modSettings['automanage_attachments']) && $modSettings['automanage_attachments'] != 1)) {
+			return;
+	}
 
 	$basedirectory = !empty($modSettings['use_subdirectories_for_attachments']) ? $modSettings['basedirectory_for_attachments'] : $boarddir;
 	// Just to be sure: I don't want directory separators at the end
@@ -215,13 +227,14 @@ 
 	{
 		$base_dir = array_search($modSettings['basedirectory_for_attachments'], $modSettings['attachment_basedirectories']);
 		$base_dir = !empty($modSettings['automanage_attachments']) ? $base_dir : 0;
+	} else {
+			$base_dir = 0;
 	}
-	else
-		$base_dir = 0;
 
 	// Get the last attachment directory for that base directory
-	if (empty($modSettings['last_attachments_directory'][$base_dir]))
-		$modSettings['last_attachments_directory'][$base_dir] = 0;
+	if (empty($modSettings['last_attachments_directory'][$base_dir])) {
+			$modSettings['last_attachments_directory'][$base_dir] = 0;
+	}
 	// And increment it.
 	$modSettings['last_attachments_directory'][$base_dir]++;
 
@@ -236,10 +249,10 @@ 
 		$modSettings['last_attachments_directory'] = smf_json_decode($modSettings['last_attachments_directory'], true);
 
 		return true;
+	} else {
+			return false;
+	}
 	}
-	else
-		return false;
-}
 
 /**
  * Split a path into a list of all directories and subdirectories
@@ -257,12 +270,13 @@ 
 			* in Windows we need to explode for both \ and /
 			* while in linux should be safe to explode only for / (aka DIRECTORY_SEPARATOR)
 	*/
-	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
-		$tree = preg_split('#[\\\/]#', $directory);
-	else
+	if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+			$tree = preg_split('#[\\\/]#', $directory);
+	} else
 	{
-		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR)
-			return false;
+		if (substr($directory, 0, 1) != DIRECTORY_SEPARATOR) {
+					return false;
+		}
 
 		$tree = explode(DIRECTORY_SEPARATOR, trim($directory, DIRECTORY_SEPARATOR));
 	}
@@ -286,10 +300,11 @@ 
 		 //Better be sure that the first part of the path is actually a drive letter...
 		 //...even if, I should check this in the admin page...isn't it?
 		 //...NHAAA Let's leave space for users' complains! :P
-		if (preg_match('/^[a-z]:$/i', $tree[0]))
-			$directory = array_shift($tree);
-		else
-			return false;
+		if (preg_match('/^[a-z]:$/i', $tree[0])) {
+					$directory = array_shift($tree);
+		} else {
+					return false;
+		}
 
 		$count--;
 	}
@@ -304,18 +319,20 @@ 
 	global $context, $modSettings, $smcFunc, $txt, $user_info;
 
 	// Make sure we're uploading to the right place.
-	if (!empty($modSettings['automanage_attachments']))
-		automanage_attachments_check_directory();
+	if (!empty($modSettings['automanage_attachments'])) {
+			automanage_attachments_check_directory();
+	}
 
-	if (!is_array($modSettings['attachmentUploadDir']))
-		$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+	if (!is_array($modSettings['attachmentUploadDir'])) {
+			$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+	}
 
 	$context['attach_dir'] = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 
 	// Is the attachments folder actualy there?
-	if (!empty($context['dir_creation_error']))
-		$initial_error = $context['dir_creation_error'];
-	elseif (!is_dir($context['attach_dir']))
+	if (!empty($context['dir_creation_error'])) {
+			$initial_error = $context['dir_creation_error'];
+	} elseif (!is_dir($context['attach_dir']))
 	{
 		$initial_error = 'attach_folder_warning';
 		log_error(sprintf($txt['attach_folder_admin_warning'], $context['attach_dir']), 'critical');
@@ -338,12 +355,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 	}
 
 	// Hmm. There are still files in session.
@@ -353,39 +370,44 @@ 
 		// Let's try to keep them. But...
 		$ignore_temp = true;
 		// If new files are being added. We can't ignore those
-		foreach ($_FILES['attachment']['tmp_name'] as $dummy)
-			if (!empty($dummy))
+		foreach ($_FILES['attachment']['tmp_name'] as $dummy) {
+					if (!empty($dummy))
 			{
 				$ignore_temp = false;
+		}
 				break;
 			}
 
 		// Need to make space for the new files. So, bye bye.
 		if (!$ignore_temp)
 		{
-			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment)
-				if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
+			foreach ($_SESSION['temp_attachments'] as $attachID => $attachment) {
+							if (strpos($attachID, 'post_tmp_' . $user_info['id']) !== false)
 					unlink($attachment['tmp_name']);
+			}
 
 			$context['we_are_history'] = $txt['error_temp_attachments_flushed'];
 			$_SESSION['temp_attachments'] = array();
 		}
 	}
 
-	if (!isset($_FILES['attachment']['name']))
-		$_FILES['attachment']['tmp_name'] = array();
+	if (!isset($_FILES['attachment']['name'])) {
+			$_FILES['attachment']['tmp_name'] = array();
+	}
 
-	if (!isset($_SESSION['temp_attachments']))
-		$_SESSION['temp_attachments'] = array();
+	if (!isset($_SESSION['temp_attachments'])) {
+			$_SESSION['temp_attachments'] = array();
+	}
 
 	// Remember where we are at. If it's anywhere at all.
-	if (!$ignore_temp)
-		$_SESSION['temp_attachments']['post'] = array(
+	if (!$ignore_temp) {
+			$_SESSION['temp_attachments']['post'] = array(
 			'msg' => !empty($_REQUEST['msg']) ? $_REQUEST['msg'] : 0,
 			'last_msg' => !empty($_REQUEST['last_msg']) ? $_REQUEST['last_msg'] : 0,
 			'topic' => !empty($topic) ? $topic : 0,
 			'board' => !empty($board) ? $board : 0,
 		);
+	}
 
 	// If we have an initial error, lets just display it.
 	if (!empty($initial_error))
@@ -393,9 +415,10 @@ 
 		$_SESSION['temp_attachments']['initial_error'] = $initial_error;
 
 		// And delete the files 'cos they ain't going nowhere.
-		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 				unlink($_FILES['attachment']['tmp_name'][$n]);
+		}
 
 		$_FILES['attachment']['tmp_name'] = array();
 	}
@@ -403,21 +426,24 @@ 
 	// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 	foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 	{
-		if ($_FILES['attachment']['name'][$n] == '')
-			continue;
+		if ($_FILES['attachment']['name'][$n] == '') {
+					continue;
+		}
 
 		// First, let's first check for PHP upload errors.
 		$errors = array();
 		if (!empty($_FILES['attachment']['error'][$n]))
 		{
-			if ($_FILES['attachment']['error'][$n] == 2)
-				$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-			elseif ($_FILES['attachment']['error'][$n] == 6)
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
-			else
-				log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
-			if (empty($errors))
-				$errors[] = 'attach_php_error';
+			if ($_FILES['attachment']['error'][$n] == 2) {
+							$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+			} elseif ($_FILES['attachment']['error'][$n] == 6) {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+			} else {
+							log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+			}
+			if (empty($errors)) {
+							$errors[] = 'attach_php_error';
+			}
 		}
 
 		// Try to move and rename the file before doing any more checks on it.
@@ -435,16 +461,16 @@ 
 			);
 
 			// Move the file to the attachments folder with a temp name for now.
-			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-				smf_chmod($destName, 0644);
-			else
+			if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+							smf_chmod($destName, 0644);
+			} else
 			{
 				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$_SESSION['temp_attachments'][$attachID] = array(
 				'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -452,12 +478,14 @@ 
 				'errors' => $errors,
 			);
 
-			if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-				unlink($_FILES['attachment']['tmp_name'][$n]);
+			if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+							unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 		}
 		// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-		if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-			attachmentChecks($attachID);
+		if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+					attachmentChecks($attachID);
+		}
 	}
 	// Mod authors, finally a hook to hang an alternate attachment upload system upon
 	// Upload to the current attachment folder with the file name $attachID or 'post_tmp_' . $user_info['id'] . '_' . md5(mt_rand())
@@ -484,21 +512,20 @@ 
 	global $modSettings, $context, $sourcedir, $smcFunc;
 
 	// No data or missing data .... Not necessarily needed, but in case a mod author missed something.
-	if (empty($_SESSION['temp_attachments'][$attachID]))
-		$error = '$_SESSION[\'temp_attachments\'][$attachID]';
-
-	elseif (empty($attachID))
-		$error = '$attachID';
-
-	elseif (empty($context['attachments']))
-		$error = '$context[\'attachments\']';
-
-	elseif (empty($context['attach_dir']))
-		$error = '$context[\'attach_dir\']';
+	if (empty($_SESSION['temp_attachments'][$attachID])) {
+			$error = '$_SESSION[\'temp_attachments\'][$attachID]';
+	} elseif (empty($attachID)) {
+			$error = '$attachID';
+	} elseif (empty($context['attachments'])) {
+			$error = '$context[\'attachments\']';
+	} elseif (empty($context['attach_dir'])) {
+			$error = '$context[\'attach_dir\']';
+	}
 
 	// Let's get their attention.
-	if (!empty($error))
-		fatal_lang_error('attach_check_nag', 'debug', array($error));
+	if (!empty($error)) {
+			fatal_lang_error('attach_check_nag', 'debug', array($error));
+	}
 
 	// Just in case this slipped by the first checks, we stop it here and now
 	if ($_SESSION['temp_attachments'][$attachID]['size'] == 0)
@@ -527,8 +554,9 @@ 
 			$size = @getimagesize($_SESSION['temp_attachments'][$attachID]['tmp_name']);
 			if (!(empty($size)) && ($size[2] != $old_format))
 			{
-				if (isset($context['validImageTypes'][$size[2]]))
-					$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				if (isset($context['validImageTypes'][$size[2]])) {
+									$_SESSION['temp_attachments'][$attachID]['type'] = 'image/' . $context['validImageTypes'][$size[2]];
+				}
 			}
 		}
 	}
@@ -582,42 +610,48 @@ 
 				// Or, let the user know that it ain't gonna happen.
 				else
 				{
-					if (isset($context['dir_creation_error']))
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
-					else
-						$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					if (isset($context['dir_creation_error'])) {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = $context['dir_creation_error'];
+					} else {
+											$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
+					}
 				}
+			} else {
+							$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 			}
-			else
-				$_SESSION['temp_attachments'][$attachID]['errors'][] = 'ran_out_of_space';
 		}
 	}
 
 	// Is the file too big?
 	$context['attachments']['total_size'] += $_SESSION['temp_attachments'][$attachID]['size'];
-	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	if (!empty($modSettings['attachmentSizeLimit']) && $_SESSION['temp_attachments'][$attachID]['size'] > $modSettings['attachmentSizeLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('file_too_big', array(comma_format($modSettings['attachmentSizeLimit'], 0)));
+	}
 
 	// Check the total upload size for this post...
-	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024)
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	if (!empty($modSettings['attachmentPostLimit']) && $context['attachments']['total_size'] > $modSettings['attachmentPostLimit'] * 1024) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attach_max_total_file_size', array(comma_format($modSettings['attachmentPostLimit'], 0), comma_format($modSettings['attachmentPostLimit'] - (($context['attachments']['total_size'] - $_SESSION['temp_attachments'][$attachID]['size']) / 1024), 0)));
+	}
 
 	// Have we reached the maximum number of files we are allowed?
 	$context['attachments']['quantity']++;
 
 	// Set a max limit if none exists
-	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50)
-		$modSettings['attachmentNumPerPostLimit'] = 50;
+	if (empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] >= 50) {
+			$modSettings['attachmentNumPerPostLimit'] = 50;
+	}
 
-	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit'])
-		$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	if (!empty($modSettings['attachmentNumPerPostLimit']) && $context['attachments']['quantity'] > $modSettings['attachmentNumPerPostLimit']) {
+			$_SESSION['temp_attachments'][$attachID]['errors'][] = array('attachments_limit_per_post', array($modSettings['attachmentNumPerPostLimit']));
+	}
 
 	// File extension check
 	if (!empty($modSettings['attachmentCheckExtensions']))
 	{
 		$allowed = explode(',', strtolower($modSettings['attachmentExtensions']));
-		foreach ($allowed as $k => $dummy)
-			$allowed[$k] = trim($dummy);
+		foreach ($allowed as $k => $dummy) {
+					$allowed[$k] = trim($dummy);
+		}
 
 		if (!in_array(strtolower(substr(strrchr($_SESSION['temp_attachments'][$attachID]['name'], '.'), 1)), $allowed))
 		{
@@ -629,10 +663,12 @@ 
 	// Undo the math if there's an error
 	if (!empty($_SESSION['temp_attachments'][$attachID]['errors']))
 	{
-		if (isset($context['dir_size']))
-			$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
-		if (isset($context['dir_files']))
-			$context['dir_files']--;
+		if (isset($context['dir_size'])) {
+					$context['dir_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
+		}
+		if (isset($context['dir_files'])) {
+					$context['dir_files']--;
+		}
 		$context['attachments']['total_size'] -= $_SESSION['temp_attachments'][$attachID]['size'];
 		$context['attachments']['quantity']--;
 		return false;
@@ -664,12 +700,14 @@ 
 	if (empty($attachmentOptions['mime_type']) && $attachmentOptions['width'])
 	{
 		// Got a proper mime type?
-		if (!empty($size['mime']))
-			$attachmentOptions['mime_type'] = $size['mime'];
+		if (!empty($size['mime'])) {
+					$attachmentOptions['mime_type'] = $size['mime'];
+		}
 
 		// Otherwise a valid one?
-		elseif (isset($context['validImageTypes'][$size[2]]))
-			$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		elseif (isset($context['validImageTypes'][$size[2]])) {
+					$attachmentOptions['mime_type'] = 'image/' . $context['validImageTypes'][$size[2]];
+		}
 	}
 
 	// It is possible we might have a MIME type that isn't actually an image but still have a size.
@@ -681,15 +719,17 @@ 
 	}
 
 	// Get the hash if no hash has been given yet.
-	if (empty($attachmentOptions['file_hash']))
-		$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	if (empty($attachmentOptions['file_hash'])) {
+			$attachmentOptions['file_hash'] = getAttachmentFilename($attachmentOptions['name'], false, null, true);
+	}
 
 	// Assuming no-one set the extension let's take a look at it.
 	if (empty($attachmentOptions['fileext']))
 	{
 		$attachmentOptions['fileext'] = strtolower(strrpos($attachmentOptions['name'], '.') !== false ? substr($attachmentOptions['name'], strrpos($attachmentOptions['name'], '.') + 1) : '');
-		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name'])
-			$attachmentOptions['fileext'] = '';
+		if (strlen($attachmentOptions['fileext']) > 8 || '.' . $attachmentOptions['fileext'] == $attachmentOptions['name']) {
+					$attachmentOptions['fileext'] = '';
+		}
 	}
 
 	// Last chance to change stuff!
@@ -698,8 +738,9 @@ 
 	// Make sure the folder is valid...
 	$tmp = is_array($modSettings['attachmentUploadDir']) ? $modSettings['attachmentUploadDir'] : smf_json_decode($modSettings['attachmentUploadDir'], true);
 	$folders = array_keys($tmp);
-	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders))
-		$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	if (empty($attachmentOptions['id_folder']) || !in_array($attachmentOptions['id_folder'], $folders)) {
+			$attachmentOptions['id_folder'] = $modSettings['currentAttachmentUploadDir'];
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}attachments',
@@ -730,8 +771,8 @@ 
 	rename($attachmentOptions['tmp_name'], $attachmentOptions['destination']);
 
 	// If it's not approved then add to the approval queue.
-	if (!$attachmentOptions['approved'])
-		$smcFunc['db_insert']('',
+	if (!$attachmentOptions['approved']) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}approval_queue',
 			array(
 				'id_attach' => 'int', 'id_msg' => 'int',
@@ -741,9 +782,11 @@ 
 			),
 			array()
 		);
+	}
 
-	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height'])))
-		return true;
+	if (empty($modSettings['attachmentThumbnails']) || (empty($attachmentOptions['width']) && empty($attachmentOptions['height']))) {
+			return true;
+	}
 
 	// Like thumbnails, do we?
 	if (!empty($modSettings['attachmentThumbWidth']) && !empty($modSettings['attachmentThumbHeight']) && ($attachmentOptions['width'] > $modSettings['attachmentThumbWidth'] || $attachmentOptions['height'] > $modSettings['attachmentThumbHeight']))
@@ -754,13 +797,15 @@ 
 			$size = @getimagesize($attachmentOptions['destination'] . '_thumb');
 			list ($thumb_width, $thumb_height) = $size;
 
-			if (!empty($size['mime']))
-				$thumb_mime = $size['mime'];
-			elseif (isset($context['validImageTypes'][$size[2]]))
-				$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			if (!empty($size['mime'])) {
+							$thumb_mime = $size['mime'];
+			} elseif (isset($context['validImageTypes'][$size[2]])) {
+							$thumb_mime = 'image/' . $context['validImageTypes'][$size[2]];
+			}
 			// Lord only knows how this happened...
-			else
-				$thumb_mime = '';
+			else {
+							$thumb_mime = '';
+			}
 
 			$thumb_filename = $attachmentOptions['name'] . '_thumb';
 			$thumb_size = filesize($attachmentOptions['destination'] . '_thumb');
@@ -840,15 +885,17 @@ 
 	global $smcFunc;
 
 	// Oh, come on!
-	if (empty($attachIDs) || empty($msgID))
-		return false;
+	if (empty($attachIDs) || empty($msgID)) {
+			return false;
+	}
 
 	// "I see what is right and approve, but I do what is wrong."
 	call_integration_hook('integrate_assign_attachments', array(&$attachIDs, &$msgID));
 
 	// One last check
-	if (empty($attachIDs))
-		return false;
+	if (empty($attachIDs)) {
+			return false;
+	}
 
 	// Perform.
 	$smcFunc['db_query']('', '
@@ -880,8 +927,9 @@ 
 	$externalParse = false;
 
 	// Meh...
-	if (empty($attachID))
-		return 'attachments_no_data_loaded';
+	if (empty($attachID)) {
+			return 'attachments_no_data_loaded';
+	}
 
 	// Make it easy.
 	$msgID = !empty($_REQUEST['msg']) ? (int) $_REQUEST['msg'] : 0;
@@ -890,20 +938,23 @@ 
 	$externalParse = call_integration_hook('integrate_pre_parseAttachBBC', array($attachID, $msgID));
 
 	// "I am innocent of the blood of this just person: see ye to it."
-	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse)))
-		return $externalParse;
+	if (!empty($externalParse) && (is_string($externalParse) || is_array($externalParse))) {
+			return $externalParse;
+	}
 
 	//Are attachments enable?
-	if (empty($modSettings['attachmentEnable']))
-		return 'attachments_not_enable';
+	if (empty($modSettings['attachmentEnable'])) {
+			return 'attachments_not_enable';
+	}
 
 	// Previewing much? no msg ID has been set yet.
 	if (!empty($context['preview_message']))
 	{
 		$allAttachments = getAttachsByMsg(0);
 
-		if (empty($allAttachments[0][$attachID]))
-			return 'attachments_no_data_loaded';
+		if (empty($allAttachments[0][$attachID])) {
+					return 'attachments_no_data_loaded';
+		}
 
 		$attachContext = $allAttachments[0][$attachID];
 		$attachLoaded = loadAttachmentContext(0, $allAttachments);
@@ -916,57 +967,66 @@ 
 		$attachContext['link'] = '<a href="' . $scripturl . '?action=dlattach;attach=' . $attachID . ';type=preview' . (empty($attachContext['is_image']) ? ';file' : '') . '">' . $smcFunc['htmlspecialchars']($attachContext['name']) . '</a>';
 
 		// Fix the thumbnail too, if the image has one.
-		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb']))
-			$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		if (!empty($attachContext['thumbnail']) && !empty($attachContext['thumbnail']['has_thumb'])) {
+					$attachContext['thumbnail']['href'] = $scripturl . '?action=dlattach;attach=' . $attachContext['thumbnail']['id'] . ';image;type=preview';
+		}
 
 		return $attachContext;
 	}
 
 	// There is always the chance someone else has already done our dirty work...
 	// If so, all pertinent checks were already done. Hopefully...
-	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID]))
-		return $context['current_attachments'][$attachID];
+	if (!empty($context['current_attachments']) && !empty($context['current_attachments'][$attachID])) {
+			return $context['current_attachments'][$attachID];
+	}
 
 	// If we are lucky enough to be in $board's scope then check it!
-	if (!empty($board) && !allowedTo('view_attachments', $board))
-		return 'attachments_not_allowed_to_see';
+	if (!empty($board) && !allowedTo('view_attachments', $board)) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Get the message info associated with this particular attach ID.
 	$attachInfo = getAttachMsgInfo($attachID);
 
 	// There is always the chance this attachment no longer exists or isn't associated to a message anymore...
-	if (empty($attachInfo) || empty($attachInfo['msg']))
-		return 'attachments_no_msg_associated';
+	if (empty($attachInfo) || empty($attachInfo['msg'])) {
+			return 'attachments_no_msg_associated';
+	}
 
 	// Hold it! got the info now check if you can see this attachment.
-	if (!allowedTo('view_attachments', $attachInfo['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachInfo['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	$allAttachments = getAttachsByMsg($attachInfo['msg']);
 	$attachContext = $allAttachments[$attachInfo['msg']][$attachID];
 
 	// No point in keep going further.
-	if (!allowedTo('view_attachments', $attachContext['board']))
-		return 'attachments_not_allowed_to_see';
+	if (!allowedTo('view_attachments', $attachContext['board'])) {
+			return 'attachments_not_allowed_to_see';
+	}
 
 	// Load this particular attach's context.
-	if (!empty($attachContext))
-		$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	if (!empty($attachContext)) {
+			$attachLoaded = loadAttachmentContext($attachContext['id_msg'], $allAttachments);
+	}
 
 	// One last check, you know, gotta be paranoid...
-	else
-		return 'attachments_no_data_loaded';
+	else {
+			return 'attachments_no_data_loaded';
+	}
 
 	// This is the last "if" I promise!
-	if (empty($attachLoaded))
-		return 'attachments_no_data_loaded';
-
-	else
-		$attachContext = $attachLoaded[$attachID];
+	if (empty($attachLoaded)) {
+			return 'attachments_no_data_loaded';
+	} else {
+			$attachContext = $attachLoaded[$attachID];
+	}
 
 	// You may or may not want to show this under the post.
-	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID]))
-		$context['show_attach_under_post'][$attachID] = $attachID;
+	if (!empty($modSettings['dont_show_attach_under_post']) && !isset($context['show_attach_under_post'][$attachID])) {
+			$context['show_attach_under_post'][$attachID] = $attachID;
+	}
 
 	// Last minute changes?
 	call_integration_hook('integrate_post_parseAttachBBC', array(&$attachContext));
@@ -986,8 +1046,9 @@ 
 {
 	global $smcFunc, $modSettings;
 
-	if (empty($attachIDs))
-		return array();
+	if (empty($attachIDs)) {
+			return array();
+	}
 
 	$return = array();
 
@@ -1003,11 +1064,12 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[$row['id_attach']] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[$row['id_attach']] = array(
 			'name' => $smcFunc['htmlspecialchars']($row['filename']),
 			'size' => $row['size'],
 			'attachID' => $row['id_attach'],
@@ -1016,6 +1078,7 @@ 
 			'mime_type' => $row['mime_type'],
 			'thumb' => $row['id_thumb'],
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $return;
@@ -1032,8 +1095,9 @@ 
 {
 	global $smcFunc;
 
-	if (empty($attachID))
-		return array();
+	if (empty($attachID)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT a.id_msg AS msg, m.id_topic AS topic, m.id_board AS board
@@ -1046,8 +1110,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) != 1)
-		return array();
+	if ($smcFunc['db_num_rows']($request) != 1) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
@@ -1088,8 +1153,9 @@ 
 		$temp = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-				continue;
+			if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+							continue;
+			}
 
 			$temp[$row['id_attach']] = $row;
 		}
@@ -1118,8 +1184,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $sourcedir, $smcFunc;
 
-	if (empty($attachments) || empty($attachments[$id_msg]))
-		return array();
+	if (empty($attachments) || empty($attachments[$id_msg])) {
+			return array();
+	}
 
 	// Set up the attachment info - based on code by Meriadoc.
 	$attachmentData = array();
@@ -1143,11 +1210,13 @@ 
 			);
 
 			// If something is unapproved we'll note it so we can sort them.
-			if (!$attachment['approved'])
-				$have_unapproved = true;
+			if (!$attachment['approved']) {
+							$have_unapproved = true;
+			}
 
-			if (!$attachmentData[$i]['is_image'])
-				continue;
+			if (!$attachmentData[$i]['is_image']) {
+							continue;
+			}
 
 			$attachmentData[$i]['real_width'] = $attachment['width'];
 			$attachmentData[$i]['width'] = $attachment['width'];
@@ -1168,12 +1237,12 @@ 
 						// So what folder are we putting this image in?
 						if (!empty($modSettings['currentAttachmentUploadDir']))
 						{
-							if (!is_array($modSettings['attachmentUploadDir']))
-								$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+							if (!is_array($modSettings['attachmentUploadDir'])) {
+															$modSettings['attachmentUploadDir'] = smf_json_decode($modSettings['attachmentUploadDir'], true);
+							}
 							$path = $modSettings['attachmentUploadDir'][$modSettings['currentAttachmentUploadDir']];
 							$id_folder_thumb = $modSettings['currentAttachmentUploadDir'];
-						}
-						else
+						} else
 						{
 							$path = $modSettings['attachmentUploadDir'];
 							$id_folder_thumb = 1;
@@ -1188,10 +1257,11 @@ 
 						$thumb_ext = isset($context['validImageTypes'][$size[2]]) ? $context['validImageTypes'][$size[2]] : '';
 
 						// Figure out the mime type.
-						if (!empty($size['mime']))
-							$thumb_mime = $size['mime'];
-						else
-							$thumb_mime = 'image/' . $thumb_ext;
+						if (!empty($size['mime'])) {
+													$thumb_mime = $size['mime'];
+						} else {
+													$thumb_mime = 'image/' . $thumb_ext;
+						}
 
 						$thumb_filename = $attachment['filename'] . '_thumb';
 						$thumb_hash = getAttachmentFilename($thumb_filename, false, null, true);
@@ -1238,11 +1308,12 @@ 
 				}
 			}
 
-			if (!empty($attachment['id_thumb']))
-				$attachmentData[$i]['thumbnail'] = array(
+			if (!empty($attachment['id_thumb'])) {
+							$attachmentData[$i]['thumbnail'] = array(
 					'id' => $attachment['id_thumb'],
 					'href' => $scripturl . '?action=dlattach;topic=' . $attachment['topic'] . '.0;attach=' . $attachment['id_thumb'] . ';image',
 				);
+			}
 			$attachmentData[$i]['thumbnail']['has_thumb'] = !empty($attachment['id_thumb']);
 
 			// If thumbnails are disabled, check the maximum size of the image.
@@ -1252,30 +1323,31 @@ 
 				{
 					$attachmentData[$i]['width'] = $modSettings['max_image_width'];
 					$attachmentData[$i]['height'] = floor($attachment['height'] * $modSettings['max_image_width'] / $attachment['width']);
-				}
-				elseif (!empty($modSettings['max_image_width']))
+				} elseif (!empty($modSettings['max_image_width']))
 				{
 					$attachmentData[$i]['width'] = floor($attachment['width'] * $modSettings['max_image_height'] / $attachment['height']);
 					$attachmentData[$i]['height'] = $modSettings['max_image_height'];
 				}
-			}
-			elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
+			} elseif ($attachmentData[$i]['thumbnail']['has_thumb'])
 			{
 				// If the image is too large to show inline, make it a popup.
-				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height'])))
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
-				else
-					$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				if (((!empty($modSettings['max_image_width']) && $attachmentData[$i]['real_width'] > $modSettings['max_image_width']) || (!empty($modSettings['max_image_height']) && $attachmentData[$i]['real_height'] > $modSettings['max_image_height']))) {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return reqWin(\'' . $attachmentData[$i]['href'] . ';image\', ' . ($attachment['width'] + 20) . ', ' . ($attachment['height'] + 20) . ', true);';
+				} else {
+									$attachmentData[$i]['thumbnail']['javascript'] = 'return expandThumb(' . $attachment['id_attach'] . ');';
+				}
 			}
 
-			if (!$attachmentData[$i]['thumbnail']['has_thumb'])
-				$attachmentData[$i]['downloads']++;
+			if (!$attachmentData[$i]['thumbnail']['has_thumb']) {
+							$attachmentData[$i]['downloads']++;
+			}
 		}
 	}
 
 	// Do we need to instigate a sort?
-	if ($have_unapproved)
-		usort($attachmentData, 'approved_attach_sort');
+	if ($have_unapproved) {
+			usort($attachmentData, 'approved_attach_sort');
+	}
 
 	return $attachmentData;
 }

Sources/QueryString.php

Braces +184 added lines, -130 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Clean the request variables - add html entities to GET and slashes if magic_quotes_gpc is Off.
@@ -44,22 +45,26 @@ 
 	unset($GLOBALS['HTTP_POST_FILES'], $GLOBALS['HTTP_POST_FILES']);
 
 	// These keys shouldn't be set...ever.
-	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
-		die('Invalid request variable.');
+	if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
+			die('Invalid request variable.');
+	}
 
 	// Same goes for numeric keys.
-	foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key)
-		if (is_numeric($key))
+	foreach (array_merge(array_keys($_POST), array_keys($_GET), array_keys($_FILES)) as $key) {
+			if (is_numeric($key))
 			die('Numeric request keys are invalid.');
+	}
 
 	// Numeric keys in cookies are less of a problem. Just unset those.
-	foreach ($_COOKIE as $key => $value)
-		if (is_numeric($key))
+	foreach ($_COOKIE as $key => $value) {
+			if (is_numeric($key))
 			unset($_COOKIE[$key]);
+	}
 
 	// Get the correct query string.  It may be in an environment variable...
-	if (!isset($_SERVER['QUERY_STRING']))
-		$_SERVER['QUERY_STRING'] = getenv('QUERY_STRING');
+	if (!isset($_SERVER['QUERY_STRING'])) {
+			$_SERVER['QUERY_STRING'] = getenv('QUERY_STRING');
+	}
 
 	// It seems that sticking a URL after the query string is mighty common, well, it's evil - don't.
 	if (strpos($_SERVER['QUERY_STRING'], 'http') === 0)
@@ -83,13 +88,14 @@ 
 		parse_str(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr($_SERVER['QUERY_STRING'], array(';?' => '&', ';' => '&', '%00' => '', "\0" => ''))), $_GET);
 
 		// Magic quotes still applies with parse_str - so clean it up.
-		if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes']))
-			$_GET = $removeMagicQuoteFunction($_GET);
-	}
-	elseif (strpos(ini_get('arg_separator.input'), ';') !== false)
+		if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) {
+					$_GET = $removeMagicQuoteFunction($_GET);
+		}
+	} elseif (strpos(ini_get('arg_separator.input'), ';') !== false)
 	{
-		if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes']))
-			$_GET = $removeMagicQuoteFunction($_GET);
+		if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) {
+					$_GET = $removeMagicQuoteFunction($_GET);
+		}
 
 		// Search engines will send action=profile%3Bu=1, which confuses PHP.
 		foreach ($_GET as $k => $v)
@@ -102,8 +108,9 @@ 
 				for ($i = 1, $n = count($temp); $i < $n; $i++)
 				{
 					@list ($key, $val) = @explode('=', $temp[$i], 2);
-					if (!isset($_GET[$key]))
-						$_GET[$key] = $val;
+					if (!isset($_GET[$key])) {
+											$_GET[$key] = $val;
+					}
 				}
 			}
 
@@ -120,18 +127,20 @@ 
 	if (!empty($_SERVER['REQUEST_URI']))
 	{
 		// Remove the .html, assuming there is one.
-		if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm')
-			$request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.'));
-		else
-			$request = $_SERVER['REQUEST_URI'];
+		if (substr($_SERVER['REQUEST_URI'], strrpos($_SERVER['REQUEST_URI'], '.'), 4) == '.htm') {
+					$request = substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], '.'));
+		} else {
+					$request = $_SERVER['REQUEST_URI'];
+		}
 
 		// @todo smflib.
 		// Replace 'index.php/a,b,c/d/e,f' with 'a=b,c&d=&e=f' and parse it into $_GET.
 		if (strpos($request, basename($scripturl) . '/') !== false)
 		{
 			parse_str(substr(preg_replace('/&(\w+)(?=&|$)/', '&$1=', strtr(preg_replace('~/([^,/]+),~', '/$1=', substr($request, strpos($request, basename($scripturl)) + strlen(basename($scripturl)))), '/', '&')), 1), $temp);
-			if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes']))
-				$temp = $removeMagicQuoteFunction($temp);
+			if (function_exists('get_magic_quotes_gpc') && @get_magic_quotes_gpc() != 0 && empty($modSettings['integrate_magic_quotes'])) {
+							$temp = $removeMagicQuoteFunction($temp);
+			}
 			$_GET += $temp;
 		}
 	}
@@ -142,9 +151,10 @@ 
 		$_ENV = $removeMagicQuoteFunction($_ENV);
 		$_POST = $removeMagicQuoteFunction($_POST);
 		$_COOKIE = $removeMagicQuoteFunction($_COOKIE);
-		foreach ($_FILES as $k => $dummy)
-			if (isset($_FILES[$k]['name']))
+		foreach ($_FILES as $k => $dummy) {
+					if (isset($_FILES[$k]['name']))
 				$_FILES[$k]['name'] = $removeMagicQuoteFunction($_FILES[$k]['name']);
+		}
 	}
 
 	// Add entities to GET.  This is kinda like the slashes on everything else.
@@ -160,11 +170,13 @@ 
 		$_REQUEST['board'] = (string) $_REQUEST['board'];
 
 		// If there's a slash in it, we've got a start value! (old, compatible links.)
-		if (strpos($_REQUEST['board'], '/') !== false)
-			list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']);
+		if (strpos($_REQUEST['board'], '/') !== false) {
+					list ($_REQUEST['board'], $_REQUEST['start']) = explode('/', $_REQUEST['board']);
+		}
 		// Same idea, but dots.  This is the currently used format - ?board=1.0...
-		elseif (strpos($_REQUEST['board'], '.') !== false)
-			list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']);
+		elseif (strpos($_REQUEST['board'], '.') !== false) {
+					list ($_REQUEST['board'], $_REQUEST['start']) = explode('.', $_REQUEST['board']);
+		}
 		// Now make absolutely sure it's a number.
 		$board = (int) $_REQUEST['board'];
 		$_REQUEST['start'] = isset($_REQUEST['start']) ? (int) $_REQUEST['start'] : 0;
@@ -173,12 +185,14 @@ 
 		$_GET['board'] = $board;
 	}
 	// Well, $board is going to be a number no matter what.
-	else
-		$board = 0;
+	else {
+			$board = 0;
+	}
 
 	// If there's a threadid, it's probably an old YaBB SE link.  Flow with it.
-	if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic']))
-		$_REQUEST['topic'] = $_REQUEST['threadid'];
+	if (isset($_REQUEST['threadid']) && !isset($_REQUEST['topic'])) {
+			$_REQUEST['topic'] = $_REQUEST['threadid'];
+	}
 
 	// We've got topic!
 	if (isset($_REQUEST['topic']))
@@ -187,29 +201,34 @@ 
 		$_REQUEST['topic'] = (string) $_REQUEST['topic'];
 
 		// Slash means old, beta style, formatting.  That's okay though, the link should still work.
-		if (strpos($_REQUEST['topic'], '/') !== false)
-			list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']);
+		if (strpos($_REQUEST['topic'], '/') !== false) {
+					list ($_REQUEST['topic'], $_REQUEST['start']) = explode('/', $_REQUEST['topic']);
+		}
 		// Dots are useful and fun ;).  This is ?topic=1.15.
-		elseif (strpos($_REQUEST['topic'], '.') !== false)
-			list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']);
+		elseif (strpos($_REQUEST['topic'], '.') !== false) {
+					list ($_REQUEST['topic'], $_REQUEST['start']) = explode('.', $_REQUEST['topic']);
+		}
 
 		$topic = (int) $_REQUEST['topic'];
 
 		// Now make sure the online log gets the right number.
 		$_GET['topic'] = $topic;
+	} else {
+			$topic = 0;
 	}
-	else
-		$topic = 0;
 
 	// There should be a $_REQUEST['start'], some at least.  If you need to default to other than 0, use $_GET['start'].
-	if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647)
-		$_REQUEST['start'] = 0;
+	if (empty($_REQUEST['start']) || $_REQUEST['start'] < 0 || (int) $_REQUEST['start'] > 2147473647) {
+			$_REQUEST['start'] = 0;
+	}
 
 	// The action needs to be a string and not an array or anything else
-	if (isset($_REQUEST['action']))
-		$_REQUEST['action'] = (string) $_REQUEST['action'];
-	if (isset($_GET['action']))
-		$_GET['action'] = (string) $_GET['action'];
+	if (isset($_REQUEST['action'])) {
+			$_REQUEST['action'] = (string) $_REQUEST['action'];
+	}
+	if (isset($_GET['action'])) {
+			$_GET['action'] = (string) $_GET['action'];
+	}
 
 	// Some mail providers like to encode semicolons in activation URLs...
 	if (!empty($_REQUEST['action']) && substr($_SERVER['QUERY_STRING'], 0, 18) == 'action=activate%3b')
@@ -235,29 +254,33 @@ 
 	$_SERVER['BAN_CHECK_IP'] = $_SERVER['REMOTE_ADDR'];
 
 	// If we haven't specified how to handle Reverse Proxy IP headers, lets do what we always used to do.
-	if (!isset($modSettings['proxy_ip_header']))
-		$modSettings['proxy_ip_header'] = 'autodetect';
+	if (!isset($modSettings['proxy_ip_header'])) {
+			$modSettings['proxy_ip_header'] = 'autodetect';
+	}
 
 	// Which headers are we going to check for Reverse Proxy IP headers?
-	if ($modSettings['proxy_ip_header'] == 'disabled')
-		$reverseIPheaders = array();
-	elseif ($modSettings['proxy_ip_header'] == 'autodetect')
-		$reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP');
-	else
-		$reverseIPheaders = array($modSettings['proxy_ip_header']);
+	if ($modSettings['proxy_ip_header'] == 'disabled') {
+			$reverseIPheaders = array();
+	} elseif ($modSettings['proxy_ip_header'] == 'autodetect') {
+			$reverseIPheaders = array('HTTP_X_FORWARDED_FOR', 'HTTP_CLIENT_IP');
+	} else {
+			$reverseIPheaders = array($modSettings['proxy_ip_header']);
+	}
 
 	// Find the user's IP address. (but don't let it give you 'unknown'!)
 	foreach ($reverseIPheaders as $proxyIPheader)
 	{
 		// Ignore if this is not set.
-		if (!isset($_SERVER[$proxyIPheader]))
-			continue;
+		if (!isset($_SERVER[$proxyIPheader])) {
+					continue;
+		}
 
 		if (!empty($modSettings['proxy_ip_servers']))
 		{
-			foreach (explode(',', $modSettings['proxy_ip_servers']) as $proxy)
-				if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy))
+			foreach (explode(',', $modSettings['proxy_ip_servers']) as $proxy) {
+							if ($proxy == $_SERVER['REMOTE_ADDR'] || matchIPtoCIDR($_SERVER['REMOTE_ADDR'], $proxy))
 					continue;
+			}
 		}
 
 		// If there are commas, get the last one.. probably.
@@ -277,8 +300,9 @@ 
 
 						// Just incase we have a legacy IPv4 address.
 						// @ TODO: Convert to IPv6.
-						if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0)
-							continue;
+						if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) {
+													continue;
+						}
 					}
 
 					continue;
@@ -290,36 +314,40 @@ 
 			}
 		}
 		// Otherwise just use the only one.
-		elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0)
-			$_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader];
-		elseif (!isValidIPv6($_SERVER[$proxyIPheader]) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0)
+		elseif (preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER[$proxyIPheader]) == 0 || preg_match('~^((0|10|172\.(1[6-9]|2[0-9]|3[01])|192\.168|255|127)\.|unknown|::1|fe80::|fc00::)~', $_SERVER['REMOTE_ADDR']) != 0) {
+					$_SERVER['BAN_CHECK_IP'] = $_SERVER[$proxyIPheader];
+		} elseif (!isValidIPv6($_SERVER[$proxyIPheader]) || preg_match('~::ffff:\d+\.\d+\.\d+\.\d+~', $_SERVER[$proxyIPheader]) !== 0)
 		{
 			$_SERVER[$proxyIPheader] = preg_replace('~^::ffff:(\d+\.\d+\.\d+\.\d+)~', '\1', $_SERVER[$proxyIPheader]);
 
 			// Just incase we have a legacy IPv4 address.
 			// @ TODO: Convert to IPv6.
-			if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0)
-				continue;
+			if (preg_match('~^((([1]?\d)?\d|2[0-4]\d|25[0-5])\.){3}(([1]?\d)?\d|2[0-4]\d|25[0-5])$~', $_SERVER[$proxyIPheader]) === 0) {
+							continue;
+			}
 		}
 	}
 
 	// Make sure we know the URL of the current request.
-	if (empty($_SERVER['REQUEST_URI']))
-		$_SERVER['REQUEST_URL'] = $scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
-	elseif (preg_match('~^([^/]+//[^/]+)~', $scripturl, $match) == 1)
-		$_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI'];
-	else
-		$_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI'];
+	if (empty($_SERVER['REQUEST_URI'])) {
+			$_SERVER['REQUEST_URL'] = $scripturl . (!empty($_SERVER['QUERY_STRING']) ? '?' . $_SERVER['QUERY_STRING'] : '');
+	} elseif (preg_match('~^([^/]+//[^/]+)~', $scripturl, $match) == 1) {
+			$_SERVER['REQUEST_URL'] = $match[1] . $_SERVER['REQUEST_URI'];
+	} else {
+			$_SERVER['REQUEST_URL'] = $_SERVER['REQUEST_URI'];
+	}
 
 	// And make sure HTTP_USER_AGENT is set.
 	$_SERVER['HTTP_USER_AGENT'] = isset($_SERVER['HTTP_USER_AGENT']) ? (isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($smcFunc['db_unescape_string']($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES) : htmlspecialchars($smcFunc['db_unescape_string']($_SERVER['HTTP_USER_AGENT']), ENT_QUOTES)) : '';
 
 	// Some final checking.
-	if (!isValidIP($_SERVER['BAN_CHECK_IP']))
-		$_SERVER['BAN_CHECK_IP'] = '';
-	if ($_SERVER['REMOTE_ADDR'] == 'unknown')
-		$_SERVER['REMOTE_ADDR'] = '';
-}
+	if (!isValidIP($_SERVER['BAN_CHECK_IP'])) {
+			$_SERVER['BAN_CHECK_IP'] = '';
+	}
+	if ($_SERVER['REMOTE_ADDR'] == 'unknown') {
+			$_SERVER['REMOTE_ADDR'] = '';
+	}
+	}
 
 /**
  * Validates a IPv6 address. returns true if it is ipv6.
@@ -330,8 +358,9 @@ 
 function isValidIPv6($ip)
 {
 	//looking for :
-	if (strpos($ip, ':') === false)
-		return false;
+	if (strpos($ip, ':') === false) {
+			return false;
+	}
 
 	//check valid address
 	return inet_pton($ip);
@@ -348,15 +377,17 @@ 
 	static $expanded = array();
 
 	// Check if we have done this already.
-	if (isset($expanded[$ip]))
-		return $expanded[$ip];
+	if (isset($expanded[$ip])) {
+			return $expanded[$ip];
+	}
 
 	// Expand the IP out.
 	$expanded_ip = explode(':', expandIPv6($ip));
 
 	$new_ip = array();
-	foreach ($expanded_ip as $int)
-		$new_ip[] = hexdec($int);
+	foreach ($expanded_ip as $int) {
+			$new_ip[] = hexdec($int);
+	}
 
 	// Save this incase of repeated use.
 	$expanded[$ip] = $new_ip;
@@ -376,8 +407,9 @@ 
 	static $converted = array();
 
 	// Check if we have done this already.
-	if (isset($converted[$addr]))
-		return $converted[$addr];
+	if (isset($converted[$addr])) {
+			return $converted[$addr];
+	}
 
 	// Check if there are segments missing, insert if necessary.
 	if (strpos($addr, '::') !== false)
@@ -387,18 +419,20 @@ 
 		$part[1] = explode(':', $part[1]);
 		$missing = array();
 
-		for ($i = 0; $i < (8 - (count($part[0]) + count($part[1]))); $i++)
-			array_push($missing, '0000');
+		for ($i = 0; $i < (8 - (count($part[0]) + count($part[1]))); $i++) {
+					array_push($missing, '0000');
+		}
 
 		$part = array_merge($part[0], $missing, $part[1]);
+	} else {
+			$part = explode(':', $addr);
 	}
-	else
-		$part = explode(':', $addr);
 
 	// Pad each segment until it has 4 digits.
-	foreach ($part as &$p)
-		while (strlen($p) < 4)
+	foreach ($part as &$p) {
+			while (strlen($p) < 4)
 			$p = '0' . $p;
+	}
 
 	unset($p);
 
@@ -409,11 +443,12 @@ 
 	$converted[$addr] = $result;
 
 	// Quick check to make sure the length is as expected.
-	if (!$strict_check || strlen($result) == 39)
-		return $result;
-	else
-		return false;
-}
+	if (!$strict_check || strlen($result) == 39) {
+			return $result;
+	} else {
+			return false;
+	}
+	}
 
 
 /**
@@ -444,15 +479,17 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($var))
-		return $smcFunc['db_escape_string']($var);
+	if (!is_array($var)) {
+			return $smcFunc['db_escape_string']($var);
+	}
 
 	// Reindex the array with slashes.
 	$new_var = array();
 
 	// Add slashes to every element, even the indexes!
-	foreach ($var as $k => $v)
-		$new_var[$smcFunc['db_escape_string']($k)] = escapestring__recursive($v);
+	foreach ($var as $k => $v) {
+			$new_var[$smcFunc['db_escape_string']($k)] = escapestring__recursive($v);
+	}
 
 	return $new_var;
 }
@@ -472,12 +509,14 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($var))
-		return isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($var, ENT_QUOTES) : htmlspecialchars($var, ENT_QUOTES);
+	if (!is_array($var)) {
+			return isset($smcFunc['htmlspecialchars']) ? $smcFunc['htmlspecialchars']($var, ENT_QUOTES) : htmlspecialchars($var, ENT_QUOTES);
+	}
 
 	// Add the htmlspecialchars to every element.
-	foreach ($var as $k => $v)
-		$var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1);
+	foreach ($var as $k => $v) {
+			$var[$k] = $level > 25 ? null : htmlspecialchars__recursive($v, $level + 1);
+	}
 
 	return $var;
 }
@@ -495,15 +534,17 @@ 
  */
 function urldecode__recursive($var, $level = 0)
 {
-	if (!is_array($var))
-		return urldecode($var);
+	if (!is_array($var)) {
+			return urldecode($var);
+	}
 
 	// Reindex the array...
 	$new_var = array();
 
 	// Add the htmlspecialchars to every element.
-	foreach ($var as $k => $v)
-		$new_var[urldecode($k)] = $level > 25 ? null : urldecode__recursive($v, $level + 1);
+	foreach ($var as $k => $v) {
+			$new_var[urldecode($k)] = $level > 25 ? null : urldecode__recursive($v, $level + 1);
+	}
 
 	return $new_var;
 }
@@ -521,15 +562,17 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($var))
-		return $smcFunc['db_unescape_string']($var);
+	if (!is_array($var)) {
+			return $smcFunc['db_unescape_string']($var);
+	}
 
 	// Reindex the array without slashes, this time.
 	$new_var = array();
 
 	// Strip the slashes from every element.
-	foreach ($var as $k => $v)
-		$new_var[$smcFunc['db_unescape_string']($k)] = unescapestring__recursive($v);
+	foreach ($var as $k => $v) {
+			$new_var[$smcFunc['db_unescape_string']($k)] = unescapestring__recursive($v);
+	}
 
 	return $new_var;
 }
@@ -547,15 +590,17 @@ 
  */
 function stripslashes__recursive($var, $level = 0)
 {
-	if (!is_array($var))
-		return stripslashes($var);
+	if (!is_array($var)) {
+			return stripslashes($var);
+	}
 
 	// Reindex the array without slashes, this time.
 	$new_var = array();
 
 	// Strip the slashes from every element.
-	foreach ($var as $k => $v)
-		$new_var[stripslashes($k)] = $level > 25 ? null : stripslashes__recursive($v, $level + 1);
+	foreach ($var as $k => $v) {
+			$new_var[stripslashes($k)] = $level > 25 ? null : stripslashes__recursive($v, $level + 1);
+	}
 
 	return $new_var;
 }
@@ -576,12 +621,14 @@ 
 	global $smcFunc;
 
 	// Remove spaces (32), tabs (9), returns (13, 10, and 11), nulls (0), and hard spaces. (160)
-	if (!is_array($var))
-		return isset($smcFunc) ? $smcFunc['htmltrim']($var) : trim($var, ' ' . "\t\n\r\x0B" . '\0' . "\xA0");
+	if (!is_array($var)) {
+			return isset($smcFunc) ? $smcFunc['htmltrim']($var) : trim($var, ' ' . "\t\n\r\x0B" . '\0' . "\xA0");
+	}
 
 	// Go through all the elements and remove the whitespace.
-	foreach ($var as $k => $v)
-		$var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1);
+	foreach ($var as $k => $v) {
+			$var[$k] = $level > 25 ? null : htmltrim__recursive($v, $level + 1);
+	}
 
 	return $var;
 }
@@ -646,30 +693,37 @@ 
 	global $scripturl, $modSettings, $context;
 
 	// If $scripturl is set to nothing, or the SID is not defined (SSI?) just quit.
-	if ($scripturl == '' || !defined('SID'))
-		return $buffer;
+	if ($scripturl == '' || !defined('SID')) {
+			return $buffer;
+	}
 
 	// Do nothing if the session is cookied, or they are a crawler - guests are caught by redirectexit().  This doesn't work below PHP 4.3.0, because it makes the output buffer bigger.
 	// @todo smflib
-	if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot'))
-		$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&amp;', $buffer);
+	if (empty($_COOKIE) && SID != '' && !isBrowser('possibly_robot')) {
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '(?!\?' . preg_quote(SID, '/') . ')\\??/', '"' . $scripturl . '?' . SID . '&amp;', $buffer);
+	}
 	// Debugging templates, are we?
-	elseif (isset($_GET['debug']))
-		$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer);
+	elseif (isset($_GET['debug'])) {
+			$buffer = preg_replace('/(?<!<link rel="canonical" href=)"' . preg_quote($scripturl, '/') . '\\??/', '"' . $scripturl . '?debug;', $buffer);
+	}
 
 	// This should work even in 4.2.x, just not CGI without cgi.fix_pathinfo.
 	if (!empty($modSettings['queryless_urls']) && (!$context['server']['is_cgi'] || ini_get('cgi.fix_pathinfo') == 1 || @get_cfg_var('cgi.fix_pathinfo') == 1) && ($context['server']['is_apache'] || $context['server']['is_lighttpd'] || $context['server']['is_litespeed']))
 	{
 		// Let's do something special for session ids!
-		if (defined('SID') && SID != '')
-			$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m)
+		if (defined('SID') && SID != '') {
+					$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?(?:' . SID . '(?:;|&|&amp;))((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m)
 			{
-				global $scripturl; return '"' . $scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"';
+				global $scripturl;
+		}
+		return '"' . $scripturl . "/" . strtr("$m[1]", '&;=', '//,') . ".html?" . SID . (isset($m[2]) ? $m[2] : "") . '"';
 			}, $buffer);
-		else
-			$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m)
+		else {
+					$buffer = preg_replace_callback('~"' . preg_quote($scripturl, '/') . '\?((?:board|topic)=[^#"]+?)(#[^"]*?)?"~', function($m)
 			{
-				global $scripturl; return '"' . $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"';
+				global $scripturl;
+		}
+		return '"' . $scripturl . '/' . strtr("$m[1]", '&;=', '//,') . '.html' . (isset($m[2]) ? $m[2] : "") . '"';
 			}, $buffer);
 	}
 

Sources/Display.php

Braces +333 added lines, -249 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The central part of the board - topic display.
@@ -34,8 +35,9 @@ 
 	global $attachments, $messages_request, $language, $smcFunc;
 
 	// What are you gonna display if these are empty?!
-	if (empty($topic))
-		fatal_lang_error('no_board', false);
+	if (empty($topic)) {
+			fatal_lang_error('no_board', false);
+	}
 
 	// Load the proper template.
 	loadTemplate('Display');
@@ -52,15 +54,17 @@ 
 	$context['messages_per_page'] = empty($modSettings['disableCustomPerPage']) && !empty($options['messages_per_page']) ? $options['messages_per_page'] : $modSettings['defaultMaxMessages'];
 
 	// Let's do some work on what to search index.
-	if (count($_GET) > 2)
-		foreach ($_GET as $k => $v)
+	if (count($_GET) > 2) {
+			foreach ($_GET as $k => $v)
 		{
 			if (!in_array($k, array('topic', 'board', 'start', session_name())))
 				$context['robot_no_index'] = true;
+	}
 		}
 
-	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0))
-		$context['robot_no_index'] = true;
+	if (!empty($_REQUEST['start']) && (!is_numeric($_REQUEST['start']) || $_REQUEST['start'] % $context['messages_per_page'] != 0)) {
+			$context['robot_no_index'] = true;
+	}
 
 	// Find the previous or next topic.  Make a fuss if there are no more.
 	if (isset($_REQUEST['prev_next']) && ($_REQUEST['prev_next'] == 'prev' || $_REQUEST['prev_next'] == 'next'))
@@ -172,8 +176,9 @@ 
 			$topic_parameters
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('not_a_topic', false, 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('not_a_topic', false, 404);
+	}
 	$context['topicinfo'] = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -210,8 +215,9 @@ 
 	$context['topic_unwatched'] = isset($context['topicinfo']['unwatched']) ? $context['topicinfo']['unwatched'] : 0;
 
 	// Add up unapproved replies to get real number of replies...
-	if ($modSettings['postmod_active'] && $approve_posts)
-		$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
+	if ($modSettings['postmod_active'] && $approve_posts) {
+			$context['real_num_replies'] += $context['topicinfo']['unapproved_posts'] - ($context['topicinfo']['approved'] ? 0 : 1);
+	}
 
 	// If this topic has unapproved posts, we need to work out how many posts the user can see, for page indexing.
 	if ($modSettings['postmod_active'] && $context['topicinfo']['unapproved_posts'] && !$user_info['is_guest'] && !$approve_posts)
@@ -231,11 +237,11 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$context['total_visible_posts'] = $context['num_replies'] + $myUnapprovedPosts + ($context['topicinfo']['approved'] ? 1 : 0);
+	} elseif ($user_info['is_guest']) {
+			$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
+	} else {
+			$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
 	}
-	elseif ($user_info['is_guest'])
-		$context['total_visible_posts'] = $context['num_replies'] + ($context['topicinfo']['approved'] ? 1 : 0);
-	else
-		$context['total_visible_posts'] = $context['num_replies'] + $context['topicinfo']['unapproved_posts'] + ($context['topicinfo']['approved'] ? 1 : 0);
 
 	// The start isn't a number; it's information about what to do, where to go.
 	if (!is_numeric($_REQUEST['start']))
@@ -248,8 +254,7 @@ 
 			{
 				$context['start_from'] = $context['total_visible_posts'] - 1;
 				$_REQUEST['start'] = empty($options['view_newest_first']) ? $context['start_from'] : 0;
-			}
-			else
+			} else
 			{
 				// Find the earliest unread message in the topic. (the use of topics here is just for both tables.)
 				$request = $smcFunc['db_query']('', '
@@ -277,9 +282,9 @@ 
 		if (substr($_REQUEST['start'], 0, 4) == 'from')
 		{
 			$timestamp = (int) substr($_REQUEST['start'], 4);
-			if ($timestamp === 0)
-				$_REQUEST['start'] = 0;
-			else
+			if ($timestamp === 0) {
+							$_REQUEST['start'] = 0;
+			} else
 			{
 				// Find the number of messages posted before said time...
 				$request = $smcFunc['db_query']('', '
@@ -307,11 +312,11 @@ 
 		elseif (substr($_REQUEST['start'], 0, 3) == 'msg')
 		{
 			$virtual_msg = (int) substr($_REQUEST['start'], 3);
-			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg'])
-				$context['start_from'] = $context['total_visible_posts'] - 1;
-			elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg'])
-				$context['start_from'] = 0;
-			else
+			if (!$context['topicinfo']['unapproved_posts'] && $virtual_msg >= $context['topicinfo']['id_last_msg']) {
+							$context['start_from'] = $context['total_visible_posts'] - 1;
+			} elseif (!$context['topicinfo']['unapproved_posts'] && $virtual_msg <= $context['topicinfo']['id_first_msg']) {
+							$context['start_from'] = 0;
+			} else
 			{
 				// Find the start value for that message......
 				$request = $smcFunc['db_query']('', '
@@ -394,21 +399,25 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (empty($row['id_member']))
-				continue;
+			if (empty($row['id_member'])) {
+							continue;
+			}
 
-			if (!empty($row['online_color']))
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
-			else
-				$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			if (!empty($row['online_color'])) {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '" style="color: ' . $row['online_color'] . ';">' . $row['real_name'] . '</a>';
+			} else {
+							$link = '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>';
+			}
 
 			$is_buddy = in_array($row['id_member'], $user_info['buddies']);
-			if ($is_buddy)
-				$link = '<strong>' . $link . '</strong>';
+			if ($is_buddy) {
+							$link = '<strong>' . $link . '</strong>';
+			}
 
 			// Add them both to the list and to the more detailed list.
-			if (!empty($row['show_online']) || allowedTo('moderate_forum'))
-				$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			if (!empty($row['show_online']) || allowedTo('moderate_forum')) {
+							$context['view_members_list'][$row['log_time'] . $row['member_name']] = empty($row['show_online']) ? '<em>' . $link . '</em>' : $link;
+			}
 			$context['view_members'][$row['log_time'] . $row['member_name']] = array(
 				'id' => $row['id_member'],
 				'username' => $row['member_name'],
@@ -420,8 +429,9 @@ 
 				'hidden' => empty($row['show_online']),
 			);
 
-			if (empty($row['show_online']))
-				$context['view_num_hidden']++;
+			if (empty($row['show_online'])) {
+							$context['view_num_hidden']++;
+			}
 		}
 
 		// The number of guests is equal to the rows minus the ones we actually used ;).
@@ -435,11 +445,13 @@ 
 
 	// If all is set, but not allowed... just unset it.
 	$can_show_all = !empty($modSettings['enableAllMessages']) && $context['total_visible_posts'] > $context['messages_per_page'] && $context['total_visible_posts'] < $modSettings['enableAllMessages'];
-	if (isset($_REQUEST['all']) && !$can_show_all)
-		unset($_REQUEST['all']);
+	if (isset($_REQUEST['all']) && !$can_show_all) {
+			unset($_REQUEST['all']);
+	}
 	// Otherwise, it must be allowed... so pretend start was -1.
-	elseif (isset($_REQUEST['all']))
-		$_REQUEST['start'] = -1;
+	elseif (isset($_REQUEST['all'])) {
+			$_REQUEST['start'] = -1;
+	}
 
 	// Construct the page index, allowing for the .START method...
 	$context['page_index'] = constructPageIndex($scripturl . '?topic=' . $topic . '.%1$d', $_REQUEST['start'], $context['total_visible_posts'], $context['messages_per_page'], true);
@@ -476,8 +488,9 @@ 
 			$_REQUEST['start'] = 0;
 		}
 		// They aren't using it, but the *option* is there, at least.
-		else
-			$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
+		else {
+					$context['page_index'] .= '&nbsp;<a href="' . $scripturl . '?topic=' . $topic . '.0;all">' . $txt['all'] . '</a> ';
+		}
 	}
 
 	// Build the link tree.
@@ -493,14 +506,16 @@ 
 	if (!empty($board_info['moderators']))
 	{
 		// Add a link for each moderator...
-		foreach ($board_info['moderators'] as $mod)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		foreach ($board_info['moderators'] as $mod) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=profile;u=' . $mod['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod['name'] . '</a>';
+		}
 	}
 	if (!empty($board_info['moderator_groups']))
 	{
 		// Add a link for each moderator group as well...
-		foreach ($board_info['moderator_groups'] as $mod_group)
-			$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		foreach ($board_info['moderator_groups'] as $mod_group) {
+					$context['link_moderators'][] = '<a href="' . $scripturl . '?action=groups;sa=viewmemberes;group=' . $mod_group['id'] . '" title="' . $txt['board_moderator'] . '">' . $mod_group['name'] . '</a>';
+		}
 	}
 
 	if (!empty($context['link_moderators']))
@@ -531,9 +546,9 @@ 
 	// For quick reply we need a response prefix in the default forum language.
 	if (!isset($context['response_prefix']) && !($context['response_prefix'] = cache_get_data('response_prefix', 600)))
 	{
-		if ($language === $user_info['language'])
-			$context['response_prefix'] = $txt['response_prefix'];
-		else
+		if ($language === $user_info['language']) {
+					$context['response_prefix'] = $txt['response_prefix'];
+		} else
 		{
 			loadLanguage('index', $language, false);
 			$context['response_prefix'] = $txt['response_prefix'];
@@ -565,8 +580,9 @@ 
 			list($start, $end, $allday, $span, $tz_abbrev) = buildEventDatetimes($row);
 
 			// Sanity check
-			if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count']))
-				continue;
+			if (!empty($start['error_count']) || !empty($start['warning_count']) || !empty($end['error_count']) || !empty($end['warning_count'])) {
+							continue;
+			}
 
 			$linked_calendar_event = array(
 				'id' => $row['id_event'],
@@ -615,8 +631,9 @@ 
 		}
 		$smcFunc['db_free_result']($request);
 
-		if (!empty($context['linked_calendar_events']))
-			$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
+		if (!empty($context['linked_calendar_events'])) {
+					$context['linked_calendar_events'][count($context['linked_calendar_events']) - 1]['is_last'] = true;
+		}
 	}
 
 	// Create the poll info if it exists.
@@ -689,20 +706,21 @@ 
 				foreach ($guestinfo as $i => $guestvoted)
 				{
 					$guestvoted = explode(',', $guestvoted);
-					if ($guestvoted[0] == $context['topicinfo']['id_poll'])
-						break;
+					if ($guestvoted[0] == $context['topicinfo']['id_poll']) {
+											break;
+					}
 				}
 				// Has the poll been reset since guest voted?
 				if ($pollinfo['reset_poll'] > $guestvoted[1])
 				{
 					// Remove the poll info from the cookie to allow guest to vote again
 					unset($guestinfo[$i]);
-					if (!empty($guestinfo))
-						$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
-					else
-						unset($_COOKIE['guest_poll_vote']);
-				}
-				else
+					if (!empty($guestinfo)) {
+											$_COOKIE['guest_poll_vote'] = ';' . implode(';', $guestinfo);
+					} else {
+											unset($_COOKIE['guest_poll_vote']);
+					}
+				} else
 				{
 					// What did they vote for?
 					unset($guestvoted[0], $guestvoted[1]);
@@ -816,23 +834,29 @@ 
 		// Build the poll moderation button array.
 		$context['poll_buttons'] = array();
 
-		if ($context['allow_return_vote'])
-			$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
+		if ($context['allow_return_vote']) {
+					$context['poll_buttons']['vote'] = array('text' => 'poll_return_vote', 'image' => 'poll_options.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start']);
+		}
 
-		if ($context['show_view_results_button'])
-			$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
+		if ($context['show_view_results_button']) {
+					$context['poll_buttons']['results'] = array('text' => 'poll_results', 'image' => 'poll_results.png', 'url' => $scripturl . '?topic=' . $context['current_topic'] . '.' . $context['start'] . ';viewresults');
+		}
 
-		if ($context['allow_change_vote'])
-			$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['allow_change_vote']) {
+					$context['poll_buttons']['change_vote'] = array('text' => 'poll_change_vote', 'image' => 'poll_change_vote.png', 'url' => $scripturl . '?action=vote;topic=' . $context['current_topic'] . '.' . $context['start'] . ';poll=' . $context['poll']['id'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
-		if ($context['allow_lock_poll'])
-			$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['allow_lock_poll']) {
+					$context['poll_buttons']['lock'] = array('text' => (!$context['poll']['is_locked'] ? 'poll_lock' : 'poll_unlock'), 'image' => 'poll_lock.png', 'url' => $scripturl . '?action=lockvoting;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
-		if ($context['allow_edit_poll'])
-			$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
+		if ($context['allow_edit_poll']) {
+					$context['poll_buttons']['edit'] = array('text' => 'poll_edit', 'image' => 'poll_edit.png', 'url' => $scripturl . '?action=editpoll;topic=' . $context['current_topic'] . '.' . $context['start']);
+		}
 
-		if ($context['can_remove_poll'])
-			$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		if ($context['can_remove_poll']) {
+					$context['poll_buttons']['remove_poll'] = array('text' => 'poll_remove', 'image' => 'admin_remove_poll.png', 'custom' => 'data-confirm="' . $txt['poll_remove_warn'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removepoll;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+		}
 
 		// Allow mods to add additional buttons here
 		call_integration_hook('integrate_poll_buttons');
@@ -873,8 +897,9 @@ 
 	$all_posters = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!empty($row['id_member']))
-			$all_posters[$row['id_msg']] = $row['id_member'];
+		if (!empty($row['id_member'])) {
+					$all_posters[$row['id_msg']] = $row['id_member'];
+		}
 		$messages[] = $row['id_msg'];
 	}
 	$smcFunc['db_free_result']($request);
@@ -886,8 +911,9 @@ 
 	if (!$user_info['is_guest'] && !empty($messages))
 	{
 		$mark_at_msg = max($messages);
-		if ($mark_at_msg >= $context['topicinfo']['id_last_msg'])
-			$mark_at_msg = $modSettings['maxMsgID'];
+		if ($mark_at_msg >= $context['topicinfo']['id_last_msg']) {
+					$mark_at_msg = $modSettings['maxMsgID'];
+		}
 		if ($mark_at_msg >= $context['topicinfo']['new_from'])
 		{
 			$smcFunc['db_insert']($context['topicinfo']['new_from'] == 0 ? 'ignore' : 'replace',
@@ -919,8 +945,9 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			// Find if this topic is marked for notification...
-			if (!empty($row['id_topic']))
-				$context['is_marked_notify'] = true;
+			if (!empty($row['id_topic'])) {
+							$context['is_marked_notify'] = true;
+			}
 
 			// Only do this once, but mark the notifications as "not sent yet" for next time.
 			if (!empty($row['sent']) && $do_once)
@@ -942,8 +969,9 @@ 
 		}
 
 		// Have we recently cached the number of new topics in this board, and it's still a lot?
-		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5)
-			$_SESSION['topicseen_cache'][$board]--;
+		if (isset($_REQUEST['topicseen']) && isset($_SESSION['topicseen_cache'][$board]) && $_SESSION['topicseen_cache'][$board] > 5) {
+					$_SESSION['topicseen_cache'][$board]--;
+		}
 		// Mark board as seen if this is the only new topic.
 		elseif (isset($_REQUEST['topicseen']))
 		{
@@ -967,14 +995,16 @@ 
 			$smcFunc['db_free_result']($request);
 
 			// If there're no real new topics in this board, mark the board as seen.
-			if (empty($numNewTopics))
-				$_REQUEST['boardseen'] = true;
-			else
-				$_SESSION['topicseen_cache'][$board] = $numNewTopics;
+			if (empty($numNewTopics)) {
+							$_REQUEST['boardseen'] = true;
+			} else {
+							$_SESSION['topicseen_cache'][$board] = $numNewTopics;
+			}
 		}
 		// Probably one less topic - maybe not, but even if we decrease this too fast it will only make us look more often.
-		elseif (isset($_SESSION['topicseen_cache'][$board]))
-			$_SESSION['topicseen_cache'][$board]--;
+		elseif (isset($_SESSION['topicseen_cache'][$board])) {
+					$_SESSION['topicseen_cache'][$board]--;
+		}
 
 		// Mark board as seen if we came using last post link from BoardIndex. (or other places...)
 		if (isset($_REQUEST['boardseen']))
@@ -1031,23 +1061,26 @@ 
 			$temp = array();
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id']))
-					continue;
+				if (!$row['approved'] && $modSettings['postmod_active'] && !allowedTo('approve_posts') && (!isset($all_posters[$row['id_msg']]) || $all_posters[$row['id_msg']] != $user_info['id'])) {
+									continue;
+				}
 
 				$temp[$row['id_attach']] = $row;
 				$temp[$row['id_attach']]['topic'] = $topic;
 				$temp[$row['id_attach']]['board'] = $board;
 
-				if (!isset($context['loaded_attachments'][$row['id_msg']]))
-					$context['loaded_attachments'][$row['id_msg']] = array();
+				if (!isset($context['loaded_attachments'][$row['id_msg']])) {
+									$context['loaded_attachments'][$row['id_msg']] = array();
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// This is better than sorting it with the query...
 			ksort($temp);
 
-			foreach ($temp as $row)
-				$context['loaded_attachments'][$row['id_msg']][] = $row;
+			foreach ($temp as $row) {
+							$context['loaded_attachments'][$row['id_msg']][] = $row;
+			}
 		}
 
 		$msg_parameters = array(
@@ -1074,21 +1107,23 @@ 
 		);
 
 		// And the likes
-		if (!empty($modSettings['enable_likes']))
-			$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
+		if (!empty($modSettings['enable_likes'])) {
+					$context['my_likes'] = $context['user']['is_guest'] ? array() : prepareLikesContext($topic);
+		}
 
 		// Go to the last message if the given time is beyond the time of the last message.
-		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies'])
-			$context['start_from'] = $context['topicinfo']['num_replies'];
+		if (isset($context['start_from']) && $context['start_from'] >= $context['topicinfo']['num_replies']) {
+					$context['start_from'] = $context['topicinfo']['num_replies'];
+		}
 
 		// Since the anchor information is needed on the top of the page we load these variables beforehand.
 		$context['first_message'] = isset($messages[$firstIndex]) ? $messages[$firstIndex] : $messages[0];
-		if (empty($options['view_newest_first']))
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
-		else
-			$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
-	}
-	else
+		if (empty($options['view_newest_first'])) {
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['start_from'];
+		} else {
+					$context['first_new_message'] = isset($context['start_from']) && $_REQUEST['start'] == $context['topicinfo']['num_replies'] - $context['start_from'];
+		}
+	} else
 	{
 		$messages_request = false;
 		$context['first_message'] = 0;
@@ -1124,8 +1159,9 @@ 
 		'can_see_likes' => 'likes_view',
 		'can_like' => 'likes_like',
 	);
-	foreach ($common_permissions as $contextual => $perm)
-		$context[$contextual] = allowedTo($perm);
+	foreach ($common_permissions as $contextual => $perm) {
+			$context[$contextual] = allowedTo($perm);
+	}
 
 	// Permissions with _any/_own versions.  $context[YYY] => ZZZ_any/_own.
 	$anyown_permissions = array(
@@ -1138,8 +1174,9 @@ 
 		'can_reply_unapproved' => 'post_unapproved_replies',
 		'can_view_warning' => 'profile_warning',
 	);
-	foreach ($anyown_permissions as $contextual => $perm)
-		$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+	foreach ($anyown_permissions as $contextual => $perm) {
+			$context[$contextual] = allowedTo($perm . '_any') || ($context['user']['started'] && allowedTo($perm . '_own'));
+	}
 
 	if (!$user_info['is_admin'] && !$modSettings['topic_move_any'])
 	{
@@ -1185,8 +1222,9 @@ 
 	// Check if the draft functions are enabled and that they have permission to use them (for quick reply.)
 	$context['drafts_save'] = !empty($modSettings['drafts_post_enabled']) && allowedTo('post_draft') && $context['can_reply'];
 	$context['drafts_autosave'] = !empty($context['drafts_save']) && !empty($modSettings['drafts_autosave_enabled']);
-	if (!empty($context['drafts_save']))
-		loadLanguage('Drafts');
+	if (!empty($context['drafts_save'])) {
+			loadLanguage('Drafts');
+	}
 
 	// When was the last time this topic was replied to?  Should we warn them about it?
 	if (!empty($modSettings['oldTopicDays']) && ($context['can_reply'] || $context['can_reply_unapproved']) && empty($context['topicinfo']['is_sticky']))
@@ -1247,26 +1285,31 @@ 
 	// Message icons - customized icons are off?
 	$context['icons'] = getMessageIcons($board);
 
-	if (!empty($context['icons']))
-		$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	if (!empty($context['icons'])) {
+			$context['icons'][count($context['icons']) - 1]['is_last'] = true;
+	}
 
 	// Build the normal button array.
 	$context['normal_buttons'] = array();
 
-	if ($context['can_reply'])
-		$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
+	if ($context['can_reply']) {
+			$context['normal_buttons']['reply'] = array('text' => 'reply', 'image' => 'reply.png', 'url' => $scripturl . '?action=post;topic=' . $context['current_topic'] . '.' . $context['start'] . ';last_msg=' . $context['topic_last_message'], 'active' => true);
+	}
 
-	if ($context['can_add_poll'])
-		$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
+	if ($context['can_add_poll']) {
+			$context['normal_buttons']['add_poll'] = array('text' => 'add_poll', 'image' => 'add_poll.png', 'url' => $scripturl . '?action=editpoll;add;topic=' . $context['current_topic'] . '.' . $context['start']);
+	}
 
-	if ($context['can_mark_unread'])
-		$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_mark_unread']) {
+			$context['normal_buttons']['mark_unread'] = array('text' => 'mark_unread', 'image' => 'markunread.png', 'url' => $scripturl . '?action=markasread;sa=topic;t=' . $context['mark_unread_time'] . ';topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_print'])
-		$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
+	if ($context['can_print']) {
+			$context['normal_buttons']['print'] = array('text' => 'print', 'image' => 'print.png', 'custom' => 'rel="nofollow"', 'url' => $scripturl . '?action=printpage;topic=' . $context['current_topic'] . '.0');
+	}
 
-	if ($context['can_set_notify'])
-		$context['normal_buttons']['notify'] = array(
+	if ($context['can_set_notify']) {
+			$context['normal_buttons']['notify'] = array(
 			'text' => 'notify_topic_' . $context['topic_notification_mode'],
 			'sub_buttons' => array(
 				array(
@@ -1288,38 +1331,47 @@ 
 				),
 			),
 		);
+	}
 
 	// Build the mod button array
 	$context['mod_buttons'] = array();
 
-	if ($context['can_move'])
-		$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
+	if ($context['can_move']) {
+			$context['mod_buttons']['move'] = array('text' => 'move_topic', 'image' => 'admin_move.png', 'url' => $scripturl . '?action=movetopic;current_board=' . $context['current_board'] . ';topic=' . $context['current_topic'] . '.0');
+	}
 
-	if ($context['can_delete'])
-		$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_delete']) {
+			$context['mod_buttons']['delete'] = array('text' => 'remove_topic', 'image' => 'admin_rem.png', 'custom' => 'data-confirm="' . $txt['are_sure_remove_topic'] . '"', 'class' => 'you_sure', 'url' => $scripturl . '?action=removetopic2;topic=' . $context['current_topic'] . '.0;' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_lock'])
-		$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_lock']) {
+			$context['mod_buttons']['lock'] = array('text' => empty($context['is_locked']) ? 'set_lock' : 'set_unlock', 'image' => 'admin_lock.png', 'url' => $scripturl . '?action=lock;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_sticky'])
-		$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_sticky']) {
+			$context['mod_buttons']['sticky'] = array('text' => empty($context['is_sticky']) ? 'set_sticky' : 'set_nonsticky', 'image' => 'admin_sticky.png', 'url' => $scripturl . '?action=sticky;topic=' . $context['current_topic'] . '.' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
-	if ($context['can_merge'])
-		$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
+	if ($context['can_merge']) {
+			$context['mod_buttons']['merge'] = array('text' => 'merge', 'image' => 'merge.png', 'url' => $scripturl . '?action=mergetopics;board=' . $context['current_board'] . '.0;from=' . $context['current_topic']);
+	}
 
-	if ($context['calendar_post'])
-		$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
+	if ($context['calendar_post']) {
+			$context['mod_buttons']['calendar'] = array('text' => 'calendar_link', 'image' => 'linktocal.png', 'url' => $scripturl . '?action=post;calendar;msg=' . $context['topic_first_message'] . ';topic=' . $context['current_topic'] . '.0');
+	}
 
 	// Restore topic. eh?  No monkey business.
-	if ($context['can_restore_topic'])
-		$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if ($context['can_restore_topic']) {
+			$context['mod_buttons']['restore_topic'] = array('text' => 'restore_topic', 'image' => '', 'url' => $scripturl . '?action=restoretopic;topics=' . $context['current_topic'] . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 
 	// Show a message in case a recently posted message became unapproved.
 	$context['becomesUnapproved'] = !empty($_SESSION['becomesUnapproved']) ? true : false;
 
 	// Don't want to show this forever...
-	if ($context['becomesUnapproved'])
-		unset($_SESSION['becomesUnapproved']);
+	if ($context['becomesUnapproved']) {
+			unset($_SESSION['becomesUnapproved']);
+	}
 
 	// Allow adding new mod buttons easily.
 	// Note: $context['normal_buttons'] and $context['mod_buttons'] are added for backward compatibility with 2.0, but are deprecated and should not be used
@@ -1328,12 +1380,14 @@ 
 	call_integration_hook('integrate_mod_buttons', array(&$context['mod_buttons']));
 
 	// Load the drafts js file
-	if ($context['drafts_autosave'])
-		loadJavaScriptFile('drafts.js', array('defer' => false), 'smf_drafts');
+	if ($context['drafts_autosave']) {
+			loadJavaScriptFile('drafts.js', array('defer' => false), 'smf_drafts');
+	}
 
 	// Spellcheck
-	if ($context['show_spellchecking'])
-		loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	if ($context['show_spellchecking']) {
+			loadJavaScriptFile('spellcheck.js', array('defer' => false), 'smf_spellcheck');
+	}
 
 	// topic.js
 	loadJavaScriptFile('topic.js', array('defer' => false), 'smf_topic');
@@ -1367,16 +1421,19 @@ 
 	static $counter = null;
 
 	// If the query returned false, bail.
-	if ($messages_request == false)
-		return false;
+	if ($messages_request == false) {
+			return false;
+	}
 
 	// Remember which message this is.  (ie. reply #83)
-	if ($counter === null || $reset)
-		$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
+	if ($counter === null || $reset) {
+			$counter = empty($options['view_newest_first']) ? $context['start'] : $context['total_visible_posts'] - $context['start'];
+	}
 
 	// Start from the beginning...
-	if ($reset)
-		return @$smcFunc['db_data_seek']($messages_request, 0);
+	if ($reset) {
+			return @$smcFunc['db_data_seek']($messages_request, 0);
+	}
 
 	// Attempt to get the next message.
 	$message = $smcFunc['db_fetch_assoc']($messages_request);
@@ -1390,19 +1447,21 @@ 
 	if (empty($context['icon_sources']))
 	{
 		$context['icon_sources'] = array();
-		foreach ($context['stable_icons'] as $icon)
-			$context['icon_sources'][$icon] = 'images_url';
+		foreach ($context['stable_icons'] as $icon) {
+					$context['icon_sources'][$icon] = 'images_url';
+		}
 	}
 
 	// Message Icon Management... check the images exist.
 	if (empty($modSettings['messageIconChecks_disable']))
 	{
 		// If the current icon isn't known, then we need to do something...
-		if (!isset($context['icon_sources'][$message['icon']]))
-			$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!isset($context['icon_sources'][$message['icon']])) {
+					$context['icon_sources'][$message['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $message['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
+	} elseif (!isset($context['icon_sources'][$message['icon']])) {
+			$context['icon_sources'][$message['icon']] = 'images_url';
 	}
-	elseif (!isset($context['icon_sources'][$message['icon']]))
-		$context['icon_sources'][$message['icon']] = 'images_url';
 
 	// If you're a lazy bum, you probably didn't give a subject...
 	$message['subject'] = $message['subject'] != '' ? $message['subject'] : $txt['no_subject'];
@@ -1427,8 +1486,7 @@ 
 		$memberContext[$message['id_member']]['email'] = $message['poster_email'];
 		$memberContext[$message['id_member']]['show_email'] = allowedTo('moderate_forum');
 		$memberContext[$message['id_member']]['is_guest'] = true;
-	}
-	else
+	} else
 	{
 		// Define this here to make things a bit more readable
 		$can_view_warning = $context['user']['can_mod'] || allowedTo('view_warning_any') || ($message['id_member'] == $user_info['id'] && allowedTo('view_warning_own'));
@@ -1451,8 +1509,9 @@ 
 	$message['body'] = parse_bbc($message['body'], $message['smileys_enabled'], $message['id_msg']);
 
 	// If it's in the recycle bin we need to override whatever icon we did have.
-	if (!empty($board_info['recycle']))
-		$message['icon'] = 'recycled';
+	if (!empty($board_info['recycle'])) {
+			$message['icon'] = 'recycled';
+	}
 
 	require_once($sourcedir . '/Subs-Attachments.php');
 
@@ -1496,32 +1555,36 @@ 
 	}
 
 	// Are likes enable?
-	if (!empty($modSettings['enable_likes']))
-		$output['likes'] = array(
+	if (!empty($modSettings['enable_likes'])) {
+			$output['likes'] = array(
 			'count' => $message['likes'],
 			'you' => in_array($message['id_msg'], $context['my_likes']),
 			'can_like' => !$context['user']['is_guest'] && $message['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 		);
+	}
 
 	// Is this user the message author?
 	$output['is_message_author'] = $message['id_member'] == $user_info['id'];
-	if (!empty($output['modified']['name']))
-		$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
+	if (!empty($output['modified']['name'])) {
+			$output['modified']['last_edit_text'] = sprintf($txt['last_edit_by'], $output['modified']['time'], $output['modified']['name']);
+	}
 
 	// Did they give a reason for editing?
-	if (!empty($output['modified']['name']) && !empty($output['modified']['reason']))
-		$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
+	if (!empty($output['modified']['name']) && !empty($output['modified']['reason'])) {
+			$output['modified']['last_edit_text'] .= '&nbsp;' . sprintf($txt['last_edit_reason'], $output['modified']['reason']);
+	}
 
 	// Any custom profile fields?
-	if (!empty($memberContext[$message['id_member']]['custom_fields']))
-		foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
+	if (!empty($memberContext[$message['id_member']]['custom_fields'])) {
+			foreach ($memberContext[$message['id_member']]['custom_fields'] as $custom)
 			$output['custom_fields'][$context['cust_profile_fields_placement'][$custom['placement']]][] = $custom;
+	}
 
-	if (empty($options['view_newest_first']))
-		$counter++;
-
-	else
-		$counter--;
+	if (empty($options['view_newest_first'])) {
+			$counter++;
+	} else {
+			$counter--;
+	}
 
 	call_integration_hook('integrate_prepare_display_context', array(&$output, &$message, $counter));
 
@@ -1547,21 +1610,23 @@ 
 	$context['no_last_modified'] = true;
 
 	// Prevent a preview image from being displayed twice.
-	if (isset($_GET['action']) && $_GET['action'] == 'dlattach' && isset($_GET['type']) && ($_GET['type'] == 'avatar' || $_GET['type'] == 'preview'))
-		return;
+	if (isset($_GET['action']) && $_GET['action'] == 'dlattach' && isset($_GET['type']) && ($_GET['type'] == 'avatar' || $_GET['type'] == 'preview')) {
+			return;
+	}
 
 	// Make sure some attachment was requested!
-	if (!isset($_REQUEST['attach']) && !isset($_REQUEST['id']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_REQUEST['attach']) && !isset($_REQUEST['id'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	$_REQUEST['attach'] = isset($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : (int) $_REQUEST['id'];
 
 	// Do we have a hook wanting to use our attachment system? We use $attachRequest to prevent accidental usage of $request.
 	$attachRequest = null;
 	call_integration_hook('integrate_download_request', array(&$attachRequest));
-	if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest))
-		$request = $attachRequest;
-	else
+	if (!is_null($attachRequest) && $smcFunc['db_is_resource']($attachRequest)) {
+			$request = $attachRequest;
+	} else
 	{
 		// This checks only the current board for $board/$topic's permissions.
 		isAllowedTo('view_attachments');
@@ -1582,19 +1647,21 @@ 
 		);
 	}
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 
 	list ($id_folder, $real_filename, $file_hash, $file_ext, $id_attach, $attachment_type, $mime_type, $is_approved, $id_member) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// If it isn't yet approved, do they have permission to view it?
-	if (!$is_approved && ($id_member == 0 || $user_info['id'] != $id_member) && ($attachment_type == 0 || $attachment_type == 3))
-		isAllowedTo('approve_posts');
+	if (!$is_approved && ($id_member == 0 || $user_info['id'] != $id_member) && ($attachment_type == 0 || $attachment_type == 3)) {
+			isAllowedTo('approve_posts');
+	}
 
 	// Update the download counter (unless it's a thumbnail).
-	if ($attachment_type != 3)
-		$smcFunc['db_query']('attach_download_increase', '
+	if ($attachment_type != 3) {
+			$smcFunc['db_query']('attach_download_increase', '
 			UPDATE LOW_PRIORITY {db_prefix}attachments
 			SET downloads = downloads + 1
 			WHERE id_attach = {int:id_attach}',
@@ -1602,15 +1669,15 @@ 
 				'id_attach' => $id_attach,
 			)
 		);
+	}
 
 	$filename = getAttachmentFilename($real_filename, $_REQUEST['attach'], $id_folder, false, $file_hash);
 
 	// This is done to clear any output that was made before now.
 	ob_end_clean();
-	if (!empty($modSettings['enableCompressedOutput']) && @filesize($filename) <= 4194304 && in_array($file_ext, array('txt', 'html', 'htm', 'js', 'doc', 'docx', 'rtf', 'css', 'php', 'log', 'xml', 'sql', 'c', 'java')))
-		@ob_start('ob_gzhandler');
-
-	else
+	if (!empty($modSettings['enableCompressedOutput']) && @filesize($filename) <= 4194304 && in_array($file_ext, array('txt', 'html', 'htm', 'js', 'doc', 'docx', 'rtf', 'css', 'php', 'log', 'xml', 'sql', 'c', 'java'))) {
+			@ob_start('ob_gzhandler');
+	} else
 	{
 		ob_start();
 		header('Content-Encoding: none');
@@ -1653,8 +1720,9 @@ 
 	// Send the attachment headers.
 	header('Pragma: ');
 
-	if (!isBrowser('gecko'))
-		header('Content-Transfer-Encoding: binary');
+	if (!isBrowser('gecko')) {
+			header('Content-Transfer-Encoding: binary');
+	}
 
 	header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 525600 * 60) . ' GMT');
 	header('Last-Modified: ' . gmdate('D, d M Y H:i:s', filemtime($filename)) . ' GMT');
@@ -1663,18 +1731,19 @@ 
 	header('ETag: ' . $eTag);
 
 	// Make sure the mime type warrants an inline display.
-	if (isset($_REQUEST['image']) && !empty($mime_type) && strpos($mime_type, 'image/') !== 0)
-		unset($_REQUEST['image']);
+	if (isset($_REQUEST['image']) && !empty($mime_type) && strpos($mime_type, 'image/') !== 0) {
+			unset($_REQUEST['image']);
+	}
 
 	// Does this have a mime type?
-	elseif (!empty($mime_type) && (isset($_REQUEST['image']) || !in_array($file_ext, array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff'))))
-		header('Content-Type: ' . strtr($mime_type, array('image/bmp' => 'image/x-ms-bmp')));
-
-	else
+	elseif (!empty($mime_type) && (isset($_REQUEST['image']) || !in_array($file_ext, array('jpg', 'gif', 'jpeg', 'x-ms-bmp', 'png', 'psd', 'tiff', 'iff')))) {
+			header('Content-Type: ' . strtr($mime_type, array('image/bmp' => 'image/x-ms-bmp')));
+	} else
 	{
 		header('Content-Type: ' . (isBrowser('ie') || isBrowser('opera') ? 'application/octetstream' : 'application/octet-stream'));
-		if (isset($_REQUEST['image']))
-			unset($_REQUEST['image']);
+		if (isset($_REQUEST['image'])) {
+					unset($_REQUEST['image']);
+		}
 	}
 
 	// Convert the file to UTF-8, cuz most browsers dig that.
@@ -1682,23 +1751,22 @@ 
 	$disposition = !isset($_REQUEST['image']) ? 'attachment' : 'inline';
 
 	// Different browsers like different standards...
-	if (isBrowser('firefox'))
-		header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
-
-	elseif (isBrowser('opera'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
-
-	elseif (isBrowser('ie'))
-		header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
-
-	else
-		header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	if (isBrowser('firefox')) {
+			header('Content-Disposition: ' . $disposition . '; filename*=UTF-8\'\'' . rawurlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)));
+	} elseif (isBrowser('opera')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name) . '"');
+	} elseif (isBrowser('ie')) {
+			header('Content-Disposition: ' . $disposition . '; filename="' . urlencode(preg_replace_callback('~&#(\d{3,8});~', 'fixchar__callback', $utf8name)) . '"');
+	} else {
+			header('Content-Disposition: ' . $disposition . '; filename="' . $utf8name . '"');
+	}
 
 	// If this has an "image extension" - but isn't actually an image - then ensure it isn't cached cause of silly IE.
-	if (!isset($_REQUEST['image']) && in_array($file_ext, array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff')))
-		header('Cache-Control: no-cache');
-	else
-		header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	if (!isset($_REQUEST['image']) && in_array($file_ext, array('gif', 'jpg', 'bmp', 'png', 'jpeg', 'tiff'))) {
+			header('Cache-Control: no-cache');
+	} else {
+			header('Cache-Control: max-age=' . (525600 * 60) . ', private');
+	}
 
 	header('Content-Length: ' . filesize($filename));
 
@@ -1708,20 +1776,23 @@ 
 	// Recode line endings for text files, if enabled.
 	if (!empty($modSettings['attachmentRecodeLineEndings']) && !isset($_REQUEST['image']) && in_array($file_ext, array('txt', 'css', 'htm', 'html', 'php', 'xml')))
 	{
-		if (strpos($_SERVER['HTTP_USER_AGENT'], 'Windows') !== false)
-			$callback = function($buffer)
+		if (strpos($_SERVER['HTTP_USER_AGENT'], 'Windows') !== false) {
+					$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\r\n", $buffer);
+		}
 			};
-		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false)
-			$callback = function($buffer)
+		elseif (strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false) {
+					$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\r", $buffer);
+		}
 			};
-		else
-			$callback = function($buffer)
+		else {
+					$callback = function($buffer)
 			{
 				return preg_replace('~[\r]?\n~', "\n", $buffer);
+		}
 			};
 	}
 
@@ -1729,23 +1800,26 @@ 
 	if (filesize($filename) > 4194304)
 	{
 		// Forcibly end any output buffering going on.
-		while (@ob_get_level() > 0)
-			@ob_end_clean();
+		while (@ob_get_level() > 0) {
+					@ob_end_clean();
+		}
 
 		$fp = fopen($filename, 'rb');
 		while (!feof($fp))
 		{
-			if (isset($callback))
-				echo $callback(fread($fp, 8192));
-			else
-				echo fread($fp, 8192);
+			if (isset($callback)) {
+							echo $callback(fread($fp, 8192));
+			} else {
+							echo fread($fp, 8192);
+			}
 			flush();
 		}
 		fclose($fp);
 	}
 	// On some of the less-bright hosts, readfile() is disabled.  It's just a faster, more byte safe, version of what's in the if.
-	elseif (isset($callback) || @readfile($filename) === null)
-		echo isset($callback) ? $callback(file_get_contents($filename)) : file_get_contents($filename);
+	elseif (isset($callback) || @readfile($filename) === null) {
+			echo isset($callback) ? $callback(file_get_contents($filename)) : file_get_contents($filename);
+	}
 
 	obExit(false);
 }
@@ -1758,8 +1832,9 @@ 
  */
 function approved_attach_sort($a, $b)
 {
-	if ($a['is_approved'] == $b['is_approved'])
-		return 0;
+	if ($a['is_approved'] == $b['is_approved']) {
+			return 0;
+	}
 
 	return $a['is_approved'] > $b['is_approved'] ? -1 : 1;
 }
@@ -1776,16 +1851,19 @@ 
 
 	require_once($sourcedir . '/RemoveTopic.php');
 
-	if (empty($_REQUEST['msgs']))
-		redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	if (empty($_REQUEST['msgs'])) {
+			redirectexit('topic=' . $topic . '.' . $_REQUEST['start']);
+	}
 
 	$messages = array();
-	foreach ($_REQUEST['msgs'] as $dummy)
-		$messages[] = (int) $dummy;
+	foreach ($_REQUEST['msgs'] as $dummy) {
+			$messages[] = (int) $dummy;
+	}
 
 	// We are restoring messages. We handle this in another place.
-	if (isset($_REQUEST['restore_selected']))
-		redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	if (isset($_REQUEST['restore_selected'])) {
+			redirectexit('action=restoretopic;msgs=' . implode(',', $messages) . ';' . $context['session_var'] . '=' . $context['session_id']);
+	}
 	if (isset($_REQUEST['split_selection']))
 	{
 		$request = $smcFunc['db_query']('', '
@@ -1804,8 +1882,9 @@ 
 	}
 
 	// Allowed to delete any message?
-	if (allowedTo('delete_any'))
-		$allowed_all = true;
+	if (allowedTo('delete_any')) {
+			$allowed_all = true;
+	}
 	// Allowed to delete replies to their messages?
 	elseif (allowedTo('delete_replies'))
 	{
@@ -1822,13 +1901,14 @@ 
 		$smcFunc['db_free_result']($request);
 
 		$allowed_all = $starter == $user_info['id'];
+	} else {
+			$allowed_all = false;
 	}
-	else
-		$allowed_all = false;
 
 	// Make sure they're allowed to delete their own messages, if not any.
-	if (!$allowed_all)
-		isAllowedTo('delete_own');
+	if (!$allowed_all) {
+			isAllowedTo('delete_own');
+	}
 
 	// Allowed to remove which messages?
 	$request = $smcFunc['db_query']('', '
@@ -1848,8 +1928,9 @@ 
 	$messages = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time())
-			continue;
+		if (!$allowed_all && !empty($modSettings['edit_disable_time']) && $row['poster_time'] + $modSettings['edit_disable_time'] * 60 < time()) {
+					continue;
+		}
 
 		$messages[$row['id_msg']] = array($row['subject'], $row['id_member']);
 	}
@@ -1872,17 +1953,20 @@ 
 	foreach ($messages as $message => $info)
 	{
 		// Just skip the first message - if it's not the last.
-		if ($message == $first_message && $message != $last_message)
-			continue;
+		if ($message == $first_message && $message != $last_message) {
+					continue;
+		}
 		// If the first message is going then don't bother going back to the topic as we're effectively deleting it.
-		elseif ($message == $first_message)
-			$topicGone = true;
+		elseif ($message == $first_message) {
+					$topicGone = true;
+		}
 
 		removeMessage($message);
 
 		// Log this moderation action ;).
-		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id']))
-			logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
+		if (allowedTo('delete_any') && (!allowedTo('delete_own') || $info[1] != $user_info['id'])) {
+					logAction('delete', array('topic' => $topic, 'subject' => $info[0], 'member' => $info[1], 'board' => $board));
+		}
 	}
 
 	redirectexit(!empty($topicGone) ? 'board=' . $board : 'topic=' . $topic . '.' . $_REQUEST['start']);