SimpleMachines / SMF2.1

Themes/default/ManageMaintenance.template.php

Braces +42 added lines, -29 removed lines

@@ -18,11 +18,12 @@ 
 	global $context, $txt, $scripturl, $modSettings;
 
 	// If maintenance has finished tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 	<div class="infobox">
 		', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 	</div>';
+	}
 
 	echo '
 	<div id="manage_maintenance">
@@ -39,8 +40,8 @@ 
 		</div>';
 
 	// Show an option to convert the body column of the post table to MEDIUMTEXT or TEXT
-	if (isset($context['convert_to']))
-		echo '
+	if (isset($context['convert_to'])) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt[$context['convert_to'] . '_title'], '</h3>
 		</div>
@@ -53,10 +54,11 @@ 
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
 			</form>
 		</div>';
+	}
 
 	// We might want to convert entities if we're on UTF-8.
-	if ($context['convert_entities'])
-		echo '
+	if ($context['convert_entities']) {
+			echo '
 		<div class="cat_bar">
 			<h3 class="catbg">', $txt['entity_convert_title'], '</h3>
 		</div>
@@ -68,6 +70,7 @@ 
 				<input type="hidden" name="', $context['admin-maint_token_var'], '" value="', $context['admin-maint_token'], '">
 			</form>
 		</div>';
+	}
 
 	echo '
 	</div><!-- #manage_maintenance -->';
@@ -85,11 +88,12 @@ 
 	<div id="manage_maintenance">';
 
 	// If maintenance has finished tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 		<div class="infobox">
 			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -221,11 +225,12 @@ 
 	<div id="manage_maintenance">';
 
 	// If maintenance has finished, tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 		<div class="infobox">
 			', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 		</div>';
+	}
 
 	echo '
 		<div class="cat_bar">
@@ -287,9 +292,10 @@ 
 				</p>
 				<div style="display: none;" id="membersPanel">';
 
-	foreach ($context['membergroups'] as $group)
-		echo '
+	foreach ($context['membergroups'] as $group) {
+			echo '
 					<label for="groups', $group['id'], '"><input type="checkbox" name="groups[', $group['id'], ']" id="groups', $group['id'], '" checked> ', $group['name'], '</label><br>';
+	}
 
 	echo '
 				</div>
@@ -333,11 +339,12 @@ 
 	global $scripturl, $txt, $context, $settings, $modSettings;
 
 	// If maintenance has finished tell the user.
-	if (!empty($context['maintenance_finished']))
-		echo '
+	if (!empty($context['maintenance_finished'])) {
+			echo '
 	<div class="infobox">
 		', sprintf($txt['maintain_done'], $context['maintenance_finished']), '
 	</div>';
+	}
 
 	// Bit of javascript for showing which boards to prune in an otherwise hidden list.
 	echo '
@@ -405,21 +412,23 @@ 
 								<ul>';
 
 		// Display a checkbox with every board.
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 									<li style="margin-', $context['right_to_left'] ? 'right' : 'left', ': ', $board['child_level'] * 1.5, 'em;">
 										<label for="boards_', $board['id'], '"><input type="checkbox" name="boards[', $board['id'], ']" id="boards_', $board['id'], '" checked>', $board['name'], '</label>
 									</li>';
+		}
 
 		echo '
 								</ul>
 							</fieldset>';
 
 		// Increase $i, and check if we're at the middle yet.
-		if (++$i == $middle)
-			echo '
+		if (++$i == $middle) {
+					echo '
 						</div><!-- .floatleft -->
 						<div class="floatright" style="width: 49%;">';
+		}
 	}
 
 	echo '
@@ -461,9 +470,10 @@ 
 		echo '
 						<optgroup label="', $category['name'], '">';
 
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"> ', str_repeat('==', $board['child_level']), '=&gt;&nbsp;', $board['name'], '</option>';
+		}
 
 		echo '
 						</optgroup>';
@@ -481,9 +491,10 @@ 
 		echo '
 						<optgroup label="', $category['name'], '">';
 
-		foreach ($category['boards'] as $board)
-			echo '
+		foreach ($category['boards'] as $board) {
+					echo '
 							<option value="', $board['id'], '"> ', str_repeat('==', $board['child_level']), '=&gt;&nbsp;', $board['name'], '</option>';
+		}
 
 		echo '
 						</optgroup>';
@@ -526,9 +537,10 @@ 
 				', $txt['database_optimize_attempt'], '<br>';
 
 	// List each table being optimized...
-	foreach ($context['optimized_tables'] as $table)
-		echo '
+	foreach ($context['optimized_tables'] as $table) {
+			echo '
 				', sprintf($txt['database_optimizing'], $table['name'], $table['data_freed']), '<br>';
+	}
 
 	// How did we go?
 	echo '
@@ -588,13 +600,14 @@ 
 				</li>
 			</ul>';
 
-		if (!empty($context['exceeding_messages_morethan']))
-			echo '
+		if (!empty($context['exceeding_messages_morethan'])) {
+					echo '
 			<p>', $context['exceeding_messages_morethan'], '</p>';
-	}
-	else
-		echo '
+		}
+	} else {
+			echo '
 			<p class="infobox">', $txt['convert_to_text'], '</p>';
+	}
 
 	echo '
 			<form action="', $scripturl, '?action=admin;area=maintain;sa=database;activity=convertmsgbody" method="post" accept-charset="', $context['character_set'], '">

Sources/ManageMaintenance.php

Braces +279 added lines, -208 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Main dispatcher, the maintenance access point.
@@ -95,14 +96,16 @@ 
 	call_integration_hook('integrate_manage_maintenance', array(&$subActions));
 
 	// Yep, sub-action time!
-	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']]))
-		$subAction = $_REQUEST['sa'];
-	else
-		$subAction = 'routine';
+	if (isset($_REQUEST['sa']) && isset($subActions[$_REQUEST['sa']])) {
+			$subAction = $_REQUEST['sa'];
+	} else {
+			$subAction = 'routine';
+	}
 
 	// Doing something special?
-	if (isset($_REQUEST['activity']) && isset($subActions[$subAction]['activities'][$_REQUEST['activity']]))
-		$activity = $_REQUEST['activity'];
+	if (isset($_REQUEST['activity']) && isset($subActions[$subAction]['activities'][$_REQUEST['activity']])) {
+			$activity = $_REQUEST['activity'];
+	}
 
 	// Set a few things.
 	$context['page_title'] = $txt['maintain_title'];
@@ -113,8 +116,9 @@ 
 	call_helper($subActions[$subAction]['function']);
 
 	// Any special activity?
-	if (isset($activity))
-		call_helper($subActions[$subAction]['activities'][$activity]);
+	if (isset($activity)) {
+			call_helper($subActions[$subAction]['activities'][$activity]);
+	}
 
 	// Create a maintenance token.  Kinda hard to do it any other way.
 	createToken('admin-maint');
@@ -135,17 +139,19 @@ 
 		db_extend('packages');
 
 		$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+		foreach ($colData as $column) {
+					if ($column['name'] == 'body')
 				$body_type = $column['type'];
+		}
 
 		$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 		$context['convert_to_suggest'] = ($body_type != 'text' && !empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] < 65536);
 	}
 
