SimpleMachines / SMF2.1

Sources/ScheduledTasks.php

Braces +277 added lines, -201 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * This function works out what to do!
@@ -24,9 +25,9 @@ 
 	global $time_start, $smcFunc;
 
 	// Special case for doing the mail queue.
-	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq')
-		ReduceMailQueue();
-	else
+	if (isset($_GET['scheduled']) && $_GET['scheduled'] == 'mailq') {
+			ReduceMailQueue();
+	} else
 	{
 		$task_string = '';
 
@@ -53,18 +54,20 @@ 
 
 			// How long in seconds it the gap?
 			$duration = $row['time_regularity'];
-			if ($row['time_unit'] == 'm')
-				$duration *= 60;
-			elseif ($row['time_unit'] == 'h')
-				$duration *= 3600;
-			elseif ($row['time_unit'] == 'd')
-				$duration *= 86400;
-			elseif ($row['time_unit'] == 'w')
-				$duration *= 604800;
+			if ($row['time_unit'] == 'm') {
+							$duration *= 60;
+			} elseif ($row['time_unit'] == 'h') {
+							$duration *= 3600;
+			} elseif ($row['time_unit'] == 'd') {
+							$duration *= 86400;
+			} elseif ($row['time_unit'] == 'w') {
+							$duration *= 604800;
+			}
 
 			// If we were really late running this task actually skip the next one.
-			if (time() + ($duration / 2) > $next_time)
-				$next_time += $duration;
+			if (time() + ($duration / 2) > $next_time) {
+							$next_time += $duration;
+			}
 
 			// Update it now, so no others run this!
 			$smcFunc['db_query']('', '
@@ -81,16 +84,19 @@ 
 			$affected_rows = $smcFunc['db_affected_rows']();
 
 			// What kind of task are we handling?
-			if (!empty($row['callable']))
-				$task_string = $row['callable'];
+			if (!empty($row['callable'])) {
+							$task_string = $row['callable'];
+			}
 
 			// Default SMF task or old mods?
-			elseif (function_exists('scheduled_' . $row['task']))
-				$task_string = 'scheduled_' . $row['task'];
+			elseif (function_exists('scheduled_' . $row['task'])) {
+							$task_string = 'scheduled_' . $row['task'];
+			}
 
 			// One last resource, the task name.
-			elseif (!empty($row['task']))
-				$task_string = $row['task'];
+			elseif (!empty($row['task'])) {
+							$task_string = $row['task'];
+			}
 
 			// The function must exist or we are wasting our time, plus do some timestamp checking, and database check!
 			if (!empty($task_string) && (!isset($_GET['ts']) || $_GET['ts'] == $row['next_time']) && $affected_rows)
@@ -101,11 +107,11 @@ 
 				$callable_task = call_helper($task_string, true);
 
 				// Perform the task.
-				if (!empty($callable_task))
-					$completed = call_user_func($callable_task);
-
-				else
-					$completed = false;
+				if (!empty($callable_task)) {
+									$completed = call_user_func($callable_task);
+				} else {
+									$completed = false;
+				}
 
 				// Log that we did it ;)
 				if ($completed)
@@ -138,18 +144,20 @@ 
 			)
 		);
 		// No new task scheduled yet?
-		if ($smcFunc['db_num_rows']($request) === 0)
-			$nextEvent = time() + 86400;
-		else
-			list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					$nextEvent = time() + 86400;
+		} else {
+					list ($nextEvent) = $smcFunc['db_fetch_row']($request);
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateSettings(array('next_task_time' => $nextEvent));
 	}
 
 	// Shall we return?
-	if (!isset($_GET['scheduled']))
-		return true;
+	if (!isset($_GET['scheduled'])) {
+			return true;
+	}
 
 	// Finally, send some stuff...
 	header('expires: Mon, 26 Jul 1997 05:00:00 GMT');
@@ -181,16 +189,18 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// If this is no longer around we'll ignore it.
-		if (empty($row['id_topic']))
-			continue;
+		if (empty($row['id_topic'])) {
+					continue;
+		}
 
 		// What type is it?
-		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg'])
-			$type = 'topic';
-		elseif ($row['id_attach'])
-			$type = 'attach';
-		else
-			$type = 'msg';
+		if ($row['id_first_msg'] && $row['id_first_msg'] == $row['id_msg']) {
+					$type = 'topic';
+		} elseif ($row['id_attach']) {
+					$type = 'attach';
+		} else {
+					$type = 'msg';
+		}
 
 		// Add it to the array otherwise.
 		$notices[$row['id_board']][$type][] = array(
@@ -211,8 +221,9 @@ 
 	);
 
 	// If nothing quit now.
-	if (empty($notices))
-		return true;
+	if (empty($notices)) {
+			return true;
+	}
 
 	// Now we need to think about finding out *who* can approve - this is hard!
 
@@ -231,14 +242,16 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Sorry guys, but we have to ignore guests AND members - it would be too many otherwise.
-		if ($row['id_group'] < 2)
-			continue;
+		if ($row['id_group'] < 2) {
+					continue;
+		}
 
 		$perms[$row['id_profile']][$row['add_deny'] ? 'add' : 'deny'][] = $row['id_group'];
 
 		// Anyone who can access has to be considered.
-		if ($row['add_deny'])
-			$addGroups[] = $row['id_group'];
+		if ($row['add_deny']) {
+					$addGroups[] = $row['id_group'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -283,8 +296,9 @@ 
 		if (!empty($row['mod_prefs']))
 		{
 			list(,, $pref_binary) = explode('|', $row['mod_prefs']);
-			if (!($pref_binary & 4))
-				continue;
+			if (!($pref_binary & 4)) {
+							continue;
+			}
 		}
 
 		$members[$row['id_member']] = array(
@@ -309,8 +323,9 @@ 
 		$emailbody = '';
 
 		// Load the language file as required.
-		if (empty($current_language) || $current_language != $member['language'])
-			$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		if (empty($current_language) || $current_language != $member['language']) {
+					$current_language = loadLanguage('EmailTemplates', $member['language'], false);
+		}
 
 		// Loop through each notice...
 		foreach ($notices as $board => $notice)
@@ -318,29 +333,34 @@ 
 			$access = false;
 
 			// Can they mod in this board?
-			if (isset($mods[$id][$board]))
-				$access = true;
+			if (isset($mods[$id][$board])) {
+							$access = true;
+			}
 
 			// Do the group check...
 			if (!$access && isset($perms[$profiles[$board]]['add']))
 			{
 				// They can access?!
-				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups']))
-					$access = true;
+				if (array_intersect($perms[$profiles[$board]]['add'], $member['groups'])) {
+									$access = true;
+				}
 
 				// If they have deny rights don't consider them!
-				if (isset($perms[$profiles[$board]]['deny']))
-					if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
+				if (isset($perms[$profiles[$board]]['deny'])) {
+									if (array_intersect($perms[$profiles[$board]]['deny'], $member['groups']))
 						$access = false;
+				}
 			}
 
 			// Finally, fix it for admins!
-			if (in_array(1, $member['groups']))
-				$access = true;
+			if (in_array(1, $member['groups'])) {
+							$access = true;
+			}
 
 			// If they can't access it then give it a break!
-			if (!$access)
-				continue;
+			if (!$access) {
+							continue;
+			}
 
 			foreach ($notice as $type => $items)
 			{
@@ -348,15 +368,17 @@ 
 				$emailbody .= $txt['scheduled_approval_email_' . $type] . "\n" .
 					'------------------------------------------------------' . "\n";
 
-				foreach ($items as $item)
-					$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				foreach ($items as $item) {
+									$emailbody .= $item['subject'] . ' - ' . $item['href'] . "\n";
+				}
 
 				$emailbody .= "\n";
 			}
 		}
 
-		if ($emailbody == '')
-			continue;
+		if ($emailbody == '') {
+					continue;
+		}
 
 		$replacements = array(
 			'REALNAME' => $member['name'],
@@ -397,8 +419,9 @@ 
 			)
 		);
 		$members = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$members[$row['id_member']] = $row['warning'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$members[$row['id_member']] = $row['warning'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Have some members to check?
@@ -420,17 +443,18 @@ 
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
 				// More than 24 hours ago?
-				if ($row['last_warning'] <= time() - 86400)
-					$member_changes[] = array(
+				if ($row['last_warning'] <= time() - 86400) {
+									$member_changes[] = array(
 						'id' => $row['id_recipient'],
 						'warning' => $members[$row['id_recipient']] >= $modSettings['warning_decrement'] ? $members[$row['id_recipient']] - $modSettings['warning_decrement'] : 0,
 					);
+				}
 			}
 			$smcFunc['db_free_result']($request);
 
 			// Have some members to change?
-			if (!empty($member_changes))
-				foreach ($member_changes as $change)
+			if (!empty($member_changes)) {
+							foreach ($member_changes as $change)
 					$smcFunc['db_query']('', '
 						UPDATE {db_prefix}members
 						SET warning = {int:warning}
@@ -440,6 +464,7 @@ 
 							'id_member' => $change['id'],
 						)
 					);
+			}
 		}
 	}
 
@@ -506,15 +531,17 @@ 
 
 		// Store this useful data!
 		$boards[$row['id_board']] = $row['id_board'];
-		if ($row['id_topic'])
-			$notify['topics'][$row['id_topic']][] = $row['id_member'];
-		else
-			$notify['boards'][$row['id_board']][] = $row['id_member'];
+		if ($row['id_topic']) {
+					$notify['topics'][$row['id_topic']][] = $row['id_member'];
+		} else {
+					$notify['boards'][$row['id_board']][] = $row['id_member'];
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Just get the board names.
 	$request = $smcFunc['db_query']('', '
@@ -526,12 +553,14 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[$row['id_board']] = $row['name'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[$row['id_board']] = $row['name'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($boards))
-		return true;
+	if (empty($boards)) {
+			return true;
+	}
 
 	// Get the actual topics...
 	$request = $smcFunc['db_query']('', '
@@ -551,52 +580,57 @@ 
 	$types = array();
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
-		if (!isset($types[$row['note_type']][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']] = array(
+		if (!isset($types[$row['note_type']][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']] = array(
 				'lines' => array(),
 				'name' => $row['board_name'],
 				'id' => $row['id_board'],
 			);
+		}
 
 		if ($row['note_type'] == 'reply')
 		{
-			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
-			else
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['count']++;
+			} else {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'count' => 1,
 				);
-		}
-		elseif ($row['note_type'] == 'topic')
+			}
+		} elseif ($row['note_type'] == 'topic')
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 				);
-		}
-		else
+			}
+		} else
 		{
-			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]))
-				$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
+			if (!isset($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']])) {
+							$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']] = array(
 					'id' => $row['id_topic'],
 					'subject' => un_htmlspecialchars($row['subject']),
 					'starter' => $row['id_member_started'],
 				);
+			}
 		}
 
 		$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array();
-		if (!empty($notify['topics'][$row['id_topic']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
-		if (!empty($notify['boards'][$row['id_board']]))
-			$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		if (!empty($notify['topics'][$row['id_topic']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['topics'][$row['id_topic']]);
+		}
+		if (!empty($notify['boards'][$row['id_board']])) {
+					$types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'] = array_merge($types[$row['note_type']][$row['id_board']]['lines'][$row['id_topic']]['members'], $notify['boards'][$row['id_board']]);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($types))
-		return true;
+	if (empty($types)) {
+			return true;
+	}
 
 	// Let's load all the languages into a cache thingy.
 	$langtxt = array();
@@ -637,8 +671,9 @@ 
 		$notify_types = !empty($prefs[$mid]['msg_notify_type']) ? $prefs[$mid]['msg_notify_type'] : 1;
 
 		// Did they not elect to choose this?
-		if ($frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4)
-			continue;
+		if ($frequency == 4 && !$is_weekly || $frequency == 3 && $is_weekly || $notify_types == 4) {
+					continue;
+		}
 
 		// Right character set!
 		$context['character_set'] = empty($modSettings['global_character_set']) ? $langtxt[$lang]['char_set'] : $modSettings['global_character_set'];
@@ -654,39 +689,43 @@ 
 		if (isset($types['topic']))
 		{
 			$titled = false;
-			foreach ($types['topic'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['topic'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_topics'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . sprintf($langtxt[$lang]['topic_lines'], $topic['subject'], $board['name']);
 					}
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// What about replies?
 		if (isset($types['reply']))
 		{
 			$titled = false;
-			foreach ($types['reply'] as $id => $board)
-				foreach ($board['lines'] as $topic)
+			foreach ($types['reply'] as $id => $board) {
+							foreach ($board['lines'] as $topic)
 					if (in_array($mid, $topic['members']))
 					{
 						if (!$titled)
 						{
 							$email['body'] .= "\n" . $langtxt[$lang]['new_replies'] . ':' . "\n" . '-----------------------------------------------';
+			}
 							$titled = true;
 						}
 						$email['body'] .= "\n" . ($topic['count'] == 1 ? sprintf($langtxt[$lang]['replies_one'], $topic['subject']) : sprintf($langtxt[$lang]['replies_many'], $topic['count'], $topic['subject']));
 					}
 
-			if ($titled)
-				$email['body'] .= "\n";
+			if ($titled) {
+							$email['body'] .= "\n";
+			}
 		}
 
 		// Finally, moderation actions!
@@ -695,24 +734,27 @@ 
 			$titled = false;
 			foreach ($types as $note_type => $type)
 			{
-				if ($note_type == 'topic' || $note_type == 'reply')
-					continue;
+				if ($note_type == 'topic' || $note_type == 'reply') {
+									continue;
+				}
 
-				foreach ($type as $id => $board)
-					foreach ($board['lines'] as $topic)
+				foreach ($type as $id => $board) {
+									foreach ($board['lines'] as $topic)
 						if (in_array($mid, $topic['members']))
 						{
 							if (!$titled)
 							{
 								$email['body'] .= "\n" . $langtxt[$lang]['mod_actions'] . ':' . "\n" . '-----------------------------------------------';
+				}
 								$titled = true;
 							}
 							$email['body'] .= "\n" . sprintf($langtxt[$lang][$note_type], $topic['subject']);
 						}
 			}
 		}
-		if ($titled)
-			$email['body'] .= "\n";
+		if ($titled) {
+					$email['body'] .= "\n";
+		}
 
 		// Then just say our goodbyes!
 		$email['body'] .= "\n\n" . $txt['regards_team'];
@@ -740,8 +782,7 @@ 
 				'not_daily' => 0,
 			)
 		);
-	}
-	else
+	} else
 	{
 		// Clear any only weekly ones, and stop us from sending daily again.
 		$smcFunc['db_query']('', '
@@ -803,16 +844,19 @@ 
 	global $modSettings, $smcFunc, $sourcedir;
 
 	// Are we intending another script to be sending out the queue?
-	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send))
-		return false;
+	if (!empty($modSettings['mail_queue_use_cron']) && empty($force_send)) {
+			return false;
+	}
 
 	// By default send 5 at once.
-	if (!$number)
-		$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	if (!$number) {
+			$number = empty($modSettings['mail_quantity']) ? 5 : $modSettings['mail_quantity'];
+	}
 
 	// If we came with a timestamp, and that doesn't match the next event, then someone else has beaten us.
-	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send))
-		return false;
+	if (isset($_GET['ts']) && $_GET['ts'] != $modSettings['mail_next_send'] && empty($force_send)) {
+			return false;
+	}
 
 	// By default move the next sending on by 10 seconds, and require an affected row.
 	if (!$override_limit)
@@ -829,8 +873,9 @@ 
 				'last_send' => $modSettings['mail_next_send'],
 			)
 		);
-		if ($smcFunc['db_affected_rows']() == 0)
-			return false;
+		if ($smcFunc['db_affected_rows']() == 0) {
+					return false;
+		}
 		$modSettings['mail_next_send'] = time() + $delay;
 	}
 
@@ -851,8 +896,9 @@ 
 			$mn += $number;
 		}
 		// No more I'm afraid, return!
-		else
-			return false;
+		else {
+					return false;
+		}
 
 		// Reflect that we're about to send some, do it now to be safe.
 		updateSettings(array('mail_recent' => $mt . '|' . $mn));
@@ -887,14 +933,15 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// Delete, delete, delete!!!
-	if (!empty($ids))
-		$smcFunc['db_query']('', '
+	if (!empty($ids)) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}mail_queue
 			WHERE id_mail IN ({array_int:mail_list})',
 			array(
 				'mail_list' => $ids,
 			)
 		);
+	}
 
 	// Don't believe we have any left?
 	if (count($ids) < $number)
@@ -912,11 +959,13 @@ 
 		);
 	}
 
-	if (empty($ids))
-		return false;
+	if (empty($ids)) {
+			return false;
+	}
 
-	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '')
-		require_once($sourcedir . '/Subs-Post.php');
+	if (!empty($modSettings['mail_type']) && $modSettings['smtp_host'] != '') {
+			require_once($sourcedir . '/Subs-Post.php');
+	}
 
 	// Send each email, yea!
 	$failed_emails = array();
@@ -936,15 +985,17 @@ 
 
 			// Try to stop a timeout, this would be bad...
 			@set_time_limit(300);
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
+		} else {
+					$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 		}
-		else
-			$result = smtp_mail(array($email['to']), $email['subject'], $email['body'], $email['headers']);
 
 		// Hopefully it sent?
-		if (!$result)
-			$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		if (!$result) {
+					$failed_emails[] = array($email['to'], $email['body'], $email['subject'], $email['headers'], $email['send_html'], $email['time_sent'], $email['private']);
+		}
 	}
 
 	// Any emails that didn't send?
@@ -959,8 +1010,8 @@ 
 		);
 
 		// If we have failed to many times, tell mail to wait a bit and try again.
-		if ($modSettings['mail_failed_attempts'] > 5)
-			$smcFunc['db_query']('', '
+		if ($modSettings['mail_failed_attempts'] > 5) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}settings
 				SET value = {string:next_mail_send}
 				WHERE variable = {literal:mail_next_send}
@@ -969,6 +1020,7 @@ 
 					'next_mail_send' => time() + 60,
 					'last_send' => $modSettings['mail_next_send'],
 			));
+		}
 
 		// Add our email back to the queue, manually.
 		$smcFunc['db_insert']('insert',
@@ -981,8 +1033,8 @@ 
 		return false;
 	}
 	// We where unable to send the email, clear our failed attempts.
-	elseif (!empty($modSettings['mail_failed_attempts']))
-		$smcFunc['db_query']('', '
+	elseif (!empty($modSettings['mail_failed_attempts'])) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}settings
 			SET value = {string:zero}
 			WHERE variable = {string:mail_failed_attempts}',
@@ -990,6 +1042,7 @@ 
 				'zero' => '0',
 				'mail_failed_attempts' => 'mail_failed_attempts',
 		));
+	}
 
 	// Had something to send...
 	return true;
@@ -1006,16 +1059,18 @@ 
 	global $modSettings, $smcFunc;
 
 	$task_query = '';
-	if (!is_array($tasks))
-		$tasks = array($tasks);
+	if (!is_array($tasks)) {
+			$tasks = array($tasks);
+	}
 
 	// Actually have something passed?
 	if (!empty($tasks))
 	{
-		if (!isset($tasks[0]) || is_numeric($tasks[0]))
-			$task_query = ' AND id_task IN ({array_int:tasks})';
-		else
-			$task_query = ' AND task IN ({array_string:tasks})';
+		if (!isset($tasks[0]) || is_numeric($tasks[0])) {
+					$task_query = ' AND id_task IN ({array_int:tasks})';
+		} else {
+					$task_query = ' AND task IN ({array_string:tasks})';
+		}
 	}
 	$nextTaskTime = empty($tasks) ? time() + 86400 : $modSettings['next_task_time'];
 
@@ -1036,20 +1091,22 @@ 
 		$next_time = next_time($row['time_regularity'], $row['time_unit'], $row['time_offset']);
 
 		// Only bother moving the task if it's out of place or we're forcing it!
-		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time())
-			$tasks[$row['id_task']] = $next_time;
-		else
-			$next_time = $row['next_time'];
+		if ($forceUpdate || $next_time < $row['next_time'] || $row['next_time'] < time()) {
+					$tasks[$row['id_task']] = $next_time;
+		} else {
+					$next_time = $row['next_time'];
+		}
 
 		// If this is sooner than the current next task, make this the next task.
-		if ($next_time < $nextTaskTime)
-			$nextTaskTime = $next_time;
+		if ($next_time < $nextTaskTime) {
+					$nextTaskTime = $next_time;
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
 	// Now make the changes!
-	foreach ($tasks as $id => $time)
-		$smcFunc['db_query']('', '
+	foreach ($tasks as $id => $time) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}scheduled_tasks
 			SET next_time = {int:next_time}
 			WHERE id_task = {int:id_task}',
@@ -1058,11 +1115,13 @@ 
 				'id_task' => $id,
 			)
 		);
+	}
 
 	// If the next task is now different update.
-	if ($modSettings['next_task_time'] != $nextTaskTime)
-		updateSettings(array('next_task_time' => $nextTaskTime));
-}
+	if ($modSettings['next_task_time'] != $nextTaskTime) {
+			updateSettings(array('next_task_time' => $nextTaskTime));
+	}
+	}
 
 /**
  * Simply returns a time stamp of the next instance of these time parameters.
@@ -1075,8 +1134,9 @@ 
 function next_time($regularity, $unit, $offset)
 {
 	// Just in case!
-	if ($regularity == 0)
-		$regularity = 2;
+	if ($regularity == 0) {
+			$regularity = 2;
+	}
 
 	$curMin = date('i', time());
 
@@ -1086,15 +1146,16 @@ 
 		$off = date('i', $offset);
 
 		// If it's now just pretend it ain't,
-		if ($off == $curMin)
-			$next_time = time() + $regularity;
-		else
+		if ($off == $curMin) {
+					$next_time = time() + $regularity;
+		} else
 		{
 			// Make sure that the offset is always in the past.
 			$off = $off > $curMin ? $off - 60 : $off;
 
-			while ($off <= $curMin)
-				$off += $regularity;
+			while ($off <= $curMin) {
+							$off += $regularity;
+			}
 
 			// Now we know when the time should be!
 			$next_time = time() + 60 * ($off - $curMin);
@@ -1114,11 +1175,13 @@ 
 		// Default we'll jump in hours.
 		$applyOffset = 3600;
 		// 24 hours = 1 day.
-		if ($unit == 'd')
-			$applyOffset = 86400;
+		if ($unit == 'd') {
+					$applyOffset = 86400;
+		}
 		// Otherwise a week.
-		if ($unit == 'w')
-			$applyOffset = 604800;
+		if ($unit == 'w') {
+					$applyOffset = 604800;
+		}
 
 		$applyOffset *= $regularity;
 
@@ -1155,8 +1218,9 @@ 
 		$settings[$row['variable']] = $row['value'];
 
 		// Is this the default theme?
-		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1')
-			$settings['default_' . $row['variable']] = $row['value'];
+		if (in_array($row['variable'], array('theme_dir', 'theme_url', 'images_url')) && $row['id_theme'] == '1') {
+					$settings['default_' . $row['variable']] = $row['value'];
+		}
 	}
 	$smcFunc['db_free_result']($result);
 
@@ -1166,12 +1230,14 @@ 
 		$settings['template_dirs'] = array($settings['theme_dir']);
 
 		// Based on theme (if there is one).
-		if (!empty($settings['base_theme_dir']))
-			$settings['template_dirs'][] = $settings['base_theme_dir'];
+		if (!empty($settings['base_theme_dir'])) {
+					$settings['template_dirs'][] = $settings['base_theme_dir'];
+		}
 
 		// Lastly the default theme.
-		if ($settings['theme_dir'] != $settings['default_theme_dir'])
-			$settings['template_dirs'][] = $settings['default_theme_dir'];
+		if ($settings['theme_dir'] != $settings['default_theme_dir']) {
+					$settings['template_dirs'][] = $settings['default_theme_dir'];
+		}
 	}
 
 	// Assume we want this.
@@ -1318,8 +1384,9 @@ 
 	// Ok should we prune the logs?
 	if (!empty($modSettings['pruningOptions']))
 	{
-		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false)
-			list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		if (!empty($modSettings['pruningOptions']) && strpos($modSettings['pruningOptions'], ',') !== false) {
+					list ($modSettings['pruneErrorLog'], $modSettings['pruneModLog'], $modSettings['pruneBanLog'], $modSettings['pruneReportLog'], $modSettings['pruneScheduledTaskLog'], $modSettings['pruneSpiderHitLog']) = explode(',', $modSettings['pruningOptions']);
+		}
 
 		if (!empty($modSettings['pruneErrorLog']))
 		{
@@ -1385,8 +1452,9 @@ 
 				)
 			);
 
-			while ($row = $smcFunc['db_fetch_row']($result))
-				$reports[] = $row[0];
+			while ($row = $smcFunc['db_fetch_row']($result)) {
+							$reports[] = $row[0];
+			}
 
 			$smcFunc['db_free_result']($result);
 
@@ -1554,8 +1622,9 @@ 
 		$emaildata = loadEmailTemplate('paid_subscription_reminder', $replacements, empty($row['lngfile']) || empty($modSettings['userLanguage']) ? $language : $row['lngfile']);
 
 		// Send the actual email.
-		if ($notifyPrefs[$row['id_member']] & 0x02)
-			sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		if ($notifyPrefs[$row['id_member']] & 0x02) {
+					sendmail($row['email_address'], $emaildata['subject'], $emaildata['body'], null, 'paid_sub_remind', $emaildata['is_html'], 2);
+		}
 
 		if ($notifyPrefs[$row['id_member']] & 0x01)
 		{
@@ -1578,18 +1647,19 @@ 
 	}
 
 	// Insert the alerts if any
-	if (!empty($alert_rows))
-		$smcFunc['db_insert']('',
+	if (!empty($alert_rows)) {
+			$smcFunc['db_insert']('',
 			'{db_prefix}user_alerts',
 			array('alert_time' => 'int', 'id_member' => 'int', 'id_member_started' => 'int', 'member_name' => 'string',
 				'content_type' => 'string', 'content_id' => 'int', 'content_action' => 'string', 'is_read' => 'int', 'extra' => 'string'),
 			$alert_rows,
 			array()
 		);
+	}
 
 	// Mark the reminder as sent.
-	if (!empty($subs_reminded))
-		$smcFunc['db_query']('', '
+	if (!empty($subs_reminded)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}log_subscribed
 			SET reminder_sent = {int:reminder_sent}
 			WHERE id_sublog IN ({array_int:subscription_list})',
@@ -1598,6 +1668,7 @@ 
 				'reminder_sent' => 1,
 			)
 		);
+	}
 
 	return true;
 }
@@ -1613,13 +1684,13 @@ 
 	// We need to know where this thing is going.
 	if (!empty($modSettings['currentAttachmentUploadDir']))
 	{
-		if (!is_array($modSettings['attachmentUploadDir']))
-			$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		if (!is_array($modSettings['attachmentUploadDir'])) {
+					$modSettings['attachmentUploadDir'] = $smcFunc['json_decode']($modSettings['attachmentUploadDir'], true);
+		}
 
 		// Just use the current path for temp files.
 		$attach_dirs = $modSettings['attachmentUploadDir'];
-	}
-	else
+	} else
 	{
 		$attach_dirs = array($modSettings['attachmentUploadDir']);
 	}
@@ -1638,14 +1709,16 @@ 
 
 		while ($file = readdir($dir))
 		{
-			if ($file == '.' || $file == '..')
-				continue;
+			if ($file == '.' || $file == '..') {
+							continue;
+			}
 
 			if (strpos($file, 'post_tmp_') !== false)
 			{
 				// Temp file is more than 5 hours old!
-				if (filemtime($attach_dir . '/' . $file) < time() - 18000)
-					@unlink($attach_dir . '/' . $file);
+				if (filemtime($attach_dir . '/' . $file) < time() - 18000) {
+									@unlink($attach_dir . '/' . $file);
+				}
 			}
 		}
 		closedir($dir);
@@ -1678,8 +1751,9 @@ 
 		)
 	);
 
-	while ($row = $smcFunc['db_fetch_row']($request))
-		$topics[] = $row[0];
+	while ($row = $smcFunc['db_fetch_row']($request)) {
+			$topics[] = $row[0];
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Zap, your gone
@@ -1699,8 +1773,9 @@ 
 {
 	global $smcFunc, $sourcedir, $modSettings;
 
-	if (empty($modSettings['drafts_keep_days']))
-		return true;
+	if (empty($modSettings['drafts_keep_days'])) {
+			return true;
+	}
 
 	// init
 	$drafts = array();
@@ -1718,8 +1793,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 one, remove them

Sources/Attachments.php

Braces +102 added lines, -75 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 class Attachments
 {
@@ -70,16 +71,18 @@ 
 
 		$this->_sa = !empty($_REQUEST['sa']) ? $smcFunc['htmlspecialchars']($smcFunc['htmltrim']($_REQUEST['sa'])) : false;
 
-		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions))
-			$this->{$this->_sa}();
+		if ($this->_canPostAttachment && $this->_sa && in_array($this->_sa, $this->_subActions)) {
+					$this->{$this->_sa}();
+		}
 
 		// Just send a generic message.
-		else
-			$this->setResponse(array(
+		else {
+					$this->setResponse(array(
 				'text' => $this->_sa == 'add' ? 'attach_error_title' :   'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Back to the future, oh, to the browser!
 		$this->sendResponse();
@@ -95,12 +98,13 @@ 
 		$attachID = !empty($_REQUEST['attach']) && is_numeric($_REQUEST['attach']) ? (int) $_REQUEST['attach'] : 0;
 
 		// Need something to work with.
-		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID])))
-			return $this->setResponse(array(
+		if (!$attachID || (!empty($_SESSION['already_attached']) && !isset($_SESSION['already_attached'][$attachID]))) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_deleted_error',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Lets pass some params and see what happens :P
 		$affectedMessage = removeAttachments(array('id_attach' => $attachID), '', true, true);
@@ -119,19 +123,21 @@ 
 	public function add()
 	{
 		// You gotta be able to post attachments.
-		if (!$this->_canPostAttachment)
-			return $this->setResponse(array(
+		if (!$this->_canPostAttachment) {
+					return $this->setResponse(array(
 				'text' => 'attached_file_cannot',
 				'type' => 'error',
 				'data' => false,
 			));
+		}
 
 		// Process them at once!
 		$this->processAttachments();
 
 		// The attachments was created and moved the the right folder, time to update the DB.
-		if (!empty($_SESSION['temp_attachments']))
-			$this->createAtttach();
+		if (!empty($_SESSION['temp_attachments'])) {
+					$this->createAtttach();
+		}
 
 		// Set the response.
 		$this->setResponse();
@@ -144,8 +150,9 @@ 
 	{
 		global $context, $modSettings, $smcFunc, $user_info, $txt;
 
-		if (!isset($_FILES['attachment']['name']))
-			$_FILES['attachment']['tmp_name'] = array();
+		if (!isset($_FILES['attachment']['name'])) {
+					$_FILES['attachment']['tmp_name'] = array();
+		}
 
 		// If there are attachments, calculate the total size and how many.
 		$context['attachments']['total_size'] = 0;
@@ -155,25 +162,30 @@ 
 		if (isset($_REQUEST['msg']))
 		{
 			$context['attachments']['quantity'] = count($context['current_attachments']);
-			foreach ($context['current_attachments'] as $attachment)
-				$context['attachments']['total_size'] += $attachment['size'];
+			foreach ($context['current_attachments'] as $attachment) {
+							$context['attachments']['total_size'] += $attachment['size'];
+			}
 		}
 
 		// A bit of house keeping first.
-		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1)
-			unset($_SESSION['temp_attachments']);
+		if (!empty($_SESSION['temp_attachments']) && count($_SESSION['temp_attachments']) == 1) {
+					unset($_SESSION['temp_attachments']);
+		}
 
 		// Our infamous SESSION var, we are gonna have soo much fun with it!
-		if (!isset($_SESSION['temp_attachments']))
-			$_SESSION['temp_attachments'] = array();
+		if (!isset($_SESSION['temp_attachments'])) {
+					$_SESSION['temp_attachments'] = array();
+		}
 
 		// Make sure we're uploading to the right place.
-		if (!empty($modSettings['automanage_attachments']))
-			automanage_attachments_check_directory();
+		if (!empty($modSettings['automanage_attachments'])) {
+					automanage_attachments_check_directory();
+		}
 
 		// Is the attachments folder actually there?
-		if (!empty($context['dir_creation_error']))
-			$this->_generalErrors[] = $context['dir_creation_error'];
+		if (!empty($context['dir_creation_error'])) {
+					$this->_generalErrors[] = $context['dir_creation_error'];
+		}
 
 		// The current attach folder ha some issues...
 		elseif (!is_dir($this->_attchDir))
@@ -198,13 +210,12 @@ 
 			);
 			list ($context['attachments']['quantity'], $context['attachments']['total_size']) = $smcFunc['db_fetch_row']($request);
 			$smcFunc['db_free_result']($request);
-		}
-
-		else
-			$context['attachments'] = array(
+		} else {
+					$context['attachments'] = array(
 				'quantity' => 0,
 				'total_size' => 0,
 			);
+		}
 
 		// Check for other general errors here.
 
@@ -212,9 +223,10 @@ 
 		if (!empty($this->_generalErrors))
 		{
 			// And delete the files 'cos they ain't going nowhere.
-			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
+			foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy) {
+							if (file_exists($_FILES['attachment']['tmp_name'][$n]))
 					unlink($_FILES['attachment']['tmp_name'][$n]);
+			}
 
 			$_FILES['attachment']['tmp_name'] = array();
 
@@ -225,26 +237,29 @@ 
 		// Loop through $_FILES['attachment'] array and move each file to the current attachments folder.
 		foreach ($_FILES['attachment']['tmp_name'] as $n => $dummy)
 		{
-			if ($_FILES['attachment']['name'][$n] == '')
-				continue;
+			if ($_FILES['attachment']['name'][$n] == '') {
+							continue;
+			}
 
 			// First, let's first check for PHP upload errors.
 			$errors = array();
 			if (!empty($_FILES['attachment']['error'][$n]))
 			{
-				if ($_FILES['attachment']['error'][$n] == 2)
-					$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
-
-				else
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				if ($_FILES['attachment']['error'][$n] == 2) {
+									$errors[] = array('file_too_big', array($modSettings['attachmentSizeLimit']));
+				} else {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_' . $_FILES['attachment']['error'][$n]]);
+				}
 
 				// Log this one, because...
-				if ($_FILES['attachment']['error'][$n] == 6)
-					log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				if ($_FILES['attachment']['error'][$n] == 6) {
+									log_error($_FILES['attachment']['name'][$n] . ': ' . $txt['php_upload_error_6'], 'critical');
+				}
 
 				// Weird, no errors were cached, still fill out a generic one.
-				if (empty($errors))
-					$errors[] = 'attach_php_error';
+				if (empty($errors)) {
+									$errors[] = 'attach_php_error';
+				}
 			}
 
 			// Try to move and rename the file before doing any more checks on it.
@@ -256,8 +271,9 @@ 
 			{
 				// The reported MIME type of the attachment might not be reliable.
 				// Fortunately, PHP 5.3+ lets us easily verify the real MIME type.
-				if (function_exists('mime_content_type'))
-					$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				if (function_exists('mime_content_type')) {
+									$_FILES['attachment']['type'][$n] = mime_content_type($_FILES['attachment']['tmp_name'][$n]);
+				}
 
 				$_SESSION['temp_attachments'][$attachID] = array(
 					'name' => $smcFunc['htmlspecialchars'](basename($_FILES['attachment']['name'][$n])),
@@ -269,16 +285,18 @@ 
 				);
 
 				// Move the file to the attachments folder with a temp name for now.
-				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName))
-					smf_chmod($destName, 0644);
+				if (@move_uploaded_file($_FILES['attachment']['tmp_name'][$n], $destName)) {
+									smf_chmod($destName, 0644);
+				}
 
 				// This is madness!!
 				else
 				{
 					// File couldn't be moved.
 					$_SESSION['temp_attachments'][$attachID]['errors'][] = 'attach_timeout';
-					if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-						unlink($_FILES['attachment']['tmp_name'][$n]);
+					if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+											unlink($_FILES['attachment']['tmp_name'][$n]);
+					}
 				}
 			}
 
@@ -291,13 +309,15 @@ 
 					'errors' => $errors,
 				);
 
-				if (file_exists($_FILES['attachment']['tmp_name'][$n]))
-					unlink($_FILES['attachment']['tmp_name'][$n]);
+				if (file_exists($_FILES['attachment']['tmp_name'][$n])) {
+									unlink($_FILES['attachment']['tmp_name'][$n]);
+				}
 			}
 
 			// If there's no errors to this point. We still do need to apply some additional checks before we are finished.
-			if (empty($_SESSION['temp_attachments'][$attachID]['errors']))
-				attachmentChecks($attachID);
+			if (empty($_SESSION['temp_attachments'][$attachID]['errors'])) {
+							attachmentChecks($attachID);
+			}
 		}
 
 		// Mod authors, finally a hook to hang an alternate attachment upload system upon
@@ -344,14 +364,15 @@ 
 
 					$_SESSION['already_attached'][$attachmentOptions['attachID']] = $attachmentOptions['attachID'];
 
-					if (!empty($attachmentOptions['thumb']))
-						$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					if (!empty($attachmentOptions['thumb'])) {
+											$_SESSION['already_attached'][$attachmentOptions['thumb']] = $attachmentOptions['thumb'];
+					}
 
-					if ($this->_msg)
-						assignAttachments($_SESSION['already_attached'], $this->_msg);
+					if ($this->_msg) {
+											assignAttachments($_SESSION['already_attached'], $this->_msg);
+					}
 				}
-			}
-			else
+			} else
 			{
 				// Sort out the errors for display and delete any associated files.
 				$log_these = array('attachments_no_create', 'attachments_no_write', 'attach_timeout', 'ran_out_of_space', 'cant_access_upload_path', 'attach_0_byte_file');
@@ -363,14 +384,16 @@ 
 					if (!is_array($error))
 					{
 						$attachmentOptions['errors'][] = $txt[$error];
-						if (in_array($error, $log_these))
-							log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						if (in_array($error, $log_these)) {
+													log_error($attachment['name'] . ': ' . $txt[$error], 'critical');
+						}
+					} else {
+											$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 					}
-					else
-						$attachmentOptions['errors'][] = vsprintf($txt[$error[0]], $error[1]);
 				}
-				if (file_exists($attachment['tmp_name']))
-					unlink($attachment['tmp_name']);
+				if (file_exists($attachment['tmp_name'])) {
+									unlink($attachment['tmp_name']);
+				}
 			}
 
 			// You don't need to know.
@@ -382,8 +405,9 @@ 
 		}
 
 		// Temp save this on the db.
-		if (!empty($_SESSION['already_attached']))
-			$this->_attachSuccess = $_SESSION['already_attached'];
+		if (!empty($_SESSION['already_attached'])) {
+					$this->_attachSuccess = $_SESSION['already_attached'];
+		}
 
 		unset($_SESSION['temp_attachments']);
 	}
@@ -403,14 +427,16 @@ 
 		if ($this->_sa == 'add')
 		{
 			// Is there any generic errors? made some sense out of them!
-			if ($this->_generalErrors)
-				foreach ($this->_generalErrors as $k => $v)
+			if ($this->_generalErrors) {
+							foreach ($this->_generalErrors as $k => $v)
 					$this->_generalErrors[$k] = (is_array($v) ? vsprintf($txt[$v[0]], $v[1]) : $txt[$v]);
+			}
 
 			// Gotta urlencode the filename.
-			if ($this->_attachResults)
-				foreach ($this->_attachResults as $k => $v)
+			if ($this->_attachResults) {
+							foreach ($this->_attachResults as $k => $v)
 					$this->_attachResults[$k]['name'] =  urlencode($this->_attachResults[$k]['name']);
+			}
 
 			$this->_response = array(
 				'files' => $this->_attachResults ? $this->_attachResults : false,
@@ -419,9 +445,10 @@ 
 		}
 
 		// Rest of us mere mortals gets no special treatment...
-		elseif (!empty($data))
-			if (!empty($data['text']) && !empty($txt[$data['text']]))
+		elseif (!empty($data)) {
+					if (!empty($data['text']) && !empty($txt[$data['text']]))
 				$this->_response['text'] = $txt[$data['text']];
+		}
 	}
 
 	protected function sendResponse()
@@ -430,11 +457,11 @@ 
 
 		ob_end_clean();
 
-		if (!empty($modSettings['CompressedOutput']))
-			@ob_start('ob_gzhandler');
-
-		else
-			ob_start();
+		if (!empty($modSettings['CompressedOutput'])) {
+					@ob_start('ob_gzhandler');
+		} else {
+					ob_start();
+		}
 
 		// Set the header.
 		header('content-type: application/json; charset='. $context['character_set'] .'');

Sources/Register.php

Braces +177 added lines, -128 removed lines

@@ -15,8 +15,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Begin the registration process.
@@ -29,19 +30,23 @@ 
 	global $language, $scripturl, $smcFunc, $sourcedir, $cur_profile;
 
 	// Is this an incoming AJAX check?
-	if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck')
-		return RegisterCheckUsername();
+	if (isset($_GET['sa']) && $_GET['sa'] == 'usernamecheck') {
+			return RegisterCheckUsername();
+	}
 
 	// Check if the administrator has it disabled.
-	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3')
-		fatal_lang_error('registration_disabled', false);
+	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == '3') {
+			fatal_lang_error('registration_disabled', false);
+	}
 
 	// If this user is an admin - redirect them to the admin registration page.
-	if (allowedTo('moderate_forum') && !$user_info['is_guest'])
-		redirectexit('action=admin;area=regcenter;sa=register');
+	if (allowedTo('moderate_forum') && !$user_info['is_guest']) {
+			redirectexit('action=admin;area=regcenter;sa=register');
+	}
 	// You are not a guest, so you are a member - and members don't get to register twice!
-	elseif (empty($user_info['is_guest']))
-		redirectexit();
+	elseif (empty($user_info['is_guest'])) {
+			redirectexit();
+	}
 
 	loadLanguage('Login');
 	loadTemplate('Register');
@@ -82,16 +87,18 @@ 
 		}
 	}
 	// Make sure they don't squeeze through without agreeing.
-	elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement'])
-		$current_step = 1;
+	elseif ($current_step > 1 && $context['require_agreement'] && !$context['registration_passed_agreement']) {
+			$current_step = 1;
+	}
 
 	// Show the user the right form.
 	$context['sub_template'] = $current_step == 1 ? 'registration_agreement' : 'registration_form';
 	$context['page_title'] = $current_step == 1 ? $txt['registration_agreement'] : $txt['registration_form'];
 
 	// Kinda need this.
-	if ($context['sub_template'] == 'registration_form')
-		loadJavaScriptFile('register.js', array('defer' => false), 'smf_register');
+	if ($context['sub_template'] == 'registration_form') {
+			loadJavaScriptFile('register.js', array('defer' => false), 'smf_register');
+	}
 
 	// Add the register chain to the link tree.
 	$context['linktree'][] = array(
@@ -100,24 +107,26 @@ 
 	);
 
 	// Prepare the time gate! Do it like so, in case later steps want to reset the limit for any reason, but make sure the time is the current one.
-	if (!isset($_SESSION['register']))
-		$_SESSION['register'] = array(
+	if (!isset($_SESSION['register'])) {
+			$_SESSION['register'] = array(
 			'timenow' => time(),
 			'limit' => 10, // minimum number of seconds required on this page for registration
 		);
-	else
-		$_SESSION['register']['timenow'] = time();
+	} else {
+			$_SESSION['register']['timenow'] = time();
+	}
 
 	// If you have to agree to the agreement, it needs to be fetched from the file.
 	if ($context['require_agreement'])
 	{
 		// Have we got a localized one?
-		if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt'))
-			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
-		elseif (file_exists($boarddir . '/agreement.txt'))
-			$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
-		else
-			$context['agreement'] = '';
+		if (file_exists($boarddir . '/agreement.' . $user_info['language'] . '.txt')) {
+					$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.' . $user_info['language'] . '.txt'), true, 'agreement_' . $user_info['language']);
+		} elseif (file_exists($boarddir . '/agreement.txt')) {
+					$context['agreement'] = parse_bbc(file_get_contents($boarddir . '/agreement.txt'), true, 'agreement');
+		} else {
+					$context['agreement'] = '';
+		}
 
 		// Nothing to show, lets disable registration and inform the admin of this error
 		if (empty($context['agreement']))
@@ -133,8 +142,9 @@ 
 		$selectedLanguage = empty($_SESSION['language']) ? $language : $_SESSION['language'];
 
 		// Do we have any languages?
-		if (empty($context['languages']))
-			getLanguages();
+		if (empty($context['languages'])) {
+					getLanguages();
+		}
 
 		// Try to find our selected language.
 		foreach ($context['languages'] as $key => $lang)
@@ -142,8 +152,9 @@ 
 			$context['languages'][$key]['name'] = strtr($lang['name'], array('-utf8' => ''));
 
 			// Found it!
-			if ($selectedLanguage == $lang['filename'])
-				$context['languages'][$key]['selected'] = true;
+			if ($selectedLanguage == $lang['filename']) {
+							$context['languages'][$key]['selected'] = true;
+			}
 		}
 	}
 
@@ -170,16 +181,19 @@ 
 		if (in_array('website', $reg_fields))
 		{
 			unset($reg_fields['website']);
-			if (isset($_POST['website_title']))
-				$cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']);
-			if (isset($_POST['website_url']))
-				$cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']);
+			if (isset($_POST['website_title'])) {
+							$cur_profile['website_title'] = $smcFunc['htmlspecialchars']($_POST['website_title']);
+			}
+			if (isset($_POST['website_url'])) {
+							$cur_profile['website_url'] = $smcFunc['htmlspecialchars']($_POST['website_url']);
+			}
 		}
 				
 		// We might have had some submissions on this front - go check.
-		foreach ($reg_fields as $field)
-			if (isset($_POST[$field]))
+		foreach ($reg_fields as $field) {
+					if (isset($_POST[$field]))
 				$cur_profile[$field] = $smcFunc['htmlspecialchars']($_POST[$field]);
+		}
 
 		// Load all the fields in question.
 		setupProfileContext($reg_fields);
@@ -196,8 +210,9 @@ 
 		$context['visual_verification_id'] = $verificationOptions['id'];
 	}
 	// Otherwise we have nothing to show.
-	else
-		$context['visual_verification'] = false;
+	else {
+			$context['visual_verification'] = false;
+	}
 
 
 	$context += array(
@@ -208,8 +223,9 @@ 
 
 	// Were there any errors?
 	$context['registration_errors'] = array();
-	if (!empty($reg_errors))
-		$context['registration_errors'] = $reg_errors;
+	if (!empty($reg_errors)) {
+			$context['registration_errors'] = $reg_errors;
+	}
 
 	createToken('register');
 }
@@ -226,27 +242,32 @@ 
 	validateToken('register');
 
 	// Check to ensure we're forcing SSL for authentication
-	if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
-		fatal_lang_error('register_ssl_required');
+	if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) {
+			fatal_lang_error('register_ssl_required');
+	}
 
 	// Start collecting together any errors.
 	$reg_errors = array();
 
 	// You can't register if it's disabled.
-	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3)
-		fatal_lang_error('registration_disabled', false);
+	if (!empty($modSettings['registration_method']) && $modSettings['registration_method'] == 3) {
+			fatal_lang_error('registration_disabled', false);
+	}
 
 	// Well, if you don't agree, you can't register.
-	if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed']))
-		redirectexit();
+	if (!empty($modSettings['requireAgreement']) && empty($_SESSION['registration_agreed'])) {
+			redirectexit();
+	}
 
 	// Make sure they came from *somewhere*, have a session.
-	if (!isset($_SESSION['old_url']))
-		redirectexit('action=signup');
+	if (!isset($_SESSION['old_url'])) {
+			redirectexit('action=signup');
+	}
 
 	// If we don't require an agreement, we need a extra check for coppa.
-	if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge']))
-		$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
+	if (empty($modSettings['requireAgreement']) && !empty($modSettings['coppaAge'])) {
+			$_SESSION['skip_coppa'] = !empty($_POST['accept_agreement']);
+	}
 	// Are they under age, and under age users are banned?
 	if (!empty($modSettings['coppaAge']) && empty($modSettings['coppaType']) && empty($_SESSION['skip_coppa']))
 	{
@@ -255,8 +276,9 @@ 
 	}
 
 	// Check the time gate for miscreants. First make sure they came from somewhere that actually set it up.
-	if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit']))
-		redirectexit('action=signup');
+	if (empty($_SESSION['register']['timenow']) || empty($_SESSION['register']['limit'])) {
+			redirectexit('action=signup');
+	}
 	// Failing that, check the time on it.
 	if (time() - $_SESSION['register']['timenow'] < $_SESSION['register']['limit'])
 	{
@@ -276,15 +298,17 @@ 
 		if (is_array($context['visual_verification']))
 		{
 			loadLanguage('Errors');
-			foreach ($context['visual_verification'] as $error)
-				$reg_errors[] = $txt['error_' . $error];
+			foreach ($context['visual_verification'] as $error) {
+							$reg_errors[] = $txt['error_' . $error];
+			}
 		}
 	}
 
 	foreach ($_POST as $key => $value)
 	{
-		if (!is_array($_POST[$key]))
-			$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		if (!is_array($_POST[$key])) {
+					$_POST[$key] = htmltrim__recursive(str_replace(array("\n", "\r"), '', $_POST[$key]));
+		}
 	}
 
 	// Collect all extra registration fields someone might have filled in.
@@ -314,12 +338,14 @@ 
 		$reg_fields = explode(',', $modSettings['registration_fields']);
 
 		// Website is a little different
-		if (in_array('website', $reg_fields))
-			$possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings);
+		if (in_array('website', $reg_fields)) {
+					$possible_strings = array_merge(array('website_url', 'website_title'), $possible_strings);
+		}
 	}
 
-	if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '')
-		$_POST['secret_answer'] = md5($_POST['secret_answer']);
+	if (isset($_POST['secret_answer']) && $_POST['secret_answer'] != '') {
+			$_POST['secret_answer'] = md5($_POST['secret_answer']);
+	}
 
 	// Needed for isReservedName() and registerMember().
 	require_once($sourcedir . '/Subs-Members.php');
@@ -328,8 +354,9 @@ 
 	if (isset($_POST['real_name']))
 	{
 		// Are you already allowed to edit the displayed name?
-		if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum'))
-			$canEditDisplayName = true;
+		if (allowedTo('profile_displayed_name') || allowedTo('moderate_forum')) {
+					$canEditDisplayName = true;
+		}
 
 		// If you are a guest, will you be allowed to once you register?
 		else
@@ -353,33 +380,38 @@ 
 			$_POST['real_name'] = trim(preg_replace('~[\t\n\r \x0B\0' . ($context['utf8'] ? '\x{A0}\x{AD}\x{2000}-\x{200F}\x{201F}\x{202F}\x{3000}\x{FEFF}' : '\x00-\x08\x0B\x0C\x0E-\x19\xA0') . ']+~' . ($context['utf8'] ? 'u' : ''), ' ', $_POST['real_name']));
 
 			// Only set it if we are sure it is good
-			if (trim($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60)
-				$possible_strings[] = 'real_name';
+			if (trim($_POST['real_name']) != '' && !isReservedName($_POST['real_name']) && $smcFunc['strlen']($_POST['real_name']) < 60) {
+							$possible_strings[] = 'real_name';
+			}
 		}
 	}
 
 	// Handle a string as a birthdate...
-	if (isset($_POST['birthdate']) && $_POST['birthdate'] != '')
-		$_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
+	if (isset($_POST['birthdate']) && $_POST['birthdate'] != '') {
+			$_POST['birthdate'] = strftime('%Y-%m-%d', strtotime($_POST['birthdate']));
+	}
 	// Or birthdate parts...
-	elseif (!empty($_POST['bday1']) && !empty($_POST['bday2']))
-		$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
+	elseif (!empty($_POST['bday1']) && !empty($_POST['bday2'])) {
+			$_POST['birthdate'] = sprintf('%04d-%02d-%02d', empty($_POST['bday3']) ? 0 : (int) $_POST['bday3'], (int) $_POST['bday1'], (int) $_POST['bday2']);
+	}
 
 	// Validate the passed language file.
 	if (isset($_POST['lngfile']) && !empty($modSettings['userLanguage']))
 	{
 		// Do we have any languages?
-		if (empty($context['languages']))
-			getLanguages();
+		if (empty($context['languages'])) {
+					getLanguages();
+		}
 
 		// Did we find it?
-		if (isset($context['languages'][$_POST['lngfile']]))
-			$_SESSION['language'] = $_POST['lngfile'];
-		else
+		if (isset($context['languages'][$_POST['lngfile']])) {
+					$_SESSION['language'] = $_POST['lngfile'];
+		} else {
+					unset($_POST['lngfile']);
+		}
+	} else {
 			unset($_POST['lngfile']);
 	}
-	else
-		unset($_POST['lngfile']);
 
 	// Set the options needed for registration.
 	$regOptions = array(
@@ -399,22 +431,27 @@ 
 	);
 
 	// Include the additional options that might have been filled in.
-	foreach ($possible_strings as $var)
-		if (isset($_POST[$var]))
+	foreach ($possible_strings as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = $smcFunc['htmlspecialchars']($_POST[$var], ENT_QUOTES);
-	foreach ($possible_ints as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_ints as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = (int) $_POST[$var];
-	foreach ($possible_floats as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_floats as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = (float) $_POST[$var];
-	foreach ($possible_bools as $var)
-		if (isset($_POST[$var]))
+	}
+	foreach ($possible_bools as $var) {
+			if (isset($_POST[$var]))
 			$regOptions['extra_register_vars'][$var] = empty($_POST[$var]) ? 0 : 1;
+	}
 
 	// Registration options are always default options...
-	if (isset($_POST['default_options']))
-		$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	if (isset($_POST['default_options'])) {
+			$_POST['options'] = isset($_POST['options']) ? $_POST['options'] + $_POST['default_options'] : $_POST['default_options'];
+	}
 	$regOptions['theme_vars'] = isset($_POST['options']) && is_array($_POST['options']) ? $_POST['options'] : array();
 
 	// Make sure they are clean, dammit!
@@ -434,12 +471,14 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Don't allow overriding of the theme variables.
-		if (isset($regOptions['theme_vars'][$row['col_name']]))
-			unset($regOptions['theme_vars'][$row['col_name']]);
+		if (isset($regOptions['theme_vars'][$row['col_name']])) {
+					unset($regOptions['theme_vars'][$row['col_name']]);
+		}
 
 		// Not actually showing it then?
-		if (!$row['show_reg'])
-			continue;
+		if (!$row['show_reg']) {
+					continue;
+		}
 
 		// Prepare the value!
 		$value = isset($_POST['customfield'][$row['col_name']]) ? trim($_POST['customfield'][$row['col_name']]) : '';
@@ -448,24 +487,27 @@ 
 		if (!in_array($row['field_type'], array('check', 'select', 'radio')))
 		{
 			// Is it too long?
-			if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value))
-				$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+			if ($row['field_length'] && $row['field_length'] < $smcFunc['strlen']($value)) {
+							$custom_field_errors[] = array('custom_field_too_long', array($row['field_name'], $row['field_length']));
+			}
 
 			// Any masks to apply?
 			if ($row['field_type'] == 'text' && !empty($row['mask']) && $row['mask'] != 'none')
 			{
-				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255))
-					$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
-				elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value))
-					$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
-				elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0)
-					$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				if ($row['mask'] == 'email' && (!filter_var($value, FILTER_VALIDATE_EMAIL) || strlen($value) > 255)) {
+									$custom_field_errors[] = array('custom_field_invalid_email', array($row['field_name']));
+				} elseif ($row['mask'] == 'number' && preg_match('~[^\d]~', $value)) {
+									$custom_field_errors[] = array('custom_field_not_number', array($row['field_name']));
+				} elseif (substr($row['mask'], 0, 5) == 'regex' && trim($value) != '' && preg_match(substr($row['mask'], 5), $value) === 0) {
+									$custom_field_errors[] = array('custom_field_inproper_format', array($row['field_name']));
+				}
 			}
 		}
 
 		// Is this required but not there?
-		if (trim($value) == '' && $row['show_reg'] > 1)
-			$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+		if (trim($value) == '' && $row['show_reg'] > 1) {
+					$custom_field_errors[] = array('custom_field_empty', array($row['field_name']));
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -473,8 +515,9 @@ 
 	if (!empty($custom_field_errors))
 	{
 		loadLanguage('Errors');
-		foreach ($custom_field_errors as $error)
-			$reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]);
+		foreach ($custom_field_errors as $error) {
+					$reg_errors[] = vsprintf($txt['error_' . $error[0]], $error[1]);
+		}
 	}
 
 	// Lets check for other errors before trying to register the member.
@@ -519,8 +562,9 @@ 
 	}
 
 	// If COPPA has been selected then things get complicated, setup the template.
-	if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa']))
-		redirectexit('action=coppa;member=' . $memberID);
+	if (!empty($modSettings['coppaAge']) && empty($_SESSION['skip_coppa'])) {
+			redirectexit('action=coppa;member=' . $memberID);
+	}
 	// Basic template variable setup.
 	elseif (!empty($modSettings['registration_method']))
 	{
@@ -532,8 +576,7 @@ 
 			'sub_template' => 'after',
 			'description' => $modSettings['registration_method'] == 2 ? $txt['approval_after_registration'] : $txt['activate_after_registration']
 		);
-	}
-	else
+	} else
 	{
 		call_integration_hook('integrate_activate', array($regOptions['username']));
 
@@ -553,16 +596,18 @@ 
 	global $context, $txt, $modSettings, $scripturl, $sourcedir, $smcFunc, $language, $user_info;
 
 	// Logged in users should not bother to activate their accounts
-	if (!empty($user_info['id']))
-		redirectexit();
+	if (!empty($user_info['id'])) {
+			redirectexit();
+	}
 
 	loadLanguage('Login');
 	loadTemplate('Login');
 
 	if (empty($_REQUEST['u']) && empty($_POST['user']))
 	{
-		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3')
-			fatal_lang_error('no_access', false);
+		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == '3') {
+					fatal_lang_error('no_access', false);
+		}
 
 		$context['member_id'] = 0;
 		$context['sub_template'] = 'resend';
@@ -602,11 +647,13 @@ 
 	// Change their email address? (they probably tried a fake one first :P.)
 	if (isset($_POST['new_email'], $_REQUEST['passwd']) && hash_password($row['member_name'], $_REQUEST['passwd']) == $row['passwd'] && ($row['is_activated'] == 0 || $row['is_activated'] == 2))
 	{
-		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3)
-			fatal_lang_error('no_access', false);
+		if (empty($modSettings['registration_method']) || $modSettings['registration_method'] == 3) {
+					fatal_lang_error('no_access', false);
+		}
 
-		if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL))
-			fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false);
+		if (!filter_var($_POST['new_email'], FILTER_VALIDATE_EMAIL)) {
+					fatal_error(sprintf($txt['valid_email_needed'], $smcFunc['htmlspecialchars']($_POST['new_email'])), false);
+		}
 
 		// Make sure their email isn't banned.
 		isBannedEmail($_POST['new_email'], 'cannot_register', $txt['ban_register_prohibited']);
@@ -622,8 +669,9 @@ 
 			)
 		);
 
-		if ($smcFunc['db_num_rows']($request) != 0)
-			fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email'])));
+		if ($smcFunc['db_num_rows']($request) != 0) {
+					fatal_lang_error('email_in_use', false, array($smcFunc['htmlspecialchars']($_POST['new_email'])));
+		}
 		$smcFunc['db_free_result']($request);
 
 		updateMemberData($row['id_member'], array('email_address' => $_POST['new_email']));
@@ -661,9 +709,9 @@ 
 	// Quit if this code is not right.
 	if (empty($_REQUEST['code']) || $row['validation_code'] != $_REQUEST['code'])
 	{
-		if (!empty($row['is_activated']))
-			fatal_lang_error('already_activated', false);
-		elseif ($row['validation_code'] == '')
+		if (!empty($row['is_activated'])) {
+					fatal_lang_error('already_activated', false);
+		} elseif ($row['validation_code'] == '')
 		{
 			loadLanguage('Profile');
 			fatal_error(sprintf($txt['registration_not_approved'], $scripturl . '?action=activate;user=' . $row['member_name']), false);
@@ -713,8 +761,9 @@ 
 	loadTemplate('Register');
 
 	// No User ID??
-	if (!isset($_GET['member']))
-		fatal_lang_error('no_access', false);
+	if (!isset($_GET['member'])) {
+			fatal_lang_error('no_access', false);
+	}
 
 	// Get the user details...
 	$request = $smcFunc['db_query']('', '
@@ -727,8 +776,9 @@ 
 			'is_coppa' => 5,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		fatal_lang_error('no_access', false);
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			fatal_lang_error('no_access', false);
+	}
 	list ($username) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -766,8 +816,7 @@ 
 			echo $data;
 			obExit(false);
 		}
-	}
-	else
+	} else
 	{
 		$context += array(
 			'page_title' => $txt['coppa_title'],
@@ -820,8 +869,9 @@ 
 	{
 		require_once($sourcedir . '/Subs-Graphics.php');
 
-		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code))
-			header('HTTP/1.1 400 Bad Request');
+		if (in_array('gd', get_loaded_extensions()) && !showCodeImage($code)) {
+					header('HTTP/1.1 400 Bad Request');
+		}
 
 		// Otherwise just show a pre-defined letter.
 		elseif (isset($_REQUEST['letter']))
@@ -839,14 +889,13 @@ 
 			header('content-type: image/gif');
 			die("\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\x00\x00\x00\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B");
 		}
-	}
-
-	elseif ($_REQUEST['format'] === '.wav')
+	} elseif ($_REQUEST['format'] === '.wav')
 	{
 		require_once($sourcedir . '/Subs-Sound.php');
 
-		if (!createWaveFile($code))
-			header('HTTP/1.1 400 Bad Request');
+		if (!createWaveFile($code)) {
+					header('HTTP/1.1 400 Bad Request');
+		}
 	}
 
 	// We all die one day...

Sources/Security.php

Braces +258 added lines, -199 removed lines

@@ -14,8 +14,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Check if the user is who he/she says he is
@@ -42,12 +43,14 @@ 
 	$refreshTime = isset($_GET['xml']) ? 4200 : 3600;
 
 	// Is the security option off?
-	if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')]))
-		return;
+	if (!empty($modSettings['securityDisable' . ($type != 'admin' ? '_' . $type : '')])) {
+			return;
+	}
 
 	// Or are they already logged in?, Moderator or admin session is need for this area
-	if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time()))
-		return;
+	if ((!empty($_SESSION[$type . '_time']) && $_SESSION[$type . '_time'] + $refreshTime >= time()) || (!empty($_SESSION['admin_time']) && $_SESSION['admin_time'] + $refreshTime >= time())) {
+			return;
+	}
 
 	require_once($sourcedir . '/Subs-Auth.php');
 
@@ -55,8 +58,9 @@ 
 	if (isset($_POST[$type . '_pass']))
 	{
 		// Check to ensure we're forcing SSL for authentication
-		if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn())
-			fatal_lang_error('login_ssl_required');
+		if (!empty($modSettings['force_ssl']) && empty($maintenance) && !httpsOn()) {
+					fatal_lang_error('login_ssl_required');
+		}
 
 		checkSession();
 
@@ -72,17 +76,19 @@ 
 	}
 
 	// Better be sure to remember the real referer
-	if (empty($_SESSION['request_referer']))
-		$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
-	elseif (empty($_POST))
-		unset($_SESSION['request_referer']);
+	if (empty($_SESSION['request_referer'])) {
+			$_SESSION['request_referer'] = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
+	} elseif (empty($_POST)) {
+			unset($_SESSION['request_referer']);
+	}
 
 	// Need to type in a password for that, man.
-	if (!isset($_GET['xml']))
-		adminLogin($type);
-	else
-		return 'session_verify_fail';
-}
+	if (!isset($_GET['xml'])) {
+			adminLogin($type);
+	} else {
+			return 'session_verify_fail';
+	}
+	}
 
 /**
  * Require a user who is logged in. (not a guest.)
@@ -96,25 +102,30 @@ 
 	global $user_info, $txt, $context, $scripturl, $modSettings;
 
 	// Luckily, this person isn't a guest.
-	if (!$user_info['is_guest'])
-		return;
+	if (!$user_info['is_guest']) {
+			return;
+	}
 
 	// Log what they were trying to do didn't work)
-	if (!empty($modSettings['who_enabled']))
-		$_GET['error'] = 'guest_login';
+	if (!empty($modSettings['who_enabled'])) {
+			$_GET['error'] = 'guest_login';
+	}
 	writeLog(true);
 
 	// Just die.
-	if (isset($_REQUEST['xml']))
-		obExit(false);
+	if (isset($_REQUEST['xml'])) {
+			obExit(false);
+	}
 
 	// Attempt to detect if they came from dlattach.
-	if (SMF != 'SSI' && empty($context['theme_loaded']))
-		loadTheme();
+	if (SMF != 'SSI' && empty($context['theme_loaded'])) {
+			loadTheme();
+	}
 
 	// Never redirect to an attachment
-	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false)
-		$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) {
+			$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+	}
 
 	// Load the Login template and language file.
 	loadLanguage('Login');
@@ -124,8 +135,7 @@ 
 	{
 		$_SESSION['login_url'] = $scripturl . '?' . $_SERVER['QUERY_STRING'];
 		redirectexit('action=login');
-	}
-	else
+	} else
 	{
 		loadTemplate('Login');
 		$context['sub_template'] = 'kick_guest';
@@ -155,8 +165,9 @@ 
 	global $sourcedir, $cookiename, $user_settings, $smcFunc;
 
 	// You cannot be banned if you are an admin - doesn't help if you log out.
-	if ($user_info['is_admin'])
-		return;
+	if ($user_info['is_admin']) {
+			return;
+	}
 
 	// Only check the ban every so often. (to reduce load.)
 	if ($forceCheck || !isset($_SESSION['ban']) || empty($modSettings['banLastUpdated']) || ($_SESSION['ban']['last_checked'] < $modSettings['banLastUpdated']) || $_SESSION['ban']['id_member'] != $user_info['id'] || $_SESSION['ban']['ip'] != $user_info['ip'] || $_SESSION['ban']['ip2'] != $user_info['ip2'] || (isset($user_info['email'], $_SESSION['ban']['email']) && $_SESSION['ban']['email'] != $user_info['email']))
@@ -177,8 +188,9 @@ 
 		// Check both IP addresses.
 		foreach (array('ip', 'ip2') as $ip_number)
 		{
-			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip'])
-				continue;
+			if ($ip_number == 'ip2' && $user_info['ip2'] == $user_info['ip']) {
+							continue;
+			}
 			$ban_query[] = ' {inet:' . $ip_number . '} BETWEEN bi.ip_low and bi.ip_high';
 			$ban_query_vars[$ip_number] = $user_info[$ip_number];
 			// IP was valid, maybe there's also a hostname...
@@ -228,24 +240,28 @@ 
 			// Store every type of ban that applies to you in your session.
 			while ($row = $smcFunc['db_fetch_assoc']($request))
 			{
-				foreach ($restrictions as $restriction)
-					if (!empty($row[$restriction]))
+				foreach ($restrictions as $restriction) {
+									if (!empty($row[$restriction]))
 					{
 						$_SESSION['ban'][$restriction]['reason'] = $row['reason'];
+				}
 						$_SESSION['ban'][$restriction]['ids'][] = $row['id_ban'];
-						if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time'])))
-							$_SESSION['ban']['expire_time'] = $row['expire_time'];
+						if (!isset($_SESSION['ban']['expire_time']) || ($_SESSION['ban']['expire_time'] != 0 && ($row['expire_time'] == 0 || $row['expire_time'] > $_SESSION['ban']['expire_time']))) {
+													$_SESSION['ban']['expire_time'] = $row['expire_time'];
+						}
 
-						if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email']))
-							$flag_is_activated = true;
+						if (!$user_info['is_guest'] && $restriction == 'cannot_access' && ($row['id_member'] == $user_info['id'] || $row['email_address'] == $user_info['email'])) {
+													$flag_is_activated = true;
+						}
 					}
 			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Mark the cannot_access and cannot_post bans as being 'hit'.
-		if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login']))
-			log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()));
+		if (isset($_SESSION['ban']['cannot_access']) || isset($_SESSION['ban']['cannot_post']) || isset($_SESSION['ban']['cannot_login'])) {
+					log_ban(array_merge(isset($_SESSION['ban']['cannot_access']) ? $_SESSION['ban']['cannot_access']['ids'] : array(), isset($_SESSION['ban']['cannot_post']) ? $_SESSION['ban']['cannot_post']['ids'] : array(), isset($_SESSION['ban']['cannot_login']) ? $_SESSION['ban']['cannot_login']['ids'] : array()));
+		}
 
 		// If for whatever reason the is_activated flag seems wrong, do a little work to clear it up.
 		if ($user_info['id'] && (($user_settings['is_activated'] >= 10 && !$flag_is_activated)
@@ -260,8 +276,9 @@ 
 	if (!isset($_SESSION['ban']['cannot_access']) && !empty($_COOKIE[$cookiename . '_']))
 	{
 		$bans = explode(',', $_COOKIE[$cookiename . '_']);
-		foreach ($bans as $key => $value)
-			$bans[$key] = (int) $value;
+		foreach ($bans as $key => $value) {
+					$bans[$key] = (int) $value;
+		}
 		$request = $smcFunc['db_query']('', '
 			SELECT bi.id_ban, bg.reason
 			FROM {db_prefix}ban_items AS bi
@@ -297,14 +314,15 @@ 
 	if (isset($_SESSION['ban']['cannot_access']))
 	{
 		// We don't wanna see you!
-		if (!$user_info['is_guest'])
-			$smcFunc['db_query']('', '
+		if (!$user_info['is_guest']) {
+					$smcFunc['db_query']('', '
 				DELETE FROM {db_prefix}log_online
 				WHERE id_member = {int:current_member}',
 				array(
 					'current_member' => $user_info['id'],
 				)
 			);
+		}
 
 		// 'Log' the user out.  Can't have any funny business... (save the name!)
 		$old_name = isset($user_info['name']) && $user_info['name'] != '' ? $user_info['name'] : $txt['guest_title'];
@@ -390,9 +408,10 @@ 
 	}
 
 	// Fix up the banning permissions.
-	if (isset($user_info['permissions']))
-		banPermissions();
-}
+	if (isset($user_info['permissions'])) {
+			banPermissions();
+	}
+	}
 
 /**
  * Fix permissions according to ban status.
@@ -403,8 +422,9 @@ 
 	global $user_info, $sourcedir, $modSettings, $context;
 
 	// Somehow they got here, at least take away all permissions...
-	if (isset($_SESSION['ban']['cannot_access']))
-		$user_info['permissions'] = array();
+	if (isset($_SESSION['ban']['cannot_access'])) {
+			$user_info['permissions'] = array();
+	}
 	// Okay, well, you can watch, but don't touch a thing.
 	elseif (isset($_SESSION['ban']['cannot_post']) || (!empty($modSettings['warning_mute']) && $modSettings['warning_mute'] <= $user_info['warning']))
 	{
@@ -446,19 +466,20 @@ 
 		call_integration_hook('integrate_warn_permissions', array(&$permission_change));
 		foreach ($permission_change as $old => $new)
 		{
-			if (!in_array($old, $user_info['permissions']))
-				unset($permission_change[$old]);
-			else
-				$user_info['permissions'][] = $new;
+			if (!in_array($old, $user_info['permissions'])) {
+							unset($permission_change[$old]);
+			} else {
+							$user_info['permissions'][] = $new;
+			}
 		}
 		$user_info['permissions'] = array_diff($user_info['permissions'], array_keys($permission_change));
 	}
 
 	// @todo Find a better place to call this? Needs to be after permissions loaded!
 	// Finally, some bits we cache in the session because it saves queries.
-	if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id'])
-		$user_info['mod_cache'] = $_SESSION['mc'];
-	else
+	if (isset($_SESSION['mc']) && $_SESSION['mc']['time'] > $modSettings['settings_updated'] && $_SESSION['mc']['id'] == $user_info['id']) {
+			$user_info['mod_cache'] = $_SESSION['mc'];
+	} else
 	{
 		require_once($sourcedir . '/Subs-Auth.php');
 		rebuildModCache();
@@ -469,14 +490,12 @@ 
 	{
 		$context['open_mod_reports'] = $_SESSION['rc']['reports'];
 		$context['open_member_reports'] = $_SESSION['rc']['member_reports'];
-	}
-	elseif ($_SESSION['mc']['bq'] != '0=1')
+	} elseif ($_SESSION['mc']['bq'] != '0=1')
 	{
 		require_once($sourcedir . '/Subs-ReportedContent.php');
 		$context['open_mod_reports'] = recountOpenReports('posts');
 		$context['open_member_reports'] = recountOpenReports('members');
-	}
-	else
+	} else
 	{
 		$context['open_mod_reports'] = 0;
 		$context['open_member_reports'] = 0;
@@ -496,8 +515,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Don't log web accelerators, it's very confusing...
-	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
-		return;
+	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch') {
+			return;
+	}
 
 	$smcFunc['db_insert']('',
 		'{db_prefix}log_banned',
@@ -507,8 +527,8 @@ 
 	);
 
 	// One extra point for these bans.
-	if (!empty($ban_ids))
-		$smcFunc['db_query']('', '
+	if (!empty($ban_ids)) {
+			$smcFunc['db_query']('', '
 			UPDATE {db_prefix}ban_items
 			SET hits = hits + 1
 			WHERE id_ban IN ({array_int:ban_ids})',
@@ -516,7 +536,8 @@ 
 				'ban_ids' => $ban_ids,
 			)
 		);
-}
+	}
+	}
 
 /**
  * Checks if a given email address might be banned.
@@ -532,8 +553,9 @@ 
 	global $txt, $smcFunc;
 
 	// Can't ban an empty email
-	if (empty($email) || trim($email) == '')
-		return;
+	if (empty($email) || trim($email) == '') {
+			return;
+	}
 
 	// Let's start with the bans based on your IP/hostname/memberID...
 	$ban_ids = isset($_SESSION['ban'][$restriction]) ? $_SESSION['ban'][$restriction]['ids'] : array();
@@ -606,16 +628,18 @@ 
 	if ($type == 'post')
 	{
 		$check = isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null);
-		if ($check !== $sc)
-			$error = 'session_timeout';
+		if ($check !== $sc) {
+					$error = 'session_timeout';
+		}
 	}
 
 	// How about $_GET['sesc']?
 	elseif ($type == 'get')
 	{
 		$check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : null);
-		if ($check !== $sc)
-			$error = 'session_verify_fail';
+		if ($check !== $sc) {
+					$error = 'session_verify_fail';
+		}
 	}
 
 	// Or can it be in either?
@@ -623,13 +647,15 @@ 
 	{
 		$check = isset($_GET[$_SESSION['session_var']]) ? $_GET[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_GET['sesc']) ? $_GET['sesc'] : (isset($_POST[$_SESSION['session_var']]) ? $_POST[$_SESSION['session_var']] : (empty($modSettings['strictSessionCheck']) && isset($_POST['sc']) ? $_POST['sc'] : null)));
 
-		if ($check !== $sc)
-			$error = 'session_verify_fail';
+		if ($check !== $sc) {
+					$error = 'session_verify_fail';
+		}
 	}
 
 	// Verify that they aren't changing user agents on us - that could be bad.
-	if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA']))
-		$error = 'session_verify_fail';
+	if ((!isset($_SESSION['USER_AGENT']) || $_SESSION['USER_AGENT'] != $_SERVER['HTTP_USER_AGENT']) && empty($modSettings['disableCheckUA'])) {
+			$error = 'session_verify_fail';
+	}
 
 	// Make sure a page with session check requirement is not being prefetched.
 	if (isset($_SERVER['HTTP_X_MOZ']) && $_SERVER['HTTP_X_MOZ'] == 'prefetch')
@@ -640,30 +666,35 @@ 
 	}
 
 	// Check the referring site - it should be the same server at least!
-	if (isset($_SESSION['request_referer']))
-		$referrer = $_SESSION['request_referer'];
-	else
-		$referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
+	if (isset($_SESSION['request_referer'])) {
+			$referrer = $_SESSION['request_referer'];
+	} else {
+			$referrer = isset($_SERVER['HTTP_REFERER']) ? @parse_url($_SERVER['HTTP_REFERER']) : array();
+	}
 	if (!empty($referrer['host']))
 	{
-		if (strpos($_SERVER['HTTP_HOST'], ':') !== false)
-			$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
-		else
-			$real_host = $_SERVER['HTTP_HOST'];
+		if (strpos($_SERVER['HTTP_HOST'], ':') !== false) {
+					$real_host = substr($_SERVER['HTTP_HOST'], 0, strpos($_SERVER['HTTP_HOST'], ':'));
+		} else {
+					$real_host = $_SERVER['HTTP_HOST'];
+		}
 
 		$parsed_url = parse_url($boardurl);
 
 		// Are global cookies on?  If so, let's check them ;).
 		if (!empty($modSettings['globalCookies']))
 		{
-			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-				$parsed_url['host'] = $parts[1];
+			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $parsed_url['host'], $parts) == 1) {
+							$parsed_url['host'] = $parts[1];
+			}
 
-			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1)
-				$referrer['host'] = $parts[1];
+			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $referrer['host'], $parts) == 1) {
+							$referrer['host'] = $parts[1];
+			}
 
-			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1)
-				$real_host = $parts[1];
+			if (preg_match('~(?:[^\.]+\.)?([^\.]{3,}\..+)\z~i', $real_host, $parts) == 1) {
+							$real_host = $parts[1];
+			}
 		}
 
 		// Okay: referrer must either match parsed_url or real_host.
@@ -681,12 +712,14 @@ 
 		$log_error = true;
 	}
 
-	if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker')
-		fatal_error('Sound the alarm!  It\'s a hacker!  Close the castle gates!!', false);
+	if (strtolower($_SERVER['HTTP_USER_AGENT']) == 'hacker') {
+			fatal_error('Sound the alarm!  It\'s a hacker!  Close the castle gates!!', false);
+	}
 
 	// Everything is ok, return an empty string.
-	if (!isset($error))
-		return '';
+	if (!isset($error)) {
+			return '';
+	}
 	// A session error occurred, show the error.
 	elseif ($is_fatal)
 	{
@@ -695,13 +728,14 @@ 
 			ob_end_clean();
 			header('HTTP/1.1 403 Forbidden - Session timeout');
 			die;
+		} else {
+					fatal_lang_error($error, isset($log_error) ? 'user' : false);
 		}
-		else
-			fatal_lang_error($error, isset($log_error) ? 'user' : false);
 	}
 	// A session error occurred, return the error to the calling function.
-	else
-		return $error;
+	else {
+			return $error;
+	}
 
 	// We really should never fall through here, for very important reasons.  Let's make sure.
 	trigger_error('Hacking attempt...', E_USER_ERROR);
@@ -717,10 +751,9 @@ 
 {
 	global $modSettings;
 
-	if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action])
-		return true;
-
-	else
+	if (isset($_GET['confirm']) && isset($_SESSION['confirm_' . $action]) && md5($_GET['confirm'] . $_SERVER['HTTP_USER_AGENT']) == $_SESSION['confirm_' . $action]) {
+			return true;
+	} else
 	{
 		$token = md5(mt_rand() . session_id() . (string) microtime() . $modSettings['rand_seed']);
 		$_SESSION['confirm_' . $action] = md5($token . $_SERVER['HTTP_USER_AGENT']);
@@ -771,9 +804,9 @@ 
 			$return = $_SESSION['token'][$type . '-' . $action][3];
 			unset($_SESSION['token'][$type . '-' . $action]);
 			return $return;
+		} else {
+					return '';
 		}
-		else
-			return '';
 	}
 
 	// This nasty piece of code validates a token.
@@ -804,12 +837,14 @@ 
 		fatal_lang_error('token_verify_fail', false);
 	}
 	// Remove this token as its useless
-	else
-		unset($_SESSION['token'][$type . '-' . $action]);
+	else {
+			unset($_SESSION['token'][$type . '-' . $action]);
+	}
 
 	// Randomly check if we should remove some older tokens.
-	if (mt_rand(0, 138) == 23)
-		cleanTokens();
+	if (mt_rand(0, 138) == 23) {
+			cleanTokens();
+	}
 
 	return false;
 }
@@ -824,14 +859,16 @@ 
 function cleanTokens($complete = false)
 {
 	// We appreciate cleaning up after yourselves.
-	if (!isset($_SESSION['token']))
-		return;
+	if (!isset($_SESSION['token'])) {
+			return;
+	}
 
 	// Clean up tokens, trying to give enough time still.
-	foreach ($_SESSION['token'] as $key => $data)
-		if ($data[2] + 10800 < time() || $complete)
+	foreach ($_SESSION['token'] as $key => $data) {
+			if ($data[2] + 10800 < time() || $complete)
 			unset($_SESSION['token'][$key]);
-}
+	}
+	}
 
 /**
  * Check whether a form has been submitted twice.
@@ -849,37 +886,40 @@ 
 {
 	global $context;
 
-	if (!isset($_SESSION['forms']))
-		$_SESSION['forms'] = array();
+	if (!isset($_SESSION['forms'])) {
+			$_SESSION['forms'] = array();
+	}
 
 	// Register a form number and store it in the session stack. (use this on the page that has the form.)
 	if ($action == 'register')
 	{
 		$context['form_sequence_number'] = 0;
-		while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms']))
-			$context['form_sequence_number'] = mt_rand(1, 16000000);
+		while (empty($context['form_sequence_number']) || in_array($context['form_sequence_number'], $_SESSION['forms'])) {
+					$context['form_sequence_number'] = mt_rand(1, 16000000);
+		}
 	}
 	// Check whether the submitted number can be found in the session.
 	elseif ($action == 'check')
 	{
-		if (!isset($_REQUEST['seqnum']))
-			return true;
-		elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms']))
+		if (!isset($_REQUEST['seqnum'])) {
+					return true;
+		} elseif (!in_array($_REQUEST['seqnum'], $_SESSION['forms']))
 		{
 			$_SESSION['forms'][] = (int) $_REQUEST['seqnum'];
 			return true;
+		} elseif ($is_fatal) {
+					fatal_lang_error('error_form_already_submitted', false);
+		} else {
+					return false;
 		}
-		elseif ($is_fatal)
-			fatal_lang_error('error_form_already_submitted', false);
-		else
-			return false;
 	}
 	// Don't check, just free the stack number.
-	elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms']))
-		$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
-	elseif ($action != 'free')
-		trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING);
-}
+	elseif ($action == 'free' && isset($_REQUEST['seqnum']) && in_array($_REQUEST['seqnum'], $_SESSION['forms'])) {
+			$_SESSION['forms'] = array_diff($_SESSION['forms'], array($_REQUEST['seqnum']));
+	} elseif ($action != 'free') {
+			trigger_error('checkSubmitOnce(): Invalid action \'' . $action . '\'', E_USER_WARNING);
+	}
+	}
 
 /**
  * Check the user's permissions.
@@ -898,16 +938,19 @@ 
 	global $user_info, $smcFunc;
 
 	// You're always allowed to do nothing. (unless you're a working man, MR. LAZY :P!)
-	if (empty($permission))
-		return true;
+	if (empty($permission)) {
+			return true;
+	}
 
 	// You're never allowed to do something if your data hasn't been loaded yet!
-	if (empty($user_info))
-		return false;
+	if (empty($user_info)) {
+			return false;
+	}
 
 	// Administrators are supermen :P.
-	if ($user_info['is_admin'])
-		return true;
+	if ($user_info['is_admin']) {
+			return true;
+	}
 
 	// Let's ensure this is an array.
 	$permission = (array) $permission;
@@ -915,14 +958,16 @@ 
 	// Are we checking the _current_ board, or some other boards?
 	if ($boards === null)
 	{
-		if (count(array_intersect($permission, $user_info['permissions'])) != 0)
-			return true;
+		if (count(array_intersect($permission, $user_info['permissions'])) != 0) {
+					return true;
+		}
 		// You aren't allowed, by default.
-		else
-			return false;
+		else {
+					return false;
+		}
+	} elseif (!is_array($boards)) {
+			$boards = array($boards);
 	}
-	elseif (!is_array($boards))
-		$boards = array($boards);
 
 	$request = $smcFunc['db_query']('', '
 		SELECT MIN(bp.add_deny) AS add_deny
@@ -950,20 +995,23 @@ 
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
 			$result = !empty($row['add_deny']);
-			if ($result == true)
-				break;
+			if ($result == true) {
+							break;
+			}
 		}
 		$smcFunc['db_free_result']($request);
 		return $result;
 	}
 
 	// Make sure they can do it on all of the boards.
-	if ($smcFunc['db_num_rows']($request) != count($boards))
-		return false;
+	if ($smcFunc['db_num_rows']($request) != count($boards)) {
+			return false;
+	}
 
 	$result = true;
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$result &= !empty($row['add_deny']);
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$result &= !empty($row['add_deny']);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If the query returned 1, they can do it... otherwise, they can't.
@@ -1030,9 +1078,10 @@ 
 
 	// If you're doing something on behalf of some "heavy" permissions, validate your session.
 	// (take out the heavy permissions, and if you can't do anything but those, you need a validated session.)
-	if (!allowedTo(array_diff($permission, $heavy_permissions), $boards))
-		validateSession();
-}
+	if (!allowedTo(array_diff($permission, $heavy_permissions), $boards)) {
+			validateSession();
+	}
+	}
 
 /**
  * Return the boards a user has a certain (board) permission on. (array(0) if all.)
@@ -1051,8 +1100,9 @@ 
 	global $user_info, $smcFunc;
 
 	// Arrays are nice, most of the time.
-	if (!is_array($permissions))
-		$permissions = array($permissions);
+	if (!is_array($permissions)) {
+			$permissions = array($permissions);
+	}
 
 	/*
 	 * Set $simple to true to use this function as it were in SMF 2.0.x.
@@ -1064,13 +1114,14 @@ 
 	// Administrators are all powerful, sorry.
 	if ($user_info['is_admin'])
 	{
-		if ($simple)
-			return array(0);
-		else
+		if ($simple) {
+					return array(0);
+		} else
 		{
 			$boards = array();
-			foreach ($permissions as $permission)
-				$boards[$permission] = array(0);
+			foreach ($permissions as $permission) {
+							$boards[$permission] = array(0);
+			}
 
 			return $boards;
 		}
@@ -1102,31 +1153,32 @@ 
 	{
 		if ($simple)
 		{
-			if (empty($row['add_deny']))
-				$deny_boards[] = $row['id_board'];
-			else
-				$boards[] = $row['id_board'];
-		}
-		else
+			if (empty($row['add_deny'])) {
+							$deny_boards[] = $row['id_board'];
+			} else {
+							$boards[] = $row['id_board'];
+			}
+		} else
 		{
-			if (empty($row['add_deny']))
-				$deny_boards[$row['permission']][] = $row['id_board'];
-			else
-				$boards[$row['permission']][] = $row['id_board'];
+			if (empty($row['add_deny'])) {
+							$deny_boards[$row['permission']][] = $row['id_board'];
+			} else {
+							$boards[$row['permission']][] = $row['id_board'];
+			}
 		}
 	}
 	$smcFunc['db_free_result']($request);
 
-	if ($simple)
-		$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
-	else
+	if ($simple) {
+			$boards = array_unique(array_values(array_diff($boards, $deny_boards)));
+	} else
 	{
 		foreach ($permissions as $permission)
 		{
 			// never had it to start with
-			if (empty($boards[$permission]))
-				$boards[$permission] = array();
-			else
+			if (empty($boards[$permission])) {
+							$boards[$permission] = array();
+			} else
 			{
 				// Or it may have been removed
 				$deny_boards[$permission] = isset($deny_boards[$permission]) ? $deny_boards[$permission] : array();
@@ -1162,10 +1214,11 @@ 
 
 
 	// Moderators are free...
-	if (!allowedTo('moderate_board'))
-		$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime'];
-	else
-		$timeLimit = 2;
+	if (!allowedTo('moderate_board')) {
+			$timeLimit = isset($timeOverrides[$error_type]) ? $timeOverrides[$error_type] : $modSettings['spamWaitTime'];
+	} else {
+			$timeLimit = 2;
+	}
 
 	call_integration_hook('integrate_spam_protection', array(&$timeOverrides, &$timeLimit));
 
@@ -1192,8 +1245,9 @@ 
 	if ($smcFunc['db_affected_rows']() != 1)
 	{
 		// Spammer!  You only have to wait a *few* seconds!
-		if (!$only_return_result)
-			fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit));
+		if (!$only_return_result) {
+					fatal_lang_error($error_type . '_WaitTime_broken', false, array($timeLimit));
+		}
 
 		return true;
 	}
@@ -1211,11 +1265,13 @@ 
  */
 function secureDirectory($path, $attachments = false)
 {
-	if (empty($path))
-		return 'empty_path';
+	if (empty($path)) {
+			return 'empty_path';
+	}
 
-	if (!is_writable($path))
-		return 'path_not_writable';
+	if (!is_writable($path)) {
+			return 'path_not_writable';
+	}
 
 	$directoryname = basename($path);
 
@@ -1227,9 +1283,9 @@ 
 
 RemoveHandler .php .php3 .phtml .cgi .fcgi .pl .fpl .shtml';
 
-	if (file_exists($path . '/.htaccess'))
-		$errors[] = 'htaccess_exists';
-	else
+	if (file_exists($path . '/.htaccess')) {
+			$errors[] = 'htaccess_exists';
+	} else
 	{
 		$fh = @fopen($path . '/.htaccess', 'w');
 		if ($fh) {
@@ -1241,9 +1297,9 @@ 
 		$errors[] = 'htaccess_cannot_create_file';
 	}
 
-	if (file_exists($path . '/index.php'))
-		$errors[] = 'index-php_exists';
-	else
+	if (file_exists($path . '/index.php')) {
+			$errors[] = 'index-php_exists';
+	} else
 	{
 		$fh = @fopen($path . '/index.php', 'w');
 		if ($fh) {
@@ -1270,11 +1326,12 @@ 
 		$errors[] = 'index-php_cannot_create_file';
 	}
 
-	if (!empty($errors))
-		return $errors;
-	else
-		return true;
-}
+	if (!empty($errors)) {
+			return $errors;
+	} else {
+			return true;
+	}
+	}
 
 /**
 * This sets the X-Frame-Options header.
@@ -1287,14 +1344,16 @@ 
 	global $modSettings;
 
 	$option = 'SAMEORIGIN';
-	if (is_null($override) && !empty($modSettings['frame_security']))
-		$option = $modSettings['frame_security'];
-	elseif (in_array($override, array('SAMEORIGIN', 'DENY')))
-		$option = $override;
+	if (is_null($override) && !empty($modSettings['frame_security'])) {
+			$option = $modSettings['frame_security'];
+	} elseif (in_array($override, array('SAMEORIGIN', 'DENY'))) {
+			$option = $override;
+	}
 
 	// Don't bother setting the header if we have disabled it.
-	if ($option == 'DISABLE')
-		return;
+	if ($option == 'DISABLE') {
+			return;
+	}
 
 	// Finally set it.
 	header('x-frame-options: ' . $option);

Sources/Subs-Auth.php

Braces +168 added lines, -121 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	die('No direct access...');
+}
 
 /**
  * Sets the SMF-style login cookie and session based on the id_member and password passed.
@@ -47,8 +48,9 @@ 
 	if (isset($_COOKIE[$cookiename]))
 	{
 		// First check for 2.1 json-format cookie
-		if (preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+,"3":"[^"]+","4":"[^"]+"~', $_COOKIE[$cookiename]) === 1)
-			list(,,, $old_domain, $old_path) = $smcFunc['json_decode']($_COOKIE[$cookiename], true);
+		if (preg_match('~^{"0":\d+,"1":"[0-9a-f]*","2":\d+,"3":"[^"]+","4":"[^"]+"~', $_COOKIE[$cookiename]) === 1) {
+					list(,,, $old_domain, $old_path) = $smcFunc['json_decode']($_COOKIE[$cookiename], true);
+		}
 
 		// Legacy format (for recent 2.0 --> 2.1 upgrades)
 		elseif (preg_match('~^a:[34]:\{i:0;i:\d+;i:1;s:(0|128):"([a-fA-F0-9]{128})?";i:2;[id]:\d+;(i:3;i:\d;)?~', $_COOKIE[$cookiename]) === 1)
@@ -58,15 +60,17 @@ 
 			$cookie_state = (empty($modSettings['localCookies']) ? 0 : 1) | (empty($modSettings['globalCookies']) ? 0 : 2);
 
 			// Maybe we need to temporarily pretend to be using local cookies
-			if ($cookie_state == 0 && $old_state == 1)
-				list($old_domain, $old_path) = url_parts(true, false);
-			else
-				list($old_domain, $old_path) = url_parts($old_state & 1 > 0, $old_state & 2 > 0);
+			if ($cookie_state == 0 && $old_state == 1) {
+							list($old_domain, $old_path) = url_parts(true, false);
+			} else {
+							list($old_domain, $old_path) = url_parts($old_state & 1 > 0, $old_state & 2 > 0);
+			}
 		}
 
 		// Out with the old, in with the new!
-		if (isset($old_domain) && $old_domain != $cookie_url[0] || isset($old_path) && $old_path != $cookie_url[1])
-			smf_setcookie($cookiename, $smcFunc['json_encode'](array(0, '', 0, $old_domain, $old_path), JSON_FORCE_OBJECT), 1, $old_path, $old_domain);
+		if (isset($old_domain) && $old_domain != $cookie_url[0] || isset($old_path) && $old_path != $cookie_url[1]) {
+					smf_setcookie($cookiename, $smcFunc['json_encode'](array(0, '', 0, $old_domain, $old_path), JSON_FORCE_OBJECT), 1, $old_path, $old_domain);
+		}
 	}
 
 	// Get the data and path to set it on.
@@ -82,8 +86,9 @@ 
 	smf_setcookie($cookiename, $data, $expiry_time, $cookie_url[1], $cookie_url[0]);
 
 	// If subdomain-independent cookies are on, unset the subdomain-dependent cookie too.
-	if (empty($id) && !empty($modSettings['globalCookies']))
-		smf_setcookie($cookiename, $data, $expiry_time, $cookie_url[1], '');
+	if (empty($id) && !empty($modSettings['globalCookies'])) {
+			smf_setcookie($cookiename, $data, $expiry_time, $cookie_url[1], '');
+	}
 
 	// Any alias URLs?  This is mainly for use with frames, etc.
 	if (!empty($modSettings['forum_alias_urls']))
@@ -99,8 +104,9 @@ 
 
 			$cookie_url = url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies']));
 
-			if ($cookie_url[0] == '')
-				$cookie_url[0] = strtok($alias, '/');
+			if ($cookie_url[0] == '') {
+							$cookie_url[0] = strtok($alias, '/');
+			}
 
 			$alias_data = $smcFunc['json_decode']($data, true);
 			$alias_data[3] = $cookie_url[0];
@@ -151,8 +157,9 @@ 
 	$identifier = $cookiename . '_tfa';
 	$cookie_url = url_parts(!empty($modSettings['localCookies']), !empty($modSettings['globalCookies']));
 
-	if ($preserve)
-		$cookie_length = 81600 * 30;
+	if ($preserve) {
+			$cookie_length = 81600 * 30;
+	}
 
 	// Get the data and path to set it on.
 	$data = $smcFunc['json_encode'](empty($id) ? array(0, '', 0, $cookie_url[0], $cookie_url[1], false) : array($id, $secret, time() + $cookie_length, $cookie_url[0], $cookie_url[1], $preserve), JSON_FORCE_OBJECT);
@@ -161,8 +168,9 @@ 
 	smf_setcookie($identifier, $data, time() + $cookie_length, $cookie_url[1], $cookie_url[0]);
 
 	// If subdomain-independent cookies are on, unset the subdomain-dependent cookie too.
-	if (empty($id) && !empty($modSettings['globalCookies']))
-		smf_setcookie($identifier, $data, time() + $cookie_length, $cookie_url[1], '');
+	if (empty($id) && !empty($modSettings['globalCookies'])) {
+			smf_setcookie($identifier, $data, time() + $cookie_length, $cookie_url[1], '');
+	}
 
 	$_COOKIE[$identifier] = $data;
 }
@@ -184,23 +192,28 @@ 
 	$parsed_url = parse_url($boardurl);
 
 	// Is local cookies off?
-	if (empty($parsed_url['path']) || !$local)
-		$parsed_url['path'] = '';
+	if (empty($parsed_url['path']) || !$local) {
+			$parsed_url['path'] = '';
+	}
 
-	if (!empty($modSettings['globalCookiesDomain']) && strpos($boardurl, $modSettings['globalCookiesDomain']) !== false)
-		$parsed_url['host'] = $modSettings['globalCookiesDomain'];
+	if (!empty($modSettings['globalCookiesDomain']) && strpos($boardurl, $modSettings['globalCookiesDomain']) !== false) {
+			$parsed_url['host'] = $modSettings['globalCookiesDomain'];
+	}
 
 	// Globalize cookies across domains (filter out IP-addresses)?
-	elseif ($global && preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1)
-		$parsed_url['host'] = '.' . $parts[1];
+	elseif ($global && preg_match('~^\d{1,3}(\.\d{1,3}){3}$~', $parsed_url['host']) == 0 && preg_match('~(?:[^\.]+\.)?([^\.]{2,}\..+)\z~i', $parsed_url['host'], $parts) == 1) {
+			$parsed_url['host'] = '.' . $parts[1];
+	}
 
 	// We shouldn't use a host at all if both options are off.
-	elseif (!$local && !$global)
-		$parsed_url['host'] = '';
+	elseif (!$local && !$global) {
+			$parsed_url['host'] = '';
+	}
 
 	// The host also shouldn't be set if there aren't any dots in it.
-	elseif (!isset($parsed_url['host']) || strpos($parsed_url['host'], '.') === false)
-		$parsed_url['host'] = '';
+	elseif (!isset($parsed_url['host']) || strpos($parsed_url['host'], '.') === false) {
+			$parsed_url['host'] = '';
+	}
 
 	return array($parsed_url['host'], $parsed_url['path'] . '/');
 }
@@ -219,8 +232,9 @@ 
 	createToken('login');
 
 	// Never redirect to an attachment
-	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false)
-		$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+	if (strpos($_SERVER['REQUEST_URL'], 'dlattach') === false) {
+			$_SESSION['login_url'] = $_SERVER['REQUEST_URL'];
+	}
 
 	$context['sub_template'] = 'kick_guest';
 	$context['page_title'] = $txt['login'];
@@ -275,10 +289,12 @@ 
 		$txt['security_wrong'] = sprintf($txt['security_wrong'], isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : $txt['unknown'], $_SERVER['HTTP_USER_AGENT'], $user_info['ip']);
 		log_error($txt['security_wrong'], 'critical');
 
-		if (isset($_POST[$type . '_hash_pass']))
-			unset($_POST[$type . '_hash_pass']);
-		if (isset($_POST[$type . '_pass']))
-			unset($_POST[$type . '_pass']);
+		if (isset($_POST[$type . '_hash_pass'])) {
+					unset($_POST[$type . '_hash_pass']);
+		}
+		if (isset($_POST[$type . '_pass'])) {
+					unset($_POST[$type . '_pass']);
+		}
 
 		$context['incorrect_password'] = true;
 	}
@@ -291,15 +307,17 @@ 
 
 	// Now go through $_POST.  Make sure the session hash is sent.
 	$_POST[$context['session_var']] = $context['session_id'];
-	foreach ($_POST as $k => $v)
-		$context['post_data'] .= adminLogin_outputPostVars($k, $v);
+	foreach ($_POST as $k => $v) {
+			$context['post_data'] .= adminLogin_outputPostVars($k, $v);
+	}
 
 	// Now we'll use the admin_login sub template of the Login template.
 	$context['sub_template'] = 'admin_login';
 
 	// And title the page something like "Login".
-	if (!isset($context['page_title']))
-		$context['page_title'] = $txt['login'];
+	if (!isset($context['page_title'])) {
+			$context['page_title'] = $txt['login'];
+	}
 
 	// The type of action.
 	$context['sessionCheckType'] = $type;
@@ -322,14 +340,15 @@ 
 {
 	global $smcFunc;
 
-	if (!is_array($v))
-		return '
+	if (!is_array($v)) {
+			return '
 <input type="hidden" name="' . $smcFunc['htmlspecialchars']($k) . '" value="' . strtr($v, array('"' => '&quot;', '<' => '&lt;', '>' => '&gt;')) . '">';
-	else
+	} else
 	{
 		$ret = '';
-		foreach ($v as $k2 => $v2)
-			$ret .= adminLogin_outputPostVars($k . '[' . $k2 . ']', $v2);
+		foreach ($v as $k2 => $v2) {
+					$ret .= adminLogin_outputPostVars($k . '[' . $k2 . ']', $v2);
+		}
 
 		return $ret;
 	}
@@ -356,18 +375,20 @@ 
 		foreach ($get as $k => $v)
 		{
 			// Only if it's not already in the $scripturl!
-			if (!isset($temp[$k]))
-				$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+			if (!isset($temp[$k])) {
+							$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+			}
 			// If it changed, put it out there, but with an ampersand.
-			elseif ($temp[$k] != $get[$k])
-				$query_string .= urlencode($k) . '=' . urlencode($v) . '&amp;';
+			elseif ($temp[$k] != $get[$k]) {
+							$query_string .= urlencode($k) . '=' . urlencode($v) . '&amp;';
+			}
 		}
-	}
-	else
+	} else
 	{
 		// Add up all the data from $_GET into get_data.
-		foreach ($get as $k => $v)
-			$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+		foreach ($get as $k => $v) {
+					$query_string .= urlencode($k) . '=' . urlencode($v) . ';';
+		}
 	}
 
 	$query_string = substr($query_string, 0, -1);
@@ -390,8 +411,9 @@ 
 	global $scripturl, $user_info, $smcFunc;
 
 	// If it's not already an array, make it one.
-	if (!is_array($names))
-		$names = explode(',', $names);
+	if (!is_array($names)) {
+			$names = explode(',', $names);
+	}
 
 	$maybe_email = false;
 	$names_list = array();
@@ -403,10 +425,11 @@ 
 		$maybe_email |= strpos($name, '@') !== false;
 
 		// Make it so standard wildcards will work. (* and ?)
-		if ($use_wildcards)
-			$names[$i] = strtr($names[$i], array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '\'' => '&#039;'));
-		else
-			$names[$i] = strtr($names[$i], array('\'' => '&#039;'));
+		if ($use_wildcards) {
+					$names[$i] = strtr($names[$i], array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '\'' => '&#039;'));
+		} else {
+					$names[$i] = strtr($names[$i], array('\'' => '&#039;'));
+		}
 
 		$names_list[] = '{string:lookup_name_' . $i . '}';
 		$where_params['lookup_name_' . $i] = $names[$i];
@@ -419,11 +442,12 @@ 
 	$results = array();
 
 	// This ensures you can't search someones email address if you can't see it.
-	if (($use_wildcards || $maybe_email) && allowedTo('moderate_forum'))
-		$email_condition = '
+	if (($use_wildcards || $maybe_email) && allowedTo('moderate_forum')) {
+			$email_condition = '
 			OR (email_address ' . $comparison . ' \'' . implode('\') OR (email_address ' . $comparison . ' \'', $names) . '\')';
-	else
-		$email_condition = '';
+	} else {
+			$email_condition = '';
+	}
 
 	// Get the case of the columns right - but only if we need to as things like MySQL will go slow needlessly otherwise.
 	$member_name = $smcFunc['db_case_sensitive'] ? 'LOWER(member_name)' : 'member_name';
@@ -482,10 +506,11 @@ 
 	$context['template_layers'] = array();
 	$context['sub_template'] = 'find_members';
 
-	if (isset($_REQUEST['search']))
-		$context['last_search'] = $smcFunc['htmlspecialchars']($_REQUEST['search'], ENT_QUOTES);
-	else
-		$_REQUEST['start'] = 0;
+	if (isset($_REQUEST['search'])) {
+			$context['last_search'] = $smcFunc['htmlspecialchars']($_REQUEST['search'], ENT_QUOTES);
+	} else {
+			$_REQUEST['start'] = 0;
+	}
 
 	// Allow the user to pass the input to be added to to the box.
 	$context['input_box_name'] = isset($_REQUEST['input']) && preg_match('~^[\w-]+$~', $_REQUEST['input']) === 1 ? $_REQUEST['input'] : 'to';
@@ -526,10 +551,10 @@ 
 		);
 
 		$context['results'] = array_slice($context['results'], $_REQUEST['start'], 7);
+	} else {
+			$context['links']['up'] = $scripturl . '?action=pm;sa=send' . (empty($_REQUEST['u']) ? '' : ';u=' . $_REQUEST['u']);
+	}
 	}
-	else
-		$context['links']['up'] = $scripturl . '?action=pm;sa=send' . (empty($_REQUEST['u']) ? '' : ';u=' . $_REQUEST['u']);
-}
 
 /**
  * Outputs each member name on its own line.
@@ -545,8 +570,9 @@ 
 	$_REQUEST['search'] = trim($smcFunc['strtolower']($_REQUEST['search']));
 	$_REQUEST['search'] = strtr($_REQUEST['search'], array('%' => '\%', '_' => '\_', '*' => '%', '?' => '_', '&#038;' => '&amp;'));
 
-	if (function_exists('iconv'))
-		header('content-type: text/plain; charset=UTF-8');
+	if (function_exists('iconv')) {
+			header('content-type: text/plain; charset=UTF-8');
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT real_name
@@ -566,14 +592,16 @@ 
 		if (function_exists('iconv'))
 		{
 			$utf8 = iconv($txt['lang_character_set'], 'UTF-8', $row['real_name']);
-			if ($utf8)
-				$row['real_name'] = $utf8;
+			if ($utf8) {
+							$row['real_name'] = $utf8;
+			}
 		}
 
 		$row['real_name'] = strtr($row['real_name'], array('&amp;' => '&#038;', '&lt;' => '&#060;', '&gt;' => '&#062;', '&quot;' => '&#034;'));
 
-		if (preg_match('~&#\d+;~', $row['real_name']) != 0)
-			$row['real_name'] = preg_replace_callback('~&#(\d+);~', 'fixchar__callback', $row['real_name']);
+		if (preg_match('~&#\d+;~', $row['real_name']) != 0) {
+					$row['real_name'] = preg_replace_callback('~&#(\d+);~', 'fixchar__callback', $row['real_name']);
+		}
 
 		echo $row['real_name'], "\n";
 	}
@@ -630,9 +658,9 @@ 
 
 		// Update the database...
 		updateMemberData($memID, array('member_name' => $user, 'passwd' => $newPassword_sha1));
+	} else {
+			updateMemberData($memID, array('passwd' => $newPassword_sha1));
 	}
-	else
-		updateMemberData($memID, array('passwd' => $newPassword_sha1));
 
 	call_integration_hook('integrate_reset_pass', array($old_user, $user, $newPassword));
 
@@ -663,31 +691,37 @@ 
 	$errors = array();
 
 	// Don't use too long a name.
-	if ($smcFunc['strlen']($username) > 25)
-		$errors[] = array('lang', 'error_long_name');
+	if ($smcFunc['strlen']($username) > 25) {
+			$errors[] = array('lang', 'error_long_name');
+	}
 
 	// No name?!  How can you register with no name?
-	if ($username == '')
-		$errors[] = array('lang', 'need_username');
+	if ($username == '') {
+			$errors[] = array('lang', 'need_username');
+	}
 
 	// Only these characters are permitted.
-	if (in_array($username, array('_', '|')) || preg_match('~[<>&"\'=\\\\]~', preg_replace('~&#(?:\\d{1,7}|x[0-9a-fA-F]{1,6});~', '', $username)) != 0 || strpos($username, '[code') !== false || strpos($username, '[/code') !== false)
-		$errors[] = array('lang', 'error_invalid_characters_username');
+	if (in_array($username, array('_', '|')) || preg_match('~[<>&"\'=\\\\]~', preg_replace('~&#(?:\\d{1,7}|x[0-9a-fA-F]{1,6});~', '', $username)) != 0 || strpos($username, '[code') !== false || strpos($username, '[/code') !== false) {
+			$errors[] = array('lang', 'error_invalid_characters_username');
+	}
 
-	if (stristr($username, $txt['guest_title']) !== false)
-		$errors[] = array('lang', 'username_reserved', 'general', array($txt['guest_title']));
+	if (stristr($username, $txt['guest_title']) !== false) {
+			$errors[] = array('lang', 'username_reserved', 'general', array($txt['guest_title']));
+	}
 
 	if ($check_reserved_name)
 	{
 		require_once($sourcedir . '/Subs-Members.php');
-		if (isReservedName($username, $memID, false))
-			$errors[] = array('done', '(' . $smcFunc['htmlspecialchars']($username) . ') ' . $txt['name_in_use']);
+		if (isReservedName($username, $memID, false)) {
+					$errors[] = array('done', '(' . $smcFunc['htmlspecialchars']($username) . ') ' . $txt['name_in_use']);
+		}
 	}
 
-	if ($return_error)
-		return $errors;
-	elseif (empty($errors))
-		return null;
+	if ($return_error) {
+			return $errors;
+	} elseif (empty($errors)) {
+			return null;
+	}
 
 	loadLanguage('Errors');
 	$error = $errors[0];
@@ -713,22 +747,26 @@ 
 	global $modSettings, $smcFunc;
 
 	// Perform basic requirements first.
-	if ($smcFunc['strlen']($password) < (empty($modSettings['password_strength']) ? 4 : 8))
-		return 'short';
+	if ($smcFunc['strlen']($password) < (empty($modSettings['password_strength']) ? 4 : 8)) {
+			return 'short';
+	}
 
 	// Is this enough?
-	if (empty($modSettings['password_strength']))
-		return null;
+	if (empty($modSettings['password_strength'])) {
+			return null;
+	}
 
 	// Otherwise, perform the medium strength test - checking if password appears in the restricted string.
-	if (preg_match('~\b' . preg_quote($password, '~') . '\b~', implode(' ', $restrict_in)) != 0)
-		return 'restricted_words';
-	elseif ($smcFunc['strpos']($password, $username) !== false)
-		return 'restricted_words';
+	if (preg_match('~\b' . preg_quote($password, '~') . '\b~', implode(' ', $restrict_in)) != 0) {
+			return 'restricted_words';
+	} elseif ($smcFunc['strpos']($password, $username) !== false) {
+			return 'restricted_words';
+	}
 
 	// If just medium, we're done.
-	if ($modSettings['password_strength'] == 1)
-		return null;
+	if ($modSettings['password_strength'] == 1) {
+			return null;
+	}
 
 	// Otherwise, hard test next, check for numbers and letters, uppercase too.
 	$good = preg_match('~(\D\d|\d\D)~', $password) != 0;
@@ -760,14 +798,16 @@ 
 			)
 		);
 		$groups = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$groups[] = $row['id_group'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$groups[] = $row['id_group'];
+		}
 		$smcFunc['db_free_result']($request);
 
-		if (empty($groups))
-			$group_query = '0=1';
-		else
-			$group_query = 'id_group IN (' . implode(',', $groups) . ')';
+		if (empty($groups)) {
+					$group_query = '0=1';
+		} else {
+					$group_query = 'id_group IN (' . implode(',', $groups) . ')';
+		}
 	}
 
 	// Then, same again, just the boards this time!
@@ -777,10 +817,11 @@ 
 	{
 		$boards = boardsAllowedTo('moderate_board', true);
 
-		if (empty($boards))
-			$board_query = '0=1';
-		else
-			$board_query = 'id_board IN (' . implode(',', $boards) . ')';
+		if (empty($boards)) {
+					$board_query = '0=1';
+		} else {
+					$board_query = 'id_board IN (' . implode(',', $boards) . ')';
+		}
 	}
 
 	// What boards are they the moderator of?
@@ -795,8 +836,9 @@ 
 				'current_member' => $user_info['id'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_mod[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_mod[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Can any of the groups they're in moderate any of the boards?
@@ -808,8 +850,9 @@ 
 				'groups' => $user_info['groups'],
 			)
 		);
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$boards_mod[] = $row['id_board'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$boards_mod[] = $row['id_board'];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Just in case we've got duplicates here...
@@ -854,10 +897,12 @@ 
 	global $modSettings;
 
 	// In case a customization wants to override the default settings
-	if ($httponly === null)
-		$httponly = !empty($modSettings['httponlyCookies']);
-	if ($secure === null)
-		$secure = !empty($modSettings['secureCookies']);
+	if ($httponly === null) {
+			$httponly = !empty($modSettings['httponlyCookies']);
+	}
+	if ($secure === null) {
+			$secure = !empty($modSettings['secureCookies']);
+	}
 
 	// Intercept cookie?
 	call_integration_hook('integrate_cookie', array($name, $value, $expire, $path, $domain, $secure, $httponly));
@@ -877,8 +922,9 @@ 
 function hash_password($username, $password, $cost = null)
 {
 	global $sourcedir, $smcFunc, $modSettings;
-	if (!function_exists('password_hash'))
-		require_once($sourcedir . '/Subs-Password.php');
+	if (!function_exists('password_hash')) {
+			require_once($sourcedir . '/Subs-Password.php');
+	}
 
 	$cost = empty($cost) ? (empty($modSettings['bcrypt_hash_cost']) ? 10 : $modSettings['bcrypt_hash_cost']) : $cost;
 
@@ -910,8 +956,9 @@ 
 function hash_verify_password($username, $password, $hash)
 {
 	global $sourcedir, $smcFunc;
-	if (!function_exists('password_verify'))
-		require_once($sourcedir . '/Subs-Password.php');
+	if (!function_exists('password_verify')) {
+			require_once($sourcedir . '/Subs-Password.php');
+	}
 
 	return password_verify($smcFunc['strtolower']($username) . $password, $hash);
 }

Sources/Admin.php

Braces +75 added lines, -52 removed lines

@@ -13,8 +13,9 @@ 
  * @version 2.1 Beta 4
  */
 
-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 @@ 
 		'https://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], 'alttxt' => (isset($var[2]) && in_array($var[2], array('file', 'db'))) || isset($var[3]) ? (in_array($var[2], array('file', 'db')) ? $var[1] : $var[3]) : '');
+		}
 	}
 
 	$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();
 }

SSI.php

Braces +426 added lines, -304 removed lines

@@ -12,8 +12,9 @@ 
  */
 
 // Don't do anything if SMF is already loaded.
-if (defined('SMF'))
+if (defined('SMF')) {
 	return true;
+}
 
 define('SMF', 'SSI');
 
@@ -28,16 +29,18 @@ 
 $time_start = microtime(true);
 
 // Just being safe...
-foreach (array('db_character_set', 'cachedir') as $variable)
+foreach (array('db_character_set', 'cachedir') as $variable) {
 	if (isset($GLOBALS[$variable]))
 		unset($GLOBALS[$variable]);
+}
 
 // Get the forum's settings for database and file paths.
 require_once(dirname(__FILE__) . '/Settings.php');
 
 // Make absolutely sure the cache directory is defined.
-if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache'))
+if ((empty($cachedir) || !file_exists($cachedir)) && file_exists($boarddir . '/cache')) {
 	$cachedir = $boarddir . '/cache';
+}
 
 $ssi_error_reporting = error_reporting(E_ALL);
 /* Set this to one of three values depending on what you want to happen in the case of a fatal error.
@@ -48,12 +51,14 @@ 
 $ssi_on_error_method = false;
 
 // Don't do john didley if the forum's been shut down completely.
-if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true))
+if ($maintenance == 2 && (!isset($ssi_maintenance_off) || $ssi_maintenance_off !== true)) {
 	die($mmessage);
+}
 
 // Fix for using the current directory as a path.
-if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.')
+if (substr($sourcedir, 0, 1) == '.' && substr($sourcedir, 1, 1) != '.') {
 	$sourcedir = dirname(__FILE__) . substr($sourcedir, 1);
+}
 
 // Load the important includes.
 require_once($sourcedir . '/QueryString.php');
@@ -78,26 +83,30 @@ 
 cleanRequest();
 
 // Seed the random generator?
-if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69)
+if (empty($modSettings['rand_seed']) || mt_rand(1, 250) == 69) {
 	smf_seed_generator();
+}
 
 // Check on any hacking attempts.
-if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS']))
+if (isset($_REQUEST['GLOBALS']) || isset($_COOKIE['GLOBALS'])) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_REQUEST['ssi_theme']) && (int) $_REQUEST['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme)
+} elseif (isset($_COOKIE['ssi_theme']) && (int) $_COOKIE['ssi_theme'] == (int) $ssi_theme) {
 	die('No direct access...');
-elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers)
+} elseif (isset($_REQUEST['ssi_layers'], $ssi_layers) && (@get_magic_quotes_gpc() ? stripslashes($_REQUEST['ssi_layers']) : $_REQUEST['ssi_layers']) == $ssi_layers) {
 	die('No direct access...');
-if (isset($_REQUEST['context']))
+}
+if (isset($_REQUEST['context'])) {
 	die('No direct access...');
+}
 
 // Gzip output? (because it must be boolean and true, this can't be hacked.)
-if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>='))
+if (isset($ssi_gzip) && $ssi_gzip === true && ini_get('zlib.output_compression') != '1' && ini_get('output_handler') != 'ob_gzhandler' && version_compare(PHP_VERSION, '4.2.0', '>=')) {
 	ob_start('ob_gzhandler');
-else
+} else {
 	$modSettings['enableCompressedOutput'] = '0';
+}
 
 /**
  * An autoloader for certain classes.
@@ -146,9 +155,9 @@ 
 ob_start('ob_sessrewrite');
 
 // Start the session... known to scramble SSI includes in cases...
-if (!headers_sent())
+if (!headers_sent()) {
 	loadSession();
-else
+} else
 {
 	if (isset($_COOKIE[session_name()]) || isset($_REQUEST[session_name()]))
 	{
@@ -182,12 +191,14 @@ 
 loadTheme(isset($ssi_theme) ? (int) $ssi_theme : 0);
 
 // @todo: probably not the best place, but somewhere it should be set...
-if (!headers_sent())
+if (!headers_sent()) {
 	header('content-type: text/html; charset=' . (empty($modSettings['global_character_set']) ? (empty($txt['lang_character_set']) ? 'ISO-8859-1' : $txt['lang_character_set']) : $modSettings['global_character_set']));
+}
 
 // Take care of any banning that needs to be done.
-if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true))
+if (isset($_REQUEST['ssi_ban']) || (isset($ssi_ban) && $ssi_ban === true)) {
 	is_not_banned();
+}
 
 // Do we allow guests in here?
 if (empty($ssi_guest_access) && empty($modSettings['allow_guestAccess']) && $user_info['is_guest'] && basename($_SERVER['PHP_SELF']) != 'SSI.php')
@@ -202,17 +213,19 @@ 
 {
 	$context['template_layers'] = $ssi_layers;
 	template_header();
-}
-else
+} else {
 	setupThemeContext();
+}
 
 // Make sure they didn't muss around with the settings... but only if it's not cli.
-if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '')
+if (isset($_SERVER['REMOTE_ADDR']) && !isset($_SERVER['is_cli']) && session_id() == '') {
 	trigger_error($txt['ssi_session_broken'], E_USER_NOTICE);
+}
 
 // Without visiting the forum this session variable might not be set on submit.
-if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote'))
+if (!isset($_SESSION['USER_AGENT']) && (!isset($_GET['ssi_function']) || $_GET['ssi_function'] !== 'pollVote')) {
 	$_SESSION['USER_AGENT'] = $_SERVER['HTTP_USER_AGENT'];
+}
 
 // Have the ability to easily add functions to SSI.
 call_integration_hook('integrate_SSI');
@@ -221,11 +234,13 @@ 
 if (basename($_SERVER['PHP_SELF']) == 'SSI.php')
 {
 	// You shouldn't just access SSI.php directly by URL!!
-	if (!isset($_GET['ssi_function']))
-		die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	if (!isset($_GET['ssi_function'])) {
+			die(sprintf($txt['ssi_not_direct'], $user_info['is_admin'] ? '\'' . addslashes(__FILE__) . '\'' : '\'SSI.php\''));
+	}
 	// Call a function passed by GET.
-	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest']))
-		call_user_func('ssi_' . $_GET['ssi_function']);
+	if (function_exists('ssi_' . $_GET['ssi_function']) && (!empty($modSettings['allow_guestAccess']) || !$user_info['is_guest'])) {
+			call_user_func('ssi_' . $_GET['ssi_function']);
+	}
 	exit;
 }
 
@@ -242,9 +257,10 @@ 
  */
 function ssi_shutdown()
 {
-	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown')
-		template_footer();
-}
+	if (!isset($_GET['ssi_function']) || $_GET['ssi_function'] != 'shutdown') {
+			template_footer();
+	}
+	}
 
 /**
  * Display a welcome message, like: Hey, User, you have 0 messages, 0 are new.
@@ -257,15 +273,17 @@ 
 
 	if ($output_method == 'echo')
 	{
-		if ($context['user']['is_guest'])
-			echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
-		else
-			echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		if ($context['user']['is_guest']) {
+					echo sprintf($txt[$context['can_register'] ? 'welcome_guest_register' : 'welcome_guest'], $txt['guest_title'], $context['forum_name_html_safe'], $scripturl . '?action=login', 'return reqOverlayDiv(this.href, ' . JavaScriptEscape($txt['login']) . ');', $scripturl . '?action=signup');
+		} else {
+					echo $txt['hello_member'], ' <strong>', $context['user']['name'], '</strong>', allowedTo('pm_read') ? ', ' . (empty($context['user']['messages']) ? $txt['msg_alert_no_messages'] : (($context['user']['messages'] == 1 ? sprintf($txt['msg_alert_one_message'], $scripturl . '?action=pm') : sprintf($txt['msg_alert_many_message'], $scripturl . '?action=pm', $context['user']['messages'])) . ', ' . ($context['user']['unread_messages'] == 1 ? $txt['msg_alert_one_new'] : sprintf($txt['msg_alert_many_new'], $context['user']['unread_messages'])))) : '';
+		}
 	}
 	// Don't echo... then do what?!
-	else
-		return $context['user'];
-}
+	else {
+			return $context['user'];
+	}
+	}
 
 /**
  * Display a menu bar, like is displayed at the top of the forum.
@@ -276,12 +294,14 @@ 
 {
 	global $context;
 
-	if ($output_method == 'echo')
-		template_menu();
+	if ($output_method == 'echo') {
+			template_menu();
+	}
 	// What else could this do?
-	else
-		return $context['menu_buttons'];
-}
+	else {
+			return $context['menu_buttons'];
+	}
+	}
 
 /**
  * Show a logout link.
@@ -293,20 +313,23 @@ 
 {
 	global $context, $txt, $scripturl;
 
-	if ($redirect_to != '')
-		$_SESSION['logout_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['logout_url'] = $redirect_to;
+	}
 
 	// Guests can't log out.
-	if ($context['user']['is_guest'])
-		return false;
+	if ($context['user']['is_guest']) {
+			return false;
+	}
 
 	$link = '<a href="' . $scripturl . '?action=logout;' . $context['session_var'] . '=' . $context['session_id'] . '">' . $txt['logout'] . '</a>';
 
-	if ($output_method == 'echo')
-		echo $link;
-	else
-		return $link;
-}
+	if ($output_method == 'echo') {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Recent post list:   [board] Subject by Poster    Date
@@ -322,17 +345,17 @@ 
 	global $modSettings, $context;
 
 	// Excluding certain boards...
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// What about including certain boards - note we do some protection here as pre-2.0 didn't have this parameter.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$include_boards = array();
 	}
@@ -369,8 +392,9 @@ 
 {
 	global $modSettings;
 
-	if (empty($post_ids))
-		return;
+	if (empty($post_ids)) {
+			return;
+	}
 
 	// Allow the user to request more than one - why not?
 	$post_ids = is_array($post_ids) ? $post_ids : array($post_ids);
@@ -405,8 +429,9 @@ 
 	global $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if (!empty($modSettings['enable_likes']))
-		$context['can_like'] = allowedTo('likes_like');
+	if (!empty($modSettings['enable_likes'])) {
+			$context['can_like'] = allowedTo('likes_like');
+	}
 
 	// Find all the posts. Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -472,12 +497,13 @@ 
 		);
 
 		// Get the likes for each message.
-		if (!empty($modSettings['enable_likes']))
-			$posts[$row['id_msg']]['likes'] = array(
+		if (!empty($modSettings['enable_likes'])) {
+					$posts[$row['id_msg']]['likes'] = array(
 				'count' => $row['likes'],
 				'you' => in_array($row['id_msg'], prepareLikesContext($row['id_topic'])),
 				'can_like' => !$context['user']['is_guest'] && $row['id_member'] != $context['user']['id'] && !empty($context['can_like']),
 			);
+		}
 	}
 	$smcFunc['db_free_result']($request);
 
@@ -485,13 +511,14 @@ 
 	call_integration_hook('integrate_ssi_queryPosts', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -505,6 +532,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -522,25 +550,26 @@ 
 	global $settings, $scripturl, $txt, $user_info;
 	global $modSettings, $smcFunc, $context;
 
-	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0)
-		$exclude_boards = array($modSettings['recycle_board']);
-	else
-		$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	if ($exclude_boards === null && !empty($modSettings['recycle_enable']) && $modSettings['recycle_board'] > 0) {
+			$exclude_boards = array($modSettings['recycle_board']);
+	} else {
+			$exclude_boards = empty($exclude_boards) ? array() : (is_array($exclude_boards) ? $exclude_boards : array($exclude_boards));
+	}
 
 	// Only some boards?.
 	if (is_array($include_boards) || (int) $include_boards === $include_boards)
 	{
 		$include_boards = is_array($include_boards) ? $include_boards : array($include_boards);
-	}
-	elseif ($include_boards != null)
+	} elseif ($include_boards != null)
 	{
 		$output_method = $include_boards;
 		$include_boards = array();
 	}
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	// Find all the posts in distinct topics.  Newer ones will have higher IDs.
 	$request = $smcFunc['db_query']('substring', '
@@ -565,13 +594,15 @@ 
 		)
 	);
 	$topics = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$topics[$row['id_topic']] = $row;
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$topics[$row['id_topic']] = $row;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Did we find anything? If not, bail.
-	if (empty($topics))
-		return array();
+	if (empty($topics)) {
+			return array();
+	}
 
 	$recycle_board = !empty($modSettings['recycle_enable']) && !empty($modSettings['recycle_board']) ? (int) $modSettings['recycle_board'] : 0;
 
@@ -599,19 +630,22 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		$row['body'] = strip_tags(strtr(parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']), array('<br>' => '&#10;')));
-		if ($smcFunc['strlen']($row['body']) > 128)
-			$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		if ($smcFunc['strlen']($row['body']) > 128) {
+					$row['body'] = $smcFunc['substr']($row['body'], 0, 128) . '...';
+		}
 
 		// Censor the subject.
 		censorText($row['subject']);
 		censorText($row['body']);
 
 		// Recycled icon
-		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board'])
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $topics[$row['id_topic']]['id_board']) {
+					$row['icon'] = 'recycled';
+		}
 
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		// Build the array.
 		$posts[] = array(
@@ -650,13 +684,14 @@ 
 	call_integration_hook('integrate_ssi_recentTopics', array(&$posts));
 
 	// Just return it.
-	if ($output_method != 'echo' || empty($posts))
-		return $posts;
+	if ($output_method != 'echo' || empty($posts)) {
+			return $posts;
+	}
 
 	echo '
 		<table style="border: none" class="ssi_table">';
-	foreach ($posts as $post)
-		echo '
+	foreach ($posts as $post) {
+			echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					[', $post['board']['link'], ']
@@ -670,6 +705,7 @@ 
 					', $post['time'], '
 				</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -694,27 +730,30 @@ 
 		)
 	);
 	$return = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$return[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$return[] = array(
 			'id' => $row['id_member'],
 			'name' => $row['real_name'],
 			'href' => $scripturl . '?action=profile;u=' . $row['id_member'],
 			'link' => '<a href="' . $scripturl . '?action=profile;u=' . $row['id_member'] . '">' . $row['real_name'] . '</a>',
 			'posts' => $row['posts']
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_topPoster', array(&$return));
 
 	// Just return all the top posters.
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	// Make a quick array to list the links in.
 	$temp_array = array();
-	foreach ($return as $member)
-		$temp_array[] = $member['link'];
+	foreach ($return as $member) {
+			$temp_array[] = $member['link'];
+	}
 
 	echo implode(', ', $temp_array);
 }
@@ -746,8 +785,8 @@ 
 		)
 	);
 	$boards = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$boards[] = array(
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$boards[] = array(
 			'id' => $row['id_board'],
 			'num_posts' => $row['num_posts'],
 			'num_topics' => $row['num_topics'],
@@ -756,14 +795,16 @@ 
 			'href' => $scripturl . '?board=' . $row['id_board'] . '.0',
 			'link' => '<a href="' . $scripturl . '?board=' . $row['id_board'] . '.0">' . $row['name'] . '</a>'
 		);
+	}
 	$smcFunc['db_free_result']($request);
 
 	// If mods want to do somthing with this list of boards, let them do that now.
 	call_integration_hook('integrate_ssi_topBoards', array(&$boards));
 
 	// If we shouldn't output or have nothing to output, just jump out.
-	if ($output_method != 'echo' || empty($boards))
-		return $boards;
+	if ($output_method != 'echo' || empty($boards)) {
+			return $boards;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -772,13 +813,14 @@ 
 				<th style="text-align: left">', $txt['board_topics'], '</th>
 				<th style="text-align: left">', $txt['posts'], '</th>
 			</tr>';
-	foreach ($boards as $sBoard)
-		echo '
+	foreach ($boards as $sBoard) {
+			echo '
 			<tr>
 				<td>', $sBoard['link'], $sBoard['new'] ? ' <a href="' . $sBoard['href'] . '"><span class="new_posts">' . $txt['new'] . '</span></a>' : '', '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_topics']), '</td>
 				<td style="text-align: right">', comma_format($sBoard['num_posts']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -811,12 +853,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();
 
 	$request = $smcFunc['db_query']('', '
 		SELECT m.subject, m.id_topic, t.num_views, t.num_replies
@@ -855,8 +898,9 @@ 
 	// If mods want to do somthing with this list of topics, let them do that now.
 	call_integration_hook('integrate_ssi_topTopics', array(&$topics, $type));
 
-	if ($output_method != 'echo' || empty($topics))
-		return $topics;
+	if ($output_method != 'echo' || empty($topics)) {
+			return $topics;
+	}
 
 	echo '
 		<table class="ssi_table">
@@ -865,8 +909,8 @@ 
 				<th style="text-align: left">', $txt['views'], '</th>
 				<th style="text-align: left">', $txt['replies'], '</th>
 			</tr>';
-	foreach ($topics as $sTopic)
-		echo '
+	foreach ($topics as $sTopic) {
+			echo '
 			<tr>
 				<td style="text-align: left">
 					', $sTopic['link'], '
@@ -874,6 +918,7 @@ 
 				<td style="text-align: right">', comma_format($sTopic['num_views']), '</td>
 				<td style="text-align: right">', comma_format($sTopic['num_replies']), '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }
@@ -909,12 +954,13 @@ 
 {
 	global $txt, $context;
 
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 	', sprintf($txt['welcome_newest_member'], $context['common_stats']['latest_member']['link']), '<br>';
-	else
-		return $context['common_stats']['latest_member'];
-}
+	} else {
+			return $context['common_stats']['latest_member'];
+	}
+	}
 
 /**
  * Fetches a random member.
@@ -963,8 +1009,9 @@ 
 	}
 
 	// Just to be sure put the random generator back to something... random.
-	if ($random_type != '')
-		mt_srand(time());
+	if ($random_type != '') {
+			mt_srand(time());
+	}
 
 	return $result;
 }
@@ -977,8 +1024,9 @@ 
  */
 function ssi_fetchMember($member_ids = array(), $output_method = 'echo')
 {
-	if (empty($member_ids))
-		return;
+	if (empty($member_ids)) {
+			return;
+	}
 
 	// Can have more than one member if you really want...
 	$member_ids = is_array($member_ids) ? $member_ids : array($member_ids);
@@ -1003,8 +1051,9 @@ 
  */
 function ssi_fetchGroupMembers($group_id = null, $output_method = 'echo')
 {
-	if ($group_id === null)
-		return;
+	if ($group_id === null) {
+			return;
+	}
 
 	$query_where = '
 		id_group = {int:id_group}
@@ -1031,8 +1080,9 @@ 
 {
 	global $smcFunc, $memberContext;
 
-	if ($query_where === null)
-		return;
+	if ($query_where === null) {
+			return;
+	}
 
 	// Fetch the members in question.
 	$request = $smcFunc['db_query']('', '
@@ -1045,12 +1095,14 @@ 
 		))
 	);
 	$members = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$members[] = $row['id_member'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$members[] = $row['id_member'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($members))
-		return array();
+	if (empty($members)) {
+			return array();
+	}
 
 	// If mods want to do somthing with this list of members, let them do that now.
 	call_integration_hook('integrate_ssi_queryMembers', array(&$members));
@@ -1059,23 +1111,25 @@ 
 	loadMemberData($members);
 
 	// Draw the table!
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		<table style="border: none" class="ssi_table">';
+	}
 
 	$query_members = array();
 	foreach ($members as $member)
 	{
 		// Load their context data.
-		if (!loadMemberContext($member))
-			continue;
+		if (!loadMemberContext($member)) {
+					continue;
+		}
 
 		// Store this member's information.
 		$query_members[$member] = $memberContext[$member];
 
 		// Only do something if we're echo'ing.
-		if ($output_method == 'echo')
-			echo '
+		if ($output_method == 'echo') {
+					echo '
 			<tr>
 				<td style="text-align: right; vertical-align: top; white-space: nowrap">
 					', $query_members[$member]['link'], '
@@ -1083,12 +1137,14 @@ 
 					<br>', $query_members[$member]['avatar']['image'], '
 				</td>
 			</tr>';
+		}
 	}
 
 	// End the table if appropriate.
-	if ($output_method == 'echo')
-		echo '
+	if ($output_method == 'echo') {
+			echo '
 		</table>';
+	}
 
 	// Send back the data.
 	return $query_members;
@@ -1103,8 +1159,9 @@ 
 {
 	global $txt, $scripturl, $modSettings, $smcFunc;
 
-	if (!allowedTo('view_stats'))
-		return;
+	if (!allowedTo('view_stats')) {
+			return;
+	}
 
 	$totals = array(
 		'members' => $modSettings['totalMembers'],
@@ -1133,8 +1190,9 @@ 
 	// If mods want to do somthing with the board stats, let them do that now.
 	call_integration_hook('integrate_ssi_boardStats', array(&$totals));
 
-	if ($output_method != 'echo')
-		return $totals;
+	if ($output_method != 'echo') {
+			return $totals;
+	}
 
 	echo '
 		', $txt['total_members'], ': <a href="', $scripturl . '?action=mlist">', comma_format($totals['members']), '</a><br>
@@ -1163,8 +1221,8 @@ 
 	call_integration_hook('integrate_ssi_whosOnline', array(&$return));
 
 	// Add some redundancy for backwards compatibility reasons.
-	if ($output_method != 'echo')
-		return $return + array(
+	if ($output_method != 'echo') {
+			return $return + array(
 			'users' => $return['users_online'],
 			'guests' => $return['num_guests'],
 			'hidden' => $return['num_users_hidden'],
@@ -1172,29 +1230,35 @@ 
 			'num_users' => $return['num_users_online'],
 			'total_users' => $return['num_users_online'] + $return['num_guests'],
 		);
+	}
 
 	echo '
 		', comma_format($return['num_guests']), ' ', $return['num_guests'] == 1 ? $txt['guest'] : $txt['guests'], ', ', comma_format($return['num_users_online']), ' ', $return['num_users_online'] == 1 ? $txt['user'] : $txt['users'];
 
 	$bracketList = array();
-	if (!empty($user_info['buddies']))
-		$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
-	if (!empty($return['num_spiders']))
-		$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
-	if (!empty($return['num_users_hidden']))
-		$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	if (!empty($user_info['buddies'])) {
+			$bracketList[] = comma_format($return['num_buddies']) . ' ' . ($return['num_buddies'] == 1 ? $txt['buddy'] : $txt['buddies']);
+	}
+	if (!empty($return['num_spiders'])) {
+			$bracketList[] = comma_format($return['num_spiders']) . ' ' . ($return['num_spiders'] == 1 ? $txt['spider'] : $txt['spiders']);
+	}
+	if (!empty($return['num_users_hidden'])) {
+			$bracketList[] = comma_format($return['num_users_hidden']) . ' ' . $txt['hidden'];
+	}
 
-	if (!empty($bracketList))
-		echo ' (' . implode(', ', $bracketList) . ')';
+	if (!empty($bracketList)) {
+			echo ' (' . implode(', ', $bracketList) . ')';
+	}
 
 	echo '<br>
 			', implode(', ', $return['list_users_online']);
 
 	// Showing membergroups?
-	if (!empty($settings['show_group_key']) && !empty($return['membergroups']))
-		echo '<br>
+	if (!empty($settings['show_group_key']) && !empty($return['membergroups'])) {
+			echo '<br>
 			[' . implode(']&nbsp;&nbsp;[', $return['membergroups']) . ']';
-}
+	}
+	}
 
 /**
  * Just like whosOnline except it also logs the online presence.
@@ -1205,11 +1269,12 @@ 
 {
 	writeLog();
 
-	if ($output_method != 'echo')
-		return ssi_whosOnline($output_method);
-	else
-		ssi_whosOnline($output_method);
-}
+	if ($output_method != 'echo') {
+			return ssi_whosOnline($output_method);
+	} else {
+			ssi_whosOnline($output_method);
+	}
+	}
 
 // Shows a login box.
 /**
@@ -1222,11 +1287,13 @@ 
 {
 	global $scripturl, $txt, $user_info, $context;
 
-	if ($redirect_to != '')
-		$_SESSION['login_url'] = $redirect_to;
+	if ($redirect_to != '') {
+			$_SESSION['login_url'] = $redirect_to;
+	}
 
-	if ($output_method != 'echo' || !$user_info['is_guest'])
-		return $user_info['is_guest'];
+	if ($output_method != 'echo' || !$user_info['is_guest']) {
+			return $user_info['is_guest'];
+	}
 
 	// Create a login token
 	createToken('login');
@@ -1278,8 +1345,9 @@ 
 
 	$boardsAllowed = array_intersect(boardsAllowedTo('poll_view'), boardsAllowedTo('poll_vote'));
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT p.id_poll, p.question, t.id_topic, p.max_votes, p.guest_vote, p.hide_results, p.expire_time
@@ -1312,12 +1380,14 @@ 
 	$smcFunc['db_free_result']($request);
 
 	// This user has voted on all the polls.
-	if (empty($row) || !is_array($row))
-		return array();
+	if (empty($row) || !is_array($row)) {
+			return array();
+	}
 
 	// If this is a guest who's voted we'll through ourselves to show poll to show the results.
-	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))))
-		return ssi_showPoll($row['id_topic'], $output_method);
+	if ($user_info['is_guest'] && (!$row['guest_vote'] || (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))))) {
+			return ssi_showPoll($row['id_topic'], $output_method);
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT COUNT(DISTINCT id_member)
@@ -1381,8 +1451,9 @@ 
 	// If mods want to do somthing with this list of polls, let them do that now.
 	call_integration_hook('integrate_ssi_recentPoll', array(&$return, $topPollInstead));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($allow_view_results)
 	{
@@ -1391,19 +1462,20 @@ 
 			<strong>', $return['question'], '</strong><br>
 			', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 			<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 			<input type="submit" value="', $txt['poll_vote'], '" class="button">
 			<input type="hidden" name="poll" value="', $return['id'], '">
 			<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 		</form>';
+	} else {
+			echo $txt['poll_cannot_see'];
+	}
 	}
-	else
-		echo $txt['poll_cannot_see'];
-}
 
 /**
  * Shows the poll from the specified topic
@@ -1417,13 +1489,15 @@ 
 
 	$boardsAllowed = boardsAllowedTo('poll_view');
 
-	if (empty($boardsAllowed))
-		return array();
+	if (empty($boardsAllowed)) {
+			return array();
+	}
 
-	if ($topic === null && isset($_REQUEST['ssi_topic']))
-		$topic = (int) $_REQUEST['ssi_topic'];
-	else
-		$topic = (int) $topic;
+	if ($topic === null && isset($_REQUEST['ssi_topic'])) {
+			$topic = (int) $_REQUEST['ssi_topic'];
+	} else {
+			$topic = (int) $topic;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT
@@ -1444,17 +1518,18 @@ 
 	);
 
 	// Either this topic has no poll, or the user cannot view it.
-	if ($smcFunc['db_num_rows']($request) == 0)
-		return array();
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			return array();
+	}
 
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
 	// Check if they can vote.
 	$already_voted = false;
-	if (!empty($row['expire_time']) && $row['expire_time'] < time())
-		$allow_vote = false;
-	elseif ($user_info['is_guest'])
+	if (!empty($row['expire_time']) && $row['expire_time'] < time()) {
+			$allow_vote = false;
+	} elseif ($user_info['is_guest'])
 	{
 		// There's a difference between "allowed to vote" and "already voted"...
 		$allow_vote = $row['guest_vote'];
@@ -1464,10 +1539,9 @@ 
 		{
 			$already_voted = true;
 		}
-	}
-	elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board']))
-		$allow_vote = false;
-	else
+	} elseif (!empty($row['voting_locked']) || !allowedTo('poll_vote', $row['id_board'])) {
+			$allow_vote = false;
+	} else
 	{
 		$request = $smcFunc['db_query']('', '
 			SELECT id_member
@@ -1549,8 +1623,9 @@ 
 	// If mods want to do somthing with this poll, let them do that now.
 	call_integration_hook('integrate_ssi_showPoll', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	if ($return['allow_vote'])
 	{
@@ -1559,17 +1634,17 @@ 
 				<strong>', $return['question'], '</strong><br>
 				', !empty($return['allowed_warning']) ? $return['allowed_warning'] . '<br>' : '';
 
-		foreach ($return['options'] as $option)
-			echo '
+		foreach ($return['options'] as $option) {
+					echo '
 				<label for="', $option['id'], '">', $option['vote_button'], ' ', $option['option'], '</label><br>';
+		}
 
 		echo '
 				<input type="submit" value="', $txt['poll_vote'], '" class="button">
 				<input type="hidden" name="poll" value="', $return['id'], '">
 				<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '">
 			</form>';
-	}
-	else
+	} else
 	{
 		echo '
 			<div class="ssi_poll">
@@ -1649,27 +1724,32 @@ 
 			'is_approved' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) == 0)
-		die;
+	if ($smcFunc['db_num_rows']($request) == 0) {
+			die;
+	}
 	$row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
-	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time']))
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (!empty($row['voting_locked']) || ($row['selected'] != -1 && !$user_info['is_guest']) || (!empty($row['expire_time']) && time() > $row['expire_time'])) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// Too many options checked?
-	if (count($_REQUEST['options']) > $row['max_votes'])
-		redirectexit('topic=' . $row['id_topic'] . '.0');
+	if (count($_REQUEST['options']) > $row['max_votes']) {
+			redirectexit('topic=' . $row['id_topic'] . '.0');
+	}
 
 	// It's a guest who has already voted?
 	if ($user_info['is_guest'])
 	{
 		// Guest voting disabled?
-		if (!$row['guest_vote'])
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		if (!$row['guest_vote']) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 		// Already voted?
-		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote'])))
-			redirectexit('topic=' . $row['id_topic'] . '.0');
+		elseif (isset($_COOKIE['guest_poll_vote']) && in_array($row['id_poll'], explode(',', $_COOKIE['guest_poll_vote']))) {
+					redirectexit('topic=' . $row['id_topic'] . '.0');
+		}
 	}
 
 	$sOptions = array();
@@ -1723,11 +1803,13 @@ 
 {
 	global $scripturl, $txt, $context;
 
-	if (!allowedTo('search_posts'))
-		return;
+	if (!allowedTo('search_posts')) {
+			return;
+	}
 
-	if ($output_method != 'echo')
-		return $scripturl . '?action=search';
+	if ($output_method != 'echo') {
+			return $scripturl . '?action=search';
+	}
 
 	echo '
 		<form action="', $scripturl, '?action=search2" method="post" accept-charset="', $context['character_set'], '">
@@ -1749,8 +1831,9 @@ 
 	// If mods want to do somthing with the news, let them do that now. Don't need to pass the news line itself, since it is already in $context.
 	call_integration_hook('integrate_ssi_news');
 
-	if ($output_method != 'echo')
-		return $context['random_news_line'];
+	if ($output_method != 'echo') {
+			return $context['random_news_line'];
+	}
 
 	echo $context['random_news_line'];
 }
@@ -1764,8 +1847,9 @@ 
 {
 	global $scripturl, $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view') || !allowedTo('profile_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => true,
@@ -1776,13 +1860,15 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_birthdays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_birthdays'];
+	}
 
-	foreach ($return['calendar_birthdays'] as $member)
-		echo '
+	foreach ($return['calendar_birthdays'] as $member) {
+			echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">' . $member['name'] . '</span>' . (isset($member['age']) ? ' (' . $member['age'] . ')' : '') . '</a>' . (!$member['is_last'] ? ', ' : '');
-}
+	}
+	}
 
 /**
  * Shows today's holidays.
@@ -1793,8 +1879,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_holidays' => true,
@@ -1805,8 +1892,9 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_holidays'];
+	if ($output_method != 'echo') {
+			return $return['calendar_holidays'];
+	}
 
 	echo '
 		', implode(', ', $return['calendar_holidays']);
@@ -1820,8 +1908,9 @@ 
 {
 	global $modSettings, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_events' => true,
@@ -1832,14 +1921,16 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return['calendar_events'];
+	if ($output_method != 'echo') {
+			return $return['calendar_events'];
+	}
 
 	foreach ($return['calendar_events'] as $event)
 	{
-		if ($event['can_edit'])
-			echo '
+		if ($event['can_edit']) {
+					echo '
 	<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+		}
 		echo '
 	' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 	}
@@ -1854,8 +1945,9 @@ 
 {
 	global $modSettings, $txt, $scripturl, $user_info;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	$eventOptions = array(
 		'include_birthdays' => allowedTo('profile_view'),
@@ -1868,19 +1960,22 @@ 
 	// The ssi_todaysCalendar variants all use the same hook and just pass on $eventOptions so the hooked code can distinguish different cases if necessary
 	call_integration_hook('integrate_ssi_calendar', array(&$return, $eventOptions));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
-	if (!empty($return['calendar_holidays']))
-		echo '
+	if (!empty($return['calendar_holidays'])) {
+			echo '
 			<span class="holiday">' . $txt['calendar_prompt'] . ' ' . implode(', ', $return['calendar_holidays']) . '<br></span>';
+	}
 	if (!empty($return['calendar_birthdays']))
 	{
 		echo '
 			<span class="birthday">' . $txt['birthdays_upcoming'] . '</span> ';
-		foreach ($return['calendar_birthdays'] as $member)
-			echo '
+		foreach ($return['calendar_birthdays'] as $member) {
+					echo '
 			<a href="', $scripturl, '?action=profile;u=', $member['id'], '"><span class="fix_rtl_names">', $member['name'], '</span>', isset($member['age']) ? ' (' . $member['age'] . ')' : '', '</a>', !$member['is_last'] ? ', ' : '';
+		}
 		echo '
 			<br>';
 	}
@@ -1890,9 +1985,10 @@ 
 			<span class="event">' . $txt['events_upcoming'] . '</span> ';
 		foreach ($return['calendar_events'] as $event)
 		{
-			if ($event['can_edit'])
-				echo '
+			if ($event['can_edit']) {
+							echo '
 			<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+			}
 			echo '
 			' . $event['link'] . (!$event['is_last'] ? ', ' : '');
 		}
@@ -1916,25 +2012,29 @@ 
 	loadLanguage('Stats');
 
 	// Must be integers....
-	if ($limit === null)
-		$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
-	else
-		$limit = (int) $limit;
-
-	if ($start === null)
-		$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
-	else
-		$start = (int) $start;
-
-	if ($board !== null)
-		$board = (int) $board;
-	elseif (isset($_GET['board']))
-		$board = (int) $_GET['board'];
-
-	if ($length === null)
-		$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
-	else
-		$length = (int) $length;
+	if ($limit === null) {
+			$limit = isset($_GET['limit']) ? (int) $_GET['limit'] : 5;
+	} else {
+			$limit = (int) $limit;
+	}
+
+	if ($start === null) {
+			$start = isset($_GET['start']) ? (int) $_GET['start'] : 0;
+	} else {
+			$start = (int) $start;
+	}
+
+	if ($board !== null) {
+			$board = (int) $board;
+	} elseif (isset($_GET['board'])) {
+			$board = (int) $_GET['board'];
+	}
+
+	if ($length === null) {
+			$length = isset($_GET['length']) ? (int) $_GET['length'] : 0;
+	} else {
+			$length = (int) $length;
+	}
 
 	$limit = max(0, $limit);
 	$start = max(0, $start);
@@ -1952,17 +2052,19 @@ 
 	);
 	if ($smcFunc['db_num_rows']($request) == 0)
 	{
-		if ($output_method == 'echo')
-			die($txt['ssi_no_guests']);
-		else
-			return array();
+		if ($output_method == 'echo') {
+					die($txt['ssi_no_guests']);
+		} else {
+					return array();
+		}
 	}
 	list ($board) = $smcFunc['db_fetch_row']($request);
 	$smcFunc['db_free_result']($request);
 
 	$icon_sources = array();
-	foreach ($context['stable_icons'] as $icon)
-		$icon_sources[$icon] = 'images_url';
+	foreach ($context['stable_icons'] as $icon) {
+			$icon_sources[$icon] = 'images_url';
+	}
 
 	if (!empty($modSettings['enable_likes']))
 	{
@@ -1985,12 +2087,14 @@ 
 		)
 	);
 	$posts = array();
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$posts[] = $row['id_first_msg'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$posts[] = $row['id_first_msg'];
+	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($posts))
-		return array();
+	if (empty($posts)) {
+			return array();
+	}
 
 	// Find the posts.
 	$request = $smcFunc['db_query']('', '
@@ -2020,24 +2124,28 @@ 
 			$last_space = strrpos($row['body'], ' ');
 			$last_open = strrpos($row['body'], '<');
 			$last_close = strrpos($row['body'], '>');
-			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6)
-				$cutoff = $last_open;
-			elseif (empty($last_close) || $last_close < $last_open)
-				$cutoff = $last_space;
+			if (empty($last_space) || ($last_space == $last_open + 3 && (empty($last_close) || (!empty($last_close) && $last_close < $last_open))) || $last_space < $last_open || $last_open == $length - 6) {
+							$cutoff = $last_open;
+			} elseif (empty($last_close) || $last_close < $last_open) {
+							$cutoff = $last_space;
+			}
 
-			if ($cutoff !== false)
-				$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			if ($cutoff !== false) {
+							$row['body'] = $smcFunc['substr']($row['body'], 0, $cutoff);
+			}
 			$row['body'] .= '...';
 		}
 
 		$row['body'] = parse_bbc($row['body'], $row['smileys_enabled'], $row['id_msg']);
 
-		if (!empty($recycle_board) && $row['id_board'] == $recycle_board)
-			$row['icon'] = 'recycled';
+		if (!empty($recycle_board) && $row['id_board'] == $recycle_board) {
+					$row['icon'] = 'recycled';
+		}
 
 		// Check that this message icon is there...
-		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']]))
-			$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		if (!empty($modSettings['messageIconChecks_enable']) && !isset($icon_sources[$row['icon']])) {
+					$icon_sources[$row['icon']] = file_exists($settings['theme_dir'] . '/images/post/' . $row['icon'] . '.png') ? 'images_url' : 'default_images_url';
+		}
 
 		censorText($row['subject']);
 		censorText($row['body']);
@@ -2074,16 +2182,18 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	if (empty($return))
-		return $return;
+	if (empty($return)) {
+			return $return;
+	}
 
 	$return[count($return) - 1]['is_last'] = true;
 
 	// If mods want to do somthing with this list of posts, let them do that now.
 	call_integration_hook('integrate_ssi_boardNews', array(&$return));
 
-	if ($output_method != 'echo')
-		return $return;
+	if ($output_method != 'echo') {
+			return $return;
+	}
 
 	foreach ($return as $news)
 	{
@@ -2135,9 +2245,10 @@ 
 		echo '
 			</div>';
 
-		if (!$news['is_last'])
-			echo '
+		if (!$news['is_last']) {
+					echo '
 			<hr>';
+		}
 	}
 }
 
@@ -2151,8 +2262,9 @@ 
 {
 	global $user_info, $scripturl, $modSettings, $txt, $context, $smcFunc;
 
-	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view'))
-		return;
+	if (empty($modSettings['cal_enabled']) || !allowedTo('calendar_view')) {
+			return;
+	}
 
 	// Find all events which are happening in the near future that the member can see.
 	$request = $smcFunc['db_query']('', '
@@ -2178,20 +2290,23 @@ 
 	while ($row = $smcFunc['db_fetch_assoc']($request))
 	{
 		// Check if we've already come by an event linked to this same topic with the same title... and don't display it if we have.
-		if (!empty($duplicates[$row['title'] . $row['id_topic']]))
-			continue;
+		if (!empty($duplicates[$row['title'] . $row['id_topic']])) {
+					continue;
+		}
 
 		// Censor the title.
 		censorText($row['title']);
 
-		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false)))
-			$date = strftime('%Y-%m-%d', forum_time(false));
-		else
-			$date = $row['start_date'];
+		if ($row['start_date'] < strftime('%Y-%m-%d', forum_time(false))) {
+					$date = strftime('%Y-%m-%d', forum_time(false));
+		} else {
+					$date = $row['start_date'];
+		}
 
 		// If the topic it is attached to is not approved then don't link it.
-		if (!empty($row['id_first_msg']) && !$row['approved'])
-			$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		if (!empty($row['id_first_msg']) && !$row['approved']) {
+					$row['id_board'] = $row['id_topic'] = $row['id_first_msg'] = 0;
+		}
 
 		$allday = (empty($row['start_time']) || empty($row['end_time']) || empty($row['timezone']) || !in_array($row['timezone'], timezone_identifiers_list(DateTimeZone::ALL_WITH_BC))) ? true : false;
 
@@ -2217,24 +2332,27 @@ 
 	}
 	$smcFunc['db_free_result']($request);
 
-	foreach ($return as $mday => $array)
-		$return[$mday][count($array) - 1]['is_last'] = true;
+	foreach ($return as $mday => $array) {
+			$return[$mday][count($array) - 1]['is_last'] = true;
+	}
 
 	// If mods want to do somthing with this list of events, let them do that now.
 	call_integration_hook('integrate_ssi_recentEvents', array(&$return));
 
-	if ($output_method != 'echo' || empty($return))
-		return $return;
+	if ($output_method != 'echo' || empty($return)) {
+			return $return;
+	}
 
 	// Well the output method is echo.
 	echo '
 			<span class="event">' . $txt['events'] . '</span> ';
-	foreach ($return as $mday => $array)
-		foreach ($array as $event)
+	foreach ($return as $mday => $array) {
+			foreach ($array as $event)
 		{
 			if ($event['can_edit'])
 				echo '
 				<a href="' . $event['modify_href'] . '" style="color: #ff0000;">*</a> ';
+	}
 
 			echo '
 				' . $event['link'] . (!$event['is_last'] ? ', ' : '');
@@ -2253,8 +2371,9 @@ 
 	global $smcFunc;
 
 	// If $id is null, this was most likely called from a query string and should do nothing.
-	if ($id === null)
-		return;
+	if ($id === null) {
+			return;
+	}
 
 	$request = $smcFunc['db_query']('', '
 		SELECT passwd, member_name, is_activated
@@ -2286,8 +2405,9 @@ 
 	$attachments_boards = boardsAllowedTo('view_attachments');
 
 	// No boards?  Adios amigo.
-	if (empty($attachments_boards))
-		return array();
+	if (empty($attachments_boards)) {
+			return array();
+	}
 
 	// Is it an array?
 	$attachment_ext = (array) $attachment_ext;
@@ -2371,8 +2491,9 @@ 
 	call_integration_hook('integrate_ssi_recentAttachments', array(&$attachments));
 
 	// So you just want an array?  Here you can have it.
-	if ($output_method == 'array' || empty($attachments))
-		return $attachments;
+	if ($output_method == 'array' || empty($attachments)) {
+			return $attachments;
+	}
 
 	// Give them the default.
 	echo '
@@ -2383,14 +2504,15 @@ 
 				<th style="text-align: left; padding: 2">', $txt['downloads'], '</th>
 				<th style="text-align: left; padding: 2">', $txt['filesize'], '</th>
 			</tr>';
-	foreach ($attachments as $attach)
-		echo '
+	foreach ($attachments as $attach) {
+			echo '
 			<tr>
 				<td>', $attach['file']['link'], '</td>
 				<td>', $attach['member']['link'], '</td>
 				<td style="text-align: center">', $attach['file']['downloads'], '</td>
 				<td>', $attach['file']['filesize'], '</td>
 			</tr>';
+	}
 	echo '
 		</table>';
 }

other/install.php

Braces +470 added lines, -350 removed lines

@@ -20,8 +20,9 @@ 
 // ><html dir="ltr"><head><title>Error!</title></head><body>Sorry, this installer requires PHP!<div style="display: none;">
 
 // Let's pull in useful classes
-if (!defined('SMF'))
+if (!defined('SMF')) {
 	define('SMF', 1);
+}
 
 require_once('Sources/Class-Package.php');
 
@@ -63,10 +64,11 @@ 
 
 			list ($charcode) = pg_fetch_row($request);
 
-			if ($charcode == 'UTF8')
-				return true;
-			else
-				return false;
+			if ($charcode == 'UTF8') {
+							return true;
+			} else {
+							return false;
+			}
 		},
 		'utf8_version' => '8.0',
 		'utf8_version_check' => '$request = pg_query(\'SELECT version()\'); list ($version) = pg_fetch_row($request); list($pgl, $version) = explode(" ", $version); return $version;',
@@ -76,12 +78,14 @@ 
 			$value = preg_replace('~[^A-Za-z0-9_\$]~', '', $value);
 
 			// Is it reserved?
-			if ($value == 'pg_')
-				return $txt['error_db_prefix_reserved'];
+			if ($value == 'pg_') {
+							return $txt['error_db_prefix_reserved'];
+			}
 
 			// Is the prefix numeric?
-			if (preg_match('~^\d~', $value))
-				return $txt['error_db_prefix_numeric'];
+			if (preg_match('~^\d~', $value)) {
+							return $txt['error_db_prefix_numeric'];
+			}
 
 			return true;
 		},
@@ -128,10 +132,11 @@ 
 		$incontext['skip'] = false;
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2]))
-			$incontext['current_step']++;
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
+					$incontext['current_step']++;
+		}
 
 		// No warnings pass on.
 		$incontext['warning'] = '';
@@ -147,8 +152,9 @@ 
 	global $databases;
 
 	// Just so people using older versions of PHP aren't left in the cold.
-	if (!isset($_SERVER['PHP_SELF']))
-		$_SERVER['PHP_SELF'] = isset($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']) ? $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] : 'install.php';
+	if (!isset($_SERVER['PHP_SELF'])) {
+			$_SERVER['PHP_SELF'] = isset($GLOBALS['HTTP_SERVER_VARS']['PHP_SELF']) ? $GLOBALS['HTTP_SERVER_VARS']['PHP_SELF'] : 'install.php';
+	}
 
 	// Enable error reporting for fatal errors.
 	error_reporting(E_ERROR | E_PARSE);
@@ -164,21 +170,23 @@ 
 	{
 		ob_start();
 
-		if (ini_get('session.save_handler') == 'user')
-			@ini_set('session.save_handler', 'files');
-		if (function_exists('session_start'))
-			@session_start();
-	}
-	else
+		if (ini_get('session.save_handler') == 'user') {
+					@ini_set('session.save_handler', 'files');
+		}
+		if (function_exists('session_start')) {
+					@session_start();
+		}
+	} else
 	{
 		ob_start('ob_gzhandler');
 
-		if (ini_get('session.save_handler') == 'user')
-			@ini_set('session.save_handler', 'files');
+		if (ini_get('session.save_handler') == 'user') {
+					@ini_set('session.save_handler', 'files');
+		}
 		session_start();
 
-		if (!headers_sent())
-			echo '<!DOCTYPE html>
+		if (!headers_sent()) {
+					echo '<!DOCTYPE html>
 <html>
 	<head>
 		<title>', htmlspecialchars($_GET['pass_string']), '</title>
@@ -187,14 +195,16 @@ 
 		<strong>', htmlspecialchars($_GET['pass_string']), '</strong>
 	</body>
 </html>';
+		}
 		exit;
 	}
 
 	// Add slashes, as long as they aren't already being added.
-	if (!function_exists('get_magic_quotes_gpc') || @get_magic_quotes_gpc() == 0)
-		foreach ($_POST as $k => $v)
+	if (!function_exists('get_magic_quotes_gpc') || @get_magic_quotes_gpc() == 0) {
+			foreach ($_POST as $k => $v)
 			if (strpos($k, 'password') === false && strpos($k, 'db_passwd') === false)
 				$_POST[$k] = addslashes($v);
+	}
 
 	// This is really quite simple; if ?delete is on the URL, delete the installer...
 	if (isset($_GET['delete']))
@@ -215,8 +225,7 @@ 
 			$ftp->close();
 
 			unset($_SESSION['installer_temp_ftp']);
-		}
-		else
+		} else
 		{
 			@unlink(__FILE__);
 
@@ -230,10 +239,11 @@ 
 		// Now just redirect to a blank.png...
 		$secure = false;
 
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-			$secure = true;
-		elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-			$secure = true;
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+					$secure = true;
+		} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+					$secure = true;
+		}
 
 		header('location: http' . ($secure ? 's' : '') . '://' . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'] . ':' . $_SERVER['SERVER_PORT']) . dirname($_SERVER['PHP_SELF']) . '/Themes/default/images/blank.png');
 		exit;
@@ -244,10 +254,11 @@ 
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$timezone_id = $ini_tz;
-		else
-			$timezone_id = '';
+		if (!empty($ini_tz)) {
+					$timezone_id = $ini_tz;
+		} else {
+					$timezone_id = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($timezone_id, timezone_identifiers_list()))
@@ -277,8 +288,9 @@ 
 		$dir = dir(dirname(__FILE__) . '/Themes/default/languages');
 		while ($entry = $dir->read())
 		{
-			if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php')
-				$incontext['detected_languages'][$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12));
+			if (substr($entry, 0, 8) == 'Install.' && substr($entry, -4) == '.php') {
+							$incontext['detected_languages'][$entry] = ucfirst(substr($entry, 8, strlen($entry) - 12));
+			}
 		}
 		$dir->close();
 	}
@@ -313,10 +325,11 @@ 
 	}
 
 	// Override the language file?
-	if (isset($_GET['lang_file']))
-		$_SESSION['installer_temp_lang'] = $_GET['lang_file'];
-	elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file']))
-		$_SESSION['installer_temp_lang'] = $GLOBALS['HTTP_GET_VARS']['lang_file'];
+	if (isset($_GET['lang_file'])) {
+			$_SESSION['installer_temp_lang'] = $_GET['lang_file'];
+	} elseif (isset($GLOBALS['HTTP_GET_VARS']['lang_file'])) {
+			$_SESSION['installer_temp_lang'] = $GLOBALS['HTTP_GET_VARS']['lang_file'];
+	}
 
 	// Make sure it exists, if it doesn't reset it.
 	if (!isset($_SESSION['installer_temp_lang']) || preg_match('~[^\\w_\\-.]~', $_SESSION['installer_temp_lang']) === 1 || !file_exists(dirname(__FILE__) . '/Themes/default/languages/' . $_SESSION['installer_temp_lang']))
@@ -325,8 +338,9 @@ 
 		list ($_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
 
 		// If we have english and some other language, use the other language.  We Americans hate english :P.
-		if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1)
-			list (, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
+		if ($_SESSION['installer_temp_lang'] == 'Install.english.php' && count($incontext['detected_languages']) > 1) {
+					list (, $_SESSION['installer_temp_lang']) = array_keys($incontext['detected_languages']);
+		}
 	}
 
 	// And now include the actual language file itself.
@@ -343,15 +357,18 @@ 
 	global $db_prefix, $db_connection, $sourcedir, $smcFunc, $modSettings;
 	global $db_server, $db_passwd, $db_type, $db_name, $db_user, $db_persist;
 
-	if (empty($sourcedir))
-		$sourcedir = dirname(__FILE__) . '/Sources';
+	if (empty($sourcedir)) {
+			$sourcedir = dirname(__FILE__) . '/Sources';
+	}
 
 	// Need this to check whether we need the database password.
 	require(dirname(__FILE__) . '/Settings.php');
-	if (!defined('SMF'))
-		define('SMF', 1);
-	if (empty($smcFunc))
-		$smcFunc = array();
+	if (!defined('SMF')) {
+			define('SMF', 1);
+	}
+	if (empty($smcFunc)) {
+			$smcFunc = array();
+	}
 
 	$modSettings['disableQueryCheck'] = true;
 
@@ -359,8 +376,9 @@ 
 	if (!$db_connection)
 	{
 		require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
-		if (version_compare(PHP_VERSION, '5', '<'))
-			require_once($sourcedir . '/Subs-Compat.php');
+		if (version_compare(PHP_VERSION, '5', '<')) {
+					require_once($sourcedir . '/Subs-Compat.php');
+		}
 
 		$db_options = array('persist' => $db_persist);
 		$port = '';
@@ -371,19 +389,20 @@ 
 			if ($db_type == 'mysql')
 			{
 				$port = ((int) $_POST['db_port'] == ini_get($db_type . 'default_port')) ? '' : (int) $_POST['db_port'];
-			}
-			elseif ($db_type == 'postgresql')
+			} elseif ($db_type == 'postgresql')
 			{
 				// PostgreSQL doesn't have a default port setting in php.ini, so just check against the default
 				$port = ((int) $_POST['db_port'] == 5432) ? '' : (int) $_POST['db_port'];
 			}
 		}
 
-		if (!empty($port))
-			$db_options['port'] = $port;
+		if (!empty($port)) {
+					$db_options['port'] = $port;
+		}
 
-		if (!$db_connection)
-			$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options);
+		if (!$db_connection) {
+					$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, $db_options);
+		}
 	}
 }
 
@@ -411,8 +430,9 @@ 
 		// @todo REMOVE THIS!!
 		else
 		{
-			if (function_exists('doStep' . $_GET['step']))
-				call_user_func('doStep' . $_GET['step']);
+			if (function_exists('doStep' . $_GET['step'])) {
+							call_user_func('doStep' . $_GET['step']);
+			}
 		}
 		// Show the footer.
 		template_install_below();
@@ -430,8 +450,9 @@ 
 	$incontext['sub_template'] = 'welcome_message';
 
 	// Done the submission?
-	if (isset($_POST['contbutt']))
-		return true;
+	if (isset($_POST['contbutt'])) {
+			return true;
+	}
 
 	// See if we think they have already installed it?
 	if (is_readable(dirname(__FILE__) . '/Settings.php'))
@@ -439,14 +460,17 @@ 
 		$probably_installed = 0;
 		foreach (file(dirname(__FILE__) . '/Settings.php') as $line)
 		{
-			if (preg_match('~^\$db_passwd\s=\s\'([^\']+)\';$~', $line))
-				$probably_installed++;
-			if (preg_match('~^\$boardurl\s=\s\'([^\']+)\';~', $line) && !preg_match('~^\$boardurl\s=\s\'http://127\.0\.0\.1/smf\';~', $line))
-				$probably_installed++;
+			if (preg_match('~^\$db_passwd\s=\s\'([^\']+)\';$~', $line)) {
+							$probably_installed++;
+			}
+			if (preg_match('~^\$boardurl\s=\s\'([^\']+)\';~', $line) && !preg_match('~^\$boardurl\s=\s\'http://127\.0\.0\.1/smf\';~', $line)) {
+							$probably_installed++;
+			}
 		}
 
-		if ($probably_installed == 2)
-			$incontext['warning'] = $txt['error_already_installed'];
+		if ($probably_installed == 2) {
+					$incontext['warning'] = $txt['error_already_installed'];
+		}
 	}
 
 	// Is some database support even compiled in?
@@ -461,45 +485,54 @@ 
 				$databases[$key]['supported'] = false;
 				$notFoundSQLFile = true;
 				$txt['error_db_script_missing'] = sprintf($txt['error_db_script_missing'], 'install_' . $GLOBALS['db_script_version'] . '_' . $type . '.sql');
+			} else {
+							$incontext['supported_databases'][] = $db;
 			}
-			else
-				$incontext['supported_databases'][] = $db;
 		}
 	}
 
 	// Check the PHP version.
-	if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>=')))
-		$error = 'error_php_too_low';
+	if ((!function_exists('version_compare') || version_compare($GLOBALS['required_php_version'], PHP_VERSION, '>='))) {
+			$error = 'error_php_too_low';
+	}
 	// Make sure we have a supported database
-	elseif (empty($incontext['supported_databases']))
-		$error = empty($notFoundSQLFile) ? 'error_db_missing' : 'error_db_script_missing';
+	elseif (empty($incontext['supported_databases'])) {
+			$error = empty($notFoundSQLFile) ? 'error_db_missing' : 'error_db_script_missing';
+	}
 	// How about session support?  Some crazy sysadmin remove it?
-	elseif (!function_exists('session_start'))
-		$error = 'error_session_missing';
+	elseif (!function_exists('session_start')) {
+			$error = 'error_session_missing';
+	}
 	// Make sure they uploaded all the files.
-	elseif (!file_exists(dirname(__FILE__) . '/index.php'))
-		$error = 'error_missing_files';
+	elseif (!file_exists(dirname(__FILE__) . '/index.php')) {
+			$error = 'error_missing_files';
+	}
 	// Very simple check on the session.save_path for Windows.
 	// @todo Move this down later if they don't use database-driven sessions?
-	elseif (@ini_get('session.save_path') == '/tmp' && substr(__FILE__, 1, 2) == ':\\')
-		$error = 'error_session_save_path';
+	elseif (@ini_get('session.save_path') == '/tmp' && substr(__FILE__, 1, 2) == ':\\') {
+			$error = 'error_session_save_path';
+	}
 
 	// Since each of the three messages would look the same, anyway...
-	if (isset($error))
-		$incontext['error'] = $txt[$error];
+	if (isset($error)) {
+			$incontext['error'] = $txt[$error];
+	}
 
 	// Mod_security blocks everything that smells funny. Let SMF handle security.
-	if (!fixModSecurity() && !isset($_GET['overmodsecurity']))
-		$incontext['error'] = $txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . $txt['error_message_click'] . '</a> ' . $txt['error_message_bad_try_again'];
+	if (!fixModSecurity() && !isset($_GET['overmodsecurity'])) {
+			$incontext['error'] = $txt['error_mod_security'] . '<br><br><a href="' . $installurl . '?overmodsecurity=true">' . $txt['error_message_click'] . '</a> ' . $txt['error_message_bad_try_again'];
+	}
 
 	// Confirm mbstring is loaded...
-	if (!extension_loaded('mbstring'))
-		$incontext['error'] = $txt['install_no_mbstring'];
+	if (!extension_loaded('mbstring')) {
+			$incontext['error'] = $txt['install_no_mbstring'];
+	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
-	if (!in_array('https', $supported_streams))
-		$incontext['warning'] = $txt['install_no_https'];
+	if (!in_array('https', $supported_streams)) {
+			$incontext['warning'] = $txt['install_no_https'];
+	}
 
 	return false;
 }
@@ -524,12 +557,14 @@ 
 		'Settings_bak.php',
 	);
 
-	foreach ($incontext['detected_languages'] as $lang => $temp)
-		$extra_files[] = 'Themes/default/languages/' . $lang;
+	foreach ($incontext['detected_languages'] as $lang => $temp) {
+			$extra_files[] = 'Themes/default/languages/' . $lang;
+	}
 
 	// With mod_security installed, we could attempt to fix it with .htaccess.
-	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules()))
-		$writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.';
+	if (function_exists('apache_get_modules') && in_array('mod_security', apache_get_modules())) {
+			$writable_files[] = file_exists(dirname(__FILE__) . '/.htaccess') ? '.htaccess' : '.';
+	}
 
 	$failed_files = array();
 
@@ -541,20 +576,23 @@ 
 		foreach ($writable_files as $file)
 		{
 			// Some files won't exist, try to address up front
-			if (!file_exists(dirname(__FILE__) . '/' . $file))
-				@touch(dirname(__FILE__) . '/' . $file);
+			if (!file_exists(dirname(__FILE__) . '/' . $file)) {
+							@touch(dirname(__FILE__) . '/' . $file);
+			}
 			// NOW do the writable check...
 			if (!is_writable(dirname(__FILE__) . '/' . $file))
 			{
 				@chmod(dirname(__FILE__) . '/' . $file, 0755);
 
 				// Well, 755 hopefully worked... if not, try 777.
-				if (!is_writable(dirname(__FILE__) . '/' . $file) && !@chmod(dirname(__FILE__) . '/' . $file, 0777))
-					$failed_files[] = $file;
+				if (!is_writable(dirname(__FILE__) . '/' . $file) && !@chmod(dirname(__FILE__) . '/' . $file, 0777)) {
+									$failed_files[] = $file;
+				}
 			}
 		}
-		foreach ($extra_files as $file)
-			@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		foreach ($extra_files as $file) {
+					@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		}
 	}
 	// Windows is trickier.  Let's try opening for r+...
 	else
@@ -564,30 +602,35 @@ 
 		foreach ($writable_files as $file)
 		{
 			// Folders can't be opened for write... but the index.php in them can ;)
-			if (is_dir(dirname(__FILE__) . '/' . $file))
-				$file .= '/index.php';
+			if (is_dir(dirname(__FILE__) . '/' . $file)) {
+							$file .= '/index.php';
+			}
 
 			// Funny enough, chmod actually does do something on windows - it removes the read only attribute.
 			@chmod(dirname(__FILE__) . '/' . $file, 0777);
 			$fp = @fopen(dirname(__FILE__) . '/' . $file, 'r+');
 
 			// Hmm, okay, try just for write in that case...
-			if (!is_resource($fp))
-				$fp = @fopen(dirname(__FILE__) . '/' . $file, 'w');
+			if (!is_resource($fp)) {
+							$fp = @fopen(dirname(__FILE__) . '/' . $file, 'w');
+			}
 
-			if (!is_resource($fp))
-				$failed_files[] = $file;
+			if (!is_resource($fp)) {
+							$failed_files[] = $file;
+			}
 
 			@fclose($fp);
 		}
-		foreach ($extra_files as $file)
-			@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		foreach ($extra_files as $file) {
+					@chmod(dirname(__FILE__) . (empty($file) ? '' : '/' . $file), 0777);
+		}
 	}
 
 	$failure = count($failed_files) >= 1;
 
-	if (!isset($_SERVER))
-		return !$failure;
+	if (!isset($_SERVER)) {
+			return !$failure;
+	}
 
 	// Put the list into context.
 	$incontext['failed_files'] = $failed_files;
@@ -635,19 +678,23 @@ 
 
 		if (!isset($ftp) || $ftp->error !== false)
 		{
-			if (!isset($ftp))
-				$ftp = new ftp_connection(null);
+			if (!isset($ftp)) {
+							$ftp = new ftp_connection(null);
+			}
 			// Save the error so we can mess with listing...
-			elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message))
-				$incontext['ftp_errors'][] = $ftp->last_message;
+			elseif ($ftp->error !== false && empty($incontext['ftp_errors']) && !empty($ftp->last_message)) {
+							$incontext['ftp_errors'][] = $ftp->last_message;
+			}
 
 			list ($username, $detect_path, $found_path) = $ftp->detect_path(dirname(__FILE__));
 
-			if (empty($_POST['ftp_path']) && $found_path)
-				$_POST['ftp_path'] = $detect_path;
+			if (empty($_POST['ftp_path']) && $found_path) {
+							$_POST['ftp_path'] = $detect_path;
+			}
 
-			if (!isset($_POST['ftp_username']))
-				$_POST['ftp_username'] = $username;
+			if (!isset($_POST['ftp_username'])) {
+							$_POST['ftp_username'] = $username;
+			}
 
 			// Set the username etc, into context.
 			$incontext['ftp'] = array(
@@ -659,8 +706,7 @@ 
 			);
 
 			return false;
-		}
-		else
+		} else
 		{
 			$_SESSION['installer_temp_ftp'] = array(
 				'server' => $_POST['ftp_server'],
@@ -674,10 +720,12 @@ 
 
 			foreach ($failed_files as $file)
 			{
-				if (!is_writable(dirname(__FILE__) . '/' . $file))
-					$ftp->chmod($file, 0755);
-				if (!is_writable(dirname(__FILE__) . '/' . $file))
-					$ftp->chmod($file, 0777);
+				if (!is_writable(dirname(__FILE__) . '/' . $file)) {
+									$ftp->chmod($file, 0755);
+				}
+				if (!is_writable(dirname(__FILE__) . '/' . $file)) {
+									$ftp->chmod($file, 0777);
+				}
 				if (!is_writable(dirname(__FILE__) . '/' . $file))
 				{
 					$failed_files_updated[] = $file;
@@ -733,15 +781,17 @@ 
 
 			if (!$foundOne)
 			{
-				if (isset($db['default_host']))
-					$incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost';
+				if (isset($db['default_host'])) {
+									$incontext['db']['server'] = ini_get($db['default_host']) or $incontext['db']['server'] = 'localhost';
+				}
 				if (isset($db['default_user']))
 				{
 					$incontext['db']['user'] = ini_get($db['default_user']);
 					$incontext['db']['name'] = ini_get($db['default_user']);
 				}
-				if (isset($db['default_password']))
-					$incontext['db']['pass'] = ini_get($db['default_password']);
+				if (isset($db['default_password'])) {
+									$incontext['db']['pass'] = ini_get($db['default_password']);
+				}
 
 				// For simplicity and less confusion, leave the port blank by default
 				$incontext['db']['port'] = '';
@@ -760,10 +810,10 @@ 
 		$incontext['db']['server'] = $_POST['db_server'];
 		$incontext['db']['prefix'] = $_POST['db_prefix'];
 
-		if (!empty($_POST['db_port']))
-			$incontext['db']['port'] = $_POST['db_port'];
-	}
-	else
+		if (!empty($_POST['db_port'])) {
+					$incontext['db']['port'] = $_POST['db_port'];
+		}
+	} else
 	{
 		$incontext['db']['prefix'] = 'smf_';
 	}
@@ -799,10 +849,11 @@ 
 		if (!empty($_POST['db_port']))
 		{
 			// For MySQL, we can get the "default port" from PHP. PostgreSQL has no such option though.
-			if (($db_type == 'mysql' || $db_type == 'mysqli') && $_POST['db_port'] != ini_get($db_type . '.default_port'))
-				$vars['db_port'] = (int) $_POST['db_port'];
-			elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432)
-				$vars['db_port'] = (int) $_POST['db_port'];
+			if (($db_type == 'mysql' || $db_type == 'mysqli') && $_POST['db_port'] != ini_get($db_type . '.default_port')) {
+							$vars['db_port'] = (int) $_POST['db_port'];
+			} elseif ($db_type == 'postgresql' && $_POST['db_port'] != 5432) {
+							$vars['db_port'] = (int) $_POST['db_port'];
+			}
 		}
 
 		// God I hope it saved!
@@ -815,8 +866,9 @@ 
 		// Make sure it works.
 		require(dirname(__FILE__) . '/Settings.php');
 
-		if (empty($sourcedir))
-			$sourcedir = dirname(__FILE__) . '/Sources';
+		if (empty($sourcedir)) {
+					$sourcedir = dirname(__FILE__) . '/Sources';
+		}
 
 		// Better find the database file!
 		if (!file_exists($sourcedir . '/Subs-Db-' . $db_type . '.php'))
@@ -826,18 +878,21 @@ 
 		}
 
 		// Now include it for database functions!
-		if (!defined('SMF'))
-			define('SMF', 1);
+		if (!defined('SMF')) {
+					define('SMF', 1);
+		}
 
 		$modSettings['disableQueryCheck'] = true;
-		if (empty($smcFunc))
-			$smcFunc = array();
+		if (empty($smcFunc)) {
+					$smcFunc = array();
+		}
 
 			require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
 
 		// What - running PHP4? The shame!
-		if (version_compare(PHP_VERSION, '5', '<'))
-			require_once($sourcedir . '/Subs-Compat.php');
+		if (version_compare(PHP_VERSION, '5', '<')) {
+					require_once($sourcedir . '/Subs-Compat.php');
+		}
 
 		// Attempt a connection.
 		$needsDB = !empty($databases[$db_type]['always_has_db']);
@@ -925,12 +980,14 @@ 
 	$incontext['page_title'] = $txt['install_settings'];
 
 	// Let's see if we got the database type correct.
-	if (isset($_POST['db_type'], $databases[$_POST['db_type']]))
-		$db_type = $_POST['db_type'];
+	if (isset($_POST['db_type'], $databases[$_POST['db_type']])) {
+			$db_type = $_POST['db_type'];
+	}
 
 	// Else we'd better be able to get the connection.
-	else
-		load_database();
+	else {
+			load_database();
+	}
 
 	$db_type = isset($_POST['db_type']) ? $_POST['db_type'] : $db_type;
 
@@ -939,10 +996,11 @@ 
 
 		$secure = false;
 
-		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')
-			$secure = true;
-		elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on')
-			$secure = true;
+		if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') {
+					$secure = true;
+		} elseif (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https' || !empty($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') {
+					$secure = true;
+		}
 
 	// Now, to put what we've learned together... and add a path.
 	$incontext['detected_url'] = 'http' . ($secure ? 's' : '') . '://' . $host . substr($_SERVER['PHP_SELF'], 0, strrpos($_SERVER['PHP_SELF'], '/'));
@@ -974,18 +1032,21 @@ 
 	// Submitting?
 	if (isset($_POST['boardurl']))
 	{
-		if (substr($_POST['boardurl'], -10) == '/index.php')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
-		elseif (substr($_POST['boardurl'], -1) == '/')
-			$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
-		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://')
-			$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		if (substr($_POST['boardurl'], -10) == '/index.php') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -10);
+		} elseif (substr($_POST['boardurl'], -1) == '/') {
+					$_POST['boardurl'] = substr($_POST['boardurl'], 0, -1);
+		}
+		if (substr($_POST['boardurl'], 0, 7) != 'http://' && substr($_POST['boardurl'], 0, 7) != 'file://' && substr($_POST['boardurl'], 0, 8) != 'https://') {
+					$_POST['boardurl'] = 'http://' . $_POST['boardurl'];
+		}
 
 		//Make sure boardurl is aligned with ssl setting
-		if (empty($_POST['force_ssl']))
-			$_POST['boardurl'] = strtr($_POST['boardurl'], array('https://' => 'http://'));
-		else
-			$_POST['boardurl'] = strtr($_POST['boardurl'], array('http://' => 'https://'));
+		if (empty($_POST['force_ssl'])) {
+					$_POST['boardurl'] = strtr($_POST['boardurl'], array('https://' => 'http://'));
+		} else {
+					$_POST['boardurl'] = strtr($_POST['boardurl'], array('http://' => 'https://'));
+		}
 
 		// Save these variables.
 		$vars = array(
@@ -1024,10 +1085,10 @@ 
 			{
 				$incontext['error'] = sprintf($txt['error_utf8_version'], $databases[$db_type]['utf8_version']);
 				return false;
-			}
-			else
-				// Set the character set here.
+			} else {
+							// Set the character set here.
 				updateSettingsFile(array('db_character_set' => 'utf8'));
+			}
 		}
 
 		// Good, skip on.
@@ -1047,8 +1108,9 @@ 
 	$incontext['continue'] = 1;
 
 	// Already done?
-	if (isset($_POST['pop_done']))
-		return true;
+	if (isset($_POST['pop_done'])) {
+			return true;
+	}
 
 	// Reload settings.
 	require(dirname(__FILE__) . '/Settings.php');
@@ -1066,8 +1128,9 @@ 
 	$modSettings = array();
 	if ($result !== false)
 	{
-		while ($row = $smcFunc['db_fetch_assoc']($result))
-			$modSettings[$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($result)) {
+					$modSettings[$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($result);
 
 		// Do they match?  If so, this is just a refresh so charge on!
@@ -1080,20 +1143,22 @@ 
 	$modSettings['disableQueryCheck'] = true;
 
 	// If doing UTF8, select it. PostgreSQL requires passing it as a string...
-	if (!empty($db_character_set) && $db_character_set == 'utf8' && !empty($databases[$db_type]['utf8_support']))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set) && $db_character_set == 'utf8' && !empty($databases[$db_type]['utf8_support'])) {
+			$smcFunc['db_query']('', '
 			SET NAMES {string:utf8}',
 			array(
 				'db_error_skip' => true,
 				'utf8' => 'utf8',
 			)
 		);
+	}
 
 	// Windows likes to leave the trailing slash, which yields to C:\path\to\SMF\/attachments...
-	if (substr(__DIR__, -1) == '\\')
-		$attachdir = __DIR__ . 'attachments';
-	else
-		$attachdir = __DIR__ . '/attachments';
+	if (substr(__DIR__, -1) == '\\') {
+			$attachdir = __DIR__ . 'attachments';
+	} else {
+			$attachdir = __DIR__ . '/attachments';
+	}
 
 	$replaces = array(
 		'{$db_prefix}' => $db_prefix,
@@ -1110,8 +1175,9 @@ 
 
 	foreach ($txt as $key => $value)
 	{
-		if (substr($key, 0, 8) == 'default_')
-			$replaces['{$' . $key . '}'] = $smcFunc['db_escape_string']($value);
+		if (substr($key, 0, 8) == 'default_') {
+					$replaces['{$' . $key . '}'] = $smcFunc['db_escape_string']($value);
+		}
 	}
 	$replaces['{$default_reserved_names}'] = strtr($replaces['{$default_reserved_names}'], array('\\\\n' => '\\n'));
 
@@ -1126,8 +1192,9 @@ 
 
 		while ($row = $smcFunc['db_fetch_assoc']($get_engines))
 		{
-			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT')
-				$engines[] = $row['Engine'];
+			if ($row['Support'] == 'YES' || $row['Support'] == 'DEFAULT') {
+							$engines[] = $row['Engine'];
+			}
 		}
 
 		// Done with this now
@@ -1151,8 +1218,7 @@ 
 			$replaces['START TRANSACTION;'] = '';
 			$replaces['COMMIT;'] = '';
 		}
-	}
-	else
+	} else
 	{
 		$has_innodb = false;
 	}
@@ -1174,21 +1240,24 @@ 
 	foreach ($sql_lines as $count => $line)
 	{
 		// No comments allowed!
-		if (substr(trim($line), 0, 1) != '#')
-			$current_statement .= "\n" . rtrim($line);
+		if (substr(trim($line), 0, 1) != '#') {
+					$current_statement .= "\n" . rtrim($line);
+		}
 
 		// Is this the end of the query string?
-		if (empty($current_statement) || (preg_match('~;[\s]*$~s', $line) == 0 && $count != count($sql_lines)))
-			continue;
+		if (empty($current_statement) || (preg_match('~;[\s]*$~s', $line) == 0 && $count != count($sql_lines))) {
+					continue;
+		}
 
 		// Does this table already exist?  If so, don't insert more data into it!
 		if (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) != 0 && in_array($match[1], $exists))
 		{
 			preg_match_all('~\)[,;]~', $current_statement, $matches);
-			if (!empty($matches[0]))
-				$incontext['sql_results']['insert_dups'] += count($matches[0]);
-			else
-				$incontext['sql_results']['insert_dups']++;
+			if (!empty($matches[0])) {
+							$incontext['sql_results']['insert_dups'] += count($matches[0]);
+			} else {
+							$incontext['sql_results']['insert_dups']++;
+			}
 
 			$current_statement = '';
 			continue;
@@ -1197,8 +1266,9 @@ 
 		if ($smcFunc['db_query']('', $current_statement, array('security_override' => true, 'db_error_skip' => true), $db_connection) === false)
 		{
 			// Use the appropriate function based on the DB type
-			if ($db_type == 'mysql' || $db_type == 'mysqli')
-				$db_errorno = $db_type . '_errno';
+			if ($db_type == 'mysql' || $db_type == 'mysqli') {
+							$db_errorno = $db_type . '_errno';
+			}
 
 			// Error 1050: Table already exists!
 			// @todo Needs to be made better!
@@ -1213,18 +1283,18 @@ 
 				// MySQLi requires a connection object. It's optional with MySQL and Postgres
 				$incontext['failures'][$count] = $smcFunc['db_error']($db_connection);
 			}
-		}
-		else
+		} else
 		{
-			if (preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1)
-				$incontext['sql_results']['tables']++;
-			elseif (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) == 1)
+			if (preg_match('~^\s*CREATE TABLE ([^\s\n\r]+?)~', $current_statement, $match) == 1) {
+							$incontext['sql_results']['tables']++;
+			} elseif (preg_match('~^\s*INSERT INTO ([^\s\n\r]+?)~', $current_statement, $match) == 1)
 			{
 				preg_match_all('~\)[,;]~', $current_statement, $matches);
-				if (!empty($matches[0]))
-					$incontext['sql_results']['inserts'] += count($matches[0]);
-				else
-					$incontext['sql_results']['inserts']++;
+				if (!empty($matches[0])) {
+									$incontext['sql_results']['inserts'] += count($matches[0]);
+				} else {
+									$incontext['sql_results']['inserts']++;
+				}
 			}
 		}
 
@@ -1237,15 +1307,17 @@ 
 	// Sort out the context for the SQL.
 	foreach ($incontext['sql_results'] as $key => $number)
 	{
-		if ($number == 0)
-			unset($incontext['sql_results'][$key]);
-		else
-			$incontext['sql_results'][$key] = sprintf($txt['db_populate_' . $key], $number);
+		if ($number == 0) {
+					unset($incontext['sql_results'][$key]);
+		} else {
+					$incontext['sql_results'][$key] = sprintf($txt['db_populate_' . $key], $number);
+		}
 	}
 
 	// Make sure UTF will be used globally.
-	if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8'])))
-		$newSettings[] = array('global_character_set', 'UTF-8');
+	if ((!empty($databases[$db_type]['utf8_support']) && !empty($databases[$db_type]['utf8_required'])) || (empty($databases[$db_type]['utf8_required']) && !empty($databases[$db_type]['utf8_support']) && isset($_POST['utf8']))) {
+			$newSettings[] = array('global_character_set', 'UTF-8');
+	}
 
 	// Auto-detect local & global cookie settings
 	$url_parts = parse_url($boardurl);
@@ -1274,15 +1346,19 @@ 
 
 		// Look for subfolder, if found, set localCookie
 		// Checking for len > 1 ensures you don't have just a slash...
-		if (!empty($url_parts['path']) && strlen($url_parts['path']) > 1)
-			$localCookies = '1';
+		if (!empty($url_parts['path']) && strlen($url_parts['path']) > 1) {
+					$localCookies = '1';
+		}
 
-		if (isset($globalCookies))
-			$newSettings[] = array('globalCookies', $globalCookies);
-		if (isset($globalCookiesDomain))
-			$newSettings[] = array('globalCookiesDomain', $globalCookiesDomain);
-		if (isset($localCookies))
-			$newSettings[] = array('localCookies', $localCookies);
+		if (isset($globalCookies)) {
+					$newSettings[] = array('globalCookies', $globalCookies);
+		}
+		if (isset($globalCookiesDomain)) {
+					$newSettings[] = array('globalCookiesDomain', $globalCookiesDomain);
+		}
+		if (isset($localCookies)) {
+					$newSettings[] = array('localCookies', $localCookies);
+		}
 	}
 
 	// Are we allowing stat collection?
@@ -1300,16 +1376,17 @@ 
 			fwrite($fp, $out);
 
 			$return_data = '';
-			while (!feof($fp))
-				$return_data .= fgets($fp, 128);
+			while (!feof($fp)) {
+							$return_data .= fgets($fp, 128);
+			}
 
 			fclose($fp);
 
 			// Get the unique site ID.
 			preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-			if (!empty($ID[1]))
-				$smcFunc['db_insert']('replace',
+			if (!empty($ID[1])) {
+							$smcFunc['db_insert']('replace',
 					$db_prefix . 'settings',
 					array('variable' => 'string', 'value' => 'string'),
 					array(
@@ -1318,11 +1395,12 @@ 
 					),
 					array('variable')
 				);
+			}
 		}
 	}
 	// Don't remove stat collection unless we unchecked the box for real, not from the loop.
-	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats']))
-		$smcFunc['db_query']('', '
+	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:enable_sm_stats}',
 			array(
@@ -1330,20 +1408,23 @@ 
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// Are we enabling SSL?
-	if (!empty($_POST['force_ssl']))
-		$newSettings[] = array('force_ssl', 1);
+	if (!empty($_POST['force_ssl'])) {
+			$newSettings[] = array('force_ssl', 1);
+	}
 
 	// Setting a timezone is required.
 	if (!isset($modSettings['default_timezone']) && function_exists('date_default_timezone_set'))
 	{
 		// Get PHP's default timezone, if set
 		$ini_tz = ini_get('date.timezone');
-		if (!empty($ini_tz))
-			$timezone_id = $ini_tz;
-		else
-			$timezone_id = '';
+		if (!empty($ini_tz)) {
+					$timezone_id = $ini_tz;
+		} else {
+					$timezone_id = '';
+		}
 
 		// If date.timezone is unset, invalid, or just plain weird, make a best guess
 		if (!in_array($timezone_id, timezone_identifiers_list()))
@@ -1352,8 +1433,9 @@ 
 			$timezone_id = timezone_name_from_abbr('', $server_offset, 0);
 		}
 
-		if (date_default_timezone_set($timezone_id))
-			$newSettings[] = array('default_timezone', $timezone_id);
+		if (date_default_timezone_set($timezone_id)) {
+					$newSettings[] = array('default_timezone', $timezone_id);
+		}
 	}
 
 	if (!empty($newSettings))
@@ -1384,16 +1466,18 @@ 
 	}
 
 	// MySQL specific stuff
-	if (substr($db_type, 0, 5) != 'mysql')
-		return false;
+	if (substr($db_type, 0, 5) != 'mysql') {
+			return false;
+	}
 
 	// Find database user privileges.
 	$privs = array();
 	$get_privs = $smcFunc['db_query']('', 'SHOW PRIVILEGES', array());
 	while ($row = $smcFunc['db_fetch_assoc']($get_privs))
 	{
-		if ($row['Privilege'] == 'Alter')
-			$privs[] = $row['Privilege'];
+		if ($row['Privilege'] == 'Alter') {
+					$privs[] = $row['Privilege'];
+		}
 	}
 	$smcFunc['db_free_result']($get_privs);
 
@@ -1423,8 +1507,9 @@ 
 	$incontext['continue'] = 1;
 
 	// Skipping?
-	if (!empty($_POST['skip']))
-		return true;
+	if (!empty($_POST['skip'])) {
+			return true;
+	}
 
 	// Need this to check whether we need the database password.
 	require(dirname(__FILE__) . '/Settings.php');
@@ -1441,18 +1526,22 @@ 
 	// We need this to properly hash the password for Admin
 	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' : function($string) {
 			global $sourcedir;
-			if (function_exists('mb_strtolower'))
-				return mb_strtolower($string, 'UTF-8');
+			if (function_exists('mb_strtolower')) {
+							return mb_strtolower($string, 'UTF-8');
+			}
 			require_once($sourcedir . '/Subs-Charset.php');
 			return utf8_strtolower($string);
 		};
 
-	if (!isset($_POST['username']))
-		$_POST['username'] = '';
-	if (!isset($_POST['email']))
-		$_POST['email'] = '';
-	if (!isset($_POST['server_email']))
-		$_POST['server_email'] = '';
+	if (!isset($_POST['username'])) {
+			$_POST['username'] = '';
+	}
+	if (!isset($_POST['email'])) {
+			$_POST['email'] = '';
+	}
+	if (!isset($_POST['server_email'])) {
+			$_POST['server_email'] = '';
+	}
 
 	$incontext['username'] = htmlspecialchars(stripslashes($_POST['username']));
 	$incontext['email'] = htmlspecialchars(stripslashes($_POST['email']));
@@ -1471,8 +1560,9 @@ 
 			'admin_group' => 1,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) != 0)
-		$incontext['skip'] = 1;
+	if ($smcFunc['db_num_rows']($request) != 0) {
+			$incontext['skip'] = 1;
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Trying to create an account?
@@ -1503,8 +1593,9 @@ 
 		}
 
 		// Update the webmaster's email?
-		if (!empty($_POST['server_email']) && (empty($webmaster_email) || $webmaster_email == 'noreply@myserver.com'))
-			updateSettingsFile(array('webmaster_email' => $_POST['server_email']));
+		if (!empty($_POST['server_email']) && (empty($webmaster_email) || $webmaster_email == 'noreply@myserver.com')) {
+					updateSettingsFile(array('webmaster_email' => $_POST['server_email']));
+		}
 
 		// Work out whether we're going to have dodgy characters and remove them.
 		$invalid_characters = preg_match('~[<>&"\'=\\\]~', $_POST['username']) != 0;
@@ -1527,32 +1618,27 @@ 
 			$smcFunc['db_free_result']($result);
 
 			$incontext['account_existed'] = $txt['error_user_settings_taken'];
-		}
-		elseif ($_POST['username'] == '' || strlen($_POST['username']) > 25)
+		} elseif ($_POST['username'] == '' || strlen($_POST['username']) > 25)
 		{
 			// Try the previous step again.
 			$incontext['error'] = $_POST['username'] == '' ? $txt['error_username_left_empty'] : $txt['error_username_too_long'];
 			return false;
-		}
-		elseif ($invalid_characters || $_POST['username'] == '_' || $_POST['username'] == '|' || strpos($_POST['username'], '[code') !== false || strpos($_POST['username'], '[/code') !== false)
+		} elseif ($invalid_characters || $_POST['username'] == '_' || $_POST['username'] == '|' || strpos($_POST['username'], '[code') !== false || strpos($_POST['username'], '[/code') !== false)
 		{
 			// Try the previous step again.
 			$incontext['error'] = $txt['error_invalid_characters_username'];
 			return false;
-		}
-		elseif (empty($_POST['email']) || !filter_var(stripslashes($_POST['email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['email'])) > 255)
+		} elseif (empty($_POST['email']) || !filter_var(stripslashes($_POST['email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['email'])) > 255)
 		{
 			// One step back, this time fill out a proper admin email address.
 			$incontext['error'] = sprintf($txt['error_valid_admin_email_needed'], $_POST['username']);
 			return false;
-		}
-		elseif (empty($_POST['server_email']) || !filter_var(stripslashes($_POST['server_email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['server_email'])) > 255)
+		} elseif (empty($_POST['server_email']) || !filter_var(stripslashes($_POST['server_email']), FILTER_VALIDATE_EMAIL) || strlen(stripslashes($_POST['server_email'])) > 255)
 		{
 			// One step back, this time fill out a proper admin email address.
 			$incontext['error'] = $txt['error_valid_server_email_needed'];
 			return false;
-		}
-		elseif ($_POST['username'] != '')
+		} elseif ($_POST['username'] != '')
 		{
 			$incontext['member_salt'] = substr(md5(mt_rand()), 0, 4);
 
@@ -1620,17 +1706,19 @@ 
 	reloadSettings();
 
 	// Bring a warning over.
-	if (!empty($incontext['account_existed']))
-		$incontext['warning'] = $incontext['account_existed'];
+	if (!empty($incontext['account_existed'])) {
+			$incontext['warning'] = $incontext['account_existed'];
+	}
 
-	if (!empty($db_character_set) && !empty($databases[$db_type]['utf8_support']))
-		$smcFunc['db_query']('', '
+	if (!empty($db_character_set) && !empty($databases[$db_type]['utf8_support'])) {
+			$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_character_set' => $db_character_set,
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// As track stats is by default enabled let's add some activity.
 	$smcFunc['db_insert']('ignore',
@@ -1651,14 +1739,16 @@ 
 	// Only proceed if we can load the data.
 	if ($request)
 	{
-		while ($row = $smcFunc['db_fetch_row']($request))
-			$modSettings[$row[0]] = $row[1];
+		while ($row = $smcFunc['db_fetch_row']($request)) {
+					$modSettings[$row[0]] = $row[1];
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	// Automatically log them in ;)
-	if (isset($incontext['member_id']) && isset($incontext['member_salt']))
-		setLoginCookie(3153600 * 60, $incontext['member_id'], hash_salt($_POST['password1'], $incontext['member_salt']));
+	if (isset($incontext['member_id']) && isset($incontext['member_salt'])) {
+			setLoginCookie(3153600 * 60, $incontext['member_id'], hash_salt($_POST['password1'], $incontext['member_salt']));
+	}
 
 	$result = $smcFunc['db_query']('', '
 		SELECT value
@@ -1669,13 +1759,14 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	if ($smcFunc['db_num_rows']($result) != 0)
-		list ($db_sessions) = $smcFunc['db_fetch_row']($result);
+	if ($smcFunc['db_num_rows']($result) != 0) {
+			list ($db_sessions) = $smcFunc['db_fetch_row']($result);
+	}
 	$smcFunc['db_free_result']($result);
 
-	if (empty($db_sessions))
-		$_SESSION['admin_time'] = time();
-	else
+	if (empty($db_sessions)) {
+			$_SESSION['admin_time'] = time();
+	} else
 	{
 		$_SERVER['HTTP_USER_AGENT'] = substr($_SERVER['HTTP_USER_AGENT'], 0, 211);
 
@@ -1699,8 +1790,9 @@ 
 	$smcFunc['strtolower'] = $db_character_set != 'utf8' && $txt['lang_character_set'] != 'UTF-8' ? 'strtolower' :
 		function($string){
 			global $sourcedir;
-			if (function_exists('mb_strtolower'))
-				return mb_strtolower($string, 'UTF-8');
+			if (function_exists('mb_strtolower')) {
+							return mb_strtolower($string, 'UTF-8');
+			}
 			require_once($sourcedir . '/Subs-Charset.php');
 			return utf8_strtolower($string);
 		};
@@ -1716,8 +1808,9 @@ 
 		)
 	);
 	$context['utf8'] = $db_character_set === 'utf8' || $txt['lang_character_set'] === 'UTF-8';
-	if ($smcFunc['db_num_rows']($request) > 0)
-		updateStats('subject', 1, htmlspecialchars($txt['default_topic_subject']));
+	if ($smcFunc['db_num_rows']($request) > 0) {
+			updateStats('subject', 1, htmlspecialchars($txt['default_topic_subject']));
+	}
 	$smcFunc['db_free_result']($request);
 
 	// Now is the perfect time to fetch the SM files.
@@ -1736,8 +1829,9 @@ 
 
 	// Check if we need some stupid MySQL fix.
 	$server_version = $smcFunc['db_server_info']();
-	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
+	if (($db_type == 'mysql' || $db_type == 'mysqli') && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	}
 
 	// Some final context for the template.
 	$incontext['dir_still_writable'] = is_writable(dirname(__FILE__)) && substr(__FILE__, 1, 2) != ':\\';
@@ -1757,8 +1851,9 @@ 
 	$settingsArray = file(dirname(__FILE__) . '/Settings.php');
 
 	// @todo Do we just want to read the file in clean, and split it this way always?
-	if (count($settingsArray) == 1)
-		$settingsArray = preg_split('~[\r\n]~', $settingsArray[0]);
+	if (count($settingsArray) == 1) {
+			$settingsArray = preg_split('~[\r\n]~', $settingsArray[0]);
+	}
 
 	for ($i = 0, $n = count($settingsArray); $i < $n; $i++)
 	{
@@ -1766,25 +1861,29 @@ 
 		if (trim($settingsArray[$i]) == 'if (file_exists(dirname(__FILE__) . \'/install.php\'))' && trim($settingsArray[$i + 1]) == '{' && trim($settingsArray[$i + 9]) == '}')
 		{
 			// Set the ten lines to nothing.
-			for ($j=0; $j < 10; $j++)
-				$settingsArray[$i++] = '';
+			for ($j=0; $j < 10; $j++) {
+							$settingsArray[$i++] = '';
+			}
 
 			continue;
 		}
 
-		if (trim($settingsArray[$i]) == '?' . '>')
-			$settingsArray[$i] = '';
+		if (trim($settingsArray[$i]) == '?' . '>') {
+					$settingsArray[$i] = '';
+		}
 
 		// Don't trim or bother with it if it's not a variable.
-		if (substr($settingsArray[$i], 0, 1) != '$')
-			continue;
+		if (substr($settingsArray[$i], 0, 1) != '$') {
+					continue;
+		}
 
 		$settingsArray[$i] = rtrim($settingsArray[$i]) . "\n";
 
-		foreach ($vars as $var => $val)
-			if (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
+		foreach ($vars as $var => $val) {
+					if (strncasecmp($settingsArray[$i], '$' . $var, 1 + strlen($var)) == 0)
 			{
 				$comment = strstr($settingsArray[$i], '#');
+		}
 				$settingsArray[$i] = '$' . $var . ' = \'' . $val . '\';' . ($comment != '' ? "\t\t" . $comment : "\n");
 				unset($vars[$var]);
 			}
@@ -1794,36 +1893,41 @@ 
 	if (!empty($vars))
 	{
 		$settingsArray[$i++] = '';
-		foreach ($vars as $var => $val)
-			$settingsArray[$i++] = '$' . $var . ' = \'' . $val . '\';' . "\n";
+		foreach ($vars as $var => $val) {
+					$settingsArray[$i++] = '$' . $var . ' = \'' . $val . '\';' . "\n";
+		}
 	}
 
 	// Blank out the file - done to fix a oddity with some servers.
 	$fp = @fopen(dirname(__FILE__) . '/Settings.php', 'w');
-	if (!$fp)
-		return false;
+	if (!$fp) {
+			return false;
+	}
 	fclose($fp);
 
 	$fp = fopen(dirname(__FILE__) . '/Settings.php', 'r+');
 
 	// Gotta have one of these ;)
-	if (trim($settingsArray[0]) != '<?php')
-		fwrite($fp, "<?php\n");
+	if (trim($settingsArray[0]) != '<?php') {
+			fwrite($fp, "<?php\n");
+	}
 
 	$lines = count($settingsArray);
 	for ($i = 0; $i < $lines - 1; $i++)
 	{
 		// Don't just write a bunch of blank lines.
-		if ($settingsArray[$i] != '' || @$settingsArray[$i - 1] != '')
-			fwrite($fp, strtr($settingsArray[$i], "\r", ''));
+		if ($settingsArray[$i] != '' || @$settingsArray[$i - 1] != '') {
+					fwrite($fp, strtr($settingsArray[$i], "\r", ''));
+		}
 	}
 	fwrite($fp, $settingsArray[$i] . '?' . '>');
 	fclose($fp);
 
 	// Even though on normal installations the filemtime should prevent this being used by the installer incorrectly
 	// it seems that there are times it might not. So let's MAKE it dump the cache.
-	if (function_exists('opcache_invalidate'))
-		opcache_invalidate(dirname(__FILE__) . '/Settings.php', true);
+	if (function_exists('opcache_invalidate')) {
+			opcache_invalidate(dirname(__FILE__) . '/Settings.php', true);
+	}
 
 	return true;
 }
@@ -1833,10 +1937,11 @@ 
 	global $cachedir;
 
 	// Write out the db_last_error file with the error timestamp
-	if (!empty($cachedir) && is_writable($cachedir))
-		file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
-	else
-		file_put_contents(dirname(__FILE__) . '/cache/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
+	if (!empty($cachedir) && is_writable($cachedir)) {
+			file_put_contents($cachedir . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
+	} else {
+			file_put_contents(dirname(__FILE__) . '/cache/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
+	}
 
 	return true;
 }
@@ -1853,9 +1958,9 @@ 
 	SecFilterScanPOST Off
 </IfModule>';
 
-	if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules()))
-		return true;
-	elseif (file_exists(dirname(__FILE__) . '/.htaccess') && is_writable(dirname(__FILE__) . '/.htaccess'))
+	if (!function_exists('apache_get_modules') || !in_array('mod_security', apache_get_modules())) {
+			return true;
+	} elseif (file_exists(dirname(__FILE__) . '/.htaccess') && is_writable(dirname(__FILE__) . '/.htaccess'))
 	{
 		$current_htaccess = implode('', file(dirname(__FILE__) . '/.htaccess'));
 
@@ -1867,29 +1972,28 @@ 
 				fwrite($ht_handle, $htaccess_addition);
 				fclose($ht_handle);
 				return true;
+			} else {
+							return false;
 			}
-			else
-				return false;
+		} else {
+					return true;
 		}
-		else
-			return true;
-	}
-	elseif (file_exists(dirname(__FILE__) . '/.htaccess'))
-		return strpos(implode('', file(dirname(__FILE__) . '/.htaccess')), '<IfModule mod_security.c>') !== false;
-	elseif (is_writable(dirname(__FILE__)))
+	} elseif (file_exists(dirname(__FILE__) . '/.htaccess')) {
+			return strpos(implode('', file(dirname(__FILE__) . '/.htaccess')), '<IfModule mod_security.c>') !== false;
+	} elseif (is_writable(dirname(__FILE__)))
 	{
 		if ($ht_handle = fopen(dirname(__FILE__) . '/.htaccess', 'w'))
 		{
 			fwrite($ht_handle, $htaccess_addition);
 			fclose($ht_handle);
 			return true;
+		} else {
+					return false;
 		}
-		else
+	} else {
 			return false;
 	}
-	else
-		return false;
-}
+	}
 
 function template_install_above()
 {
@@ -1927,9 +2031,10 @@ 
 								<label for="installer_language">', $txt['installer_language'], ':</label>
 								<select id="installer_language" name="lang_file" onchange="location.href = \'', $installurl, '?lang_file=\' + this.options[this.selectedIndex].value;">';
 
-		foreach ($incontext['detected_languages'] as $lang => $name)
-			echo '
+		foreach ($incontext['detected_languages'] as $lang => $name) {
+					echo '
 									<option', isset($_SESSION['installer_temp_lang']) && $_SESSION['installer_temp_lang'] == $lang ? ' selected' : '', ' value="', $lang, '">', $name, '</option>';
+		}
 
 		echo '
 								</select>
@@ -1949,9 +2054,10 @@ 
 						<h2>', $txt['upgrade_progress'], '</h2>
 						<ul>';
 
-	foreach ($incontext['steps'] as $num => $step)
-		echo '
+	foreach ($incontext['steps'] as $num => $step) {
+			echo '
 							<li class="', $num < $incontext['current_step'] ? 'stepdone' : ($num == $incontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+	}
 
 	echo '
 						</ul>
@@ -1976,20 +2082,23 @@ 
 		echo '
 								<div class="floatright">';
 
-		if (!empty($incontext['continue']))
-			echo '
+		if (!empty($incontext['continue'])) {
+					echo '
 									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '" onclick="return submitThisOnce(this);" class="button" />';
-		if (!empty($incontext['skip']))
-			echo '
+		}
+		if (!empty($incontext['skip'])) {
+					echo '
 									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="return submitThisOnce(this);" class="button" />';
+		}
 		echo '
 								</div>';
 	}
 
 	// Show the closing form tag and other data only if not in the last step
-	if (count($incontext['steps']) - 1 !== (int) $incontext['current_step'])
-		echo '
+	if (count($incontext['steps']) - 1 !== (int) $incontext['current_step']) {
+			echo '
 							</form>';
+	}
 
 	echo '
 						</div>
@@ -2024,13 +2133,15 @@ 
 		</div>';
 
 	// Show the warnings, or not.
-	if (template_warning_divs())
-		echo '
+	if (template_warning_divs()) {
+			echo '
 		<h3>', $txt['install_all_lovely'], '</h3>';
+	}
 
 	// Say we want the continue button!
-	if (empty($incontext['error']))
-		$incontext['continue'] = 1;
+	if (empty($incontext['error'])) {
+			$incontext['continue'] = 1;
+	}
 
 	// For the latest version stuff.
 	echo '
@@ -2064,8 +2175,8 @@ 
 	global $txt, $incontext;
 
 	// Errors are very serious..
-	if (!empty($incontext['error']))
-		echo '
+	if (!empty($incontext['error'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_critical_error'], '</strong><br>
@@ -2073,9 +2184,10 @@ 
 				', $incontext['error'], '
 			</div>
 		</div>';
+	}
 	// A warning message?
-	elseif (!empty($incontext['warning']))
-		echo '
+	elseif (!empty($incontext['warning'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -2083,6 +2195,7 @@ 
 				', $incontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	return empty($incontext['error']) && empty($incontext['warning']);
 }
@@ -2098,27 +2211,30 @@ 
 			<li>', $incontext['failed_files']), '</li>
 		</ul>';
 
-	if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux')
-		echo '
+	if (isset($incontext['systemos'], $incontext['detected_path']) && $incontext['systemos'] == 'linux') {
+			echo '
 		<hr>
 		<p>', $txt['chmod_linux_info'], '</p>
 		<tt># chmod a+w ', implode(' ' . $incontext['detected_path'] . '/', $incontext['failed_files']), '</tt>';
+	}
 
 	// This is serious!
-	if (!template_warning_divs())
-		return;
+	if (!template_warning_divs()) {
+			return;
+	}
 
 	echo '
 		<hr>
 		<p>', $txt['ftp_setup_info'], '</p>';
 
-	if (!empty($incontext['ftp_errors']))
-		echo '
+	if (!empty($incontext['ftp_errors'])) {
+			echo '
 		<div class="error_message">
 			', $txt['error_ftp_no_connect'], '<br><br>
 			<code>', implode('<br>', $incontext['ftp_errors']), '</code>
 		</div>
 		<br>';
+	}
 
 	echo '
 		<form action="', $incontext['form_url'], '" method="post">
@@ -2178,17 +2294,17 @@ 
 				<td>
 					<select name="db_type" id="db_type_input" onchange="toggleDBInput();">';
 
-	foreach ($incontext['supported_databases'] as $key => $db)
-			echo '
+	foreach ($incontext['supported_databases'] as $key => $db) {
+				echo '
 						<option value="', $key, '"', isset($_POST['db_type']) && $_POST['db_type'] == $key ? ' selected' : '', '>', $db['name'], '</option>';
+	}
 
 	echo '
 					</select>
 					<div class="smalltext block">', $txt['db_settings_type_info'], '</div>
 				</td>
 			</tr>';
-	}
-	else
+	} else
 	{
 		echo '
 			<tr style="display: none;">
@@ -2381,9 +2497,10 @@ 
 				<div style="color: red;">', $txt['error_db_queries'], '</div>
 				<ul>';
 
-		foreach ($incontext['failures'] as $line => $fail)
-			echo '
+		foreach ($incontext['failures'] as $line => $fail) {
+					echo '
 						<li><strong>', $txt['error_db_queries_line'], $line + 1, ':</strong> ', nl2br(htmlspecialchars($fail)), '</li>';
+		}
 
 		echo '
 				</ul>';
@@ -2444,15 +2561,16 @@ 
 			</tr>
 		</table>';
 
-	if ($incontext['require_db_confirm'])
-		echo '
+	if ($incontext['require_db_confirm']) {
+			echo '
 		<h2>', $txt['user_settings_database'], '</h2>
 		<p>', $txt['user_settings_database_info'], '</p>
 
 		<div style="margin-bottom: 2ex; padding-', $txt['lang_rtl'] == false ? 'left' : 'right', ': 50px;">
 			<input type="password" name="password3" size="30" />
 		</div>';
-}
+	}
+	}
 
 // Tell them it's done, and to delete.
 function template_delete_install()
@@ -2465,14 +2583,15 @@ 
 	template_warning_divs();
 
 	// Install directory still writable?
-	if ($incontext['dir_still_writable'])
-		echo '
+	if ($incontext['dir_still_writable']) {
+			echo '
 		<em>', $txt['still_writable'], '</em><br>
 		<br>';
+	}
 
 	// Don't show the box if it's like 99% sure it won't work :P.
-	if ($incontext['probably_delete_install'])
-		echo '
+	if ($incontext['probably_delete_install']) {
+			echo '
 		<div style="margin: 1ex; font-weight: bold;">
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete();" /> ', $txt['delete_installer'], !isset($_SESSION['installer_temp_ftp']) ? ' ' . $txt['delete_installer_maybe'] : '', '</label>
 		</div>
@@ -2488,6 +2607,7 @@ 
 			}
 		</script>
 		<br>';
+	}
 
 	echo '
 		', sprintf($txt['go_to_your_forum'], $boardurl . '/index.php'), '<br>

other/upgrade.php

Braces +887 added lines, -651 removed lines

@@ -75,8 +75,9 @@ 
 $upcontext['inactive_timeout'] = 10;
 
 // The helper is crucial. Include it first thing.
-if (!file_exists($upgrade_path . '/upgrade-helper.php'))
+if (!file_exists($upgrade_path . '/upgrade-helper.php')) {
     die('upgrade-helper.php not found where it was expected: ' . $upgrade_path . '/upgrade-helper.php! Make sure you have uploaded ALL files from the upgrade package. The upgrader cannot continue.');
+}
 
 require_once($upgrade_path . '/upgrade-helper.php');
 
@@ -100,11 +101,14 @@ 
 	ini_set('default_socket_timeout', 900);
 }
 // Clean the upgrade path if this is from the client.
-if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR']))
-	for ($i = 1; $i < $_SERVER['argc']; $i++)
+if (!empty($_SERVER['argv']) && php_sapi_name() == 'cli' && empty($_SERVER['REMOTE_ADDR'])) {
+	for ($i = 1;
+}
+$i < $_SERVER['argc']; $i++)
 	{
-		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0)
-			$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		if (preg_match('~^--path=(.+)$~', $_SERVER['argv'][$i], $match) != 0) {
+					$upgrade_path = substr($match[1], -1) == '/' ? substr($match[1], 0, -1) : $match[1];
+		}
 	}
 
 // Are we from the client?
@@ -112,16 +116,17 @@ 
 {
 	$command_line = true;
 	$disable_security = true;
-}
-else
+} else {
 	$command_line = false;
+}
 
 // Load this now just because we can.
 require_once($upgrade_path . '/Settings.php');
 
 // We don't use "-utf8" anymore...  Tweak the entry that may have been loaded by Settings.php
-if (isset($language))
+if (isset($language)) {
 	$language = str_ireplace('-utf8', '', $language);
+}
 
 // Are we logged in?
 if (isset($upgradeData))
@@ -129,10 +134,12 @@ 
 	$upcontext['user'] = json_decode(base64_decode($upgradeData), true);
 
 	// Check for sensible values.
-	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400)
-		$upcontext['user']['started'] = time();
-	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400)
-		$upcontext['user']['updated'] = 0;
+	if (empty($upcontext['user']['started']) || $upcontext['user']['started'] < time() - 86400) {
+			$upcontext['user']['started'] = time();
+	}
+	if (empty($upcontext['user']['updated']) || $upcontext['user']['updated'] < time() - 86400) {
+			$upcontext['user']['updated'] = 0;
+	}
 
 	$upcontext['started'] = $upcontext['user']['started'];
 	$upcontext['updated'] = $upcontext['user']['updated'];
@@ -197,8 +204,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	while ($row = $smcFunc['db_fetch_assoc']($request))
-		$modSettings[$row['variable']] = $row['value'];
+	while ($row = $smcFunc['db_fetch_assoc']($request)) {
+			$modSettings[$row['variable']] = $row['value'];
+	}
 	$smcFunc['db_free_result']($request);
 }
 
@@ -208,10 +216,12 @@ 
 	$modSettings['theme_url'] = 'Themes/default';
 	$modSettings['images_url'] = 'Themes/default/images';
 }
-if (!isset($settings['default_theme_url']))
+if (!isset($settings['default_theme_url'])) {
 	$settings['default_theme_url'] = $modSettings['theme_url'];
-if (!isset($settings['default_theme_dir']))
+}
+if (!isset($settings['default_theme_dir'])) {
 	$settings['default_theme_dir'] = $modSettings['theme_dir'];
+}
 
 $upcontext['is_large_forum'] = (empty($modSettings['smfVersion']) || $modSettings['smfVersion'] <= '1.1 RC1') && !empty($modSettings['totalMessages']) && $modSettings['totalMessages'] > 75000;
 // Default title...
@@ -229,13 +239,15 @@ 
 	$support_js = $upcontext['upgrade_status']['js'];
 
 	// Only set this if the upgrader status says so.
-	if (empty($is_debug))
-		$is_debug = $upcontext['upgrade_status']['debug'];
+	if (empty($is_debug)) {
+			$is_debug = $upcontext['upgrade_status']['debug'];
+	}
 
 	// Load the language.
-	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
-}
+	if (file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
+	}
 // Set the defaults.
 else
 {
@@ -253,15 +265,18 @@ 
 }
 
 // If this isn't the first stage see whether they are logging in and resuming.
-if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step']))
+if ($upcontext['current_step'] != 0 || !empty($upcontext['user']['step'])) {
 	checkLogin();
+}
 
-if ($command_line)
+if ($command_line) {
 	cmdStep0();
+}
 
 // Don't error if we're using xml.
-if (isset($_GET['xml']))
+if (isset($_GET['xml'])) {
 	$upcontext['return_error'] = true;
+}
 
 // Loop through all the steps doing each one as required.
 $upcontext['overall_percent'] = 0;
@@ -282,9 +297,9 @@ 
 		}
 
 		// Call the step and if it returns false that means pause!
-		if (function_exists($step[2]) && $step[2]() === false)
-			break;
-		elseif (function_exists($step[2])) {
+		if (function_exists($step[2]) && $step[2]() === false) {
+					break;
+		} elseif (function_exists($step[2])) {
 			//Start each new step with this unset, so the 'normal' template is called first
 			unset($_GET['xml']);
 			//Clear out warnings at the start of each step
@@ -330,17 +345,18 @@ 
 		// This should not happen my dear... HELP ME DEVELOPERS!!
 		if (!empty($command_line))
 		{
-			if (function_exists('debug_print_backtrace'))
-				debug_print_backtrace();
+			if (function_exists('debug_print_backtrace')) {
+							debug_print_backtrace();
+			}
 
 			echo "\n" . 'Error: Unexpected call to use the ' . (isset($upcontext['sub_template']) ? $upcontext['sub_template'] : '') . ' template. Please copy and paste all the text above and visit the SMF support forum to tell the Developers that they\'ve made a boo boo; they\'ll get you up and running again.';
 			flush();
 			die();
 		}
 
-		if (!isset($_GET['xml']))
-			template_upgrade_above();
-		else
+		if (!isset($_GET['xml'])) {
+					template_upgrade_above();
+		} else
 		{
 			header('content-type: text/xml; charset=UTF-8');
 			// Sadly we need to retain the $_GET data thanks to the old upgrade scripts.
@@ -362,25 +378,29 @@ 
 			$upcontext['form_url'] = $upgradeurl . '?step=' . $upcontext['current_step'] . '&amp;substep=' . $_GET['substep'] . '&amp;data=' . base64_encode(json_encode($upcontext['upgrade_status']));
 
 			// Custom stuff to pass back?
-			if (!empty($upcontext['query_string']))
-				$upcontext['form_url'] .= $upcontext['query_string'];
+			if (!empty($upcontext['query_string'])) {
+							$upcontext['form_url'] .= $upcontext['query_string'];
+			}
 
 			// Call the appropriate subtemplate
-			if (is_callable('template_' . $upcontext['sub_template']))
-				call_user_func('template_' . $upcontext['sub_template']);
-			else
-				die('Upgrade aborted!  Invalid template: template_' . $upcontext['sub_template']);
+			if (is_callable('template_' . $upcontext['sub_template'])) {
+							call_user_func('template_' . $upcontext['sub_template']);
+			} else {
+							die('Upgrade aborted!  Invalid template: template_' . $upcontext['sub_template']);
+			}
 		}
 
 		// Was there an error?
-		if (!empty($upcontext['forced_error_message']))
-			echo $upcontext['forced_error_message'];
+		if (!empty($upcontext['forced_error_message'])) {
+					echo $upcontext['forced_error_message'];
+		}
 
 		// Show the footer.
-		if (!isset($_GET['xml']))
-			template_upgrade_below();
-		else
-			template_xml_below();
+		if (!isset($_GET['xml'])) {
+					template_upgrade_below();
+		} else {
+					template_xml_below();
+		}
 	}
 
 
@@ -392,15 +412,19 @@ 
 		$seconds = intval($active % 60);
 
 		$totalTime = '';
-		if ($hours > 0)
-			$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-		if ($minutes > 0)
-			$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-		if ($seconds > 0)
-			$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		if ($hours > 0) {
+					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+		}
+		if ($minutes > 0) {
+					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+		}
+		if ($seconds > 0) {
+					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		}
 
-		if (!empty($totalTime))
-			echo "\n" . 'Upgrade completed in ' . $totalTime . "\n";
+		if (!empty($totalTime)) {
+					echo "\n" . 'Upgrade completed in ' . $totalTime . "\n";
+		}
 	}
 
 	// Bang - gone!
@@ -413,8 +437,9 @@ 
 	global $upgradeurl, $upcontext, $command_line;
 
 	// Command line users can't be redirected.
-	if ($command_line)
-		upgradeExit(true);
+	if ($command_line) {
+			upgradeExit(true);
+	}
 
 	// Are we providing the core info?
 	if ($addForm)
@@ -440,12 +465,14 @@ 
 	define('SMF', 1);
 
 	// Start the session.
-	if (@ini_get('session.save_handler') == 'user')
-		@ini_set('session.save_handler', 'files');
+	if (@ini_get('session.save_handler') == 'user') {
+			@ini_set('session.save_handler', 'files');
+	}
 	@session_start();
 
-	if (empty($smcFunc))
-		$smcFunc = array();
+	if (empty($smcFunc)) {
+			$smcFunc = array();
+	}
 
 	// We need this for authentication and some upgrade code
 	require_once($sourcedir . '/Subs-Auth.php');
@@ -472,24 +499,27 @@ 
 		require_once($sourcedir . '/Subs-Db-' . $db_type . '.php');
 
 		// Make the connection...
-		if (empty($db_connection))
-			$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
-		else
-			// If we've returned here, ping/reconnect to be safe
+		if (empty($db_connection)) {
+					$db_connection = smf_db_initiate($db_server, $db_name, $db_user, $db_passwd, $db_prefix, array('non_fatal' => true));
+		} else {
+					// If we've returned here, ping/reconnect to be safe
 			$smcFunc['db_ping']($db_connection);
+		}
 
 		// Oh dear god!!
-		if ($db_connection === null)
-			die('Unable to connect to database - please check username and password are correct in Settings.php');
+		if ($db_connection === null) {
+					die('Unable to connect to database - please check username and password are correct in Settings.php');
+		}
 
-		if ($db_type == 'mysql' && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1)
-			$smcFunc['db_query']('', '
+		if ($db_type == 'mysql' && isset($db_character_set) && preg_match('~^\w+$~', $db_character_set) === 1) {
+					$smcFunc['db_query']('', '
 			SET NAMES {string:db_character_set}',
 			array(
 				'db_error_skip' => true,
 				'db_character_set' => $db_character_set,
 			)
 		);
+		}
 
 		// Load the modSettings data...
 		$request = $smcFunc['db_query']('', '
@@ -500,11 +530,11 @@ 
 			)
 		);
 		$modSettings = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$modSettings[$row['variable']] = $row['value'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$modSettings[$row['variable']] = $row['value'];
+		}
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		return throw_error('Cannot find ' . $sourcedir . '/Subs-Db-' . $db_type . '.php' . '. Please check you have uploaded all source files and have the correct paths set.');
 	}
@@ -518,9 +548,10 @@ 
 		cleanRequest();
 	}
 
-	if (!isset($_GET['substep']))
-		$_GET['substep'] = 0;
-}
+	if (!isset($_GET['substep'])) {
+			$_GET['substep'] = 0;
+	}
+	}
 
 function initialize_inputs()
 {
@@ -550,8 +581,9 @@ 
 		$dh = opendir(dirname(__FILE__));
 		while ($file = readdir($dh))
 		{
-			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1]))
-				@unlink(dirname(__FILE__) . '/' . $file);
+			if (preg_match('~upgrade_\d-\d_([A-Za-z])+\.sql~i', $file, $matches) && isset($matches[1])) {
+							@unlink(dirname(__FILE__) . '/' . $file);
+			}
 		}
 		closedir($dh);
 
@@ -580,8 +612,9 @@ 
 	$temp = 'upgrade_php?step';
 	while (strlen($temp) > 4)
 	{
-		if (isset($_GET[$temp]))
-			unset($_GET[$temp]);
+		if (isset($_GET[$temp])) {
+					unset($_GET[$temp]);
+		}
 		$temp = substr($temp, 1);
 	}
 
@@ -608,32 +641,39 @@ 
 		&& @file_exists(dirname(__FILE__) . '/upgrade_2-1_' . $db_type . '.sql');
 
 	// Need legacy scripts?
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $db_type . '.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
-	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1)
-		$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_2-0_' . $db_type . '.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 2.0) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-1.sql');
+	}
+	if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < 1.1) {
+			$check &= @file_exists(dirname(__FILE__) . '/upgrade_1-0.sql');
+	}
 
 	// We don't need "-utf8" files anymore...
 	$upcontext['language'] = str_ireplace('-utf8', '', $upcontext['language']);
 
 	// This needs to exist!
-	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-		return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
-	else
-		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+			return throw_error('The upgrader could not find the &quot;Install&quot; language file for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+	} else {
+			require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
+	}
 
-	if (!$check)
-		// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
+	if (!$check) {
+			// Don't tell them what files exactly because it's a spot check - just like teachers don't tell which problems they are spot checking, that's dumb.
 		return throw_error('The upgrader was unable to find some crucial files.<br><br>Please make sure you uploaded all of the files included in the package, including the Themes, Sources, and other directories.');
+	}
 
 	// Do they meet the install requirements?
-	if (!php_version_check())
-		return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	if (!php_version_check()) {
+			return throw_error('Warning!  You do not appear to have a version of PHP installed on your webserver that meets SMF\'s minimum installations requirements.<br><br>Please ask your host to upgrade.');
+	}
 
-	if (!db_version_check())
-		return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	if (!db_version_check()) {
+			return throw_error('Your ' . $databases[$db_type]['name'] . ' version does not meet the minimum requirements of SMF.<br><br>Please ask your host to upgrade.');
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -648,14 +688,16 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	if (!$create || !$alter || !$drop) {
+			return throw_error('The ' . $databases[$db_type]['name'] . ' user you have set in Settings.php does not have proper privileges.<br><br>Please ask your host to give this user the ALTER, CREATE, and DROP privileges.');
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			return throw_error('The upgrader found some old or outdated files.<br><br>Please make certain you uploaded the new versions of all the files included in the package.');
+	}
 
 	// What absolutely needs to be writable?
 	$writable_files = array(
@@ -664,12 +706,13 @@ 
 	);
 
 	// Only check for minified writable files if we have it enabled or not set.
-	if (!empty($modSettings['minimize_files']) || !isset($modSettings['minimize_files']))
-		$writable_files += array(
+	if (!empty($modSettings['minimize_files']) || !isset($modSettings['minimize_files'])) {
+			$writable_files += array(
 			$modSettings['theme_dir'] . '/css/minified.css',
 			$modSettings['theme_dir'] . '/scripts/minified.js',
 			$modSettings['theme_dir'] . '/scripts/minified_deferred.js',
 		);
+	}
 
 	// Do we need to add this setting?
 	$need_settings_update = empty($modSettings['custom_avatar_dir']);
@@ -681,12 +724,13 @@ 
 	quickFileWritable($custom_av_dir);
 
 	// Are we good now?
-	if (!is_writable($custom_av_dir))
-		return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
-	elseif ($need_settings_update)
+	if (!is_writable($custom_av_dir)) {
+			return throw_error(sprintf('The directory: %1$s has to be writable to continue the upgrade. Please make sure permissions are correctly set to allow this.', $custom_av_dir));
+	} elseif ($need_settings_update)
 	{
-		if (!function_exists('cache_put_data'))
-			require_once($sourcedir . '/Load.php');
+		if (!function_exists('cache_put_data')) {
+					require_once($sourcedir . '/Load.php');
+		}
 		updateSettings(array('custom_avatar_dir' => $custom_av_dir));
 		updateSettings(array('custom_avatar_url' => $custom_av_url));
 	}
@@ -695,28 +739,33 @@ 
 
 	// Check the cache directory.
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
-	if (!file_exists($cachedir_temp))
-		return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
-
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
-	elseif (!isset($_GET['skiplang']))
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
+	if (!file_exists($cachedir_temp)) {
+			return throw_error('The cache directory could not be found.<br><br>Please make sure you have a directory called &quot;cache&quot; in your forum directory before continuing.');
+	}
+
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			return throw_error('The upgrader was unable to find language files for the language specified in Settings.php.<br>SMF will not work without the primary language files installed.<br><br>Please either install them, or <a href="' . $upgradeurl . '?step=0;lang=english">use english instead</a>.');
+	} elseif (!isset($_GET['skiplang']))
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					return throw_error('The upgrader found some old or outdated language files, for the forum default language, ' . $upcontext['language'] . '.<br><br>Please make certain you uploaded the new versions of all the files included in the package, even the theme and language files for the default theme.<br>&nbsp;&nbsp;&nbsp;[<a href="' . $upgradeurl . '?skiplang">SKIP</a>] [<a href="' . $upgradeurl . '?lang=english">Try English</a>]');
+		}
 	}
 
-	if (!makeFilesWritable($writable_files))
-		return false;
+	if (!makeFilesWritable($writable_files)) {
+			return false;
+	}
 
 	// Check agreement.txt. (it may not exist, in which case $boarddir must be writable.)
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			return throw_error('The upgrader was unable to obtain write access to agreement.txt.<br><br>If you are using a linux or unix based server, please ensure that the file is chmod\'d to 777, or if it does not exist that the directory this upgrader is in is 777.<br>If your server is running Windows, please ensure that the internet guest account has the proper permissions on it or its folder.');
+	}
 
 	// Upgrade the agreement.
 	elseif (isset($modSettings['agreement']))
@@ -727,8 +776,8 @@ 
 	}
 
 	// We're going to check that their board dir setting is right in case they've been moving stuff around.
-	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => '')))
-		$upcontext['warning'] = '
+	if (strtr($boarddir, array('/' => '', '\\' => '')) != strtr(dirname(__FILE__), array('/' => '', '\\' => ''))) {
+			$upcontext['warning'] = '
 			It looks as if your board directory settings <em>might</em> be incorrect. Your board directory is currently set to &quot;' . $boarddir . '&quot; but should probably be &quot;' . dirname(__FILE__) . '&quot;. Settings.php currently lists your paths as:<br>
 			<ul>
 				<li>Board Directory: ' . $boarddir . '</li>
@@ -736,19 +785,23 @@ 
 				<li>Cache Directory: ' . $cachedir_temp . '</li>
 			</ul>
 			If these seem incorrect please open Settings.php in a text editor before proceeding with this upgrade. If they are incorrect due to you moving your forum to a new location please download and execute the <a href="https://download.simplemachines.org/?tools">Repair Settings</a> tool from the Simple Machines website before continuing.';
+	}
 
 	// Confirm mbstring is loaded...
-	if (!extension_loaded('mbstring'))
-		return throw_error($txt['install_no_mbstring']);
+	if (!extension_loaded('mbstring')) {
+			return throw_error($txt['install_no_mbstring']);
+	}
 
 	// Check for https stream support.
 	$supported_streams = stream_get_wrappers();
-	if (!in_array('https', $supported_streams))
-		$upcontext['custom_warning'] = $txt['install_no_https'];
+	if (!in_array('https', $supported_streams)) {
+			$upcontext['custom_warning'] = $txt['install_no_https'];
+	}
 
 	// Either we're logged in or we're going to present the login.
-	if (checkLogin())
-		return true;
+	if (checkLogin()) {
+			return true;
+	}
 
 	$upcontext += createToken('login');
 
@@ -762,15 +815,17 @@ 
 	global $smcFunc, $db_type, $support_js;
 
 	// Don't bother if the security is disabled.
-	if ($disable_security)
-		return true;
+	if ($disable_security) {
+			return true;
+	}
 
 	// Are we trying to login?
 	if (isset($_POST['contbutt']) && (!empty($_POST['user'])))
 	{
 		// If we've disabled security pick a suitable name!
-		if (empty($_POST['user']))
-			$_POST['user'] = 'Administrator';
+		if (empty($_POST['user'])) {
+					$_POST['user'] = 'Administrator';
+		}
 
 		// Before 2.0 these column names were different!
 		$oldDB = false;
@@ -785,16 +840,17 @@ 
 					'db_error_skip' => true,
 				)
 			);
-			if ($smcFunc['db_num_rows']($request) != 0)
-				$oldDB = true;
+			if ($smcFunc['db_num_rows']($request) != 0) {
+							$oldDB = true;
+			}
 			$smcFunc['db_free_result']($request);
 		}
 
 		// Get what we believe to be their details.
 		if (!$disable_security)
 		{
-			if ($oldDB)
-				$request = $smcFunc['db_query']('', '
+			if ($oldDB) {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, memberName AS member_name, passwd, id_group,
 					additionalGroups AS additional_groups, lngfile
 					FROM {db_prefix}members
@@ -804,8 +860,8 @@ 
 						'db_error_skip' => true,
 					)
 				);
-			else
-				$request = $smcFunc['db_query']('', '
+			} else {
+							$request = $smcFunc['db_query']('', '
 					SELECT id_member, member_name, passwd, id_group, additional_groups, lngfile
 					FROM {db_prefix}members
 					WHERE member_name = {string:member_name}',
@@ -814,6 +870,7 @@ 
 						'db_error_skip' => true,
 					)
 				);
+			}
 			if ($smcFunc['db_num_rows']($request) != 0)
 			{
 				list ($id_member, $name, $password, $id_group, $addGroups, $user_language) = $smcFunc['db_fetch_row']($request);
@@ -821,16 +878,17 @@ 
 				$groups = explode(',', $addGroups);
 				$groups[] = $id_group;
 
-				foreach ($groups as $k => $v)
-					$groups[$k] = (int) $v;
+				foreach ($groups as $k => $v) {
+									$groups[$k] = (int) $v;
+				}
 
 				$sha_passwd = sha1(strtolower($name) . un_htmlspecialchars($_REQUEST['passwrd']));
 
 				// We don't use "-utf8" anymore...
 				$user_language = str_ireplace('-utf8', '', $user_language);
+			} else {
+							$upcontext['username_incorrect'] = true;
 			}
-			else
-				$upcontext['username_incorrect'] = true;
 			$smcFunc['db_free_result']($request);
 		}
 		$upcontext['username'] = $_POST['user'];
@@ -840,13 +898,14 @@ 
 		{
 			$upcontext['upgrade_status']['js'] = 1;
 			$support_js = 1;
+		} else {
+					$support_js = 0;
 		}
-		else
-			$support_js = 0;
 
 		// Note down the version we are coming from.
-		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version']))
-			$upcontext['user']['version'] = $modSettings['smfVersion'];
+		if (!empty($modSettings['smfVersion']) && empty($upcontext['user']['version'])) {
+					$upcontext['user']['version'] = $modSettings['smfVersion'];
+		}
 
 		// Didn't get anywhere?
 		if (!$disable_security && (empty($sha_passwd) || (!empty($password) ? $password : '') != $sha_passwd) && !hash_verify_password((!empty($name) ? $name : ''), $_REQUEST['passwrd'], (!empty($password) ? $password : '')) && empty($upcontext['username_incorrect']))
@@ -880,15 +939,15 @@ 
 							'db_error_skip' => true,
 						)
 					);
-					if ($smcFunc['db_num_rows']($request) == 0)
-						return throw_error('You need to be an admin to perform an upgrade!');
+					if ($smcFunc['db_num_rows']($request) == 0) {
+											return throw_error('You need to be an admin to perform an upgrade!');
+					}
 					$smcFunc['db_free_result']($request);
 				}
 
 				$upcontext['user']['id'] = $id_member;
 				$upcontext['user']['name'] = $name;
-			}
-			else
+			} else
 			{
 				$upcontext['user']['id'] = 1;
 				$upcontext['user']['name'] = 'Administrator';
@@ -904,11 +963,11 @@ 
 				$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $user_language . '.php')), 0, 4096);
 				preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php'))
-					$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
-				else
+				if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been updated to the latest version. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} elseif (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . basename($user_language, '.lng') . '.php')) {
+									$upcontext['upgrade_options_warning'] = 'The language files for your selected language, ' . $user_language . ', have not been uploaded/updated as the &quot;Install&quot; language file is missing. Upgrade will continue with the forum default, ' . $upcontext['language'] . '.';
+				} else
 				{
 					// Set this as the new language.
 					$upcontext['language'] = $user_language;
@@ -952,8 +1011,9 @@ 
 	unset($member_columns);
 
 	// If we've not submitted then we're done.
-	if (empty($_POST['upcont']))
-		return false;
+	if (empty($_POST['upcont'])) {
+			return false;
+	}
 
 	// Firstly, if they're enabling SM stat collection just do it.
 	if (!empty($_POST['stats']) && substr($boardurl, 0, 16) != 'http://localhost' && empty($modSettings['allow_sm_stats']) && empty($modSettings['enable_sm_stats']))
@@ -973,16 +1033,17 @@ 
 				fwrite($fp, $out);
 
 				$return_data = '';
-				while (!feof($fp))
-					$return_data .= fgets($fp, 128);
+				while (!feof($fp)) {
+									$return_data .= fgets($fp, 128);
+				}
 
 				fclose($fp);
 
 				// Get the unique site ID.
 				preg_match('~SITE-ID:\s(\w{10})~', $return_data, $ID);
 
-				if (!empty($ID[1]))
-					$smcFunc['db_insert']('replace',
+				if (!empty($ID[1])) {
+									$smcFunc['db_insert']('replace',
 						$db_prefix . 'settings',
 						array('variable' => 'string', 'value' => 'string'),
 						array(
@@ -991,9 +1052,9 @@ 
 						),
 						array('variable')
 					);
+				}
 			}
-		}
-		else
+		} else
 		{
 			$smcFunc['db_insert']('replace',
 				$db_prefix . 'settings',
@@ -1004,8 +1065,8 @@ 
 		}
 	}
 	// Don't remove stat collection unless we unchecked the box for real, not from the loop.
-	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats']))
-		$smcFunc['db_query']('', '
+	elseif (empty($_POST['stats']) && empty($upcontext['allow_sm_stats'])) {
+			$smcFunc['db_query']('', '
 			DELETE FROM {db_prefix}settings
 			WHERE variable = {string:enable_sm_stats}',
 			array(
@@ -1013,6 +1074,7 @@ 
 				'db_error_skip' => true,
 			)
 		);
+	}
 
 	// Deleting old karma stuff?
 	if (!empty($_POST['delete_karma']))
@@ -1027,20 +1089,22 @@ 
 		);
 
 		// Cleaning up old karma member settings.
-		if ($upcontext['karma_installed']['good'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['good']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_good',
 				array()
 			);
+		}
 
 		// Does karma bad was enable?
-		if ($upcontext['karma_installed']['bad'])
-			$smcFunc['db_query']('', '
+		if ($upcontext['karma_installed']['bad']) {
+					$smcFunc['db_query']('', '
 				ALTER TABLE {db_prefix}members
 				DROP karma_bad',
 				array()
 			);
+		}
 
 		// Cleaning up old karma permissions.
 		$smcFunc['db_query']('', '
@@ -1058,32 +1122,37 @@ 
 	}
 
 	// Emptying the error log?
-	if (!empty($_POST['empty_error']))
-		$smcFunc['db_query']('truncate_table', '
+	if (!empty($_POST['empty_error'])) {
+			$smcFunc['db_query']('truncate_table', '
 			TRUNCATE {db_prefix}log_errors',
 			array(
 			)
 		);
+	}
 
 	$changes = array();
 
 	// Add proxy settings.
-	if (!isset($GLOBALS['image_proxy_maxsize']))
-		$changes += array(
+	if (!isset($GLOBALS['image_proxy_maxsize'])) {
+			$changes += array(
 			'image_proxy_secret' => '\'' . substr(sha1(mt_rand()), 0, 20) . '\'',
 			'image_proxy_maxsize' => 5190,
 			'image_proxy_enabled' => 0,
 		);
+	}
 
 	// If $boardurl reflects https, set force_ssl
-	if (!function_exists('cache_put_data'))
-		require_once($sourcedir . '/Load.php');
-	if (stripos($boardurl, 'https://') !== false)
-		updateSettings(array('force_ssl' => '1'));
+	if (!function_exists('cache_put_data')) {
+			require_once($sourcedir . '/Load.php');
+	}
+	if (stripos($boardurl, 'https://') !== false) {
+			updateSettings(array('force_ssl' => '1'));
+	}
 
 	// If we're overriding the language follow it through.
-	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php'))
-		$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	if (isset($_GET['lang']) && file_exists($modSettings['theme_dir'] . '/languages/index.' . $_GET['lang'] . '.php')) {
+			$changes['language'] = '\'' . $_GET['lang'] . '\'';
+	}
 
 	if (!empty($_POST['maint']))
 	{
@@ -1095,26 +1164,29 @@ 
 		{
 			$changes['mtitle'] = '\'' . addslashes($_POST['maintitle']) . '\'';
 			$changes['mmessage'] = '\'' . addslashes($_POST['mainmessage']) . '\'';
-		}
-		else
+		} else
 		{
 			$changes['mtitle'] = '\'Upgrading the forum...\'';
 			$changes['mmessage'] = '\'Don\\\'t worry, we will be back shortly with an updated forum.  It will only be a minute ;).\'';
 		}
 	}
 
-	if ($command_line)
-		echo ' * Updating Settings.php...';
+	if ($command_line) {
+			echo ' * Updating Settings.php...';
+	}
 
 	// Fix some old paths.
-	if (substr($boarddir, 0, 1) == '.')
-		$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	if (substr($boarddir, 0, 1) == '.') {
+			$changes['boarddir'] = '\'' . fixRelativePath($boarddir) . '\'';
+	}
 
-	if (substr($sourcedir, 0, 1) == '.')
-		$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	if (substr($sourcedir, 0, 1) == '.') {
+			$changes['sourcedir'] = '\'' . fixRelativePath($sourcedir) . '\'';
+	}
 
-	if (empty($cachedir) || substr($cachedir, 0, 1) == '.')
-		$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	if (empty($cachedir) || substr($cachedir, 0, 1) == '.') {
+			$changes['cachedir'] = '\'' . fixRelativePath($boarddir) . '/cache\'';
+	}
 
 	// If they have a "host:port" setup for the host, split that into separate values
 	// You should never have a : in the hostname if you're not on MySQL, but better safe than sorry
@@ -1125,32 +1197,36 @@ 
 		$changes['db_server'] = '\'' . $db_server . '\'';
 
 		// Only set this if we're not using the default port
-		if ($db_port != ini_get('mysqli.default_port'))
-			$changes['db_port'] = (int) $db_port;
-	}
-	elseif (!empty($db_port))
+		if ($db_port != ini_get('mysqli.default_port')) {
+					$changes['db_port'] = (int) $db_port;
+		}
+	} elseif (!empty($db_port))
 	{
 		// If db_port is set and is the same as the default, set it to ''
 		if ($db_type == 'mysql')
 		{
-			if ($db_port == ini_get('mysqli.default_port'))
-				$changes['db_port'] = '\'\'';
-			elseif ($db_type == 'postgresql' && $db_port == 5432)
-				$changes['db_port'] = '\'\'';
+			if ($db_port == ini_get('mysqli.default_port')) {
+							$changes['db_port'] = '\'\'';
+			} elseif ($db_type == 'postgresql' && $db_port == 5432) {
+							$changes['db_port'] = '\'\'';
+			}
 		}
 	}
 
 	// Maybe we haven't had this option yet?
-	if (empty($packagesdir))
-		$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	if (empty($packagesdir)) {
+			$changes['packagesdir'] = '\'' . fixRelativePath($boarddir) . '/Packages\'';
+	}
 
 	// Add support for $tasksdir var.
-	if (empty($tasksdir))
-		$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	if (empty($tasksdir)) {
+			$changes['tasksdir'] = '\'' . fixRelativePath($sourcedir) . '/tasks\'';
+	}
 
 	// Make sure we fix the language as well.
-	if (stristr($language, '-utf8'))
-		$changes['language'] = '\'' . str_ireplace('-utf8', '', $language) . '\'';
+	if (stristr($language, '-utf8')) {
+			$changes['language'] = '\'' . str_ireplace('-utf8', '', $language) . '\'';
+	}
 
 	// @todo Maybe change the cookie name if going to 1.1, too?
 
@@ -1161,8 +1237,9 @@ 
 	// Tell Settings.php to store db_last_error.php in the cache
 	move_db_last_error_to_cachedir();
 
-	if ($command_line)
-		echo ' Successful.' . "\n";
+	if ($command_line) {
+			echo ' Successful.' . "\n";
+	}
 
 	// Are we doing debug?
 	if (isset($_POST['debug']))
@@ -1172,8 +1249,9 @@ 
 	}
 
 	// If we're not backing up then jump one.
-	if (empty($_POST['backup']))
-		$upcontext['current_step']++;
+	if (empty($_POST['backup'])) {
+			$upcontext['current_step']++;
+	}
 
 	// If we've got here then let's proceed to the next step!
 	return true;
@@ -1188,8 +1266,9 @@ 
 	$upcontext['page_title'] = 'Backup Database';
 
 	// Done it already - js wise?
-	if (!empty($_POST['backup_done']))
-		return true;
+	if (!empty($_POST['backup_done'])) {
+			return true;
+	}
 
 	// Some useful stuff here.
 	db_extend();
@@ -1203,9 +1282,10 @@ 
 	$tables = $smcFunc['db_list_tables']($db, $filter);
 
 	$table_names = array();
-	foreach ($tables as $table)
-		if (substr($table, 0, 7) !== 'backup_')
+	foreach ($tables as $table) {
+			if (substr($table, 0, 7) !== 'backup_')
 			$table_names[] = $table;
+	}
 
 	$upcontext['table_count'] = count($table_names);
 	$upcontext['cur_table_num'] = $_GET['substep'];
@@ -1215,12 +1295,14 @@ 
 	$file_steps = $upcontext['table_count'];
 
 	// What ones have we already done?
-	foreach ($table_names as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($table_names as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Backing Up Tables.';
+	if ($command_line) {
+			echo 'Backing Up Tables.';
+	}
 
 	// If we don't support javascript we backup here.
 	if (!$support_js || isset($_GET['xml']))
@@ -1239,8 +1321,9 @@ 
 			backupTable($table_names[$substep]);
 
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -1273,9 +1356,10 @@ 
 
 	$smcFunc['db_backup_table']($table, 'backup_' . $table);
 
-	if ($command_line)
-		echo ' done.';
-}
+	if ($command_line) {
+			echo ' done.';
+	}
+	}
 
 // Step 2: Everything.
 function DatabaseChanges()
@@ -1284,8 +1368,9 @@ 
 	global $upcontext, $support_js, $db_type;
 
 	// Have we just completed this?
-	if (!empty($_POST['database_done']))
-		return true;
+	if (!empty($_POST['database_done'])) {
+			return true;
+	}
 
 	$upcontext['sub_template'] = isset($_GET['xml']) ? 'database_xml' : 'database_changes';
 	$upcontext['page_title'] = 'Database Changes';
@@ -1300,15 +1385,16 @@ 
 	);
 
 	// How many files are there in total?
-	if (isset($_GET['filecount']))
-		$upcontext['file_count'] = (int) $_GET['filecount'];
-	else
+	if (isset($_GET['filecount'])) {
+			$upcontext['file_count'] = (int) $_GET['filecount'];
+	} else
 	{
 		$upcontext['file_count'] = 0;
 		foreach ($files as $file)
 		{
-			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1])
-				$upcontext['file_count']++;
+			if (!isset($modSettings['smfVersion']) || $modSettings['smfVersion'] < $file[1]) {
+							$upcontext['file_count']++;
+			}
 		}
 	}
 
@@ -1318,9 +1404,9 @@ 
 	$upcontext['cur_file_num'] = 0;
 	foreach ($files as $file)
 	{
-		if ($did_not_do)
-			$did_not_do--;
-		else
+		if ($did_not_do) {
+					$did_not_do--;
+		} else
 		{
 			$upcontext['cur_file_num']++;
 			$upcontext['cur_file_name'] = $file[0];
@@ -1347,12 +1433,13 @@ 
 					// Flag to move on to the next.
 					$upcontext['completed_step'] = true;
 					// Did we complete the whole file?
-					if ($nextFile)
-						$upcontext['current_debug_item_num'] = -1;
+					if ($nextFile) {
+											$upcontext['current_debug_item_num'] = -1;
+					}
 					return upgradeExit();
+				} elseif ($support_js) {
+									break;
 				}
-				elseif ($support_js)
-					break;
 			}
 			// Set the progress bar to be right as if we had - even if we hadn't...
 			$upcontext['step_progress'] = ($upcontext['cur_file_num'] / $upcontext['file_count']) * 100;
@@ -1377,8 +1464,9 @@ 
 	global $command_line, $language, $upcontext, $sourcedir, $forum_version, $user_info, $maintenance, $smcFunc, $db_type;
 
 	// Now it's nice to have some of the basic SMF source files.
-	if (!isset($_GET['ssi']) && !$command_line)
-		redirectLocation('&ssi=1');
+	if (!isset($_GET['ssi']) && !$command_line) {
+			redirectLocation('&ssi=1');
+	}
 
 	$upcontext['sub_template'] = 'upgrade_complete';
 	$upcontext['page_title'] = 'Upgrade Complete';
@@ -1394,14 +1482,16 @@ 
 	// Are we in maintenance mode?
 	if (isset($upcontext['user']['main']))
 	{
-		if ($command_line)
-			echo ' * ';
+		if ($command_line) {
+					echo ' * ';
+		}
 		$upcontext['removed_maintenance'] = true;
 		$changes['maintenance'] = $upcontext['user']['main'];
 	}
 	// Otherwise if somehow we are in 2 let's go to 1.
-	elseif (!empty($maintenance) && $maintenance == 2)
-		$changes['maintenance'] = 1;
+	elseif (!empty($maintenance) && $maintenance == 2) {
+			$changes['maintenance'] = 1;
+	}
 
 	// Wipe this out...
 	$upcontext['user'] = array();
@@ -1416,9 +1506,9 @@ 
 	$upcontext['can_delete_script'] = is_writable(dirname(__FILE__)) || is_writable(__FILE__);
 
 	// Now is the perfect time to fetch the SM files.
-	if ($command_line)
-		cli_scheduled_fetchSMfiles();
-	else
+	if ($command_line) {
+			cli_scheduled_fetchSMfiles();
+	} else
 	{
 		require_once($sourcedir . '/ScheduledTasks.php');
 		$forum_version = SMF_VERSION; // The variable is usually defined in index.php so lets just use the constant to do it for us.
@@ -1426,8 +1516,9 @@ 
 	}
 
 	// Log what we've done.
-	if (empty($user_info['id']))
-		$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	if (empty($user_info['id'])) {
+			$user_info['id'] = !empty($upcontext['user']['id']) ? $upcontext['user']['id'] : 0;
+	}
 
 	// Log the action manually, so CLI still works.
 	$smcFunc['db_insert']('',
@@ -1446,8 +1537,9 @@ 
 
 	// Save the current database version.
 	$server_version = $smcFunc['db_server_info']();
-	if ($db_type == 'mysql' && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51')))
-		updateSettings(array('db_mysql_group_by_fix' => '1'));
+	if ($db_type == 'mysql' && in_array(substr($server_version, 0, 6), array('5.0.50', '5.0.51'))) {
+			updateSettings(array('db_mysql_group_by_fix' => '1'));
+	}
 
 	if ($command_line)
 	{
@@ -1459,8 +1551,9 @@ 
 
 	// Make sure it says we're done.
 	$upcontext['overall_percent'] = 100;
-	if (isset($upcontext['step_progress']))
-		unset($upcontext['step_progress']);
+	if (isset($upcontext['step_progress'])) {
+			unset($upcontext['step_progress']);
+	}
 
 	$_GET['substep'] = 0;
 	return false;
@@ -1471,8 +1564,9 @@ 
 {
 	global $sourcedir, $language, $forum_version, $modSettings, $smcFunc;
 
-	if (empty($modSettings['time_format']))
-		$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	if (empty($modSettings['time_format'])) {
+			$modSettings['time_format'] = '%B %d, %Y, %I:%M:%S %p';
+	}
 
 	// What files do we want to get
 	$request = $smcFunc['db_query']('', '
@@ -1506,8 +1600,9 @@ 
 		$file_data = fetch_web_data($url);
 
 		// If we got an error - give up - the site might be down.
-		if ($file_data === false)
-			return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		if ($file_data === false) {
+					return throw_error(sprintf('Could not retrieve the file %1$s.', $url));
+		}
 
 		// Save the file to the database.
 		$smcFunc['db_query']('substring', '
@@ -1549,8 +1644,9 @@ 
 	$themeData = array();
 	foreach ($values as $variable => $value)
 	{
-		if (!isset($value) || $value === null)
-			$value = 0;
+		if (!isset($value) || $value === null) {
+					$value = 0;
+		}
 
 		$themeData[] = array(0, 1, $variable, $value);
 	}
@@ -1579,8 +1675,9 @@ 
 
 	foreach ($values as $variable => $value)
 	{
-		if (empty($modSettings[$value[0]]))
-			continue;
+		if (empty($modSettings[$value[0]])) {
+					continue;
+		}
 
 		$smcFunc['db_query']('', '
 			INSERT IGNORE INTO {db_prefix}themes
@@ -1666,19 +1763,21 @@ 
 	set_error_handler(
 		function ($errno, $errstr, $errfile, $errline) use ($support_js)
 		{
-			if ($support_js)
-				return true;
-			else
-				echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			if ($support_js) {
+							return true;
+			} else {
+							echo 'Error: ' . $errstr . ' File: ' . $errfile . ' Line: ' . $errline;
+			}
 		}
 	);
 
 	// If we're on MySQL, set {db_collation}; this approach is used throughout upgrade_2-0_mysql.php to set new tables to utf8
 	// Note it is expected to be in the format: ENGINE=MyISAM{$db_collation};
-	if ($db_type == 'mysql')
-		$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
-	else
-		$db_collation = '';
+	if ($db_type == 'mysql') {
+			$db_collation = ' DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci';
+	} else {
+			$db_collation = '';
+	}
 
 	$endl = $command_line ? "\n" : '<br>' . "\n";
 
@@ -1690,8 +1789,9 @@ 
 	$last_step = '';
 
 	// Make sure all newly created tables will have the proper characters set; this approach is used throughout upgrade_2-1_mysql.php
-	if (isset($db_character_set) && $db_character_set === 'utf8')
-		$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	if (isset($db_character_set) && $db_character_set === 'utf8') {
+			$lines = str_replace(') ENGINE=MyISAM;', ') ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;', $lines);
+	}
 
 	// Count the total number of steps within this file - for progress.
 	$file_steps = substr_count(implode('', $lines), '---#');
@@ -1711,15 +1811,18 @@ 
 		$do_current = $substep >= $_GET['substep'];
 
 		// Get rid of any comments in the beginning of the line...
-		if (substr(trim($line), 0, 2) === '/*')
-			$line = preg_replace('~/\*.+?\*/~', '', $line);
+		if (substr(trim($line), 0, 2) === '/*') {
+					$line = preg_replace('~/\*.+?\*/~', '', $line);
+		}
 
 		// Always flush.  Flush, flush, flush.  Flush, flush, flush, flush!  FLUSH!
-		if ($is_debug && !$support_js && $command_line)
-			flush();
+		if ($is_debug && !$support_js && $command_line) {
+					flush();
+		}
 
-		if (trim($line) === '')
-			continue;
+		if (trim($line) === '') {
+					continue;
+		}
 
 		if (trim(substr($line, 0, 3)) === '---')
 		{
@@ -1729,8 +1832,9 @@ 
 			if (trim($current_data) != '' && $type !== '}')
 			{
 				$upcontext['error_message'] = 'Error in upgrade script - line ' . $line_number . '!' . $endl;
-				if ($command_line)
-					echo $upcontext['error_message'];
+				if ($command_line) {
+									echo $upcontext['error_message'];
+				}
 			}
 
 			if ($type == ' ')
@@ -1748,17 +1852,18 @@ 
 				if ($do_current)
 				{
 					$upcontext['actioned_items'][] = $last_step;
-					if ($command_line)
-						echo ' * ';
+					if ($command_line) {
+											echo ' * ';
+					}
 				}
-			}
-			elseif ($type == '#')
+			} elseif ($type == '#')
 			{
 				$upcontext['step_progress'] += (100 / $upcontext['file_count']) / $file_steps;
 
 				$upcontext['current_debug_item_num']++;
-				if (trim($line) != '---#')
-					$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				if (trim($line) != '---#') {
+									$upcontext['current_debug_item_name'] = htmlspecialchars(rtrim(substr($line, 4)));
+				}
 
 				// Have we already done something?
 				if (isset($_GET['xml']) && $done_something)
@@ -1769,34 +1874,36 @@ 
 
 				if ($do_current)
 				{
-					if (trim($line) == '---#' && $command_line)
-						echo ' done.', $endl;
-					elseif ($command_line)
-						echo ' +++ ', rtrim(substr($line, 4));
-					elseif (trim($line) != '---#')
+					if (trim($line) == '---#' && $command_line) {
+											echo ' done.', $endl;
+					} elseif ($command_line) {
+											echo ' +++ ', rtrim(substr($line, 4));
+					} elseif (trim($line) != '---#')
 					{
-						if ($is_debug)
-							$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						if ($is_debug) {
+													$upcontext['actioned_items'][] = htmlspecialchars(rtrim(substr($line, 4)));
+						}
 					}
 				}
 
 				if ($substep < $_GET['substep'] && $substep + 1 >= $_GET['substep'])
 				{
-					if ($command_line)
-						echo ' * ';
-					else
-						$upcontext['actioned_items'][] = $last_step;
+					if ($command_line) {
+											echo ' * ';
+					} else {
+											$upcontext['actioned_items'][] = $last_step;
+					}
 				}
 
 				// Small step - only if we're actually doing stuff.
-				if ($do_current)
-					nextSubstep(++$substep);
-				else
-					$substep++;
-			}
-			elseif ($type == '{')
-				$current_type = 'code';
-			elseif ($type == '}')
+				if ($do_current) {
+									nextSubstep(++$substep);
+				} else {
+									$substep++;
+				}
+			} elseif ($type == '{') {
+							$current_type = 'code';
+			} elseif ($type == '}')
 			{
 				$current_type = 'sql';
 
@@ -1809,8 +1916,9 @@ 
 				if (eval('global $db_prefix, $modSettings, $smcFunc; ' . $current_data) === false)
 				{
 					$upcontext['error_message'] = 'Error in upgrade script ' . basename($filename) . ' on line ' . $line_number . '!' . $endl;
-					if ($command_line)
-						echo $upcontext['error_message'];
+					if ($command_line) {
+											echo $upcontext['error_message'];
+					}
 				}
 
 				// Done with code!
@@ -1890,8 +1998,9 @@ 
 	$db_unbuffered = false;
 
 	// Failure?!
-	if ($result !== false)
-		return $result;
+	if ($result !== false) {
+			return $result;
+	}
 
 	$db_error_message = $smcFunc['db_error']($db_connection);
 	// If MySQL we do something more clever.
@@ -1919,54 +2028,61 @@ 
 			{
 				mysqli_query($db_connection, 'REPAIR TABLE `' . $match[1] . '`');
 				$result = mysqli_query($db_connection, $string);
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
-		}
-		elseif ($mysqli_errno == 2013)
+		} elseif ($mysqli_errno == 2013)
 		{
 			$db_connection = mysqli_connect($db_server, $db_user, $db_passwd);
 			mysqli_select_db($db_connection, $db_name);
 			if ($db_connection)
 			{
 				$result = mysqli_query($db_connection, $string);
-				if ($result !== false)
-					return $result;
+				if ($result !== false) {
+									return $result;
+				}
 			}
 		}
 		// Duplicate column name... should be okay ;).
-		elseif (in_array($mysqli_errno, array(1060, 1061, 1068, 1091)))
-			return false;
+		elseif (in_array($mysqli_errno, array(1060, 1061, 1068, 1091))) {
+					return false;
+		}
 		// Duplicate insert... make sure it's the proper type of query ;).
-		elseif (in_array($mysqli_errno, array(1054, 1062, 1146)) && $error_query)
-			return false;
+		elseif (in_array($mysqli_errno, array(1054, 1062, 1146)) && $error_query) {
+					return false;
+		}
 		// Creating an index on a non-existent column.
-		elseif ($mysqli_errno == 1072)
-			return false;
-		elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE')
-			return false;
+		elseif ($mysqli_errno == 1072) {
+					return false;
+		} elseif ($mysqli_errno == 1050 && substr(trim($string), 0, 12) == 'RENAME TABLE') {
+					return false;
+		}
 	}
 	// If a table already exists don't go potty.
 	else
 	{
 		if (in_array(substr(trim($string), 0, 8), array('CREATE T', 'CREATE S', 'DROP TABL', 'ALTER TA', 'CREATE I', 'CREATE U')))
 		{
-			if (strpos($db_error_message, 'exist') !== false)
-				return true;
-		}
-		elseif (strpos(trim($string), 'INSERT ') !== false)
+			if (strpos($db_error_message, 'exist') !== false) {
+							return true;
+			}
+		} elseif (strpos(trim($string), 'INSERT ') !== false)
 		{
-			if (strpos($db_error_message, 'duplicate') !== false)
-				return true;
+			if (strpos($db_error_message, 'duplicate') !== false) {
+							return true;
+			}
 		}
 	}
 
 	// Get the query string so we pass everything.
 	$query_string = '';
-	foreach ($_GET as $k => $v)
-		$query_string .= ';' . $k . '=' . $v;
-	if (strlen($query_string) != 0)
-		$query_string = '?' . substr($query_string, 1);
+	foreach ($_GET as $k => $v) {
+			$query_string .= ';' . $k . '=' . $v;
+	}
+	if (strlen($query_string) != 0) {
+			$query_string = '?' . substr($query_string, 1);
+	}
 
 	if ($command_line)
 	{
@@ -2021,16 +2137,18 @@ 
 			{
 				$found |= 1;
 				// Do some checks on the data if we have it set.
-				if (isset($change['col_type']))
-					$found &= $change['col_type'] === $column['type'];
-				if (isset($change['null_allowed']))
-					$found &= $column['null'] == $change['null_allowed'];
-				if (isset($change['default']))
-					$found &= $change['default'] === $column['default'];
+				if (isset($change['col_type'])) {
+									$found &= $change['col_type'] === $column['type'];
+				}
+				if (isset($change['null_allowed'])) {
+									$found &= $column['null'] == $change['null_allowed'];
+				}
+				if (isset($change['default'])) {
+									$found &= $change['default'] === $column['default'];
+				}
 			}
 		}
-	}
-	elseif ($change['type'] === 'index')
+	} elseif ($change['type'] === 'index')
 	{
 		$request = upgrade_query('
 			SHOW INDEX
@@ -2039,9 +2157,10 @@ 
 		{
 			$cur_index = array();
 
-			while ($row = $smcFunc['db_fetch_assoc']($request))
-				if ($row['Key_name'] === $change['name'])
+			while ($row = $smcFunc['db_fetch_assoc']($request)) {
+							if ($row['Key_name'] === $change['name'])
 					$cur_index[(int) $row['Seq_in_index']] = $row['Column_name'];
+			}
 
 			ksort($cur_index, SORT_NUMERIC);
 			$found = array_values($cur_index) === $change['target_columns'];
@@ -2051,14 +2170,17 @@ 
 	}
 
 	// If we're trying to add and it's added, we're done.
-	if ($found && in_array($change['method'], array('add', 'change')))
-		return true;
+	if ($found && in_array($change['method'], array('add', 'change'))) {
+			return true;
+	}
 	// Otherwise if we're removing and it wasn't found we're also done.
-	elseif (!$found && in_array($change['method'], array('remove', 'change_remove')))
-		return true;
+	elseif (!$found && in_array($change['method'], array('remove', 'change_remove'))) {
+			return true;
+	}
 	// Otherwise is it just a test?
-	elseif ($is_test)
-		return false;
+	elseif ($is_test) {
+			return false;
+	}
 
 	// Not found it yet? Bummer! How about we see if we're currently doing it?
 	$running = false;
@@ -2069,8 +2191,9 @@ 
 			SHOW FULL PROCESSLIST');
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false)
-				$found = true;
+			if (strpos($row['Info'], 'ALTER TABLE ' . $db_prefix . $change['table']) !== false && strpos($row['Info'], $change['text']) !== false) {
+							$found = true;
+			}
 		}
 
 		// Can't find it? Then we need to run it fools!
@@ -2082,8 +2205,9 @@ 
 				ALTER TABLE ' . $db_prefix . $change['table'] . '
 				' . $change['text'], true) !== false;
 
-			if (!$success)
-				return false;
+			if (!$success) {
+							return false;
+			}
 
 			// Return
 			$running = true;
@@ -2125,8 +2249,9 @@ 
 			'db_error_skip' => true,
 		)
 	);
-	if ($smcFunc['db_num_rows']($request) === 0)
-		die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+	if ($smcFunc['db_num_rows']($request) === 0) {
+			die('Unable to find column ' . $change['column'] . ' inside table ' . $db_prefix . $change['table']);
+	}
 	$table_row = $smcFunc['db_fetch_assoc']($request);
 	$smcFunc['db_free_result']($request);
 
@@ -2148,18 +2273,19 @@ 
 			)
 		);
 		// No results? Just forget it all together.
-		if ($smcFunc['db_num_rows']($request) === 0)
-			unset($table_row['Collation']);
-		else
-			$collation_info = $smcFunc['db_fetch_assoc']($request);
+		if ($smcFunc['db_num_rows']($request) === 0) {
+					unset($table_row['Collation']);
+		} else {
+					$collation_info = $smcFunc['db_fetch_assoc']($request);
+		}
 		$smcFunc['db_free_result']($request);
 	}
 
 	if ($column_fix)
 	{
 		// Make sure there are no NULL's left.
-		if ($null_fix)
-			$smcFunc['db_query']('', '
+		if ($null_fix) {
+					$smcFunc['db_query']('', '
 				UPDATE {db_prefix}' . $change['table'] . '
 				SET ' . $change['column'] . ' = {string:default}
 				WHERE ' . $change['column'] . ' IS NULL',
@@ -2168,6 +2294,7 @@ 
 					'db_error_skip' => true,
 				)
 			);
+		}
 
 		// Do the actual alteration.
 		$smcFunc['db_query']('', '
@@ -2196,8 +2323,9 @@ 
 	}
 
 	// Not a column we need to check on?
-	if (!in_array($change['name'], array('memberGroups', 'passwordSalt')))
-		return;
+	if (!in_array($change['name'], array('memberGroups', 'passwordSalt'))) {
+			return;
+	}
 
 	// Break it up you (six|seven).
 	$temp = explode(' ', str_replace('NOT NULL', 'NOT_NULL', $change['text']));
@@ -2216,13 +2344,13 @@ 
 				'new_name' => $temp[2],
 		));
 		// !!! This doesn't technically work because we don't pass request into it, but it hasn't broke anything yet.
-		if ($smcFunc['db_num_rows'] != 1)
-			return;
+		if ($smcFunc['db_num_rows'] != 1) {
+					return;
+		}
 
 		list (, $current_type) = $smcFunc['db_fetch_assoc']($request);
 		$smcFunc['db_free_result']($request);
-	}
-	else
+	} else
 	{
 		// Do this the old fashion, sure method way.
 		$request = $smcFunc['db_query']('', '
@@ -2233,21 +2361,24 @@ 
 		));
 		// Mayday!
 		// !!! This doesn't technically work because we don't pass request into it, but it hasn't broke anything yet.
-		if ($smcFunc['db_num_rows'] == 0)
-			return;
+		if ($smcFunc['db_num_rows'] == 0) {
+					return;
+		}
 
 		// Oh where, oh where has my little field gone. Oh where can it be...
-		while ($row = $smcFunc['db_query']($request))
-			if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
+		while ($row = $smcFunc['db_query']($request)) {
+					if ($row['Field'] == $temp[1] || $row['Field'] == $temp[2])
 			{
 				$current_type = $row['Type'];
+		}
 				break;
 			}
 	}
 
 	// If this doesn't match, the column may of been altered for a reason.
-	if (trim($current_type) != trim($temp[3]))
-		$temp[3] = $current_type;
+	if (trim($current_type) != trim($temp[3])) {
+			$temp[3] = $current_type;
+	}
 
 	// Piece this back together.
 	$change['text'] = str_replace('NOT_NULL', 'NOT NULL', implode(' ', $temp));
@@ -2259,8 +2390,9 @@ 
 	global $start_time, $timeLimitThreshold, $command_line, $custom_warning;
 	global $step_progress, $is_debug, $upcontext;
 
-	if ($_GET['substep'] < $substep)
-		$_GET['substep'] = $substep;
+	if ($_GET['substep'] < $substep) {
+			$_GET['substep'] = $substep;
+	}
 
 	if ($command_line)
 	{
@@ -2273,29 +2405,33 @@ 
 	}
 
 	@set_time_limit(300);
-	if (function_exists('apache_reset_timeout'))
-		@apache_reset_timeout();
+	if (function_exists('apache_reset_timeout')) {
+			@apache_reset_timeout();
+	}
 
-	if (time() - $start_time <= $timeLimitThreshold)
-		return;
+	if (time() - $start_time <= $timeLimitThreshold) {
+			return;
+	}
 
 	// Do we have some custom step progress stuff?
 	if (!empty($step_progress))
 	{
 		$upcontext['substep_progress'] = 0;
 		$upcontext['substep_progress_name'] = $step_progress['name'];
-		if ($step_progress['current'] > $step_progress['total'])
-			$upcontext['substep_progress'] = 99.9;
-		else
-			$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		if ($step_progress['current'] > $step_progress['total']) {
+					$upcontext['substep_progress'] = 99.9;
+		} else {
+					$upcontext['substep_progress'] = ($step_progress['current'] / $step_progress['total']) * 100;
+		}
 
 		// Make it nicely rounded.
 		$upcontext['substep_progress'] = round($upcontext['substep_progress'], 1);
 	}
 
 	// If this is XML we just exit right away!
-	if (isset($_GET['xml']))
-		return upgradeExit();
+	if (isset($_GET['xml'])) {
+			return upgradeExit();
+	}
 
 	// We're going to pause after this!
 	$upcontext['pause'] = true;
@@ -2303,13 +2439,15 @@ 
 	$upcontext['query_string'] = '';
 	foreach ($_GET as $k => $v)
 	{
-		if ($k != 'data' && $k != 'substep' && $k != 'step')
-			$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		if ($k != 'data' && $k != 'substep' && $k != 'step') {
+					$upcontext['query_string'] .= ';' . $k . '=' . $v;
+		}
 	}
 
 	// Custom warning?
-	if (!empty($custom_warning))
-		$upcontext['custom_warning'] = $custom_warning;
+	if (!empty($custom_warning)) {
+			$upcontext['custom_warning'] = $custom_warning;
+	}
 
 	upgradeExit();
 }
@@ -2324,25 +2462,26 @@ 
 	ob_implicit_flush(true);
 	@set_time_limit(600);
 
-	if (!isset($_SERVER['argv']))
-		$_SERVER['argv'] = array();
+	if (!isset($_SERVER['argv'])) {
+			$_SERVER['argv'] = array();
+	}
 	$_GET['maint'] = 1;
 
 	foreach ($_SERVER['argv'] as $i => $arg)
 	{
-		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0)
-			$_GET['lang'] = $match[1];
-		elseif (preg_match('~^--path=(.+)$~', $arg) != 0)
-			continue;
-		elseif ($arg == '--no-maintenance')
-			$_GET['maint'] = 0;
-		elseif ($arg == '--debug')
-			$is_debug = true;
-		elseif ($arg == '--backup')
-			$_POST['backup'] = 1;
-		elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted')))
-			$_GET['conv'] = 1;
-		elseif ($i != 0)
+		if (preg_match('~^--language=(.+)$~', $arg, $match) != 0) {
+					$_GET['lang'] = $match[1];
+		} elseif (preg_match('~^--path=(.+)$~', $arg) != 0) {
+					continue;
+		} elseif ($arg == '--no-maintenance') {
+					$_GET['maint'] = 0;
+		} elseif ($arg == '--debug') {
+					$is_debug = true;
+		} elseif ($arg == '--backup') {
+					$_POST['backup'] = 1;
+		} elseif ($arg == '--template' && (file_exists($boarddir . '/template.php') || file_exists($boarddir . '/template.html') && !file_exists($modSettings['theme_dir'] . '/converted'))) {
+					$_GET['conv'] = 1;
+		} elseif ($i != 0)
 		{
 			echo 'SMF Command-line Upgrader
 Usage: /path/to/php -f ' . basename(__FILE__) . ' -- [OPTION]...
@@ -2356,10 +2495,12 @@ 
 		}
 	}
 
-	if (!php_version_check())
-		print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
-	if (!db_version_check())
-		print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	if (!php_version_check()) {
+			print_error('Error: PHP ' . PHP_VERSION . ' does not match version requirements.', true);
+	}
+	if (!db_version_check()) {
+			print_error('Error: ' . $databases[$db_type]['name'] . ' ' . $databases[$db_type]['version'] . ' does not match minimum requirements.', true);
+	}
 
 	// Do some checks to make sure they have proper privileges
 	db_extend('packages');
@@ -2374,34 +2515,39 @@ 
 	$drop = $smcFunc['db_drop_table']('{db_prefix}priv_check');
 
 	// Sorry... we need CREATE, ALTER and DROP
-	if (!$create || !$alter || !$drop)
-		print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	if (!$create || !$alter || !$drop) {
+			print_error("The " . $databases[$db_type]['name'] . " user you have set in Settings.php does not have proper privileges.\n\nPlease ask your host to give this user the ALTER, CREATE, and DROP privileges.", true);
+	}
 
 	$check = @file_exists($modSettings['theme_dir'] . '/index.template.php')
 		&& @file_exists($sourcedir . '/QueryString.php')
 		&& @file_exists($sourcedir . '/ManageBoards.php');
-	if (!$check && !isset($modSettings['smfVersion']))
-		print_error('Error: Some files are missing or out-of-date.', true);
+	if (!$check && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Some files are missing or out-of-date.', true);
+	}
 
 	// Do a quick version spot check.
 	$temp = substr(@implode('', @file($boarddir . '/index.php')), 0, 4096);
 	preg_match('~\*\s@version\s+(.+)[\s]{2}~i', $temp, $match);
-	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION))
-		print_error('Error: Some files have not yet been updated properly.');
+	if (empty($match[1]) || (trim($match[1]) != SMF_VERSION)) {
+			print_error('Error: Some files have not yet been updated properly.');
+	}
 
 	// Make sure Settings.php is writable.
 	quickFileWritable($boarddir . '/Settings.php');
-	if (!is_writable($boarddir . '/Settings.php'))
-		print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	if (!is_writable($boarddir . '/Settings.php')) {
+			print_error('Error: Unable to obtain write access to "Settings.php".', true);
+	}
 
 	// Make sure Settings_bak.php is writable.
 	quickFileWritable($boarddir . '/Settings_bak.php');
-	if (!is_writable($boarddir . '/Settings_bak.php'))
-		print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	if (!is_writable($boarddir . '/Settings_bak.php')) {
+			print_error('Error: Unable to obtain write access to "Settings_bak.php".');
+	}
 
-	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt'))
-		print_error('Error: Unable to obtain write access to "agreement.txt".');
-	elseif (isset($modSettings['agreement']))
+	if (isset($modSettings['agreement']) && (!is_writable($boarddir) || file_exists($boarddir . '/agreement.txt')) && !is_writable($boarddir . '/agreement.txt')) {
+			print_error('Error: Unable to obtain write access to "agreement.txt".');
+	} elseif (isset($modSettings['agreement']))
 	{
 		$fp = fopen($boarddir . '/agreement.txt', 'w');
 		fwrite($fp, $modSettings['agreement']);
@@ -2411,36 +2557,42 @@ 
 	// Make sure Themes is writable.
 	quickFileWritable($modSettings['theme_dir']);
 
-	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion']))
-		print_error('Error: Unable to obtain write access to "Themes".');
+	if (!is_writable($modSettings['theme_dir']) && !isset($modSettings['smfVersion'])) {
+			print_error('Error: Unable to obtain write access to "Themes".');
+	}
 
 	// Make sure cache directory exists and is writable!
 	$cachedir_temp = empty($cachedir) ? $boarddir . '/cache' : $cachedir;
-	if (!file_exists($cachedir_temp))
-		@mkdir($cachedir_temp);
+	if (!file_exists($cachedir_temp)) {
+			@mkdir($cachedir_temp);
+	}
 
 	// Make sure the cache temp dir is writable.
 	quickFileWritable($cachedir_temp);
 
-	if (!is_writable($cachedir_temp))
-		print_error('Error: Unable to obtain write access to "cache".', true);
+	if (!is_writable($cachedir_temp)) {
+			print_error('Error: Unable to obtain write access to "cache".', true);
+	}
 
 	// Make sure db_last_error.php is writable.
 	quickFileWritable($cachedir_temp . '/db_last_error.php');
-	if (!is_writable($cachedir_temp . '/db_last_error.php'))
-		print_error('Error: Unable to obtain write access to "db_last_error.php".');
+	if (!is_writable($cachedir_temp . '/db_last_error.php')) {
+			print_error('Error: Unable to obtain write access to "db_last_error.php".');
+	}
 
-	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang']))
-		print_error('Error: Unable to find language files!', true);
-	else
+	if (!file_exists($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php') && !isset($modSettings['smfVersion']) && !isset($_GET['lang'])) {
+			print_error('Error: Unable to find language files!', true);
+	} else
 	{
 		$temp = substr(@implode('', @file($modSettings['theme_dir'] . '/languages/index.' . $upcontext['language'] . '.php')), 0, 4096);
 		preg_match('~(?://|/\*)\s*Version:\s+(.+?);\s*index(?:[\s]{2}|\*/)~i', $temp, $match);
 
-		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION)
-			print_error('Error: Language files out of date.', true);
-		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php'))
-			print_error('Error: Install language is missing for selected language.', true);
+		if (empty($match[1]) || $match[1] != SMF_LANG_VERSION) {
+					print_error('Error: Language files out of date.', true);
+		}
+		if (!file_exists($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php')) {
+					print_error('Error: Install language is missing for selected language.', true);
+		}
 
 		// Otherwise include it!
 		require_once($modSettings['theme_dir'] . '/languages/Install.' . $upcontext['language'] . '.php');
@@ -2459,8 +2611,9 @@ 
 	global $upcontext, $db_character_set, $sourcedir, $smcFunc, $modSettings, $language, $db_prefix, $db_type, $command_line, $support_js;
 
 	// Done it already?
-	if (!empty($_POST['utf8_done']))
-		return true;
+	if (!empty($_POST['utf8_done'])) {
+			return true;
+	}
 
 	// First make sure they aren't already on UTF-8 before we go anywhere...
 	if ($db_type == 'postgresql' || ($db_character_set === 'utf8' && !empty($modSettings['global_character_set']) && $modSettings['global_character_set'] === 'UTF-8'))
@@ -2473,8 +2626,7 @@ 
 		);
 
 		return true;
-	}
-	else
+	} else
 	{
 		$upcontext['page_title'] = 'Converting to UTF8';
 		$upcontext['sub_template'] = isset($_GET['xml']) ? 'convert_xml' : 'convert_utf8';
@@ -2518,8 +2670,9 @@ 
 			)
 		);
 		$db_charsets = array();
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$db_charsets[] = $row['Charset'];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$db_charsets[] = $row['Charset'];
+		}
 
 		$smcFunc['db_free_result']($request);
 
@@ -2555,13 +2708,15 @@ 
 		// If there's a fulltext index, we need to drop it first...
 		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'))
 					$upcontext['fulltext_index'][] = $row['Key_name'];
+			}
 			$smcFunc['db_free_result']($request);
 
-			if (isset($upcontext['fulltext_index']))
-				$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			if (isset($upcontext['fulltext_index'])) {
+							$upcontext['fulltext_index'] = array_unique($upcontext['fulltext_index']);
+			}
 		}
 
 		// Drop it and make a note...
@@ -2751,8 +2906,9 @@ 
 			$replace = '%field%';
 
 			// Build a huge REPLACE statement...
-			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to)
-				$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			foreach ($translation_tables[$upcontext['charset_detected']] as $from => $to) {
+							$replace = 'REPLACE(' . $replace . ', ' . $from . ', ' . $to . ')';
+			}
 		}
 
 		// Get a list of table names ahead of time... This makes it easier to set our substep and such
@@ -2762,9 +2918,10 @@ 
 		$upcontext['table_count'] = count($queryTables);
 
 		// What ones have we already done?
-		foreach ($queryTables as $id => $table)
-			if ($id < $_GET['substep'])
+		foreach ($queryTables as $id => $table) {
+					if ($id < $_GET['substep'])
 				$upcontext['previous_tables'][] = $table;
+		}
 
 		$upcontext['cur_table_num'] = $_GET['substep'];
 		$upcontext['cur_table_name'] = str_replace($db_prefix, '', $queryTables[$_GET['substep']]);
@@ -2801,8 +2958,9 @@ 
 			nextSubstep($substep);
 
 			// Just to make sure it doesn't time out.
-			if (function_exists('apache_reset_timeout'))
-				@apache_reset_timeout();
+			if (function_exists('apache_reset_timeout')) {
+							@apache_reset_timeout();
+			}
 
 			$table_charsets = array();
 
@@ -2825,8 +2983,9 @@ 
 
 						// Build structure of columns to operate on organized by charset; only operate on columns not yet utf8
 						if ($charset != 'utf8') {
-							if (!isset($table_charsets[$charset]))
-								$table_charsets[$charset] = array();
+							if (!isset($table_charsets[$charset])) {
+															$table_charsets[$charset] = array();
+							}
 
 							$table_charsets[$charset][] = $column_info;
 						}
@@ -2867,10 +3026,11 @@ 
 				if (isset($translation_tables[$upcontext['charset_detected']]))
 				{
 					$update = '';
-					foreach ($table_charsets as $charset => $columns)
-						foreach ($columns as $column)
+					foreach ($table_charsets as $charset => $columns) {
+											foreach ($columns as $column)
 							$update .= '
 								' . $column['Field'] . ' = ' . strtr($replace, array('%field%' => $column['Field'])) . ',';
+					}
 
 					$smcFunc['db_query']('', '
 						UPDATE {raw:table_name}
@@ -2895,8 +3055,9 @@ 
 			// Now do the actual conversion (if still needed).
 			if ($charsets[$upcontext['charset_detected']] !== 'utf8')
 			{
-				if ($command_line)
-					echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				if ($command_line) {
+									echo 'Converting table ' . $table_info['Name'] . ' to UTF-8...';
+				}
 
 				$smcFunc['db_query']('', '
 					ALTER TABLE {raw:table_name}
@@ -2906,12 +3067,14 @@ 
 					)
 				);
 
-				if ($command_line)
-					echo " done.\n";
+				if ($command_line) {
+									echo " done.\n";
+				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']) && $upcontext['cur_table_num'] < $upcontext['table_count'])
-				return upgradeExit();
+			if (isset($_GET['xml']) && $upcontext['cur_table_num'] < $upcontext['table_count']) {
+							return upgradeExit();
+			}
 		}
 
 		$prev_charset = empty($translation_tables[$upcontext['charset_detected']]) ? $charsets[$upcontext['charset_detected']] : $translation_tables[$upcontext['charset_detected']];
@@ -2940,8 +3103,8 @@ 
 		);
 		while ($row = $smcFunc['db_fetch_assoc']($request))
 		{
-			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1)
-				$smcFunc['db_query']('', '
+			if (@safe_unserialize($row['extra']) === false && preg_match('~^(a:3:{s:5:"topic";i:\d+;s:7:"subject";s:)(\d+):"(.+)"(;s:6:"member";s:5:"\d+";})$~', $row['extra'], $matches) === 1) {
+							$smcFunc['db_query']('', '
 					UPDATE {db_prefix}log_actions
 					SET extra = {string:extra}
 					WHERE id_action = {int:current_action}',
@@ -2950,6 +3113,7 @@ 
 						'extra' => $matches[1] . strlen($matches[3]) . ':"' . $matches[3] . '"' . $matches[4],
 					)
 				);
+			}
 		}
 		$smcFunc['db_free_result']($request);
 
@@ -2971,15 +3135,17 @@ 
 	// First thing's first - did we already do this?
 	if (!empty($modSettings['json_done']))
 	{
-		if ($command_line)
-			return DeleteUpgrade();
-		else
-			return true;
+		if ($command_line) {
+					return DeleteUpgrade();
+		} else {
+					return true;
+		}
 	}
 
 	// Done it already - js wise?
-	if (!empty($_POST['json_done']))
-		return true;
+	if (!empty($_POST['json_done'])) {
+			return true;
+	}
 
 	// List of tables affected by this function
 	// name => array('key', col1[,col2|true[,col3]])
@@ -3011,12 +3177,14 @@ 
 	$upcontext['cur_table_name'] = isset($keys[$_GET['substep']]) ? $keys[$_GET['substep']] : $keys[0];
 	$upcontext['step_progress'] = (int) (($upcontext['cur_table_num'] / $upcontext['table_count']) * 100);
 
-	foreach ($keys as $id => $table)
-		if ($id < $_GET['substep'])
+	foreach ($keys as $id => $table) {
+			if ($id < $_GET['substep'])
 			$upcontext['previous_tables'][] = $table;
+	}
 
-	if ($command_line)
-		echo 'Converting data from serialize() to json_encode().';
+	if ($command_line) {
+			echo 'Converting data from serialize() to json_encode().';
+	}
 
 	if (!$support_js || isset($_GET['xml']))
 	{
@@ -3056,8 +3224,9 @@ 
 
 				// Loop through and fix these...
 				$new_settings = array();
-				if ($command_line)
-					echo "\n" . 'Fixing some settings...';
+				if ($command_line) {
+									echo "\n" . 'Fixing some settings...';
+				}
 
 				foreach ($serialized_settings as $var)
 				{
@@ -3065,22 +3234,24 @@ 
 					{
 						// Attempt to unserialize the setting
 						$temp = @safe_unserialize($modSettings[$var]);
-						if (!$temp && $command_line)
-							echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
-						elseif ($temp !== false)
-							$new_settings[$var] = json_encode($temp);
+						if (!$temp && $command_line) {
+													echo "\n - Failed to unserialize the '" . $var . "' setting. Skipping.";
+						} elseif ($temp !== false) {
+													$new_settings[$var] = json_encode($temp);
+						}
 					}
 				}
 
 				// Update everything at once
-				if (!function_exists('cache_put_data'))
-					require_once($sourcedir . '/Load.php');
+				if (!function_exists('cache_put_data')) {
+									require_once($sourcedir . '/Load.php');
+				}
 				updateSettings($new_settings, true);
 
-				if ($command_line)
-					echo ' done.';
-			}
-			elseif ($table == 'themes')
+				if ($command_line) {
+									echo ' done.';
+				}
+			} elseif ($table == 'themes')
 			{
 				// Finally, fix the admin prefs. Unfortunately this is stored per theme, but hopefully they only have one theme installed at this point...
 				$query = $smcFunc['db_query']('', '
@@ -3099,10 +3270,11 @@ 
 
 						if ($command_line)
 						{
-							if ($temp === false)
-								echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
-							else
-								echo "\n" . 'Fixing admin preferences...';
+							if ($temp === false) {
+															echo "\n" . 'Unserialize of admin_preferences for user ' . $row['id_member'] . ' failed. Skipping.';
+							} else {
+															echo "\n" . 'Fixing admin preferences...';
+							}
 						}
 
 						if ($temp !== false)
@@ -3124,15 +3296,15 @@ 
 								)
 							);
 
-							if ($command_line)
-								echo ' done.';
+							if ($command_line) {
+															echo ' done.';
+							}
 						}
 					}
 
 					$smcFunc['db_free_result']($query);
 				}
-			}
-			else
+			} else
 			{
 				// First item is always the key...
 				$key = $info[0];
@@ -3143,8 +3315,7 @@ 
 				{
 					$col_select = $info[1];
 					$where = ' WHERE ' . $info[1] . ' != {empty}';
-				}
-				else
+				} else
 				{
 					$col_select = implode(', ', $info);
 				}
@@ -3177,8 +3348,7 @@ 
 								if ($temp === false && $command_line)
 								{
 									echo "\nFailed to unserialize " . $row[$col] . "... Skipping\n";
-								}
-								else
+								} else
 								{
 									$row[$col] = json_encode($temp);
 
@@ -3203,16 +3373,18 @@ 
 						}
 					}
 
-					if ($command_line)
-						echo ' done.';
+					if ($command_line) {
+											echo ' done.';
+					}
 
 					// Free up some memory...
 					$smcFunc['db_free_result']($query);
 				}
 			}
 			// If this is XML to keep it nice for the user do one table at a time anyway!
-			if (isset($_GET['xml']))
-				return upgradeExit();
+			if (isset($_GET['xml'])) {
+							return upgradeExit();
+			}
 		}
 
 		if ($command_line)
@@ -3227,8 +3399,9 @@ 
 
 		$_GET['substep'] = 0;
 		// Make sure we move on!
-		if ($command_line)
-			return DeleteUpgrade();
+		if ($command_line) {
+					return DeleteUpgrade();
+		}
 
 		return true;
 	}
@@ -3285,14 +3458,16 @@ 
 	global $upcontext, $txt, $settings;
 
 	// Don't call me twice!
-	if (!empty($upcontext['chmod_called']))
-		return;
+	if (!empty($upcontext['chmod_called'])) {
+			return;
+	}
 
 	$upcontext['chmod_called'] = true;
 
 	// Nothing?
-	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error']))
-		return;
+	if (empty($upcontext['chmod']['files']) && empty($upcontext['chmod']['ftp_error'])) {
+			return;
+	}
 
 	// Was it a problem with Windows?
 	if (!empty($upcontext['chmod']['ftp_error']) && $upcontext['chmod']['ftp_error'] == 'total_mess')
@@ -3324,11 +3499,12 @@ 
 					content.write(\'<div class="windowbg description">\n\t\t\t<h4>The following files needs to be made writable to continue:</h4>\n\t\t\t\');
 					content.write(\'<p>', implode('<br>\n\t\t\t', $upcontext['chmod']['files']), '</p>\n\t\t\t\');';
 
-	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux')
-		echo '
+	if (isset($upcontext['systemos']) && $upcontext['systemos'] == 'linux') {
+			echo '
 					content.write(\'<hr>\n\t\t\t\');
 					content.write(\'<p>If you have a shell account, the convenient below command can automatically correct permissions on these files</p>\n\t\t\t\');
 					content.write(\'<tt># chmod a+w ', implode(' ', $upcontext['chmod']['files']), '</tt>\n\t\t\t\');';
+	}
 
 	echo '
 					content.write(\'<a href="javascript:self.close();">close</a>\n\t\t</div>\n\t</body>\n</html>\');
@@ -3336,17 +3512,19 @@ 
 				}
 			</script>';
 
-	if (!empty($upcontext['chmod']['ftp_error']))
-		echo '
+	if (!empty($upcontext['chmod']['ftp_error'])) {
+			echo '
 			<div class="error_message red">
 				The following error was encountered when trying to connect:<br><br>
 				<code>', $upcontext['chmod']['ftp_error'], '</code>
 			</div>
 			<br>';
+	}
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	<form action="', $upcontext['form_url'], '" method="post">';
+	}
 
 	echo '
 		<table width="520" border="0" align="center" style="margin-bottom: 1ex;">
@@ -3381,10 +3559,11 @@ 
 		<div class="righttext" style="margin: 1ex;"><input type="submit" value="', $txt['ftp_connect'], '" class="button"></div>
 	</div>';
 
-	if (empty($upcontext['chmod_in_form']))
-		echo '
+	if (empty($upcontext['chmod_in_form'])) {
+			echo '
 	</form>';
-}
+	}
+	}
 
 function template_upgrade_above()
 {
@@ -3444,9 +3623,10 @@ 
 				<h2>', $txt['upgrade_progress'], '</h2>
 				<ul>';
 
-	foreach ($upcontext['steps'] as $num => $step)
-		echo '
+	foreach ($upcontext['steps'] as $num => $step) {
+			echo '
 						<li class="', $num < $upcontext['current_step'] ? 'stepdone' : ($num == $upcontext['current_step'] ? 'stepcurrent' : 'stepwaiting'), '">', $txt['upgrade_step'], ' ', $step[0], ': ', $step[1], '</li>';
+	}
 
 	echo '
 					</ul>
@@ -3459,8 +3639,8 @@ 
 				</div>
 			</div>';
 
-	if (isset($upcontext['step_progress']))
-		echo '
+	if (isset($upcontext['step_progress'])) {
+			echo '
 				<br>
 				<br>
 				<div id="progress_bar_step">
@@ -3469,6 +3649,7 @@ 
 						<span>', $txt['upgrade_step_progress'], '</span>
 					</div>
 				</div>';
+	}
 
 	echo '
 				<div id="substep_bar_div" class="smalltext" style="float: left;width: 50%;margin-top: 0.6em;display: ', isset($upcontext['substep_progress']) ? '' : 'none', ';">', isset($upcontext['substep_progress_name']) ? trim(strtr($upcontext['substep_progress_name'], array('.' => ''))) : '', ':</div>
@@ -3499,32 +3680,36 @@ 
 {
 	global $upcontext, $txt;
 
-	if (!empty($upcontext['pause']))
-		echo '
+	if (!empty($upcontext['pause'])) {
+			echo '
 								<em>', $txt['upgrade_incomplete'], '.</em><br>
 
 								<h2 style="margin-top: 2ex;">', $txt['upgrade_not_quite_done'], '</h2>
 								<h3>
 									', $txt['upgrade_paused_overload'], '
 								</h3>';
+	}
 
-	if (!empty($upcontext['custom_warning']))
-		echo '
+	if (!empty($upcontext['custom_warning'])) {
+			echo '
 								<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 									<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 									<strong style="text-decoration: underline;">', $txt['upgrade_note'], '</strong><br>
 									<div style="padding-left: 6ex;">', $upcontext['custom_warning'], '</div>
 								</div>';
+	}
 
 	echo '
 								<div class="righttext" style="margin: 1ex;">';
 
-	if (!empty($upcontext['continue']))
-		echo '
+	if (!empty($upcontext['continue'])) {
+			echo '
 									<input type="submit" id="contbutt" name="contbutt" value="', $txt['upgrade_continue'], '"', $upcontext['continue'] == 2 ? ' disabled' : '', ' class="button">';
-	if (!empty($upcontext['skip']))
-		echo '
+	}
+	if (!empty($upcontext['skip'])) {
+			echo '
 									<input type="submit" id="skip" name="skip" value="', $txt['upgrade_skip'], '" onclick="dontSubmit = true; document.getElementById(\'contbutt\').disabled = \'disabled\'; return true;" class="button">';
+	}
 
 	echo '
 								</div>
@@ -3574,11 +3759,12 @@ 
 	echo '<', '?xml version="1.0" encoding="UTF-8"?', '>
 	<smf>';
 
-	if (!empty($upcontext['get_data']))
-		foreach ($upcontext['get_data'] as $k => $v)
+	if (!empty($upcontext['get_data'])) {
+			foreach ($upcontext['get_data'] as $k => $v)
 			echo '
 		<get key="', $k, '">', $v, '</get>';
-}
+	}
+	}
 
 function template_xml_below()
 {
@@ -3619,8 +3805,8 @@ 
 	template_chmod();
 
 	// For large, pre 1.1 RC2 forums give them a warning about the possible impact of this upgrade!
-	if ($upcontext['is_large_forum'])
-		echo '
+	if ($upcontext['is_large_forum']) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -3628,10 +3814,11 @@ 
 				', $txt['upgrade_warning_lots_data'], '
 			</div>
 		</div>';
+	}
 
 	// A warning message?
-	if (!empty($upcontext['warning']))
-		echo '
+	if (!empty($upcontext['warning'])) {
+			echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">', $txt['upgrade_warning'], '</strong><br>
@@ -3639,6 +3826,7 @@ 
 				', $upcontext['warning'], '
 			</div>
 		</div>';
+	}
 
 	// Paths are incorrect?
 	echo '
@@ -3654,20 +3842,22 @@ 
 	if (!empty($upcontext['user']['id']) && (time() - $upcontext['started'] < 72600 || time() - $upcontext['updated'] < 3600))
 	{
 		$ago = time() - $upcontext['started'];
-		if ($ago < 60)
-			$ago = $ago . ' seconds';
-		elseif ($ago < 3600)
-			$ago = (int) ($ago / 60) . ' minutes';
-		else
-			$ago = (int) ($ago / 3600) . ' hours';
+		if ($ago < 60) {
+					$ago = $ago . ' seconds';
+		} elseif ($ago < 3600) {
+					$ago = (int) ($ago / 60) . ' minutes';
+		} else {
+					$ago = (int) ($ago / 3600) . ' hours';
+		}
 
 		$active = time() - $upcontext['updated'];
-		if ($active < 60)
-			$updated = $active . ' seconds';
-		elseif ($active < 3600)
-			$updated = (int) ($active / 60) . ' minutes';
-		else
-			$updated = (int) ($active / 3600) . ' hours';
+		if ($active < 60) {
+					$updated = $active . ' seconds';
+		} elseif ($active < 3600) {
+					$updated = (int) ($active / 60) . ' minutes';
+		} else {
+					$updated = (int) ($active / 3600) . ' hours';
+		}
 
 		echo '
 		<div style="margin: 2ex; padding: 2ex; border: 2px dashed #cc3344; color: black; background-color: #ffe4e9;">
@@ -3676,16 +3866,18 @@ 
 			<div style="padding-left: 6ex;">
 				&quot;', $upcontext['user']['name'], '&quot; has been running the upgrade script for the last ', $ago, ' - and was last active ', $updated, ' ago.';
 
-		if ($active < 600)
-			echo '
+		if ($active < 600) {
+					echo '
 				We recommend that you do not run this script unless you are sure that ', $upcontext['user']['name'], ' has completed their upgrade.';
+		}
 
-		if ($active > $upcontext['inactive_timeout'])
-			echo '
+		if ($active > $upcontext['inactive_timeout']) {
+					echo '
 				<br><br>You can choose to either run the upgrade again from the beginning - or alternatively continue from the last step reached during the last upgrade.';
-		else
-			echo '
+		} else {
+					echo '
 				<br><br>This upgrade script cannot be run until ', $upcontext['user']['name'], ' has been inactive for at least ', ($upcontext['inactive_timeout'] > 120 ? round($upcontext['inactive_timeout'] / 60, 1) . ' minutes!' : $upcontext['inactive_timeout'] . ' seconds!');
+		}
 
 		echo '
 			</div>
@@ -3701,9 +3893,10 @@ 
 					<td>
 						<input type="text" name="user" value="', !empty($upcontext['username']) ? $upcontext['username'] : '', '"', $disable_security ? ' disabled' : '', '>';
 
-	if (!empty($upcontext['username_incorrect']))
-		echo '
+	if (!empty($upcontext['username_incorrect'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Username Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -3714,9 +3907,10 @@ 
 						<input type="password" name="passwrd" value=""', $disable_security ? ' disabled' : '', '>
 						<input type="hidden" name="hash_passwrd" value="">';
 
-	if (!empty($upcontext['password_failed']))
-		echo '
+	if (!empty($upcontext['password_failed'])) {
+			echo '
 						<div class="smalltext" style="color: red;">Password Incorrect</div>';
+	}
 
 	echo '
 					</td>
@@ -3787,8 +3981,8 @@ 
 			<form action="', $upcontext['form_url'], '" method="post" name="upform" id="upform">';
 
 	// Warning message?
-	if (!empty($upcontext['upgrade_options_warning']))
-		echo '
+	if (!empty($upcontext['upgrade_options_warning'])) {
+			echo '
 		<div style="margin: 1ex; padding: 1ex; border: 1px dashed #cc3344; color: black; background-color: #ffe4e9;">
 			<div style="float: left; width: 2ex; font-size: 2em; color: red;">!!</div>
 			<strong style="text-decoration: underline;">Warning!</strong><br>
@@ -3796,6 +3990,7 @@ 
 				', $upcontext['upgrade_options_warning'], '
 			</div>
 		</div>';
+	}
 
 	echo '
 				<table>
@@ -3838,8 +4033,8 @@ 
 						</td>
 					</tr>';
 
-	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad']))
-		echo '
+	if (!empty($upcontext['karma_installed']['good']) || !empty($upcontext['karma_installed']['bad'])) {
+			echo '
 					<tr valign="top">
 						<td width="2%">
 							<input type="checkbox" name="delete_karma" id="delete_karma" value="1">
@@ -3848,6 +4043,7 @@ 
 							<label for="delete_karma">Delete all karma settings and info from the DB</label>
 						</td>
 					</tr>';
+	}
 
 	echo '
 					<tr valign="top">
@@ -3885,10 +4081,11 @@ 
 			</div>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
@@ -3925,12 +4122,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -3963,8 +4161,9 @@ 
 {
 	global $upcontext, $support_js, $is_debug, $timeLimitThreshold;
 
-	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug']))
-		$is_debug = true;
+	if (empty($is_debug) && !empty($upcontext['upgrade_status']['debug'])) {
+			$is_debug = true;
+	}
 
 	echo '
 		<h3>Executing database changes</h3>
@@ -3979,8 +4178,9 @@ 
 	{
 		foreach ($upcontext['actioned_items'] as $num => $item)
 		{
-			if ($num != 0)
-				echo ' Successful!';
+			if ($num != 0) {
+							echo ' Successful!';
+			}
 			echo '<br>' . $item;
 		}
 		if (!empty($upcontext['changes_complete']))
@@ -3993,28 +4193,32 @@ 
 				$seconds = intval($active % 60);
 
 				$totalTime = '';
-				if ($hours > 0)
-					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-				if ($minutes > 0)
-					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-				if ($seconds > 0)
-					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				if ($hours > 0) {
+									$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+				}
+				if ($minutes > 0) {
+									$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+				}
+				if ($seconds > 0) {
+									$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				}
 			}
 
-			if ($is_debug && !empty($totalTime))
-				echo ' Successful! Completed in ', $totalTime, '<br><br>';
-			else
-				echo ' Successful!<br><br>';
+			if ($is_debug && !empty($totalTime)) {
+							echo ' Successful! Completed in ', $totalTime, '<br><br>';
+			} else {
+							echo ' Successful!<br><br>';
+			}
 
 			echo '<span id="commess" style="font-weight: bold;">1 Database Updates Complete! Click Continue to Proceed.</span><br>';
 		}
-	}
-	else
+	} else
 	{
 		// Tell them how many files we have in total.
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 		<strong id="info1">Executing upgrade script <span id="file_done">', $upcontext['cur_file_num'], '</span> of ', $upcontext['file_count'], '.</strong>';
+		}
 
 		echo '
 		<h3 id="info2"><strong>Executing:</strong> &quot;<span id="cur_item_name">', $upcontext['current_item_name'], '</span>&quot; (<span id="item_num">', $upcontext['current_item_num'], '</span> of <span id="total_items"><span id="item_count">', $upcontext['total_items'], '</span>', $upcontext['file_count'] > 1 ? ' - of this script' : '', ')</span></h3>
@@ -4030,19 +4234,23 @@ 
 				$seconds = intval($active % 60);
 
 				$totalTime = '';
-				if ($hours > 0)
-					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-				if ($minutes > 0)
-					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-				if ($seconds > 0)
-					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				if ($hours > 0) {
+									$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+				}
+				if ($minutes > 0) {
+									$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+				}
+				if ($seconds > 0) {
+									$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+				}
 			}
 
 			echo '
 			<br><span id="upgradeCompleted">';
 
-			if (!empty($totalTime))
-				echo 'Completed in ', $totalTime, '<br>';
+			if (!empty($totalTime)) {
+							echo 'Completed in ', $totalTime, '<br>';
+			}
 
 			echo '</span>
 			<div id="debug_section" style="height: 59px; overflow: auto;">
@@ -4079,9 +4287,10 @@ 
 			var getData = "";
 			var debugItems = ', $upcontext['debug_items'], ';';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 			var upgradeStartTime = ' . $upcontext['started'] . ';';
+		}
 
 		echo '
 			function getNextItem()
@@ -4121,9 +4330,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Error retrieving information on step: " + (sDebugName == "" ? sLastString : sDebugName));';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -4144,9 +4354,10 @@ 
 						document.getElementById("error_block").style.display = "";
 						setInnerHTML(document.getElementById("error_message"), "Upgrade script appears to be going into a loop - step: " + sDebugName);';
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 						setOuterHTML(document.getElementById(\'debuginfo\'), \'<span style="color: red;">failed<\' + \'/span><span id="debuginfo"><\' + \'/span>\');';
+	}
 
 	echo '
 					}
@@ -4205,8 +4416,8 @@ 
 				if (bIsComplete && iDebugNum == -1 && curFile >= ', $upcontext['file_count'], ')
 				{';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					document.getElementById(\'debug_section\').style.display = "none";
 
 					var upgradeFinishedTime = parseInt(oXMLDoc.getElementsByTagName("curtime")[0].childNodes[0].nodeValue);
@@ -4224,6 +4435,7 @@ 
 						totalTime = totalTime + diffSeconds + " second" + (diffSeconds > 1 ? "s" : "");
 
 					setInnerHTML(document.getElementById("upgradeCompleted"), "Completed in " + totalTime);';
+		}
 
 		echo '
 
@@ -4231,9 +4443,10 @@ 
 					document.getElementById(\'contbutt\').disabled = 0;
 					document.getElementById(\'database_done\').value = 1;';
 
-		if ($upcontext['file_count'] > 1)
-			echo '
+		if ($upcontext['file_count'] > 1) {
+					echo '
 					document.getElementById(\'info1\').style.display = "none";';
+		}
 
 		echo '
 					document.getElementById(\'info2\').style.display = "none";
@@ -4246,9 +4459,10 @@ 
 					lastItem = 0;
 					prevFile = curFile;';
 
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 					setOuterHTML(document.getElementById(\'debuginfo\'), \'Moving to next script file...done<br><span id="debuginfo"><\' + \'/span>\');';
+		}
 
 		echo '
 					getNextItem();
@@ -4256,8 +4470,8 @@ 
 				}';
 
 		// If debug scroll the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				if (iLastSubStepProgress == -1)
 				{
 					// Give it consistent dots.
@@ -4276,6 +4490,7 @@ 
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Update the page.
@@ -4336,9 +4551,10 @@ 
 			}';
 
 		// Start things off assuming we've not errored.
-		if (empty($upcontext['error_message']))
-			echo '
+		if (empty($upcontext['error_message'])) {
+					echo '
 			getNextItem();';
+		}
 
 		echo '
 		//# sourceURL=dynamicScript-dbch.js
@@ -4356,18 +4572,21 @@ 
 	<item num="', $upcontext['current_item_num'], '">', $upcontext['current_item_name'], '</item>
 	<debug num="', $upcontext['current_debug_item_num'], '" percent="', isset($upcontext['substep_progress']) ? $upcontext['substep_progress'] : '-1', '" complete="', empty($upcontext['completed_step']) ? 0 : 1, '">', $upcontext['current_debug_item_name'], '</debug>';
 
-	if (!empty($upcontext['error_message']))
-		echo '
+	if (!empty($upcontext['error_message'])) {
+			echo '
 	<error>', $upcontext['error_message'], '</error>';
+	}
 
-	if (!empty($upcontext['error_string']))
-		echo '
+	if (!empty($upcontext['error_string'])) {
+			echo '
 	<sql>', $upcontext['error_string'], '</sql>';
+	}
 
-	if ($is_debug)
-		echo '
+	if ($is_debug) {
+			echo '
 	<curtime>', time(), '</curtime>';
-}
+	}
+	}
 
 // Template for the UTF-8 conversion step. Basically a copy of the backup stuff with slight modifications....
 function template_convert_utf8()
@@ -4386,18 +4605,20 @@ 
 			</div>';
 
 	// Done any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>';
 
 	// If we dropped their index, let's let them know
-	if ($upcontext['dropping_index'])
-		echo '
+	if ($upcontext['dropping_index']) {
+			echo '
 				<br><span id="indexmsg" style="font-weight: bold; font-style: italic; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Please note that your fulltext index was dropped to facilitate the conversion and will need to be recreated in the admin area after the upgrade is complete.</span>';
+	}
 
 	// Completion notification
 	echo '
@@ -4434,12 +4655,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -4487,19 +4709,21 @@ 
 			</div>';
 
 	// Dont any tables so far?
-	if (!empty($upcontext['previous_tables']))
-		foreach ($upcontext['previous_tables'] as $table)
+	if (!empty($upcontext['previous_tables'])) {
+			foreach ($upcontext['previous_tables'] as $table)
 			echo '
 			<br>Completed Table: &quot;', $table, '&quot;.';
+	}
 
 	echo '
 			<h3 id="current_tab_div">Current Table: &quot;<span id="current_table">', $upcontext['cur_table_name'], '</span>&quot;</h3>
 			<br><span id="commess" style="font-weight: bold; display: ', $upcontext['cur_table_num'] == $upcontext['table_count'] ? 'inline' : 'none', ';">Convert to JSON Complete! Click Continue to Proceed.</span>';
 
 	// Try to make sure substep was reset.
-	if ($upcontext['cur_table_num'] == $upcontext['table_count'])
-		echo '
+	if ($upcontext['cur_table_num'] == $upcontext['table_count']) {
+			echo '
 			<input type="hidden" name="substep" id="substep" value="0">';
+	}
 
 	// Continue please!
 	$upcontext['continue'] = $support_js ? 2 : 1;
@@ -4532,12 +4756,13 @@ 
 				updateStepProgress(iTableNum, ', $upcontext['table_count'], ', ', $upcontext['step_weight'] * ((100 - $upcontext['step_progress']) / 100), ');';
 
 		// If debug flood the screen.
-		if ($is_debug)
-			echo '
+		if ($is_debug) {
+					echo '
 				setOuterHTML(document.getElementById(\'debuginfo\'), \'<br>Completed Table: &quot;\' + sCompletedTableName + \'&quot;.<span id="debuginfo"><\' + \'/span>\');
 
 				if (document.getElementById(\'debug_section\').scrollHeight)
 					document.getElementById(\'debug_section\').scrollTop = document.getElementById(\'debug_section\').scrollHeight';
+		}
 
 		echo '
 				// Get the next update...
@@ -4573,8 +4798,8 @@ 
 	<h3>That wasn\'t so hard, was it?  Now you are ready to use <a href="', $boardurl, '/index.php">your installation of SMF</a>.  Hope you like it!</h3>
 	<form action="', $boardurl, '/index.php">';
 
-	if (!empty($upcontext['can_delete_script']))
-		echo '
+	if (!empty($upcontext['can_delete_script'])) {
+			echo '
 			<label for="delete_self"><input type="checkbox" id="delete_self" onclick="doTheDelete(this);"> Delete upgrade.php and its data files now</label> <em>(doesn\'t work on all servers).</em>
 			<script>
 				function doTheDelete(theCheck)
@@ -4586,6 +4811,7 @@ 
 				}
 			</script>
 			<img src="', $settings['default_theme_url'], '/images/blank.png" alt="" id="delete_upgrader"><br>';
+	}
 
 	$active = time() - $upcontext['started'];
 	$hours = floor($active / 3600);
@@ -4595,16 +4821,20 @@ 
 	if ($is_debug)
 	{
 		$totalTime = '';
-		if ($hours > 0)
-			$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
-		if ($minutes > 0)
-			$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
-		if ($seconds > 0)
-			$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		if ($hours > 0) {
+					$totalTime .= $hours . ' hour' . ($hours > 1 ? 's' : '') . ' ';
+		}
+		if ($minutes > 0) {
+					$totalTime .= $minutes . ' minute' . ($minutes > 1 ? 's' : '') . ' ';
+		}
+		if ($seconds > 0) {
+					$totalTime .= $seconds . ' second' . ($seconds > 1 ? 's' : '') . ' ';
+		}
 	}
 
-	if ($is_debug && !empty($totalTime))
-		echo '<br> Upgrade completed in ', $totalTime, '<br><br>';
+	if ($is_debug && !empty($totalTime)) {
+			echo '<br> Upgrade completed in ', $totalTime, '<br><br>';
+	}
 
 	echo '<br>
 			If you had any problems with this upgrade, or have any problems using SMF, please don\'t hesitate to <a href="https://www.simplemachines.org/community/index.php">look to us for assistance</a>.<br>
@@ -4631,8 +4861,9 @@ 
 
 	$current_substep = $_GET['substep'];
 
-	if (empty($_GET['a']))
-		$_GET['a'] = 0;
+	if (empty($_GET['a'])) {
+			$_GET['a'] = 0;
+	}
 	$step_progress['name'] = 'Converting ips';
 	$step_progress['current'] = $_GET['a'];
 
@@ -4675,16 +4906,19 @@ 
 				'empty' => '',
 				'limit' => $limit,
 		));
-		while ($row = $smcFunc['db_fetch_assoc']($request))
-			$arIp[] = $row[$oldCol];
+		while ($row = $smcFunc['db_fetch_assoc']($request)) {
+					$arIp[] = $row[$oldCol];
+		}
 		$smcFunc['db_free_result']($request);
 
 		// Special case, null ip could keep us in a loop.
-		if (is_null($arIp[0]))
-			unset($arIp[0]);
+		if (is_null($arIp[0])) {
+					unset($arIp[0]);
+		}
 
-		if (empty($arIp))
-			$is_done = true;
+		if (empty($arIp)) {
+					$is_done = true;
+		}
 
 		$updates = array();
 		$cases = array();
@@ -4693,16 +4927,18 @@ 
 		{
 			$arIp[$i] = trim($arIp[$i]);
 
-			if (empty($arIp[$i]))
-				continue;
+			if (empty($arIp[$i])) {
+							continue;
+			}
 
 			$updates['ip' . $i] = $arIp[$i];
 			$cases[$arIp[$i]] = 'WHEN ' . $oldCol . ' = {string:ip' . $i . '} THEN {inet:ip' . $i . '}';
 
 			if ($setSize > 0 && $i % $setSize === 0)
 			{
-				if (count($updates) == 1)
-					continue;
+				if (count($updates) == 1) {
+									continue;
+				}
 
 				$updates['whereSet'] = array_values($updates);
 				$smcFunc['db_query']('', '
@@ -4736,8 +4972,7 @@ 
 							'ip' => $ip
 					));
 				}
-			}
-			else
+			} else
 			{
 				$updates['whereSet'] = array_values($updates);
 				$smcFunc['db_query']('', '
@@ -4751,9 +4986,9 @@ 
 					$updates
 				);
 			}
+		} else {
+					$is_done = true;
 		}
-		else
-			$is_done = true;
 
 		$_GET['a'] += $limit;
 		$step_progress['current'] = $_GET['a'];
@@ -4779,10 +5014,11 @@ 
 
  	$columns = $smcFunc['db_list_columns']($targetTable, true);
 
-	if (isset($columns[$column]))
-		return $columns[$column];
-	else
-		return null;
-}
+	if (isset($columns[$column])) {
+			return $columns[$column];
+	} else {
+			return null;
+	}
+	}
 
 ?>
\ No newline at end of file