albertlast / SMF2.1

Sources/ManageSearch.php

Spacing +6 added lines, -6 removed lines

@@ -231,7 +231,7 @@ 
 				)
 			);
 
-			$request = $smcFunc['db_query']('','
+			$request = $smcFunc['db_query']('', '
 				SHOW default_text_search_config',
 				array()
 			);
@@ -426,8 +426,8 @@ 
 			WHERE t.schemaname= {string:schema} and (
 				indexname = {string:messages_ftx} OR indexname = {string:log_search_words} )',
 			array(
-				'messages_ftx' => $db_prefix. 'messages_ftx',
-				'log_search_words' => $db_prefix. 'log_search_words',
+				'messages_ftx' => $db_prefix . 'messages_ftx',
+				'log_search_words' => $db_prefix . 'log_search_words',
 				'schema' => 'public',
 			)
 		);
@@ -442,7 +442,7 @@ 
 					$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'];
@@ -799,7 +799,7 @@ 
 	// We need this for db_get_version
 	db_extend();
 
-	if ($smcFunc['db_title'] == 'PostgreSQL'){
+	if ($smcFunc['db_title'] == 'PostgreSQL') {
 		$request = $smcFunc['db_query']('', '
 			SELECT
 				indexname
@@ -814,7 +814,7 @@ 
 			WHERE t.schemaname= {string:schema} and indexname = {string:messages_ftx}',
 			array(
 				'schema' => 'public',
-				'messages_ftx' => $db_prefix.'messages_ftx',
+				'messages_ftx' => $db_prefix . 'messages_ftx',
 			)
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))

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')
 	{
@@ -250,8 +258,7 @@ 
 					'language' => $language_ftx
 				)
 			);
-		}
-		else
+		} else
 		{
 			// Make sure it's gone before creating it.
 			$smcFunc['db_query']('', '
@@ -271,8 +278,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');
@@ -289,12 +295,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');
@@ -316,12 +322,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');
@@ -343,8 +349,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}',
@@ -353,14 +359,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.
@@ -372,8 +379,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}',
@@ -382,14 +389,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.
@@ -398,8 +406,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();
@@ -441,38 +448,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'];
 	}
@@ -501,8 +508,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'];
@@ -532,8 +540,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,
@@ -542,12 +549,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)
@@ -576,12 +585,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(
@@ -597,16 +608,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;
@@ -647,21 +658,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.
@@ -672,9 +684,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;
@@ -695,20 +707,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'])
@@ -769,8 +783,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,
@@ -817,10 +832,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
@@ -831,17 +846,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}',
@@ -850,20 +867,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/Stats.php

Spacing +1 added lines, -1 removed lines

@@ -555,7 +555,7 @@
 				'subject' => $row_liked_message['subject'],
 				'num' => $row_liked_message['likes'],
 				'href' => $scripturl . '?msg=' . $row_liked_message['id_msg'],
-				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] .'">' . $row_liked_message['subject'] . '</a>'
+				'link' => '<a href="' . $scripturl . '?msg=' . $row_liked_message['id_msg'] . '">' . $row_liked_message['subject'] . '</a>'
 			);
 
 			if ($max_liked_message < $row_liked_message['likes'])

Braces +112 added lines, -78 removed lines

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

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main admin handling function.<br>
@@ -444,8 +445,9 @@ 
 		foreach ($admin_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);
+			}
 		}
 	}
 
@@ -457,24 +459,27 @@ 
 	unset($admin_areas);
 
 	// Nothing valid?
-	if ($admin_include_data == false)
-		fatal_lang_error('no_access', false);
+	if ($admin_include_data == false) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Build the link tree.
 	$context['linktree'][] = array(
 		'url' => $scripturl . '?action=admin',
 		'name' => $txt['admin_center'],
 	);