-	if (isset($_GET['done']) && $_GET['done'] == 'convertentities')
-		$context['maintenance_finished'] = $txt['entity_convert_title'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'convertentities') {
+			$context['maintenance_finished'] = $txt['entity_convert_title'];
+	}
+	}
 
 /**
  * Supporting function for the routine maintenance area.
@@ -154,9 +160,10 @@ 
 {
 	global $context, $txt;
 
-	if (isset($_GET['done']) && $_GET['done'] == 'recount')
-		$context['maintenance_finished'] = $txt['maintain_recount'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'recount') {
+			$context['maintenance_finished'] = $txt['maintain_recount'];
+	}
+	}
 
 /**
  * Supporting function for the members maintenance area.
@@ -187,8 +194,9 @@ 
 	}
 	$smcFunc['db_free_result']($result);
 
-	if (isset($_GET['done']) && $_GET['done'] == 'recountposts')
-		$context['maintenance_finished'] = $txt['maintain_recountposts'];
+	if (isset($_GET['done']) && $_GET['done'] == 'recountposts') {
+			$context['maintenance_finished'] = $txt['maintain_recountposts'];
+	}
 
 	loadJavaScriptFile('suggest.js', array('defer' => false, 'minimize' => true), 'smf_suggest');
 }
@@ -214,11 +222,12 @@ 
 	$context['categories'] = array();
 	while ($row = $smcFunc['db_fetch_assoc']($result))
 	{
-		if (!isset($context['categories'][$row['id_cat']]))
-			$context['categories'][$row['id_cat']] = array(
+		if (!isset($context['categories'][$row['id_cat']])) {
+					$context['categories'][$row['id_cat']] = array(
 				'name' => $row['cat_name'],
 				'boards' => array()
 			);
+		}
 
 		$context['categories'][$row['id_cat']]['boards'][$row['id_board']] = array(
 			'id' => $row['id_board'],
@@ -231,11 +240,12 @@ 
 	require_once($sourcedir . '/Subs-Boards.php');
 	sortCategories($context['categories']);
 
-	if (isset($_GET['done']) && $_GET['done'] == 'purgeold')
-		$context['maintenance_finished'] = $txt['maintain_old'];
-	elseif (isset($_GET['done']) && $_GET['done'] == 'massmove')
-		$context['maintenance_finished'] = $txt['move_topics_maintenance'];
-}
+	if (isset($_GET['done']) && $_GET['done'] == 'purgeold') {
+			$context['maintenance_finished'] = $txt['maintain_old'];
+	} elseif (isset($_GET['done']) && $_GET['done'] == 'massmove') {
+			$context['maintenance_finished'] = $txt['move_topics_maintenance'];
+	}
+	}
 
 /**
  * Find and fix all errors on the forum.
@@ -343,15 +353,17 @@ 
 	// Show me your badge!
 	isAllowedTo('admin_forum');
 
-	if ($db_type != 'mysql')
-		return;
+	if ($db_type != 'mysql') {
+			return;
+	}
 
 	db_extend('packages');
 
 	$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-	foreach ($colData as $column)
-		if ($column['name'] == 'body')
+	foreach ($colData as $column) {
+			if ($column['name'] == 'body')
 			$body_type = $column['type'];
+	}
 
 	$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 
@@ -361,33 +373,36 @@ 
 		validateToken('admin-maint');
 
 		// Make it longer so we can do their limit.
-		if ($body_type == 'text')
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+		if ($body_type == 'text') {
+					$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'mediumtext'));
+		}
 		// Shorten the column so we can have a bit (literally per record) less space occupied
-		else
-			$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
+		else {
+					$smcFunc['db_change_column']('{db_prefix}messages', 'body', array('type' => 'text'));
+		}
 
 		// 3rd party integrations may be interested in knowning about this.
 		call_integration_hook('integrate_convert_msgbody', array($body_type));
 
 		$colData = $smcFunc['db_list_columns']('{db_prefix}messages', true);
-		foreach ($colData as $column)
-			if ($column['name'] == 'body')
+		foreach ($colData as $column) {
+					if ($column['name'] == 'body')
 				$body_type = $column['type'];
+		}
 
 		$context['maintenance_finished'] = $txt[$context['convert_to'] . '_title'];
 		$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : 'text';
 		$context['convert_to_suggest'] = ($body_type != 'text' && !empty($modSettings['max_messageLength']) && $modSettings['max_messageLength'] < 65536);
 
 		return;
-	}
-	elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
+	} elseif ($body_type != 'text' && (!isset($_POST['do_conversion']) || isset($_POST['cont'])))
 	{
 		checkSession();
-		if (empty($_REQUEST['start']))
-			validateToken('admin-maint');
-		else
-			validateToken('admin-convertMsg');
+		if (empty($_REQUEST['start'])) {
+					validateToken('admin-maint');
+		} else {
+					validateToken('admin-convertMsg');
+		}
 
 		$context['page_title'] = $txt['not_done_title'];
 		$context['continue_post_data'] = '';
@@ -419,8 +434,9 @@ 
 					'increment' => $increment - 1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$id_msg_exceeding[] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$id_msg_exceeding[] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -449,9 +465,9 @@ 
 			{
 				$query_msg = array_slice($id_msg_exceeding, 0, 100);
 				$context['exceeding_messages_morethan'] = sprintf($txt['exceeding_messages_morethan'], count($id_msg_exceeding));
+			} else {
+							$query_msg = $id_msg_exceeding;
 			}
-			else
-				$query_msg = $id_msg_exceeding;
 
 			$context['exceeding_messages'] = array();
 			$request = $smcFunc['db_query']('', '
@@ -462,8 +478,9 @@ 
 					'messages' => $query_msg,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$context['exceeding_messages'][] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$context['exceeding_messages'][] = '<a href="' . $scripturl . '?topic=' . $row['id_topic'] . '.msg' . $row['id_msg'] . '#msg' . $row['id_msg'] . '">' . $row['subject'] . '</a>';
+			}
 			$smcFunc['db_free_result']($request);
 		}
 	}
@@ -487,8 +504,9 @@ 
 	isAllowedTo('admin_forum');
 
 	// Check to see if UTF-8 is currently the default character set.
-	if ($modSettings['global_character_set'] !== 'UTF-8')
-		fatal_lang_error('entity_convert_only_utf8');
+	if ($modSettings['global_character_set'] !== 'UTF-8') {
+			fatal_lang_error('entity_convert_only_utf8');
+	}
 
 	// Some starting values.
 	$context['table'] = empty($_REQUEST['table']) ? 0 : (int) $_REQUEST['table'];
@@ -550,13 +568,14 @@ 
 		// Make sure we keep stuff unique!
 		$primary_keys = array();
 
-		if (function_exists('apache_reset_timeout'))
-			@apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					@apache_reset_timeout();
+		}
 
 		// Get a list of text columns.
 		$columns = array();
-		if ($db_type == 'postgresql')
-			$request = $smcFunc['db_query']('', '
+		if ($db_type == 'postgresql') {
+					$request = $smcFunc['db_query']('', '
 				SELECT column_name "Field", data_type "Type"
 				FROM information_schema.columns 
 				WHERE table_name = {string:cur_table}
@@ -565,21 +584,23 @@ 
 					'cur_table' => $db_prefix.$cur_table,
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW FULL COLUMNS
 				FROM {db_prefix}{raw:cur_table}',
 				array(
 					'cur_table' => $cur_table,
 				)
 			);
-		while ($column_info = $smcFunc['db_fetch_assoc']($request))
-			if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
+		}
+		while ($column_info = $smcFunc['db_fetch_assoc']($request)) {
+					if (strpos($column_info['Type'], 'text') !== false || strpos($column_info['Type'], 'char') !== false)
 				$columns[] = strtolower($column_info['Field']);
+		}
 
 		// Get the column with the (first) primary key.
-		if ($db_type == 'postgresql')
-			$request = $smcFunc['db_query']('', '
+		if ($db_type == 'postgresql') {
+					$request = $smcFunc['db_query']('', '
 				SELECT a.attname "Column_name", \'PRIMARY\' "Key_name", attnum "Seq_in_index"
 				FROM   pg_index i
 				JOIN   pg_attribute a ON a.attrelid = i.indrelid
@@ -590,20 +611,22 @@ 
 					'cur_table' => $db_prefix.$cur_table,
 				)
 			);
-		else
-			$request = $smcFunc['db_query']('', '
+		} else {
+					$request = $smcFunc['db_query']('', '
 				SHOW KEYS
 				FROM {db_prefix}{raw:cur_table}',
 				array(
 					'cur_table' => $cur_table,
 				)
 			);
+		}
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			if ($row['Key_name'] === 'PRIMARY')
 			{
-				if ((empty($primary_key) || $row['Seq_in_index'] == 1) && !in_array(strtolower($row['Column_name']), $columns))
-					$primary_key = $row['Column_name'];
+				if ((empty($primary_key) || $row['Seq_in_index'] == 1) && !in_array(strtolower($row['Column_name']), $columns)) {
+									$primary_key = $row['Column_name'];
+				}
 
 				$primary_keys[] = $row['Column_name'];
 			}
@@ -612,8 +635,9 @@ 
 
 		// No primary key, no glory.
 		// Same for columns. Just to be sure we've work to do!
-		if (empty($primary_key) || empty($columns))
-			continue;
+		if (empty($primary_key) || empty($columns)) {
+					continue;
+		}
 
 		// Get the maximum value for the primary key.
 		$request = $smcFunc['db_query']('', '
@@ -627,8 +651,9 @@ 
 		list($max_value) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
 
-		if (empty($max_value))
-			continue;
+		if (empty($max_value)) {
+					continue;
+		}
 
 		while ($context['start'] <= $max_value)
 		{
@@ -652,10 +677,11 @@ 
 			{
 				$insertion_variables = array();
 				$changes = array();
-				foreach ($row as $column_name => $column_value)
-					if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
+				foreach ($row as $column_name => $column_value) {
+									if ($column_name !== $primary_key && strpos($column_value, '&#') !== false)
 					{
 						$changes[] = $column_name . ' = {string:changes_' . $column_name . '}';
+				}
 						$insertion_variables['changes_' . $column_name] = preg_replace_callback('~&#(\d{1,5}|x[0-9a-fA-F]{1,4});~', 'fixchardb__callback', $column_value);
 					}
 
@@ -667,8 +693,8 @@ 
 				}
 
 				// Update the row.
-				if (!empty($changes))
-					$smcFunc['db_query']('', '
+				if (!empty($changes)) {
+									$smcFunc['db_query']('', '
 						UPDATE {db_prefix}' . $cur_table . '
 						SET
 							' . implode(',
@@ -676,6 +702,7 @@ 
 						WHERE ' . implode(' AND ', $where),
 						$insertion_variables
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 			$context['start'] += 500;
@@ -716,10 +743,11 @@ 
 
 	checkSession('request');
 
-	if (!isset($_SESSION['optimized_tables']))
-		validateToken('admin-maint');
-	else
-		validateToken('admin-optimize', 'post', false);
+	if (!isset($_SESSION['optimized_tables'])) {
+			validateToken('admin-maint');
+	} else {
+			validateToken('admin-optimize', 'post', false);
+	}
 
 	ignore_user_abort(true);
 	db_extend();
@@ -735,13 +763,15 @@ 
 	// Get a list of tables, as well as how many there are.
 	$temp_tables = $smcFunc['db_list_tables'](false, $real_prefix . '%');
 	$tables = array();
-	foreach ($temp_tables as $table)
-		$tables[] = array('table_name' => $table);
+	foreach ($temp_tables as $table) {
+			$tables[] = array('table_name' => $table);
+	}
 
 	// If there aren't any tables then I believe that would mean the world has exploded...
 	$context['num_tables'] = count($tables);
-	if ($context['num_tables'] == 0)
-		fatal_error('You appear to be running SMF in a flat file mode... fantastic!', false);
+	if ($context['num_tables'] == 0) {
+			fatal_error('You appear to be running SMF in a flat file mode... fantastic!', false);
+	}
 
 	$_REQUEST['start'] = empty($_REQUEST['start']) ? 0 : (int) $_REQUEST['start'];
 
@@ -752,8 +782,9 @@ 
 	$_SESSION['optimized_tables'] = !empty($_SESSION['optimized_tables']) ? $_SESSION['optimized_tables'] : array();
 	for ($key = $_REQUEST['start']; $context['num_tables'] - 1; $key++)
 	{
-		if (empty($tables[$key]))
-			break;
+		if (empty($tables[$key])) {
+					break;
+		}
 
 		// Continue?
 		if (microtime(true) - $time_start > 10)
@@ -767,8 +798,9 @@ 
 			createToken('admin-optimize');
 			$context['continue_post_data'] = '<input type="hidden" name="' . $context['admin-optimize_token_var'] . '" value="' . $context['admin-optimize_token'] . '">';
 
-			if (function_exists('apache_reset_timeout'))
-				apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							apache_reset_timeout();
+			}
 
 			return;
 		}
@@ -776,11 +808,12 @@ 
 		// Optimize the table!  We use backticks here because it might be a custom table.
 		$data_freed = $smcFunc['db_optimize_table']($tables[$key]['table_name']);
 
-		if ($data_freed > 0)
-			$_SESSION['optimized_tables'][] = array(
+		if ($data_freed > 0) {
+					$_SESSION['optimized_tables'][] = array(
 				'name' => $tables[$key]['table_name'],
 				'data_freed' => $data_freed,
 			);
+		}
 	}
 
 	// Number of tables, etc...
@@ -815,10 +848,11 @@ 
 	checkSession('request');
 
 	// validate the request or the loop
-	if (!isset($_REQUEST['step']))
-		validateToken('admin-maint');
-	else
-		validateToken('admin-boardrecount');
+	if (!isset($_REQUEST['step'])) {
+			validateToken('admin-maint');
+	} else {
+			validateToken('admin-boardrecount');
+	}
 
 	$context['page_title'] = $txt['not_done_title'];
 	$context['continue_post_data'] = '';
@@ -839,8 +873,9 @@ 
 	$smcFunc['db_free_result']($request);
 
 	$increment = min(max(50, ceil($max_topics / 4)), 2000);
-	if (empty($_REQUEST['start']))
-		$_REQUEST['start'] = 0;
+	if (empty($_REQUEST['start'])) {
+			$_REQUEST['start'] = 0;
+	}
 
 	$total_steps = 8;
 
@@ -867,8 +902,8 @@ 
 					'max_id' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET num_replies = {int:num_replies}
 					WHERE id_topic = {int:id_topic}',
@@ -877,6 +912,7 @@ 
 						'id_topic' => $row['id_topic'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			// Recount unapproved messages
@@ -895,8 +931,8 @@ 
 					'max_id' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}topics
 					SET unapproved_posts = {int:unapproved_posts}
 					WHERE id_topic = {int:id_topic}',
@@ -905,6 +941,7 @@ 
 						'id_topic' => $row['id_topic'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -927,8 +964,8 @@ 
 	// Update the post count of each board.
 	if ($_REQUEST['step'] <= 1)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET num_posts = {int:num_posts}
 				WHERE redirect = {string:redirect}',
@@ -937,6 +974,7 @@ 
 					'redirect' => '',
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -953,8 +991,8 @@ 
 					'is_approved' => 1,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET num_posts = num_posts + {int:real_num_posts}
 					WHERE id_board = {int:id_board}',
@@ -963,6 +1001,7 @@ 
 						'real_num_posts' => $row['real_num_posts'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -985,14 +1024,15 @@ 
 	// Update the topic count of each board.
 	if ($_REQUEST['step'] <= 2)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET num_topics = {int:num_topics}',
 				array(
 					'num_topics' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1009,8 +1049,8 @@ 
 					'id_topic_max' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET num_topics = num_topics + {int:real_num_topics}
 					WHERE id_board = {int:id_board}',
@@ -1019,6 +1059,7 @@ 
 						'real_num_topics' => $row['real_num_topics'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1041,14 +1082,15 @@ 
 	// Update the unapproved post count of each board.
 	if ($_REQUEST['step'] <= 3)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET unapproved_posts = {int:unapproved_posts}',
 				array(
 					'unapproved_posts' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1065,8 +1107,8 @@ 
 					'is_approved' => 0,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_posts = unapproved_posts + {int:unapproved_posts}
 					WHERE id_board = {int:id_board}',
@@ -1075,6 +1117,7 @@ 
 						'unapproved_posts' => $row['real_unapproved_posts'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1097,14 +1140,15 @@ 
 	// Update the unapproved topic count of each board.
 	if ($_REQUEST['step'] <= 4)
 	{
-		if (empty($_REQUEST['start']))
-			$smcFunc['db_query']('', '
+		if (empty($_REQUEST['start'])) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}boards
 				SET unapproved_topics = {int:unapproved_topics}',
 				array(
 					'unapproved_topics' => 0,
 				)
 			);
+		}
 
 		while ($_REQUEST['start'] < $max_topics)
 		{
@@ -1121,8 +1165,8 @@ 
 					'id_topic_max' => $_REQUEST['start'] + $increment,
 				)
 			);
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$smcFunc['db_query']('', '
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET unapproved_topics = unapproved_topics + {int:real_unapproved_topics}
 					WHERE id_board = {int:id_board}',
@@ -1131,6 +1175,7 @@ 
 						'real_unapproved_topics' => $row['real_unapproved_topics'],
 					)
 				);
+			}
 			$smcFunc['db_free_result']($request);
 
 			$_REQUEST['start'] += $increment;
@@ -1164,8 +1209,9 @@ 
 				'is_not_deleted' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('instant_messages' => $row['real_num']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		$request = $smcFunc['db_query']('', '
@@ -1180,8 +1226,9 @@ 
 				'is_not_read' => 0,
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					updateMemberData($row['id_member'], array('unread_messages' => $row['real_num']));
+		}
 		$smcFunc['db_free_result']($request);
 
 		if (microtime(true) - $time_start > 3)
@@ -1213,12 +1260,13 @@ 
 				)
 			);
 			$boards = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$boards[$row['id_board']][] = $row['id_msg'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$boards[$row['id_board']][] = $row['id_msg'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			foreach ($boards as $board_id => $messages)
-				$smcFunc['db_query']('', '
+			foreach ($boards as $board_id => $messages) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}messages
 					SET id_board = {int:id_board}
 					WHERE id_msg IN ({array_int:id_msg_array})',
@@ -1227,6 +1275,7 @@ 
 						'id_board' => $board_id,
 					)
 				);
+			}
 
 			$_REQUEST['start'] += $increment;
 
@@ -1256,8 +1305,9 @@ 
 		)
 	);
 	$realBoardCounts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$realBoardCounts[$row['id_board']] = $row['local_last_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
 	$request = $smcFunc['db_query']('', '
@@ -1277,18 +1327,20 @@ 
 	krsort($resort_me);
 
 	$lastModifiedMsg = array();
-	foreach ($resort_me as $rows)
-		foreach ($rows as $row)
+	foreach ($resort_me as $rows) {
+			foreach ($rows as $row)
 		{
 			// The latest message is the latest of the current board and its children.
 			if (isset($lastModifiedMsg[$row['id_board']]))
 				$curLastModifiedMsg = max($row['local_last_msg'], $lastModifiedMsg[$row['id_board']]);
-			else
-				$curLastModifiedMsg = $row['local_last_msg'];
+	}
+			else {
+							$curLastModifiedMsg = $row['local_last_msg'];
+			}
 
 			// If what is and what should be the latest message differ, an update is necessary.
-			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated'])
-				$smcFunc['db_query']('', '
+			if ($row['local_last_msg'] != $row['id_last_msg'] || $curLastModifiedMsg != $row['id_msg_updated']) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}boards
 					SET id_last_msg = {int:id_last_msg}, id_msg_updated = {int:id_msg_updated}
 					WHERE id_board = {int:id_board}',
@@ -1298,12 +1350,14 @@ 
 						'id_board' => $row['id_board'],
 					)
 				);
+			}
 
 			// Parent boards inherit the latest modified message of their children.
-			if (isset($lastModifiedMsg[$row['id_parent']]))
-				$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
-			else
-				$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			if (isset($lastModifiedMsg[$row['id_parent']])) {
+							$lastModifiedMsg[$row['id_parent']] = max($row['local_last_msg'], $lastModifiedMsg[$row['id_parent']]);
+			} else {
+							$lastModifiedMsg[$row['id_parent']] = $row['local_last_msg'];
+			}
 		}
 
 	// Update all the basic statistics.
@@ -1375,8 +1429,9 @@ 
 	require_once($sourcedir . '/Subs-Auth.php');
 	$members = findMembers($_POST['to']);
 
-	if (empty($members))
-		fatal_lang_error('reattribute_cannot_find_member');
+	if (empty($members)) {
+			fatal_lang_error('reattribute_cannot_find_member');
+	}
 
 	$memID = array_shift($members);
 	$memID = $memID['id'];
@@ -1406,8 +1461,9 @@ 
 		validateToken('admin-maint');
 
 		$groups = array();
-		foreach ($_POST['groups'] as $id => $dummy)
-			$groups[] = (int) $id;
+		foreach ($_POST['groups'] as $id => $dummy) {
+					$groups[] = (int) $id;
+		}
 		$time_limit = (time() - ($_POST['maxdays'] * 24 * 3600));
 		$where_vars = array(
 			'time_limit' => $time_limit,
@@ -1416,9 +1472,9 @@ 
 		{
 			$where = 'mem.date_registered < {int:time_limit} AND mem.is_activated = {int:is_activated}';
 			$where_vars['is_activated'] = 0;
+		} else {
+					$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
 		}
-		else
-			$where = 'mem.last_login < {int:time_limit} AND (mem.last_login != 0 OR mem.date_registered < {int:time_limit})';
 
 		// Need to get *all* groups then work out which (if any) we avoid.
 		$request = $smcFunc['db_query']('', '
@@ -1437,8 +1493,7 @@ 
 				{
 					$where .= ' AND mem.id_post_group != {int:id_post_group_' . $row['id_group'] . '}';
 					$where_vars['id_post_group_' . $row['id_group']] = $row['id_group'];
-				}
-				else
+				} else
 				{
 					$where .= ' AND mem.id_group != {int:id_group_' . $row['id_group'] . '} AND FIND_IN_SET({int:id_group_' . $row['id_group'] . '}, mem.additional_groups) = 0';
 					$where_vars['id_group_' . $row['id_group']] = $row['id_group'];
@@ -1465,8 +1520,9 @@ 
 		$members = array();
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (!$row['is_mod'] || !in_array(3, $groups))
-				$members[] = $row['id_member'];
+			if (!$row['is_mod'] || !in_array(3, $groups)) {
+							$members[] = $row['id_member'];
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -1513,8 +1569,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$drafts[] = (int) $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$drafts[] = (int) $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If we have old drafts, remove them
@@ -1557,8 +1614,9 @@ 
 	$sticky = isset($_POST['move_type_sticky']) || isset($_GET['sticky']);
 
 	// No boards then this is your stop.
-	if (empty($id_board_from) || empty($id_board_to))
-		return;
+	if (empty($id_board_from) || empty($id_board_to)) {
+			return;
+	}
 
 	// The big WHERE clause
 	$conditions = 'WHERE t.id_board = {int:id_board_from}
@@ -1606,18 +1664,20 @@ 
 		);
 		list ($total_topics) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			$total_topics = (int) $_REQUEST['totaltopics'];
 	}
-	else
-		$total_topics = (int) $_REQUEST['totaltopics'];
 
 	// Seems like we need this here.
 	$context['continue_get_data'] = '?action=admin;area=maintain;sa=topics;activity=massmove;id_board_from=' . $id_board_from . ';id_board_to=' . $id_board_to . ';totaltopics=' . $total_topics . ';max_days=' . $max_days;
 
-	if ($locked)
-		$context['continue_get_data'] .= ';locked';
+	if ($locked) {
+			$context['continue_get_data'] .= ';locked';
+	}
 
-	if ($sticky)
-		$context['continue_get_data'] .= ';sticky';
+	if ($sticky) {
+			$context['continue_get_data'] .= ';sticky';
+	}
 
 	$context['continue_get_data'] .= ';start=' . $context['start'] . ';' . $context['session_var'] . '=' . $context['session_id'];
 
@@ -1638,8 +1698,9 @@ 
 
 			// Get the ids.
 			$topics = array();
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				$topics[] = $row['id_topic'];
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							$topics[] = $row['id_topic'];
+			}
 
 			// Just return if we don't have any topics left to move.
 			if (empty($topics))
@@ -1730,9 +1791,9 @@ 
 		// save it so we don't do this again for this task
 		list ($_SESSION['total_members']) = $smcFunc['db_fetch_row']($request);
 		$smcFunc['db_free_result']($request);
+	} else {
+			validateToken('admin-recountposts');
 	}
-	else
-		validateToken('admin-recountposts');
 
 	// Lets get a group of members and determine their post count (from the boards that have post count enabled of course).
 	$request = $smcFunc['db_query']('', '
@@ -1778,8 +1839,9 @@ 
 		createToken('admin-recountposts');
 		$context['continue_post_data'] = '<input type="hidden" name="' . $context['admin-recountposts_token_var'] . '" value="' . $context['admin-recountposts_token'] . '">';
 
-		if (function_exists('apache_reset_timeout'))
-			apache_reset_timeout();
+		if (function_exists('apache_reset_timeout')) {
+					apache_reset_timeout();
+		}
 		return;
 	}
 
@@ -1865,10 +1927,9 @@ 
 		checkSession('request');
 		validateToken('admin-hook', 'request');
 
-		if ($_REQUEST['do'] == 'remove')
-			remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
-
-		else
+		if ($_REQUEST['do'] == 'remove') {
+					remove_integration_function($_REQUEST['hook'], urldecode($_REQUEST['function']));
+		} else
 		{
 			$function_remove = urldecode($_REQUEST['function']) . (($_REQUEST['do'] == 'disable') ? '' : '!');
 			$function_add = urldecode($_REQUEST['function']) . (($_REQUEST['do'] == 'disable') ? '!' : '');
@@ -1918,11 +1979,11 @@ 
 						// Show a nice icon to indicate this is an instance.
 						$instance = (!empty($data['instance']) ? '<span class="generic_icons news" title="' . $txt['hooks_field_function_method'] . '"></span> ' : '');
 
-						if (!empty($data['included_file']))
-							return $instance . $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
-
-						else
-							return $instance . $data['real_function'];
+						if (!empty($data['included_file'])) {
+													return $instance . $txt['hooks_field_function'] . ': ' . $data['real_function'] . '<br>' . $txt['hooks_field_included_file'] . ': ' . $data['included_file'];
+						} else {
+													return $instance . $data['real_function'];
+						}
 					},
 				),
 				'sort' =>  array(
@@ -1987,11 +2048,12 @@ 
 		'data' => array(
 			'function' => function($data) use ($txt, $scripturl, $context)
 			{
-				if (!$data['hook_exists'])
-					return '
+				if (!$data['hook_exists']) {
+									return '
 					<a href="' . $scripturl . '?action=admin;area=maintain;sa=hooks;do=remove;hook=' . $data['hook_name'] . ';function=' . urlencode($data['function_name']) . $context['filter_url'] . ';' . $context['admin-hook_token_var'] . '=' . $context['admin-hook_token'] . ';' . $context['session_var'] . '=' . $context['session_id'] . '" data-confirm="' . $txt['quickmod_confirm'] . '" class="you_sure">
 						<span class="generic_icons delete" title="' . $txt['hooks_button_remove'] . '"></span>
 					</a>';
+				}
 			},
 			'class' => 'centertext',
 		),
@@ -2026,10 +2088,11 @@ 
 		{
 			if ($file != '.' && $file != '..')
 			{
-				if (is_dir($dir_path . '/' . $file))
-					$files = array_merge($files, get_files_recursive($dir_path . '/' . $file));
-				else
-					$files[] = array('dir' => $dir_path, 'name' => $file);
+				if (is_dir($dir_path . '/' . $file)) {
+									$files = array_merge($files, get_files_recursive($dir_path . '/' . $file));
+				} else {
+									$files[] = array('dir' => $dir_path, 'name' => $file);
+				}
 			}
 		}
 	}
@@ -2078,16 +2141,16 @@ 
 							// I need to know if there is at least one function called in this file.
 							$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
 							unset($temp_hooks[$hook][$rawFunc]);
-						}
-						elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($hookParsedData['pureFunc']) . '(') !== false)
+						} elseif (strpos(str_replace(' (', '(', $fc), 'function ' . trim($hookParsedData['pureFunc']) . '(') !== false)
 						{
 							$hook_status[$hook][$hookParsedData['pureFunc']] = $hookParsedData;
 							$hook_status[$hook][$hookParsedData['pureFunc']]['exists'] = true;
 							$hook_status[$hook][$hookParsedData['pureFunc']]['in_file'] = (!empty($file['name']) ? $file['name'] : (!empty($hookParsedData['hookFile']) ? $hookParsedData['hookFile'] : ''));
 
 							// Does the hook has its own file?
-							if (!empty($hookParsedData['hookFile']))
-								$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
+							if (!empty($hookParsedData['hookFile'])) {
+															$temp_data['include'][$hookParsedData['pureFunc']] = array('hook' => $hook, 'function' => $hookParsedData['pureFunc']);
+							}
 
 							// I want to remember all the functions called within this file (to check later if they are enabled or disabled and decide if the integrare_*_include of that file can be disabled too)
 							$temp_data['function'][$file['name']][$hookParsedData['pureFunc']] = $hookParsedData['enabled'];
@@ -2114,15 +2177,17 @@ 
 	$sort = array();
 	$hooks_filters = array();
 
-	foreach ($hooks as $hook => $functions)
-		$hooks_filters[] = '<option' . ($context['current_filter'] == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+	foreach ($hooks as $hook => $functions) {
+			$hooks_filters[] = '<option' . ($context['current_filter'] == $hook ? ' selected ' : '') . ' value="' . $hook . '">' . $hook . '</option>';
+	}
 
-	if (!empty($hooks_filters))
-		$context['insert_after_template'] .= '
+	if (!empty($hooks_filters)) {
+			$context['insert_after_template'] .= '
 		<script>
 			var hook_name_header = document.getElementById(\'header_list_integration_hooks_hook_name\');
 			hook_name_header.innerHTML += ' . JavaScriptEscape('<select style="margin-left:15px;" onchange="window.location=(\'' . $scripturl . '?action=admin;area=maintain;sa=hooks\' + (this.value ? \';filter=\' + this.value : \'\'));"><option value="">' . $txt['hooks_reset_filter'] . '</option>' . implode('', $hooks_filters) . '</select>') . ';
 		</script>';
+	}
 
 	$temp_data = array();
 	$id = 0;
@@ -2164,10 +2229,11 @@ 
 
 	foreach ($temp_data as $data)
 	{
-		if (++$counter < $start)
-			continue;
-		elseif ($counter == $start + $per_page)
-			break;
+		if (++$counter < $start) {
+					continue;
+		} elseif ($counter == $start + $per_page) {
+					break;
+		}
 
 		$hooks_data[] = $data;
 	}
@@ -2189,13 +2255,15 @@ 
 	$hooks_count = 0;
 
 	$context['filter'] = false;
-	if (isset($_GET['filter']))
-		$context['filter'] = $_GET['filter'];
+	if (isset($_GET['filter'])) {
+			$context['filter'] = $_GET['filter'];
+	}
 
 	foreach ($hooks as $hook => $functions)
 	{
-		if (empty($context['filter']) || (!empty($context['filter']) && $context['filter'] == $hook))
-			$hooks_count += count($functions);
+		if (empty($context['filter']) || (!empty($context['filter']) && $context['filter'] == $hook)) {
+					$hooks_count += count($functions);
+		}
 	}
 
 	return $hooks_count;
@@ -2216,8 +2284,9 @@ 
 		$integration_hooks = array();
 		foreach ($modSettings as $key => $value)
 		{
-			if (!empty($value) && substr($key, 0, 10) === 'integrate_')
-				$integration_hooks[$key] = explode(',', $value);
+			if (!empty($value) && substr($key, 0, 10) === 'integrate_') {
+							$integration_hooks[$key] = explode(',', $value);
+			}
 		}
 	}
 
@@ -2248,8 +2317,9 @@ 
 	);
 
 	// Meh...
-	if (empty($rawData))
-		return $hookData;
+	if (empty($rawData)) {
+			return $hookData;
+	}
 
 	// For convenience purposes only!
 	$modFunc = $rawData;
@@ -2260,11 +2330,11 @@ 
 		list ($hookData['hookFile'], $modFunc) = explode('|', $modFunc);
 
 		// Does the file exists? who knows!
-		if (empty($settings['theme_dir']))
-			$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
-
-		else
-			$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		if (empty($settings['theme_dir'])) {
+					$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir));
+		} else {
+					$hookData['absPath'] = strtr(trim($hookData['hookFile']), array('$boarddir' => $boarddir, '$sourcedir' => $sourcedir, '$themedir' => $settings['theme_dir']));
+		}
 
 		$hookData['fileExists'] = file_exists($hookData['absPath']);
 		$hookData['hookFile'] = basename($hookData['hookFile']);
@@ -2289,11 +2359,10 @@ 
 	{
 		list ($hookData['class'], $hookData['method']) = explode('::', $modFunc);
 		$hookData['pureFunc'] = $hookData['method'];
+	} else {
+			$hookData['pureFunc'] = $modFunc;
 	}
 
-	else
-		$hookData['pureFunc'] = $modFunc;
-
 	return $hookData;
 }
 
@@ -2311,16 +2380,18 @@ 
 function fixchardb__callback($matches)
 {
 	global $smcFunc;
-	if (!isset($matches[1]))
-		return '';
+	if (!isset($matches[1])) {
+			return '';
+	}
 
 	$num = $matches[1][0] === 'x' ? hexdec(substr($matches[1], 1)) : (int) $matches[1];
 	
 	// it's to big for mb3?
-	if ($num > 0xFFFF && !$smcFunc['db_mb4'])
-		return $matches[0];
-	else
-		return fixchar__callback($matches);
-}
+	if ($num > 0xFFFF && !$smcFunc['db_mb4']) {
+			return $matches[0];
+	} else {
+			return fixchar__callback($matches);
+	}
+	}
 
 ?>
\ No newline at end of file

Themes/default/Admin.template.php

Braces +182 added lines, -130 removed lines

@@ -65,9 +65,10 @@ 
 										', implode(', ', $context['administrators']);
 
 	// If we have lots of admins... don't show them all.
-	if (!empty($context['more_admins_link']))
-		echo '
+	if (!empty($context['more_admins_link'])) {
+			echo '
 										(', $context['more_admins_link'], ')';
+	}
 
 	echo '
 									</div><!-- #version_details -->
@@ -84,17 +85,19 @@ 
 		foreach ($area['areas'] as $item_id => $item)
 		{
 			// No point showing the 'home' page here, we're already on it!
-			if ($area_id == 'forum' && $item_id == 'index')
-				continue;
+			if ($area_id == 'forum' && $item_id == 'index') {
+							continue;
+			}
 
 			$url = isset($item['url']) ? $item['url'] : $scripturl . '?action=admin;area=' . $item_id . (!empty($context[$context['admin_menu_name']]['extra_parameters']) ? $context[$context['admin_menu_name']]['extra_parameters'] : '');
 
-			if (!empty($item['icon_file']))
-				echo '
+			if (!empty($item['icon_file'])) {
+							echo '
 							<a href="', $url, '" class="admin_group', !empty($item['inactive']) ? ' inactive' : '', '"><img class="large_admin_menu_icon_file" src="', $item['icon_file'], '" alt="">', $item['label'], '</a>';
-			else
-				echo '
+			} else {
+							echo '
 							<a href="', $url, '"><span class="large_', $item['icon_class'], !empty($item['inactive']) ? ' inactive' : '', '"></span>', $item['label'], '</a>';
+			}
 		}
 
 		echo '
@@ -105,10 +108,11 @@ 
 					</div><!-- #admincenter -->';
 
 	// The below functions include all the scripts needed from the simplemachines.org site. The language and format are passed for internationalization.
-	if (empty($modSettings['disable_smf_js']))
-		echo '
+	if (empty($modSettings['disable_smf_js'])) {
+			echo '
 					<script src="', $scripturl, '?action=viewsmfile;filename=current-version.js"></script>
 					<script src="', $scripturl, '?action=viewsmfile;filename=latest-news.js"></script>';
+	}
 
 	// This sets the announcements and current versions themselves ;).
 	echo '
@@ -186,9 +190,10 @@ 
 								<em>', $version['version'], '</em>';
 
 		// more details for this item, show them a link
-		if ($context['can_admin'] && isset($version['more']))
-			echo
+		if ($context['can_admin'] && isset($version['more'])) {
+					echo
 								' <a href="', $scripturl, $version['more'], ';', $context['session_var'], '=', $context['session_id'], '">', $txt['version_check_more'], '</a>';
+		}
 		echo '
 								<br>';
 	}
@@ -219,21 +224,23 @@ 
 
 	foreach ($context['credits'] as $section)
 	{
-		if (isset($section['pretext']))
-			echo '
+		if (isset($section['pretext'])) {
+					echo '
 								<p>', $section['pretext'], '</p>
 								<hr>';
+		}
 
 		echo '
 								<dl>';
 
 		foreach ($section['groups'] as $group)
 		{
-			if (isset($group['title']))
-				echo '
+			if (isset($group['title'])) {
+							echo '
 									<dt>
 										<strong>', $group['title'], ':</strong>
 									</dt>';
+			}
 
 			echo '
 									<dd>', implode(', ', $group['members']), '</dd>';
@@ -242,10 +249,11 @@ 
 		echo '
 								</dl>';
 
-		if (isset($section['posttext']))
-			echo '
+		if (isset($section['posttext'])) {
+					echo '
 								<hr>
 								<p>', $section['posttext'], '</p>';
+		}
 	}
 
 	echo '
@@ -261,9 +269,10 @@ 
 						smfSupportVersions.forum = "', $context['forum_version'], '";';
 
 	// Don't worry, none of this is logged, it's just used to give information that might be of use.
-	foreach ($context['current_versions'] as $variable => $version)
-		echo '
+	foreach ($context['current_versions'] as $variable => $version) {
+			echo '
 						smfSupportVersions.', $variable, ' = "', $version['version'], '";';
+	}
 
 	// Now we just have to include the script and wait ;).
 	echo '
@@ -360,8 +369,8 @@ 
 								<tbody>';
 
 	// Loop through every source file displaying its version - using javascript.
-	foreach ($context['file_versions'] as $filename => $version)
-		echo '
+	foreach ($context['file_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -373,6 +382,7 @@ 
 											<em id="currentSources', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Default template files.
 	echo '
@@ -398,8 +408,8 @@ 
 							<table id="Default" class="table_grid">
 								<tbody>';
 
-	foreach ($context['default_template_versions'] as $filename => $version)
-		echo '
+	foreach ($context['default_template_versions'] as $filename => $version) {
+			echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -411,6 +421,7 @@ 
 											<em id="currentDefault', $filename, '">??</em>
 										</td>
 									</tr>';
+	}
 
 	// Now the language files...
 	echo '
@@ -438,8 +449,8 @@ 
 
 	foreach ($context['default_language_versions'] as $language => $files)
 	{
-		foreach ($files as $filename => $version)
-			echo '
+		foreach ($files as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '.<em>', $language, '</em>.php
@@ -451,6 +462,7 @@ 
 											<em id="current', $filename, '.', $language, '">??</em>
 										</td>
 									</tr>';
+		}
 	}
 
 	echo '
@@ -480,8 +492,8 @@ 
 							<table id="Templates" class="table_grid">
 								<tbody>';
 
-		foreach ($context['template_versions'] as $filename => $version)
-			echo '
+		foreach ($context['template_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -493,6 +505,7 @@ 
 											<em id="currentTemplates', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -522,8 +535,8 @@ 
 							<table id="Tasks" class="table_grid">
 								<tbody>';
 
-		foreach ($context['tasks_versions'] as $filename => $version)
-			echo '
+		foreach ($context['tasks_versions'] as $filename => $version) {
+					echo '
 									<tr class="windowbg">
 										<td class="half_table">
 											', $filename, '
@@ -535,6 +548,7 @@ 
 											<em id="currentTasks', $filename, '">??</em>
 										</td>
 									</tr>';
+		}
 
 		echo '
 								</tbody>
@@ -576,9 +590,10 @@ 
 {
 	global $context, $scripturl, $txt, $modSettings;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// First section is for adding/removing words from the censored list.
 	echo '
@@ -593,11 +608,12 @@ 
 								<p>', $txt['admin_censored_where'], '</p>';
 
 	// Show text boxes for censoring [bad   ] => [good  ].
-	foreach ($context['censored_words'] as $vulgar => $proper)
-		echo '
+	foreach ($context['censored_words'] as $vulgar => $proper) {
+			echo '
 								<div class="block">
 									<input type="text" name="censor_vulgar[]" value="', $vulgar, '" size="30"> =&gt; <input type="text" name="censor_proper[]" value="', $proper, '" size="30">
 								</div>';
+	}
 
 	// Now provide a way to censor more words.
 	echo '
@@ -672,27 +688,30 @@ 
 						<div class="windowbg">
 							', $txt['not_done_reason'];
 
-	if (!empty($context['continue_percent']))
-		echo '
+	if (!empty($context['continue_percent'])) {
+			echo '
 							<div class="progress_bar">
 								<span>', $context['continue_percent'], '%</span>
 								<div class="bar" style="width: ', $context['continue_percent'], '%;"></div>
 							</div>';
+	}
 
-	if (!empty($context['substep_enabled']))
-		echo '
+	if (!empty($context['substep_enabled'])) {
+			echo '
 							<div class="progress_bar progress_blue">
 								<span>', $context['substep_title'], ' (', $context['substep_continue_percent'], '%)</span>
 								<div class="bar" style="width: ', $context['substep_continue_percent'], '%;"></div>
 							</div>';
+	}
 
 	echo '
 							<form action="', $scripturl, $context['continue_get_data'], '" method="post" accept-charset="', $context['character_set'], '" name="autoSubmit" id="autoSubmit">';
 
 	// Do we have a token?
-	if (isset($context['not_done_token']) && isset($context[$context['not_done_token'] . '_token'], $context[$context['not_done_token'] . '_token_var']))
-		echo '
+	if (isset($context['not_done_token']) && isset($context[$context['not_done_token'] . '_token'], $context[$context['not_done_token'] . '_token_var'])) {
+			echo '
 							<input type="hidden" name="', $context[$context['not_done_token'] . '_token_var'], '" value="', $context[$context['not_done_token'] . '_token'], '">';
+	}
 
 	echo '
 								<input type="submit" name="cont" value="', $txt['not_done_continue'], '" class="button">
@@ -726,35 +745,40 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
-	elseif (!empty($context['saved_failed']))
-		echo '
+	} elseif (!empty($context['saved_failed'])) {
+			echo '
 					<div class="errorbox">', sprintf($txt['settings_not_saved'], $context['saved_failed']), '</div>';
+	}
 
-	if (!empty($context['settings_pre_javascript']))
-		echo '
+	if (!empty($context['settings_pre_javascript'])) {
+			echo '
 					<script>', $context['settings_pre_javascript'], '</script>';
+	}
 
-	if (!empty($context['settings_insert_above']))
-		echo $context['settings_insert_above'];
+	if (!empty($context['settings_insert_above'])) {
+			echo $context['settings_insert_above'];
+	}
 
 	echo '
 					<div id="admincenter">
 						<form id="admin_form_wrapper" action="', $context['post_url'], '" method="post" accept-charset="', $context['character_set'], '"', !empty($context['force_form_onsubmit']) ? ' onsubmit="' . $context['force_form_onsubmit'] . '"' : '', '>';
 
 	// Is there a custom title?
-	if (isset($context['settings_title']))
-		echo '
+	if (isset($context['settings_title'])) {
+			echo '
 							<div class="cat_bar">
 								<h3 class="catbg">', $context['settings_title'], '</h3>
 							</div>';
+	}
 
 	// Have we got a message to display?
-	if (!empty($context['settings_message']))
-		echo '
+	if (!empty($context['settings_message'])) {
+			echo '
 							<div class="information">', $context['settings_message'], '</div>';
+	}
 
 	// Now actually loop through all the variables.
 	$is_open = false;
@@ -807,8 +831,9 @@ 
 		// Hang about? Are you pulling my leg - a callback?!
 		if (is_array($config_var) && $config_var['type'] == 'callback')
 		{
-			if (function_exists('template_callback_' . $config_var['name']))
-				call_user_func('template_callback_' . $config_var['name']);
+			if (function_exists('template_callback_' . $config_var['name'])) {
+							call_user_func('template_callback_' . $config_var['name']);
+			}
 
 			continue;
 		}
@@ -838,9 +863,10 @@ 
 				$text_types = array('color', 'date', 'datetime', 'datetime-local', 'email', 'month', 'time');
 
 				// Show the [?] button.
-				if ($config_var['help'])
-					echo '
+				if ($config_var['help']) {
+									echo '
 										<a id="setting_', $config_var['name'], '_help" href="', $scripturl, '?action=helpadmin;help=', $config_var['help'], '" onclick="return reqOverlayDiv(this.href);"><span class="generic_icons help" title="', $txt['help'], '"></span></a> ';
+				}
 
 				echo '
 										<a id="setting_', $config_var['name'], '"></a> <span', ($config_var['disabled'] ? ' style="color: #777777;"' : ($config_var['invalid'] ? ' class="error"' : '')), '><label for="', $config_var['name'], '">', $config_var['label'], '</label>', $subtext, ($config_var['type'] == 'password' ? '<br><em>' . $txt['admin_confirm_password'] . '</em>' : ''), '</span>
@@ -849,23 +875,26 @@ 
 										$config_var['preinput'];
 
 				// Show a check box.
-				if ($config_var['type'] == 'check')
-					echo '
+				if ($config_var['type'] == 'check') {
+									echo '
 										<input type="checkbox"', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '"', ($config_var['value'] ? ' checked' : ''), ' value="1">';
+				}
 				// Escape (via htmlspecialchars.) the text box.
-				elseif ($config_var['type'] == 'password')
-					echo '
+				elseif ($config_var['type'] == 'password') {
+									echo '
 										<input type="password"', $disabled, $javascript, ' name="', $config_var['name'], '[0]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), ' value="*#fakepass#*" onfocus="this.value = \'\'; this.form.', $config_var['name'], '.disabled = false;"><br>
 										<input type="password" disabled id="', $config_var['name'], '" name="', $config_var['name'], '[1]"', ($config_var['size'] ? ' size="' . $config_var['size'] . '"' : ''), '>';
+				}
 				// Show a selection box.
 				elseif ($config_var['type'] == 'select')
 				{
 					echo '
 										<select name="', $config_var['name'], '" id="', $config_var['name'], '" ', $javascript, $disabled, (!empty($config_var['multiple']) ? ' multiple="multiple"' : ''), (!empty($config_var['multiple']) && !empty($config_var['size']) ? ' size="' . $config_var['size'] . '"' : ''), '>';
 
-					foreach ($config_var['data'] as $option)
-						echo '
+					foreach ($config_var['data'] as $option) {
+											echo '
 											<option value="', $option[0], '"', (!empty($config_var['value']) && ($option[0] == $config_var['value'] || (!empty($config_var['multiple']) && in_array($option[0], $config_var['value']))) ? ' selected' : ''), '>', $option[1], '</option>';
+					}
 					echo '
 										</select>';
 				}
@@ -882,16 +911,18 @@ 
 
 					foreach ($context['board_list'] as $id_cat => $cat)
 					{
-						if (!$first)
-							echo '
+						if (!$first) {
+													echo '
 											<hr>';
+						}
 						echo '
 											<strong>', $cat['name'], '</strong>
 											<ul>';
 
-						foreach ($cat['boards'] as $id_board => $brd)
-							echo '
+						foreach ($cat['boards'] as $id_board => $brd) {
+													echo '
 												<li><label><input type="checkbox" name="', $config_var['name'], '[', $brd['id'], ']" value="1"', in_array($brd['id'], $config_var['value']) ? ' checked' : '', '> ', $brd['child_level'] > 0 ? str_repeat('&nbsp; &nbsp;', $brd['child_level']) : '', $brd['name'], '</label></li>';
+						}
 
 						echo '
 											</ul>';
@@ -901,12 +932,14 @@ 
 										</fieldset>';
 				}
 				// Text area?
-				elseif ($config_var['type'] == 'large_text')
-					echo '
+				elseif ($config_var['type'] == 'large_text') {
+									echo '
 										<textarea rows="', (!empty($config_var['size']) ? $config_var['size'] : (!empty($config_var['rows']) ? $config_var['rows'] : 4)), '" cols="', (!empty($config_var['cols']) ? $config_var['cols'] : 30), '" ', $javascript, $disabled, ' name="', $config_var['name'], '" id="', $config_var['name'], '">', $config_var['value'], '</textarea>';
+				}
 				// Permission group?
-				elseif ($config_var['type'] == 'permissions')
-					theme_inline_permissions($config_var['name']);
+				elseif ($config_var['type'] == 'permissions') {
+									theme_inline_permissions($config_var['name']);
+				}
 
 				// BBC selection?
 				elseif ($config_var['type'] == 'bbc')
@@ -918,22 +951,24 @@ 
 
 					foreach ($context['bbc_columns'] as $bbcColumn)
 					{
-						foreach ($bbcColumn as $bbcTag)
-							echo '
+						foreach ($bbcColumn as $bbcTag) {
+													echo '
 												<li class="list_bbc floatleft">
 													<input type="checkbox" name="', $config_var['name'], '_enabledTags[]" id="tag_', $config_var['name'], '_', $bbcTag['tag'], '" value="', $bbcTag['tag'], '"', !in_array($bbcTag['tag'], $context['bbc_sections'][$config_var['name']]['disabled']) ? ' checked' : '', '> <label for="tag_', $config_var['name'], '_', $bbcTag['tag'], '">', $bbcTag['tag'], '</label>', $bbcTag['show_help'] ? ' (<a href="' . $scripturl . '?action=helpadmin;help=tag_' . $bbcTag['tag'] . '" onclick="return reqOverlayDiv(this.href);">?</a>)' : '', '
 												</li>';
+						}
 					}
 					echo '					</ul>
 											<input type="checkbox" id="bbc_', $config_var['name'], '_select_all" onclick="invertAll(this, this.form, \'', $config_var['name'], '_enabledTags\');"', $context['bbc_sections'][$config_var['name']]['all_selected'] ? ' checked' : '', '> <label for="bbc_', $config_var['name'], '_select_all"><em>', $txt['bbcTagsToUse_select_all'], '</em></label>
 										</fieldset>';
 				}
 				// A simple message?
-				elseif ($config_var['type'] == 'var_message')
-					echo '
+				elseif ($config_var['type'] == 'var_message') {
+									echo '
 										<div', !empty($config_var['name']) ? ' id="' . $config_var['name'] . '"' : '', '>
 											', $config_var['var_message'], '
 										</div>';
+				}
 				// Assume it must be a text box
 				else
 				{
@@ -958,62 +993,70 @@ 
 											' . $config_var['postinput'] : '','
 									</dd>';
 			}
-		}
-		else
+		} else
 		{
 			// Just show a separator.
-			if ($config_var == '')
-				echo '
+			if ($config_var == '') {
+							echo '
 								</dl>
 								<hr>
 								<dl class="settings">';
-			else
-				echo '
+			} else {
+							echo '
 									<dd>
 										<strong>' . $config_var . '</strong>
 									</dd>';
+			}
 		}
 	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 								</dl>';
+	}
 
-	if (empty($context['settings_save_dont_show']))
-		echo '
+	if (empty($context['settings_save_dont_show'])) {
+			echo '
 								<input type="submit" value="', $txt['save'], '"', (!empty($context['save_disabled']) ? ' disabled' : ''), (!empty($context['settings_save_onclick']) ? ' onclick="' . $context['settings_save_onclick'] . '"' : ''), ' class="button">';
+	}
 
-	if ($is_open)
-		echo '
+	if ($is_open) {
+			echo '
 							</div><!-- .windowbg -->';
+	}
 
 
 	// At least one token has to be used!
-	if (isset($context['admin-ssc_token']))
-		echo '
+	if (isset($context['admin-ssc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-ssc_token_var'], '" value="', $context['admin-ssc_token'], '">';
+	}
 
-	if (isset($context['admin-dbsc_token']))
-		echo '
+	if (isset($context['admin-dbsc_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-dbsc_token_var'], '" value="', $context['admin-dbsc_token'], '">';
+	}
 
-	if (isset($context['admin-mp_token']))
-		echo '
+	if (isset($context['admin-mp_token'])) {
+			echo '
 							<input type="hidden" name="', $context['admin-mp_token_var'], '" value="', $context['admin-mp_token'], '">';
+	}
 
 	echo '
 							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 						</form>
 					</div><!-- #admincenter -->';
 
-	if (!empty($context['settings_post_javascript']))
-		echo '
+	if (!empty($context['settings_post_javascript'])) {
+			echo '
 					<script>
 						', $context['settings_post_javascript'], '
 					</script>';
+	}
 
-	if (!empty($context['settings_insert_below']))
-		echo $context['settings_insert_below'];
+	if (!empty($context['settings_insert_below'])) {
+			echo $context['settings_insert_below'];
+	}
 
 	// We may have added a board listing. If we did, we need to make it work.
 	addInlineJavascript('
@@ -1036,9 +1079,10 @@ 
 {
 	global $context, $txt;
 
-	if (!empty($context['saved_successful']))
-		echo '
+	if (!empty($context['saved_successful'])) {
+			echo '
 					<div class="infobox">', $txt['settings_saved'], '</div>';
+	}
 
 	// Standard fields.
 	template_show_list('standard_profile_fields');
@@ -1072,11 +1116,12 @@ 
 	{
 		loadLanguage('Errors');
 
-		if (isset($txt['custom_option_' . $_GET['msg']]))
-			echo '
+		if (isset($txt['custom_option_' . $_GET['msg']])) {
+					echo '
 					<div class="errorbox">',
 						$txt['custom_option_' . $_GET['msg']], '
 					</div>';
+		}
 	}
 
 	echo '
@@ -1143,9 +1188,10 @@ 
 										<dd>
 											<select name="placement" id="placement">';
 
-	foreach ($context['cust_profile_fields_placement'] as $order => $name)
-		echo '
+	foreach ($context['cust_profile_fields_placement'] as $order => $name) {
+			echo '
 												<option value="', $order, '"', $context['field']['placement'] == $order ? ' selected' : '', '>', $txt['custom_profile_placement_' . $name], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1169,9 +1215,10 @@ 
 										<dd>
 											<select name="field_type" id="field_type" onchange="updateInputBoxes();">';
 
-	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type)
-		echo '
+	foreach (array('text', 'textarea', 'select', 'radio', 'check') as $field_type) {
+			echo '
 												<option value="', $field_type, '"', $context['field']['type'] == $field_type ? ' selected' : '', '>', $txt['custom_profile_type_' . $field_type], '</option>';
+	}
 
 	echo '
 											</select>
@@ -1203,9 +1250,10 @@ 
 										</dt>
 										<dd id="options_dd">';
 
-	foreach ($context['field']['options'] as $k => $option)
-		echo '
+	foreach ($context['field']['options'] as $k => $option) {
+			echo '
 											', $k == 0 ? '' : '<br>', '<input type="radio" name="default_select" value="', $k, '"', $context['field']['default_select'] == $option ? ' checked' : '', '><input type="text" name="select_option[', $k, ']" value="', $option, '">';
+	}
 
 	echo '
 											<span id="addopt"></span>
@@ -1269,9 +1317,10 @@ 
 								</fieldset>
 								<input type="submit" name="save" value="', $txt['save'], '" class="button">';
 
-	if ($context['fid'])
-		echo '
+	if ($context['fid']) {
+			echo '
 								<input type="submit" name="delete" value="', $txt['delete'], '" data-confirm="', $txt['custom_edit_delete_sure'], '" class="button you_sure">';
+	}
 
 	echo '
 							</div><!-- .windowbg -->
@@ -1318,8 +1367,7 @@ 
 							<p class="centertext">
 								<strong>', $txt['admin_search_results_none'], '</strong>
 							</p>';
-	}
-	else
+	} else
 	{
 		echo '
 							<ol class="search_results">';
@@ -1346,9 +1394,10 @@ 
 								<li>
 									<a href="', $result['url'], '"><strong>', $result['name'], '</strong></a> [', isset($txt['admin_search_section_' . $result['type']]) ? $txt['admin_search_section_' . $result['type']] : $result['type'], ']';
 
-				if ($result['help'])
-					echo '
+				if ($result['help']) {
+									echo '
 									<p class="double_height">', $result['help'], '</p>';
+				}
 
 				echo '
 								</li>';
@@ -1388,10 +1437,11 @@ 
 									<strong>', $txt['setup_verification_answer'], '</strong>
 								</dd>';
 
-		if (!empty($context['qa_by_lang'][$lang_id]))
-			foreach ($context['qa_by_lang'][$lang_id] as $q_id)
+		if (!empty($context['qa_by_lang'][$lang_id])) {
+					foreach ($context['qa_by_lang'][$lang_id] as $q_id)
 			{
 				$question = $context['question_answers'][$q_id];
+		}
 
 				echo '
 								<dt>
@@ -1399,9 +1449,10 @@ 
 								</dt>
 								<dd>';
 
-				foreach ($question['answers'] as $answer)
-					echo '
+				foreach ($question['answers'] as $answer) {
+									echo '
 									<input type="text" name="answer[', $lang_id, '][', $q_id, '][]" value="', $answer, '" size="50" class="verification_answer">';
+				}
 
 				echo '
 									<div class="qa_add_answer"><a href="javascript:void(0);">[ ', $txt['setup_verification_add_answer'], ' ]</a></div>
@@ -1440,11 +1491,12 @@ 
 							', $txt['errors_found'], ':
 							<ul>';
 
-			foreach ($context['repair_errors'] as $error)
-				echo '
+			foreach ($context['repair_errors'] as $error) {
+							echo '
 								<li>
 									', $error, '
 								</li>';
+			}
 
 			echo '
 							</ul>
@@ -1454,15 +1506,14 @@ 
 							<p class="padding">
 								<strong><a href="', $scripturl, '?action=admin;area=repairboards;fixErrors;', $context['session_var'], '=', $context['session_id'], '">', $txt['yes'], '</a> - <a href="', $scripturl, '?action=admin;area=maintain">', $txt['no'], '</a></strong>
 							</p>';
-		}
-		else
-			echo '
+		} else {
+					echo '
 							<p>', $txt['maintain_no_errors'], '</p>
 							<p class="padding">
 								<a href="', $scripturl, '?action=admin;area=maintain;sa=routine">', $txt['maintain_return'], '</a>
 							</p>';
-	}
-	else
+		}
+	} else
 	{
 		if (!empty($context['redirect_to_recount']))
 		{
@@ -1474,8 +1525,7 @@ 
 								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 								<input type="submit" name="recount" id="recount_now" value="', $txt['errors_recount_now'], '">
 							</form>';
-		}
-		else
+		} else
 		{
 			echo '
 							<p>', $txt['errors_fixed'], '</p>
@@ -1566,9 +1616,10 @@ 
 								<tr class="windowbg">
 									<td class="equal_table">', $key, '</td>';
 
-				foreach ($setting as $key_lm => $value)
-					echo '
+				foreach ($setting as $key_lm => $value) {
+									echo '
 									<td class="equal_table">', $value, '</td>';
+				}
 
 				echo '
 								</tr>';
@@ -1628,8 +1679,8 @@ 
 {
 	global $context, $txt;
 
-	if ($context['user']['is_admin'])
-		echo '
+	if ($context['user']['is_admin']) {
+			echo '
 								<span class="floatright admin_search">
 									<span class="generic_icons filter centericon"></span>
 									<input type="search" name="search_term" placeholder="', $txt['admin_search'], '">
@@ -1640,6 +1691,7 @@ 
 									</select>
 									<input type="submit" name="search_go" id="search_go" value="', $txt['admin_search_go'], '" class="button">
 								</span>';
-}
+	}
+	}
 
 ?>
\ No newline at end of file