-	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index')
-		$context['linktree'][] = array(
+	if (isset($admin_include_data['current_area']) && $admin_include_data['current_area'] != 'index') {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['label'],
 		);
-	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label'])
-		$context['linktree'][] = array(
+	}
+	if (!empty($admin_include_data['current_subsection']) && $admin_include_data['subsections'][$admin_include_data['current_subsection']][0] != $admin_include_data['label']) {
+			$context['linktree'][] = array(
 			'url' => $scripturl . '?action=admin;area=' . $admin_include_data['current_area'] . ';sa=' . $admin_include_data['current_subsection'] . ';' . $context['session_var'] . '=' . $context['session_id'],
 			'name' => $admin_include_data['subsections'][$admin_include_data['current_subsection']][0],
 		);
+	}
 
 	// Make a note of the Unique ID for this menu.
 	$context['admin_menu_id'] = $context['max_menu_id'];
@@ -484,16 +489,18 @@ 
 	$context['admin_area'] = $admin_include_data['current_area'];
 
 	// Now - finally - call the right place!
-	if (isset($admin_include_data['file']))
-		require_once($sourcedir . '/' . $admin_include_data['file']);
+	if (isset($admin_include_data['file'])) {
+			require_once($sourcedir . '/' . $admin_include_data['file']);
+	}
 
 	// Get the right callable.
 	$call = call_helper($admin_include_data['function'], true);
 
 	// Is it valid?
-	if (!empty($call))
-		call_user_func($call);
-}
+	if (!empty($call)) {
+			call_user_func($call);
+	}
+	}
 
 /**
  * The main administration section.
@@ -547,13 +554,14 @@ 
 
 	$context['sub_template'] = $context['admin_area'] == 'credits' ? 'credits' : 'admin';
 	$context['page_title'] = $context['admin_area'] == 'credits' ? $txt['support_credits_title'] : $txt['admin_center'];
-	if ($context['admin_area'] != 'credits')
-		$context[$context['admin_menu_name']]['tab_data'] = array(
+	if ($context['admin_area'] != 'credits') {
+			$context[$context['admin_menu_name']]['tab_data'] = array(
 			'title' => $txt['admin_center'],
 			'help' => '',
 			'description' => '<strong>' . $txt['hello_guest'] . ' ' . $context['user']['name'] . '!</strong>
 						' . sprintf($txt['admin_main_welcome'], $txt['admin_center'], $txt['help'], $txt['help']),
 		);
+	}
 
 	// Lastly, fill in the blanks in the support resources paragraphs.
 	$txt['support_resources_p1'] = sprintf($txt['support_resources_p1'],
@@ -571,9 +579,10 @@ 
 		'http://www.simplemachines.org/redirect/customize_support'
 	);
 
-	if ($context['admin_area'] == 'admin')
-		loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
-}
+	if ($context['admin_area'] == 'admin') {
+			loadJavaScriptFile('admin.js', array('defer' => false), 'smf_admin');
+	}
+	}
 
 /**
  * Get one of the admin information files from Simple Machines.
@@ -584,8 +593,9 @@ 
 
 	setMemoryLimit('32M');
 
-	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['filename']) || !is_string($_REQUEST['filename'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Strip off the forum cache part or we won't find it...
 	$_REQUEST['filename'] = str_replace($modSettings['browser_cache'], '', $_REQUEST['filename']);
@@ -600,27 +610,30 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('admin_file_not_found', true, array($_REQUEST['filename']), 404);
+	}
 
 	list ($file_data, $filetype) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	// @todo Temp
 	// Figure out if sesc is still being used.
-	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript')
-		$file_data = '
+	if (strpos($file_data, ';sesc=') !== false && $filetype == 'text/javascript') {
+			$file_data = '
 if (!(\'smfForum_sessionvar\' in window))
 	window.smfForum_sessionvar = \'sesc\';
 ' . strtr($file_data, array(';sesc=' => ';\' + window.smfForum_sessionvar + \'='));
+	}
 
 	$context['template_layers'] = array();
 	// Lets make sure we aren't going to output anything nasty.
 	@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();
+	}
 
 	// Make sure they know what type of file we are.
 	header('Content-Type: ' . $filetype);
@@ -660,11 +673,12 @@ 
 		updateAdminPreferences();
 	}
 
-	if (trim($context['search_term']) == '')
-		$context['search_results'] = array();
-	else
-		call_helper($subActions[$context['search_type']]);
-}
+	if (trim($context['search_term']) == '') {
+			$context['search_results'] = array();
+	} else {
+			call_helper($subActions[$context['search_type']]);
+	}
+	}
 
 /**
  * A complicated but relatively quick internal search.
@@ -728,8 +742,9 @@ 
 
 	loadLanguage(implode('+', $language_files));
 
-	foreach ($include_files as $file)
-		require_once($sourcedir . '/' . $file . '.php');
+	foreach ($include_files as $file) {
+			require_once($sourcedir . '/' . $file . '.php');
+	}
 
 	/* This is the huge array that defines everything... it's a huge array of items formatted as follows:
 		0 = Language index (Can be array of indexes) to search through for this setting.
@@ -753,11 +768,12 @@ 
 		foreach ($section['areas'] as $menu_key => $menu_item)
 		{
 			$search_data['sections'][] = array($menu_item['label'], 'area=' . $menu_key);
-			if (!empty($menu_item['subsections']))
-				foreach ($menu_item['subsections'] as $key => $sublabel)
+			if (!empty($menu_item['subsections'])) {
+							foreach ($menu_item['subsections'] as $key => $sublabel)
 				{
 					if (isset($sublabel['label']))
 						$search_data['sections'][] = array($sublabel['label'], 'area=' . $menu_key . ';sa=' . $key);
+			}
 				}
 		}
 	}
@@ -767,9 +783,10 @@ 
 		// Get a list of their variables.
 		$config_vars = $setting_area[0](true);
 
-		foreach ($config_vars as $var)
-			if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
+		foreach ($config_vars as $var) {
+					if (!empty($var[1]) && !in_array($var[0], array('permissions', 'switch', 'desc')))
 				$search_data['settings'][] = array($var[(isset($var[2]) && in_array($var[2], array('file', 'db'))) ? 0 : 1], $setting_area[1]);
+		}
 	}
 
 	$context['page_title'] = $txt['admin_search_results'];
@@ -782,8 +799,9 @@ 
 		foreach ($data as $item)
 		{
 			$found = false;
-			if (!is_array($item[0]))
-				$item[0] = array($item[0]);
+			if (!is_array($item[0])) {
+							$item[0] = array($item[0]);
+			}
 			foreach ($item[0] as $term)
 			{
 				if (stripos($term, $search_term) !== false || (isset($txt[$term]) && stripos($txt[$term], $search_term) !== false) || (isset($txt['setting_' . $term]) && stripos($txt['setting_' . $term], $search_term) !== false))
@@ -841,8 +859,9 @@ 
 	$postVars = explode(' ', $context['search_term']);
 
 	// Encode the search data.
-	foreach ($postVars as $k => $v)
-		$postVars[$k] = urlencode($v);
+	foreach ($postVars as $k => $v) {
+			$postVars[$k] = urlencode($v);
+	}
 
 	// This is what we will send.
 	$postVars = implode('+', $postVars);
@@ -854,8 +873,9 @@ 
 	$search_results = fetch_web_data($context['doc_apiurl'] . '?action=query&list=search&srprop=timestamp|snippet&format=xml&srwhat=text&srsearch=' . $postVars);
 
 	// If we didn't get any xml back we are in trouble - perhaps the doc site is overloaded?
-	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true)
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$search_results || preg_match('~<' . '\?xml\sversion="\d+\.\d+"\?' . '>\s*(<api>.+?</api>)~is', $search_results, $matches) != true) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	$search_results = $matches[1];
 
@@ -867,8 +887,9 @@ 
 	$results = new xmlArray($search_results, false);
 
 	// Move through the api layer.
-	if (!$results->exists('api'))
-		fatal_lang_error('cannot_connect_doc_site');
+	if (!$results->exists('api')) {
+			fatal_lang_error('cannot_connect_doc_site');
+	}
 
 	// Are there actually some results?
 	if ($results->exists('api/query/search/p'))
@@ -904,8 +925,9 @@ 
 	);
 
 	// If it's not got a sa set it must have come here for first time, pretend error log should be reversed.
-	if (!isset($_REQUEST['sa']))
-		$_REQUEST['desc'] = true;
+	if (!isset($_REQUEST['sa'])) {
+			$_REQUEST['desc'] = true;
+	}
 
 	// Setup some tab stuff.
 	$context[$context['admin_menu_name']]['tab_data'] = array(
@@ -955,9 +977,10 @@ 
 	unset($_SESSION['admin_time']);
 
 	// Clean any admin tokens as well.
-	foreach ($_SESSION['token'] as $key => $token)
-		if (strpos($key, '-admin') !== false)
+	foreach ($_SESSION['token'] as $key => $token) {
+			if (strpos($key, '-admin') !== false)
 			unset($_SESSION['token'][$key]);
+	}
 
 	redirectexit();
 }

Sources/Modlog.php

Spacing +2 added lines, -2 removed lines

@@ -256,7 +256,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($entry)
+					'function' => function($entry)
 					{
 						return '<input type="checkbox" class="input_check" name="delete[]" value="' . $entry['id'] . '"' . ($entry['editable'] ? '' : ' disabled') . '>';
 					},
@@ -638,7 +638,7 @@ 
 		if (empty($entries[$k]['action_text']))
 			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
-			function ($matches) use ($entries, $k)
+			function($matches) use ($entries, $k)
 			{
 				return isset($entries[$k]['extra'][$matches[1]]) ? $entries[$k]['extra'][$matches[1]] : '';
 			}, $entries[$k]['action_text']);

Braces +97 added lines, -73 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Prepares the information from the moderation log for viewing.
@@ -32,14 +33,16 @@ 
 
 	// Are we looking at the moderation log or the administration log.
 	$context['log_type'] = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 3 : 1;
-	if ($context['log_type'] == 3)
-		isAllowedTo('admin_forum');
+	if ($context['log_type'] == 3) {
+			isAllowedTo('admin_forum');
+	}
 
 	// These change dependant on whether we are viewing the moderation or admin log.
-	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin')
-		$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
-	else
-		$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	if ($context['log_type'] == 3 || $_REQUEST['action'] == 'admin') {
+			$context['url_start'] = '?action=admin;area=logs;sa=' . ($context['log_type'] == 3 ? 'adminlog' : 'modlog') . ';type=' . $context['log_type'];
+	} else {
+			$context['url_start'] = '?action=moderate;area=modlog;type=' . $context['log_type'];
+	}
 
 	$context['can_delete'] = allowedTo('admin_forum');
 
@@ -67,8 +70,7 @@ 
 		$log_type = isset($_REQUEST['sa']) && $_REQUEST['sa'] == 'adminlog' ? 'admin' : 'moderate';
 		logAction('clearlog_' . $log_type, array(), $log_type);
 
-	}
-	elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
+	} elseif (!empty($_POST['remove']) && isset($_POST['delete']) && $context['can_delete'])
 	{
 		checkSession();
 		validateToken('mod-ml');
@@ -114,15 +116,17 @@ 
 		'ip' => array('sql' => 'lm.ip', 'label' => $txt['modlog_ip'])
 	);
 
-	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search']))
-		$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
-	else
-		$search_params_string = $search_params['string'];
+	if (!isset($search_params['string']) || (!empty($_REQUEST['search']) && $search_params['string'] != $_REQUEST['search'])) {
+			$search_params_string = empty($_REQUEST['search']) ? '' : $_REQUEST['search'];
+	} else {
+			$search_params_string = $search_params['string'];
+	}
 
-	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']]))
-		$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
-	else
-		$search_params_type = $search_params['type'];
+	if (isset($_REQUEST['search_type']) || empty($search_params['type']) || !isset($searchTypes[$search_params['type']])) {
+			$search_params_type = isset($_REQUEST['search_type']) && isset($searchTypes[$_REQUEST['search_type']]) ? $_REQUEST['search_type'] : (isset($searchTypes[$context['order']]) ? $context['order'] : 'member');
+	} else {
+			$search_params_type = $search_params['type'];
+	}
 
 	$search_params_column = $searchTypes[$search_params_type]['sql'];
 	$search_params = array(
@@ -297,13 +301,14 @@ 
 	$context['sub_template'] = 'show_list';
 	$context['default_list'] = 'moderation_log_list';
 
-	if (isset($context['moderation_menu_name']))
-		$context[$context['moderation_menu_name']]['tab_data'] = array(
+	if (isset($context['moderation_menu_name'])) {
+			$context[$context['moderation_menu_name']]['tab_data'] = array(
 			'title' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log'],
 			'help' => $context['log_type'] == 3 ? 'adminlog' : 'modlog',
 			'description' => $txt['modlog_' . ($context['log_type'] == 3 ? 'admin' : 'moderation') . '_log_desc']
 		);
-}
+	}
+	}
 
 /**
  * Get the number of mod log entries.
@@ -407,30 +412,35 @@ 
 		// Add on some of the column stuff info
 		if (!empty($row['id_board']))
 		{
-			if ($row['action'] == 'move')
-				$row['extra']['board_to'] = $row['id_board'];
-			else
-				$row['extra']['board'] = $row['id_board'];
+			if ($row['action'] == 'move') {
+							$row['extra']['board_to'] = $row['id_board'];
+			} else {
+							$row['extra']['board'] = $row['id_board'];
+			}
 		}
 
-		if (!empty($row['id_topic']))
-			$row['extra']['topic'] = $row['id_topic'];
-		if (!empty($row['id_msg']))
-			$row['extra']['message'] = $row['id_msg'];
+		if (!empty($row['id_topic'])) {
+					$row['extra']['topic'] = $row['id_topic'];
+		}
+		if (!empty($row['id_msg'])) {
+					$row['extra']['message'] = $row['id_msg'];
+		}
 
 		// Is this associated with a topic?
-		if (isset($row['extra']['topic']))
-			$topics[(int) $row['extra']['topic']][] = $row['id_action'];
-		if (isset($row['extra']['new_topic']))
-			$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		if (isset($row['extra']['topic'])) {
+					$topics[(int) $row['extra']['topic']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['new_topic'])) {
+					$topics[(int) $row['extra']['new_topic']][] = $row['id_action'];
+		}
 
 		// How about a member?
 		if (isset($row['extra']['member']))
 		{
 			// Guests don't have names!
-			if (empty($row['extra']['member']))
-				$row['extra']['member'] = $txt['modlog_parameter_guest'];
-			else
+			if (empty($row['extra']['member'])) {
+							$row['extra']['member'] = $txt['modlog_parameter_guest'];
+			} else
 			{
 				// Try to find it...
 				$members[(int) $row['extra']['member']][] = $row['id_action'];
@@ -438,35 +448,42 @@ 
 		}
 
 		// Associated with a board?
-		if (isset($row['extra']['board_to']))
-			$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
-		if (isset($row['extra']['board_from']))
-			$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
-		if (isset($row['extra']['board']))
-			$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		if (isset($row['extra']['board_to'])) {
+					$boards[(int) $row['extra']['board_to']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board_from'])) {
+					$boards[(int) $row['extra']['board_from']][] = $row['id_action'];
+		}
+		if (isset($row['extra']['board'])) {
+					$boards[(int) $row['extra']['board']][] = $row['id_action'];
+		}
 
 		// A message?
-		if (isset($row['extra']['message']))
-			$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		if (isset($row['extra']['message'])) {
+					$messages[(int) $row['extra']['message']][] = $row['id_action'];
+		}
 
 		// IP Info?
-		if (isset($row['extra']['ip_range']))
-			if ($seeIP)
+		if (isset($row['extra']['ip_range'])) {
+					if ($seeIP)
 				$row['extra']['ip_range'] = '<a href="' . $scripturl . '?action=trackip;searchip=' . $row['extra']['ip_range'] . '">' . $row['extra']['ip_range'] . '</a>';
-			else
-				$row['extra']['ip_range'] = $txt['logged'];
+		} else {
+							$row['extra']['ip_range'] = $txt['logged'];
+			}
 
 		// Email?
-		if (isset($row['extra']['email']))
-			$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		if (isset($row['extra']['email'])) {
+					$row['extra']['email'] = '<a href="mailto:' . $row['extra']['email'] . '">' . $row['extra']['email'] . '</a>';
+		}
 
 		// Bans are complex.
 		if ($row['action'] == 'ban' || $row['action'] == 'banremove')
 		{
 			$row['action_text'] = $txt['modlog_ac_ban' . ($row['action'] == 'banremove' ? '_remove' : '')];
-			foreach (array('member', 'email', 'ip_range', 'hostname') as $type)
-				if (isset($row['extra'][$type]))
+			foreach (array('member', 'email', 'ip_range', 'hostname') as $type) {
+							if (isset($row['extra'][$type]))
 					$row['action_text'] .= $txt['modlog_ac_ban_trigger_' . $type];
+			}
 		}
 
 		// The array to go to the template. Note here that action is set to a "default" value of the action doesn't match anything in the descriptions. Allows easy adding of logging events with basic details.
@@ -502,12 +519,13 @@ 
 			foreach ($boards[$row['id_board']] as $action)
 			{
 				// Make the board number into a link - dealing with moving too.
-				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board'])
-					$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board'])
-					$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
-				elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board'])
-					$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				if (isset($entries[$action]['extra']['board_to']) && $entries[$action]['extra']['board_to'] == $row['id_board']) {
+									$entries[$action]['extra']['board_to'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board_from']) && $entries[$action]['extra']['board_from'] == $row['id_board']) {
+									$entries[$action]['extra']['board_from'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				} elseif (isset($entries[$action]['extra']['board']) && $entries[$action]['extra']['board'] == $row['id_board']) {
+									$entries[$action]['extra']['board'] = '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -541,10 +559,11 @@ 
 				);
 
 				// Make the topic number into a link - dealing with splitting too.
-				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic'])
-					$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
-				elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic'])
-					$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['topic']) && $this_action['extra']['topic'] == $row['id_topic']) {
+									$this_action['extra']['topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				} elseif (isset($this_action['extra']['new_topic']) && $this_action['extra']['new_topic'] == $row['id_topic']) {
+									$this_action['extra']['new_topic'] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.' . (isset($this_action['extra']['message']) ? 'msg' . $this_action['extra']['message'] . '#msg' . $this_action['extra']['message'] : '0') . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -577,8 +596,9 @@ 
 				);
 
 				// Make the message number into a link.
-				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg'])
-					$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				if (isset($this_action['extra']['message']) && $this_action['extra']['message'] == $row['id_msg']) {
+									$this_action['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+				}
 			}
 		}
 		$smcFunc['db_free_result']($request);
@@ -618,25 +638,29 @@ 
 	foreach ($entries as $k => $entry)
 	{
 		// Make any message info links so its easier to go find that message.
-		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id'])))
-			$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		if (isset($entry['extra']['message']) && (empty($entry['message']) || empty($entry['message']['id']))) {
+					$entries[$k]['extra']['message'] = '<a href="' . $scripturl . '?msg=' . $entry['extra']['message'] . '">' . $entry['extra']['message'] . '</a>';
+		}
 
 		// Mark up any deleted members, topics and boards.
-		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type)
-			if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
+		foreach (array('board', 'board_from', 'board_to', 'member', 'topic', 'new_topic') as $type) {
+					if (!empty($entry['extra'][$type]) && is_numeric($entry['extra'][$type]))
 				$entries[$k]['extra'][$type] = sprintf($txt['modlog_id'], $entry['extra'][$type]);
+		}
 
 		if (isset($entry['extra']['report']))
 		{
 			// Member profile reports go in a different area
-			if (stristr($entry['action'], 'user_report'))
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
-			else
-				$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			if (stristr($entry['action'], 'user_report')) {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedmembers;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			} else {
+							$entries[$k]['extra']['report'] = '<a href="' . $scripturl . '?action=moderate;area=reportedposts;sa=details;rid=' . $entry['extra']['report'] . '">' . $txt['modlog_report'] . '</a>';
+			}
 		}
 
-		if (empty($entries[$k]['action_text']))
-			$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		if (empty($entries[$k]['action_text'])) {
+					$entries[$k]['action_text'] = isset($txt['modlog_ac_' . $entry['action']]) ? $txt['modlog_ac_' . $entry['action']] : $entry['action'];
+		}
 		$entries[$k]['action_text'] = preg_replace_callback('~\{([A-Za-z\d_]+)\}~i',
 			function ($matches) use ($entries, $k)
 			{

Sources/DbExtra-postgresql.php

Spacing +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
 
 	$table = str_replace('{db_prefix}', $db_prefix, $table);
 
-	$pg_tables = array('pg_catalog','information_schema');
+	$pg_tables = array('pg_catalog', 'information_schema');
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -369,7 +369,7 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
+	if (!empty($ver))
 		return $ver;
 
 	global $smcFunc;

Braces +37 added lines, -27 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.
@@ -48,13 +50,14 @@ 
 
 	// Do we need to drop it first?
 	$tables = smf_db_list_tables(false, $backup_table);
-	if (!empty($tables))
-		$smcFunc['db_query']('', '
+	if (!empty($tables)) {
+			$smcFunc['db_query']('', '
 			DROP TABLE {raw:backup_table}',
 			array(
 				'backup_table' => $backup_table,
 			)
 		);
+	}
 
 	/**
 	 * @todo Should we create backups of sequences as well?
@@ -117,8 +120,9 @@ 
 			)
 		);
 
-	if (!$request)
-		return -1;
+	if (!$request) {
+			return -1;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT pg_relation_size(C.oid) AS "size"
@@ -136,11 +140,12 @@ 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (isset($row['size']))
-			return ($old_size - $row['size']) / 1024;
-	else
-		return 0;
-}
+	if (isset($row['size'])) {
+				return ($old_size - $row['size']) / 1024;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * This function lists all tables in the database.
@@ -167,8 +172,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;
@@ -209,12 +215,14 @@ 
 	);
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if ($row['data_type'] == 'character varying')
-			$row['data_type'] = 'varchar';
-		elseif ($row['data_type'] == 'character')
-			$row['data_type'] = 'char';
-		if ($row['character_maximum_length'])
-			$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		if ($row['data_type'] == 'character varying') {
+					$row['data_type'] = 'varchar';
+		} elseif ($row['data_type'] == 'character') {
+					$row['data_type'] = 'char';
+		}
+		if ($row['character_maximum_length']) {
+					$row['data_type'] .= '(' . $row['character_maximum_length'] . ')';
+		}
 
 		// Make the CREATE for this column.
 		$schema_create .= ' "' . $row['column_name'] . '" ' . $row['data_type'] . ($row['is_nullable'] != 'YES' ? ' NOT NULL' : '');
@@ -265,13 +273,14 @@ 
 	{
 		if ($row['is_primary'])
 		{
-			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0)
-				continue;
+			if (preg_match('~\(([^\)]+?)\)~i', $row['inddef'], $matches) == 0) {
+							continue;
+			}
 
 			$index_create .= $crlf . 'ALTER TABLE ' . $tableName . ' ADD PRIMARY KEY ("' . $matches[1] . '");';
+		} else {
+					$index_create .= $crlf . $row['inddef'] . ';';
 		}
-		else
-			$index_create .= $crlf . $row['inddef'] . ';';
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -289,8 +298,9 @@ 
 {
 	static $ver;
 
-	if(!empty($ver))
-		return $ver;
+	if(!empty($ver)) {
+			return $ver;
+	}
 
 	global $smcFunc;
 

Sources/ManageCalendar.php

Spacing +2 added lines, -2 removed lines

@@ -136,7 +136,7 @@ 
 					'value' => $txt['date'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						// Recurring every year or just a single year?
 						$year = $rowData['year'] == '0004' ? sprintf('(%1$s)', $txt['every_year']) : $rowData['year'];
@@ -218,7 +218,7 @@ 
 		checkSession();
 
 		// Not too long good sir?
-		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
+		$_REQUEST['title'] = $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
 		if (isset($_REQUEST['delete']))

Braces +37 added lines, -28 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * The main controlling function doesn't have much to do... yet.
@@ -43,8 +44,7 @@ 
 			'settings' => 'ModifyCalendarSettings'
 		);
 		$default = 'holidays';
-	}
-	else
+	} else
 	{
 		$subActions = array(
 			'settings' => 'ModifyCalendarSettings'
@@ -60,8 +60,8 @@ 
 		'help' => 'calendar',
 		'description' => $txt['calendar_settings_desc'],
 	);
-	if (!empty($modSettings['cal_enabled']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs'] = array(
 			'holidays' => array(
 				'description' => $txt['manage_holidays_desc'],
 			),
@@ -69,6 +69,7 @@ 
 				'description' => $txt['calendar_settings_desc'],
 			),
 		);
+	}
 
 	call_integration_hook('integrate_manage_calendar', array(&$subActions));
 
@@ -88,8 +89,9 @@ 
 		checkSession();
 		validateToken('admin-mc');
 
-		foreach ($_REQUEST['holiday'] as $id => $value)
-			$_REQUEST['holiday'][$id] = (int) $id;
+		foreach ($_REQUEST['holiday'] as $id => $value) {
+					$_REQUEST['holiday'][$id] = (int) $id;
+		}
 
 		// Now the IDs are "safe" do the delete...
 		require_once($sourcedir . '/Subs-Calendar.php');
@@ -209,8 +211,9 @@ 
 	$context['sub_template'] = 'edit_holiday';
 
 	// Cast this for safety...
-	if (isset($_REQUEST['holiday']))
-		$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	if (isset($_REQUEST['holiday'])) {
+			$_REQUEST['holiday'] = (int) $_REQUEST['holiday'];
+	}
 
 	// Submitting?
 	if (isset($_POST[$context['session_var']]) && (isset($_REQUEST['delete']) || $_REQUEST['title'] != ''))
@@ -221,19 +224,19 @@ 
 		$_REQUEST['title'] =  $smcFunc['substr']($_REQUEST['title'], 0, 60);
 		$_REQUEST['holiday'] = isset($_REQUEST['holiday']) ? (int) $_REQUEST['holiday'] : 0;
 
-		if (isset($_REQUEST['delete']))
-			$smcFunc['db_query']('', '
+		if (isset($_REQUEST['delete'])) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}calendar_holidays
 				WHERE id_holiday = {int:selected_holiday}',
 				array(
 					'selected_holiday' => $_REQUEST['holiday'],
 				)
 			);
-		else
+		} else
 		{
 			$date = strftime($_REQUEST['year'] <= 4 ? '0004-%m-%d' : '%Y-%m-%d', mktime(0, 0, 0, $_REQUEST['month'], $_REQUEST['day'], $_REQUEST['year']));
-			if (isset($_REQUEST['edit']))
-				$smcFunc['db_query']('', '
+			if (isset($_REQUEST['edit'])) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}calendar_holidays
 					SET event_date = {date:holiday_date}, title = {string:holiday_title}
 					WHERE id_holiday = {int:selected_holiday}',
@@ -243,8 +246,8 @@ 
 						'holiday_title' => $_REQUEST['title'],
 					)
 				);
-			else
-				$smcFunc['db_insert']('',
+			} else {
+							$smcFunc['db_insert']('',
 					'{db_prefix}calendar_holidays',
 					array(
 						'event_date' => 'date', 'title' => 'string-60',
@@ -254,6 +257,7 @@ 
 					),
 					array('id_holiday')
 				);
+			}
 		}
 
 		updateSettings(array(
@@ -265,14 +269,15 @@ 
 	}
 
 	// Default states...
-	if ($context['is_new'])
-		$context['holiday'] = array(
+	if ($context['is_new']) {
+			$context['holiday'] = array(
 			'id' => 0,
 			'day' => date('d'),
 			'month' => date('m'),
 			'year' => '0000',
 			'title' => ''
 		);
+	}
 	// If it's not new load the data.
 	else
 	{
@@ -285,14 +290,15 @@ 
 				'selected_holiday' => $_REQUEST['holiday'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$context['holiday'] = array(
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$context['holiday'] = array(
 				'id' => $row['id_holiday'],
 				'day' => $row['day'],
 				'month' => $row['month'],
 				'year' => $row['year'] <= 4 ? 0 : $row['year'],
 				'title' => $row['title']
 			);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
@@ -319,16 +325,17 @@ 
 		array(
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['cat_name'] . ' - ' . $row['board_name'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortBoards($boards);
 
 	// Look, all the calendar settings - of which there are many!
-	if (!empty($modSettings['cal_enabled']))
-		$config_vars = array(
+	if (!empty($modSettings['cal_enabled'])) {
+			$config_vars = array(
 				array('check', 'cal_enabled'),
 			'',
 				// All the permissions:
@@ -371,14 +378,16 @@ 
 				array('check', 'cal_short_days'),
 				array('check', 'cal_short_months'),
 		);
-	else
-		$config_vars = array(
+	} else {
+			$config_vars = array(
 			array('check', 'cal_enabled'),
 		);
+	}
 
 	call_integration_hook('integrate_modify_calendar_settings', array(&$config_vars));
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Get the settings template fired up.
 	require_once($sourcedir . '/ManageServer.php');

Sources/Class-BrowserDetect.php

Indentation +33 added lines, -33 removed lines

@@ -101,9 +101,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera or not
-	* @return boolean Whether or not this is Opera
-	*/
+	 * Determine if the browser is Opera or not
+	 * @return boolean Whether or not this is Opera
+	 */
 	function isOpera()
 	{
 		if (!isset($this->_browsers['is_opera']))
@@ -112,9 +112,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is IE or not
-	* @return boolean true Whether or not the browser is IE
-	*/
+	 * Determine if the browser is IE or not
+	 * @return boolean true Whether or not the browser is IE
+	 */
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
@@ -124,9 +124,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is IE11 or not
-	* @return boolean Whether or not the browser is IE11
-	*/
+	 * Determine if the browser is IE11 or not
+	 * @return boolean Whether or not the browser is IE11
+	 */
 	function isIe11()
 	{
 		// IE11 is a bit different than earlier versions
@@ -137,9 +137,9 @@ 
  	}
 
 	/**
-	* Determine if the browser is Edge or not
-	* @return boolean Whether or not the browser is Edge
-	*/
+	 * Determine if the browser is Edge or not
+	 * @return boolean Whether or not the browser is Edge
+	 */
 	function isEdge()
 	{
 		if (!isset($this->_browsers['is_edge']))
@@ -148,9 +148,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is a Webkit based one or not
-	* @return boolean Whether or not this is a Webkit-based browser
-	*/
+	 * Determine if the browser is a Webkit based one or not
+	 * @return boolean Whether or not this is a Webkit-based browser
+	 */
 	function isWebkit()
 	{
 		if (!isset($this->_browsers['is_webkit']))
@@ -159,9 +159,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Firefox or one of its variants
-	* @return boolean Whether or not this is Firefox (or one of its variants)
-	*/
+	 * Determine if the browser is Firefox or one of its variants
+	 * @return boolean Whether or not this is Firefox (or one of its variants)
+	 */
 	function isFirefox()
 	{
 		if (!isset($this->_browsers['is_firefox']))
@@ -170,9 +170,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is WebTv or not
-	* @return boolean Whether or not this is WebTV
-	*/
+	 * Determine if the browser is WebTv or not
+	 * @return boolean Whether or not this is WebTV
+	 */
 	function isWebTv()
 	{
 		if (!isset($this->_browsers['is_web_tv']))
@@ -181,9 +181,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is konqueror or not
-	* @return boolean Whether or not this is Konqueror
-	*/
+	 * Determine if the browser is konqueror or not
+	 * @return boolean Whether or not this is Konqueror
+	 */
 	function isKonqueror()
 	{
 		if (!isset($this->_browsers['is_konqueror']))
@@ -192,9 +192,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Gecko or not
-	* @return boolean Whether or not this is a Gecko-based browser
-	*/
+	 * Determine if the browser is Gecko or not
+	 * @return boolean Whether or not this is a Gecko-based browser
+	 */
 	function isGecko()
 	{
 		if (!isset($this->_browsers['is_gecko']))
@@ -203,9 +203,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera Mini or not
-	* @return boolean Whether or not this is Opera Mini
-	*/
+	 * Determine if the browser is Opera Mini or not
+	 * @return boolean Whether or not this is Opera Mini
+	 */
 	function isOperaMini()
 	{
 		if (!isset($this->_browsers['is_opera_mini']))
@@ -216,9 +216,9 @@ 
 	}
 
 	/**
-	* Determine if the browser is Opera Mobile or not
-	* @return boolean Whether or not this is Opera Mobile
-	*/
+	 * Determine if the browser is Opera Mobile or not
+	 * @return boolean Whether or not this is Opera Mobile
+	 */
 	function isOperaMobi()
 	{
 		if (!isset($this->_browsers['is_opera_mobi']))

Braces +88 added lines, -60 removed lines

@@ -11,8 +11,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Class browser_detector
@@ -55,20 +56,25 @@ 
 		$this->_browsers['needs_size_fix'] = false;
 
 		// One at a time, one at a time, and in this order too
-		if ($this->isOpera())
-			$this->setupOpera();
+		if ($this->isOpera()) {
+					$this->setupOpera();
+		}
 		// Meh...
-		elseif ($this->isEdge())
-			$this->setupEdge();
+		elseif ($this->isEdge()) {
+					$this->setupEdge();
+		}
 		// Them webkits need to be set up too
-		elseif ($this->isWebkit())
-			$this->setupWebkit();
+		elseif ($this->isWebkit()) {
+					$this->setupWebkit();
+		}
 		// We may have work to do on Firefox...
-		elseif ($this->isFirefox())
-			$this->setupFirefox();
+		elseif ($this->isFirefox()) {
+					$this->setupFirefox();
+		}
 		// Old friend, old frenemy
-		elseif ($this->isIe())
-			$this->setupIe();
+		elseif ($this->isIe()) {
+					$this->setupIe();
+		}
 
 		// Just a few mobile checks
 		$this->isOperaMini();
@@ -84,11 +90,12 @@ 
 			$this->_browsers['possibly_robot'] = !empty($user_info['possibly_robot']);
 
 			// Robots shouldn't be logging in or registering.  So, they aren't a bot.  Better to be wrong than sorry (or people won't be able to log in!), anyway.
-			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest'])
-				$this->_browsers['possibly_robot'] = false;
+			if ((isset($_REQUEST['action']) && in_array($_REQUEST['action'], array('login', 'login2', 'register', 'signup'))) || !$user_info['is_guest']) {
+							$this->_browsers['possibly_robot'] = false;
+			}
+		} else {
+					$this->_browsers['possibly_robot'] = false;
 		}
-		else
-			$this->_browsers['possibly_robot'] = false;
 
 		// Fill out the historical array as needed to support old mods that don't use isBrowser
 		$this->fillInformation();
@@ -106,8 +113,9 @@ 
 	*/
 	function isOpera()
 	{
-		if (!isset($this->_browsers['is_opera']))
-			$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		if (!isset($this->_browsers['is_opera'])) {
+					$this->_browsers['is_opera'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') !== false;
+		}
 		return $this->_browsers['is_opera'];
 	}
 
@@ -118,8 +126,9 @@ 
 	function isIe()
 	{
 		// I'm IE, Yes I'm the real IE; All you other IEs are just imitating.
-		if (!isset($this->_browsers['is_ie']))
-			$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		if (!isset($this->_browsers['is_ie'])) {
+					$this->_browsers['is_ie'] = !$this->isOpera() && !$this->isGecko() && !$this->isWebTv() && preg_match('~MSIE \d+~', $_SERVER['HTTP_USER_AGENT']) === 1;
+		}
 		return $this->_browsers['is_ie'];
 	}
 
@@ -131,8 +140,9 @@ 
 	{
 		// IE11 is a bit different than earlier versions
 		// The isGecko() part is to ensure we get this right...
-		if (!isset($this->_browsers['is_ie11']))
-			$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		if (!isset($this->_browsers['is_ie11'])) {
+					$this->_browsers['is_ie11'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Trident') !== false && $this->isGecko();
+		}
 		return $this->_browsers['is_ie11'];
  	}
 
@@ -142,8 +152,9 @@ 
 	*/
 	function isEdge()
 	{
-		if (!isset($this->_browsers['is_edge']))
-			$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		if (!isset($this->_browsers['is_edge'])) {
+					$this->_browsers['is_edge'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Edge') !== false;
+		}
 		return $this->_browsers['is_edge'];
 	}
 
@@ -153,8 +164,9 @@ 
 	*/
 	function isWebkit()
 	{
-		if (!isset($this->_browsers['is_webkit']))
-			$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		if (!isset($this->_browsers['is_webkit'])) {
+					$this->_browsers['is_webkit'] = strpos($_SERVER['HTTP_USER_AGENT'], 'AppleWebKit') !== false;
+		}
 		return $this->_browsers['is_webkit'];
 	}
 
@@ -164,8 +176,9 @@ 
 	*/
 	function isFirefox()
 	{
-		if (!isset($this->_browsers['is_firefox']))
-			$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		if (!isset($this->_browsers['is_firefox'])) {
+					$this->_browsers['is_firefox'] = preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)/~', $_SERVER['HTTP_USER_AGENT']) === 1 && $this->isGecko();
+		}
 		return $this->_browsers['is_firefox'];
 	}
 
@@ -175,8 +188,9 @@ 
 	*/
 	function isWebTv()
 	{
-		if (!isset($this->_browsers['is_web_tv']))
-			$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		if (!isset($this->_browsers['is_web_tv'])) {
+					$this->_browsers['is_web_tv'] = strpos($_SERVER['HTTP_USER_AGENT'], 'WebTV') !== false;
+		}
 		return $this->_browsers['is_web_tv'];
 	}
 
@@ -186,8 +200,9 @@ 
 	*/
 	function isKonqueror()
 	{
-		if (!isset($this->_browsers['is_konqueror']))
-			$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		if (!isset($this->_browsers['is_konqueror'])) {
+					$this->_browsers['is_konqueror'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Konqueror') !== false;
+		}
 		return $this->_browsers['is_konqueror'];
 	}
 
@@ -197,8 +212,9 @@ 
 	*/
 	function isGecko()
 	{
-		if (!isset($this->_browsers['is_gecko']))
-			$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		if (!isset($this->_browsers['is_gecko'])) {
+					$this->_browsers['is_gecko'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') !== false && !$this->isWebkit() && !$this->isKonqueror();
+		}
 		return $this->_browsers['is_gecko'];
 	}
 
@@ -208,10 +224,12 @@ 
 	*/
 	function isOperaMini()
 	{
-		if (!isset($this->_browsers['is_opera_mini']))
-			$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
-		if ($this->_browsers['is_opera_mini'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mini'])) {
+					$this->_browsers['is_opera_mini'] = (isset($_SERVER['HTTP_X_OPERAMINI_PHONE_UA']) || stripos($_SERVER['HTTP_USER_AGENT'], 'opera mini') !== false);
+		}
+		if ($this->_browsers['is_opera_mini']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -221,10 +239,12 @@ 
 	*/
 	function isOperaMobi()
 	{
-		if (!isset($this->_browsers['is_opera_mobi']))
-			$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
-		if ($this->_browsers['is_opera_mobi'])
-			$this->_is_mobile = true;
+		if (!isset($this->_browsers['is_opera_mobi'])) {
+					$this->_browsers['is_opera_mobi'] = stripos($_SERVER['HTTP_USER_AGENT'], 'opera mobi') !== false;
+		}
+		if ($this->_browsers['is_opera_mobi']) {
+					$this->_is_mobile = true;
+		}
 		return $this->_browsers['is_opera_mini'];
 	}
 
@@ -244,8 +264,9 @@ 
 		);
 
 		// blackberry, playbook, iphone, nokia, android and ipods set a mobile flag
-		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia'])
-			$this->_is_mobile = true;
+		if ($this->_browsers['is_iphone'] || $this->_browsers['is_blackberry'] || $this->_browsers['is_android'] || $this->_browsers['is_nokia']) {
+					$this->_is_mobile = true;
+		}
 
 		// @todo what to do with the blaPad? ... for now leave it detected as Safari ...
 		$this->_browsers['is_safari'] = strpos($_SERVER['HTTP_USER_AGENT'], 'Safari') !== false && !$this->_browsers['is_chrome'] && !$this->_browsers['is_iphone'];
@@ -254,15 +275,17 @@ 
 		// if Chrome, get the major version
 		if ($this->_browsers['is_chrome'])
 		{
-			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			if (preg_match('~chrome[/]([0-9][0-9]?[.])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_chrome' . (int) $match[1]] = true;
+			}
 		}
 
 		// or if Safari get its major version
 		if ($this->_browsers['is_safari'])
 		{
-			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-				$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			if (preg_match('~version/?(.*)safari.*~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+							$this->_browsers['is_safari' . (int) trim($match[1])] = true;
+			}
 		}
 	}
 
@@ -291,8 +314,9 @@ 
 			$this->_browsers['is_ie' . ((int) $trident_match[1] + 4)] = true;
 
 			// If trident is set, see the (if any) msie tag in the user agent matches ... if not its in some compatibility view
-			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4))
-				$this->_browsers['is_ie_compat_view'] = true;
+			if (isset($msie_match[1]) && ($msie_match[1] < $trident_match[1] + 4)) {
+							$this->_browsers['is_ie_compat_view'] = true;
+			}
 		}
 
 		// Detect true IE6 and IE7 and not IE in compat mode.
@@ -326,8 +350,9 @@ 
 	 */
 	private function setupFirefox()
 	{
-		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		if (preg_match('~(?:Firefox|Ice[wW]easel|IceCat|Shiretoko|Minefield)[\/ \(]([^ ;\)]+)~', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_firefox' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -338,11 +363,13 @@ 
 	private function setupOpera()
 	{
 		// Opera 10+ uses the version tag at the end of the string
-		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		if (preg_match('~\sVersion/([0-9]+)\.[0-9]+(?:\s*|$)~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 		// Opera pre 10 is supposed to uses the Opera tag alone, as do some spoofers
-		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match))
-			$this->_browsers['is_opera' . (int) $match[1]] = true;
+		elseif (preg_match('~Opera[ /]([0-9]+)(?!\\.[89])~', $_SERVER['HTTP_USER_AGENT'], $match)) {
+					$this->_browsers['is_opera' . (int) $match[1]] = true;
+		}
 
 		// Needs size fix?
 		$this->_browsers['needs_size_fix'] = !empty($this->_browsers['is_opera6']);
@@ -353,8 +380,9 @@ 
 	 */
 	private function setupEdge()
 	{
-		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1)
-			$this->_browsers['is_edge' . (int) $match[1]] = true;
+		if (preg_match('~Edge[\/]([0-9][0-9]?[\.][0-9][0-9])~i', $_SERVER['HTTP_USER_AGENT'], $match) === 1) {
+					$this->_browsers['is_edge' . (int) $match[1]] = true;
+		}
 	}
 
 	/**
@@ -367,9 +395,9 @@ 
 	{
 		global $context;
 
-		if ($this->_is_mobile)
-			$context['browser_body_id'] = 'mobile';
-		else
+		if ($this->_is_mobile) {
+					$context['browser_body_id'] = 'mobile';
+		} else
 		{
 			// add in any specific detection conversions here if you want a special body id e.g. 'is_opera9' => 'opera9'
 			$browser_priority = array(

Sources/ReportToMod.php

Spacing +1 added lines, -1 removed lines

@@ -303,7 +303,7 @@
 			),
 			array(
 				$_POST['msg'], $message['id_topic'], $message['id_board'], $message['id_poster'], $message['real_name'],
-				$message['subject'], $message['body'] , time(), time(), 1, 0,
+				$message['subject'], $message['body'], time(), time(), 1, 0,
 			),
 			array('id_report')
 		);

Braces +71 added lines, -51 removed lines

@@ -12,8 +12,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Report a post or profile to the moderator... ask for a comment.
@@ -35,10 +36,11 @@ 
 
 	// You can't use this if it's off or you are not allowed to do it.
 	// If we don't have the ID of something to report, we'll die with a no_access error below
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	elseif (isset($_REQUEST['u']))
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} elseif (isset($_REQUEST['u'])) {
+			isAllowedTo('report_user');
+	}
 
 	// Previewing or modifying?
 	if (isset($_POST['preview']) && !isset($_POST['save']))
@@ -56,19 +58,23 @@ 
 	}
 
 	// If they're posting, it should be processed by ReportToModerator2.
-	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview']))
-		ReportToModerator2();
+	if ((isset($_POST[$context['session_var']]) || isset($_POST['save'])) && empty($context['post_errors']) && !isset($_POST['preview'])) {
+			ReportToModerator2();
+	}
 
 	// We need a message ID or user ID to check!
-	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u']))
-		fatal_lang_error('no_access', false);
+	if (empty($_REQUEST['msg']) && empty($_REQUEST['mid']) && empty($_REQUEST['u'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// For compatibility, accept mid, but we should be using msg. (not the flavor kind!)
-	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid']))
-		$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	if (!empty($_REQUEST['msg']) || !empty($_REQUEST['mid'])) {
+			$_REQUEST['msg'] = empty($_REQUEST['msg']) ? (int) $_REQUEST['mid'] : (int) $_REQUEST['msg'];
+	}
 	// msg and mid empty - assume we're reporting a user
-	elseif (!empty($_REQUEST['u']))
-		$_REQUEST['u'] = (int) $_REQUEST['u'];
+	elseif (!empty($_REQUEST['u'])) {
+			$_REQUEST['u'] = (int) $_REQUEST['u'];
+	}
 
 	// Set up some form values
 	$context['report_type'] = isset($_REQUEST['msg']) ? 'msg' : 'u';
@@ -89,8 +95,9 @@ 
 				'id_msg' => $_REQUEST['msg'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_board', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_board', false);
+		}
 		list ($_REQUEST['msg'], $member, $starter) = $smcFunc['db_fetch_row']($result);
 		$smcFunc['db_free_result']($result);
 
@@ -101,8 +108,7 @@ 
 
 		// The submit URL is different for users than it is for posts
 		$context['submit_url'] = $scripturl . '?action=reporttm;msg=' . $_REQUEST['msg'] . ';topic=' . $topic;
-	}
-	else
+	} else
 	{
 		// Check the user's ID
 		$result = $smcFunc['db_query']('', '
@@ -114,8 +120,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($result) == 0)
-			fatal_lang_error('no_user', false);
+		if ($smcFunc['db_num_rows']($result) == 0) {
+					fatal_lang_error('no_user', false);
+		}
 		list($_REQUEST['u'], $display_name, $username) = $smcFunc['db_fetch_row']($result);
 
 		$context['current_user'] = $_REQUEST['u'];
@@ -170,10 +177,11 @@ 
 	is_not_guest();
 
 	// You must have the proper permissions!
-	if (isset($_REQUEST['msg']))
-		isAllowedTo('report_any');
-	else
-		isAllowedTo('report_user');
+	if (isset($_REQUEST['msg'])) {
+			isAllowedTo('report_any');
+	} else {
+			isAllowedTo('report_user');
+	}
 
 	// Make sure they aren't spamming.
 	spamProtection('reporttm');
@@ -187,17 +195,20 @@ 
 	$post_errors = array();
 
 	// Check their session.
-	if (checkSession('post', '', false) != '')
-		$post_errors[] = 'session_timeout';
+	if (checkSession('post', '', false) != '') {
+			$post_errors[] = 'session_timeout';
+	}
 
 	// Make sure we have a comment and it's clean.
-	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '')
-		$post_errors[] = 'no_comment';
+	if (!isset($_POST['comment']) || $smcFunc['htmltrim']($_POST['comment']) === '') {
+			$post_errors[] = 'no_comment';
+	}
 
 	$poster_comment = strtr($smcFunc['htmlspecialchars']($_POST['comment']), array("\r" => '', "\t" => ''));
 
-	if ($smcFunc['strlen']($poster_comment) > 254)
-		$post_errors[] = 'post_too_long';
+	if ($smcFunc['strlen']($poster_comment) > 254) {
+			$post_errors[] = 'post_too_long';
+	}
 
 	// Any errors?
 	if (!empty($post_errors))
@@ -205,8 +216,9 @@ 
 		loadLanguage('Errors');
 
 		$context['post_errors'] = array();
-		foreach ($post_errors as $post_error)
-			$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		foreach ($post_errors as $post_error) {
+					$context['post_errors'][$post_error] = $txt['error_' . $post_error];
+		}
 
 		return ReportToModerator();
 	}
@@ -215,8 +227,7 @@ 
 	{
 		// Handle this elsewhere to keep things from getting too long
 		reportPost($_POST['msg'], $poster_comment);
-	}
-	else
+	} else
 	{
 		reportUser($_POST['u'], $poster_comment);
 	}
@@ -247,8 +258,9 @@ 
 			'id_msg' => $_POST['msg'],
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_board', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_board', false);
+	}
 	$message = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -268,18 +280,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	if (!empty($ignore)) {
+			redirectexit('topic=' . $topic . '.msg' . $_POST['msg'] . '#msg' . $_POST['msg']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -288,11 +302,13 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{
-		if (empty($message['real_name']))
-			$message['real_name'] = $message['poster_name'];
+		if (empty($message['real_name'])) {
+					$message['real_name'] = $message['poster_name'];
+		}
 
 		$smcFunc['db_insert']('',
 			'{db_prefix}log_reported',
@@ -371,8 +387,9 @@ 
 			'id_member' => $_POST['u']
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_user', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_user', false);
+	}
 	$user = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -393,18 +410,20 @@ 
 			'ignored' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			list ($id_report, $ignore) = $smcFunc['db_fetch_row']($request);
+	}
 
 	$smcFunc['db_free_result']($request);
 
 	// If we're just going to ignore these, then who gives a monkeys...
-	if (!empty($ignore))
-		redirectexit('action=profile;u=' . $_POST['u']);
+	if (!empty($ignore)) {
+			redirectexit('action=profile;u=' . $_POST['u']);
+	}
 
 	// Already reported? My god, we could be dealing with a real rogue here...
-	if (!empty($id_report))
-		$smcFunc['db_query']('', '
+	if (!empty($id_report)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_reported
 			SET num_reports = num_reports + 1, time_updated = {int:current_time}
 			WHERE id_report = {int:id_report}',
@@ -413,6 +432,7 @@ 
 				'id_report' => $id_report,
 			)
 		);
+	}
 	// Otherwise, we shall make one!
 	else
 	{

Sources/ManageSmileys.php

Spacing +9 added lines, -9 removed lines

@@ -393,7 +393,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '<span class="generic_icons valid"></span>' : '';
 					},
@@ -453,7 +453,7 @@ 
 					'class' => 'centercol',
 				),
 				'data' => array(
-					'function' => function ($rowData)
+					'function' => function($rowData)
 					{
 						return $rowData['selected'] ? '' : sprintf('<input type="checkbox" name="smiley_set[%1$d]" class="input_check">', $rowData['id']);
 					},
@@ -997,7 +997,7 @@ 
 						'value' => $txt['smileys_location'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($txt)
+						'function' => function($rowData) use ($txt)
 						{
 							if (empty($rowData['hidden']))
 								return $txt['smileys_location_form'];
@@ -1017,7 +1017,7 @@ 
 						'value' => $txt['smileys_description'],
 					),
 					'data' => array(
-						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
+						'function' => function($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
 							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
 								return $smcFunc['htmlspecialchars']($rowData['description']);
@@ -1557,7 +1557,7 @@ 
 				'action' => $smcFunc['htmlspecialchars'](strtr($action['destination'], array($boarddir => '.')))
 			);
 
-			$file =  $packagesdir . '/temp/' . $base_path . $action['filename'];
+			$file = $packagesdir . '/temp/' . $base_path . $action['filename'];
 			if (isset($action['filename']) && (!file_exists($file) || !is_writable(dirname($action['destination']))))
 			{
 				$context['has_failure'] = true;
@@ -1601,7 +1601,7 @@ 
 		{
 			updateSettings(array(
 				'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . basename($action['action']),
-				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' .  (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
+				'smiley_sets_names' => $modSettings['smiley_sets_names'] . "\n" . $smileyInfo['name'] . (count($context['actions']) > 1 ? ' ' . (!empty($action['description']) ? $smcFunc['htmlspecialchars']($action['description']) : basename($action['action'])) : ''),
 			));
 		}
 
@@ -1613,7 +1613,7 @@ 
 			'{db_prefix}log_packages',
 			array(
 				'filename' => 'string', 'name' => 'string', 'package_id' => 'string', 'version' => 'string',
-				'id_member_installed' => 'int', 'member_installed' => 'string','time_installed' => 'int',
+				'id_member_installed' => 'int', 'member_installed' => 'string', 'time_installed' => 'int',
 				'install_state' => 'int', 'failed_steps' => 'string', 'themes_installed' => 'string',
 				'member_removed' => 'int', 'db_changes' => 'string', 'credits' => 'string',
 			),
@@ -1862,7 +1862,7 @@ 
 		'columns' => array(
 			'icon' => array(
 				'data' => array(
-					'function' => function ($rowData) use ($settings, $smcFunc)
+					'function' => function($rowData) use ($settings, $smcFunc)
 					{
 						$images_url = $settings[file_exists(sprintf('%1$s/images/post/%2$s.png', $settings['theme_dir'], $rowData['filename'])) ? 'actual_images_url' : 'default_images_url'];
 						return sprintf('<img src="%1$s/post/%2$s.png" alt="%3$s">', $images_url, $rowData['filename'], $smcFunc['htmlspecialchars']($rowData['title']));
@@ -1896,7 +1896,7 @@ 
 					'value' => $txt['icons_board'],
 				),
 				'data' => array(
-					'function' => function ($rowData) use ($txt)
+					'function' => function($rowData) use ($txt)
 					{
 						return empty($rowData['board_name']) ? $txt['icons_edit_icons_all_boards'] : $rowData['board_name'];
 					},

Braces +297 added lines, -211 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 3
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This is the dispatcher of smileys administration.
@@ -91,8 +92,9 @@ 
 	);
 
 	// Some settings may not be enabled, disallow these from the tabs as appropriate.
-	if (empty($modSettings['messageIcons_enable']))
-		$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	if (empty($modSettings['messageIcons_enable'])) {
+			$context[$context['admin_menu_name']]['tab_data']['tabs']['editicons']['disabled'] = true;
+	}
 	if (empty($modSettings['smiley_enable']))
 	{
 		$context[$context['admin_menu_name']]['tab_data']['tabs']['addsmiley']['disabled'] = true;
@@ -125,8 +127,9 @@ 
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
 
 	$smiley_context = array();
-	foreach ($smiley_sets as $i => $set)
-		$smiley_context[$set] = $set_names[$i];
+	foreach ($smiley_sets as $i => $set) {
+			$smiley_context[$set] = $set_names[$i];
+	}
 
 	// All the settings for the page...
 	$config_vars = array(
@@ -147,8 +150,9 @@ 
 
 	call_integration_hook('integrate_modify_smiley_settings', array(&$config_vars));
 
-	if ($return_config)
-		return $config_vars;
+	if ($return_config) {
+			return $config_vars;
+	}
 
 	// Setup the basics of the settings template.
 	require_once($sourcedir . '/ManageServer.php');
@@ -207,8 +211,9 @@ 
 			foreach ($_POST['smiley_set'] as $id => $val)
 			{
 				// If this is the set you've marked as default, or the only one remaining, you can't delete it
-				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id]))
-					unset($set_paths[$id], $set_names[$id]);
+				if ($modSettings['smiley_sets_default'] != $set_paths[$id] && count($set_paths) != 1 && isset($set_paths[$id], $set_names[$id])) {
+									unset($set_paths[$id], $set_names[$id]);
+				}
 			}
 
 			// Shortcut... array_merge() on a single array resets the numeric keys
@@ -222,8 +227,9 @@ 
 			));
 		}
 		// Add a new smiley set.
-		elseif (!empty($_POST['add']))
-			$context['sub_action'] = 'modifyset';
+		elseif (!empty($_POST['add'])) {
+					$context['sub_action'] = 'modifyset';
+		}
 		// Create or modify a smiley set.
 		elseif (isset($_POST['set']))
 		{
@@ -233,8 +239,9 @@ 
 			// Create a new smiley set.
 			if ($_POST['set'] == -1 && isset($_POST['smiley_sets_path']))
 			{
-				if (in_array($_POST['smiley_sets_path'], $set_paths))
-					fatal_lang_error('smiley_set_already_exists');
+				if (in_array($_POST['smiley_sets_path'], $set_paths)) {
+									fatal_lang_error('smiley_set_already_exists');
+				}
 
 				updateSettings(array(
 					'smiley_sets_known' => $modSettings['smiley_sets_known'] . ',' . $_POST['smiley_sets_path'],
@@ -246,12 +253,14 @@ 
 			else
 			{
 				// Make sure the smiley set exists.
-				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']]))
-					fatal_lang_error('smiley_set_not_found');
+				if (!isset($set_paths[$_POST['set']]) || !isset($set_names[$_POST['set']])) {
+									fatal_lang_error('smiley_set_not_found');
+				}
 
 				// Make sure the path is not yet used by another smileyset.
-				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']])
-					fatal_lang_error('smiley_set_path_already_used');
+				if (in_array($_POST['smiley_sets_path'], $set_paths) && $_POST['smiley_sets_path'] != $set_paths[$_POST['set']]) {
+									fatal_lang_error('smiley_set_path_already_used');
+				}
 
 				$set_paths[$_POST['set']] = $_POST['smiley_sets_path'];
 				$set_names[$_POST['set']] = $_POST['smiley_sets_name'];
@@ -263,8 +272,9 @@ 
 			}
 
 			// The user might have checked to also import smileys.
-			if (!empty($_POST['smiley_sets_import']))
-				ImportSmileys($_POST['smiley_sets_path']);
+			if (!empty($_POST['smiley_sets_import'])) {
+							ImportSmileys($_POST['smiley_sets_path']);
+			}
 		}
 		cache_put_data('parsing_smileys', null, 480);
 		cache_put_data('posting_smileys', null, 480);
@@ -273,13 +283,14 @@ 
 	// Load all available smileysets...
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Importing any smileys from an existing set?
 	if ($context['sub_action'] == 'import')
@@ -290,8 +301,9 @@ 
 		$_GET['set'] = (int) $_GET['set'];
 
 		// Sanity check - then import.
-		if (isset($context['smiley_sets'][$_GET['set']]))
-			ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		if (isset($context['smiley_sets'][$_GET['set']])) {
+					ImportSmileys(un_htmlspecialchars($context['smiley_sets'][$_GET['set']]['path']));
+		}
 
 		// Force the process to continue.
 		$context['sub_action'] = 'modifyset';
@@ -301,15 +313,15 @@ 
 	if ($context['sub_action'] == 'modifyset')
 	{
 		$_GET['set'] = !isset($_GET['set']) ? -1 : (int) $_GET['set'];
-		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']]))
-			$context['current_set'] = array(
+		if ($_GET['set'] == -1 || !isset($context['smiley_sets'][$_GET['set']])) {
+					$context['current_set'] = array(
 				'id' => '-1',
 				'path' => '',
 				'name' => '',
 				'selected' => false,
 				'is_new' => true,
 			);
-		else
+		} else
 		{
 			$context['current_set'] = &$context['smiley_sets'][$_GET['set']];
 			$context['current_set']['is_new'] = false;
@@ -321,13 +333,15 @@ 
 				$dir = dir($modSettings['smileys_dir'] . '/' . $context['current_set']['path']);
 				while ($entry = $dir->read())
 				{
-					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$smileys[strtolower($entry)] = $entry;
+					if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$smileys[strtolower($entry)] = $entry;
+					}
 				}
 				$dir->close();
 
-				if (empty($smileys))
-					fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				if (empty($smileys)) {
+									fatal_lang_error('smiley_set_dir_not_found', false, array($context['current_set']['name']));
+				}
 
 				// Exclude the smileys that are already in the database.
 				$request = $smcFunc['db_query']('', '
@@ -338,9 +352,10 @@ 
 						'smiley_list' => $smileys,
 					)
 				);
-				while ($row = $smcFunc['db_fetch_assoc']($request))
-					if (isset($smileys[strtolower($row['filename'])]))
+				while ($row = $smcFunc['db_fetch_assoc']($request)) {
+									if (isset($smileys[strtolower($row['filename'])]))
 						unset($smileys[strtolower($row['filename'])]);
+				}
 				$smcFunc['db_free_result']($request);
 
 				$context['current_set']['can_import'] = count($smileys);
@@ -355,13 +370,14 @@ 
 			$dir = dir($modSettings['smileys_dir']);
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry))
-					$context['smiley_set_dirs'][] = array(
+				if (!in_array($entry, array('.', '..')) && is_dir($modSettings['smileys_dir'] . '/' . $entry)) {
+									$context['smiley_set_dirs'][] = array(
 						'id' => $entry,
 						'path' => $modSettings['smileys_dir'] . '/' . $entry,
 						'selectable' => $entry == $context['current_set']['path'] || !in_array($entry, explode(',', $modSettings['smiley_sets_known'])),
 						'current' => $entry == $context['current_set']['path'],
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -371,8 +387,9 @@ 
 	createToken('admin-mss', 'request');
 
 	// In case we need to import smileys, we need to add the token in now.
-	if (isset($context['current_set']['import_url']))
-		$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	if (isset($context['current_set']['import_url'])) {
+			$context['current_set']['import_url'] .= ';' . $context['admin-mss_token_var'] . '=' . $context['admin-mss_token'];
+	}
 
 	$listOptions = array(
 		'id' => 'smiley_set_list',
@@ -510,21 +527,23 @@ 
 		$cols['name'][] = $set_names[$i];
 	}
 	$sort_flag = strpos($sort, 'DESC') === false ? SORT_ASC : SORT_DESC;
-	if (substr($sort, 0, 4) === 'name')
-		array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
-	elseif (substr($sort, 0, 4) === 'path')
-		array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
-	else
-		array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	if (substr($sort, 0, 4) === 'name') {
+			array_multisort($cols['name'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['selected'], $cols['id']);
+	} elseif (substr($sort, 0, 4) === 'path') {
+			array_multisort($cols['path'], $sort_flag, SORT_REGULAR, $cols['name'], $cols['selected'], $cols['id']);
+	} else {
+			array_multisort($cols['selected'], $sort_flag, SORT_REGULAR, $cols['path'], $cols['name'], $cols['id']);
+	}
 
 	$smiley_sets = array();
-	foreach ($cols['id'] as $i => $id)
-		$smiley_sets[] = array(
+	foreach ($cols['id'] as $i => $id) {
+			$smiley_sets[] = array(
 			'id' => $id,
 			'path' => $cols['path'][$i],
 			'name' => $cols['name'][$i],
 			'selected' => $cols['path'][$i] == $modSettings['smiley_sets_default']
 		);
+	}
 
 	return $smiley_sets;
 }
@@ -553,13 +572,14 @@ 
 	$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Submitting a form?
 	if (isset($_POST[$context['session_var']], $_POST['smiley_code']))
@@ -575,8 +595,9 @@ 
 		$_POST['smiley_filename'] = htmltrim__recursive($_POST['smiley_filename']);
 
 		// Make sure some code was entered.
-		if (empty($_POST['smiley_code']))
-			fatal_lang_error('smiley_has_no_code');
+		if (empty($_POST['smiley_code'])) {
+					fatal_lang_error('smiley_has_no_code');
+		}
 
 		// Check whether the new code has duplicates. It should be unique.
 		$request = $smcFunc['db_query']('', '
@@ -588,8 +609,9 @@ 
 				'smiley_code' => $_POST['smiley_code'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) > 0)
-			fatal_lang_error('smiley_not_unique');
+		if ($smcFunc['db_num_rows']($request) > 0) {
+					fatal_lang_error('smiley_not_unique');
+		}
 		$smcFunc['db_free_result']($request);
 
 		// If we are uploading - check all the smiley sets are writable!
@@ -598,38 +620,44 @@ 
 			$writeErrors = array();
 			foreach ($context['smiley_sets'] as $set)
 			{
-				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path'])))
-					$writeErrors[] = $set['path'];
+				if (!is_writable($context['smileys_dir'] . '/' . un_htmlspecialchars($set['path']))) {
+									$writeErrors[] = $set['path'];
+				}
+			}
+			if (!empty($writeErrors)) {
+							fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 			}
-			if (!empty($writeErrors))
-				fatal_lang_error('smileys_upload_error_notwritable', true, array(implode(', ', $writeErrors)));
 		}
 
 		// Uploading just one smiley for all of them?
 		if (isset($_POST['sameall']) && isset($_FILES['uploadSmiley']['name']) && $_FILES['uploadSmiley']['name'] != '')
 		{
-			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name'])))
-				fatal_lang_error('smileys_upload_error');
+			if (!is_uploaded_file($_FILES['uploadSmiley']['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['uploadSmiley']['tmp_name']))) {
+							fatal_lang_error('smileys_upload_error');
+			}
 
 			// Sorry, no spaces, dots, or anything else but letters allowed.
 			$_FILES['uploadSmiley']['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['uploadSmiley']['name']);
 
 			// We only allow image files - it's THAT simple - no messing around here...
-			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes))
-				fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			if (!in_array(strtolower(substr(strrchr($_FILES['uploadSmiley']['name'], '.'), 1)), $allowedTypes)) {
+							fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+			}
 
 			// We only need the filename...
 			$destName = basename($_FILES['uploadSmiley']['name']);
 
 			// Make sure they aren't trying to upload a nasty file - for their own good here!
-			if (in_array(strtolower($destName), $disabledFiles))
-				fatal_lang_error('smileys_upload_error_illegal');
+			if (in_array(strtolower($destName), $disabledFiles)) {
+							fatal_lang_error('smileys_upload_error_illegal');
+			}
 
 			// Check if the file already exists... and if not move it to EVERY smiley set directory.
 			$i = 0;
 			// Keep going until we find a set the file doesn't exist in. (or maybe it exists in all of them?)
-			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName))
-				$i++;
+			while (isset($context['smiley_sets'][$i]) && file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName)) {
+							$i++;
+			}
 
 			// Okay, we're going to put the smiley right here, since it's not there yet!
 			if (isset($context['smiley_sets'][$i]['path']))
@@ -644,8 +672,9 @@ 
 					$currentPath = $context['smileys_dir'] . '/' . un_htmlspecialchars($context['smiley_sets'][$i]['path']) . '/' . $destName;
 
 					// The file is already there!  Don't overwrite it!
-					if (file_exists($currentPath))
-						continue;
+					if (file_exists($currentPath)) {
+											continue;
+					}
 
 					// Okay, so copy the first one we made to here.
 					copy($smileyLocation, $currentPath);
@@ -662,13 +691,15 @@ 
 			$newName = '';
 			foreach ($_FILES as $name => $data)
 			{
-				if ($_FILES[$name]['name'] == '')
-					fatal_lang_error('smileys_upload_error_blank');
+				if ($_FILES[$name]['name'] == '') {
+									fatal_lang_error('smileys_upload_error_blank');
+				}
 
-				if (empty($newName))
-					$newName = basename($_FILES[$name]['name']);
-				elseif (basename($_FILES[$name]['name']) != $newName)
-					fatal_lang_error('smileys_upload_error_name');
+				if (empty($newName)) {
+									$newName = basename($_FILES[$name]['name']);
+				} elseif (basename($_FILES[$name]['name']) != $newName) {
+									fatal_lang_error('smileys_upload_error_name');
+				}
 			}
 
 			foreach ($context['smiley_sets'] as $i => $set)
@@ -676,31 +707,36 @@ 
 				$set['name'] = un_htmlspecialchars($set['name']);
 				$set['path'] = un_htmlspecialchars($set['path']);
 
-				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '')
-					continue;
+				if (!isset($_FILES['individual_' . $set['name']]['name']) || $_FILES['individual_' . $set['name']]['name'] == '') {
+									continue;
+				}
 
 				// Got one...
-				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name'])))
-					fatal_lang_error('smileys_upload_error');
+				if (!is_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name']) || (ini_get('open_basedir') == '' && !file_exists($_FILES['individual_' . $set['name']]['tmp_name']))) {
+									fatal_lang_error('smileys_upload_error');
+				}
 
 				// Sorry, no spaces, dots, or anything else but letters allowed.
 				$_FILES['individual_' . $set['name']]['name'] = preg_replace(array('/\s/', '/\.[\.]+/', '/[^\w_\.\-]/'), array('_', '.', ''), $_FILES['individual_' . $set['name']]['name']);
 
 				// We only allow image files - it's THAT simple - no messing around here...
-				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes))
-					fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				if (!in_array(strtolower(substr(strrchr($_FILES['individual_' . $set['name']]['name'], '.'), 1)), $allowedTypes)) {
+									fatal_lang_error('smileys_upload_error_types', false, array(implode(', ', $allowedTypes)));
+				}
 
 				// We only need the filename...
 				$destName = basename($_FILES['individual_' . $set['name']]['name']);
 
 				// Make sure they aren't trying to upload a nasty file - for their own good here!
-				if (in_array(strtolower($destName), $disabledFiles))
-					fatal_lang_error('smileys_upload_error_illegal');
+				if (in_array(strtolower($destName), $disabledFiles)) {
+									fatal_lang_error('smileys_upload_error_illegal');
+				}
 
 				// If the file exists - ignore it.
 				$smileyLocation = $context['smileys_dir'] . '/' . $set['path'] . '/' . $destName;
-				if (file_exists($smileyLocation))
-					continue;
+				if (file_exists($smileyLocation)) {
+									continue;
+				}
 
 				// Finally - move the image!
 				move_uploaded_file($_FILES['individual_' . $set['name']]['tmp_name'], $smileyLocation);
@@ -712,8 +748,9 @@ 
 		}
 
 		// Also make sure a filename was given.
-		if (empty($_POST['smiley_filename']))
-			fatal_lang_error('smiley_has_no_filename');
+		if (empty($_POST['smiley_filename'])) {
+					fatal_lang_error('smiley_has_no_filename');
+		}
 
 		// Find the position on the right.
 		$smiley_order = '0';
@@ -732,8 +769,9 @@ 
 			list ($smiley_order) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
 
-			if (empty($smiley_order))
-				$smiley_order = '0';
+			if (empty($smiley_order)) {
+							$smiley_order = '0';
+			}
 		}
 		$smcFunc['db_insert']('',
 			'{db_prefix}smileys',
@@ -761,17 +799,19 @@ 
 	{
 		foreach ($context['smiley_sets'] as $smiley_set)
 		{
-			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-				continue;
+			if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+							continue;
+			}
 
 			$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 			while ($entry = $dir->read())
 			{
-				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-					$context['filenames'][strtolower($entry)] = array(
+				if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+									$context['filenames'][strtolower($entry)] = array(
 						'id' => $smcFunc['htmlspecialchars']($entry),
 						'selected' => false,
 					);
+				}
 			}
 			$dir->close();
 		}
@@ -809,17 +849,19 @@ 
 		// Changing the selected smileys?
 		if (isset($_POST['smiley_action']) && !empty($_POST['checked_smileys']))
 		{
-			foreach ($_POST['checked_smileys'] as $id => $smiley_id)
-				$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			foreach ($_POST['checked_smileys'] as $id => $smiley_id) {
+							$_POST['checked_smileys'][$id] = (int) $smiley_id;
+			}
 
-			if ($_POST['smiley_action'] == 'delete')
-				$smcFunc['db_query']('', '
+			if ($_POST['smiley_action'] == 'delete') {
+							$smcFunc['db_query']('', '
 					DELETE FROM {db_prefix}smileys
 					WHERE id_smiley IN ({array_int:checked_smileys})',
 					array(
 						'checked_smileys' => $_POST['checked_smileys'],
 					)
 				);
+			}
 			// Changing the status of the smiley?
 			else
 			{
@@ -829,8 +871,8 @@ 
 					'hidden' => 1,
 					'popup' => 2
 				);
-				if (isset($displayTypes[$_POST['smiley_action']]))
-					$smcFunc['db_query']('', '
+				if (isset($displayTypes[$_POST['smiley_action']])) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET hidden = {int:display_type}
 						WHERE id_smiley IN ({array_int:checked_smileys})',
@@ -839,6 +881,7 @@ 
 							'display_type' => $displayTypes[$_POST['smiley_action']],
 						)
 					);
+				}
 			}
 		}
 		// Create/modify a smiley.
@@ -864,12 +907,14 @@ 
 				$_POST['smiley_location'] = empty($_POST['smiley_location']) || $_POST['smiley_location'] > 2 || $_POST['smiley_location'] < 0 ? 0 : (int) $_POST['smiley_location'];
 
 				// Make sure some code was entered.
-				if (empty($_POST['smiley_code']))
-					fatal_lang_error('smiley_has_no_code');
+				if (empty($_POST['smiley_code'])) {
+									fatal_lang_error('smiley_has_no_code');
+				}
 
 				// Also make sure a filename was given.
-				if (empty($_POST['smiley_filename']))
-					fatal_lang_error('smiley_has_no_filename');
+				if (empty($_POST['smiley_filename'])) {
+									fatal_lang_error('smiley_has_no_filename');
+				}
 
 				// Check whether the new code has duplicates. It should be unique.
 				$request = $smcFunc['db_query']('', '
@@ -883,8 +928,9 @@ 
 						'smiley_code' => $_POST['smiley_code'],
 					)
 				);
-				if ($smcFunc['db_num_rows']($request) > 0)
-					fatal_lang_error('smiley_not_unique');
+				if ($smcFunc['db_num_rows']($request) > 0) {
+									fatal_lang_error('smiley_not_unique');
+				}
 				$smcFunc['db_free_result']($request);
 
 				$smcFunc['db_query']('', '
@@ -913,13 +959,14 @@ 
 	// Load all known smiley sets.
 	$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 	$set_names = explode("\n", $modSettings['smiley_sets_names']);
-	foreach ($context['smiley_sets'] as $i => $set)
-		$context['smiley_sets'][$i] = array(
+	foreach ($context['smiley_sets'] as $i => $set) {
+			$context['smiley_sets'][$i] = array(
 			'id' => $i,
 			'path' => $smcFunc['htmlspecialchars']($set),
 			'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 			'selected' => $set == $modSettings['smiley_sets_default']
 		);
+	}
 
 	// Prepare overview of all (custom) smileys.
 	if ($context['sub_action'] == 'editsmileys')
@@ -935,9 +982,10 @@ 
 		// Create a list of options for selecting smiley sets.
 		$smileyset_option_list = '
 			<select name="set" onchange="changeSet(this.options[this.selectedIndex].value);">';
-		foreach ($context['smiley_sets'] as $smiley_set)
-			$smileyset_option_list .= '
+		foreach ($context['smiley_sets'] as $smiley_set) {
+					$smileyset_option_list .= '
 				<option value="' . $smiley_set['path'] . '"' . ($modSettings['smiley_sets_default'] == $smiley_set['path'] ? ' selected' : '') . '>' . $smiley_set['name'] . '</option>';
+		}
 		$smileyset_option_list .= '
 			</select>';
 
@@ -999,12 +1047,13 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($txt)
 						{
-							if (empty($rowData['hidden']))
-								return $txt['smileys_location_form'];
-							elseif ($rowData['hidden'] == 1)
-								return $txt['smileys_location_hidden'];
-							else
-								return $txt['smileys_location_popup'];
+							if (empty($rowData['hidden'])) {
+															return $txt['smileys_location_form'];
+							} elseif ($rowData['hidden'] == 1) {
+															return $txt['smileys_location_hidden'];
+							} else {
+															return $txt['smileys_location_popup'];
+							}
 						},
 					),
 					'sort' => array(
@@ -1019,19 +1068,22 @@ 
 					'data' => array(
 						'function' => function ($rowData) use ($context, $txt, $modSettings, $smcFunc)
 						{
-							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir']))
-								return $smcFunc['htmlspecialchars']($rowData['description']);
+							if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'])) {
+															return $smcFunc['htmlspecialchars']($rowData['description']);
+							}
 
 							// Check if there are smileys missing in some sets.
 							$missing_sets = array();
-							foreach ($context['smiley_sets'] as $smiley_set)
-								if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
+							foreach ($context['smiley_sets'] as $smiley_set) {
+															if (!file_exists(sprintf('%1$s/%2$s/%3$s', $modSettings['smileys_dir'], $smiley_set['path'], $rowData['filename'])))
 									$missing_sets[] = $smiley_set['path'];
+							}
 
 							$description = $smcFunc['htmlspecialchars']($rowData['description']);
 
-							if (!empty($missing_sets))
-								$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							if (!empty($missing_sets)) {
+															$description .= sprintf('<br><span class="smalltext"><strong>%1$s:</strong> %2$s</span>', $txt['smileys_not_found_in_set'], implode(', ', $missing_sets));
+							}
 
 							return $description;
 						},
@@ -1147,13 +1199,14 @@ 
 		$context['smileys_dir_found'] = is_dir($context['smileys_dir']);
 		$context['smiley_sets'] = explode(',', $modSettings['smiley_sets_known']);
 		$set_names = explode("\n", $modSettings['smiley_sets_names']);
-		foreach ($context['smiley_sets'] as $i => $set)
-			$context['smiley_sets'][$i] = array(
+		foreach ($context['smiley_sets'] as $i => $set) {
+					$context['smiley_sets'][$i] = array(
 				'id' => $i,
 				'path' => $smcFunc['htmlspecialchars']($set),
 				'name' => $smcFunc['htmlspecialchars']($set_names[$i]),
 				'selected' => $set == $modSettings['smiley_sets_default']
 			);
+		}
 
 		$context['selected_set'] = $modSettings['smiley_sets_default'];
 
@@ -1163,17 +1216,19 @@ 
 		{
 			foreach ($context['smiley_sets'] as $smiley_set)
 			{
-				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path'])))
-					continue;
+				if (!file_exists($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']))) {
+									continue;
+				}
 
 				$dir = dir($context['smileys_dir'] . '/' . un_htmlspecialchars($smiley_set['path']));
 				while ($entry = $dir->read())
 				{
-					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-						$context['filenames'][strtolower($entry)] = array(
+					if (!in_array($entry, $context['filenames']) && in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+											$context['filenames'][strtolower($entry)] = array(
 							'id' => $smcFunc['htmlspecialchars']($entry),
 							'selected' => false,
 						);
+					}
 				}
 				$dir->close();
 			}
@@ -1188,8 +1243,9 @@ 
 				'current_smiley' => (int) $_REQUEST['smiley'],
 			)
 		);
-		if ($smcFunc['db_num_rows']($request) != 1)
-			fatal_lang_error('smiley_not_found');
+		if ($smcFunc['db_num_rows']($request) != 1) {
+					fatal_lang_error('smiley_not_found');
+		}
 		$context['current_smiley'] = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
 
@@ -1197,8 +1253,9 @@ 
 		$context['current_smiley']['filename'] = $smcFunc['htmlspecialchars']($context['current_smiley']['filename']);
 		$context['current_smiley']['description'] = $smcFunc['htmlspecialchars']($context['current_smiley']['description']);
 
-		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])]))
-			$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		if (isset($context['filenames'][strtolower($context['current_smiley']['filename'])])) {
+					$context['filenames'][strtolower($context['current_smiley']['filename'])]['selected'] = true;
+		}
 	}
 }
 
@@ -1223,8 +1280,9 @@ 
 		)
 	);
 	$smileys = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$smileys[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$smileys[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $smileys;
@@ -1264,8 +1322,9 @@ 
 		$_GET['location'] = empty($_GET['location']) || $_GET['location'] != 'popup' ? 0 : 2;
 		$_GET['source'] = empty($_GET['source']) ? 0 : (int) $_GET['source'];
 
-		if (empty($_GET['source']))
-			fatal_lang_error('smiley_not_found');
+		if (empty($_GET['source'])) {
+					fatal_lang_error('smiley_not_found');
+		}
 
 		if (!empty($_GET['after']))
 		{
@@ -1281,12 +1340,12 @@ 
 					'after_smiley' => $_GET['after'],
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 1)
-				fatal_lang_error('smiley_not_found');
+			if ($smcFunc['db_num_rows']($request) != 1) {
+							fatal_lang_error('smiley_not_found');
+			}
 			list ($smiley_row, $smiley_order, $smileyLocation) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-		else
+		} else
 		{
 			$smiley_row = (int) $_GET['row'];
 			$smiley_order = -1;
@@ -1360,14 +1419,15 @@ 
 	$context['move_smiley'] = empty($_REQUEST['move']) ? 0 : (int) $_REQUEST['move'];
 
 	// Make sure all rows are sequential.
-	foreach (array_keys($context['smileys']) as $location)
-		$context['smileys'][$location] = array(
+	foreach (array_keys($context['smileys']) as $location) {
+			$context['smileys'][$location] = array(
 			'id' => $location,
 			'title' => $location == 'postform' ? $txt['smileys_location_form'] : $txt['smileys_location_popup'],
 			'description' => $location == 'postform' ? $txt['smileys_location_form_description'] : $txt['smileys_location_popup_description'],
 			'last_row' => count($context['smileys'][$location]['rows']),
 			'rows' => array_values($context['smileys'][$location]['rows']),
 		);
+	}
 
 	// Check & fix smileys that are not ordered properly in the database.
 	foreach (array_keys($context['smileys']) as $location)
@@ -1392,8 +1452,8 @@ 
 				$context['smileys'][$location]['rows'][$id][0]['row'] = $id;
 			}
 			// Make sure the smiley order is always sequential.
-			foreach ($smiley_row as $order_id => $smiley)
-				if ($order_id != $smiley['order'])
+			foreach ($smiley_row as $order_id => $smiley) {
+							if ($order_id != $smiley['order'])
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}smileys
 						SET smiley_order = {int:new_order}
@@ -1403,6 +1463,7 @@ 
 							'current_smiley' => $smiley['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -1436,19 +1497,20 @@ 
 		$context['filename'] = $base_name;
 
 		// Check that the smiley is from simplemachines.org, for now... maybe add mirroring later.
-		if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false)
-			fatal_lang_error('not_on_simplemachines');
+		if (preg_match('~^http://[\w_\-]+\.simplemachines\.org/~', $_REQUEST['set_gz']) == 0 || strpos($_REQUEST['set_gz'], 'dlattach') !== false) {
+					fatal_lang_error('not_on_simplemachines');
+		}
 
 		$destination = $packagesdir . '/' . $base_name;
 
-		if (file_exists($destination))
-			fatal_lang_error('package_upload_error_exists');
+		if (file_exists($destination)) {
+					fatal_lang_error('package_upload_error_exists');
+		}
 
 		// Let's copy it to the Packages directory
 		file_put_contents($destination, fetch_web_data($_REQUEST['set_gz']));
 		$testing = true;
-	}
-	elseif (isset($_REQUEST['package']))
+	} elseif (isset($_REQUEST['package']))
 	{
 		$base_name = basename($_REQUEST['package']);
 		$name = $smcFunc['htmlspecialchars'](strtok(basename($_REQUEST['package']), '.'));
@@ -1458,12 +1520,14 @@ 
 		$destination = $packagesdir . '/' . basename($_REQUEST['package']);
 	}
 
-	if (!file_exists($destination))
-		fatal_lang_error('package_no_file', false);
+	if (!file_exists($destination)) {
+			fatal_lang_error('package_no_file', false);
+	}
 
 	// Make sure temp directory exists and is empty.
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp', false);
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp', false);
+	}
 
 	if (!mktree($packagesdir . '/temp', 0755))
 	{
@@ -1475,31 +1539,37 @@ 
 			create_chmod_control(array($packagesdir . '/temp/delme.tmp'), array('destination_url' => $scripturl . '?action=admin;area=smileys;sa=install;set_gz=' . $_REQUEST['set_gz'], 'crash_on_error' => true));
 
 			deltree($packagesdir . '/temp', false);
-			if (!mktree($packagesdir . '/temp', 0777))
-				fatal_lang_error('package_cant_download', false);
+			if (!mktree($packagesdir . '/temp', 0777)) {
+							fatal_lang_error('package_cant_download', false);
+			}
 		}
 	}
 
 	$extracted = read_tgz_file($destination, $packagesdir . '/temp');
-	if (!$extracted)
-		fatal_lang_error('packageget_unable', false, array('http://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
-	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml'))
-		foreach ($extracted as $file)
+	if (!$extracted) {
+			fatal_lang_error('packageget_unable', false, array('http://custom.simplemachines.org/mods/index.php?action=search;type=12;basic_search=' . $name));
+	}
+	if ($extracted && !file_exists($packagesdir . '/temp/package-info.xml')) {
+			foreach ($extracted as $file)
 			if (basename($file['filename']) == 'package-info.xml')
 			{
 				$base_path = dirname($file['filename']) . '/';
+	}
 				break;
 			}
 
-	if (!isset($base_path))
-		$base_path = '';
+	if (!isset($base_path)) {
+			$base_path = '';
+	}
 
-	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml'))
-		fatal_lang_error('package_get_error_missing_xml', false);
+	if (!file_exists($packagesdir . '/temp/' . $base_path . 'package-info.xml')) {
+			fatal_lang_error('package_get_error_missing_xml', false);
+	}
 
 	$smileyInfo = getPackageInfo($context['filename']);
-	if (!is_array($smileyInfo))
-		fatal_lang_error($smileyInfo);
+	if (!is_array($smileyInfo)) {
+			fatal_lang_error($smileyInfo);
+	}
 
 	// See if it is installed?
 	$request = $smcFunc['db_query']('', '
@@ -1515,8 +1585,9 @@ 
 		)
 	);
 
-	if ($smcFunc['db_num_rows']($request) > 0)
-		fata_lang_error('package_installed_warning1');
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			fata_lang_error('package_installed_warning1');
+	}
 
 	// Everything is fine, now it's time to do something
 	$actions = parsePackageInfo($smileyInfo['xml'], true, 'install');
@@ -1533,23 +1604,23 @@ 
 		{
 			$has_readme = true;
 			$type = 'package_' . $action['type'];
-			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
-			elseif (file_exists($action['filename']))
-				$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			if (file_exists($packagesdir . '/temp/' . $base_path . $action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($packagesdir . '/temp/' . $base_path . $action['filename']), "\n\r"));
+			} elseif (file_exists($action['filename'])) {
+							$context[$type] = $smcFunc['htmlspecialchars'](trim(file_get_contents($action['filename']), "\n\r"));
+			}
 
 			if (!empty($action['parse_bbc']))
 			{
 				require_once($sourcedir . '/Subs-Post.php');
 				preparsecode($context[$type]);
 				$context[$type] = parse_bbc($context[$type]);
+			} else {
+							$context[$type] = nl2br($context[$type]);
 			}
-			else
-				$context[$type] = nl2br($context[$type]);
 
 			continue;
-		}
-		elseif ($action['type'] == 'require-dir')
+		} elseif ($action['type'] == 'require-dir')
 		{
 			// Do this one...
 			$thisAction = array(
@@ -1568,12 +1639,12 @@ 
 				);
 			}
 			// @todo None given?
-			if (empty($thisAction['description']))
-				$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			if (empty($thisAction['description'])) {
+							$thisAction['description'] = isset($action['description']) ? $action['description'] : '';
+			}
 
 			$context['actions'][] = $thisAction;
-		}
-		elseif ($action['type'] == 'credits')
+		} elseif ($action['type'] == 'credits')
 		{
 			// Time to build the billboard
 			$credits_tag = array(
@@ -1632,12 +1703,14 @@ 
 		cache_put_data('posting_smileys', null, 480);
 	}
 
-	if (file_exists($packagesdir . '/temp'))
-		deltree($packagesdir . '/temp');
+	if (file_exists($packagesdir . '/temp')) {
+			deltree($packagesdir . '/temp');
+	}
 
-	if (!$testing)
-		redirectexit('action=admin;area=smileys');
-}
+	if (!$testing) {
+			redirectexit('action=admin;area=smileys');
+	}
+	}
 
 /**
  * A function to import new smileys from an existing directory into the database.
@@ -1648,15 +1721,17 @@ 
 {
 	global $modSettings, $smcFunc;
 
-	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath))
-		fatal_lang_error('smiley_set_unable_to_import');
+	if (empty($modSettings['smileys_dir']) || !is_dir($modSettings['smileys_dir'] . '/' . $smileyPath)) {
+			fatal_lang_error('smiley_set_unable_to_import');
+	}
 
 	$smileys = array();
 	$dir = dir($modSettings['smileys_dir'] . '/' . $smileyPath);
 	while ($entry = $dir->read())
 	{
-		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png')))
-			$smileys[strtolower($entry)] = $entry;
+		if (in_array(strrchr($entry, '.'), array('.jpg', '.gif', '.jpeg', '.png'))) {
+					$smileys[strtolower($entry)] = $entry;
+		}
 	}
 	$dir->close();
 
@@ -1669,9 +1744,10 @@ 
 			'smiley_list' => $smileys,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		if (isset($smileys[strtolower($row['filename'])]))
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			if (isset($smileys[strtolower($row['filename'])]))
 			unset($smileys[strtolower($row['filename'])]);
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1688,9 +1764,10 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$new_smileys = array();
-	foreach ($smileys as $smiley)
-		if (strlen($smiley) <= 48)
+	foreach ($smileys as $smiley) {
+			if (strlen($smiley) <= 48)
 			$new_smileys[] = array(':' . strtok($smiley, '.') . ':', $smiley, strtok($smiley, '.'), 0, ++$smiley_order);
+	}
 
 	if (!empty($new_smileys))
 	{
@@ -1755,8 +1832,9 @@ 
 		if (isset($_POST['delete']) && !empty($_POST['checked_icons']))
 		{
 			$deleteIcons = array();
-			foreach ($_POST['checked_icons'] as $icon)
-				$deleteIcons[] = (int) $icon;
+			foreach ($_POST['checked_icons'] as $icon) {
+							$deleteIcons[] = (int) $icon;
+			}
 
 			// Do the actual delete!
 			$smcFunc['db_query']('', '
@@ -1773,35 +1851,41 @@ 
 			$_GET['icon'] = (int) $_GET['icon'];
 
 			// Do some preperation with the data... like check the icon exists *somewhere*
-			if (strpos($_POST['icon_filename'], '.png') !== false)
-				$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
-			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png'))
-				fatal_lang_error('icon_not_found');
+			if (strpos($_POST['icon_filename'], '.png') !== false) {
+							$_POST['icon_filename'] = substr($_POST['icon_filename'], 0, -4);
+			}
+			if (!file_exists($settings['default_theme_dir'] . '/images/post/' . $_POST['icon_filename'] . '.png')) {
+							fatal_lang_error('icon_not_found');
+			}
 			// There is a 16 character limit on message icons...
-			elseif (strlen($_POST['icon_filename']) > 16)
-				fatal_lang_error('icon_name_too_long');
-			elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon']))
-				fatal_lang_error('icon_after_itself');
+			elseif (strlen($_POST['icon_filename']) > 16) {
+							fatal_lang_error('icon_name_too_long');
+			} elseif ($_POST['icon_location'] == $_GET['icon'] && !empty($_GET['icon'])) {
+							fatal_lang_error('icon_after_itself');
+			}
 
 			// First do the sorting... if this is an edit reduce the order of everything after it by one ;)
 			if ($_GET['icon'] != 0)
 			{
 				$oldOrder = $context['icons'][$_GET['icon']]['true_order'];
-				foreach ($context['icons'] as $id => $data)
-					if ($data['true_order'] > $oldOrder)
+				foreach ($context['icons'] as $id => $data) {
+									if ($data['true_order'] > $oldOrder)
 						$context['icons'][$id]['true_order']--;
+				}
 			}
 
 			// If there are no existing icons and this is a new one, set the id to 1 (mainly for non-mysql)
-			if (empty($_GET['icon']) && empty($context['icons']))
-				$_GET['icon'] = 1;
+			if (empty($_GET['icon']) && empty($context['icons'])) {
+							$_GET['icon'] = 1;
+			}
 
 			// Get the new order.
 			$newOrder = $_POST['icon_location'] == 0 ? 0 : $context['icons'][$_POST['icon_location']]['true_order'] + 1;
 			// Do the same, but with the one that used to be after this icon, done to avoid conflict.
-			foreach ($context['icons'] as $id => $data)
-				if ($data['true_order'] >= $newOrder)
+			foreach ($context['icons'] as $id => $data) {
+							if ($data['true_order'] >= $newOrder)
 					$context['icons'][$id]['true_order']++;
+			}
 
 			// Finally set the current icon's position!
 			$context['icons'][$_GET['icon']]['true_order'] = $newOrder;
@@ -1819,8 +1903,7 @@ 
 				if ($id != 0)
 				{
 					$iconInsert[] = array($id, $icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
-				}
-				else
+				} else
 				{
 					$iconInsert_new[] = array($icon['board_id'], $icon['title'], $icon['filename'], $icon['true_order']);
 				}
@@ -1845,8 +1928,9 @@ 
 		}
 
 		// Unless we're adding a new thing, we'll escape
-		if (!isset($_POST['add']))
-			redirectexit('action=admin;area=smileys;sa=editicons');
+		if (!isset($_POST['add'])) {
+					redirectexit('action=admin;area=smileys;sa=editicons');
+		}
 	}
 
 	$context[$context['admin_menu_name']]['current_subsection'] = 'editicons';
@@ -1956,8 +2040,9 @@ 
 		$context['new_icon'] = !isset($_GET['icon']);
 
 		// Get the properties of the current icon from the icon list.
-		if (!$context['new_icon'])
-			$context['icon'] = $context['icons'][$_GET['icon']];
+		if (!$context['new_icon']) {
+					$context['icon'] = $context['icons'][$_GET['icon']];
+		}
 
 		// Get a list of boards needed for assigning this icon to a specific board.
 		$boardListOptions = array(
@@ -1991,8 +2076,9 @@ 
 	);
 
 	$message_icons = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$message_icons[] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$message_icons[] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	return $message_icons;